From 7ab89e48c9e14559a84e2ed5809e8ac91ed7d8be Mon Sep 17 00:00:00 2001 From: Superomarking Date: Thu, 5 Dec 2024 13:08:02 +0300 Subject: [PATCH] Update mappings + Fix CS --- .../block_state_meta_map-1.21.40.json | 1126 ++--------------- .../canonical_block_states-1.21.40.nbt | Bin 2059051 -> 1918591 bytes .../versions/required_item_list-1.21.40.json | 516 +++----- .../handlers/static/InGamePacketHandler.php | 1 - .../packets/serializer/CustomBitSet.php | 4 +- 5 files changed, 260 insertions(+), 1387 deletions(-) diff --git a/resources/versions/block_state_meta_map-1.21.40.json b/resources/versions/block_state_meta_map-1.21.40.json index bfbd73c..e027100 100644 --- a/resources/versions/block_state_meta_map-1.21.40.json +++ b/resources/versions/block_state_meta_map-1.21.40.json @@ -314,22 +314,6 @@ 0, 0, 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 0, - 1, 0, 1, 0, @@ -1621,22 +1605,6 @@ 0, 1, 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 0, - 1, - 2, 0, 0, 0, @@ -1651,11 +1619,6 @@ 6, 7, 0, - 0, - 1, - 2, - 3, - 0, 1, 0, 1, @@ -1718,15 +1681,6 @@ 0, 0, 1, - 0, - 0, - 1, - 2, - 3, - 4, - 5, - 0, - 1, 2, 3, 4, @@ -2360,38 +2314,6 @@ 0, 0, 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29, - 30, - 31, - 0, - 1, 0, 1, 0, @@ -2628,70 +2550,6 @@ 3, 0, 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29, - 30, - 31, - 32, - 33, - 34, - 35, - 36, - 37, - 38, - 39, - 40, - 41, - 42, - 43, - 44, - 45, - 46, - 47, - 48, - 49, - 50, - 51, - 52, - 53, - 54, - 55, - 56, - 57, - 58, - 59, - 60, - 61, - 62, - 63, - 0, - 1, 0, 1, 0, @@ -3460,9 +3318,6 @@ 0, 0, 0, - 1, - 2, - 0, 0, 0, 1, @@ -4835,8 +4690,6 @@ 14, 15, 0, - 1, - 0, 0, 0, 0, @@ -4936,22 +4789,6 @@ 0, 1, 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 0, 0, 0, 1, @@ -4996,7 +4833,6 @@ 1, 2, 0, - 0, 1, 2, 3, @@ -5990,12 +5826,7 @@ 1, 0, 1, - 2, - 0, - 1, - 0, 0, - 1, 0, 0, 0, @@ -8102,9 +7933,6 @@ 1, 0, 0, - 1, - 2, - 0, 0, 1, 2, @@ -8379,469 +8207,85 @@ 3, 4, 5, + 6, + 7, 8, 9, 10, 11, 12, 13, + 14, + 15, 16, 17, 18, 19, 20, 21, + 22, + 23, 24, 25, - 26, - 27, - 28, - 29, - 32, - 33, - 34, - 35, - 36, - 37, - 40, - 41, - 42, - 43, - 44, - 45, - 48, - 49, - 50, - 51, - 52, - 53, - 56, - 57, - 58, - 59, - 60, - 61, - 64, - 65, - 66, - 67, - 68, - 69, - 72, - 73, - 74, - 75, - 76, - 77, - 80, - 81, - 82, - 83, - 84, - 85, - 88, - 89, - 90, - 91, - 92, - 93, - 96, - 97, - 98, - 99, - 100, - 101, - 104, - 105, - 106, - 107, - 108, - 109, - 112, - 113, - 114, - 115, - 116, - 117, - 120, - 121, - 122, - 123, - 124, - 125, - 128, - 129, - 130, - 131, - 132, - 133, - 136, - 137, - 138, - 139, - 140, - 141, - 144, - 145, - 146, - 147, - 148, - 149, - 152, - 153, - 154, - 155, - 156, - 157, - 160, - 161, - 162, - 163, - 164, - 165, - 168, - 169, - 170, - 171, - 172, - 173, - 176, - 177, - 178, - 179, - 180, - 181, - 184, - 185, - 186, - 187, - 188, - 189, - 192, - 193, - 194, - 195, - 196, - 197, - 200, - 201, - 202, - 203, - 204, - 205, - 208, - 209, - 210, - 211, - 212, - 213, - 216, - 217, - 218, - 219, - 220, - 221, - 224, - 225, - 226, - 227, - 228, - 229, - 232, - 233, - 234, - 235, - 236, - 237, - 240, - 241, - 242, - 243, - 244, - 245, - 248, - 249, - 250, - 251, - 252, - 253, - 256, - 257, - 258, - 259, - 260, - 261, - 264, - 265, - 266, - 267, - 268, - 269, - 272, - 273, - 274, - 275, - 276, - 277, - 280, - 281, - 282, - 283, - 284, - 285, - 288, - 289, - 290, - 291, - 292, - 293, - 296, - 297, - 298, - 299, - 300, - 301, - 304, - 305, - 306, - 307, - 308, - 309, - 312, - 313, - 314, - 315, - 316, - 317, - 320, - 321, - 322, - 323, - 324, - 325, - 328, - 329, - 330, - 331, - 332, - 333, - 336, - 337, - 338, - 339, - 340, - 341, - 344, - 345, - 346, - 347, - 348, - 349, - 352, - 353, - 354, - 355, - 356, - 357, - 360, - 361, - 362, - 363, - 364, - 365, - 368, - 369, - 370, - 371, - 372, - 373, - 376, - 377, - 378, - 379, - 380, - 381, - 384, - 385, - 386, - 387, - 388, - 389, - 392, - 393, - 394, - 395, - 396, - 397, - 400, - 401, - 402, - 403, - 404, - 405, - 408, - 409, - 410, - 411, - 412, - 413, - 416, - 417, - 418, - 419, - 420, - 421, - 424, - 425, - 426, - 427, - 428, - 429, - 432, - 433, - 434, - 435, - 436, - 437, - 440, - 441, - 442, - 443, - 444, - 445, - 448, - 449, - 450, - 451, - 452, - 453, - 456, - 457, - 458, - 459, - 460, - 461, - 464, - 465, - 466, - 467, - 468, - 469, - 472, - 473, - 474, - 475, - 476, - 477, - 480, - 481, - 482, - 483, - 484, - 485, - 488, - 489, - 490, - 491, - 492, - 493, - 496, - 497, - 498, - 499, - 500, - 501, - 504, - 505, - 506, - 507, - 508, - 509, - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24, - 25, - 0, - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 0, - 1, - 2, - 3, - 4, - 5, - 8, - 9, - 10, - 11, - 12, - 13, - 16, - 17, - 18, - 19, - 20, - 21, + 0, + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 0, + 1, + 2, + 3, + 4, + 5, + 8, + 9, + 10, + 11, + 12, + 13, + 16, + 17, + 18, + 19, + 20, + 21, 32, 33, 34, @@ -9359,7 +8803,6 @@ 31, 0, 0, - 0, 1, 0, 0, @@ -10484,7 +9927,6 @@ 0, 0, 0, - 0, 1, 2, 3, @@ -11097,9 +10539,6 @@ 0, 1, 2, - 0, - 1, - 2, 3, 4, 5, @@ -11129,185 +10568,21 @@ 3, 4, 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 0, - 0, - 1, - 0, - 0, - 0, - 1, - 0, - 1, - 2, - 3, - 4, - 5, - 8, - 9, - 10, - 11, - 12, - 13, - 16, - 17, - 18, - 19, - 20, - 21, - 32, - 33, - 34, - 35, - 36, - 37, - 40, - 41, - 42, - 43, - 44, - 45, - 48, - 49, - 50, - 51, - 52, - 53, - 64, - 65, - 66, - 67, - 68, - 69, - 72, - 73, - 74, - 75, - 76, - 77, - 80, - 81, - 82, - 83, - 84, - 85, - 128, - 129, - 130, - 131, - 132, - 133, - 136, - 137, - 138, - 139, - 140, - 141, - 144, - 145, - 146, - 147, - 148, - 149, - 160, - 161, - 162, - 163, - 164, - 165, - 168, - 169, - 170, - 171, - 172, - 173, - 176, - 177, - 178, - 179, - 180, - 181, - 192, - 193, - 194, - 195, - 196, - 197, - 200, - 201, - 202, - 203, - 204, - 205, - 208, - 209, - 210, - 211, - 212, - 213, - 256, - 257, - 258, - 259, - 260, - 261, - 264, - 265, - 266, - 267, - 268, - 269, - 272, - 273, - 274, - 275, - 276, - 277, - 288, - 289, - 290, - 291, - 292, - 293, - 296, - 297, - 298, - 299, - 300, - 301, - 304, - 305, - 306, - 307, - 308, - 309, - 320, - 321, - 322, - 323, - 324, - 325, - 328, - 329, - 330, - 331, - 332, - 333, - 336, - 337, - 338, - 339, - 340, - 341, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 0, + 0, + 1, + 0, + 0, 0, 1, 2, @@ -11369,14 +10644,6 @@ 15, 0, 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 0, 0, 0, 1, @@ -11511,7 +10778,6 @@ 0, 0, 0, - 0, 1, 2, 3, @@ -11802,7 +11068,6 @@ 2, 0, 0, - 0, 1, 0, 1, @@ -12028,23 +11293,6 @@ 5, 6, 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 0, 0, 0, 0, @@ -13312,28 +12560,10 @@ 7, 0, 0, - 1, - 0, - 0, - 1, 0, 1, 0, 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, 0, 1, 2, @@ -13373,14 +12603,6 @@ 0, 1, 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 0, 0, 1, 2, @@ -13638,30 +12860,6 @@ 6, 7, 0, - 1, - 2, - 4, - 5, - 6, - 8, - 9, - 10, - 12, - 13, - 14, - 0, - 1, - 2, - 3, - 4, - 5, - 8, - 9, - 10, - 11, - 12, - 13, - 0, 0, 0, 0, @@ -14726,168 +13924,6 @@ 340, 341, 0, - 1, - 2, - 3, - 4, - 5, - 8, - 9, - 10, - 11, - 12, - 13, - 16, - 17, - 18, - 19, - 20, - 21, - 32, - 33, - 34, - 35, - 36, - 37, - 40, - 41, - 42, - 43, - 44, - 45, - 48, - 49, - 50, - 51, - 52, - 53, - 64, - 65, - 66, - 67, - 68, - 69, - 72, - 73, - 74, - 75, - 76, - 77, - 80, - 81, - 82, - 83, - 84, - 85, - 128, - 129, - 130, - 131, - 132, - 133, - 136, - 137, - 138, - 139, - 140, - 141, - 144, - 145, - 146, - 147, - 148, - 149, - 160, - 161, - 162, - 163, - 164, - 165, - 168, - 169, - 170, - 171, - 172, - 173, - 176, - 177, - 178, - 179, - 180, - 181, - 192, - 193, - 194, - 195, - 196, - 197, - 200, - 201, - 202, - 203, - 204, - 205, - 208, - 209, - 210, - 211, - 212, - 213, - 256, - 257, - 258, - 259, - 260, - 261, - 264, - 265, - 266, - 267, - 268, - 269, - 272, - 273, - 274, - 275, - 276, - 277, - 288, - 289, - 290, - 291, - 292, - 293, - 296, - 297, - 298, - 299, - 300, - 301, - 304, - 305, - 306, - 307, - 308, - 309, - 320, - 321, - 322, - 323, - 324, - 325, - 328, - 329, - 330, - 331, - 332, - 333, - 336, - 337, - 338, - 339, - 340, - 341, - 0, 0, 1, 0, @@ -15060,8 +14096,6 @@ 4, 5, 0, - 1, - 0, 0, 1, 2, diff --git a/resources/versions/canonical_block_states-1.21.40.nbt b/resources/versions/canonical_block_states-1.21.40.nbt index 556c9edfbf9247f3bfabb11a56a264e0bbbcb4c1..ff4d75701640921818a7fda13f0449f5e3595a19 100644 GIT binary patch delta 729 zcmY+BUr19?9LMqA{c*cz+jTm(dDq>X)`OZ@6D5Kgg#XIcGM`d&AeAM>dZ?!YY2Xbk zCk^(6pcpANlfV%A^&lEl5EGdg>1{pRJd zxo7C@;ss0(83ZgH%(LUu8_xBAtqco~_3l`5N=Z)TP;!cU)JM@He5W40A2H=S^gnD=i_2{mjBK5uQ1h8@}V zv+pn~D`eEj)iBWtnJ)$qxou)tE;U+l_>A70s2UQebJ^VB&Gxa-xJ}q^L-eYJVXRmv z#X^U>2H`c{fOVhX#mq^2`L6G~4`~ft0g? z)O*gi1!%j%o9W$CXJ!wAevu&}OJ$fT;RI^@=KOL#A=-?XY<2BKB*WxHRi2$Rd)S0% zzsG^duxsDn;WZ^q@9^2FEV%pGY*oT(mxi0d>7x4B#`CvSNZmP!)JqFG7C9qXtEEW> zb;-`?^&!bLjORx^4DE|tt}>!ZG@^QRuMljI`=GiF%^RykWLIje5; I@2xET15)oEg8%>k delta 43160 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 diff --git a/resources/versions/required_item_list-1.21.40.json b/resources/versions/required_item_list-1.21.40.json index c523dd6..5d02118 100644 --- a/resources/versions/required_item_list-1.21.40.json +++ b/resources/versions/required_item_list-1.21.40.json @@ -8,7 +8,7 @@ "component_based": false }, "minecraft:acacia_chest_boat": { - "runtime_id": 680, + "runtime_id": 679, "component_based": false }, "minecraft:acacia_door": { @@ -92,7 +92,7 @@ "component_based": false }, "minecraft:allay_spawn_egg": { - "runtime_id": 669, + "runtime_id": 668, "component_based": false }, "minecraft:allium": { @@ -112,7 +112,7 @@ "component_based": false }, "minecraft:amethyst_shard": { - "runtime_id": 662, + "runtime_id": 661, "component_based": false }, "minecraft:ancient_debris": { @@ -140,7 +140,7 @@ "component_based": false }, "minecraft:angler_pottery_sherd": { - "runtime_id": 694, + "runtime_id": 693, "component_based": false }, "minecraft:anvil": { @@ -152,15 +152,15 @@ "component_based": true }, "minecraft:archer_pottery_sherd": { - "runtime_id": 695, + "runtime_id": 694, "component_based": false }, "minecraft:armadillo_scute": { - "runtime_id": 741, + "runtime_id": 740, "component_based": false }, "minecraft:armadillo_spawn_egg": { - "runtime_id": 740, + "runtime_id": 739, "component_based": false }, "minecraft:armor_stand": { @@ -168,7 +168,7 @@ "component_based": false }, "minecraft:arms_up_pottery_sherd": { - "runtime_id": 696, + "runtime_id": 695, "component_based": false }, "minecraft:arrow": { @@ -204,7 +204,7 @@ "component_based": false }, "minecraft:balloon": { - "runtime_id": 636, + "runtime_id": 635, "component_based": false }, "minecraft:bamboo": { @@ -220,7 +220,7 @@ "component_based": false }, "minecraft:bamboo_chest_raft": { - "runtime_id": 692, + "runtime_id": 691, "component_based": false }, "minecraft:bamboo_door": { @@ -268,7 +268,7 @@ "component_based": false }, "minecraft:bamboo_raft": { - "runtime_id": 691, + "runtime_id": 690, "component_based": false }, "minecraft:bamboo_sapling": { @@ -276,7 +276,7 @@ "component_based": false }, "minecraft:bamboo_sign": { - "runtime_id": 690, + "runtime_id": 689, "component_based": false }, "minecraft:bamboo_slab": { @@ -304,7 +304,7 @@ "component_based": false }, "minecraft:banner_pattern": { - "runtime_id": 794, + "runtime_id": 788, "component_based": false }, "minecraft:barrel": { @@ -380,7 +380,7 @@ "component_based": false }, "minecraft:birch_chest_boat": { - "runtime_id": 677, + "runtime_id": 676, "component_based": false }, "minecraft:birch_door": { @@ -452,7 +452,7 @@ "component_based": false }, "minecraft:black_bundle": { - "runtime_id": 257, + "runtime_id": 259, "component_based": true }, "minecraft:black_candle": { @@ -524,7 +524,7 @@ "component_based": false }, "minecraft:blade_pottery_sherd": { - "runtime_id": 697, + "runtime_id": 696, "component_based": false }, "minecraft:blast_furnace": { @@ -544,11 +544,11 @@ "component_based": false }, "minecraft:bleach": { - "runtime_id": 634, + "runtime_id": 633, "component_based": false }, "minecraft:blue_bundle": { - "runtime_id": 258, + "runtime_id": 266, "component_based": true }, "minecraft:blue_candle": { @@ -607,12 +607,8 @@ "runtime_id": -563, "component_based": false }, - "minecraft:board": { - "runtime_id": 630, - "component_based": false - }, "minecraft:boat": { - "runtime_id": 792, + "runtime_id": 786, "component_based": false }, "minecraft:bogged_spawn_egg": { @@ -620,7 +616,7 @@ "component_based": false }, "minecraft:bolt_armor_trim_smithing_template": { - "runtime_id": 736, + "runtime_id": 735, "component_based": false }, "minecraft:bone": { @@ -688,7 +684,7 @@ "component_based": false }, "minecraft:brewer_pottery_sherd": { - "runtime_id": 698, + "runtime_id": 697, "component_based": false }, "minecraft:brewing_stand": { @@ -720,7 +716,7 @@ "component_based": false }, "minecraft:brown_bundle": { - "runtime_id": 259, + "runtime_id": 261, "component_based": true }, "minecraft:brown_candle": { @@ -780,7 +776,7 @@ "component_based": false }, "minecraft:brush": { - "runtime_id": 717, + "runtime_id": 716, "component_based": false }, "minecraft:bubble_column": { @@ -812,11 +808,11 @@ "component_based": false }, "minecraft:bundle": { - "runtime_id": 262, + "runtime_id": 269, "component_based": true }, "minecraft:burn_pottery_sherd": { - "runtime_id": 699, + "runtime_id": 698, "component_based": false }, "minecraft:cactus": { @@ -836,11 +832,11 @@ "component_based": false }, "minecraft:camel_spawn_egg": { - "runtime_id": 693, + "runtime_id": 692, "component_based": false }, "minecraft:camera": { - "runtime_id": 631, + "runtime_id": 630, "component_based": false }, "minecraft:campfire": { @@ -856,7 +852,7 @@ "component_based": false }, "minecraft:carpet": { - "runtime_id": 751, + "runtime_id": 745, "component_based": false }, "minecraft:carrot": { @@ -904,7 +900,7 @@ "component_based": false }, "minecraft:chain": { - "runtime_id": 657, + "runtime_id": 656, "component_based": true }, "minecraft:chain_command_block": { @@ -927,10 +923,6 @@ "runtime_id": 366, "component_based": false }, - "minecraft:chalkboard": { - "runtime_id": 230, - "component_based": false - }, "minecraft:charcoal": { "runtime_id": 327, "component_based": true @@ -940,11 +932,11 @@ "component_based": false }, "minecraft:chemistry_table": { - "runtime_id": 786, + "runtime_id": 780, "component_based": false }, "minecraft:cherry_boat": { - "runtime_id": 687, + "runtime_id": 686, "component_based": false }, "minecraft:cherry_button": { @@ -952,7 +944,7 @@ "component_based": false }, "minecraft:cherry_chest_boat": { - "runtime_id": 688, + "runtime_id": 687, "component_based": false }, "minecraft:cherry_door": { @@ -996,7 +988,7 @@ "component_based": false }, "minecraft:cherry_sign": { - "runtime_id": 689, + "runtime_id": 688, "component_based": false }, "minecraft:cherry_slab": { @@ -1028,7 +1020,7 @@ "component_based": false }, "minecraft:chest_boat": { - "runtime_id": 683, + "runtime_id": 682, "component_based": false }, "minecraft:chest_minecart": { @@ -1075,10 +1067,6 @@ "runtime_id": -956, "component_based": false }, - "minecraft:chiseled_resin_bricks": { - "runtime_id": -1020, - "component_based": false - }, "minecraft:chiseled_sandstone": { "runtime_id": -944, "component_based": false @@ -1123,10 +1111,6 @@ "runtime_id": 419, "component_based": false }, - "minecraft:closed_eyeblossom": { - "runtime_id": -1019, - "component_based": false - }, "minecraft:coal": { "runtime_id": 326, "component_based": true @@ -1144,7 +1128,7 @@ "component_based": false }, "minecraft:coast_armor_trim_smithing_template": { - "runtime_id": 721, + "runtime_id": 720, "component_based": false }, "minecraft:cobbled_deepslate": { @@ -1208,7 +1192,7 @@ "component_based": false }, "minecraft:colored_torch_bp": { - "runtime_id": 790, + "runtime_id": 784, "component_based": false }, "minecraft:colored_torch_green": { @@ -1224,7 +1208,7 @@ "component_based": false }, "minecraft:colored_torch_rg": { - "runtime_id": 789, + "runtime_id": 783, "component_based": false }, "minecraft:command_block": { @@ -1248,7 +1232,7 @@ "component_based": false }, "minecraft:compound": { - "runtime_id": 632, + "runtime_id": 631, "component_based": false }, "minecraft:compound_creator": { @@ -1256,11 +1240,11 @@ "component_based": false }, "minecraft:concrete": { - "runtime_id": 777, + "runtime_id": 771, "component_based": false }, "minecraft:concrete_powder": { - "runtime_id": 778, + "runtime_id": 772, "component_based": false }, "minecraft:conduit": { @@ -1328,19 +1312,19 @@ "component_based": false }, "minecraft:coral": { - "runtime_id": 773, + "runtime_id": 767, "component_based": false }, "minecraft:coral_block": { - "runtime_id": 755, + "runtime_id": 749, "component_based": false }, "minecraft:coral_fan": { - "runtime_id": 764, + "runtime_id": 758, "component_based": false }, "minecraft:coral_fan_dead": { - "runtime_id": 765, + "runtime_id": 759, "component_based": false }, "minecraft:cornflower": { @@ -1379,14 +1363,6 @@ "runtime_id": 58, "component_based": false }, - "minecraft:creaking_heart": { - "runtime_id": -1012, - "component_based": false - }, - "minecraft:creaking_spawn_egg": { - "runtime_id": 748, - "component_based": false - }, "minecraft:creeper_banner_pattern": { "runtime_id": 615, "component_based": false @@ -1404,7 +1380,7 @@ "component_based": false }, "minecraft:crimson_door": { - "runtime_id": 654, + "runtime_id": 653, "component_based": false }, "minecraft:crimson_double_slab": { @@ -1448,7 +1424,7 @@ "component_based": false }, "minecraft:crimson_sign": { - "runtime_id": 652, + "runtime_id": 651, "component_based": false }, "minecraft:crimson_slab": { @@ -1580,7 +1556,7 @@ "component_based": false }, "minecraft:danger_pottery_sherd": { - "runtime_id": 700, + "runtime_id": 699, "component_based": false }, "minecraft:dark_oak_boat": { @@ -1592,7 +1568,7 @@ "component_based": false }, "minecraft:dark_oak_chest_boat": { - "runtime_id": 681, + "runtime_id": 680, "component_based": false }, "minecraft:dark_oak_door": { @@ -1956,7 +1932,7 @@ "component_based": false }, "minecraft:disc_fragment_5": { - "runtime_id": 675, + "runtime_id": 674, "component_based": false }, "minecraft:dispenser": { @@ -1976,23 +1952,23 @@ "component_based": false }, "minecraft:double_plant": { - "runtime_id": 771, + "runtime_id": 765, "component_based": false }, "minecraft:double_stone_block_slab": { - "runtime_id": 760, + "runtime_id": 754, "component_based": false }, "minecraft:double_stone_block_slab2": { - "runtime_id": 761, + "runtime_id": 755, "component_based": false }, "minecraft:double_stone_block_slab3": { - "runtime_id": 762, + "runtime_id": 756, "component_based": false }, "minecraft:double_stone_block_slab4": { - "runtime_id": 763, + "runtime_id": 757, "component_based": false }, "minecraft:dragon_breath": { @@ -2028,15 +2004,15 @@ "component_based": false }, "minecraft:dune_armor_trim_smithing_template": { - "runtime_id": 720, + "runtime_id": 719, "component_based": false }, "minecraft:dye": { - "runtime_id": 793, + "runtime_id": 787, "component_based": false }, "minecraft:echo_shard": { - "runtime_id": 685, + "runtime_id": 684, "component_based": false }, "minecraft:egg": { @@ -2568,7 +2544,7 @@ "component_based": false }, "minecraft:end_crystal": { - "runtime_id": 796, + "runtime_id": 790, "component_based": false }, "minecraft:end_gateway": { @@ -2636,7 +2612,7 @@ "component_based": false }, "minecraft:explorer_pottery_sherd": { - "runtime_id": 701, + "runtime_id": 700, "component_based": false }, "minecraft:exposed_chiseled_copper": { @@ -2680,7 +2656,7 @@ "component_based": false }, "minecraft:eye_armor_trim_smithing_template": { - "runtime_id": 724, + "runtime_id": 723, "component_based": false }, "minecraft:farmland": { @@ -2692,7 +2668,7 @@ "component_based": false }, "minecraft:fence": { - "runtime_id": 753, + "runtime_id": 747, "component_based": false }, "minecraft:fence_gate": { @@ -2764,7 +2740,7 @@ "component_based": false }, "minecraft:flow_armor_trim_smithing_template": { - "runtime_id": 735, + "runtime_id": 734, "component_based": false }, "minecraft:flow_banner_pattern": { @@ -2772,7 +2748,7 @@ "component_based": false }, "minecraft:flow_pottery_sherd": { - "runtime_id": 702, + "runtime_id": 701, "component_based": false }, "minecraft:flower_banner_pattern": { @@ -2804,7 +2780,7 @@ "component_based": true }, "minecraft:friend_pottery_sherd": { - "runtime_id": 703, + "runtime_id": 702, "component_based": false }, "minecraft:frog_spawn": { @@ -2812,7 +2788,7 @@ "component_based": false }, "minecraft:frog_spawn_egg": { - "runtime_id": 666, + "runtime_id": 665, "component_based": false }, "minecraft:frosted_ice": { @@ -2856,11 +2832,11 @@ "component_based": false }, "minecraft:glow_berries": { - "runtime_id": 797, + "runtime_id": 791, "component_based": false }, "minecraft:glow_frame": { - "runtime_id": 661, + "runtime_id": 660, "component_based": true }, "minecraft:glow_ink_sac": { @@ -2876,7 +2852,7 @@ "component_based": false }, "minecraft:glow_stick": { - "runtime_id": 639, + "runtime_id": 638, "component_based": false }, "minecraft:glowingobsidian": { @@ -2892,7 +2868,7 @@ "component_based": false }, "minecraft:goat_horn": { - "runtime_id": 665, + "runtime_id": 664, "component_based": false }, "minecraft:goat_spawn_egg": { @@ -3000,7 +2976,7 @@ "component_based": false }, "minecraft:gray_bundle": { - "runtime_id": 268, + "runtime_id": 264, "component_based": true }, "minecraft:gray_candle": { @@ -3052,7 +3028,7 @@ "component_based": false }, "minecraft:green_bundle": { - "runtime_id": 269, + "runtime_id": 262, "component_based": true }, "minecraft:green_candle": { @@ -3120,7 +3096,7 @@ "component_based": false }, "minecraft:guster_pottery_sherd": { - "runtime_id": 704, + "runtime_id": 703, "component_based": false }, "minecraft:hanging_roots": { @@ -3248,11 +3224,11 @@ "component_based": false }, "minecraft:hard_stained_glass": { - "runtime_id": 787, + "runtime_id": 781, "component_based": false }, "minecraft:hard_stained_glass_pane": { - "runtime_id": 788, + "runtime_id": 782, "component_based": false }, "minecraft:hard_white_stained_glass": { @@ -3284,11 +3260,11 @@ "component_based": false }, "minecraft:heart_pottery_sherd": { - "runtime_id": 705, + "runtime_id": 704, "component_based": false }, "minecraft:heartbreak_pottery_sherd": { - "runtime_id": 706, + "runtime_id": 705, "component_based": false }, "minecraft:heavy_core": { @@ -3348,11 +3324,11 @@ "component_based": false }, "minecraft:host_armor_trim_smithing_template": { - "runtime_id": 734, + "runtime_id": 733, "component_based": false }, "minecraft:howl_pottery_sherd": { - "runtime_id": 707, + "runtime_id": 706, "component_based": false }, "minecraft:husk_spawn_egg": { @@ -3364,7 +3340,7 @@ "component_based": false }, "minecraft:ice_bomb": { - "runtime_id": 633, + "runtime_id": 632, "component_based": false }, "minecraft:infested_chiseled_stone_bricks": { @@ -3612,7 +3588,7 @@ "component_based": false }, "minecraft:jungle_chest_boat": { - "runtime_id": 678, + "runtime_id": 677, "component_based": false }, "minecraft:jungle_door": { @@ -3756,11 +3732,11 @@ "component_based": false }, "minecraft:leaves": { - "runtime_id": 767, + "runtime_id": 761, "component_based": false }, "minecraft:leaves2": { - "runtime_id": 768, + "runtime_id": 762, "component_based": false }, "minecraft:lectern": { @@ -3772,7 +3748,7 @@ "component_based": false }, "minecraft:light_block": { - "runtime_id": 791, + "runtime_id": 785, "component_based": false }, "minecraft:light_block_0": { @@ -3840,7 +3816,7 @@ "component_based": false }, "minecraft:light_blue_bundle": { - "runtime_id": 260, + "runtime_id": 257, "component_based": true }, "minecraft:light_blue_candle": { @@ -3892,7 +3868,7 @@ "component_based": false }, "minecraft:light_gray_bundle": { - "runtime_id": 263, + "runtime_id": 273, "component_based": true }, "minecraft:light_gray_candle": { @@ -3956,7 +3932,7 @@ "component_based": false }, "minecraft:lime_bundle": { - "runtime_id": 270, + "runtime_id": 263, "component_based": true }, "minecraft:lime_candle": { @@ -4048,15 +4024,15 @@ "component_based": false }, "minecraft:lodestone_compass": { - "runtime_id": 640, + "runtime_id": 639, "component_based": false }, "minecraft:log": { - "runtime_id": 752, + "runtime_id": 746, "component_based": false }, "minecraft:log2": { - "runtime_id": 775, + "runtime_id": 769, "component_based": false }, "minecraft:loom": { @@ -4068,7 +4044,7 @@ "component_based": false }, "minecraft:magenta_bundle": { - "runtime_id": 273, + "runtime_id": 271, "component_based": true }, "minecraft:magenta_candle": { @@ -4132,7 +4108,7 @@ "component_based": false }, "minecraft:mangrove_boat": { - "runtime_id": 673, + "runtime_id": 672, "component_based": false }, "minecraft:mangrove_button": { @@ -4140,11 +4116,11 @@ "component_based": false }, "minecraft:mangrove_chest_boat": { - "runtime_id": 682, + "runtime_id": 681, "component_based": false }, "minecraft:mangrove_door": { - "runtime_id": 671, + "runtime_id": 670, "component_based": false }, "minecraft:mangrove_double_slab": { @@ -4188,7 +4164,7 @@ "component_based": false }, "minecraft:mangrove_sign": { - "runtime_id": 672, + "runtime_id": 671, "component_based": false }, "minecraft:mangrove_slab": { @@ -4220,7 +4196,7 @@ "component_based": false }, "minecraft:medicine": { - "runtime_id": 637, + "runtime_id": 636, "component_based": false }, "minecraft:medium_amethyst_bud": { @@ -4252,7 +4228,7 @@ "component_based": false }, "minecraft:miner_pottery_sherd": { - "runtime_id": 708, + "runtime_id": 707, "component_based": false }, "minecraft:mob_spawner": { @@ -4264,7 +4240,7 @@ "component_based": false }, "minecraft:monster_egg": { - "runtime_id": 776, + "runtime_id": 770, "component_based": false }, "minecraft:mooshroom_spawn_egg": { @@ -4320,7 +4296,7 @@ "component_based": false }, "minecraft:mourner_pottery_sherd": { - "runtime_id": 709, + "runtime_id": 708, "component_based": false }, "minecraft:moving_block": { @@ -4376,7 +4352,7 @@ "component_based": true }, "minecraft:music_disc_5": { - "runtime_id": 674, + "runtime_id": 673, "component_based": true }, "minecraft:music_disc_blocks": { @@ -4392,11 +4368,11 @@ "component_based": true }, "minecraft:music_disc_creator": { - "runtime_id": 783, + "runtime_id": 777, "component_based": true }, "minecraft:music_disc_creator_music_box": { - "runtime_id": 784, + "runtime_id": 778, "component_based": true }, "minecraft:music_disc_far": { @@ -4412,19 +4388,19 @@ "component_based": true }, "minecraft:music_disc_otherside": { - "runtime_id": 664, + "runtime_id": 663, "component_based": true }, "minecraft:music_disc_pigstep": { - "runtime_id": 658, + "runtime_id": 657, "component_based": true }, "minecraft:music_disc_precipice": { - "runtime_id": 785, + "runtime_id": 779, "component_based": true }, "minecraft:music_disc_relic": { - "runtime_id": 737, + "runtime_id": 736, "component_based": true }, "minecraft:music_disc_stal": { @@ -4488,7 +4464,7 @@ "component_based": false }, "minecraft:nether_sprouts": { - "runtime_id": 659, + "runtime_id": 658, "component_based": true }, "minecraft:nether_star": { @@ -4508,7 +4484,7 @@ "component_based": false }, "minecraft:netherite_axe": { - "runtime_id": 644, + "runtime_id": 643, "component_based": false }, "minecraft:netherite_block": { @@ -4516,47 +4492,47 @@ "component_based": false }, "minecraft:netherite_boots": { - "runtime_id": 650, + "runtime_id": 649, "component_based": false }, "minecraft:netherite_chestplate": { - "runtime_id": 648, + "runtime_id": 647, "component_based": false }, "minecraft:netherite_helmet": { - "runtime_id": 647, + "runtime_id": 646, "component_based": false }, "minecraft:netherite_hoe": { - "runtime_id": 645, + "runtime_id": 644, "component_based": false }, "minecraft:netherite_ingot": { - "runtime_id": 646, + "runtime_id": 645, "component_based": false }, "minecraft:netherite_leggings": { - "runtime_id": 649, + "runtime_id": 648, "component_based": false }, "minecraft:netherite_pickaxe": { - "runtime_id": 643, + "runtime_id": 642, "component_based": false }, "minecraft:netherite_scrap": { - "runtime_id": 651, + "runtime_id": 650, "component_based": false }, "minecraft:netherite_shovel": { - "runtime_id": 642, + "runtime_id": 641, "component_based": false }, "minecraft:netherite_sword": { - "runtime_id": 641, + "runtime_id": 640, "component_based": false }, "minecraft:netherite_upgrade_smithing_template": { - "runtime_id": 718, + "runtime_id": 717, "component_based": false }, "minecraft:netherrack": { @@ -4592,7 +4568,7 @@ "component_based": false }, "minecraft:oak_chest_boat": { - "runtime_id": 676, + "runtime_id": 675, "component_based": false }, "minecraft:oak_double_slab": { @@ -4660,15 +4636,11 @@ "component_based": false }, "minecraft:ominous_trial_key": { - "runtime_id": 275, + "runtime_id": 276, "component_based": true }, - "minecraft:open_eyeblossom": { - "runtime_id": -1018, - "component_based": false - }, "minecraft:orange_bundle": { - "runtime_id": 271, + "runtime_id": 258, "component_based": true }, "minecraft:orange_candle": { @@ -4779,98 +4751,6 @@ "runtime_id": 382, "component_based": false }, - "minecraft:pale_hanging_moss": { - "runtime_id": -1011, - "component_based": false - }, - "minecraft:pale_moss_block": { - "runtime_id": -1009, - "component_based": false - }, - "minecraft:pale_moss_carpet": { - "runtime_id": -1010, - "component_based": false - }, - "minecraft:pale_oak_boat": { - "runtime_id": 745, - "component_based": false - }, - "minecraft:pale_oak_button": { - "runtime_id": -989, - "component_based": false - }, - "minecraft:pale_oak_chest_boat": { - "runtime_id": 746, - "component_based": false - }, - "minecraft:pale_oak_door": { - "runtime_id": -990, - "component_based": false - }, - "minecraft:pale_oak_double_slab": { - "runtime_id": -999, - "component_based": false - }, - "minecraft:pale_oak_fence": { - "runtime_id": -991, - "component_based": false - }, - "minecraft:pale_oak_fence_gate": { - "runtime_id": -992, - "component_based": false - }, - "minecraft:pale_oak_hanging_sign": { - "runtime_id": -993, - "component_based": false - }, - "minecraft:pale_oak_leaves": { - "runtime_id": -1007, - "component_based": false - }, - "minecraft:pale_oak_log": { - "runtime_id": -995, - "component_based": false - }, - "minecraft:pale_oak_planks": { - "runtime_id": -996, - "component_based": false - }, - "minecraft:pale_oak_pressure_plate": { - "runtime_id": -997, - "component_based": false - }, - "minecraft:pale_oak_sapling": { - "runtime_id": -1006, - "component_based": false - }, - "minecraft:pale_oak_sign": { - "runtime_id": 747, - "component_based": false - }, - "minecraft:pale_oak_slab": { - "runtime_id": -998, - "component_based": false - }, - "minecraft:pale_oak_stairs": { - "runtime_id": -1000, - "component_based": false - }, - "minecraft:pale_oak_standing_sign": { - "runtime_id": -1001, - "component_based": false - }, - "minecraft:pale_oak_trapdoor": { - "runtime_id": -1002, - "component_based": false - }, - "minecraft:pale_oak_wall_sign": { - "runtime_id": -1003, - "component_based": false - }, - "minecraft:pale_oak_wood": { - "runtime_id": -1005, - "component_based": false - }, "minecraft:panda_spawn_egg": { "runtime_id": 517, "component_based": false @@ -4932,7 +4812,7 @@ "component_based": false }, "minecraft:pink_bundle": { - "runtime_id": 264, + "runtime_id": 272, "component_based": true }, "minecraft:pink_candle": { @@ -5012,7 +4892,7 @@ "component_based": false }, "minecraft:planks": { - "runtime_id": 772, + "runtime_id": 766, "component_based": false }, "minecraft:player_head": { @@ -5020,7 +4900,7 @@ "component_based": false }, "minecraft:plenty_pottery_sherd": { - "runtime_id": 710, + "runtime_id": 709, "component_based": false }, "minecraft:podzol": { @@ -5268,7 +5148,7 @@ "component_based": false }, "minecraft:prize_pottery_sherd": { - "runtime_id": 711, + "runtime_id": 710, "component_based": false }, "minecraft:pufferfish": { @@ -5300,7 +5180,7 @@ "component_based": false }, "minecraft:purple_bundle": { - "runtime_id": 266, + "runtime_id": 270, "component_based": true }, "minecraft:purple_candle": { @@ -5428,11 +5308,11 @@ "component_based": false }, "minecraft:raiser_armor_trim_smithing_template": { - "runtime_id": 732, + "runtime_id": 731, "component_based": false }, "minecraft:rapid_fertilizer": { - "runtime_id": 635, + "runtime_id": 634, "component_based": false }, "minecraft:ravager_spawn_egg": { @@ -5464,11 +5344,11 @@ "component_based": false }, "minecraft:recovery_compass": { - "runtime_id": 684, + "runtime_id": 683, "component_based": false }, "minecraft:red_bundle": { - "runtime_id": 272, + "runtime_id": 267, "component_based": true }, "minecraft:red_candle": { @@ -5496,7 +5376,7 @@ "component_based": false }, "minecraft:red_flower": { - "runtime_id": 770, + "runtime_id": 764, "component_based": false }, "minecraft:red_glazed_terracotta": { @@ -5619,44 +5499,12 @@ "runtime_id": 255, "component_based": false }, - "minecraft:resin_block": { - "runtime_id": -1021, - "component_based": false - }, - "minecraft:resin_brick": { - "runtime_id": 749, - "component_based": false - }, - "minecraft:resin_brick_double_slab": { - "runtime_id": -1015, - "component_based": false - }, - "minecraft:resin_brick_slab": { - "runtime_id": -1014, - "component_based": false - }, - "minecraft:resin_brick_stairs": { - "runtime_id": -1016, - "component_based": false - }, - "minecraft:resin_brick_wall": { - "runtime_id": -1017, - "component_based": false - }, - "minecraft:resin_bricks": { - "runtime_id": -1013, - "component_based": false - }, - "minecraft:resin_clump": { - "runtime_id": -1022, - "component_based": false - }, "minecraft:respawn_anchor": { "runtime_id": -272, "component_based": false }, "minecraft:rib_armor_trim_smithing_template": { - "runtime_id": 728, + "runtime_id": 727, "component_based": false }, "minecraft:rose_bush": { @@ -5708,7 +5556,7 @@ "component_based": false }, "minecraft:sapling": { - "runtime_id": 766, + "runtime_id": 760, "component_based": false }, "minecraft:scaffolding": { @@ -5716,7 +5564,7 @@ "component_based": false }, "minecraft:scrape_pottery_sherd": { - "runtime_id": 712, + "runtime_id": 711, "component_based": false }, "minecraft:sculk": { @@ -5752,15 +5600,15 @@ "component_based": false }, "minecraft:sentry_armor_trim_smithing_template": { - "runtime_id": 719, + "runtime_id": 718, "component_based": false }, "minecraft:shaper_armor_trim_smithing_template": { - "runtime_id": 733, + "runtime_id": 732, "component_based": false }, "minecraft:sheaf_pottery_sherd": { - "runtime_id": 713, + "runtime_id": 712, "component_based": false }, "minecraft:shears": { @@ -5772,7 +5620,7 @@ "component_based": false }, "minecraft:shelter_pottery_sherd": { - "runtime_id": 714, + "runtime_id": 713, "component_based": false }, "minecraft:shield": { @@ -5788,7 +5636,7 @@ "component_based": false }, "minecraft:shulker_box": { - "runtime_id": 781, + "runtime_id": 775, "component_based": false }, "minecraft:shulker_shell": { @@ -5800,7 +5648,7 @@ "component_based": false }, "minecraft:silence_armor_trim_smithing_template": { - "runtime_id": 730, + "runtime_id": 729, "component_based": false }, "minecraft:silver_glazed_terracotta": { @@ -5824,7 +5672,7 @@ "component_based": false }, "minecraft:skull": { - "runtime_id": 738, + "runtime_id": 737, "component_based": false }, "minecraft:skull_banner_pattern": { @@ -5832,7 +5680,7 @@ "component_based": false }, "minecraft:skull_pottery_sherd": { - "runtime_id": 715, + "runtime_id": 714, "component_based": false }, "minecraft:slime": { @@ -5936,11 +5784,11 @@ "component_based": false }, "minecraft:snort_pottery_sherd": { - "runtime_id": 716, + "runtime_id": 715, "component_based": false }, "minecraft:snout_armor_trim_smithing_template": { - "runtime_id": 727, + "runtime_id": 726, "component_based": false }, "minecraft:snow": { @@ -5960,7 +5808,7 @@ "component_based": true }, "minecraft:soul_campfire": { - "runtime_id": 660, + "runtime_id": 659, "component_based": true }, "minecraft:soul_fire": { @@ -5984,11 +5832,11 @@ "component_based": false }, "minecraft:sparkler": { - "runtime_id": 638, + "runtime_id": 637, "component_based": false }, "minecraft:spawn_egg": { - "runtime_id": 795, + "runtime_id": 789, "component_based": false }, "minecraft:spider_eye": { @@ -6000,7 +5848,7 @@ "component_based": false }, "minecraft:spire_armor_trim_smithing_template": { - "runtime_id": 729, + "runtime_id": 728, "component_based": false }, "minecraft:splash_potion": { @@ -6024,7 +5872,7 @@ "component_based": false }, "minecraft:spruce_chest_boat": { - "runtime_id": 679, + "runtime_id": 678, "component_based": false }, "minecraft:spruce_door": { @@ -6096,7 +5944,7 @@ "component_based": false }, "minecraft:spyglass": { - "runtime_id": 663, + "runtime_id": 662, "component_based": false }, "minecraft:squid_spawn_egg": { @@ -6104,15 +5952,15 @@ "component_based": false }, "minecraft:stained_glass": { - "runtime_id": 779, + "runtime_id": 773, "component_based": false }, "minecraft:stained_glass_pane": { - "runtime_id": 780, + "runtime_id": 774, "component_based": false }, "minecraft:stained_hardened_clay": { - "runtime_id": 739, + "runtime_id": 738, "component_based": false }, "minecraft:standing_banner": { @@ -6144,19 +5992,19 @@ "component_based": false }, "minecraft:stone_block_slab": { - "runtime_id": 756, + "runtime_id": 750, "component_based": false }, "minecraft:stone_block_slab2": { - "runtime_id": 757, + "runtime_id": 751, "component_based": false }, "minecraft:stone_block_slab3": { - "runtime_id": 758, + "runtime_id": 752, "component_based": false }, "minecraft:stone_block_slab4": { - "runtime_id": 759, + "runtime_id": 753, "component_based": false }, "minecraft:stone_brick_double_slab": { @@ -6208,7 +6056,7 @@ "component_based": false }, "minecraft:stonebrick": { - "runtime_id": 754, + "runtime_id": 748, "component_based": false }, "minecraft:stonecutter": { @@ -6299,14 +6147,6 @@ "runtime_id": -819, "component_based": false }, - "minecraft:stripped_pale_oak_log": { - "runtime_id": -994, - "component_based": false - }, - "minecraft:stripped_pale_oak_wood": { - "runtime_id": -1004, - "component_based": false - }, "minecraft:stripped_spruce_log": { "runtime_id": -5, "component_based": false @@ -6364,11 +6204,11 @@ "component_based": false }, "minecraft:tadpole_bucket": { - "runtime_id": 668, + "runtime_id": 667, "component_based": false }, "minecraft:tadpole_spawn_egg": { - "runtime_id": 667, + "runtime_id": 666, "component_based": false }, "minecraft:tall_grass": { @@ -6376,7 +6216,7 @@ "component_based": false }, "minecraft:tallgrass": { - "runtime_id": 774, + "runtime_id": 768, "component_based": false }, "minecraft:target": { @@ -6384,7 +6224,7 @@ "component_based": false }, "minecraft:tide_armor_trim_smithing_template": { - "runtime_id": 726, + "runtime_id": 725, "component_based": false }, "minecraft:tinted_glass": { @@ -6420,7 +6260,7 @@ "component_based": false }, "minecraft:trader_llama_spawn_egg": { - "runtime_id": 686, + "runtime_id": 685, "component_based": false }, "minecraft:trapdoor": { @@ -6432,7 +6272,7 @@ "component_based": false }, "minecraft:trial_key": { - "runtime_id": 276, + "runtime_id": 275, "component_based": true }, "minecraft:trial_spawner": { @@ -6576,7 +6416,7 @@ "component_based": false }, "minecraft:vex_armor_trim_smithing_template": { - "runtime_id": 725, + "runtime_id": 724, "component_based": false }, "minecraft:vex_spawn_egg": { @@ -6608,11 +6448,11 @@ "component_based": false }, "minecraft:ward_armor_trim_smithing_template": { - "runtime_id": 723, + "runtime_id": 722, "component_based": false }, "minecraft:warden_spawn_egg": { - "runtime_id": 670, + "runtime_id": 669, "component_based": false }, "minecraft:warped_button": { @@ -6620,7 +6460,7 @@ "component_based": false }, "minecraft:warped_door": { - "runtime_id": 655, + "runtime_id": 654, "component_based": false }, "minecraft:warped_double_slab": { @@ -6640,7 +6480,7 @@ "component_based": false }, "minecraft:warped_fungus_on_a_stick": { - "runtime_id": 656, + "runtime_id": 655, "component_based": true }, "minecraft:warped_hanging_sign": { @@ -6668,7 +6508,7 @@ "component_based": false }, "minecraft:warped_sign": { - "runtime_id": 653, + "runtime_id": 652, "component_based": false }, "minecraft:warped_slab": { @@ -6872,7 +6712,7 @@ "component_based": false }, "minecraft:wayfinder_armor_trim_smithing_template": { - "runtime_id": 731, + "runtime_id": 730, "component_based": false }, "minecraft:weathered_chiseled_copper": { @@ -6936,7 +6776,7 @@ "component_based": false }, "minecraft:white_bundle": { - "runtime_id": 261, + "runtime_id": 268, "component_based": true }, "minecraft:white_candle": { @@ -6992,7 +6832,7 @@ "component_based": false }, "minecraft:wild_armor_trim_smithing_template": { - "runtime_id": 722, + "runtime_id": 721, "component_based": false }, "minecraft:wind_charge": { @@ -7020,7 +6860,7 @@ "component_based": false }, "minecraft:wolf_armor": { - "runtime_id": 742, + "runtime_id": 741, "component_based": true }, "minecraft:wolf_spawn_egg": { @@ -7028,7 +6868,7 @@ "component_based": false }, "minecraft:wood": { - "runtime_id": 782, + "runtime_id": 776, "component_based": false }, "minecraft:wooden_axe": { @@ -7060,7 +6900,7 @@ "component_based": false }, "minecraft:wooden_slab": { - "runtime_id": 769, + "runtime_id": 763, "component_based": false }, "minecraft:wooden_sword": { @@ -7068,7 +6908,7 @@ "component_based": false }, "minecraft:wool": { - "runtime_id": 750, + "runtime_id": 744, "component_based": false }, "minecraft:writable_book": { @@ -7080,7 +6920,7 @@ "component_based": false }, "minecraft:yellow_bundle": { - "runtime_id": 267, + "runtime_id": 260, "component_based": true }, "minecraft:yellow_candle": { diff --git a/src/Supero/NightfallProtocol/network/handlers/static/InGamePacketHandler.php b/src/Supero/NightfallProtocol/network/handlers/static/InGamePacketHandler.php index d25acd7..479787a 100644 --- a/src/Supero/NightfallProtocol/network/handlers/static/InGamePacketHandler.php +++ b/src/Supero/NightfallProtocol/network/handlers/static/InGamePacketHandler.php @@ -91,7 +91,6 @@ use Supero\NightfallProtocol\network\packets\ItemStackRequestPacket as CustomItemStackRequestPacket; use Supero\NightfallProtocol\network\packets\ItemStackResponsePacket; use Supero\NightfallProtocol\network\packets\PlayerAuthInputPacket as CustomPlayerAuthInputPacket; -use Supero\NightfallProtocol\network\packets\serializer\CustomBitSet; use Supero\NightfallProtocol\network\packets\types\inventory\CustomItemStackRequest; use Supero\NightfallProtocol\network\packets\types\inventory\stackresponse\ItemStackResponse; use function array_push; diff --git a/src/Supero/NightfallProtocol/network/packets/serializer/CustomBitSet.php b/src/Supero/NightfallProtocol/network/packets/serializer/CustomBitSet.php index 59f3196..0e9f36f 100644 --- a/src/Supero/NightfallProtocol/network/packets/serializer/CustomBitSet.php +++ b/src/Supero/NightfallProtocol/network/packets/serializer/CustomBitSet.php @@ -119,7 +119,7 @@ public function write(PacketSerializer $out, int $length = null) : void{ $length ??= $this->length; if($length > $this->length){ - throw new \InvalidArgumentException("Cannot write more bits than the CustomBitSet contains"); + throw new \InvalidArgumentException("Cannot write more bits than the BitSet contains"); } $currentIndex = 0; @@ -130,7 +130,7 @@ public function write(PacketSerializer $out, int $length = null) : void{ $nextShift = $currentShift + self::SHIFT; if($nextShift >= self::INT_BITS){ $nextShift -= self::INT_BITS; - $bits |= $parts[++$currentIndex] << (self::SHIFT - $nextShift); + $bits |= ($parts[++$currentIndex] ?? 0) << (self::SHIFT - $nextShift); } $currentShift = $nextShift;