LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge branch 'patch-3' of git://github.com/tazorax/Minecraft-Overviewer

Browse Source
This commit is contained in:
Aaron Griffith
2016-06-10 20:43:14 -04:00
parent 125c87b195 218b0a5996
commit 7bbc3bd4d4
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
overviewer_core/textures.py
View File

@@ -4062,12 +4062,15 @@ def beacon(self, blockid, data):
return img return img
# cobblestone and mossy cobblestone walls # cobblestone and mossy cobblestone walls, chorus plants
# one additional bit of data value added for mossy and cobblestone # one additional bit of data value added for mossy and cobblestone
@material(blockid=139, data=range(32), transparent=True, nospawn=True) @material(blockid=[139, 199], data=range(32), transparent=True, nospawn=True)
def cobblestone_wall(self, blockid, data): def cobblestone_wall(self, blockid, data):
# chorus plants
if blockid == 199:
t = self.load_image_texture("assets/minecraft/textures/blocks/chorus_plant.png").copy()
# no rotation, uses pseudo data # no rotation, uses pseudo data
if data & 0b10000 == 0: elif data & 0b10000 == 0:
# cobblestone # cobblestone
t = self.load_image_texture("assets/minecraft/textures/blocks/cobblestone.png").copy() t = self.load_image_texture("assets/minecraft/textures/blocks/cobblestone.png").copy()
else: else:
@@ -4448,6 +4451,17 @@ def flower(self, blockid, data):
return img return img
# chorus flower
@material(blockid=200, data=range(6), solid=True)
def chorus_flower(self, blockid, data):
# aged 5, dead
if data == 5:
texture = self.load_image_texture("assets/minecraft/textures/blocks/chorus_flower_dead.png")
else:
texture = self.load_image_texture("assets/minecraft/textures/blocks/chorus_flower.png")
return self.build_block(texture,texture)
# purpur block # purpur block
block(blockid=201, top_image="assets/minecraft/textures/blocks/purpur_block.png") block(blockid=201, top_image="assets/minecraft/textures/blocks/purpur_block.png")