From e729addd23ceb089d95bd05a54f3ad6f4ad46e6b Mon Sep 17 00:00:00 2001 From: Nicolas F Date: Thu, 10 Jun 2021 19:24:01 +0200 Subject: [PATCH] textures: add some of the new copper blocks --- overviewer_core/src/mc_id.h | 8 ++++++++ overviewer_core/textures.py | 7 +++++++ overviewer_core/world.py | 8 ++++++++ 3 files changed, 23 insertions(+) diff --git a/overviewer_core/src/mc_id.h b/overviewer_core/src/mc_id.h index bf552ee..b4da821 100644 --- a/overviewer_core/src/mc_id.h +++ b/overviewer_core/src/mc_id.h @@ -317,6 +317,14 @@ enum mc_block_id { 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, // adding a gap in the numbering of walls to keep them all // in one numbering block starting at 1792 diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index 7d8bdd1..65454f2 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -5922,3 +5922,10 @@ block(blockid=1042, top_image="assets/minecraft/textures/block/amethyst_block.pn 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") block(blockid=1045, top_image="assets/minecraft/textures/block/budding_amethyst.png") + +# You have entered the COPPER ZONE +block(blockid=[1046, 1050], top_image="assets/minecraft/textures/block/copper_block.png") +block(blockid=[1047, 1051], top_image="assets/minecraft/textures/block/exposed_copper.png") +block(blockid=[1048, 1052], top_image="assets/minecraft/textures/block/weathered_copper.png") +block(blockid=[1049, 1053], top_image="assets/minecraft/textures/block/oxidized_copper.png") +# You are now leaving the COPPER ZONE diff --git a/overviewer_core/world.py b/overviewer_core/world.py index 9963659..e4e6c89 100644 --- a/overviewer_core/world.py +++ b/overviewer_core/world.py @@ -775,6 +775,14 @@ class RegionSet(object): 'minecraft:raw_iron_block': (1043, 0), 'minecraft:raw_gold_block': (1044, 0), 'minecraft:budding_amethyst': (1045, 0), + 'minecraft:copper_block': (1046, 0), + 'minecraft:exposed_copper': (1047, 0), + 'minecraft:weathered_copper': (1048, 0), + 'minecraft:oxidized_copper': (1049, 0), + 'minecraft:waxed_copper_block': (1050, 0), + 'minecraft:waxed_exposed_copper': (1051, 0), + 'minecraft:waxed_weathered_copper': (1052, 0), + 'minecraft:waxed_oxidized_copper': (1053, 0), # New blocks 'minecraft:carved_pumpkin': (11300, 0),