diff --git a/overviewer_core/src/mc_id.h b/overviewer_core/src/mc_id.h index cfec1e9..8c79b4c 100644 --- a/overviewer_core/src/mc_id.h +++ b/overviewer_core/src/mc_id.h @@ -312,6 +312,11 @@ enum mc_block_id { block_soul_torch = 1039, block_soul_fire = 1040, + // 1.17 + block_amethyst = 1042, + block_raw_iron = 1043, + block_raw_gold = 1044, + // 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 e522154..1732546 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 99 +#define OVERVIEWER_EXTENSION_VERSION 100 #include #include diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index 07425ef..ccb12ff 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -5917,3 +5917,7 @@ block(blockid=1035, top_image="assets/minecraft/textures/block/crying_obsidian.p block(blockid=1036, top_image="assets/minecraft/textures/block/lodestone_top.png", side_image="assets/minecraft/textures/block/lodestone_side.png") block(blockid=1037, top_image="assets/minecraft/textures/block/respawn_anchor_top.png", side_image="assets/minecraft/textures/block/respawn_anchor_side1.png") block(blockid=1041, top_image="assets/minecraft/textures/block/quartz_bricks.png") + +block(blockid=1042, top_image="assets/minecraft/textures/block/amethyst_block.png") +block(blockid=1043, top_image="assets/minecraft/textures/block/raw_iron_block.png") +block(blockid=1044, top_image="assets/minecraft/textures/block/raw_gold_block.png") diff --git a/overviewer_core/world.py b/overviewer_core/world.py index b139856..e506988 100644 --- a/overviewer_core/world.py +++ b/overviewer_core/world.py @@ -770,6 +770,11 @@ class RegionSet(object): # quartz bricks 'minecraft:quartz_bricks': (1041, 0), + # 1.17 blocks go here + 'minecraft:amethyst_block': (1042, 0), + 'minecraft:raw_iron_block': (1043, 0), + 'minecraft:raw_gold_block': (1044, 0), + # New blocks 'minecraft:carved_pumpkin': (11300, 0), 'minecraft:spruce_pressure_plate': (11301, 0),