Merge pull request #17 from NeoRaider/mc1.17

Add Minecraft 1.17 support

resource/README.md

@@ -0,0 +1,71 @@
+# Resource management
+
+## Scripts
+
+The following scripts can be found in the `resource` directory of this Git
+repository. Python 3.8 should be sufficient, older versions may or may not
+work.
+
+- `blocklist.py`: Lists all supported block IDs of an unpacked Minecraft JAR, or diffs the ID lists
+  of two different versions
+- `extract.py`: Takes the block type information from `blocks.json` and texture data
+  from an unpacked Minecraft JAR, storing the result in `colors.json`
+- `generate.py`: Generates `BlockType.inc` from `colors.json`
+
+In addition to these scripts, the JSON processor *jq* is a useful tool to work
+with MinedMap's resource metadata.
+
+
+## How to add support for block IDs of a new Minecraft version
+
+1. Download the Minecraft version you want to support as well as the previous
+   version currently supported by MinedMap. You can use the Minecraft launcher
+   to do so. On Linux the downloaded JAR archive can be found at
+   `~/.minecraft/versions/`.
+2. Unpack both versions to different directories. The next part assumes that
+   the unpacked data is stored in `resource/data/old` and `resource/data/new`;
+   using the respective Minecraft version numbers instead of `old`
+   and `new` is advisable.
+3. Check the added and removed block types using `blocklist.py`:
+
+     ```sh
+     ./blocklist.py diff data/old data/new
+     ```
+
+4. Append all new block types to `blocks.json`. The following command can be
+   used to generate the basic JSON structure:
+
+     ```sh
+     ./blocklist.py added data/old data/new | jq -R -n -S --tab '[inputs] | map({key: ., value: {}}) | from_entries'
+     ```
+
+5. Edit `blocks.json` until the following command passes without errors:
+
+     ```sh
+     ./extract.py blocks.json data/new/assets/minecraft/textures/block colors.json
+     ```
+
+   If possible, the top texture of blocks should be used where different sides
+   exist. Block types that should not be visible on the map are just set to
+   `null` in the JSON.
+
+   The `water`, `grass` and `foliage` flags control biome-dependent texture color modifiers.
+
+6. When `colors.json` builds successfully, use the following command to sort
+   `blocks.json` by block ID:
+
+     ```sh
+     jq --tab -S < blocks.json > blocks.json.new && mv blocks.json.new blocks.json
+     ```
+
+   Then regenerate `colors.json` one last time, so it is sorted as well.
+
+7. Update the source code with the new block colors:
+
+     ```sh
+     ./generate.py colors.json ../src/Resource/BlockType.inc
+     ```
+
+After the update, the new version should be tested with old savegames (both
+before and after migration by the new version) as well as newly generated
+worlds. Use creative mode to add the new block types to your test world.

resource/blocklist.py

@@ -0,0 +1,69 @@
+#!/usr/bin/env python3
+
+import argparse
+import os
+import sys
+
+def blocklist(path):
+	blockpath = os.path.join(path, 'assets', 'minecraft', 'blockstates')
+	try:
+		return map(
+			lambda filename: filename[:-5],
+			filter(
+				lambda filename: filename.endswith('.json'),
+				os.listdir(blockpath),
+			),
+		)
+	except FileNotFoundError:
+		sys.exit('''
+Path '{}' not found.
+Please pass a directory containing the unpacked contents of a JAR of a recent Minecraft version.
+		'''.strip().format(blockpath))
+
+def print_blocklist(path):
+	for block in sorted(blocklist(path)):
+		print(block)
+
+def diff_blocklist(old, new, cmd):
+	blocks_old = set(blocklist(old))
+	blocks_new = set(blocklist(new))
+	diff = sorted(blocks_old.symmetric_difference(blocks_new))
+
+	for block in diff:
+		if block in blocks_old:
+			if cmd == 'removed':
+				print(block)
+			elif cmd == 'diff':
+				print('-', block)
+		else:
+			if cmd == 'added':
+				print(block)
+			elif cmd == 'diff':
+				print('+', block)
+
+
+parser = argparse.ArgumentParser(description='List block IDs of an unpacked Minecraft JAR, or diff two versions')
+
+subparsers = parser.add_subparsers(dest='cmd', metavar='COMMAND', required=True)
+
+parse_list = subparsers.add_parser('list', help='list supported blocks')
+parse_list.add_argument('DIR')
+
+parse_added = subparsers.add_parser('added', help='list added blocks')
+parse_added.add_argument('OLD')
+parse_added.add_argument('NEW')
+
+parse_removed = subparsers.add_parser('removed', help='list removed blocks')
+parse_removed.add_argument('OLD')
+parse_removed.add_argument('NEW')
+
+parse_removed = subparsers.add_parser('diff', help='diff lists of supported blocks')
+parse_removed.add_argument('OLD')
+parse_removed.add_argument('NEW')
+
+args = parser.parse_args()
+
+if args.cmd == 'list':
+	print_blocklist(args.DIR)
+else:
+	diff_blocklist(args.OLD, args.NEW, args.cmd)

resource/blocks.json

@@ -37,6 +37,8 @@
 	"activator_rail": {},
 	"air": null,
 	"allium": null,
+	"amethyst_block": {},
+	"amethyst_cluster": {},
 	"ancient_debris": {
 		"texture": "ancient_debris_top"
 	},
@@ -59,6 +61,10 @@
 	"attached_pumpkin_stem": {
 		"grass": true
 	},
+	"azalea": {
+		"texture": "azalea_top"
+	},
+	"azalea_leaves": {},
 	"azure_bluet": null,
 	"bamboo": {
 		"texture": "bamboo_stalk"
@@ -85,6 +91,10 @@
 	"bell": {
 		"texture": "bell_top"
 	},
+	"big_dripleaf": {
+		"texture": "big_dripleaf_top"
+	},
+	"big_dripleaf_stem": null,
 	"birch_button": null,
 	"birch_door": {
 		"texture": "birch_door_top"
@@ -122,6 +132,10 @@
 	},
 	"black_banner": null,
 	"black_bed": null,
+	"black_candle": null,
+	"black_candle_cake": {
+		"texture": "cake_top"
+	},
 	"black_carpet": {
 		"texture": "black_wool"
 	},
@@ -153,6 +167,10 @@
 	},
 	"blue_banner": null,
 	"blue_bed": null,
+	"blue_candle": null,
+	"blue_candle_cake": {
+		"texture": "cake_top"
+	},
 	"blue_carpet": {
 		"texture": "blue_wool"
 	},
@@ -192,6 +210,10 @@
 	"bricks": {},
 	"brown_banner": null,
 	"brown_bed": null,
+	"brown_candle": null,
+	"brown_candle_cake": {
+		"texture": "cake_top"
+	},
 	"brown_carpet": {
 		"texture": "brown_wool"
 	},
@@ -216,15 +238,21 @@
 	"bubble_coral_block": {},
 	"bubble_coral_fan": null,
 	"bubble_coral_wall_fan": null,
+	"budding_amethyst": {},
 	"cactus": {
 		"texture": "cactus_top"
 	},
 	"cake": {
 		"texture": "cake_top"
 	},
+	"calcite": {},
 	"campfire": {
 		"texture": "campfire_log_lit"
 	},
+	"candle": null,
+	"candle_cake": {
+		"texture": "cake_top"
+	},
 	"carrots": {
 		"texture": "carrots_stage3"
 	},
@@ -238,6 +266,8 @@
 		"texture": "cauldron_top"
 	},
 	"cave_air": null,
+	"cave_vines": {},
+	"cave_vines_plant": {},
 	"chain": null,
 	"chain_command_block": {
 		"texture": "chain_command_block_side"
@@ -248,6 +278,7 @@
 	"chipped_anvil": {
 		"texture": "chipped_anvil_top"
 	},
+	"chiseled_deepslate": {},
 	"chiseled_nether_bricks": {},
 	"chiseled_polished_blackstone": {},
 	"chiseled_quartz_block": {},
@@ -264,6 +295,16 @@
 	"coal_block": {},
 	"coal_ore": {},
 	"coarse_dirt": {},
+	"cobbled_deepslate": {},
+	"cobbled_deepslate_slab": {
+		"texture": "cobbled_deepslate"
+	},
+	"cobbled_deepslate_stairs": {
+		"texture": "cobbled_deepslate"
+	},
+	"cobbled_deepslate_wall": {
+		"texture": "cobbled_deepslate"
+	},
 	"cobblestone": {},
 	"cobblestone_slab": {
 		"texture": "cobblestone"
@@ -286,7 +327,11 @@
 		"texture": "composter_compost"
 	},
 	"conduit": {},
+	"copper_block": {},
+	"copper_ore": {},
 	"cornflower": null,
+	"cracked_deepslate_bricks": {},
+	"cracked_deepslate_tiles": {},
 	"cracked_nether_bricks": {},
 	"cracked_polished_blackstone_bricks": {},
 	"cracked_stone_bricks": {},
@@ -330,6 +375,13 @@
 	"crimson_trapdoor": {},
 	"crimson_wall_sign": null,
 	"crying_obsidian": {},
+	"cut_copper": {},
+	"cut_copper_slab": {
+		"texture": "cut_copper"
+	},
+	"cut_copper_stairs": {
+		"texture": "cut_copper"
+	},
 	"cut_red_sandstone": {
 		"texture": "red_sandstone_top"
 	},
@@ -344,6 +396,10 @@
 	},
 	"cyan_banner": null,
 	"cyan_bed": null,
+	"cyan_candle": null,
+	"cyan_candle_cake": {
+		"texture": "cake_top"
+	},
 	"cyan_carpet": {
 		"texture": "cyan_wool"
 	},
@@ -428,6 +484,35 @@
 	"dead_tube_coral_block": {},
 	"dead_tube_coral_fan": null,
 	"dead_tube_coral_wall_fan": null,
+	"deepslate": {},
+	"deepslate_brick_slab": {
+		"texture": "deepslate_bricks"
+	},
+	"deepslate_brick_stairs": {
+		"texture": "deepslate_bricks"
+	},
+	"deepslate_brick_wall": {
+		"texture": "deepslate_bricks"
+	},
+	"deepslate_bricks": {},
+	"deepslate_coal_ore": {},
+	"deepslate_copper_ore": {},
+	"deepslate_diamond_ore": {},
+	"deepslate_emerald_ore": {},
+	"deepslate_gold_ore": {},
+	"deepslate_iron_ore": {},
+	"deepslate_lapis_ore": {},
+	"deepslate_redstone_ore": {},
+	"deepslate_tile_slab": {
+		"texture": "deepslate_tiles"
+	},
+	"deepslate_tile_stairs": {
+		"texture": "deepslate_tiles"
+	},
+	"deepslate_tile_wall": {
+		"texture": "deepslate_tiles"
+	},
+	"deepslate_tiles": {},
 	"detector_rail": {},
 	"diamond_block": {},
 	"diamond_ore": {},
@@ -442,6 +527,9 @@
 		"texture": "diorite"
 	},
 	"dirt": {},
+	"dirt_path": {
+		"texture": "dirt_path_top"
+	},
 	"dispenser": {
 		"texture": "furnace_top"
 	},
@@ -451,6 +539,7 @@
 	"dried_kelp_block": {
 		"texture": "dried_kelp_top"
 	},
+	"dripstone_block": {},
 	"dropper": {
 		"texture": "furnace_top"
 	},
@@ -483,6 +572,14 @@
 	"ender_chest": {
 		"texture": "obsidian"
 	},
+	"exposed_copper": {},
+	"exposed_cut_copper": {},
+	"exposed_cut_copper_slab": {
+		"texture": "exposed_cut_copper"
+	},
+	"exposed_cut_copper_stairs": {
+		"texture": "exposed_cut_copper"
+	},
 	"farmland": {
 		"texture": "farmland_moist"
 	},
@@ -498,6 +595,10 @@
 		"texture": "fletching_table_top"
 	},
 	"flower_pot": {},
+	"flowering_azalea": {
+		"texture": "flowering_azalea_top"
+	},
+	"flowering_azalea_leaves": {},
 	"frosted_ice": {
 		"texture": "frosted_ice_0"
 	},
@@ -509,6 +610,8 @@
 	"glass_pane": {
 		"texture": "glass_pane_top"
 	},
+	"glow_item_frame": null,
+	"glow_lichen": null,
 	"glowstone": {},
 	"gold_block": {},
 	"gold_ore": {},
@@ -528,11 +631,15 @@
 		"texture": "grass_block_top"
 	},
 	"grass_path": {
-		"texture": "grass_path_top"
+		"texture": "dirt_path_top"
 	},
 	"gravel": {},
 	"gray_banner": null,
 	"gray_bed": null,
+	"gray_candle": null,
+	"gray_candle_cake": {
+		"texture": "cake_top"
+	},
 	"gray_carpet": {
 		"texture": "gray_wool"
 	},
@@ -549,6 +656,10 @@
 	"gray_wool": {},
 	"green_banner": null,
 	"green_bed": null,
+	"green_candle": null,
+	"green_candle_cake": {
+		"texture": "cake_top"
+	},
 	"green_carpet": {
 		"texture": "green_wool"
 	},
@@ -566,6 +677,7 @@
 	"grindstone": {
 		"texture": "grindstone_round"
 	},
+	"hanging_roots": {},
 	"hay_block": {
 		"texture": "hay_block_top"
 	},
@@ -593,6 +705,9 @@
 	"infested_cracked_stone_bricks": {
 		"texture": "cracked_stone_bricks"
 	},
+	"infested_deepslate": {
+		"texture": "deepslate"
+	},
 	"infested_mossy_stone_bricks": {
 		"texture": "mossy_stone_bricks"
 	},
@@ -658,6 +773,7 @@
 	"lantern": {},
 	"lapis_block": {},
 	"lapis_ore": {},
+	"large_amethyst_bud": null,
 	"large_fern": {
 		"grass": true,
 		"texture": "large_fern_top"
@@ -665,12 +781,20 @@
 	"lava": {
 		"texture": "lava_still"
 	},
+	"lava_cauldron": {
+		"texture": "cauldron_top"
+	},
 	"lectern": {
 		"texture": "lectern_top"
 	},
 	"lever": null,
+	"light": null,
 	"light_blue_banner": null,
 	"light_blue_bed": null,
+	"light_blue_candle": null,
+	"light_blue_candle_cake": {
+		"texture": "cake_top"
+	},
 	"light_blue_carpet": {
 		"texture": "light_blue_wool"
 	},
@@ -687,6 +811,10 @@
 	"light_blue_wool": {},
 	"light_gray_banner": null,
 	"light_gray_bed": null,
+	"light_gray_candle": null,
+	"light_gray_candle_cake": {
+		"texture": "cake_top"
+	},
 	"light_gray_carpet": {
 		"texture": "light_gray_wool"
 	},
@@ -704,6 +832,7 @@
 	"light_weighted_pressure_plate": {
 		"texture": "gold_block"
 	},
+	"lightning_rod": null,
 	"lilac": {
 		"texture": "lilac_top"
 	},
@@ -713,6 +842,10 @@
 	},
 	"lime_banner": null,
 	"lime_bed": null,
+	"lime_candle": null,
+	"lime_candle_cake": {
+		"texture": "cake_top"
+	},
 	"lime_carpet": {
 		"texture": "lime_wool"
 	},
@@ -735,6 +868,10 @@
 	},
 	"magenta_banner": null,
 	"magenta_bed": null,
+	"magenta_candle": null,
+	"magenta_candle_cake": {
+		"texture": "cake_top"
+	},
 	"magenta_carpet": {
 		"texture": "magenta_wool"
 	},
@@ -752,12 +889,17 @@
 	"magma_block": {
 		"texture": "magma"
 	},
+	"medium_amethyst_bud": null,
 	"melon": {
 		"texture": "melon_top"
 	},
 	"melon_stem": {
 		"grass": true
 	},
+	"moss_block": {},
+	"moss_carpet": {
+		"texture": "moss_block"
+	},
 	"mossy_cobblestone": {},
 	"mossy_cobblestone_slab": {
 		"texture": "mossy_cobblestone"
@@ -848,6 +990,10 @@
 	"obsidian": {},
 	"orange_banner": null,
 	"orange_bed": null,
+	"orange_candle": null,
+	"orange_candle_cake": {
+		"texture": "cake_top"
+	},
 	"orange_carpet": {
 		"texture": "orange_wool"
 	},
@@ -864,6 +1010,14 @@
 	"orange_wall_banner": null,
 	"orange_wool": {},
 	"oxeye_daisy": null,
+	"oxidized_copper": {},
+	"oxidized_cut_copper": {},
+	"oxidized_cut_copper_slab": {
+		"texture": "oxidized_cut_copper"
+	},
+	"oxidized_cut_copper_stairs": {
+		"texture": "oxidized_cut_copper"
+	},
 	"packed_ice": {},
 	"peony": {
 		"texture": "peony_top"
@@ -873,6 +1027,10 @@
 	},
 	"pink_banner": null,
 	"pink_bed": null,
+	"pink_candle": null,
+	"pink_candle_cake": {
+		"texture": "cake_top"
+	},
 	"pink_carpet": {
 		"texture": "pink_wool"
 	},
@@ -899,6 +1057,9 @@
 	"podzol": {
 		"texture": "podzol_top"
 	},
+	"pointed_dripstone": {
+		"texture": "pointed_dripstone_down_base"
+	},
 	"polished_andesite": {},
 	"polished_andesite_slab": {
 		"texture": "polished_andesite"
@@ -933,6 +1094,16 @@
 	"polished_blackstone_wall": {
 		"texture": "polished_blackstone"
 	},
+	"polished_deepslate": {},
+	"polished_deepslate_slab": {
+		"texture": "polished_deepslate"
+	},
+	"polished_deepslate_stairs": {
+		"texture": "polished_deepslate"
+	},
+	"polished_deepslate_wall": {
+		"texture": "polished_deepslate"
+	},
 	"polished_diorite": {},
 	"polished_diorite_slab": {
 		"texture": "polished_diorite"
@@ -957,6 +1128,9 @@
 	"potted_allium": {
 		"texture": "allium"
 	},
+	"potted_azalea_bush": {
+		"texture": "azalea_top"
+	},
 	"potted_azure_bluet": {
 		"texture": "azure_bluet"
 	},
@@ -997,6 +1171,9 @@
 		"grass": true,
 		"texture": "fern"
 	},
+	"potted_flowering_azalea_bush": {
+		"texture": "flowering_azalea_top"
+	},
 	"potted_jungle_sapling": {
 		"texture": "jungle_sapling"
 	},
@@ -1039,6 +1216,10 @@
 	"potted_wither_rose": {
 		"texture": "wither_rose"
 	},
+	"powder_snow": {},
+	"powder_snow_cauldron": {
+		"texture": "cauldron_top"
+	},
 	"powered_rail": {},
 	"prismarine": {},
 	"prismarine_brick_slab": {
@@ -1065,6 +1246,10 @@
 	},
 	"purple_banner": null,
 	"purple_bed": null,
+	"purple_candle": null,
+	"purple_candle_cake": {
+		"texture": "cake_top"
+	},
 	"purple_carpet": {
 		"texture": "purple_wool"
 	},
@@ -1099,8 +1284,15 @@
 		"texture": "quartz_block_top"
 	},
 	"rail": {},
+	"raw_copper_block": {},
+	"raw_gold_block": {},
+	"raw_iron_block": {},
 	"red_banner": null,
 	"red_bed": null,
+	"red_candle": null,
+	"red_candle_cake": {
+		"texture": "cake_top"
+	},
 	"red_carpet": {
 		"texture": "red_wool"
 	},
@@ -1156,6 +1348,7 @@
 	"respawn_anchor": {
 		"texture": "respawn_anchor_top"
 	},
+	"rooted_dirt": {},
 	"rose_bush": {
 		"texture": "rose_bush_top"
 	},
@@ -1175,6 +1368,9 @@
 	"scaffolding": {
 		"texture": "scaffolding_top"
 	},
+	"sculk_sensor": {
+		"texture": "sculk_sensor_top"
+	},
 	"sea_lantern": {},
 	"sea_pickle": {},
 	"seagrass": null,
@@ -1186,12 +1382,15 @@
 	"skeleton_skull": null,
 	"skeleton_wall_skull": null,
 	"slime_block": {},
+	"small_amethyst_bud": null,
+	"small_dripleaf": null,
 	"smithing_table": {
 		"texture": "smithing_table_top"
 	},
 	"smoker": {
 		"texture": "smoker_top"
 	},
+	"smooth_basalt": {},
 	"smooth_quartz": {
 		"texture": "quartz_block_top"
 	},
@@ -1240,6 +1439,7 @@
 	"soul_wall_torch": null,
 	"spawner": {},
 	"sponge": {},
+	"spore_blossom": {},
 	"spruce_button": null,
 	"spruce_door": {
 		"texture": "spruce_door_top"
@@ -1370,6 +1570,7 @@
 		"texture": "target_top"
 	},
 	"terracotta": {},
+	"tinted_glass": {},
 	"tnt": {
 		"texture": "tnt_top"
 	},
@@ -1383,6 +1584,7 @@
 	"tube_coral_block": {},
 	"tube_coral_fan": null,
 	"tube_coral_wall_fan": null,
+	"tuff": {},
 	"turtle_egg": {},
 	"twisting_vines": {},
 	"twisting_vines_plant": {},
@@ -1431,6 +1633,65 @@
 		"texture": "water_still",
 		"water": true
 	},
+	"water_cauldron": {
+		"texture": "cauldron_top"
+	},
+	"waxed_copper_block": {
+		"texture": "copper_block"
+	},
+	"waxed_cut_copper": {
+		"texture": "cut_copper"
+	},
+	"waxed_cut_copper_slab": {
+		"texture": "cut_copper"
+	},
+	"waxed_cut_copper_stairs": {
+		"texture": "cut_copper"
+	},
+	"waxed_exposed_copper": {
+		"texture": "exposed_copper"
+	},
+	"waxed_exposed_cut_copper": {
+		"texture": "exposed_cut_copper"
+	},
+	"waxed_exposed_cut_copper_slab": {
+		"texture": "exposed_cut_copper"
+	},
+	"waxed_exposed_cut_copper_stairs": {
+		"texture": "exposed_cut_copper"
+	},
+	"waxed_oxidized_copper": {
+		"texture": "oxidized_copper"
+	},
+	"waxed_oxidized_cut_copper": {
+		"texture": "oxidized_cut_copper"
+	},
+	"waxed_oxidized_cut_copper_slab": {
+		"texture": "oxidized_cut_copper"
+	},
+	"waxed_oxidized_cut_copper_stairs": {
+		"texture": "oxidized_cut_copper"
+	},
+	"waxed_weathered_copper": {
+		"texture": "weathered_copper"
+	},
+	"waxed_weathered_cut_copper": {
+		"texture": "weathered_cut_copper"
+	},
+	"waxed_weathered_cut_copper_slab": {
+		"texture": "weathered_cut_copper"
+	},
+	"waxed_weathered_cut_copper_stairs": {
+		"texture": "weathered_cut_copper"
+	},
+	"weathered_copper": {},
+	"weathered_cut_copper": {},
+	"weathered_cut_copper_slab": {
+		"texture": "weathered_cut_copper"
+	},
+	"weathered_cut_copper_stairs": {
+		"texture": "weathered_cut_copper"
+	},
 	"weeping_vines": {},
 	"weeping_vines_plant": {},
 	"wet_sponge": {},
@@ -1439,6 +1700,10 @@
 	},
 	"white_banner": null,
 	"white_bed": null,
+	"white_candle": null,
+	"white_candle_cake": {
+		"texture": "cake_top"
+	},
 	"white_carpet": {
 		"texture": "white_wool"
 	},
@@ -1459,6 +1724,10 @@
 	"wither_skeleton_wall_skull": null,
 	"yellow_banner": null,
 	"yellow_bed": null,
+	"yellow_candle": null,
+	"yellow_candle_cake": {
+		"texture": "cake_top"
+	},
 	"yellow_carpet": {
 		"texture": "yellow_wool"
 	},

src/Resource/Biome.cpp

@@ -342,6 +342,8 @@ const Biome *const BIOMES[256] = {
 	/* 171 */ &BiomeDesert, /* Crimson Forest */
 	/* 172 */ &BiomeDesert, /* Warped Forest */
 	/* 173 */ &BiomeDesert, /* Basalt Deltas */
+	/* 174 */ &BiomePlains, /* Dripstone Caves */
+	/* 175 */ &BiomeDefault, /* Lush Caves */
 };
 
 }

src/Resource/BlockType.inc

@@ -16,6 +16,8 @@
 {"minecraft:activator_rail", {BLOCK_OPAQUE, {115, 87, 74}}},
 {"minecraft:air", {0, {0, 0, 0}}},
 {"minecraft:allium", {0, {0, 0, 0}}},
+{"minecraft:amethyst_block", {BLOCK_OPAQUE, {133, 97, 191}}},
+{"minecraft:amethyst_cluster", {BLOCK_OPAQUE, {163, 126, 207}}},
 {"minecraft:ancient_debris", {BLOCK_OPAQUE, {94, 66, 58}}},
 {"minecraft:andesite", {BLOCK_OPAQUE, {136, 136, 136}}},
 {"minecraft:andesite_slab", {BLOCK_OPAQUE, {136, 136, 136}}},
@@ -24,6 +26,8 @@
 {"minecraft:anvil", {BLOCK_OPAQUE, {72, 72, 72}}},
 {"minecraft:attached_melon_stem", {BLOCK_OPAQUE|BLOCK_GRASS, {141, 142, 141}}},
 {"minecraft:attached_pumpkin_stem", {BLOCK_OPAQUE|BLOCK_GRASS, {139, 139, 139}}},
+{"minecraft:azalea", {BLOCK_OPAQUE, {101, 124, 47}}},
+{"minecraft:azalea_leaves", {BLOCK_OPAQUE, {90, 114, 44}}},
 {"minecraft:azure_bluet", {0, {0, 0, 0}}},
 {"minecraft:bamboo", {BLOCK_OPAQUE, {93, 144, 19}}},
 {"minecraft:bamboo_sapling", {0, {0, 0, 0}}},
@@ -36,6 +40,8 @@
 {"minecraft:beehive", {BLOCK_OPAQUE, {180, 146, 90}}},
 {"minecraft:beetroots", {BLOCK_OPAQUE, {93, 91, 30}}},
 {"minecraft:bell", {BLOCK_OPAQUE, {253, 235, 110}}},
+{"minecraft:big_dripleaf", {BLOCK_OPAQUE, {111, 141, 51}}},
+{"minecraft:big_dripleaf_stem", {0, {0, 0, 0}}},
 {"minecraft:birch_button", {0, {0, 0, 0}}},
 {"minecraft:birch_door", {BLOCK_OPAQUE, {220, 209, 176}}},
 {"minecraft:birch_fence", {BLOCK_OPAQUE, {192, 175, 121}}},
@@ -53,6 +59,8 @@
 {"minecraft:birch_wood", {BLOCK_OPAQUE, {216, 215, 210}}},
 {"minecraft:black_banner", {0, {0, 0, 0}}},
 {"minecraft:black_bed", {0, {0, 0, 0}}},
+{"minecraft:black_candle", {0, {0, 0, 0}}},
+{"minecraft:black_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:black_carpet", {BLOCK_OPAQUE, {20, 21, 25}}},
 {"minecraft:black_concrete", {BLOCK_OPAQUE, {8, 10, 15}}},
 {"minecraft:black_concrete_powder", {BLOCK_OPAQUE, {25, 26, 31}}},
@@ -70,6 +78,8 @@
 {"minecraft:blast_furnace", {BLOCK_OPAQUE, {80, 80, 81}}},
 {"minecraft:blue_banner", {0, {0, 0, 0}}},
 {"minecraft:blue_bed", {0, {0, 0, 0}}},
+{"minecraft:blue_candle", {0, {0, 0, 0}}},
+{"minecraft:blue_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:blue_carpet", {BLOCK_OPAQUE, {53, 57, 157}}},
 {"minecraft:blue_concrete", {BLOCK_OPAQUE, {44, 46, 143}}},
 {"minecraft:blue_concrete_powder", {BLOCK_OPAQUE, {70, 73, 166}}},
@@ -95,6 +105,8 @@
 {"minecraft:bricks", {BLOCK_OPAQUE, {150, 97, 83}}},
 {"minecraft:brown_banner", {0, {0, 0, 0}}},
 {"minecraft:brown_bed", {0, {0, 0, 0}}},
+{"minecraft:brown_candle", {0, {0, 0, 0}}},
+{"minecraft:brown_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:brown_carpet", {BLOCK_OPAQUE, {114, 71, 40}}},
 {"minecraft:brown_concrete", {BLOCK_OPAQUE, {96, 59, 31}}},
 {"minecraft:brown_concrete_powder", {BLOCK_OPAQUE, {125, 84, 53}}},
@@ -112,18 +124,25 @@
 {"minecraft:bubble_coral_block", {BLOCK_OPAQUE, {165, 26, 162}}},
 {"minecraft:bubble_coral_fan", {0, {0, 0, 0}}},
 {"minecraft:bubble_coral_wall_fan", {0, {0, 0, 0}}},
+{"minecraft:budding_amethyst", {BLOCK_OPAQUE, {132, 96, 186}}},
 {"minecraft:cactus", {BLOCK_OPAQUE, {85, 127, 43}}},
 {"minecraft:cake", {BLOCK_OPAQUE, {248, 222, 214}}},
+{"minecraft:calcite", {BLOCK_OPAQUE, {223, 224, 220}}},
 {"minecraft:campfire", {BLOCK_OPAQUE, {110, 88, 54}}},
+{"minecraft:candle", {0, {0, 0, 0}}},
+{"minecraft:candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:carrots", {BLOCK_OPAQUE, {81, 123, 37}}},
 {"minecraft:cartography_table", {BLOCK_OPAQUE, {104, 87, 67}}},
 {"minecraft:carved_pumpkin", {BLOCK_OPAQUE, {198, 118, 24}}},
 {"minecraft:cauldron", {BLOCK_OPAQUE, {73, 72, 74}}},
 {"minecraft:cave_air", {0, {0, 0, 0}}},
+{"minecraft:cave_vines", {BLOCK_OPAQUE, {90, 109, 40}}},
+{"minecraft:cave_vines_plant", {BLOCK_OPAQUE, {88, 101, 38}}},
 {"minecraft:chain", {0, {0, 0, 0}}},
 {"minecraft:chain_command_block", {BLOCK_OPAQUE, {131, 161, 147}}},
 {"minecraft:chest", {BLOCK_OPAQUE, {162, 130, 78}}},
 {"minecraft:chipped_anvil", {BLOCK_OPAQUE, {72, 72, 72}}},
+{"minecraft:chiseled_deepslate", {BLOCK_OPAQUE, {54, 54, 54}}},
 {"minecraft:chiseled_nether_bricks", {BLOCK_OPAQUE, {47, 23, 28}}},
 {"minecraft:chiseled_polished_blackstone", {BLOCK_OPAQUE, {53, 48, 56}}},
 {"minecraft:chiseled_quartz_block", {BLOCK_OPAQUE, {231, 226, 218}}},
@@ -134,8 +153,12 @@
 {"minecraft:chorus_plant", {BLOCK_OPAQUE, {93, 57, 93}}},
 {"minecraft:clay", {BLOCK_OPAQUE, {160, 166, 179}}},
 {"minecraft:coal_block", {BLOCK_OPAQUE, {16, 15, 15}}},
-{"minecraft:coal_ore", {BLOCK_OPAQUE, {116, 116, 116}}},
+{"minecraft:coal_ore", {BLOCK_OPAQUE, {105, 105, 105}}},
 {"minecraft:coarse_dirt", {BLOCK_OPAQUE, {119, 85, 59}}},
+{"minecraft:cobbled_deepslate", {BLOCK_OPAQUE, {77, 77, 80}}},
+{"minecraft:cobbled_deepslate_slab", {BLOCK_OPAQUE, {77, 77, 80}}},
+{"minecraft:cobbled_deepslate_stairs", {BLOCK_OPAQUE, {77, 77, 80}}},
+{"minecraft:cobbled_deepslate_wall", {BLOCK_OPAQUE, {77, 77, 80}}},
 {"minecraft:cobblestone", {BLOCK_OPAQUE, {127, 127, 127}}},
 {"minecraft:cobblestone_slab", {BLOCK_OPAQUE, {127, 127, 127}}},
 {"minecraft:cobblestone_stairs", {BLOCK_OPAQUE, {127, 127, 127}}},
@@ -146,9 +169,13 @@
 {"minecraft:comparator", {BLOCK_OPAQUE, {166, 161, 159}}},
 {"minecraft:composter", {BLOCK_OPAQUE, {88, 61, 23}}},
 {"minecraft:conduit", {BLOCK_OPAQUE, {159, 139, 113}}},
+{"minecraft:copper_block", {BLOCK_OPAQUE, {192, 107, 79}}},
+{"minecraft:copper_ore", {BLOCK_OPAQUE, {124, 125, 120}}},
 {"minecraft:cornflower", {0, {0, 0, 0}}},
+{"minecraft:cracked_deepslate_bricks", {BLOCK_OPAQUE, {64, 64, 65}}},
+{"minecraft:cracked_deepslate_tiles", {BLOCK_OPAQUE, {52, 52, 52}}},
 {"minecraft:cracked_nether_bricks", {BLOCK_OPAQUE, {40, 20, 23}}},
-{"minecraft:cracked_polished_blackstone_bricks", {BLOCK_OPAQUE, {43, 37, 43}}},
+{"minecraft:cracked_polished_blackstone_bricks", {BLOCK_OPAQUE, {44, 37, 43}}},
 {"minecraft:cracked_stone_bricks", {BLOCK_OPAQUE, {118, 117, 118}}},
 {"minecraft:crafting_table", {BLOCK_OPAQUE, {119, 73, 42}}},
 {"minecraft:creeper_head", {0, {0, 0, 0}}},
@@ -170,12 +197,17 @@
 {"minecraft:crimson_trapdoor", {BLOCK_OPAQUE, {103, 50, 72}}},
 {"minecraft:crimson_wall_sign", {0, {0, 0, 0}}},
 {"minecraft:crying_obsidian", {BLOCK_OPAQUE, {32, 10, 60}}},
+{"minecraft:cut_copper", {BLOCK_OPAQUE, {191, 106, 80}}},
+{"minecraft:cut_copper_slab", {BLOCK_OPAQUE, {191, 106, 80}}},
+{"minecraft:cut_copper_stairs", {BLOCK_OPAQUE, {191, 106, 80}}},
 {"minecraft:cut_red_sandstone", {BLOCK_OPAQUE, {181, 97, 31}}},
 {"minecraft:cut_red_sandstone_slab", {BLOCK_OPAQUE, {181, 97, 31}}},
 {"minecraft:cut_sandstone", {BLOCK_OPAQUE, {223, 214, 170}}},
 {"minecraft:cut_sandstone_slab", {BLOCK_OPAQUE, {223, 214, 170}}},
 {"minecraft:cyan_banner", {0, {0, 0, 0}}},
 {"minecraft:cyan_bed", {0, {0, 0, 0}}},
+{"minecraft:cyan_candle", {0, {0, 0, 0}}},
+{"minecraft:cyan_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:cyan_carpet", {BLOCK_OPAQUE, {21, 137, 145}}},
 {"minecraft:cyan_concrete", {BLOCK_OPAQUE, {21, 119, 136}}},
 {"minecraft:cyan_concrete_powder", {BLOCK_OPAQUE, {36, 147, 157}}},
@@ -228,22 +260,41 @@
 {"minecraft:dead_tube_coral_block", {BLOCK_OPAQUE, {130, 123, 119}}},
 {"minecraft:dead_tube_coral_fan", {0, {0, 0, 0}}},
 {"minecraft:dead_tube_coral_wall_fan", {0, {0, 0, 0}}},
+{"minecraft:deepslate", {BLOCK_OPAQUE, {80, 80, 82}}},
+{"minecraft:deepslate_brick_slab", {BLOCK_OPAQUE, {70, 70, 71}}},
+{"minecraft:deepslate_brick_stairs", {BLOCK_OPAQUE, {70, 70, 71}}},
+{"minecraft:deepslate_brick_wall", {BLOCK_OPAQUE, {70, 70, 71}}},
+{"minecraft:deepslate_bricks", {BLOCK_OPAQUE, {70, 70, 71}}},
+{"minecraft:deepslate_coal_ore", {BLOCK_OPAQUE, {74, 74, 76}}},
+{"minecraft:deepslate_copper_ore", {BLOCK_OPAQUE, {92, 93, 89}}},
+{"minecraft:deepslate_diamond_ore", {BLOCK_OPAQUE, {83, 106, 106}}},
+{"minecraft:deepslate_emerald_ore", {BLOCK_OPAQUE, {78, 104, 87}}},
+{"minecraft:deepslate_gold_ore", {BLOCK_OPAQUE, {115, 102, 78}}},
+{"minecraft:deepslate_iron_ore", {BLOCK_OPAQUE, {106, 99, 94}}},
+{"minecraft:deepslate_lapis_ore", {BLOCK_OPAQUE, {79, 90, 115}}},
+{"minecraft:deepslate_redstone_ore", {BLOCK_OPAQUE, {104, 73, 74}}},
+{"minecraft:deepslate_tile_slab", {BLOCK_OPAQUE, {54, 54, 55}}},
+{"minecraft:deepslate_tile_stairs", {BLOCK_OPAQUE, {54, 54, 55}}},
+{"minecraft:deepslate_tile_wall", {BLOCK_OPAQUE, {54, 54, 55}}},
+{"minecraft:deepslate_tiles", {BLOCK_OPAQUE, {54, 54, 55}}},
 {"minecraft:detector_rail", {BLOCK_OPAQUE, {123, 104, 90}}},
 {"minecraft:diamond_block", {BLOCK_OPAQUE, {98, 237, 228}}},
-{"minecraft:diamond_ore", {BLOCK_OPAQUE, {125, 142, 141}}},
+{"minecraft:diamond_ore", {BLOCK_OPAQUE, {121, 141, 140}}},
 {"minecraft:diorite", {BLOCK_OPAQUE, {188, 188, 188}}},
 {"minecraft:diorite_slab", {BLOCK_OPAQUE, {188, 188, 188}}},
 {"minecraft:diorite_stairs", {BLOCK_OPAQUE, {188, 188, 188}}},
 {"minecraft:diorite_wall", {BLOCK_OPAQUE, {188, 188, 188}}},
 {"minecraft:dirt", {BLOCK_OPAQUE, {134, 96, 67}}},
+{"minecraft:dirt_path", {BLOCK_OPAQUE, {148, 121, 65}}},
 {"minecraft:dispenser", {BLOCK_OPAQUE, {110, 109, 109}}},
 {"minecraft:dragon_egg", {BLOCK_OPAQUE, {12, 9, 15}}},
 {"minecraft:dragon_head", {0, {0, 0, 0}}},
 {"minecraft:dragon_wall_head", {0, {0, 0, 0}}},
 {"minecraft:dried_kelp_block", {BLOCK_OPAQUE, {50, 58, 38}}},
+{"minecraft:dripstone_block", {BLOCK_OPAQUE, {134, 107, 92}}},
 {"minecraft:dropper", {BLOCK_OPAQUE, {110, 109, 109}}},
 {"minecraft:emerald_block", {BLOCK_OPAQUE, {42, 203, 87}}},
-{"minecraft:emerald_ore", {BLOCK_OPAQUE, {117, 136, 124}}},
+{"minecraft:emerald_ore", {BLOCK_OPAQUE, {108, 136, 115}}},
 {"minecraft:enchanting_table", {BLOCK_OPAQUE, {128, 75, 85}}},
 {"minecraft:end_gateway", {BLOCK_OPAQUE, {15, 10, 24}}},
 {"minecraft:end_portal", {BLOCK_OPAQUE, {15, 10, 24}}},
@@ -255,6 +306,10 @@
 {"minecraft:end_stone_brick_wall", {BLOCK_OPAQUE, {218, 224, 162}}},
 {"minecraft:end_stone_bricks", {BLOCK_OPAQUE, {218, 224, 162}}},
 {"minecraft:ender_chest", {BLOCK_OPAQUE, {15, 10, 24}}},
+{"minecraft:exposed_copper", {BLOCK_OPAQUE, {161, 125, 103}}},
+{"minecraft:exposed_cut_copper", {BLOCK_OPAQUE, {154, 121, 101}}},
+{"minecraft:exposed_cut_copper_slab", {BLOCK_OPAQUE, {154, 121, 101}}},
+{"minecraft:exposed_cut_copper_stairs", {BLOCK_OPAQUE, {154, 121, 101}}},
 {"minecraft:farmland", {BLOCK_OPAQUE, {81, 44, 15}}},
 {"minecraft:fern", {0, {0, 0, 0}}},
 {"minecraft:fire", {BLOCK_OPAQUE, {211, 140, 53}}},
@@ -264,14 +319,18 @@
 {"minecraft:fire_coral_wall_fan", {0, {0, 0, 0}}},
 {"minecraft:fletching_table", {BLOCK_OPAQUE, {197, 180, 133}}},
 {"minecraft:flower_pot", {BLOCK_OPAQUE, {124, 68, 53}}},
+{"minecraft:flowering_azalea", {BLOCK_OPAQUE, {112, 121, 64}}},
+{"minecraft:flowering_azalea_leaves", {BLOCK_OPAQUE, {99, 111, 60}}},
 {"minecraft:frosted_ice", {BLOCK_OPAQUE, {140, 181, 252}}},
 {"minecraft:furnace", {BLOCK_OPAQUE, {110, 109, 109}}},
-{"minecraft:gilded_blackstone", {BLOCK_OPAQUE, {56, 43, 38}}},
+{"minecraft:gilded_blackstone", {BLOCK_OPAQUE, {55, 42, 38}}},
 {"minecraft:glass", {BLOCK_OPAQUE, {175, 213, 219}}},
 {"minecraft:glass_pane", {BLOCK_OPAQUE, {211, 239, 244}}},
+{"minecraft:glow_item_frame", {0, {0, 0, 0}}},
+{"minecraft:glow_lichen", {0, {0, 0, 0}}},
 {"minecraft:glowstone", {BLOCK_OPAQUE, {171, 131, 84}}},
 {"minecraft:gold_block", {BLOCK_OPAQUE, {246, 208, 61}}},
-{"minecraft:gold_ore", {BLOCK_OPAQUE, {143, 140, 125}}},
+{"minecraft:gold_ore", {BLOCK_OPAQUE, {145, 133, 106}}},
 {"minecraft:granite", {BLOCK_OPAQUE, {149, 103, 85}}},
 {"minecraft:granite_slab", {BLOCK_OPAQUE, {149, 103, 85}}},
 {"minecraft:granite_stairs", {BLOCK_OPAQUE, {149, 103, 85}}},
@@ -282,6 +341,8 @@
 {"minecraft:gravel", {BLOCK_OPAQUE, {131, 127, 126}}},
 {"minecraft:gray_banner", {0, {0, 0, 0}}},
 {"minecraft:gray_bed", {0, {0, 0, 0}}},
+{"minecraft:gray_candle", {0, {0, 0, 0}}},
+{"minecraft:gray_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:gray_carpet", {BLOCK_OPAQUE, {62, 68, 71}}},
 {"minecraft:gray_concrete", {BLOCK_OPAQUE, {54, 57, 61}}},
 {"minecraft:gray_concrete_powder", {BLOCK_OPAQUE, {76, 81, 84}}},
@@ -294,6 +355,8 @@
 {"minecraft:gray_wool", {BLOCK_OPAQUE, {62, 68, 71}}},
 {"minecraft:green_banner", {0, {0, 0, 0}}},
 {"minecraft:green_bed", {0, {0, 0, 0}}},
+{"minecraft:green_candle", {0, {0, 0, 0}}},
+{"minecraft:green_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:green_carpet", {BLOCK_OPAQUE, {84, 109, 27}}},
 {"minecraft:green_concrete", {BLOCK_OPAQUE, {73, 91, 36}}},
 {"minecraft:green_concrete_powder", {BLOCK_OPAQUE, {97, 119, 44}}},
@@ -305,6 +368,7 @@
 {"minecraft:green_wall_banner", {0, {0, 0, 0}}},
 {"minecraft:green_wool", {BLOCK_OPAQUE, {84, 109, 27}}},
 {"minecraft:grindstone", {BLOCK_OPAQUE, {142, 142, 142}}},
+{"minecraft:hanging_roots", {BLOCK_OPAQUE, {161, 115, 91}}},
 {"minecraft:hay_block", {BLOCK_OPAQUE, {165, 139, 12}}},
 {"minecraft:heavy_weighted_pressure_plate", {BLOCK_OPAQUE, {220, 220, 220}}},
 {"minecraft:honey_block", {BLOCK_OPAQUE, {251, 185, 52}}},
@@ -318,13 +382,14 @@
 {"minecraft:infested_chiseled_stone_bricks", {BLOCK_OPAQUE, {119, 118, 119}}},
 {"minecraft:infested_cobblestone", {BLOCK_OPAQUE, {127, 127, 127}}},
 {"minecraft:infested_cracked_stone_bricks", {BLOCK_OPAQUE, {118, 117, 118}}},
+{"minecraft:infested_deepslate", {BLOCK_OPAQUE, {80, 80, 82}}},
 {"minecraft:infested_mossy_stone_bricks", {BLOCK_OPAQUE, {115, 121, 105}}},
 {"minecraft:infested_stone", {BLOCK_OPAQUE, {125, 125, 125}}},
 {"minecraft:infested_stone_bricks", {BLOCK_OPAQUE, {122, 121, 122}}},
 {"minecraft:iron_bars", {BLOCK_OPAQUE, {136, 139, 135}}},
 {"minecraft:iron_block", {BLOCK_OPAQUE, {220, 220, 220}}},
 {"minecraft:iron_door", {BLOCK_OPAQUE, {193, 192, 192}}},
-{"minecraft:iron_ore", {BLOCK_OPAQUE, {136, 130, 127}}},
+{"minecraft:iron_ore", {BLOCK_OPAQUE, {136, 129, 122}}},
 {"minecraft:iron_trapdoor", {BLOCK_OPAQUE, {202, 202, 202}}},
 {"minecraft:item_frame", {0, {0, 0, 0}}},
 {"minecraft:jack_o_lantern", {BLOCK_OPAQUE, {214, 152, 52}}},
@@ -350,13 +415,18 @@
 {"minecraft:ladder", {0, {0, 0, 0}}},
 {"minecraft:lantern", {BLOCK_OPAQUE, {106, 91, 83}}},
 {"minecraft:lapis_block", {BLOCK_OPAQUE, {30, 67, 140}}},
-{"minecraft:lapis_ore", {BLOCK_OPAQUE, {99, 110, 132}}},
+{"minecraft:lapis_ore", {BLOCK_OPAQUE, {107, 117, 141}}},
+{"minecraft:large_amethyst_bud", {0, {0, 0, 0}}},
 {"minecraft:large_fern", {BLOCK_OPAQUE|BLOCK_GRASS, {125, 125, 125}}},
 {"minecraft:lava", {BLOCK_OPAQUE, {212, 90, 18}}},
+{"minecraft:lava_cauldron", {BLOCK_OPAQUE, {73, 72, 74}}},
 {"minecraft:lectern", {BLOCK_OPAQUE, {173, 137, 83}}},
 {"minecraft:lever", {0, {0, 0, 0}}},
+{"minecraft:light", {0, {0, 0, 0}}},
 {"minecraft:light_blue_banner", {0, {0, 0, 0}}},
 {"minecraft:light_blue_bed", {0, {0, 0, 0}}},
+{"minecraft:light_blue_candle", {0, {0, 0, 0}}},
+{"minecraft:light_blue_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:light_blue_carpet", {BLOCK_OPAQUE, {58, 175, 217}}},
 {"minecraft:light_blue_concrete", {BLOCK_OPAQUE, {35, 137, 198}}},
 {"minecraft:light_blue_concrete_powder", {BLOCK_OPAQUE, {74, 180, 213}}},
@@ -369,6 +439,8 @@
 {"minecraft:light_blue_wool", {BLOCK_OPAQUE, {58, 175, 217}}},
 {"minecraft:light_gray_banner", {0, {0, 0, 0}}},
 {"minecraft:light_gray_bed", {0, {0, 0, 0}}},
+{"minecraft:light_gray_candle", {0, {0, 0, 0}}},
+{"minecraft:light_gray_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:light_gray_carpet", {BLOCK_OPAQUE, {142, 142, 134}}},
 {"minecraft:light_gray_concrete", {BLOCK_OPAQUE, {125, 125, 115}}},
 {"minecraft:light_gray_concrete_powder", {BLOCK_OPAQUE, {154, 154, 148}}},
@@ -380,11 +452,14 @@
 {"minecraft:light_gray_wall_banner", {0, {0, 0, 0}}},
 {"minecraft:light_gray_wool", {BLOCK_OPAQUE, {142, 142, 134}}},
 {"minecraft:light_weighted_pressure_plate", {BLOCK_OPAQUE, {246, 208, 61}}},
+{"minecraft:lightning_rod", {0, {0, 0, 0}}},
 {"minecraft:lilac", {BLOCK_OPAQUE, {154, 125, 147}}},
 {"minecraft:lily_of_the_valley", {0, {0, 0, 0}}},
 {"minecraft:lily_pad", {BLOCK_OPAQUE|BLOCK_GRASS, {133, 133, 133}}},
 {"minecraft:lime_banner", {0, {0, 0, 0}}},
 {"minecraft:lime_bed", {0, {0, 0, 0}}},
+{"minecraft:lime_candle", {0, {0, 0, 0}}},
+{"minecraft:lime_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:lime_carpet", {BLOCK_OPAQUE, {112, 185, 25}}},
 {"minecraft:lime_concrete", {BLOCK_OPAQUE, {94, 168, 24}}},
 {"minecraft:lime_concrete_powder", {BLOCK_OPAQUE, {125, 189, 41}}},
@@ -399,6 +474,8 @@
 {"minecraft:loom", {BLOCK_OPAQUE, {142, 119, 91}}},
 {"minecraft:magenta_banner", {0, {0, 0, 0}}},
 {"minecraft:magenta_bed", {0, {0, 0, 0}}},
+{"minecraft:magenta_candle", {0, {0, 0, 0}}},
+{"minecraft:magenta_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:magenta_carpet", {BLOCK_OPAQUE, {189, 68, 179}}},
 {"minecraft:magenta_concrete", {BLOCK_OPAQUE, {169, 48, 159}}},
 {"minecraft:magenta_concrete_powder", {BLOCK_OPAQUE, {192, 83, 184}}},
@@ -410,8 +487,11 @@
 {"minecraft:magenta_wall_banner", {0, {0, 0, 0}}},
 {"minecraft:magenta_wool", {BLOCK_OPAQUE, {189, 68, 179}}},
 {"minecraft:magma_block", {BLOCK_OPAQUE, {142, 63, 31}}},
+{"minecraft:medium_amethyst_bud", {0, {0, 0, 0}}},
 {"minecraft:melon", {BLOCK_OPAQUE, {111, 144, 30}}},
 {"minecraft:melon_stem", {BLOCK_OPAQUE|BLOCK_GRASS, {153, 153, 153}}},
+{"minecraft:moss_block", {BLOCK_OPAQUE, {89, 109, 45}}},
+{"minecraft:moss_carpet", {BLOCK_OPAQUE, {89, 109, 45}}},
 {"minecraft:mossy_cobblestone", {BLOCK_OPAQUE, {110, 118, 94}}},
 {"minecraft:mossy_cobblestone_slab", {BLOCK_OPAQUE, {110, 118, 94}}},
 {"minecraft:mossy_cobblestone_stairs", {BLOCK_OPAQUE, {110, 118, 94}}},
@@ -456,6 +536,8 @@
 {"minecraft:obsidian", {BLOCK_OPAQUE, {15, 10, 24}}},
 {"minecraft:orange_banner", {0, {0, 0, 0}}},
 {"minecraft:orange_bed", {0, {0, 0, 0}}},
+{"minecraft:orange_candle", {0, {0, 0, 0}}},
+{"minecraft:orange_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:orange_carpet", {BLOCK_OPAQUE, {240, 118, 19}}},
 {"minecraft:orange_concrete", {BLOCK_OPAQUE, {224, 97, 0}}},
 {"minecraft:orange_concrete_powder", {BLOCK_OPAQUE, {227, 131, 31}}},
@@ -468,11 +550,17 @@
 {"minecraft:orange_wall_banner", {0, {0, 0, 0}}},
 {"minecraft:orange_wool", {BLOCK_OPAQUE, {240, 118, 19}}},
 {"minecraft:oxeye_daisy", {0, {0, 0, 0}}},
+{"minecraft:oxidized_copper", {BLOCK_OPAQUE, {82, 162, 132}}},
+{"minecraft:oxidized_cut_copper", {BLOCK_OPAQUE, {79, 153, 126}}},
+{"minecraft:oxidized_cut_copper_slab", {BLOCK_OPAQUE, {79, 153, 126}}},
+{"minecraft:oxidized_cut_copper_stairs", {BLOCK_OPAQUE, {79, 153, 126}}},
 {"minecraft:packed_ice", {BLOCK_OPAQUE, {141, 180, 250}}},
 {"minecraft:peony", {BLOCK_OPAQUE, {129, 126, 139}}},
 {"minecraft:petrified_oak_slab", {BLOCK_OPAQUE, {162, 130, 78}}},
 {"minecraft:pink_banner", {0, {0, 0, 0}}},
 {"minecraft:pink_bed", {0, {0, 0, 0}}},
+{"minecraft:pink_candle", {0, {0, 0, 0}}},
+{"minecraft:pink_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:pink_carpet", {BLOCK_OPAQUE, {237, 141, 172}}},
 {"minecraft:pink_concrete", {BLOCK_OPAQUE, {213, 101, 142}}},
 {"minecraft:pink_concrete_powder", {BLOCK_OPAQUE, {228, 153, 181}}},
@@ -489,20 +577,25 @@
 {"minecraft:player_head", {0, {0, 0, 0}}},
 {"minecraft:player_wall_head", {0, {0, 0, 0}}},
 {"minecraft:podzol", {BLOCK_OPAQUE, {91, 63, 24}}},
+{"minecraft:pointed_dripstone", {BLOCK_OPAQUE, {129, 102, 89}}},
 {"minecraft:polished_andesite", {BLOCK_OPAQUE, {132, 134, 133}}},
 {"minecraft:polished_andesite_slab", {BLOCK_OPAQUE, {132, 134, 133}}},
 {"minecraft:polished_andesite_stairs", {BLOCK_OPAQUE, {132, 134, 133}}},
 {"minecraft:polished_basalt", {BLOCK_OPAQUE, {99, 98, 100}}},
 {"minecraft:polished_blackstone", {BLOCK_OPAQUE, {53, 48, 56}}},
-{"minecraft:polished_blackstone_brick_slab", {BLOCK_OPAQUE, {46, 41, 48}}},
-{"minecraft:polished_blackstone_brick_stairs", {BLOCK_OPAQUE, {46, 41, 48}}},
-{"minecraft:polished_blackstone_brick_wall", {BLOCK_OPAQUE, {46, 41, 48}}},
-{"minecraft:polished_blackstone_bricks", {BLOCK_OPAQUE, {46, 41, 48}}},
+{"minecraft:polished_blackstone_brick_slab", {BLOCK_OPAQUE, {48, 42, 49}}},
+{"minecraft:polished_blackstone_brick_stairs", {BLOCK_OPAQUE, {48, 42, 49}}},
+{"minecraft:polished_blackstone_brick_wall", {BLOCK_OPAQUE, {48, 42, 49}}},
+{"minecraft:polished_blackstone_bricks", {BLOCK_OPAQUE, {48, 42, 49}}},
 {"minecraft:polished_blackstone_button", {0, {0, 0, 0}}},
 {"minecraft:polished_blackstone_pressure_plate", {BLOCK_OPAQUE, {53, 48, 56}}},
 {"minecraft:polished_blackstone_slab", {BLOCK_OPAQUE, {53, 48, 56}}},
 {"minecraft:polished_blackstone_stairs", {BLOCK_OPAQUE, {53, 48, 56}}},
 {"minecraft:polished_blackstone_wall", {BLOCK_OPAQUE, {53, 48, 56}}},
+{"minecraft:polished_deepslate", {BLOCK_OPAQUE, {72, 72, 73}}},
+{"minecraft:polished_deepslate_slab", {BLOCK_OPAQUE, {72, 72, 73}}},
+{"minecraft:polished_deepslate_stairs", {BLOCK_OPAQUE, {72, 72, 73}}},
+{"minecraft:polished_deepslate_wall", {BLOCK_OPAQUE, {72, 72, 73}}},
 {"minecraft:polished_diorite", {BLOCK_OPAQUE, {192, 193, 194}}},
 {"minecraft:polished_diorite_slab", {BLOCK_OPAQUE, {192, 193, 194}}},
 {"minecraft:polished_diorite_stairs", {BLOCK_OPAQUE, {192, 193, 194}}},
@@ -513,6 +606,7 @@
 {"minecraft:potatoes", {BLOCK_OPAQUE, {84, 135, 47}}},
 {"minecraft:potted_acacia_sapling", {BLOCK_OPAQUE, {118, 117, 23}}},
 {"minecraft:potted_allium", {BLOCK_OPAQUE, {158, 137, 183}}},
+{"minecraft:potted_azalea_bush", {BLOCK_OPAQUE, {101, 124, 47}}},
 {"minecraft:potted_azure_bluet", {BLOCK_OPAQUE, {169, 204, 127}}},
 {"minecraft:potted_bamboo", {BLOCK_OPAQUE, {93, 144, 19}}},
 {"minecraft:potted_birch_sapling", {BLOCK_OPAQUE, {127, 160, 79}}},
@@ -526,6 +620,7 @@
 {"minecraft:potted_dark_oak_sapling", {BLOCK_OPAQUE, {61, 90, 30}}},
 {"minecraft:potted_dead_bush", {BLOCK_OPAQUE, {107, 78, 40}}},
 {"minecraft:potted_fern", {BLOCK_OPAQUE|BLOCK_GRASS, {124, 124, 124}}},
+{"minecraft:potted_flowering_azalea_bush", {BLOCK_OPAQUE, {112, 121, 64}}},
 {"minecraft:potted_jungle_sapling", {BLOCK_OPAQUE, {47, 81, 16}}},
 {"minecraft:potted_lily_of_the_valley", {BLOCK_OPAQUE, {123, 174, 95}}},
 {"minecraft:potted_oak_sapling", {BLOCK_OPAQUE, {77, 106, 40}}},
@@ -540,6 +635,8 @@
 {"minecraft:potted_warped_roots", {BLOCK_OPAQUE, {20, 136, 123}}},
 {"minecraft:potted_white_tulip", {BLOCK_OPAQUE, {93, 164, 71}}},
 {"minecraft:potted_wither_rose", {BLOCK_OPAQUE, {41, 44, 23}}},
+{"minecraft:powder_snow", {BLOCK_OPAQUE, {248, 253, 253}}},
+{"minecraft:powder_snow_cauldron", {BLOCK_OPAQUE, {73, 72, 74}}},
 {"minecraft:powered_rail", {BLOCK_OPAQUE, {137, 109, 74}}},
 {"minecraft:prismarine", {BLOCK_OPAQUE, {99, 156, 151}}},
 {"minecraft:prismarine_brick_slab", {BLOCK_OPAQUE, {99, 171, 158}}},
@@ -552,6 +649,8 @@
 {"minecraft:pumpkin_stem", {BLOCK_OPAQUE|BLOCK_GRASS, {154, 154, 154}}},
 {"minecraft:purple_banner", {0, {0, 0, 0}}},
 {"minecraft:purple_bed", {0, {0, 0, 0}}},
+{"minecraft:purple_candle", {0, {0, 0, 0}}},
+{"minecraft:purple_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:purple_carpet", {BLOCK_OPAQUE, {121, 42, 172}}},
 {"minecraft:purple_concrete", {BLOCK_OPAQUE, {100, 31, 156}}},
 {"minecraft:purple_concrete_powder", {BLOCK_OPAQUE, {131, 55, 177}}},
@@ -572,8 +671,13 @@
 {"minecraft:quartz_slab", {BLOCK_OPAQUE, {235, 229, 222}}},
 {"minecraft:quartz_stairs", {BLOCK_OPAQUE, {235, 229, 222}}},
 {"minecraft:rail", {BLOCK_OPAQUE, {125, 111, 88}}},
+{"minecraft:raw_copper_block", {BLOCK_OPAQUE, {154, 105, 79}}},
+{"minecraft:raw_gold_block", {BLOCK_OPAQUE, {221, 169, 46}}},
+{"minecraft:raw_iron_block", {BLOCK_OPAQUE, {166, 135, 107}}},
 {"minecraft:red_banner", {0, {0, 0, 0}}},
 {"minecraft:red_bed", {0, {0, 0, 0}}},
+{"minecraft:red_candle", {0, {0, 0, 0}}},
+{"minecraft:red_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:red_carpet", {BLOCK_OPAQUE, {160, 39, 34}}},
 {"minecraft:red_concrete", {BLOCK_OPAQUE, {142, 32, 32}}},
 {"minecraft:red_concrete_powder", {BLOCK_OPAQUE, {168, 54, 50}}},
@@ -598,13 +702,14 @@
 {"minecraft:red_wool", {BLOCK_OPAQUE, {160, 39, 34}}},
 {"minecraft:redstone_block", {BLOCK_OPAQUE, {175, 24, 5}}},
 {"minecraft:redstone_lamp", {BLOCK_OPAQUE, {95, 54, 30}}},
-{"minecraft:redstone_ore", {BLOCK_OPAQUE, {133, 107, 107}}},
+{"minecraft:redstone_ore", {BLOCK_OPAQUE, {140, 109, 109}}},
 {"minecraft:redstone_torch", {0, {0, 0, 0}}},
 {"minecraft:redstone_wall_torch", {0, {0, 0, 0}}},
 {"minecraft:redstone_wire", {BLOCK_OPAQUE, {175, 24, 5}}},
 {"minecraft:repeater", {BLOCK_OPAQUE, {160, 157, 156}}},
 {"minecraft:repeating_command_block", {BLOCK_OPAQUE, {129, 111, 176}}},
 {"minecraft:respawn_anchor", {BLOCK_OPAQUE, {75, 26, 144}}},
+{"minecraft:rooted_dirt", {BLOCK_OPAQUE, {144, 103, 76}}},
 {"minecraft:rose_bush", {BLOCK_OPAQUE, {131, 66, 37}}},
 {"minecraft:sand", {BLOCK_OPAQUE, {219, 207, 163}}},
 {"minecraft:sandstone", {BLOCK_OPAQUE, {223, 214, 170}}},
@@ -612,6 +717,7 @@
 {"minecraft:sandstone_stairs", {BLOCK_OPAQUE, {223, 214, 170}}},
 {"minecraft:sandstone_wall", {BLOCK_OPAQUE, {223, 214, 170}}},
 {"minecraft:scaffolding", {BLOCK_OPAQUE, {174, 134, 80}}},
+{"minecraft:sculk_sensor", {BLOCK_OPAQUE, {7, 70, 84}}},
 {"minecraft:sea_lantern", {BLOCK_OPAQUE, {172, 199, 190}}},
 {"minecraft:sea_pickle", {BLOCK_OPAQUE, {90, 97, 39}}},
 {"minecraft:seagrass", {0, {0, 0, 0}}},
@@ -621,8 +727,11 @@
 {"minecraft:skeleton_skull", {0, {0, 0, 0}}},
 {"minecraft:skeleton_wall_skull", {0, {0, 0, 0}}},
 {"minecraft:slime_block", {BLOCK_OPAQUE, {111, 192, 91}}},
+{"minecraft:small_amethyst_bud", {0, {0, 0, 0}}},
+{"minecraft:small_dripleaf", {0, {0, 0, 0}}},
 {"minecraft:smithing_table", {BLOCK_OPAQUE, {57, 58, 70}}},
-{"minecraft:smoker", {BLOCK_OPAQUE, {84, 82, 80}}},
+{"minecraft:smoker", {BLOCK_OPAQUE, {85, 83, 81}}},
+{"minecraft:smooth_basalt", {BLOCK_OPAQUE, {72, 72, 78}}},
 {"minecraft:smooth_quartz", {BLOCK_OPAQUE, {235, 229, 222}}},
 {"minecraft:smooth_quartz_slab", {BLOCK_OPAQUE, {235, 229, 222}}},
 {"minecraft:smooth_quartz_stairs", {BLOCK_OPAQUE, {235, 229, 222}}},
@@ -645,6 +754,7 @@
 {"minecraft:soul_wall_torch", {0, {0, 0, 0}}},
 {"minecraft:spawner", {BLOCK_OPAQUE, {36, 46, 62}}},
 {"minecraft:sponge", {BLOCK_OPAQUE, {195, 192, 74}}},
+{"minecraft:spore_blossom", {BLOCK_OPAQUE, {206, 96, 158}}},
 {"minecraft:spruce_button", {0, {0, 0, 0}}},
 {"minecraft:spruce_door", {BLOCK_OPAQUE, {106, 80, 48}}},
 {"minecraft:spruce_fence", {BLOCK_OPAQUE, {114, 84, 48}}},
@@ -696,6 +806,7 @@
 {"minecraft:tall_seagrass", {BLOCK_OPAQUE, {59, 139, 14}}},
 {"minecraft:target", {BLOCK_OPAQUE, {226, 170, 157}}},
 {"minecraft:terracotta", {BLOCK_OPAQUE, {152, 94, 67}}},
+{"minecraft:tinted_glass", {BLOCK_OPAQUE, {44, 38, 46}}},
 {"minecraft:tnt", {BLOCK_OPAQUE, {142, 62, 53}}},
 {"minecraft:torch", {0, {0, 0, 0}}},
 {"minecraft:trapped_chest", {BLOCK_OPAQUE, {162, 130, 78}}},
@@ -705,6 +816,7 @@
 {"minecraft:tube_coral_block", {BLOCK_OPAQUE, {49, 87, 206}}},
 {"minecraft:tube_coral_fan", {0, {0, 0, 0}}},
 {"minecraft:tube_coral_wall_fan", {0, {0, 0, 0}}},
+{"minecraft:tuff", {BLOCK_OPAQUE, {108, 109, 102}}},
 {"minecraft:turtle_egg", {BLOCK_OPAQUE, {228, 226, 191}}},
 {"minecraft:twisting_vines", {BLOCK_OPAQUE, {20, 143, 124}}},
 {"minecraft:twisting_vines_plant", {BLOCK_OPAQUE, {20, 135, 122}}},
@@ -730,12 +842,35 @@
 {"minecraft:warped_wall_sign", {0, {0, 0, 0}}},
 {"minecraft:warped_wart_block", {BLOCK_OPAQUE, {22, 119, 121}}},
 {"minecraft:water", {BLOCK_OPAQUE|BLOCK_WATER, {177, 177, 177}}},
+{"minecraft:water_cauldron", {BLOCK_OPAQUE, {73, 72, 74}}},
+{"minecraft:waxed_copper_block", {BLOCK_OPAQUE, {192, 107, 79}}},
+{"minecraft:waxed_cut_copper", {BLOCK_OPAQUE, {191, 106, 80}}},
+{"minecraft:waxed_cut_copper_slab", {BLOCK_OPAQUE, {191, 106, 80}}},
+{"minecraft:waxed_cut_copper_stairs", {BLOCK_OPAQUE, {191, 106, 80}}},
+{"minecraft:waxed_exposed_copper", {BLOCK_OPAQUE, {161, 125, 103}}},
+{"minecraft:waxed_exposed_cut_copper", {BLOCK_OPAQUE, {154, 121, 101}}},
+{"minecraft:waxed_exposed_cut_copper_slab", {BLOCK_OPAQUE, {154, 121, 101}}},
+{"minecraft:waxed_exposed_cut_copper_stairs", {BLOCK_OPAQUE, {154, 121, 101}}},
+{"minecraft:waxed_oxidized_copper", {BLOCK_OPAQUE, {82, 162, 132}}},
+{"minecraft:waxed_oxidized_cut_copper", {BLOCK_OPAQUE, {79, 153, 126}}},
+{"minecraft:waxed_oxidized_cut_copper_slab", {BLOCK_OPAQUE, {79, 153, 126}}},
+{"minecraft:waxed_oxidized_cut_copper_stairs", {BLOCK_OPAQUE, {79, 153, 126}}},
+{"minecraft:waxed_weathered_copper", {BLOCK_OPAQUE, {108, 153, 110}}},
+{"minecraft:waxed_weathered_cut_copper", {BLOCK_OPAQUE, {109, 145, 107}}},
+{"minecraft:waxed_weathered_cut_copper_slab", {BLOCK_OPAQUE, {109, 145, 107}}},
+{"minecraft:waxed_weathered_cut_copper_stairs", {BLOCK_OPAQUE, {109, 145, 107}}},
+{"minecraft:weathered_copper", {BLOCK_OPAQUE, {108, 153, 110}}},
+{"minecraft:weathered_cut_copper", {BLOCK_OPAQUE, {109, 145, 107}}},
+{"minecraft:weathered_cut_copper_slab", {BLOCK_OPAQUE, {109, 145, 107}}},
+{"minecraft:weathered_cut_copper_stairs", {BLOCK_OPAQUE, {109, 145, 107}}},
 {"minecraft:weeping_vines", {BLOCK_OPAQUE, {104, 1, 0}}},
 {"minecraft:weeping_vines_plant", {BLOCK_OPAQUE, {132, 16, 12}}},
 {"minecraft:wet_sponge", {BLOCK_OPAQUE, {171, 181, 70}}},
 {"minecraft:wheat", {BLOCK_OPAQUE, {166, 151, 73}}},
 {"minecraft:white_banner", {0, {0, 0, 0}}},
 {"minecraft:white_bed", {0, {0, 0, 0}}},
+{"minecraft:white_candle", {0, {0, 0, 0}}},
+{"minecraft:white_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:white_carpet", {BLOCK_OPAQUE, {233, 236, 236}}},
 {"minecraft:white_concrete", {BLOCK_OPAQUE, {207, 213, 214}}},
 {"minecraft:white_concrete_powder", {BLOCK_OPAQUE, {225, 227, 227}}},
@@ -752,6 +887,8 @@
 {"minecraft:wither_skeleton_wall_skull", {0, {0, 0, 0}}},
 {"minecraft:yellow_banner", {0, {0, 0, 0}}},
 {"minecraft:yellow_bed", {0, {0, 0, 0}}},
+{"minecraft:yellow_candle", {0, {0, 0, 0}}},
+{"minecraft:yellow_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:yellow_carpet", {BLOCK_OPAQUE, {248, 197, 39}}},
 {"minecraft:yellow_concrete", {BLOCK_OPAQUE, {240, 175, 21}}},
 {"minecraft:yellow_concrete_powder", {BLOCK_OPAQUE, {232, 199, 54}}},