diff --git a/overviewer_core/src/block_class.c b/overviewer_core/src/block_class.c index d9e9b0b..2729916 100644 --- a/overviewer_core/src/block_class.c +++ b/overviewer_core/src/block_class.c @@ -341,7 +341,8 @@ const mc_block_t block_class_alt_height[] = { block_cobbled_deepslate_slab, block_polished_deepslate_slab, block_deepslate_brick_slab, - block_deepslate_tile_slab}; + block_deepslate_tile_slab, + block_mud_brick_slab}; const size_t block_class_alt_height_len = COUNT_OF(block_class_alt_height); const mc_block_t block_class_nether_roof[] = { diff --git a/overviewer_core/src/mc_id.h b/overviewer_core/src/mc_id.h index 025d6f2..4764352 100644 --- a/overviewer_core/src/mc_id.h +++ b/overviewer_core/src/mc_id.h @@ -405,6 +405,11 @@ enum mc_block_id { block_glow_lichen = 1119, block_spore_blossom = 1120, + block_mud = 1121, + block_packed_mud = 1122, + block_mud_bricks = 1123, + block_mud_brick_slab = 1124, + // adding a gap in the numbering of walls to keep them all // in one numbering block starting at 1792 // all blocks between 1792 and 2047 are considered walls diff --git a/overviewer_core/src/overviewer.h b/overviewer_core/src/overviewer.h index a8b9c88..c77c68c 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 110 +#define OVERVIEWER_EXTENSION_VERSION 111 #include #include diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index 0141b8f..7124f6f 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -1698,10 +1698,10 @@ block(blockid=42, top_image="assets/minecraft/textures/block/iron_block.png") # double slabs and slabs # these wooden slabs are unobtainable without cheating, they are still # here because lots of pre-1.3 worlds use this blocks, add prismarine slabs -@material(blockid=[43, 44, 181, 182, 204, 205] + list(range(11340, 11359)) + +@material(blockid=[43, 44, 181, 182, 204, 205, 1124] + list(range(11340, 11359)) + list(range(1027, 1030)) + list(range(1072, 1080)) + list(range(1103, 1107)), data=list(range(16)), - transparent=[44, 182, 205] + list(range(11340, 11359)) + list(range(1027, 1030)) + + transparent=[44, 182, 205, 1124] + list(range(11340, 11359)) + list(range(1027, 1030)) + list(range(1072, 1080)) + list(range(1103, 1107)), solid=True) def slabs(self, blockid, data): if blockid == 44 or blockid == 182: @@ -1818,6 +1818,8 @@ def slabs(self, blockid, data): 1106: "assets/minecraft/textures/block/deepslate_tiles.png", } top = side = self.load_image_texture(deepslate_tex[blockid]).copy() + elif blockid == 1124: + top = side = self.load_image_texture("assets/minecraft/textures/block/mud_bricks.png").copy() if blockid == 43 or blockid == 181 or blockid == 204: # double slab return self.build_block(top, side) @@ -6374,3 +6376,7 @@ def spore_blossom(self, blockid, data): alpha_over(img, base_top, (0, 0), base_top) return img + +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") diff --git a/overviewer_core/world.py b/overviewer_core/world.py index 9701c70..34cd2d6 100644 --- a/overviewer_core/world.py +++ b/overviewer_core/world.py @@ -863,6 +863,12 @@ class RegionSet(object): 'minecraft:glow_lichen': (1119, 0), 'minecraft:spore_blossom': (1120, 0), + # 1.19 blocks + 'minecraft:mud': (1121, 0), + 'minecraft:packed_mud': (1122, 0), + 'minecraft:mud_bricks': (1123, 0), + 'minecraft:mud_brick_slab': (1124, 0), + # New blocks 'minecraft:carved_pumpkin': (11300, 0), 'minecraft:spruce_pressure_plate': (11301, 0), @@ -1053,7 +1059,7 @@ class RegionSet(object): 'minecraft:blackstone_slab','minecraft:polished_blackstone_slab', 'minecraft:polished_blackstone_brick_slab', 'minecraft:cobbled_deepslate_slab', 'minecraft:polished_deepslate_slab', 'minecraft:deepslate_brick_slab', - 'minecraft:deepslate_tile_slab' + 'minecraft:deepslate_tile_slab', 'minecraft:mud_brick_slab' ) prismarine_slabs = ('minecraft:prismarine_slab','minecraft:dark_prismarine_slab','minecraft:prismarine_brick_slab') @@ -1201,6 +1207,9 @@ class RegionSet(object): elif key == 'minecraft:deepslate_tile_slab': block = 1096 # 'minecraft:deepslate_tiles' data = 0 + elif key == 'minecraft:mud_brick_slab': + block = 1123 # 'minecraft:mud_bricks + data = 0 elif key in prismarine_slabs: block = 168 # minecraft:prismarine variants