From b282bec2cf63bf440449e7539af48dc7dff0de83 Mon Sep 17 00:00:00 2001 From: James Miller Date: Fri, 14 Dec 2018 23:08:33 -0800 Subject: [PATCH] Uncarved pumpkin textures --- overviewer_core/textures.py | 7 +++++-- overviewer_core/world.py | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index 3df55e7..69b921c 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -2985,7 +2985,7 @@ def fence(self, blockid, data): return img # 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 # rotation if self.rotation == 1: @@ -3006,7 +3006,10 @@ def pumpkin(self, blockid, data): # pumpkins, jack-o-lantern # texture generation 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) side = self.load_image_texture("assets/minecraft/textures/block/pumpkin_side.png") diff --git a/overviewer_core/world.py b/overviewer_core/world.py index 2e08a48..9d5282a 100644 --- a/overviewer_core/world.py +++ b/overviewer_core/world.py @@ -457,7 +457,6 @@ class RegionSet(object): 'minecraft:jukebox': (84, 0), 'minecraft:oak_fence': (85, 0), 'minecraft:pumpkin': (86, 0), - 'minecraft:carved_pumpkin': (86, 0), 'minecraft:netherrack': (87, 0), 'minecraft:soul_sand': (88, 0), 'minecraft:glowstone': (89, 0), @@ -734,6 +733,9 @@ class RegionSet(object): 'minecraft:tube_coral_block': (8, 0), 'minecraft:tube_coral_fan': (8, 0), 'minecraft:tube_coral_wall_fan': (8, 0), + + #New blocks + 'minecraft:carved_pumpkin': (11300, 0), } colors = [ 'white', 'orange', 'magenta', 'light_blue',