diff --git a/canonical_block_states.nbt b/canonical_block_states.nbt
index ff4dc59..2cb1ff7 100644
Binary files a/canonical_block_states.nbt and b/canonical_block_states.nbt differ
diff --git a/level_sound_id_map.json b/level_sound_id_map.json
index c3bab6b..5c776b1 100644
--- a/level_sound_id_map.json
+++ b/level_sound_id_map.json
@@ -1,6 +1,7 @@
 {
     "add.chest": 39,
     "admire": 298,
+    "agitated": 370,
     "ambient": 10,
     "ambient.aggressive": 252,
     "ambient.baby": 11,
@@ -178,8 +179,50 @@
     "haggle.idle": 124,
     "haggle.no": 123,
     "haggle.yes": 122,
+    "heartbeat": 376,
     "heavy.step": 7,
     "hit": 1,
+    "horn_bass0": 413,
+    "horn_bass1": 414,
+    "horn_bass2": 415,
+    "horn_bass3": 416,
+    "horn_bass4": 417,
+    "horn_bass5": 418,
+    "horn_bass6": 419,
+    "horn_bass7": 420,
+    "horn_bass8": 421,
+    "horn_bass9": 422,
+    "horn_break": 377,
+    "horn_call0": 383,
+    "horn_call1": 384,
+    "horn_call2": 385,
+    "horn_call3": 386,
+    "horn_call4": 387,
+    "horn_call5": 388,
+    "horn_call6": 389,
+    "horn_call7": 390,
+    "horn_call8": 391,
+    "horn_call9": 392,
+    "horn_harmony0": 393,
+    "horn_harmony1": 394,
+    "horn_harmony2": 395,
+    "horn_harmony3": 396,
+    "horn_harmony4": 397,
+    "horn_harmony5": 398,
+    "horn_harmony6": 399,
+    "horn_harmony7": 400,
+    "horn_harmony8": 401,
+    "horn_harmony9": 402,
+    "horn_melody0": 403,
+    "horn_melody1": 404,
+    "horn_melody2": 405,
+    "horn_melody3": 406,
+    "horn_melody4": 407,
+    "horn_melody5": 408,
+    "horn_melody6": 409,
+    "horn_melody7": 410,
+    "horn_melody8": 411,
+    "horn_melody9": 412,
     "hurt": 17,
     "hurt.baby": 219,
     "hurt.in.water": 18,
@@ -241,6 +284,7 @@
     "leashknot.break": 137,
     "leashknot.place": 136,
     "levelup": 62,
+    "listening": 375,
     "lodestone_compass.link_compass_to_lodestone": 315,
     "lt.reaction.bleach": 192,
     "lt.reaction.epaste": 193,
@@ -332,7 +376,6 @@
     "shulkerbox.closed": 70,
     "shulkerbox.open": 69,
     "sleep": 282,
-    "slightly_angry": 370,
     "smithing_table.use": 316,
     "sneeze": 241,
     "sparkler.active": 210,
diff --git a/r12_to_current_block_map.bin b/r12_to_current_block_map.bin
index b1b8464..3fcbd26 100644
Binary files a/r12_to_current_block_map.bin and b/r12_to_current_block_map.bin differ
diff --git a/r16_to_current_item_map.json b/r16_to_current_item_map.json
index 388b394..8dcff6b 100644
--- a/r16_to_current_item_map.json
+++ b/r16_to_current_item_map.json
@@ -30,6 +30,14 @@
             "5": "minecraft:pufferfish_bucket",
             "8": "minecraft:water_bucket"
         },
+        "minecraft:chest_boat": {
+            "0": "minecraft:oak_chest_boat",
+            "1": "minecraft:spruce_chest_boat",
+            "2": "minecraft:birch_chest_boat",
+            "3": "minecraft:jungle_chest_boat",
+            "4": "minecraft:acacia_chest_boat",
+            "5": "minecraft:dark_oak_chest_boat"
+        },
         "minecraft:coal": {
             "1": "minecraft:charcoal"
         },
@@ -81,7 +89,8 @@
             "128": "minecraft:goat_spawn_egg",
             "129": "minecraft:glow_squid_spawn_egg",
             "13": "minecraft:sheep_spawn_egg",
-            "130": "minecraft:axolotl_spawn_egg",
+            "130": "minecraft:axolotl_bucket",
+            "131": "minecraft:warden_spawn_egg",
             "132": "minecraft:frog_spawn_egg",
             "133": "minecraft:tadpole_spawn_egg",
             "134": "minecraft:allay_spawn_egg",
@@ -137,6 +146,7 @@
         "minecraft:carrotonastick": "minecraft:carrot_on_a_stick",
         "minecraft:chorus_fruit_popped": "minecraft:popped_chorus_fruit",
         "minecraft:clownfish": "minecraft:tropical_fish",
+        "minecraft:concretepowder": "minecraft:concrete_powder",
         "minecraft:cooked_fish": "minecraft:cooked_cod",
         "minecraft:darkoak_sign": "minecraft:dark_oak_sign",
         "minecraft:emptymap": "minecraft:empty_map",
@@ -164,13 +174,16 @@
         "minecraft:horsearmorgold": "minecraft:golden_horse_armor",
         "minecraft:horsearmoriron": "minecraft:iron_horse_armor",
         "minecraft:horsearmorleather": "minecraft:leather_horse_armor",
+        "minecraft:invisiblebedrock": "minecraft:invisible_bedrock",
         "minecraft:lodestonecompass": "minecraft:lodestone_compass",
         "minecraft:map": "minecraft:filled_map",
         "minecraft:melon": "minecraft:melon_slice",
+        "minecraft:movingblock": "minecraft:moving_block",
         "minecraft:muttoncooked": "minecraft:cooked_mutton",
         "minecraft:muttonraw": "minecraft:mutton",
         "minecraft:nametag": "minecraft:name_tag",
         "minecraft:netherstar": "minecraft:nether_star",
+        "minecraft:pistonarmcollision": "minecraft:piston_arm_collision",
         "minecraft:prismarineshard": "minecraft:prismarine_shard",
         "minecraft:record_11": "minecraft:music_disc_11",
         "minecraft:record_13": "minecraft:music_disc_13",
@@ -187,8 +200,10 @@
         "minecraft:record_wait": "minecraft:music_disc_wait",
         "minecraft:record_ward": "minecraft:music_disc_ward",
         "minecraft:reeds": "minecraft:sugar_cane",
+        "minecraft:sealantern": "minecraft:sea_lantern",
         "minecraft:sign": "minecraft:oak_sign",
         "minecraft:speckled_melon": "minecraft:glistering_melon_slice",
+        "minecraft:stickypistonarmcollision": "minecraft:sticky_piston_arm_collision",
         "minecraft:stone_slab": "minecraft:double_stone_slab",
         "minecraft:stone_slab2": "minecraft:double_stone_slab2",
         "minecraft:stone_slab3": "minecraft:double_stone_slab3",
diff --git a/required_item_list.json b/required_item_list.json
index d320382..180f5a3 100644
--- a/required_item_list.json
+++ b/required_item_list.json
@@ -7,6 +7,10 @@
         "runtime_id": -140,
         "component_based": false
     },
+    "minecraft:acacia_chest_boat": {
+        "runtime_id": 637,
+        "component_based": false
+    },
     "minecraft:acacia_door": {
         "runtime_id": 556,
         "component_based": false
@@ -52,7 +56,7 @@
         "component_based": false
     },
     "minecraft:allay_spawn_egg": {
-        "runtime_id": 631,
+        "runtime_id": 630,
         "component_based": false
     },
     "minecraft:allow": {
@@ -68,7 +72,7 @@
         "component_based": false
     },
     "minecraft:amethyst_shard": {
-        "runtime_id": 625,
+        "runtime_id": 624,
         "component_based": false
     },
     "minecraft:ancient_debris": {
@@ -136,7 +140,7 @@
         "component_based": false
     },
     "minecraft:banner_pattern": {
-        "runtime_id": 635,
+        "runtime_id": 642,
         "component_based": false
     },
     "minecraft:barrel": {
@@ -211,6 +215,10 @@
         "runtime_id": -141,
         "component_based": false
     },
+    "minecraft:birch_chest_boat": {
+        "runtime_id": 634,
+        "component_based": false
+    },
     "minecraft:birch_door": {
         "runtime_id": 554,
         "component_based": false
@@ -320,7 +328,7 @@
         "component_based": false
     },
     "minecraft:boat": {
-        "runtime_id": 633,
+        "runtime_id": 640,
         "component_based": false
     },
     "minecraft:bone": {
@@ -367,10 +375,6 @@
         "runtime_id": 431,
         "component_based": false
     },
-    "minecraft:brewingstandblock": {
-        "runtime_id": 117,
-        "component_based": false
-    },
     "minecraft:brick": {
         "runtime_id": 383,
         "component_based": false
@@ -535,6 +539,10 @@
         "runtime_id": 54,
         "component_based": false
     },
+    "minecraft:chest_boat": {
+        "runtime_id": 639,
+        "component_based": false
+    },
     "minecraft:chest_minecart": {
         "runtime_id": 389,
         "component_based": false
@@ -911,6 +919,10 @@
         "runtime_id": -142,
         "component_based": false
     },
+    "minecraft:dark_oak_chest_boat": {
+        "runtime_id": 638,
+        "component_based": false
+    },
     "minecraft:dark_oak_door": {
         "runtime_id": 557,
         "component_based": false
@@ -1176,7 +1188,7 @@
         "component_based": false
     },
     "minecraft:dye": {
-        "runtime_id": 634,
+        "runtime_id": 641,
         "component_based": false
     },
     "minecraft:egg": {
@@ -1704,7 +1716,7 @@
         "component_based": false
     },
     "minecraft:end_crystal": {
-        "runtime_id": 637,
+        "runtime_id": 644,
         "component_based": false
     },
     "minecraft:end_gateway": {
@@ -1867,12 +1879,12 @@
         "runtime_id": 513,
         "component_based": false
     },
-    "minecraft:frog_egg": {
+    "minecraft:frog_spawn": {
         "runtime_id": -468,
         "component_based": false
     },
     "minecraft:frog_spawn_egg": {
-        "runtime_id": 628,
+        "runtime_id": 627,
         "component_based": false
     },
     "minecraft:frosted_ice": {
@@ -1916,7 +1928,7 @@
         "component_based": false
     },
     "minecraft:glow_berries": {
-        "runtime_id": 638,
+        "runtime_id": 645,
         "component_based": false
     },
     "minecraft:glow_frame": {
@@ -1951,10 +1963,6 @@
         "runtime_id": 394,
         "component_based": false
     },
-    "minecraft:goat_horn": {
-        "runtime_id": 624,
-        "component_based": false
-    },
     "minecraft:goat_spawn_egg": {
         "runtime_id": 501,
         "component_based": false
@@ -2183,7 +2191,7 @@
         "runtime_id": 413,
         "component_based": false
     },
-    "minecraft:invisiblebedrock": {
+    "minecraft:invisible_bedrock": {
         "runtime_id": 95,
         "component_based": false
     },
@@ -2271,6 +2279,10 @@
         "runtime_id": 194,
         "component_based": false
     },
+    "minecraft:item.brewing_stand": {
+        "runtime_id": 117,
+        "component_based": false
+    },
     "minecraft:item.cake": {
         "runtime_id": 92,
         "component_based": false
@@ -2379,6 +2391,10 @@
         "runtime_id": -143,
         "component_based": false
     },
+    "minecraft:jungle_chest_boat": {
+        "runtime_id": 635,
+        "component_based": false
+    },
     "minecraft:jungle_door": {
         "runtime_id": 555,
         "component_based": false
@@ -2635,6 +2651,18 @@
         "runtime_id": 455,
         "component_based": false
     },
+    "minecraft:mangrove_leaves": {
+        "runtime_id": -472,
+        "component_based": false
+    },
+    "minecraft:mangrove_propagule": {
+        "runtime_id": -474,
+        "component_based": false
+    },
+    "minecraft:mangrove_propagule_hanging": {
+        "runtime_id": -476,
+        "component_based": false
+    },
     "minecraft:medicine": {
         "runtime_id": 599,
         "component_based": false
@@ -2703,10 +2731,34 @@
         "runtime_id": -175,
         "component_based": false
     },
-    "minecraft:movingblock": {
+    "minecraft:moving_block": {
         "runtime_id": 250,
         "component_based": false
     },
+    "minecraft:mud": {
+        "runtime_id": -473,
+        "component_based": false
+    },
+    "minecraft:mud_brick_double_slab": {
+        "runtime_id": -479,
+        "component_based": false
+    },
+    "minecraft:mud_brick_slab": {
+        "runtime_id": -478,
+        "component_based": false
+    },
+    "minecraft:mud_brick_stairs": {
+        "runtime_id": -480,
+        "component_based": false
+    },
+    "minecraft:mud_brick_wall": {
+        "runtime_id": -481,
+        "component_based": false
+    },
+    "minecraft:mud_bricks": {
+        "runtime_id": -475,
+        "component_based": false
+    },
     "minecraft:mule_spawn_egg": {
         "runtime_id": 466,
         "component_based": false
@@ -2748,7 +2800,7 @@
         "component_based": false
     },
     "minecraft:music_disc_otherside": {
-        "runtime_id": 627,
+        "runtime_id": 626,
         "component_based": false
     },
     "minecraft:music_disc_pigstep": {
@@ -2779,14 +2831,6 @@
         "runtime_id": 110,
         "component_based": false
     },
-    "minecraft:mysterious_frame": {
-        "runtime_id": -466,
-        "component_based": false
-    },
-    "minecraft:mysterious_frame_slot": {
-        "runtime_id": -467,
-        "component_based": false
-    },
     "minecraft:name_tag": {
         "runtime_id": 548,
         "component_based": false
@@ -2903,6 +2947,10 @@
         "runtime_id": 375,
         "component_based": false
     },
+    "minecraft:oak_chest_boat": {
+        "runtime_id": 633,
+        "component_based": false
+    },
     "minecraft:oak_sign": {
         "runtime_id": 358,
         "component_based": false
@@ -2967,6 +3015,10 @@
         "runtime_id": 174,
         "component_based": false
     },
+    "minecraft:packed_mud": {
+        "runtime_id": -477,
+        "component_based": false
+    },
     "minecraft:painting": {
         "runtime_id": 357,
         "component_based": false
@@ -3035,7 +3087,7 @@
         "runtime_id": 33,
         "component_based": false
     },
-    "minecraft:pistonarmcollision": {
+    "minecraft:piston_arm_collision": {
         "runtime_id": 34,
         "component_based": false
     },
@@ -3415,6 +3467,10 @@
         "runtime_id": 55,
         "component_based": false
     },
+    "minecraft:reinforced_deepslate": {
+        "runtime_id": -466,
+        "component_based": false
+    },
     "minecraft:repeater": {
         "runtime_id": 419,
         "component_based": false
@@ -3495,6 +3551,10 @@
         "runtime_id": 572,
         "component_based": false
     },
+    "minecraft:sea_lantern": {
+        "runtime_id": 169,
+        "component_based": false
+    },
     "minecraft:sea_pickle": {
         "runtime_id": -156,
         "component_based": false
@@ -3503,10 +3563,6 @@
         "runtime_id": -130,
         "component_based": false
     },
-    "minecraft:sealantern": {
-        "runtime_id": 169,
-        "component_based": false
-    },
     "minecraft:shears": {
         "runtime_id": 421,
         "component_based": false
@@ -3648,7 +3704,7 @@
         "component_based": false
     },
     "minecraft:spawn_egg": {
-        "runtime_id": 636,
+        "runtime_id": 643,
         "component_based": false
     },
     "minecraft:spider_eye": {
@@ -3679,6 +3735,10 @@
         "runtime_id": -144,
         "component_based": false
     },
+    "minecraft:spruce_chest_boat": {
+        "runtime_id": 636,
+        "component_based": false
+    },
     "minecraft:spruce_door": {
         "runtime_id": 553,
         "component_based": false
@@ -3712,7 +3772,7 @@
         "component_based": false
     },
     "minecraft:spyglass": {
-        "runtime_id": 626,
+        "runtime_id": 625,
         "component_based": false
     },
     "minecraft:squid_spawn_egg": {
@@ -3747,7 +3807,7 @@
         "runtime_id": 29,
         "component_based": false
     },
-    "minecraft:stickypistonarmcollision": {
+    "minecraft:sticky_piston_arm_collision": {
         "runtime_id": -217,
         "component_based": false
     },
@@ -3884,11 +3944,11 @@
         "component_based": false
     },
     "minecraft:tadpole_bucket": {
-        "runtime_id": 630,
+        "runtime_id": 629,
         "component_based": false
     },
     "minecraft:tadpole_spawn_egg": {
-        "runtime_id": 629,
+        "runtime_id": 628,
         "component_based": false
     },
     "minecraft:tallgrass": {
@@ -3931,7 +3991,7 @@
         "runtime_id": 546,
         "component_based": false
     },
-    "minecraft:tripwire": {
+    "minecraft:trip_wire": {
         "runtime_id": 132,
         "component_based": false
     },
@@ -4027,6 +4087,10 @@
         "runtime_id": 492,
         "component_based": false
     },
+    "minecraft:warden_spawn_egg": {
+        "runtime_id": 631,
+        "component_based": false
+    },
     "minecraft:warped_button": {
         "runtime_id": -261,
         "component_based": false