From 0a9d1961c55b77722b19cb01c7e24165c81c68c9 Mon Sep 17 00:00:00 2001 From: InrcedibleHolg Date: Tue, 4 Aug 2020 19:20:09 +0200 Subject: [PATCH] add soul_soil, nether_gold_ore, removelist --- overviewer_core/src/mc_id.h | 3 ++- overviewer_core/src/overviewer.h | 2 +- overviewer_core/src/primitives/nether.c | 4 +++- overviewer_core/textures.py | 6 ++++++ overviewer_core/world.py | 2 ++ 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/overviewer_core/src/mc_id.h b/overviewer_core/src/mc_id.h index aabc748..903bad2 100644 --- a/overviewer_core/src/mc_id.h +++ b/overviewer_core/src/mc_id.h @@ -279,7 +279,8 @@ enum mc_block_id { block_crimson_fungus = 1017, block_warped_roots = 1018, block_crimson_roots = 1019, - + block_soul_soil = 1020, + block_nether_gold_ore = 1021, // 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 ef55ab6..670307c 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 88 +#define OVERVIEWER_EXTENSION_VERSION 89 #include #include diff --git a/overviewer_core/src/primitives/nether.c b/overviewer_core/src/primitives/nether.c index 9ef0299..02e632f 100644 --- a/overviewer_core/src/primitives/nether.c +++ b/overviewer_core/src/primitives/nether.c @@ -37,7 +37,9 @@ walk_chunk(RenderState* state, RenderPrimitiveNether* data) { for (y = NETHER_ROOF - 1; y >= 0; y--) { blockid = get_data(state, BLOCKS, x, y - (state->chunky * 16), z); - if (block_class_is_subset(blockid, (mc_block_t[]){block_bedrock, block_netherrack, block_quartz_ore, block_lava}, 4)) + if (block_class_is_subset(blockid, (mc_block_t[]){block_bedrock, block_netherrack, + block_quartz_ore, block_lava, block_soul_sand, block_basalt, block_blackstone, + block_soul_soil, block_nether_gold_ore}, 9)) data->remove_block[x + 1][y][z + 1] = true; else break; diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index aee4bb4..09b1bee 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -4407,6 +4407,12 @@ block(blockid=110, top_image="assets/minecraft/textures/block/mycelium_top.png", # warped_nylium & crimson_nylium block(blockid=1006, top_image="assets/minecraft/textures/block/warped_nylium.png", side_image="assets/minecraft/textures/block/warped_nylium_side.png") block(blockid=1007, top_image="assets/minecraft/textures/block/crimson_nylium.png", side_image="assets/minecraft/textures/block/crimson_nylium_side.png") +# soul soil +soul_soil_texture="assets/minecraft/textures/block/soul_soil.png" +block(blockid=1020, top_image=soul_soil_texture, side_image=soul_soil_texture) +# nether gold ore +nether_gold_texture="assets/minecraft/textures/block/nether_gold_ore.png" +block(blockid=1021, top_image=nether_gold_texture, side_image=nether_gold_texture) # lilypad # At the moment of writing this lilypads has no ancil data and their diff --git a/overviewer_core/world.py b/overviewer_core/world.py index 516e057..7e775fd 100644 --- a/overviewer_core/world.py +++ b/overviewer_core/world.py @@ -719,6 +719,8 @@ class RegionSet(object): 'minecraft:crimson_fungus': (1017, 0), 'minecraft:warped_roots': (1018, 0), 'minecraft:crimson_roots': (1019, 0), + 'minecraft:soul_soil': (1020, 0), + 'minecraft:nether_gold_ore': (1021, 0), # New blocks 'minecraft:carved_pumpkin': (11300, 0),