diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java
index 1616df38c..5abb2a8b3 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java
@@ -222,10 +222,6 @@ public final class Protocol1_17To1_16_4 extends AbstractProtocol<ClientboundPack
                 "minecraft:features_cannot_replace", "minecraft:lava_pool_stone_replaceables", "minecraft:geode_invalid_blocks");
         tagRewriter.addEmptyTags(RegistryType.ENTITY, "minecraft:powder_snow_walkable_mobs", "minecraft:axolotl_always_hostiles", "minecraft:axolotl_tempted_hostiles",
                 "minecraft:axolotl_hunt_targets", "minecraft:freeze_hurts_extra_types", "minecraft:freeze_immune_entity_types");
-
-        // Mmmm numbers
-        tagRewriter.addTag(RegistryType.BLOCK, "minecraft:mineable/axe", 74, 246, 245, 622, 668, 730, 731, 497, 138, 238, 132, 680, 306, 671, 202, 147, 492, 491, 267, 728, 151, 697, 333, 97, 96, 672, 95, 203, 190, 162, 415, 674, 254, 667, 248, 244, 240, 258, 307, 247, 192, 239, 133, 666, 675, 681, 189, 682, 414, 329, 702, 701, 249, 688, 700, 699, 152, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 478, 476, 479, 477, 250, 475, 714, 715, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 131, 130, 410, 411, 413, 412, 40, 52, 45, 58, 35, 47, 46, 53, 39, 51, 44, 57, 37, 49, 42, 55, 38, 50, 43, 56, 36, 48, 41, 54, 692, 693, 694, 695, 683, 684, 685, 686, 13, 14, 15, 16, 17, 18, 704, 705, 19, 20, 21, 22, 23, 24, 155, 156, 157, 158, 159, 160, 722, 723, 165, 166, 167, 168, 169, 170, 724, 725, 308, 309, 310, 311, 312, 313, 718, 719, 161, 485, 486, 487, 488, 489, 720, 721, 191, 483, 484, 480, 481, 482, 710, 711, 174, 175, 176, 177, 178, 179, 708, 709, 452, 453, 454, 455, 456, 457, 706, 707, 146, 274, 275, 276, 375, 376, 716, 717, 226, 224, 227, 225, 222, 223, 712, 713);
-        tagRewriter.addTag(RegistryType.BLOCK, "minecraft:mineable/pickaxe", 1, 2, 3, 4, 5, 6, 7, 12, 31, 32, 33, 34, 68, 69, 70, 71, 72, 73, 134, 135, 136, 139, 140, 145, 149, 150, 154, 164, 172, 173, 180, 193, 196, 197, 228, 229, 230, 231, 241, 242, 251, 252, 255, 256, 257, 259, 260, 264, 268, 269, 270, 273, 330, 331, 334, 335, 336, 337, 338, 339, 340, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 407, 408, 448, 449, 450, 451, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 493, 494, 495, 496, 503, 505, 506, 508, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, 578, 579, 580, 581, 582, 583, 584, 585, 586, 587, 588, 589, 590, 591, 592, 598, 599, 600, 601, 602, 608, 609, 610, 611, 612, 627, 628, 629, 630, 631, 632, 633, 634, 635, 636, 637, 638, 639, 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 651, 652, 653, 669, 670, 673, 676, 677, 678, 679, 687, 696, 734, 735, 736, 737, 742, 743, 744, 746, 747, 748, 749, 750, 751, 752, 754, 755, 756, 757, 760, 761, 762, 185, 409, 619, 183, 100, 93, 101, 233, 237, 236, 232, 235, 234, 279, 280, 654, 655, 656, 657, 658, 659, 660, 661, 662, 663, 664, 665, 745, 753, 759, 509, 525, 521, 522, 519, 517, 523, 513, 518, 515, 512, 511, 516, 520, 524, 510, 514, 326, 327, 328, 261, 163, 91, 92, 341);
     }
 
     @Override
diff --git a/common/src/main/resources/assets/viaversion/data/mappingdiff-1.16.2to1.17.json b/common/src/main/resources/assets/viaversion/data/mappingdiff-1.16.2to1.17.json
index 8edb5c431..a86ecc886 100644
--- a/common/src/main/resources/assets/viaversion/data/mappingdiff-1.16.2to1.17.json
+++ b/common/src/main/resources/assets/viaversion/data/mappingdiff-1.16.2to1.17.json
@@ -115,6 +115,530 @@
         "minecraft:black_concrete_powder",
         "minecraft:soul_soil"
       ],
+      "minecraft:mineable/axe": [
+        "minecraft:note_block",
+        "minecraft:attached_melon_stem",
+        "minecraft:attached_pumpkin_stem",
+        "minecraft:bamboo",
+        "minecraft:barrel",
+        "minecraft:bee_nest",
+        "minecraft:beehive",
+        "minecraft:beetroots",
+        "minecraft:bookshelf",
+        "minecraft:brown_mushroom_block",
+        "minecraft:brown_mushroom",
+        "minecraft:campfire",
+        "minecraft:carrots",
+        "minecraft:cartography_table",
+        "minecraft:carved_pumpkin",
+        "minecraft:chest",
+        "minecraft:chorus_flower",
+        "minecraft:chorus_plant",
+        "minecraft:cocoa",
+        "minecraft:composter",
+        "minecraft:crafting_table",
+        "minecraft:crimson_fungus",
+        "minecraft:daylight_detector",
+        "minecraft:dead_bush",
+        "minecraft:fern",
+        "minecraft:fletching_table",
+        "minecraft:grass",
+        "minecraft:jack_o_lantern",
+        "minecraft:jukebox",
+        "minecraft:ladder",
+        "minecraft:large_fern",
+        "minecraft:lectern",
+        "minecraft:lily_pad",
+        "minecraft:loom",
+        "minecraft:melon_stem",
+        "minecraft:melon",
+        "minecraft:mushroom_stem",
+        "minecraft:nether_wart",
+        "minecraft:potatoes",
+        "minecraft:pumpkin_stem",
+        "minecraft:pumpkin",
+        "minecraft:red_mushroom_block",
+        "minecraft:red_mushroom",
+        "minecraft:scaffolding",
+        "minecraft:smithing_table",
+        "minecraft:soul_campfire",
+        "minecraft:sugar_cane",
+        "minecraft:sweet_berry_bush",
+        "minecraft:tall_grass",
+        "minecraft:trapped_chest",
+        "minecraft:twisting_vines_plant",
+        "minecraft:twisting_vines",
+        "minecraft:vine",
+        "minecraft:warped_fungus",
+        "minecraft:weeping_vines_plant",
+        "minecraft:weeping_vines",
+        "minecraft:wheat",
+        "minecraft:white_banner",
+        "minecraft:orange_banner",
+        "minecraft:magenta_banner",
+        "minecraft:light_blue_banner",
+        "minecraft:yellow_banner",
+        "minecraft:lime_banner",
+        "minecraft:pink_banner",
+        "minecraft:gray_banner",
+        "minecraft:light_gray_banner",
+        "minecraft:cyan_banner",
+        "minecraft:purple_banner",
+        "minecraft:blue_banner",
+        "minecraft:brown_banner",
+        "minecraft:green_banner",
+        "minecraft:red_banner",
+        "minecraft:black_banner",
+        "minecraft:white_wall_banner",
+        "minecraft:orange_wall_banner",
+        "minecraft:magenta_wall_banner",
+        "minecraft:light_blue_wall_banner",
+        "minecraft:yellow_wall_banner",
+        "minecraft:lime_wall_banner",
+        "minecraft:pink_wall_banner",
+        "minecraft:gray_wall_banner",
+        "minecraft:light_gray_wall_banner",
+        "minecraft:cyan_wall_banner",
+        "minecraft:purple_wall_banner",
+        "minecraft:blue_wall_banner",
+        "minecraft:brown_wall_banner",
+        "minecraft:green_wall_banner",
+        "minecraft:red_wall_banner",
+        "minecraft:black_wall_banner",
+        "minecraft:acacia_fence_gate",
+        "minecraft:birch_fence_gate",
+        "minecraft:dark_oak_fence_gate",
+        "minecraft:jungle_fence_gate",
+        "minecraft:oak_fence_gate",
+        "minecraft:spruce_fence_gate",
+        "minecraft:crimson_fence_gate",
+        "minecraft:warped_fence_gate",
+        "minecraft:dandelion",
+        "minecraft:poppy",
+        "minecraft:blue_orchid",
+        "minecraft:allium",
+        "minecraft:azure_bluet",
+        "minecraft:red_tulip",
+        "minecraft:orange_tulip",
+        "minecraft:white_tulip",
+        "minecraft:pink_tulip",
+        "minecraft:oxeye_daisy",
+        "minecraft:cornflower",
+        "minecraft:lily_of_the_valley",
+        "minecraft:wither_rose",
+        "minecraft:sunflower",
+        "minecraft:lilac",
+        "minecraft:peony",
+        "minecraft:rose_bush",
+        "minecraft:dark_oak_log",
+        "minecraft:dark_oak_wood",
+        "minecraft:stripped_dark_oak_log",
+        "minecraft:stripped_dark_oak_wood",
+        "minecraft:oak_log",
+        "minecraft:oak_wood",
+        "minecraft:stripped_oak_log",
+        "minecraft:stripped_oak_wood",
+        "minecraft:acacia_log",
+        "minecraft:acacia_wood",
+        "minecraft:stripped_acacia_log",
+        "minecraft:stripped_acacia_wood",
+        "minecraft:birch_log",
+        "minecraft:birch_wood",
+        "minecraft:stripped_birch_log",
+        "minecraft:stripped_birch_wood",
+        "minecraft:jungle_log",
+        "minecraft:jungle_wood",
+        "minecraft:stripped_jungle_log",
+        "minecraft:stripped_jungle_wood",
+        "minecraft:spruce_log",
+        "minecraft:spruce_wood",
+        "minecraft:stripped_spruce_log",
+        "minecraft:stripped_spruce_wood",
+        "minecraft:crimson_stem",
+        "minecraft:stripped_crimson_stem",
+        "minecraft:crimson_hyphae",
+        "minecraft:stripped_crimson_hyphae",
+        "minecraft:warped_stem",
+        "minecraft:stripped_warped_stem",
+        "minecraft:warped_hyphae",
+        "minecraft:stripped_warped_hyphae",
+        "minecraft:oak_planks",
+        "minecraft:spruce_planks",
+        "minecraft:birch_planks",
+        "minecraft:jungle_planks",
+        "minecraft:acacia_planks",
+        "minecraft:dark_oak_planks",
+        "minecraft:crimson_planks",
+        "minecraft:warped_planks",
+        "minecraft:oak_sapling",
+        "minecraft:spruce_sapling",
+        "minecraft:birch_sapling",
+        "minecraft:jungle_sapling",
+        "minecraft:acacia_sapling",
+        "minecraft:dark_oak_sapling",
+        "minecraft:oak_sign",
+        "minecraft:spruce_sign",
+        "minecraft:birch_sign",
+        "minecraft:acacia_sign",
+        "minecraft:jungle_sign",
+        "minecraft:dark_oak_sign",
+        "minecraft:crimson_sign",
+        "minecraft:warped_sign",
+        "minecraft:oak_wall_sign",
+        "minecraft:spruce_wall_sign",
+        "minecraft:birch_wall_sign",
+        "minecraft:acacia_wall_sign",
+        "minecraft:jungle_wall_sign",
+        "minecraft:dark_oak_wall_sign",
+        "minecraft:crimson_wall_sign",
+        "minecraft:warped_wall_sign",
+        "minecraft:oak_button",
+        "minecraft:spruce_button",
+        "minecraft:birch_button",
+        "minecraft:jungle_button",
+        "minecraft:acacia_button",
+        "minecraft:dark_oak_button",
+        "minecraft:crimson_button",
+        "minecraft:warped_button",
+        "minecraft:oak_door",
+        "minecraft:spruce_door",
+        "minecraft:birch_door",
+        "minecraft:jungle_door",
+        "minecraft:acacia_door",
+        "minecraft:dark_oak_door",
+        "minecraft:crimson_door",
+        "minecraft:warped_door",
+        "minecraft:oak_fence",
+        "minecraft:acacia_fence",
+        "minecraft:dark_oak_fence",
+        "minecraft:spruce_fence",
+        "minecraft:birch_fence",
+        "minecraft:jungle_fence",
+        "minecraft:crimson_fence",
+        "minecraft:warped_fence",
+        "minecraft:oak_pressure_plate",
+        "minecraft:spruce_pressure_plate",
+        "minecraft:birch_pressure_plate",
+        "minecraft:jungle_pressure_plate",
+        "minecraft:acacia_pressure_plate",
+        "minecraft:dark_oak_pressure_plate",
+        "minecraft:crimson_pressure_plate",
+        "minecraft:warped_pressure_plate",
+        "minecraft:oak_slab",
+        "minecraft:spruce_slab",
+        "minecraft:birch_slab",
+        "minecraft:jungle_slab",
+        "minecraft:acacia_slab",
+        "minecraft:dark_oak_slab",
+        "minecraft:crimson_slab",
+        "minecraft:warped_slab",
+        "minecraft:oak_stairs",
+        "minecraft:spruce_stairs",
+        "minecraft:birch_stairs",
+        "minecraft:jungle_stairs",
+        "minecraft:acacia_stairs",
+        "minecraft:dark_oak_stairs",
+        "minecraft:crimson_stairs",
+        "minecraft:warped_stairs",
+        "minecraft:acacia_trapdoor",
+        "minecraft:birch_trapdoor",
+        "minecraft:dark_oak_trapdoor",
+        "minecraft:jungle_trapdoor",
+        "minecraft:oak_trapdoor",
+        "minecraft:spruce_trapdoor",
+        "minecraft:crimson_trapdoor",
+        "minecraft:warped_trapdoor"
+      ],
+      "minecraft:mineable/pickaxe": [
+        "minecraft:stone",
+        "minecraft:granite",
+        "minecraft:polished_granite",
+        "minecraft:diorite",
+        "minecraft:polished_diorite",
+        "minecraft:andesite",
+        "minecraft:polished_andesite",
+        "minecraft:cobblestone",
+        "minecraft:gold_ore",
+        "minecraft:iron_ore",
+        "minecraft:coal_ore",
+        "minecraft:nether_gold_ore",
+        "minecraft:lapis_ore",
+        "minecraft:lapis_block",
+        "minecraft:dispenser",
+        "minecraft:sandstone",
+        "minecraft:chiseled_sandstone",
+        "minecraft:cut_sandstone",
+        "minecraft:gold_block",
+        "minecraft:iron_block",
+        "minecraft:bricks",
+        "minecraft:mossy_cobblestone",
+        "minecraft:obsidian",
+        "minecraft:spawner",
+        "minecraft:diamond_ore",
+        "minecraft:diamond_block",
+        "minecraft:furnace",
+        "minecraft:cobblestone_stairs",
+        "minecraft:stone_pressure_plate",
+        "minecraft:iron_door",
+        "minecraft:redstone_ore",
+        "minecraft:netherrack",
+        "minecraft:basalt",
+        "minecraft:polished_basalt",
+        "minecraft:stone_bricks",
+        "minecraft:mossy_stone_bricks",
+        "minecraft:cracked_stone_bricks",
+        "minecraft:chiseled_stone_bricks",
+        "minecraft:iron_bars",
+        "minecraft:chain",
+        "minecraft:brick_stairs",
+        "minecraft:stone_brick_stairs",
+        "minecraft:nether_bricks",
+        "minecraft:nether_brick_fence",
+        "minecraft:nether_brick_stairs",
+        "minecraft:enchanting_table",
+        "minecraft:brewing_stand",
+        "minecraft:end_stone",
+        "minecraft:sandstone_stairs",
+        "minecraft:emerald_ore",
+        "minecraft:ender_chest",
+        "minecraft:emerald_block",
+        "minecraft:light_weighted_pressure_plate",
+        "minecraft:heavy_weighted_pressure_plate",
+        "minecraft:redstone_block",
+        "minecraft:nether_quartz_ore",
+        "minecraft:hopper",
+        "minecraft:quartz_block",
+        "minecraft:chiseled_quartz_block",
+        "minecraft:quartz_pillar",
+        "minecraft:quartz_stairs",
+        "minecraft:dropper",
+        "minecraft:white_terracotta",
+        "minecraft:orange_terracotta",
+        "minecraft:magenta_terracotta",
+        "minecraft:light_blue_terracotta",
+        "minecraft:yellow_terracotta",
+        "minecraft:lime_terracotta",
+        "minecraft:pink_terracotta",
+        "minecraft:gray_terracotta",
+        "minecraft:light_gray_terracotta",
+        "minecraft:cyan_terracotta",
+        "minecraft:purple_terracotta",
+        "minecraft:blue_terracotta",
+        "minecraft:brown_terracotta",
+        "minecraft:green_terracotta",
+        "minecraft:red_terracotta",
+        "minecraft:black_terracotta",
+        "minecraft:iron_trapdoor",
+        "minecraft:prismarine",
+        "minecraft:prismarine_bricks",
+        "minecraft:dark_prismarine",
+        "minecraft:prismarine_stairs",
+        "minecraft:prismarine_brick_stairs",
+        "minecraft:dark_prismarine_stairs",
+        "minecraft:prismarine_slab",
+        "minecraft:prismarine_brick_slab",
+        "minecraft:dark_prismarine_slab",
+        "minecraft:terracotta",
+        "minecraft:coal_block",
+        "minecraft:red_sandstone",
+        "minecraft:chiseled_red_sandstone",
+        "minecraft:cut_red_sandstone",
+        "minecraft:red_sandstone_stairs",
+        "minecraft:stone_slab",
+        "minecraft:smooth_stone_slab",
+        "minecraft:sandstone_slab",
+        "minecraft:cut_sandstone_slab",
+        "minecraft:petrified_oak_slab",
+        "minecraft:cobblestone_slab",
+        "minecraft:brick_slab",
+        "minecraft:stone_brick_slab",
+        "minecraft:nether_brick_slab",
+        "minecraft:quartz_slab",
+        "minecraft:red_sandstone_slab",
+        "minecraft:cut_red_sandstone_slab",
+        "minecraft:purpur_slab",
+        "minecraft:smooth_stone",
+        "minecraft:smooth_sandstone",
+        "minecraft:smooth_quartz",
+        "minecraft:smooth_red_sandstone",
+        "minecraft:purpur_block",
+        "minecraft:purpur_pillar",
+        "minecraft:purpur_stairs",
+        "minecraft:end_stone_bricks",
+        "minecraft:magma_block",
+        "minecraft:red_nether_bricks",
+        "minecraft:bone_block",
+        "minecraft:observer",
+        "minecraft:white_glazed_terracotta",
+        "minecraft:orange_glazed_terracotta",
+        "minecraft:magenta_glazed_terracotta",
+        "minecraft:light_blue_glazed_terracotta",
+        "minecraft:yellow_glazed_terracotta",
+        "minecraft:lime_glazed_terracotta",
+        "minecraft:pink_glazed_terracotta",
+        "minecraft:gray_glazed_terracotta",
+        "minecraft:light_gray_glazed_terracotta",
+        "minecraft:cyan_glazed_terracotta",
+        "minecraft:purple_glazed_terracotta",
+        "minecraft:blue_glazed_terracotta",
+        "minecraft:brown_glazed_terracotta",
+        "minecraft:green_glazed_terracotta",
+        "minecraft:red_glazed_terracotta",
+        "minecraft:black_glazed_terracotta",
+        "minecraft:white_concrete",
+        "minecraft:orange_concrete",
+        "minecraft:magenta_concrete",
+        "minecraft:light_blue_concrete",
+        "minecraft:yellow_concrete",
+        "minecraft:lime_concrete",
+        "minecraft:pink_concrete",
+        "minecraft:gray_concrete",
+        "minecraft:light_gray_concrete",
+        "minecraft:cyan_concrete",
+        "minecraft:purple_concrete",
+        "minecraft:blue_concrete",
+        "minecraft:brown_concrete",
+        "minecraft:green_concrete",
+        "minecraft:red_concrete",
+        "minecraft:black_concrete",
+        "minecraft:dead_tube_coral_block",
+        "minecraft:dead_brain_coral_block",
+        "minecraft:dead_bubble_coral_block",
+        "minecraft:dead_fire_coral_block",
+        "minecraft:dead_horn_coral_block",
+        "minecraft:tube_coral_block",
+        "minecraft:brain_coral_block",
+        "minecraft:bubble_coral_block",
+        "minecraft:fire_coral_block",
+        "minecraft:horn_coral_block",
+        "minecraft:dead_tube_coral",
+        "minecraft:dead_brain_coral",
+        "minecraft:dead_bubble_coral",
+        "minecraft:dead_fire_coral",
+        "minecraft:dead_horn_coral",
+        "minecraft:dead_tube_coral_fan",
+        "minecraft:dead_brain_coral_fan",
+        "minecraft:dead_bubble_coral_fan",
+        "minecraft:dead_fire_coral_fan",
+        "minecraft:dead_horn_coral_fan",
+        "minecraft:dead_tube_coral_wall_fan",
+        "minecraft:dead_brain_coral_wall_fan",
+        "minecraft:dead_bubble_coral_wall_fan",
+        "minecraft:dead_fire_coral_wall_fan",
+        "minecraft:dead_horn_coral_wall_fan",
+        "minecraft:polished_granite_stairs",
+        "minecraft:smooth_red_sandstone_stairs",
+        "minecraft:mossy_stone_brick_stairs",
+        "minecraft:polished_diorite_stairs",
+        "minecraft:mossy_cobblestone_stairs",
+        "minecraft:end_stone_brick_stairs",
+        "minecraft:stone_stairs",
+        "minecraft:smooth_sandstone_stairs",
+        "minecraft:smooth_quartz_stairs",
+        "minecraft:granite_stairs",
+        "minecraft:andesite_stairs",
+        "minecraft:red_nether_brick_stairs",
+        "minecraft:polished_andesite_stairs",
+        "minecraft:diorite_stairs",
+        "minecraft:polished_granite_slab",
+        "minecraft:smooth_red_sandstone_slab",
+        "minecraft:mossy_stone_brick_slab",
+        "minecraft:polished_diorite_slab",
+        "minecraft:mossy_cobblestone_slab",
+        "minecraft:end_stone_brick_slab",
+        "minecraft:smooth_sandstone_slab",
+        "minecraft:smooth_quartz_slab",
+        "minecraft:granite_slab",
+        "minecraft:andesite_slab",
+        "minecraft:red_nether_brick_slab",
+        "minecraft:polished_andesite_slab",
+        "minecraft:diorite_slab",
+        "minecraft:smoker",
+        "minecraft:blast_furnace",
+        "minecraft:grindstone",
+        "minecraft:stonecutter",
+        "minecraft:bell",
+        "minecraft:lantern",
+        "minecraft:soul_lantern",
+        "minecraft:warped_nylium",
+        "minecraft:crimson_nylium",
+        "minecraft:netherite_block",
+        "minecraft:ancient_debris",
+        "minecraft:crying_obsidian",
+        "minecraft:respawn_anchor",
+        "minecraft:lodestone",
+        "minecraft:blackstone",
+        "minecraft:blackstone_stairs",
+        "minecraft:blackstone_slab",
+        "minecraft:polished_blackstone",
+        "minecraft:polished_blackstone_bricks",
+        "minecraft:cracked_polished_blackstone_bricks",
+        "minecraft:chiseled_polished_blackstone",
+        "minecraft:polished_blackstone_brick_slab",
+        "minecraft:polished_blackstone_brick_stairs",
+        "minecraft:gilded_blackstone",
+        "minecraft:polished_blackstone_stairs",
+        "minecraft:polished_blackstone_slab",
+        "minecraft:polished_blackstone_pressure_plate",
+        "minecraft:chiseled_nether_bricks",
+        "minecraft:cracked_nether_bricks",
+        "minecraft:quartz_bricks",
+        "minecraft:ice",
+        "minecraft:packed_ice",
+        "minecraft:blue_ice",
+        "minecraft:stone_button",
+        "minecraft:piston",
+        "minecraft:sticky_piston",
+        "minecraft:piston_head",
+        "minecraft:infested_cobblestone",
+        "minecraft:infested_chiseled_stone_bricks",
+        "minecraft:infested_cracked_stone_bricks",
+        "minecraft:infested_stone",
+        "minecraft:infested_mossy_stone_bricks",
+        "minecraft:infested_stone_bricks",
+        "minecraft:cobblestone_wall",
+        "minecraft:mossy_cobblestone_wall",
+        "minecraft:brick_wall",
+        "minecraft:prismarine_wall",
+        "minecraft:red_sandstone_wall",
+        "minecraft:mossy_stone_brick_wall",
+        "minecraft:granite_wall",
+        "minecraft:stone_brick_wall",
+        "minecraft:nether_brick_wall",
+        "minecraft:andesite_wall",
+        "minecraft:red_nether_brick_wall",
+        "minecraft:sandstone_wall",
+        "minecraft:end_stone_brick_wall",
+        "minecraft:diorite_wall",
+        "minecraft:blackstone_wall",
+        "minecraft:polished_blackstone_brick_wall",
+        "minecraft:polished_blackstone_wall",
+        "minecraft:shulker_box",
+        "minecraft:black_shulker_box",
+        "minecraft:blue_shulker_box",
+        "minecraft:brown_shulker_box",
+        "minecraft:cyan_shulker_box",
+        "minecraft:gray_shulker_box",
+        "minecraft:green_shulker_box",
+        "minecraft:light_blue_shulker_box",
+        "minecraft:light_gray_shulker_box",
+        "minecraft:lime_shulker_box",
+        "minecraft:magenta_shulker_box",
+        "minecraft:orange_shulker_box",
+        "minecraft:pink_shulker_box",
+        "minecraft:purple_shulker_box",
+        "minecraft:red_shulker_box",
+        "minecraft:white_shulker_box",
+        "minecraft:yellow_shulker_box",
+        "minecraft:anvil",
+        "minecraft:chipped_anvil",
+        "minecraft:damaged_anvil",
+        "minecraft:cauldron",
+        "minecraft:rail",
+        "minecraft:powered_rail",
+        "minecraft:detector_rail",
+        "minecraft:activator_rail"
+      ],
       "minecraft:needs_diamond_tool": [
         "minecraft:obsidian",
         "minecraft:crying_obsidian",
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 453bd8364..3f59f22d8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -22,7 +22,7 @@ legacyBukkit = "1.8.8-R0.1-SNAPSHOT"
 bungee = "1.16-R0.5-SNAPSHOT"
 sponge = "5.0.0"
 legacySponge = "4.0.0"
-velocity = "1.1.0-SNAPSHOT"
+velocity = "3.0.0-SNAPSHOT"
 
 
 [libraries]