Merge pull request #102 from zhuowei/penewmaterials

Update for the new Minecraft PE updates

materials.py

@@ -657,25 +657,52 @@ def defineShroomFaces(Shroom, id, name):
 pocketMaterials.Glass = pocketMaterials[20, 0]
 
 pocketMaterials.LapisLazuliOre = pocketMaterials[21, 0]
+pocketMaterials.LapisLazuliBlock = pocketMaterials[22, 0]
 pocketMaterials.Sandstone = pocketMaterials[24, 0]
-pocketMaterials.BlackWool2 = pocketMaterials[35, 0]
+pocketMaterials.WhiteWool = pocketMaterials[35, 0]
+pocketMaterials.OrangeWool = pocketMaterials[35, 1]
+pocketMaterials.MagentaWool = pocketMaterials[35, 2]
+pocketMaterials.LightBlueWool = pocketMaterials[35, 3]
+pocketMaterials.YellowWool = pocketMaterials[35, 4]
+pocketMaterials.LightGreenWool = pocketMaterials[35, 5]
+pocketMaterials.PinkWool = pocketMaterials[35, 6]
+pocketMaterials.GrayWool = pocketMaterials[35, 7]
+pocketMaterials.LightGrayWool = pocketMaterials[35, 8]
+pocketMaterials.CyanWool = pocketMaterials[35, 9]
+pocketMaterials.PurpleWool = pocketMaterials[35, 10]
+pocketMaterials.BlueWool = pocketMaterials[35, 11]
+pocketMaterials.BrownWool = pocketMaterials[35, 12]
+pocketMaterials.DarkGreenWool = pocketMaterials[35, 13]
+pocketMaterials.RedWool = pocketMaterials[35, 14]
+pocketMaterials.BlackWool = pocketMaterials[35, 15]
 pocketMaterials.Flower = pocketMaterials[37, 0]
 pocketMaterials.Rose = pocketMaterials[38, 0]
 pocketMaterials.BrownMushroom = pocketMaterials[39, 0]
 pocketMaterials.RedMushroom = pocketMaterials[40, 0]
 pocketMaterials.BlockofGold = pocketMaterials[41, 0]
 pocketMaterials.BlockofIron = pocketMaterials[42, 0]
 pocketMaterials.DoubleStoneSlab = pocketMaterials[43, 0]
+pocketMaterials.DoubleSandstoneSlab = pocketMaterials[43, 1]
+pocketMaterials.DoubleWoodenSlab = pocketMaterials[43, 2]
+pocketMaterials.DoubleCobblestoneSlab = pocketMaterials[43, 3]
+pocketMaterials.DoubleBrickSlab = pocketMaterials[43, 4]
 pocketMaterials.StoneSlab = pocketMaterials[44, 0]
+pocketMaterials.SandstoneSlab = pocketMaterials[44, 1]
+pocketMaterials.WoodenSlab = pocketMaterials[44, 2]
+pocketMaterials.CobblestoneSlab = pocketMaterials[44, 3]
+pocketMaterials.BrickSlab = pocketMaterials[44, 4]
 pocketMaterials.Brick = pocketMaterials[45, 0]
 pocketMaterials.TNT = pocketMaterials[46, 0]
+pocketMaterials.Bookshelf = pocketMaterials[47, 0]
+pocketMaterials.MossStone = pocketMaterials[48, 0]
 pocketMaterials.Obsidian = pocketMaterials[49, 0]
 
 pocketMaterials.Torch = pocketMaterials[50, 0]
 pocketMaterials.Fire = pocketMaterials[51, 0]
 pocketMaterials.WoodenStairs = pocketMaterials[53, 0]
 pocketMaterials.DiamondOre = pocketMaterials[56, 0]
 pocketMaterials.BlockofDiamond = pocketMaterials[57, 0]
+pocketMaterials.CraftingTable = pocketMaterials[58, 0]
 pocketMaterials.Farmland = pocketMaterials[60, 0]
 pocketMaterials.WoodenDoor = pocketMaterials[64, 0]
 pocketMaterials.Ladder = pocketMaterials[65, 0]
@@ -686,23 +713,12 @@ def defineShroomFaces(Shroom, id, name):
 pocketMaterials.SnowLayer = pocketMaterials[78, 0]
 pocketMaterials.Ice = pocketMaterials[79, 0]
 
+pocketMaterials.Snow = pocketMaterials[80, 0]
+pocketMaterials.Cactus = pocketMaterials[81, 0]
 pocketMaterials.Clay = pocketMaterials[82, 0]
 pocketMaterials.SugarCane = pocketMaterials[83, 0]
-pocketMaterials.BlackWool = pocketMaterials[101, 0]
-pocketMaterials.RedWool = pocketMaterials[102, 0]
-pocketMaterials.GreenWool = pocketMaterials[103, 0]
-pocketMaterials.BrownWool = pocketMaterials[104, 0]
-pocketMaterials.BlueWool = pocketMaterials[105, 0]
-pocketMaterials.PurpleWool = pocketMaterials[106, 0]
-pocketMaterials.CyanWool = pocketMaterials[107, 0]
-pocketMaterials.LightGrayWool = pocketMaterials[108, 0]
-pocketMaterials.GrayWool = pocketMaterials[109, 0]
-pocketMaterials.PinkWool = pocketMaterials[110, 0]
-pocketMaterials.LimeWool = pocketMaterials[111, 0]
-pocketMaterials.YellowWool = pocketMaterials[112, 0]
-pocketMaterials.LightBlueWool = pocketMaterials[113, 0]
-pocketMaterials.MagentaWool = pocketMaterials[114, 0]
-pocketMaterials.OrangeWool = pocketMaterials[115, 0]
+pocketMaterials.Fence = pocketMaterials[85, 0]
+pocketMaterials.FenceGate = pocketMaterials[107, 0]
 
 # print "\n".join(["pocketMaterials.{0} = pocketMaterials[{1},{2}]".format(
 #                      b.name.replace(" ", "").replace("(","").replace(")",""),

pocket.py

@@ -348,7 +348,7 @@ def getChunk(self, cx, cz):
 
     @classmethod
     def _isLevel(cls, filename):
-        clp = ("chunks.dat", "level.dat", "player.dat")
+        clp = ("chunks.dat", "level.dat")
 
         if not os.path.isdir(filename):
             f = os.path.basename(filename)
@@ -400,12 +400,18 @@ def isLoaded(self):
     def load(self):
         pass
 
+    def unload(self):
+        pass
+
     def decompress(self):
         pass
 
     def compress(self):
         pass
 
+    def compressedSize(self):
+        return 0
+
     def unpackChunkData(self):
         for key in ('SkyLight', 'BlockLight', 'Data'):
             dataArray = getattr(self, key)