Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #102 from zhuowei/penewmaterials

Update for the new Minecraft PE updates
  • Loading branch information...
commit bfba132452cb955e020e9e78d39d3577a426586e 2 parents 253597f + b6a490f
@TkTech TkTech authored
Showing with 205 additions and 182 deletions.
  1. +32 −16 materials.py
  2. +7 −1 pocket.py
  3. +166 −165 pocket.yaml
View
48 materials.py
@@ -657,8 +657,24 @@ 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]
@@ -666,9 +682,19 @@ def defineShroomFaces(Shroom, id, name):
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]
@@ -676,6 +702,7 @@ def defineShroomFaces(Shroom, id, name):
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(")",""),
View
8 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)
View
331 pocket.yaml
@@ -211,12 +211,12 @@ blocks:
name: Lapis Lazuli Ore
mapcolor: [27, 70, 161]
tex: [0, 10]
-#
-# - id: 22
-# idStr: LAPIS_LAZULI_BLOCK
-# name: Lapis Lazuli Block
-# mapcolor: [0, 0, 0]
-# tex: [0, 9]
+
+ - id: 22
+ idStr: LAPIS_LAZULI_BLOCK
+ name: Lapis Lazuli Block
+ mapcolor: [0, 0, 0]
+ tex: [0, 9]
#
# - id: 23
# idStr: DISPENSER
@@ -351,9 +351,76 @@ blocks:
#
- id: 35
idStr: WOOL
- name: Black Wool 2
- mapcolor: [0, 0, 0]
- tex: [1, 7]
+ name: White Wool
+ mapcolor: [222, 222, 222]
+ tex: [0, 4]
+ data:
+ 0:
+ tex: [0, 4]
+ name: White Wool
+ mapcolor: [222, 222, 222]
+ 1:
+ tex: [2, 13]
+ name: Orange Wool
+ mapcolor: [234, 127, 55]
+ 2:
+ tex: [2, 12]
+ name: Magenta Wool
+ mapcolor: [191, 75, 201]
+ 3:
+ tex: [2, 11]
+ name: Light Blue Wool
+ aka: Aqua Wool
+ mapcolor: [104, 139, 212]
+ 4:
+ tex: [2, 10]
+ name: Yellow Wool
+ mapcolor: [104, 139, 212]
+ 5:
+ tex: [2, 9]
+ name: Lime Wool
+ mapcolor: [59, 189, 48]
+ 6:
+ tex: [2, 8]
+ name: Pink Wool
+ mapcolor: [217, 131, 155]
+ 7:
+ tex: [2, 7]
+ name: Gray Wool
+ mapcolor: [66, 66, 66]
+ 8:
+ tex: [1, 14]
+ name: Light Gray Wool
+ mapcolor: [166, 166, 166]
+ 9:
+ tex: [1, 13]
+ name: Cyan Wool
+ mapcolor: [39, 117, 149]
+ 10:
+ tex: [1, 12]
+ name: Purple Wool
+ aka: Indigo Wool, Violet Wool
+ mapcolor: [129, 54, 196]
+ 11:
+ tex: [1, 11]
+ name: Blue Wool
+ mapcolor: [39, 51, 161]
+ 12:
+ tex: [1, 10]
+ name: Brown Wool
+ mapcolor: [86, 51, 28]
+ 13:
+ tex: [1, 9]
+ name: Green Wool
+ mapcolor: [56, 77, 24]
+ 14:
+ tex: [1, 8]
+ name: Red Wool
+ mapcolor: [164, 45, 41]
+ 15:
+ tex: [1, 7]
+ name: Black Wool
+ mapcolor: [0, 0, 0]
- id: 37
idStr: YELLOW_FLOWER
@@ -411,22 +478,22 @@ blocks:
BACKWARD: [5, 0]
SIDES: [5, 0]
-# data:
-# 0:
-# tex: [5, 0]
-# name: Double Stone Slab
-# 1:
-# tex: [0, 12]
-# name: Double Sandstone Slab
-# 2:
-# tex: [4, 0]
-# name: Double Wooden Slab
-# 3:
-# tex: [0, 1]
-# name: Double Cobblestone Slab
-# 4:
-# tex: [7, 0]
-# name: Double Brick Slab
+ data:
+ 0:
+ tex: [5, 0]
+ name: Double Stone Slab
+ 1:
+ tex: [0, 12]
+ name: Double Sandstone Slab
+ 2:
+ tex: [4, 0]
+ name: Double Wooden Slab
+ 3:
+ tex: [0, 1]
+ name: Double Cobblestone Slab
+ 4:
+ tex: [7, 0]
+ name: Double Brick Slab
# 5:
# tex: [6, 3]
# name: Double Stone Brick Slab
@@ -445,22 +512,22 @@ blocks:
SIDES: [5, 0]
type: HALFHEIGHT
-# data:
-# 0:
-# tex: [6, 0]
-# name: Stone Slab
-# 1:
-# tex: [0, 12]
-# name: Sandstone Slab
-# 2:
-# tex: [4, 0]
-# name: Wooden Slab
-# 3:
-# tex: [0, 1]
-# name: Cobblestone Slab
-# 4:
-# tex: [7, 0]
-# name: Brick Slab
+ data:
+ 0:
+ tex: [6, 0]
+ name: Stone Slab
+ 1:
+ tex: [0, 12]
+ name: Sandstone Slab
+ 2:
+ tex: [4, 0]
+ name: Wooden Slab
+ 3:
+ tex: [0, 1]
+ name: Cobblestone Slab
+ 4:
+ tex: [7, 0]
+ name: Brick Slab
# 5:
# tex: [6, 3]
# name: Stone Brick Slab
@@ -479,23 +546,23 @@ blocks:
tex_direction:
TOP: [9, 0]
BOTTOM: [10, 0]
-#
-# - id: 47
-# idStr: BOOKSHELF
-# name: Bookshelf
-# mapcolor: [188, 152, 98]
-# tex: [3, 2]
-# tex_direction:
-# TOP: [4, 0]
-# BOTTOM: [4, 0]
-#
-# - id: 48
-# idStr: MOSSY_COBBLESTONE
-# name: Moss Stone
-# aka: Mossy Cobblestone
-# mapcolor: [115, 169, 115]
-# tex: [4, 2]
-#
+
+ - id: 47
+ idStr: BOOKSHELF
+ name: Bookshelf
+ mapcolor: [188, 152, 98]
+ tex: [3, 2]
+ tex_direction:
+ TOP: [4, 0]
+ BOTTOM: [4, 0]
+
+ - id: 48
+ idStr: MOSSY_COBBLESTONE
+ name: Moss Stone
+ aka: Mossy Cobblestone
+ mapcolor: [115, 169, 115]
+ tex: [4, 2]
+
- id: 49
idStr: OBSIDIAN
name: Obsidian
@@ -570,16 +637,16 @@ blocks:
name: Block of Diamond
mapcolor: [45, 166, 152]
tex: [8, 1]
-#
-# - id: 58
-# idStr: WORKBENCH
-# name: Bench
-# mapcolor: [114, 88, 56]
-# tex: [12, 3]
-# tex_direction:
-# SIDES: [11, 3]
-# TOP: [11, 2]
-# BOTTOM: [4, 0]
+
+ - id: 58
+ idStr: WORKBENCH
+ name: Bench
+ mapcolor: [114, 88, 56]
+ tex: [12, 3]
+ tex_direction:
+ SIDES: [11, 3]
+ TOP: [11, 2]
+ BOTTOM: [4, 0]
#
# - id: 59
# idStr: CROPS
@@ -778,23 +845,23 @@ blocks:
tex: [3, 4]
type: WATER
opacity: 3
-#
-# - id: 80
-# idStr: SNOW_BLOCK
-# name: Snow
-# mapcolor: [250, 250, 250]
-# tex: [2, 4]
-#
-# - id: 81
-# idStr: CACTUS
-# name: Cactus
-# mapcolor: [25, 120, 25]
-# tex: [6, 4]
-# tex_direction:
-# TOP: [5, 4]
-# BOTTOM: [5, 4]
-# opacity: 0
-#
+
+ - id: 80
+ idStr: SNOW_BLOCK
+ name: Snow
+ mapcolor: [250, 250, 250]
+ tex: [2, 4]
+
+ - id: 81
+ idStr: CACTUS
+ name: Cactus
+ mapcolor: [25, 120, 25]
+ tex: [6, 4]
+ tex_direction:
+ TOP: [5, 4]
+ BOTTOM: [5, 4]
+ opacity: 0
+
- id: 82
idStr: CLAY
name: Clay
@@ -808,87 +875,21 @@ blocks:
tex: [9, 4]
type: DECORATION_CROSS
opacity: 0
-
- - id: 101
- tex: [1, 7]
- name: Black Wool
- mapcolor: [0, 0, 0]
+
+ - id: 85
+ idStr: FENCE
+ name: Fence
+ mapcolor: [157, 128, 79]
+ tex: [4, 0]
+ type: FENCE
+ opacity: 0
- - id: 102
- tex: [1, 8]
- name: Red Wool
- mapcolor: [164, 45, 41]
-
- - id: 103
- tex: [1, 9]
- name: Green Wool
- mapcolor: [56, 77, 24]
-
- - id: 104
- tex: [1, 10]
- name: Brown Wool
- mapcolor: [86, 51, 28]
-
- - id: 105
- tex: [1, 11]
- name: Blue Wool
- mapcolor: [39, 51, 161]
-
- - id: 106
- tex: [1, 12]
- name: Purple Wool
- mapcolor: [129, 54, 196]
-
- id: 107
- tex: [1, 13]
- name: Cyan Wool
- mapcolor: [39, 117, 149]
-
- - id: 108
- tex: [1, 14]
- name: Light Gray Wool
- aka: White Wool
- mapcolor: [166, 166, 166]
-
- - id: 109
- tex: [2, 7]
- name: Gray Wool
- mapcolor: [66, 66, 66]
-
- - id: 110
- tex: [2, 8]
- name: Pink Wool
- mapcolor: [217, 131, 155]
-
- - id: 111
- tex: [2, 9]
- name: Lime Wool
- mapcolor: [59, 189, 48]
-
- - id: 112
- tex: [2, 10]
- name: Yellow Wool
- mapcolor: [104, 139, 212]
-
- - id: 113
- tex: [2, 11]
- name: Light Blue Wool
- aka: Aqua Wool
- mapcolor: [104, 139, 212]
-
- - id: 114
- tex: [2, 12]
- name: Magenta Wool
- mapcolor: [191, 75, 201]
-
- - id: 115
- tex: [2, 13]
- name: Orange Wool
- mapcolor: [234, 127, 55]
-
-# - id: 116?
-# tex: [0, 4]
-# name: White Wool
-# mapcolor: [222, 222, 222]
+ idStr: FENCE_GATE
+ name: Fence Gate
+ mapcolor: [157, 128, 79]
+ tex: [4, 0]
+ type: FENCE_GATE
+ opacity: 0
...
Please sign in to comment.
Something went wrong with that request. Please try again.