diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index 17562ff..94c58b7 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -1077,7 +1077,7 @@ block(blockid=15, top_image="assets/minecraft/textures/block/iron_ore.png") # coal ore block(blockid=16, top_image="assets/minecraft/textures/block/coal_ore.png") -@material(blockid=[17,162], data=range(12), solid=True) +@material(blockid=[17,162,11306,11307], data=range(12), solid=True) def wood(self, blockid, data): # extract orientation and wood type frorm data bits wood_type = data & 3 @@ -1113,6 +1113,29 @@ def wood(self, blockid, data): else: top = self.load_image_texture("assets/minecraft/textures/block/acacia_log_top.png") side = self.load_image_texture("assets/minecraft/textures/block/acacia_log.png") + if blockid == 11306: # stripped regular wood: + if wood_type == 0: # normal + top = self.load_image_texture("assets/minecraft/textures/block/stripped_oak_log_top.png") + side = self.load_image_texture("assets/minecraft/textures/block/stripped_oak_log.png") + if wood_type == 1: # spruce + top = self.load_image_texture("assets/minecraft/textures/block/stripped_spruce_log_top.png") + side = self.load_image_texture("assets/minecraft/textures/block/stripped_spruce_log.png") + if wood_type == 2: # birch + top = self.load_image_texture("assets/minecraft/textures/block/stripped_birch_log_top.png") + side = self.load_image_texture("assets/minecraft/textures/block/stripped_birch_log.png") + if wood_type == 3: # jungle wood + top = self.load_image_texture("assets/minecraft/textures/block/stripped_jungle_log_top.png") + side = self.load_image_texture("assets/minecraft/textures/block/stripped_jungle_log.png") + elif blockid == 11307: # stripped acacia/dark wood: + if wood_type == 0: # acacia + top = self.load_image_texture("assets/minecraft/textures/block/stripped_acacia_log_top.png") + side = self.load_image_texture("assets/minecraft/textures/block/stripped_acacia_log.png") + elif wood_type == 1: # dark oak + top = self.load_image_texture("assets/minecraft/textures/block/stripped_dark_oak_log_top.png") + side = self.load_image_texture("assets/minecraft/textures/block/stripped_dark_oak_log.png") + else: + top = self.load_image_texture("assets/minecraft/textures/block/stripped_acacia_log_top.png") + side = self.load_image_texture("assets/minecraft/textures/block/stripped_acacia_log.png") # choose orientation and paste textures if wood_orientation == 0: diff --git a/overviewer_core/world.py b/overviewer_core/world.py index 1638c3f..03e9153 100644 --- a/overviewer_core/world.py +++ b/overviewer_core/world.py @@ -587,7 +587,6 @@ class RegionSet(object): 'minecraft:green_terracotta': (159, 13), 'minecraft:red_terracotta': (159, 14), 'minecraft:black_terracotta': (159, 15), - # What to do about stripped logs? 'minecraft:acacia_log': (162, 0), 'minecraft:dark_oak_log': (162, 1), 'minecraft:acacia_stairs': (163, 0), @@ -736,6 +735,12 @@ class RegionSet(object): 'minecraft:jungle_pressure_plate': (11303, 0), 'minecraft:acacia_pressure_plate': (11304, 0), 'minecraft:dark_oak_pressure_plate': (11305, 0), + 'minecraft:stripped_oak_log': (11306, 0), + 'minecraft:stripped_spruce_log': (11306, 1), + 'minecraft:stripped_birch_log': (11306, 2), + 'minecraft:stripped_jungle_log': (11306, 3), + 'minecraft:stripped_acacia_log': (11307, 0), + 'minecraft:stripped_dark_oak_log': (11307, 1), } colors = [ 'white', 'orange', 'magenta', 'light_blue',