From 73420851403cbb7bdd39053175387f19ec8025ec Mon Sep 17 00:00:00 2001 From: Gijs Oortgiese Date: Wed, 21 Aug 2019 09:44:37 +0200 Subject: [PATCH] Created seperate sapling blocks and added bamboo_sapling --- overviewer_core/src/mc_id.h | 7 +++++++ overviewer_core/src/overviewer.h | 2 +- overviewer_core/textures.py | 8 ++++++++ overviewer_core/world.py | 14 ++++++++------ 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/overviewer_core/src/mc_id.h b/overviewer_core/src/mc_id.h index dc5981f..c95c159 100644 --- a/overviewer_core/src/mc_id.h +++ b/overviewer_core/src/mc_id.h @@ -305,6 +305,12 @@ enum mc_block_id { block_andesite_stairs = 11382, block_end_stone_brick_stairs = 11383, block_red_nether_brick_stairs = 11384, + block_oak_sapling = 11385, + block_spruce_sapling = 11386, + block_birch_sapling = 11387, + block_jungle_sapling = 11388, + block_acacia_sapling = 11389, + block_dark_oak_sapling = 11390, block_oak_sign = 11401, block_spruce_sign = 11402, block_birch_sign = 11403, @@ -317,6 +323,7 @@ enum mc_block_id { block_jungle_wall_sign = 11410, block_acacia_wall_sign = 11411, block_dark_oak_wall_sign = 11412, + block_bamboo_sapling = 11413, }; typedef uint16_t mc_block_t; diff --git a/overviewer_core/src/overviewer.h b/overviewer_core/src/overviewer.h index f3250d6..6126365 100644 --- a/overviewer_core/src/overviewer.h +++ b/overviewer_core/src/overviewer.h @@ -31,7 +31,7 @@ // increment this value if you've made a change to the c extesion // and want to force users to rebuild -#define OVERVIEWER_EXTENSION_VERSION 74 +#define OVERVIEWER_EXTENSION_VERSION 75 #include #include diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index c6019e2..f2b428f 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -987,6 +987,14 @@ def saplings(self, blockid, data): tex = self.load_image_texture("assets/minecraft/textures/block/dark_oak_sapling.png") return self.build_sprite(tex) +sprite(blockid=11385, imagename="assets/minecraft/textures/block/oak_sapling.png") +sprite(blockid=11386, imagename="assets/minecraft/textures/block/spruce_sapling.png") +sprite(blockid=11387, imagename="assets/minecraft/textures/block/birch_sapling.png") +sprite(blockid=11388, imagename="assets/minecraft/textures/block/jungle_sapling.png") +sprite(blockid=11389, imagename="assets/minecraft/textures/block/acacia_sapling.png") +sprite(blockid=11390, imagename="assets/minecraft/textures/block/dark_oak_sapling.png") +sprite(blockid=11413, imagename="assets/minecraft/textures/block/bamboo_stage0.png") + # bedrock block(blockid=7, top_image="assets/minecraft/textures/block/bedrock.png") diff --git a/overviewer_core/world.py b/overviewer_core/world.py index 5cc259e..4e4b76f 100644 --- a/overviewer_core/world.py +++ b/overviewer_core/world.py @@ -314,12 +314,7 @@ class RegionSet(object): 'minecraft:jungle_planks': (5, 3), 'minecraft:acacia_planks': (5, 4), 'minecraft:dark_oak_planks': (5, 5), - 'minecraft:oak_sapling': (6, 0), - 'minecraft:spruce_sapling': (6, 1), - 'minecraft:birch_sapling': (6, 2), - 'minecraft:jungle_sapling': (6, 3), - 'minecraft:acacia_sapling': (6, 4), - 'minecraft:dark_oak_sapling': (6, 5), + 'minecraft:sapling': (6, 0), 'minecraft:bedrock': (7, 0), 'minecraft:water': (8, 0), 'minecraft:lava': (10, 0), @@ -831,6 +826,13 @@ class RegionSet(object): 'minecraft:andesite_stairs': (11382, 0), 'minecraft:end_stone_brick_stairs': (11383, 0), 'minecraft:red_nether_brick_stairs': (11384, 0), + 'minecraft:oak_sapling': (11385, 0), + 'minecraft:spruce_sapling': (11386, 0), + 'minecraft:birch_sapling': (11387, 0), + 'minecraft:jungle_sapling': (11388, 0), + 'minecraft:acacia_sapling': (11389, 0), + 'minecraft:dark_oak_sapling': (11390, 0), + 'minecraft:bamboo_sapling': (11413, 0), } colors = [ 'white', 'orange', 'magenta', 'light_blue',