From 446916540a7e54ea05c3627a2cfb1488c312beb7 Mon Sep 17 00:00:00 2001 From: James Miller Date: Fri, 14 Dec 2018 23:40:21 -0800 Subject: [PATCH] non-oak pressure plates --- overviewer_core/textures.py | 21 ++++++++++++--------- overviewer_core/world.py | 10 +++++----- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index 69b921c..17562ff 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -2692,16 +2692,19 @@ def levers(self, blockid, data): return img # wooden and stone pressure plates, and weighted pressure plates -@material(blockid=[70, 72,147,148], data=[0,1], transparent=True) +@material(blockid=[70, 72,147,148,11301,11302,11303,11304,11305], data=[0,1], transparent=True) def pressure_plate(self, blockid, data): - if blockid == 70: # stone - t = self.load_image_texture("assets/minecraft/textures/block/stone.png").copy() - elif blockid == 72: # wooden - t = self.load_image_texture("assets/minecraft/textures/block/oak_planks.png").copy() - elif blockid == 147: # light golden - t = self.load_image_texture("assets/minecraft/textures/block/gold_block.png").copy() - else: # blockid == 148: # heavy iron - t = self.load_image_texture("assets/minecraft/textures/block/iron_block.png").copy() + texture_name = {70:"assets/minecraft/textures/block/stone.png", # stone + 72:"assets/minecraft/textures/block/oak_planks.png", # oak + 11301:"assets/minecraft/textures/block/spruce_planks.png", # spruce + 11302:"assets/minecraft/textures/block/birch_planks.png", # birch + 11303:"assets/minecraft/textures/block/jungle_planks.png", # jungle + 11304:"assets/minecraft/textures/block/acacia_planks.png", # acacia + 11305:"assets/minecraft/textures/block/dark_oak_planks.png", # dark oak + 147:"assets/minecraft/textures/block/gold_block.png", # light golden + 148:"assets/minecraft/textures/block/iron_block.png", # heavy iron + }[blockid] + t = self.load_image_texture(texture_name).copy() # cut out the outside border, pressure plates are smaller # than a normal block diff --git a/overviewer_core/world.py b/overviewer_core/world.py index 9d5282a..1638c3f 100644 --- a/overviewer_core/world.py +++ b/overviewer_core/world.py @@ -439,11 +439,6 @@ class RegionSet(object): 'minecraft:stone_pressure_plate': (70, 0), 'minecraft:iron_door': (71, 0), 'minecraft:oak_pressure_plate': (72, 0), - 'minecraft:spruce_pressure_plate': (72, 0), #new textures needed - 'minecraft:birch_pressure_plate': (72, 0), - 'minecraft:jungle_pressure_plate': (72, 0), - 'minecraft:acacia_pressure_plate': (72, 0), - 'minecraft:dark_oak_pressure_plate': (72, 0), 'minecraft:redstone_ore': (73, 0), 'minecraft:redstone_wall_torch': (75, 0), 'minecraft:redstone_torch': (75, 5), @@ -736,6 +731,11 @@ class RegionSet(object): #New blocks 'minecraft:carved_pumpkin': (11300, 0), + 'minecraft:spruce_pressure_plate': (11301, 0), + 'minecraft:birch_pressure_plate': (11302, 0), + 'minecraft:jungle_pressure_plate': (11303, 0), + 'minecraft:acacia_pressure_plate': (11304, 0), + 'minecraft:dark_oak_pressure_plate': (11305, 0), } colors = [ 'white', 'orange', 'magenta', 'light_blue',