Merge PR #1856 from IncredibleHolg

I finally got around to doing this.

overviewer_core/src/block_class.c

@@ -89,6 +89,8 @@ const mc_block_t block_class_stair[] = {
     block_spruce_stairs,
     block_birch_stairs,
     block_jungle_stairs,
+    block_crimson_stairs,
+    block_warped_stairs,
     block_quartz_stairs,
     block_acacia_stairs,
     block_dark_oak_stairs,
@@ -111,7 +113,10 @@ const mc_block_t block_class_stair[] = {
     block_end_stone_brick_stairs,
     block_red_nether_brick_stairs,
     block_mossy_stone_brick_stairs,
-    block_smooth_sandstone_stairs};
+    block_smooth_sandstone_stairs,
+    block_blackstone_stairs,
+    block_polished_blackstone_stairs,
+    block_polished_blackstone_brick_stairs};
 const size_t block_class_stair_len = COUNT_OF(block_class_stair);
 
 const mc_block_t block_class_door[] = {
@@ -121,7 +126,9 @@ const mc_block_t block_class_door[] = {
     block_birch_door,
     block_jungle_door,
     block_acacia_door,
-    block_dark_oak_door};
+    block_dark_oak_door,
+    block_crimson_door,
+    block_warped_door};
 const size_t block_class_door_len = COUNT_OF(block_class_door);
 
 const mc_block_t block_class_fence[] = {
@@ -131,6 +138,8 @@ const mc_block_t block_class_fence[] = {
     block_birch_fence,
     block_jungle_fence,
     block_dark_oak_fence,
+    block_crimson_fence,
+    block_warped_fence,
     block_acacia_fence};
 const size_t block_class_fence_len = COUNT_OF(block_class_fence);
 
@@ -140,7 +149,9 @@ const mc_block_t block_class_fence_gate[] = {
     block_birch_fence_gate,
     block_jungle_fence_gate,
     block_dark_oak_fence_gate,
-    block_acacia_fence_gate};
+    block_acacia_fence_gate,
+    block_crimson_fence_gate,
+    block_warped_fence_gate};
 const size_t block_class_fence_gate_len = COUNT_OF(block_class_fence_gate);
 
 const mc_block_t block_class_ancil[] = {
@@ -151,6 +162,7 @@ const mc_block_t block_class_ancil[] = {
     block_jungle_door,
     block_acacia_door,
     block_dark_oak_door,
+    block_crimson_door,
     block_oak_stairs,
     block_brick_stairs,
     block_stone_brick_stairs,
@@ -162,6 +174,8 @@ const mc_block_t block_class_ancil[] = {
     block_quartz_stairs,
     block_acacia_stairs,
     block_dark_oak_stairs,
+    block_crimson_stairs,
+    block_warped_stairs,
     block_red_sandstone_stairs,
     block_smooth_red_sandstone_stairs,
     block_purpur_stairs,
@@ -182,6 +196,9 @@ const mc_block_t block_class_ancil[] = {
     block_end_stone_brick_stairs,
     block_red_nether_brick_stairs,
     block_smooth_sandstone_stairs,
+    block_blackstone_stairs,
+    block_polished_blackstone_stairs,
+    block_polished_blackstone_brick_stairs,    
     block_grass,
     block_flowing_water,
     block_water,
@@ -208,6 +225,12 @@ const mc_block_t block_class_ancil[] = {
     block_red_sandstone_wall,
     block_sandstone_wall,
     block_stone_brick_wall,
+    block_blackstone_wall,
+    block_polished_blackstone_wall,
+    block_polished_blackstone_brick_wall,
+    block_crying_obsidian,
+    block_lodestone,
+    block_respawn_anchor,
     block_double_plant,
     block_stained_glass_pane,
     block_stained_glass,
@@ -215,6 +238,8 @@ const mc_block_t block_class_ancil[] = {
     block_birch_fence,
     block_jungle_fence,
     block_dark_oak_fence,
+    block_crimson_fence,
+    block_warped_fence,
     block_acacia_fence};
 const size_t block_class_ancil_len = COUNT_OF(block_class_ancil);
 
@@ -231,6 +256,8 @@ const mc_block_t block_class_alt_height[] = {
     block_quartz_stairs,
     block_acacia_stairs,
     block_dark_oak_stairs,
+    block_crimson_stairs,
+    block_warped_stairs,
     block_red_sandstone_stairs,
     block_smooth_red_sandstone_stairs,
     block_prismarine_stairs,
@@ -250,6 +277,9 @@ const mc_block_t block_class_alt_height[] = {
     block_end_stone_brick_stairs,
     block_red_nether_brick_stairs,
     block_smooth_sandstone_stairs,
+    block_blackstone_stairs,
+    block_polished_blackstone_stairs,
+    block_polished_blackstone_brick_stairs,    
     block_prismarine_slab,
     block_dark_prismarine_slab,
     block_prismarine_brick_slab,
@@ -265,6 +295,9 @@ const mc_block_t block_class_alt_height[] = {
     block_smooth_red_sandstone_slab,
     block_cut_red_sandstone_slab,
     block_end_stone_brick_slab,
+    block_blackstone_slab,
+    block_polished_blackstone_slab,
+    block_polished_blackstone_brick_slab,
     block_mossy_cobblestone_slab,
     block_mossy_stone_brick_slab,
     block_smooth_quartz_slab,
@@ -284,7 +317,8 @@ const mc_block_t block_class_nether_roof[] = {
     block_basalt,
     block_blackstone,
     block_soul_soil,
-    block_nether_gold_ore};
+    block_nether_gold_ore,
+    block_ancient_debris};
 const size_t block_class_nether_roof_len = COUNT_OF(block_class_nether_roof);
 
 const mc_block_t block_connects_to_glass_pane[] = {

overviewer_core/src/iterate.c

@@ -280,7 +280,8 @@ generate_pseudo_data(RenderState* state, uint16_t ancilData) {
         /* check for fences AND fence gates */
         return check_adjacent_blocks(state, x, y, z, state->block) | check_adjacent_blocks(state, x, y, z, block_fence_gate) |
                check_adjacent_blocks(state, x, y, z, block_fence_gate) | check_adjacent_blocks(state, x, y, z, block_birch_fence_gate) | check_adjacent_blocks(state, x, y, z, block_jungle_fence_gate) |
-               check_adjacent_blocks(state, x, y, z, block_dark_oak_fence_gate) | check_adjacent_blocks(state, x, y, z, block_acacia_fence_gate);
+               check_adjacent_blocks(state, x, y, z, block_dark_oak_fence_gate) | check_adjacent_blocks(state, x, y, z, block_acacia_fence_gate)
+                | check_adjacent_blocks(state, x, y, z, block_crimson_fence_gate) | check_adjacent_blocks(state, x, y, z, block_warped_fence_gate);
 
     } else if (state->block == block_redstone_wire) { /* redstone */
         /* three addiotional bit are added, one for on/off state, and

overviewer_core/src/mc_id.h

@@ -168,6 +168,8 @@ enum mc_block_id {
     block_log2 = 162,
     block_acacia_stairs = 163,
     block_dark_oak_stairs = 164,
+    block_crimson_stairs = 509,
+    block_warped_stairs = 510,
     block_slime = 165,
     block_barrier = 166,
     block_iron_trapdoor = 167,
@@ -192,15 +194,21 @@ enum mc_block_id {
     block_jungle_fence_gate = 185,
     block_dark_oak_fence_gate = 186,
     block_acacia_fence_gate = 187,
+    block_crimson_fence_gate = 513,
+    block_warped_fence_gate = 514,
     block_spruce_fence = 188,
     block_birch_fence = 189,
     block_jungle_fence = 190,
     block_dark_oak_fence = 191,
     block_acacia_fence = 192,
+    block_crimson_fence = 511,
+    block_warped_fence = 512,
     block_spruce_door = 193,
     block_birch_door = 194,
     block_jungle_door = 195,
     block_acacia_door = 196,
+    block_crimson_door = 499,
+    block_warped_door = 500,
     block_dark_oak_door = 197,
     block_end_rod = 198,
     block_chorus_plant = 199,
@@ -281,6 +289,29 @@ 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,
+    block_polished_blackstone_brick_stairs = 1032,
+    // nether redstone blocks
+    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,
+
     // 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
@@ -299,6 +330,9 @@ enum mc_block_id {
     block_red_sandstone_wall = 1803,
     block_sandstone_wall = 1804,
     block_stone_brick_wall = 1805,
+    block_blackstone_wall = 1806,
+    block_polished_blackstone_wall = 1807,
+    block_polished_blackstone_brick_wall = 1808,
     // end of walls
 
     block_prismarine_stairs = 11337,
@@ -319,6 +353,9 @@ enum mc_block_id {
     block_smooth_red_sandstone_slab = 11352,
     block_cut_red_sandstone_slab = 11353,
     block_end_stone_brick_slab = 11354,
+    block_blackstone_slab = 1027,
+    block_polished_blackstone_slab = 1028,
+    block_polished_blackstone_brick_slab = 1029,
     block_mossy_cobblestone_slab = 11355,
     block_mossy_stone_brick_slab = 11356,
     block_smooth_quartz_slab = 11357,
@@ -360,12 +397,16 @@ enum mc_block_id {
     block_jungle_sign = 11404,
     block_acacia_sign = 11405,
     block_dark_oak_sign = 11406,
+    block_crimson_sign = 12505,
+    block_warped_sign = 12506,
     block_oak_wall_sign = 11407,
     block_spruce_wall_sign = 11408,
     block_birch_wall_sign = 11409,
     block_jungle_wall_sign = 11410,
     block_acacia_wall_sign = 11411,
     block_dark_oak_wall_sign = 11412,
+    block_crimson_wall_sign = 12507,
+    block_warped_wall_sign = 12508,
     block_bamboo_sapling = 11413,
     block_scaffolding = 11414,
     block_bamboo = 11416,
@@ -565,6 +606,8 @@ enum mc_item_id {
     item_jungle_door = 429,
     item_acacia_door = 430,
     item_dark_oak_door = 431,
+    item_crimson_door = 755,
+    item_warped_door = 756,
     item_chorus_fruit = 432,
     item_popped_chorus_fruit = 433,
     item_beetroot = 434,
@@ -597,7 +640,7 @@ enum mc_item_id {
     item_record_strad = 2264,
     item_record_ward = 2265,
     item_record_11 = 2266,
-    item_record_wait = 2267
+    item_record_wait = 2267,
 };
 
 typedef uint16_t mc_item_t;

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 92
+#define OVERVIEWER_EXTENSION_VERSION 96
 
 #include <stdbool.h>
 #include <stdint.h>