diff --git a/overviewer_core/src/block_class.c b/overviewer_core/src/block_class.c index 5fc8b3a..c43cc1c 100644 --- a/overviewer_core/src/block_class.c +++ b/overviewer_core/src/block_class.c @@ -116,7 +116,15 @@ const mc_block_t block_class_stair[] = { block_smooth_sandstone_stairs, block_blackstone_stairs, block_polished_blackstone_stairs, - block_polished_blackstone_brick_stairs}; + block_polished_blackstone_brick_stairs, + block_cut_copper_stairs, + block_exposed_cut_copper_stairs, + block_weathered_cut_copper_stairs, + block_oxidized_cut_copper_stairs, + block_waxed_cut_copper_stairs, + block_waxed_exposed_cut_copper_stairs, + block_waxed_weathered_cut_copper_stairs, + block_waxed_oxidized_cut_copper_stairs}; const size_t block_class_stair_len = COUNT_OF(block_class_stair); const mc_block_t block_class_door[] = { @@ -199,6 +207,14 @@ const mc_block_t block_class_ancil[] = { block_blackstone_stairs, block_polished_blackstone_stairs, block_polished_blackstone_brick_stairs, + block_cut_copper_stairs, + block_exposed_cut_copper_stairs, + block_weathered_cut_copper_stairs, + block_oxidized_cut_copper_stairs, + block_waxed_cut_copper_stairs, + block_waxed_exposed_cut_copper_stairs, + block_waxed_weathered_cut_copper_stairs, + block_waxed_oxidized_cut_copper_stairs, block_grass, block_flowing_water, block_water, diff --git a/overviewer_core/src/mc_id.h b/overviewer_core/src/mc_id.h index f72c352..e8c0489 100644 --- a/overviewer_core/src/mc_id.h +++ b/overviewer_core/src/mc_id.h @@ -338,6 +338,16 @@ enum mc_block_id { block_raw_copper = 1062, block_copper_ore = 1063, + block_cut_copper_stairs = 1064, + block_exposed_cut_copper_stairs = 1065, + block_weathered_cut_copper_stairs = 1066, + block_oxidized_cut_copper_stairs = 1067, + + block_waxed_cut_copper_stairs = 1068, + block_waxed_exposed_cut_copper_stairs = 1069, + block_waxed_weathered_cut_copper_stairs = 1070, + block_waxed_oxidized_cut_copper_stairs = 1071, + // 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 511cf0e..a5a1658 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 102 +#define OVERVIEWER_EXTENSION_VERSION 103 #include #include diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index 83897d3..a686b3f 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -2029,9 +2029,11 @@ block(blockid=52, top_image="assets/minecraft/textures/block/spawner.png", trans # mossy brick and mossy cobblestone, stone smooth_quartz # polished_granite polished_andesite polished_diorite granite diorite andesite end_stone_bricks red_nether_brick stairs # smooth_red_sandstone blackstone polished_blackstone polished_blackstone_brick -@material(blockid=[53, 67, 108, 109, 114, 128, 134, 135, 136, 156, 163, 164, 180, 203, 509, 510, 11337, 11338, 11339, - 11370, 11371, 11374, 11375, 11376, 11377, 11378, 11379, 11380, 11381, 11382, 11383, 11384, 11415, - 1030, 1031, 1032], +# also all the copper variants +@material(blockid=[53, 67, 108, 109, 114, 128, 134, 135, 136, 156, 163, 164, 180, 203, 509, 510, + 11337, 11338, 11339, 11370, 11371, 11374, 11375, 11376, 11377, 11378, 11379, + 11380, 11381, 11382, 11383, 11384, 11415, 1030, 1031, 1032, 1064, 1065, 1066, + 1067, 1068, 1069, 1070, 1071], data=list(range(128)), transparent=True, solid=True, nospawn=True) def stairs(self, blockid, data): # preserve the upside-down bit @@ -2082,6 +2084,17 @@ def stairs(self, blockid, data): 1030: "assets/minecraft/textures/block/blackstone.png", 1031: "assets/minecraft/textures/block/polished_blackstone.png", 1032: "assets/minecraft/textures/block/polished_blackstone_bricks.png", + # Cut copper stairs + 1064: "assets/minecraft/textures/block/cut_copper.png", + 1065: "assets/minecraft/textures/block/exposed_cut_copper.png", + 1066: "assets/minecraft/textures/block/weathered_cut_copper.png", + 1067: "assets/minecraft/textures/block/oxidized_cut_copper.png", + # Waxed cut copper stairs + 1068: "assets/minecraft/textures/block/cut_copper.png", + 1069: "assets/minecraft/textures/block/exposed_cut_copper.png", + 1070: "assets/minecraft/textures/block/weathered_cut_copper.png", + 1071: "assets/minecraft/textures/block/oxidized_cut_copper.png", + } texture = self.load_image_texture(stair_id_to_tex[blockid]).copy() diff --git a/overviewer_core/world.py b/overviewer_core/world.py index c10bb8a..9687a9d 100644 --- a/overviewer_core/world.py +++ b/overviewer_core/world.py @@ -794,6 +794,14 @@ class RegionSet(object): 'minecraft:waxed_oxidized_cut_copper': (1061, 0), 'minecraft:raw_copper_block': (1062, 0), 'minecraft:copper_ore': (1063, 0), + 'minecraft:cut_copper_stairs': (1064, 0), + 'minecraft:exposed_cut_copper_stairs': (1065, 0), + 'minecraft:weathered_cut_copper_stairs': (1066, 0), + 'minecraft:oxidized_cut_copper_stairs': (1067, 0), + 'minecraft:waxed_cut_copper_stairs': (1068, 0), + 'minecraft:waxed_exposed_cut_copper_stairs': (1069, 0), + 'minecraft:waxed_weathered_cut_copper_stairs': (1070, 0), + 'minecraft:waxed_oxidized_cut_copper_stairs': (1071, 0), # New blocks 'minecraft:carved_pumpkin': (11300, 0),