diff --git a/.travis.yml b/.travis.yml index 7f3df87..b07f845 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ python: - "2.7" # - "3.2" env: - - MC_VERSION=1.9 + - MC_VERSION=1.10 before_install: - wget https://raw.githubusercontent.com/python-pillow/Pillow/master/libImaging/Imaging.h - wget https://raw.githubusercontent.com/python-pillow/Pillow/master/libImaging/ImPlatform.h diff --git a/overviewer_core/items.py b/overviewer_core/items.py index 77923e6..c4d058f 100644 --- a/overviewer_core/items.py +++ b/overviewer_core/items.py @@ -165,6 +165,10 @@ items = { 173: 'Block of Coal', 174: 'Packed Ice', 175: 'Large Flowers', + 213: 'Magma Block', + 214: 'Nether Wart Block', + 215: 'Red Nether Brick', + 216: 'Bone Block', 256: 'Iron Shovel', 257: 'Iron Pickaxe', 258: 'Iron Axe', diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index 13649e0..27e8a21 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -4476,6 +4476,7 @@ def purpur_pillar(self, blockid, data): elif pillar_orientation == 4: # east-west orientation return self.build_full_block(side.rotate(90), None, None, top, side.rotate(90)) elif pillar_orientation == 8: # north-south orientation + return self.build_full_block(side, None, None, side.rotate(270), top) # end brick @@ -4487,6 +4488,37 @@ def frosted_ice(self, blockid, data): img = self.load_image_texture("assets/minecraft/textures/blocks/frosted_ice_%d.png" % data) return self.build_block(img, img) +# magma block +block(blockid=213, top_image="assets/minecraft/textures/blocks/magma.png") + +# nether wart block +block(blockid=214, top_image="assets/minecraft/textures/blocks/nether_wart_block.png") + +# red nether brick +block(blockid=215, top_image="assets/minecraft/textures/blocks/red_nether_brick.png") + +@material(blockid=216, data=range(12), solid=True) +def boneblock(self, blockid, data): + # extract orientation + boneblock_orientation = data & 12 + if self.rotation == 1: + if boneblock_orientation == 4: boneblock_orientation = 8 + elif boneblock_orientation == 8: boneblock_orientation = 4 + elif self.rotation == 3: + if boneblock_orientation == 4: boneblock_orientation = 8 + elif boneblock_orientation == 8: boneblock_orientation = 4 + + top = self.load_image_texture("assets/minecraft/textures/blocks/bone_block_top.png") + side = self.load_image_texture("assets/minecraft/textures/blocks/bone_block_side.png") + + # choose orientation and paste textures + if boneblock_orientation == 0: + return self.build_block(top, side) + elif boneblock_orientation == 4: # east-west orientation + return self.build_full_block(side.rotate(90), None, None, top, side.rotate(90)) + elif boneblock_orientation == 8: # north-south orientation + return self.build_full_block(side, None, None, side.rotate(270), top) + # structure block @material(blockid=255, data=range(4), solid=True) def structure_block(self, blockid, data):