From 6643af756e54019634ebfbbb28d5cbeb7de149af Mon Sep 17 00:00:00 2001 From: Bernd Buschinski Date: Wed, 16 Jun 2021 20:49:29 +0200 Subject: [PATCH] Added more 1.17 blocks - only non-rotational full blocks --- overviewer_core/src/mc_id.h | 24 ++++++++++++++++++++++++ overviewer_core/textures.py | 28 ++++++++++++++++++++++++++++ overviewer_core/world.py | 24 ++++++++++++++++++++++++ 3 files changed, 76 insertions(+) diff --git a/overviewer_core/src/mc_id.h b/overviewer_core/src/mc_id.h index f301d11..44cb845 100644 --- a/overviewer_core/src/mc_id.h +++ b/overviewer_core/src/mc_id.h @@ -358,6 +358,30 @@ 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_cobbled_deepslate = 1083, + block_polished_deepslate = 1084, + block_deepslate_coal_ore = 1085, + block_deepslate_iron_ore = 1086, + block_deepslate_copper_ore = 1087, + block_deepslate_gold_ore = 1088, + block_deepslate_emerald_ore = 1089, + block_deepslate_lapis_ore = 1090, + block_deepslate_diamond_ore = 1091, + block_deepslate_redstone_ore = 1092, + block_deepslate_bricks = 1093, + block_cracked_deepslate_bricks = 1094, + block_deepslate_tiles = 1095, + block_cracked_deepslate_tiles = 1096, + block_chiseled_deepslate = 1097, + + block_dripstone = 1098, + block_smooth_basalt = 1099, + block_tuff = 1100, + // 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/textures.py b/overviewer_core/textures.py index 108708a..c10a25f 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -1176,6 +1176,10 @@ def leaves(self, blockid, data): t = self.load_image_texture("assets/minecraft/textures/block/acacia_leaves.png") elif (blockid, data) == (161, 5): t = self.load_image_texture("assets/minecraft/textures/block/dark_oak_leaves.png") + elif (blockid, data) == (18, 6): + t = self.load_image_texture("assets/minecraft/textures/block/flowering_azalea_leaves.png") + elif (blockid, data) == (18, 7): + t = self.load_image_texture("assets/minecraft/textures/block/azalea_leaves.png") return self.build_block(t, t) # sponge @@ -5988,3 +5992,27 @@ block(blockid=[1057, 1061], top_image="assets/minecraft/textures/block/oxidized_ block(blockid=1062, top_image="assets/minecraft/textures/block/raw_copper_block.png") block(blockid=1063, top_image="assets/minecraft/textures/block/copper_ore.png") # You are now leaving the COPPER ZONE + +block(blockid=1080, top_image="assets/minecraft/textures/block/moss_block.png") +block(blockid=1081, top_image="assets/minecraft/textures/block/calcite.png") +block(blockid=1082, top_image="assets/minecraft/textures/block/rooted_dirt.png") + +block(blockid=1083, top_image="assets/minecraft/textures/block/cobbled_deepslate.png") +block(blockid=1084, top_image="assets/minecraft/textures/block/polished_deepslate.png") +block(blockid=1085, top_image="assets/minecraft/textures/block/deepslate_coal_ore.png") +block(blockid=1086, top_image="assets/minecraft/textures/block/deepslate_iron_ore.png") +block(blockid=1087, top_image="assets/minecraft/textures/block/deepslate_copper_ore.png") +block(blockid=1088, top_image="assets/minecraft/textures/block/deepslate_gold_ore.png") +block(blockid=1089, top_image="assets/minecraft/textures/block/deepslate_emerald_ore.png") +block(blockid=1090, top_image="assets/minecraft/textures/block/deepslate_lapis_ore.png") +block(blockid=1091, top_image="assets/minecraft/textures/block/deepslate_diamond_ore.png") +block(blockid=1092, top_image="assets/minecraft/textures/block/deepslate_redstone_ore.png") +block(blockid=1093, top_image="assets/minecraft/textures/block/deepslate_bricks.png") +block(blockid=1094, top_image="assets/minecraft/textures/block/cracked_deepslate_bricks.png") +block(blockid=1095, top_image="assets/minecraft/textures/block/deepslate_tiles.png") +block(blockid=1096, top_image="assets/minecraft/textures/block/cracked_deepslate_tiles.png") +block(blockid=1097, top_image="assets/minecraft/textures/block/chiseled_deepslate.png") + +block(blockid=1098, top_image="assets/minecraft/textures/block/dripstone_block.png") +block(blockid=1099, top_image="assets/minecraft/textures/block/smooth_basalt.png") +block(blockid=1100, top_image="assets/minecraft/textures/block/tuff.png") diff --git a/overviewer_core/world.py b/overviewer_core/world.py index 61a61b0..f8ac9f0 100644 --- a/overviewer_core/world.py +++ b/overviewer_core/world.py @@ -343,6 +343,8 @@ class RegionSet(object): 'minecraft:jungle_leaves': (18, 3), 'minecraft:acacia_leaves': (18, 4), 'minecraft:dark_oak_leaves': (18, 5), + 'minecraft:flowering_azalea_leaves': (18, 6), + 'minecraft:azalea_leaves': (18, 7), 'minecraft:sponge': (19, 0), 'minecraft:wet_sponge': (19, 1), 'minecraft:glass': (20, 0), @@ -810,6 +812,28 @@ class RegionSet(object): 'minecraft:waxed_exposed_cut_copper_slab': (1077, 0), 'minecraft:waxed_weathered_cut_copper_slab': (1078, 0), 'minecraft:waxed_oxidized_cut_copper_slab': (1079, 0), + 'minecraft:moss_block': (1080, 0), + 'minecraft:calcite': (1081, 0), + 'minecraft:rooted_dirt': (1082, 0), + 'minecraft:cobbled_deepslate': (1083, 0), + 'minecraft:polished_deepslate': (1084, 0), + 'minecraft:deepslate_coal_ore': (1085, 0), + 'minecraft:deepslate_iron_ore': (1086, 0), + 'minecraft:deepslate_copper_ore': (1087, 0), + 'minecraft:deepslate_gold_ore': (1088, 0), + 'minecraft:deepslate_emerald_ore': (1089, 0), + 'minecraft:deepslate_lapis_ore': (1090, 0), + 'minecraft:deepslate_diamond_ore': (1091, 0), + 'minecraft:deepslate_redstone_ore': (1092, 0), + 'minecraft:deepslate_bricks': (1093, 0), + 'minecraft:cracked_deepslate_bricks': (1094, 0), + 'minecraft:deepslate_tiles': (1095, 0), + 'minecraft:cracked_deepslate_tiles': (1096, 0), + 'minecraft:chiseled_deepslate': (1097, 0), + + 'minecraft:dripstone_block': (1098, 0), + 'minecraft:smooth_basalt': (1099, 0), + 'minecraft:tuff': (1100, 0), # New blocks 'minecraft:carved_pumpkin': (11300, 0),