diff --git a/overviewer_core/src/mc_id.h b/overviewer_core/src/mc_id.h index 4764352..52c358d 100644 --- a/overviewer_core/src/mc_id.h +++ b/overviewer_core/src/mc_id.h @@ -409,6 +409,8 @@ enum mc_block_id { block_packed_mud = 1122, block_mud_bricks = 1123, block_mud_brick_slab = 1124, + block_mangrove_roots = 1125, + block_mangrove_log = 1126, // adding a gap in the numbering of walls to keep them all // in one numbering block starting at 1792 diff --git a/overviewer_core/src/overviewer.h b/overviewer_core/src/overviewer.h index c77c68c..594585e 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 extension // and want to force users to rebuild -#define OVERVIEWER_EXTENSION_VERSION 111 +#define OVERVIEWER_EXTENSION_VERSION 112 #include #include diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index 7124f6f..e6b36b0 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -1097,7 +1097,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, 11306, 11307, 11308, 11309, 11310, 11311, 1008, 1009], +@material(blockid=[17, 162, 11306, 11307, 11308, 11309, 11310, 11311, 1008, 1009, 1126], data=list(range(12)), solid=True) def wood(self, blockid, data): # extract orientation and wood type frorm data bits @@ -1163,7 +1163,11 @@ def wood(self, blockid, data): 1: ("stripped_warped_stem.png", None), 2: ("crimson_stem.png", None), 3: ("stripped_crimson_stem.png", None), - } + }, + 1126: { + 0: ("mangrove_log_top.png", "mangrove_log.png"), + 1: ("stripped_mangrove_log_top.png", "stripped_mangrove_log.png"), + }, } top_f, side_f = wood_tex[blockid].get(wood_type, wood_tex[blockid][0]) @@ -1200,6 +1204,8 @@ def leaves(self, blockid, data): t = self.load_image_texture("assets/minecraft/textures/block/flowering_azalea_leaves.png") elif (blockid, data) == (18, 7): t = self.load_image_texture("assets/minecraft/textures/block/azalea_leaves.png") + elif (blockid, data) == (18, 8): + t = self.load_image_texture("assets/minecraft/textures/block/mangrove_leaves.png") return self.build_block(t, t) # sponge @@ -6380,3 +6386,5 @@ def spore_blossom(self, blockid, data): block(blockid=1121, top_image="assets/minecraft/textures/block/mud.png") block(blockid=1122, top_image="assets/minecraft/textures/block/packed_mud.png") block(blockid=1123, top_image="assets/minecraft/textures/block/mud_bricks.png") +block(blockid=1125, top_image="assets/minecraft/textures/block/mangrove_roots_top.png", + side_image="assets/minecraft/textures/block/mangrove_roots_side.png") diff --git a/overviewer_core/world.py b/overviewer_core/world.py index 3f04b0b..17839f5 100644 --- a/overviewer_core/world.py +++ b/overviewer_core/world.py @@ -345,6 +345,7 @@ class RegionSet(object): 'minecraft:dark_oak_leaves': (18, 5), 'minecraft:flowering_azalea_leaves': (18, 6), 'minecraft:azalea_leaves': (18, 7), + 'minecraft:mangrove_leaves': (18, 8), 'minecraft:sponge': (19, 0), 'minecraft:wet_sponge': (19, 1), 'minecraft:glass': (20, 0), @@ -868,6 +869,9 @@ class RegionSet(object): 'minecraft:packed_mud': (1122, 0), 'minecraft:mud_bricks': (1123, 0), 'minecraft:mud_brick_slab': (1124, 0), + 'minecraft:mangrove_roots': (1125, 0), + 'minecraft:mangrove_log': (1126, 0), + 'minecraft:stripped_mangrove_log': (1126, 1), # New blocks 'minecraft:carved_pumpkin': (11300, 0),