LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Tweak crop rendering

Browse Source 
Remote beetroot in preperation of bringing in patch
This commit is contained in:
Andrew Chin
2016-03-06 00:00:23 -05:00
parent 2c5971b5d8
commit db3c79a46e
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
overviewer_core/textures.py
View File

@@ -2156,9 +2156,9 @@ def crafting_table(self, blockid, data):
img = self.build_full_block(top, None, None, side3, side4, None) img = self.build_full_block(top, None, None, side3, side4, None)
return img return img
# crops # crops with 8 data values (like wheat)
@material(blockid=59, data=range(8), transparent=True, nospawn=True) @material(blockid=59, data=range(8), transparent=True, nospawn=True)
def crops(self, blockid, data): def crops8(self, blockid, data):
raw_crop = self.load_image_texture("assets/minecraft/textures/blocks/wheat_stage_%d.png" % data) raw_crop = self.load_image_texture("assets/minecraft/textures/blocks/wheat_stage_%d.png" % data)
crop1 = self.transform_image_top(raw_crop) crop1 = self.transform_image_top(raw_crop)
crop2 = self.transform_image_side(raw_crop) crop2 = self.transform_image_side(raw_crop)
@@ -4185,19 +4185,22 @@ def cobblestone_wall(self, blockid, data):
return img return img
# carrots, potatoes, and beetroot # carrots, potatoes
@material(blockid=[141,142,207], data=range(8), transparent=True, nospawn=True) @material(blockid=[141,142,207], data=range(8), transparent=True, nospawn=True)
def crops(self, blockid, data): def crops4(self, blockid, data):
if data != 7: # when growing they look the same # carrots and potatoes have 8 data, but only 4 visual stages
# data = 7 -> fully grown, everything else is growing stage = {0:0,
# this seems to work, but still not sure 1:0,
raw_crop = self.load_image_texture("assets/minecraft/textures/blocks/potatoes_stage_%d.png" % (data % 3)) 2:1,
elif blockid == 141: # carrots 3:1,
raw_crop = self.load_image_texture("assets/minecraft/textures/blocks/carrots_stage_3.png") 4:2,
elif blockid == 207: # beetroot 5:2,
raw_crop = self.load_image_texture("assets/minecraft/textures/blocks/beetroots_stage_3.png") 6:2,
7:3}[data]
if blockid == 141: # carrots
raw_crop = self.load_image_texture("assets/minecraft/textures/blocks/carrots_stage_%d.png" % stage)
else: # potatoes else: # potatoes
raw_crop = self.load_image_texture("assets/minecraft/textures/blocks/potatoes_stage_3.png") raw_crop = self.load_image_texture("assets/minecraft/textures/blocks/potatoes_stage_%d.png" % stage)
crop1 = self.transform_image_top(raw_crop) crop1 = self.transform_image_top(raw_crop)
crop2 = self.transform_image_side(raw_crop) crop2 = self.transform_image_side(raw_crop)
crop3 = crop2.transpose(Image.FLIP_LEFT_RIGHT) crop3 = crop2.transpose(Image.FLIP_LEFT_RIGHT)