LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Uncarved pumpkin textures

Browse Source
This commit is contained in:
James Miller
2018-12-14 23:08:33 -08:00
parent 39c006886d
commit b282bec2cf
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
overviewer_core/textures.py
View File

@@ -2985,7 +2985,7 @@ def fence(self, blockid, data):
return img return img
# pumpkin # pumpkin
@material(blockid=[86, 91], data=range(4), solid=True) @material(blockid=[86, 91,11300], data=range(4), solid=True)
def pumpkin(self, blockid, data): # pumpkins, jack-o-lantern def pumpkin(self, blockid, data): # pumpkins, jack-o-lantern
# rotation # rotation
if self.rotation == 1: if self.rotation == 1:
@@ -3006,7 +3006,10 @@ def pumpkin(self, blockid, data): # pumpkins, jack-o-lantern
# texture generation # texture generation
top = self.load_image_texture("assets/minecraft/textures/block/pumpkin_top.png") top = self.load_image_texture("assets/minecraft/textures/block/pumpkin_top.png")
frontName = "assets/minecraft/textures/block/carved_pumpkin.png" if blockid == 86 else "assets/minecraft/textures/block/jack_o_lantern.png" frontName = {86: "assets/minecraft/textures/block/pumpkin_side.png",
91: "assets/minecraft/textures/block/jack_o_lantern.png",
11300: "assets/minecraft/textures/block/carved_pumpkin.png"
}[blockid]
front = self.load_image_texture(frontName) front = self.load_image_texture(frontName)
side = self.load_image_texture("assets/minecraft/textures/block/pumpkin_side.png") side = self.load_image_texture("assets/minecraft/textures/block/pumpkin_side.png")

4
overviewer_core/world.py
View File

@@ -457,7 +457,6 @@ class RegionSet(object):
'minecraft:jukebox': (84, 0), 'minecraft:jukebox': (84, 0),
'minecraft:oak_fence': (85, 0), 'minecraft:oak_fence': (85, 0),
'minecraft:pumpkin': (86, 0), 'minecraft:pumpkin': (86, 0),
'minecraft:carved_pumpkin': (86, 0),
'minecraft:netherrack': (87, 0), 'minecraft:netherrack': (87, 0),
'minecraft:soul_sand': (88, 0), 'minecraft:soul_sand': (88, 0),
'minecraft:glowstone': (89, 0), 'minecraft:glowstone': (89, 0),
@@ -734,6 +733,9 @@ class RegionSet(object):
'minecraft:tube_coral_block': (8, 0), 'minecraft:tube_coral_block': (8, 0),
'minecraft:tube_coral_fan': (8, 0), 'minecraft:tube_coral_fan': (8, 0),
'minecraft:tube_coral_wall_fan': (8, 0), 'minecraft:tube_coral_wall_fan': (8, 0),
#New blocks
'minecraft:carved_pumpkin': (11300, 0),
} }
colors = [ 'white', 'orange', 'magenta', 'light_blue', colors = [ 'white', 'orange', 'magenta', 'light_blue',