From 77c5b410e653433a17c7cf25b115dae4c25bdbd2 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Sun, 5 Oct 2014 22:09:19 +0200
Subject: Fixed eMonsterType Lua API mismatch.

---
 src/BlockID.cpp | 51 ---------------------------------------------------
 1 file changed, 51 deletions(-)

(limited to 'src/BlockID.cpp')

diff --git a/src/BlockID.cpp b/src/BlockID.cpp
index 9026d81f2..755c721db 100644
--- a/src/BlockID.cpp
+++ b/src/BlockID.cpp
@@ -253,57 +253,6 @@ AString ItemToFullString(const cItem & a_Item)
 
 
 
-int StringToMobType(const AString & a_MobString)
-{
-	static struct
-	{
-		int m_MobType;
-		const char * m_String;
-	} MobMap [] =
-	{
-		{mtCreeper,      "Creeper"},
-		{mtSkeleton,     "Skeleton"},
-		{mtSpider,       "Spider"},
-		{mtGiant,        "Giant"},
-		{mtZombie,       "Zombie"},
-		{mtSlime,        "Slime"},
-		{mtGhast,        "Ghast"},
-		{mtZombiePigman, "ZombiePigman"},
-		{mtEnderman,     "Enderman"},
-		{mtCaveSpider,   "CaveSpider"},
-		{mtSilverfish,   "SilverFish"},
-		{mtBlaze,        "Blaze"},
-		{mtMagmaCube,    "MagmaCube"},
-		{mtEnderDragon,  "EnderDragon"},
-		{mtWither,       "Wither"},
-		{mtBat,          "Bat"},
-		{mtWitch,        "Witch"},
-		{mtPig,          "Pig"},
-		{mtSheep,        "Sheep"},
-		{mtCow,          "Cow"},
-		{mtChicken,      "Chicken"},
-		{mtSquid,        "Squid"},
-		{mtWolf,         "Wolf"},
-		{mtMooshroom,    "Mooshroom"},
-		{mtSnowGolem,    "SnowGolem"},
-		{mtOcelot,       "Ocelot"},
-		{mtIronGolem,    "IronGolem"},
-		{mtVillager,     "Villager"},
-	};
-	for (size_t i = 0; i < ARRAYCOUNT(MobMap); i++)
-	{
-		if (NoCaseCompare(MobMap[i].m_String, a_MobString) == 0)
-		{
-			return MobMap[i].m_MobType;
-		}
-	}  // for i - MobMap[]
-	return -1;
-}
-
-
-
-
-
 eDimension StringToDimension(const AString & a_DimensionString)
 {
 	// First try decoding as a number
-- 
cgit v1.2.3


From 449d08cb3d1a8ef430430790fcea0ce36b713866 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Thu, 23 Oct 2014 15:15:10 +0200
Subject: Merged IniFile into main MCS sources.

---
 src/BlockID.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/BlockID.cpp')

diff --git a/src/BlockID.cpp b/src/BlockID.cpp
index 755c721db..c0f3193bb 100644
--- a/src/BlockID.cpp
+++ b/src/BlockID.cpp
@@ -4,7 +4,7 @@
 
 #include "Globals.h"
 #include "BlockID.h"
-#include "inifile/iniFile.h"
+#include "IniFile.h"
 #include "Item.h"
 #include "Mobs/Monster.h"
 
-- 
cgit v1.2.3


From 165533c27e380300f5e9411e4d46aa553bf2fdeb Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Wed, 29 Oct 2014 15:47:43 +0100
Subject: Fixed 1.8 world item format reading.

---
 src/BlockID.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/BlockID.cpp')

diff --git a/src/BlockID.cpp b/src/BlockID.cpp
index c0f3193bb..c98e0cad1 100644
--- a/src/BlockID.cpp
+++ b/src/BlockID.cpp
@@ -217,7 +217,12 @@ BLOCKTYPE BlockStringToType(const AString & a_BlockTypeString)
 
 bool StringToItem(const AString & a_ItemTypeString, cItem & a_Item)
 {
-	return gsBlockIDMap.ResolveItem(TrimString(a_ItemTypeString), a_Item);
+	AString ItemName = TrimString(a_ItemTypeString);
+	if (ItemName.substr(0, 10) == "minecraft:")
+	{
+		ItemName = ItemName.substr(10);
+	}
+	return gsBlockIDMap.ResolveItem(ItemName, a_Item);
 }
 
 
-- 
cgit v1.2.3