removes all simple blocks from textures.py

Author: Lieuwe Westra

overviewer_core/src/block_class.c

@@ -162,6 +162,7 @@ const mc_block_t block_class_door[] = {
     block_acacia_door,
     block_dark_oak_door,
     block_crimson_door,
+    block_mangrove_door,
     block_warped_door};
 const size_t block_class_door_len = COUNT_OF(block_class_door);
 
@@ -174,6 +175,7 @@ const mc_block_t block_class_ancil[] = {
     block_acacia_door,
     block_dark_oak_door,
     block_crimson_door,
+    block_mangrove_door,
     block_oak_stairs,
     block_brick_stairs,
     block_stone_brick_stairs,
@@ -252,7 +254,8 @@ const mc_block_t block_class_ancil[] = {
     block_cobbled_deepslate_wall,
     block_polished_deepslate_wall,
     block_deepslate_brick_wall,
-    block_deepslate_tile_wall};
+    block_deepslate_tile_wall,
+    block_mud_brick_wall};
 const size_t block_class_ancil_len = COUNT_OF(block_class_ancil);
 
 const mc_block_t block_class_alt_height[] = {

overviewer_core/src/iterate.c

@@ -141,7 +141,6 @@ bool load_chunk(RenderState* state, int32_t x, int32_t z, uint8_t required) {
     x += state->chunkx;
     z += state->chunkz;
 
-    
     PyObject_CallMethod(state->regionset, "add_to_blockmap","O", model_blocks);
 
     chunk = PyObject_CallMethod(state->regionset, "get_chunk", "ii", x, z);

overviewer_core/src/mc_id.h

@@ -3,21 +3,18 @@
 
 #include <stdint.h>
 
+// enum to keep track of blocks that have special rendering effects
+
 enum mc_block_id {
     block_air = 0,
-    block_stone = 1,
     block_grass = 2,
-    block_dirt = 3,
     block_cobblestone = 4,
-    block_planks = 5,
     block_sapling = 6,
     block_bedrock = 7,
     block_flowing_water = 8,
     block_water = 9,
     block_flowing_lava = 10,
     block_lava = 11,
-    block_sand = 12,
-    block_gravel = 13,
     block_gold_ore = 14,
     block_iron_ore = 15,
     block_coal_ore = 16,
@@ -28,8 +25,6 @@ enum mc_block_id {
     block_lapis_ore = 21,
     block_lapis_block = 22,
     block_dispenser = 23,
-    block_sandstone = 24,
-    block_noteblock = 25,
     block_bed = 26,
     block_golden_rail = 27,
     block_detector_rail = 28,
@@ -39,7 +34,6 @@ enum mc_block_id {
     block_deadbush = 32,
     block_piston = 33,
     block_piston_head = 34,
-    block_wool = 35,
     block_yellow_flower = 37,
     block_red_flower = 38,
     block_brown_mushroom = 39,
@@ -48,11 +42,8 @@ enum mc_block_id {
     block_iron_block = 42,
     block_double_stone_slab = 43,
     block_stone_slab = 44,
-    block_brick_block = 45,
     block_tnt = 46,
-    block_bookshelf = 47,
     block_mossy_cobblestone = 48,
-    block_obsidian = 49,
     block_torch = 50,
     block_fire = 51,
     block_mob_spawner = 52,
@@ -61,7 +52,6 @@ enum mc_block_id {
     block_redstone_wire = 55,
     block_diamond_ore = 56,
     block_diamond_block = 57,
-    block_crafting_table = 58,
     block_wheat = 59,
     block_farmland = 60,
     block_furnace = 61,
@@ -77,22 +67,16 @@ enum mc_block_id {
     block_iron_door = 71,
     block_wooden_pressure_plate = 72,
     block_redstone_ore = 73,
-    block_lit_redstone_ore = 74,
     block_unlit_redstone_torch = 75,
     block_redstone_torch = 76,
     block_stone_button = 77,
     block_snow_layer = 78,
     block_ice = 79,
-    block_snow = 80,
     block_cactus = 81,
-    block_clay = 82,
     block_reeds = 83,
-    block_jukebox = 84,
     block_fence = 85,
-    block_pumpkin = 86,
     block_netherrack = 87,
     block_soul_sand = 88,
-    block_glowstone = 89,
     block_portal = 90,
     block_lit_pumpkin = 91,
     block_cake = 92,
@@ -101,21 +85,18 @@ enum mc_block_id {
     block_stained_glass = 95,
     block_trapdoor = 96,
     block_monster_egg = 97,
-    block_stonebrick = 98,
+    block_infested_stone_bricks = 98,
     block_brown_mushroom_block = 99,
     block_red_mushroom_block = 100,
     block_iron_bars = 101,
     block_glass_pane = 102,
-    block_melon_block = 103,
     block_pumpkin_stem = 104,
     block_melon_stem = 105,
     block_vine = 106,
     block_fence_gate = 107,
     block_brick_stairs = 108,
     block_stone_brick_stairs = 109,
-    block_mycelium = 110,
     block_waterlily = 111,
-    block_nether_brick = 112,
     block_nether_brick_fence = 113,
     block_nether_brick_stairs = 114,
     block_nether_wart = 115,
@@ -124,10 +105,8 @@ enum mc_block_id {
     block_cauldron = 118,
     block_end_portal = 119,
     block_end_portal_frame = 120,
-    block_end_stone = 121,
     block_dragon_egg = 122,
     block_redstone_lamp = 123,
-    block_lit_redstone_lamp = 124,
     block_double_wooden_slab = 125,
     block_wooden_slab = 126,
     block_cocoa = 127,
@@ -136,11 +115,9 @@ enum mc_block_id {
     block_ender_chest = 130,
     block_tripwire_hook = 131,
     block_tripwire_wire = 132,
-    block_emerald_block = 133,
     block_spruce_stairs = 134,
     block_birch_stairs = 135,
     block_jungle_stairs = 136,
-    block_command_block = 137,
     block_beacon = 138,
     block_mushroom_stem = 139,
     block_flower_pot = 140,
@@ -155,14 +132,11 @@ enum mc_block_id {
     block_unpowered_comparator = 149,
     block_powered_comparator = 150,
     block_daylight_detector = 151,
-    block_redstone_block = 152,
     block_quartz_ore = 153,
     block_hopper = 154,
-    block_quartz_block = 155,
     block_quartz_stairs = 156,
     block_activator_rail = 157,
     block_dropper = 158,
-    block_stained_hardened_clay = 159,
     block_stained_glass_pane = 160,
     block_leaves2 = 161,
     block_log2 = 162,
@@ -173,18 +147,13 @@ enum mc_block_id {
     block_slime = 165,
     block_barrier = 166,
     block_iron_trapdoor = 167,
-    block_prismarine = 168,
     block_sea_lantern = 169,
     block_hay_block = 170,
     block_carpet = 171,
-    block_hardened_clay = 172,
-    block_coal_block = 173,
-    block_packed_ice = 174,
     block_double_plant = 175,
     block_standing_banner = 176,
     block_wall_banner = 177,
     block_daylight_detector_inverted = 178,
-    block_red_sandstone = 179,
     block_red_sandstone_stairs = 180,
     block_smooth_red_sandstone_stairs = 11415,
     block_double_stone_slab2 = 181,
@@ -196,6 +165,8 @@ enum mc_block_id {
     block_acacia_fence_gate = 187,
     block_crimson_fence_gate = 513,
     block_warped_fence_gate = 514,
+    block_mangrove_fence_gate = 455,
+    block_mangrove_fence = 456,
     block_spruce_fence = 188,
     block_birch_fence = 189,
     block_jungle_fence = 190,
@@ -207,13 +178,13 @@ enum mc_block_id {
     block_birch_door = 194,
     block_jungle_door = 195,
     block_acacia_door = 196,
+    block_mangrove_door = 457,
     block_crimson_door = 499,
     block_warped_door = 500,
     block_dark_oak_door = 197,
     block_end_rod = 198,
     block_chorus_plant = 199,
     block_chorus_flower = 200,
-    block_purpur_block = 201,
     block_purpur_pillar = 202,
     block_purpur_stairs = 203,
     block_purpur_double_slab = 204,
@@ -222,12 +193,7 @@ enum mc_block_id {
     block_beetroots = 207,
     block_dirt_path = 208,
     block_end_gateway = 209,
-    block_repeating_command_block = 210,
-    block_chain_command_block = 211,
     block_frosted_ice = 212,
-    block_magma = 213,
-    block_nether_wart_block = 214,
-    block_red_nether_brick = 215,
     block_bone_block = 216,
     block_structure_void = 217,
     block_observer = 218,
@@ -263,22 +229,18 @@ enum mc_block_id {
     block_green_glazed_terracotta = 248,
     block_red_glazed_terracotta = 249,
     block_black_glazed_terracotta = 250,
-    block_concrete = 251,
-    block_concrete_powder = 252,
     block_structure_block = 255,
     block_jigsaw = 256,
     block_shulker_box = 257,
+
+    block_mangrove_trapdoor = 451,
+    block_mangrove_wall_sign = 454,
     // 1.16 stuff
     block_ancient_debris = 1000,
     block_basalt = 1001,
     block_polished_basalt = 1002,
     block_soul_campfire = 1003,
     block_blackstone = 1004,
-    block_netherite_block = 1005,
-    block_warped_nylium = 1006,
-    block_crimson_nylium = 1007,
-    block_warped_wart_block = 1010,
-    block_shroomlight = 1011,
     block_twisting_vines = 1012,
     block_twisting_vines_plant = 1013,
     block_weeping_vines = 1014,
@@ -289,13 +251,6 @@ enum mc_block_id {
     block_crimson_roots = 1019,
     block_soul_soil = 1020,
     block_nether_gold_ore = 1021,
-    // Solid Nether stone blocks
-    block_polished_blackstone = 1022,
-    block_chiseled_polished_blackstone = 1023,
-    block_gilded_blackstone = 1024,
-    block_cracked_polished_blackstone_bricks = 1025,
-    block_polished_blackstone_bricks = 1026,
-    block_quartz_bricks = 1041,
     // Nether stone stairs
     block_blackstone_stairs = 1030,
     block_polished_blackstone_stairs = 1031,
@@ -304,38 +259,24 @@ enum mc_block_id {
     block_polished_blackstone_pressure_plate = 1033,
     block_polished_blackstone_button = 1034,
     // advanced nether blocks
-    block_crying_obsidian = 1035,
-    block_lodestone = 1036,
     block_respawn_anchor = 1037,
     // soul lightning
     block_soul_lantern = 1038,
     block_soul_torch = 1039,
     block_soul_fire = 1040,
 
     // 1.17
-    block_amethyst = 1042,
-    block_raw_iron = 1043,
-    block_raw_gold = 1044,
     block_budding_amethyst = 1045,
-    block_copper = 1046,
-    block_exposed_copper = 1047,
-    block_weathered_copper = 1048,
-    block_oxidized_copper = 1049,
     block_waxed_copper = 1050,
     block_waxed_exposed_copper = 1051,
     block_waxed_weathered_copper = 1052,
     block_waxed_oxidized_copper = 1053,
 
-    block_cut_copper = 1054,
-    block_exposed_cut_copper = 1055,
-    block_weathered_cut_copper = 1056,
-    block_oxidized_cut_copper = 1057,
     block_waxed_cut_copper = 1058,
     block_waxed_exposed_cut_copper = 1059,
     block_waxed_weathered_cut_copper = 1060,
     block_waxed_oxidized_cut_copper = 1061,
 
-    block_raw_copper = 1062,
     block_copper_ore = 1063,
 
     block_cut_copper_stairs = 1064,
@@ -358,13 +299,7 @@ enum mc_block_id {
     block_waxed_weathered_cut_copper_slab = 1078,
     block_waxed_oxidized_cut_copper_slab = 1079,
 
-    block_moss = 1080,
-    block_calcite = 1081,
-    block_rooted_dirt = 1082,
-
     block_deepslate = 1083,
-    block_cobbled_deepslate = 1084,
-    block_polished_deepslate = 1085,
     block_deepslate_coal_ore = 1086,
     block_deepslate_iron_ore = 1087,
     block_deepslate_copper_ore = 1088,
@@ -373,11 +308,6 @@ enum mc_block_id {
     block_deepslate_lapis_ore = 1091,
     block_deepslate_diamond_ore = 1092,
     block_deepslate_redstone_ore = 1093,
-    block_deepslate_bricks = 1094,
-    block_cracked_deepslate_bricks = 1095,
-    block_deepslate_tiles = 1096,
-    block_cracked_deepslate_tiles = 1097,
-    block_chiseled_deepslate = 1098,
 
     block_cobbled_deepslate_stairs = 1099,
     block_polished_deepslate_stairs = 1100,
@@ -389,12 +319,8 @@ enum mc_block_id {
     block_deepslate_brick_slab = 1105,
     block_deepslate_tile_slab = 1106,
 
-    block_dripstone = 1107,
-    block_smooth_basalt = 1108,
-    block_tuff = 1109,
     block_pointed_dripstone = 1110,
 
-    block_powder_snow = 1111,
     block_hanging_roots = 1112,
     block_small_amethyst_bud = 1113,
     block_medium_amethyst_bud = 1114,
@@ -405,13 +331,9 @@ 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,
     block_mangrove_roots = 1125,
     block_mangrove_log = 1126,
-    block_muddy_mangrove_roots = 1127,
 
     // adding a gap in the numbering of walls to keep them all
     // in one numbering block starting at 1792
@@ -438,6 +360,8 @@ enum mc_block_id {
     block_polished_deepslate_wall = 1810,
     block_deepslate_brick_wall = 1811,
     block_deepslate_tile_wall = 1812,
+    block_mud_brick_wall = 1813,
+    
     // end of walls
 
     block_prismarine_stairs = 11337,
@@ -465,9 +389,6 @@ enum mc_block_id {
     block_mossy_stone_brick_slab = 11356,
     block_smooth_quartz_slab = 11357,
     block_smooth_stone_slab = 11358,
-    block_fletching_table = 11359,
-    block_cartography_table = 11360,
-    block_smithing_table = 11361,
     block_blast_furnace = 11362,
     // block_blast_furnace lit 11363
     block_smoker = 11364,
@@ -519,7 +440,6 @@ enum mc_block_id {
     // 1.15 blocks below
     block_beehive = 11501,
     block_bee_nest = 11502,
-    block_honeycomb_block = 11503,
     block_honey_block = 11504,
     block_sweet_berry_bush = 11505,
     block_campfire = 11506,