From 3fc97d131ec1621526187a89fbd1e1be52ac4b7f Mon Sep 17 00:00:00 2001 From: Nicolas F Date: Sun, 28 Apr 2019 12:55:14 +0200 Subject: [PATCH] Add fletching, cartography and smithing tables --- overviewer_core/textures.py | 32 ++++++++++++++++++++++++++++++++ overviewer_core/world.py | 21 ++++++++++++--------- 2 files changed, 44 insertions(+), 9 deletions(-) diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index 5d16124..e8bdd4a 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -2326,6 +2326,38 @@ def crafting_table(self, blockid, data): img = self.build_full_block(top, None, None, side3, side4, None) return img +# fletching table +@material(blockid=11359, solid=True, nodata=True) +def fletching_table(self, blockid, data): + top = self.load_image_texture("assets/minecraft/textures/block/fletching_table_top.png") + side3 = self.load_image_texture("assets/minecraft/textures/block/fletching_table_side.png") + side4 = self.load_image_texture("assets/minecraft/textures/block/fletching_table_front.png") + + img = self.build_full_block(top, None, None, side3, side4, None) + return img + +# cartography table +@material(blockid=11360, solid=True, nodata=True) +def cartography_table(self, blockid, data): + top = self.load_image_texture("assets/minecraft/textures/block/cartography_table_top.png") + side1 = self.load_image_texture("assets/minecraft/textures/block/cartography_table_side3.png") + side2 = side1 + side3 = self.load_image_texture("assets/minecraft/textures/block/cartography_table_side2.png") + side4 = self.load_image_texture("assets/minecraft/textures/block/cartography_table_side1.png").transpose(Image.FLIP_LEFT_RIGHT) + + img = self.build_full_block(top, side1, side2, side3, side4, None) + return img + +# smithing table +@material(blockid=11361, solid=True, nodata=True) +def smithing_table(self, blockid, data): + top = self.load_image_texture("assets/minecraft/textures/block/smithing_table_top.png") + side3 = self.load_image_texture("assets/minecraft/textures/block/smithing_table_side.png") + side4 = self.load_image_texture("assets/minecraft/textures/block/smithing_table_front.png") + + img = self.build_full_block(top, None, None, side3, side4, None) + return img + # crops with 8 data values (like wheat) @material(blockid=59, data=range(8), transparent=True, nospawn=True) def crops8(self, blockid, data): diff --git a/overviewer_core/world.py b/overviewer_core/world.py index aed19b9..9f91efc 100644 --- a/overviewer_core/world.py +++ b/overviewer_core/world.py @@ -787,15 +787,18 @@ class RegionSet(object): "minecraft:polished_diorite_slab": (11347, 0), "minecraft:polished_granite_slab": (11348, 0), "minecraft:red_nether_brick_slab": (11349, 0), - "minecraft:smooth_sandstone_slab": (11350,0), - "minecraft:cut_sandstone_slab": (11351,0), - "minecraft:smooth_red_sandstone_slab": (11352,0), - "minecraft:cut_red_sandstone_slab": (11353,0), - "minecraft:end_stone_brick_slab": (11354,0), - "minecraft:mossy_cobblestone_slab": (11355,0), - "minecraft:mossy_stone_brick_slab": (11356,0), - "minecraft:smooth_quartz_slab": (11357,0), - "minecraft:smooth_stone_slab": (11358,0), + "minecraft:smooth_sandstone_slab": (11350, 0), + "minecraft:cut_sandstone_slab": (11351, 0), + "minecraft:smooth_red_sandstone_slab": (11352, 0), + "minecraft:cut_red_sandstone_slab": (11353, 0), + "minecraft:end_stone_brick_slab": (11354, 0), + "minecraft:mossy_cobblestone_slab": (11355, 0), + "minecraft:mossy_stone_brick_slab": (11356, 0), + "minecraft:smooth_quartz_slab": (11357, 0), + "minecraft:smooth_stone_slab": (11358, 0), + "minecraft:fletching_table": (11359, 0), + "minecraft:cartography_table": (11360, 0), + "minecraft:smithing_table": (11361, 0), } colors = [ 'white', 'orange', 'magenta', 'light_blue',