1 files changed, 2 insertions, 184 deletions

diff --git a/src/BlockID.cpp b/src/BlockType.cpp
index 399f9c3f6..cecfb752b 100644
--- a/src/BlockID.cpp
+++ b/src/BlockType.cpp
@@ -1,6 +1,6 @@
-// BlockID.cpp
+// BlockType.cpp
 
-// Implements the helper functions for converting Block ID string to int etc.
+// Implements the helper functions for converting Block Type string to int etc.
 
 #include "Globals.h"
 #include "IniFile.h"
@@ -291,188 +291,6 @@ AString ItemToFullString(const cItem & a_Item)
 
 
 
-eDimension StringToDimension(const AString & a_DimensionString)
-{
-	// First try decoding as a number
-	int res;
-	if (StringToInteger(a_DimensionString, res))
-	{
-		// It was a valid number
-		return static_cast<eDimension>(res);
-	}
-
-	// Decode using a built-in map:
-	static struct
-	{
-		eDimension m_Dimension;
-		const char * m_String;
-	} DimensionMap [] =
-	{
-		{ dimOverworld, "Overworld"},
-		{ dimOverworld, "Normal"},
-		{ dimOverworld, "World"},
-		{ dimNether,    "Nether"},
-		{ dimNether,    "Hell"},  // Alternate name for Nether
-		{ dimEnd,       "End"},
-		{ dimEnd,       "Sky"},  // Old name for End
-	} ;
-	for (size_t i = 0; i < ARRAYCOUNT(DimensionMap); i++)
-	{
-		if (NoCaseCompare(DimensionMap[i].m_String, a_DimensionString) == 0)
-		{
-			return DimensionMap[i].m_Dimension;
-		}
-	}  // for i - DimensionMap[]
-
-	// Not found
-	LOGWARNING("Unknown dimension: \"%s\". Setting to Overworld", a_DimensionString.c_str());
-	return dimOverworld;
-}
-
-
-
-
-
-AString DimensionToString(eDimension a_Dimension)
-{
-	// Decode using a built-in map:
-	static struct
-	{
-		eDimension m_Dimension;
-		const char * m_String;
-	} DimensionMap[] =
-	{
-		{ dimOverworld, "Overworld" },
-		{ dimNether, "Nether" },
-		{ dimEnd, "End" },
-	};
-
-	for (size_t i = 0; i < ARRAYCOUNT(DimensionMap); i++)
-	{
-		if (DimensionMap[i].m_Dimension == a_Dimension)
-		{
-			return DimensionMap[i].m_String;
-		}
-	}  // for i - DimensionMap[]
-
-	// Not found
-	LOGWARNING("Unknown dimension: \"%i\". Setting to Overworld", static_cast<int>(a_Dimension));
-	return "Overworld";
-}
-
-
-
-
-
-/** Translates damage type constant to a string representation (built-in) */
-AString DamageTypeToString(eDamageType a_DamageType)
-{
-	// Make sure to keep this alpha-sorted.
-	switch (a_DamageType)
-	{
-		case dtAdmin:           return "dtAdmin";
-		case dtAttack:          return "dtAttack";
-		case dtCactusContact:   return "dtCactusContact";
-		case dtDrowning:        return "dtDrowning";
-		case dtEnderPearl:      return "dtEnderPearl";
-		case dtFalling:         return "dtFalling";
-		case dtFireContact:     return "dtFireContact";
-		case dtInVoid:          return "dtInVoid";
-		case dtLavaContact:     return "dtLavaContact";
-		case dtLightning:       return "dtLightning";
-		case dtOnFire:          return "dtOnFire";
-		case dtPoisoning:       return "dtPoisoning";
-		case dtWithering:       return "dtWithering";
-		case dtPotionOfHarming: return "dtPotionOfHarming";
-		case dtRangedAttack:    return "dtRangedAttack";
-		case dtStarving:        return "dtStarving";
-		case dtSuffocating:     return "dtSuffocation";
-		case dtExplosion:       return "dtExplosion";
-	}
-	UNREACHABLE("Unsupported damage type");
-}
-
-
-
-
-
-/** Translates a damage type string to damage type. Takes either a number or a damage type alias (built-in).
-Returns -1 on failure. */
-eDamageType StringToDamageType(const AString & a_DamageTypeString)
-{
-	// First try decoding as a number:
-	int res;
-	if (!StringToInteger(a_DamageTypeString, res))
-	{
-		// It was a valid number
-		return static_cast<eDamageType>(res);
-	}
-
-	// Decode using a built-in map:
-	static struct
-	{
-		eDamageType  m_DamageType;
-		const char * m_String;
-	} DamageTypeMap [] =
-	{
-		// Cannonical names:
-		{ dtAttack,          "dtAttack"},
-		{ dtRangedAttack,    "dtRangedAttack"},
-		{ dtLightning,       "dtLightning"},
-		{ dtFalling,         "dtFalling"},
-		{ dtDrowning,        "dtDrowning"},
-		{ dtSuffocating,     "dtSuffocation"},
-		{ dtStarving,        "dtStarving"},
-		{ dtCactusContact,   "dtCactusContact"},
-		{ dtLavaContact,     "dtLavaContact"},
-		{ dtPoisoning,       "dtPoisoning"},
-		{ dtWithering,       "dtWithering"},
-		{ dtOnFire,          "dtOnFire"},
-		{ dtFireContact,     "dtFireContact"},
-		{ dtInVoid,          "dtInVoid"},
-		{ dtPotionOfHarming, "dtPotionOfHarming"},
-		{ dtAdmin,           "dtAdmin"},
-		{ dtExplosion,       "dtExplosion"},
-
-		// Common synonyms:
-		{ dtAttack,        "dtPawnAttack"},
-		{ dtAttack,        "dtEntityAttack"},
-		{ dtAttack,        "dtMob"},
-		{ dtAttack,        "dtMobAttack"},
-		{ dtRangedAttack,  "dtArrowAttack"},
-		{ dtRangedAttack,  "dtArrow"},
-		{ dtRangedAttack,  "dtProjectile"},
-		{ dtFalling,       "dtFall"},
-		{ dtDrowning,      "dtDrown"},
-		{ dtSuffocating,   "dtSuffocation"},
-		{ dtStarving,      "dtStarvation"},
-		{ dtStarving,      "dtHunger"},
-		{ dtCactusContact, "dtCactus"},
-		{ dtCactusContact, "dtCactuses"},
-		{ dtCactusContact, "dtCacti"},
-		{ dtLavaContact,   "dtLava"},
-		{ dtPoisoning,     "dtPoison"},
-		{ dtWithering,     "dtWither"},
-		{ dtOnFire,        "dtBurning"},
-		{ dtFireContact,   "dtInFire"},
-		{ dtAdmin,         "dtPlugin"},
-	} ;
-	for (size_t i = 0; i < ARRAYCOUNT(DamageTypeMap); i++)
-	{
-		if (NoCaseCompare(DamageTypeMap[i].m_String, a_DamageTypeString) == 0)
-		{
-			return DamageTypeMap[i].m_DamageType;
-		}
-	}  // for i - DamageTypeMap[]
-
-	// Not found:
-	return static_cast<eDamageType>(-1);
-}
-
-
-
-
-
 cItem GetIniItemSet(cIniFile & a_IniFile, const char * a_Section, const char * a_Key, const char * a_Default)
 {
 	AString ItemStr = a_IniFile.GetValueSet(a_Section, a_Key, a_Default);