minecraft: update to 1.21.70 - 2

Author: leaftail1880

.yarnrc.yml

@@ -1,4 +1,4 @@
-afterInstall: node tools/patches.js
+afterInstall: node -no-warnings --experimental-strip-types tools/patches.ts
 
 nodeLinker: node-modules
 

package.json

@@ -8,7 +8,7 @@
     "test": "./node_modules/vitest/vitest.mjs",
     "coverage": "./node_modules/vitest/vitest.mjs --coverage",
     "cov": "./node_modules/vitest/vitest.mjs --coverage --ui",
-    "patches": "node tools/patches.js",
+    "patches": "node --no-warnings --experimental-strip-types tools/patches.ts",
     "prepare": "git config core.ignorecase false"
   },
   "dependencies": {

src/lib/assets/chest-ui-type-ids.ts

@@ -1,4 +1,11 @@
 export const typeIdToID = new Map([
+  ['minecraft:cactus_flower', -1030],
+  ['minecraft:tall_dry_grass', -1029],
+  ['minecraft:short_dry_grass', -1028],
+  ['minecraft:leaf_litter', -1026],
+  ['minecraft:firefly_bush', -1025],
+  ['minecraft:wildflowers', -1024],
+  ['minecraft:bush', -1023],
   ['minecraft:resin_clump', -1022],
   ['minecraft:resin_block', -1021],
   ['minecraft:chiseled_resin_bricks', -1020],
@@ -1518,6 +1525,7 @@ export const typeIdToID = new Map([
   ['minecraft:experience_bottle', 542],
   ['minecraft:fire_charge', 543],
   ['minecraft:writable_book', 544],
+  ['minecraft:written_book', 545],
   ['minecraft:emerald', 546],
   ['minecraft:frame', 547],
   ['minecraft:flower_pot', 548],
@@ -1719,53 +1727,55 @@ export const typeIdToID = new Map([
   ['minecraft:creaking_spawn_egg', 747],
   ['minecraft:resin_brick', 748],
   ['minecraft:wool', 749],
-  ['minecraft:carpet', 750],
-  ['minecraft:log', 751],
-  ['minecraft:fence', 752],
-  ['minecraft:stonebrick', 753],
-  ['minecraft:coral_block', 754],
-  ['minecraft:stone_block_slab', 755],
-  ['minecraft:stone_block_slab2', 756],
-  ['minecraft:stone_block_slab3', 757],
-  ['minecraft:stone_block_slab4', 758],
-  ['minecraft:double_stone_block_slab', 759],
-  ['minecraft:double_stone_block_slab2', 760],
-  ['minecraft:double_stone_block_slab3', 761],
-  ['minecraft:double_stone_block_slab4', 762],
-  ['minecraft:coral_fan', 763],
-  ['minecraft:coral_fan_dead', 764],
-  ['minecraft:sapling', 765],
-  ['minecraft:leaves', 766],
-  ['minecraft:leaves2', 767],
-  ['minecraft:wooden_slab', 768],
-  ['minecraft:red_flower', 769],
-  ['minecraft:double_plant', 770],
-  ['minecraft:double_wooden_slab', 771],
-  ['minecraft:coral', 772],
-  ['minecraft:tallgrass', 773],
-  ['minecraft:log2', 774],
-  ['minecraft:monster_egg', 775],
-  ['minecraft:concrete', 776],
-  ['minecraft:concrete_powder', 777],
-  ['minecraft:stained_glass', 778],
-  ['minecraft:stained_glass_pane', 779],
-  ['minecraft:shulker_box', 780],
-  ['minecraft:wood', 781],
-  ['minecraft:music_disc_creator', 782],
-  ['minecraft:music_disc_creator_music_box', 783],
-  ['minecraft:music_disc_precipice', 784],
-  ['minecraft:chemistry_table', 785],
-  ['minecraft:hard_stained_glass', 786],
-  ['minecraft:hard_stained_glass_pane', 787],
-  ['minecraft:colored_torch_rg', 788],
-  ['minecraft:colored_torch_bp', 789],
-  ['minecraft:light_block', 790],
-  ['minecraft:boat', 791],
-  ['minecraft:dye', 792],
-  ['minecraft:banner_pattern', 793],
-  ['minecraft:spawn_egg', 794],
-  ['minecraft:end_crystal', 795],
-  ['minecraft:glow_berries', 796],
+  ['minecraft:blue_egg', 750],
+  ['minecraft:brown_egg', 751],
+  ['minecraft:carpet', 752],
+  ['minecraft:log', 753],
+  ['minecraft:fence', 754],
+  ['minecraft:stonebrick', 755],
+  ['minecraft:coral_block', 756],
+  ['minecraft:stone_block_slab', 757],
+  ['minecraft:stone_block_slab2', 758],
+  ['minecraft:stone_block_slab3', 759],
+  ['minecraft:stone_block_slab4', 760],
+  ['minecraft:double_stone_block_slab', 761],
+  ['minecraft:double_stone_block_slab2', 762],
+  ['minecraft:double_stone_block_slab3', 763],
+  ['minecraft:double_stone_block_slab4', 764],
+  ['minecraft:coral_fan', 765],
+  ['minecraft:coral_fan_dead', 766],
+  ['minecraft:sapling', 767],
+  ['minecraft:leaves', 768],
+  ['minecraft:leaves2', 769],
+  ['minecraft:wooden_slab', 770],
+  ['minecraft:red_flower', 771],
+  ['minecraft:double_plant', 772],
+  ['minecraft:double_wooden_slab', 773],
+  ['minecraft:coral', 774],
+  ['minecraft:tallgrass', 775],
+  ['minecraft:log2', 776],
+  ['minecraft:monster_egg', 777],
+  ['minecraft:concrete', 778],
+  ['minecraft:concrete_powder', 779],
+  ['minecraft:stained_glass', 780],
+  ['minecraft:stained_glass_pane', 781],
+  ['minecraft:shulker_box', 782],
+  ['minecraft:wood', 783],
+  ['minecraft:music_disc_creator', 784],
+  ['minecraft:music_disc_creator_music_box', 785],
+  ['minecraft:music_disc_precipice', 786],
+  ['minecraft:chemistry_table', 787],
+  ['minecraft:hard_stained_glass', 788],
+  ['minecraft:hard_stained_glass_pane', 789],
+  ['minecraft:colored_torch_rg', 790],
+  ['minecraft:colored_torch_bp', 791],
+  ['minecraft:light_block', 792],
+  ['minecraft:boat', 793],
+  ['minecraft:dye', 794],
+  ['minecraft:banner_pattern', 795],
+  ['minecraft:spawn_egg', 796],
+  ['minecraft:end_crystal', 797],
+  ['minecraft:glow_berries', 798],
 ])
 export const typeIdToDataId = new Map([
   ['minecraft:respawn_anchor_charge_0', -272],
@@ -2068,94 +2078,94 @@ export const typeIdToDataId = new Map([
   ['minecraft:orange_banner', 600 + 14 / 65536],
   ['minecraft:white_banner', 600 + 15 / 65536],
 
-  ['minecraft:compound_salt', 631],
-  ['minecraft:compound_sodium_oxide', 631 + 1 / 65536],
-  ['minecraft:compound_sodium_hydroxide', 631 + 2 / 65536],
-  ['minecraft:compound_magnesium_nitrate', 631 + 3 / 65536],
-  ['minecraft:compound_iron_sulfide', 631 + 4 / 65536],
-  ['minecraft:compound_lithium_hydride', 631 + 5 / 65536],
-  ['minecraft:compound_sodium_hydride', 631 + 6 / 65536],
-  ['minecraft:compound_calcium_bromide', 631 + 7 / 65536],
-  ['minecraft:compound_magnesium_oxide', 631 + 8 / 65536],
-  ['minecraft:compound_sodium_acetate', 631 + 9 / 65536],
-  ['minecraft:compound_luminol', 631 + 10 / 65536],
-  ['minecraft:compound_charcoal', 631 + 11 / 65536],
-  ['minecraft:compound_sugar', 631 + 12 / 65536],
-  ['minecraft:compound_aluminum_oxide', 631 + 13 / 65536],
-  ['minecraft:compound_boron_trioxide', 631 + 14 / 65536],
-  ['minecraft:compound_soap', 631 + 15 / 65536],
-  ['minecraft:compound_polyethylene', 631 + 16 / 65536],
-  ['minecraft:compound_garbage', 631 + 17 / 65536],
-  ['minecraft:compound_blue_jar', 631 + 24 / 65536],
-  ['minecraft:compound_blue_beaker', 631 + 26 / 65536],
-  ['minecraft:compound_glue', 631 + 27 / 65536],
-  ['minecraft:compound_white_beaker', 631 + 28 / 65536],
-  ['minecraft:compound_black_beaker', 631 + 29 / 65536],
-  ['minecraft:compound_yellow_beaker', 631 + 31 / 65536],
-  ['minecraft:compound_clear_beaker', 631 + 35 / 65536],
-  ['minecraft:compound_blue_bottle', 631 + 38 / 65536],
+  ['minecraft:compound_salt', 630],
+  ['minecraft:compound_sodium_oxide', 630 + 1 / 65536],
+  ['minecraft:compound_sodium_hydroxide', 630 + 2 / 65536],
+  ['minecraft:compound_magnesium_nitrate', 630 + 3 / 65536],
+  ['minecraft:compound_iron_sulfide', 630 + 4 / 65536],
+  ['minecraft:compound_lithium_hydride', 630 + 5 / 65536],
+  ['minecraft:compound_sodium_hydride', 630 + 6 / 65536],
+  ['minecraft:compound_calcium_bromide', 630 + 7 / 65536],
+  ['minecraft:compound_magnesium_oxide', 630 + 8 / 65536],
+  ['minecraft:compound_sodium_acetate', 630 + 9 / 65536],
+  ['minecraft:compound_luminol', 630 + 10 / 65536],
+  ['minecraft:compound_charcoal', 630 + 11 / 65536],
+  ['minecraft:compound_sugar', 630 + 12 / 65536],
+  ['minecraft:compound_aluminum_oxide', 630 + 13 / 65536],
+  ['minecraft:compound_boron_trioxide', 630 + 14 / 65536],
+  ['minecraft:compound_soap', 630 + 15 / 65536],
+  ['minecraft:compound_polyethylene', 630 + 16 / 65536],
+  ['minecraft:compound_garbage', 630 + 17 / 65536],
+  ['minecraft:compound_blue_jar', 630 + 24 / 65536],
+  ['minecraft:compound_blue_beaker', 630 + 26 / 65536],
+  ['minecraft:compound_glue', 630 + 27 / 65536],
+  ['minecraft:compound_white_beaker', 630 + 28 / 65536],
+  ['minecraft:compound_black_beaker', 630 + 29 / 65536],
+  ['minecraft:compound_yellow_beaker', 630 + 31 / 65536],
+  ['minecraft:compound_clear_beaker', 630 + 35 / 65536],
+  ['minecraft:compound_blue_bottle', 630 + 38 / 65536],
 
-  ['minecraft:white_balloon', 635],
-  ['minecraft:red_balloon', 635 + 1 / 65536],
-  ['minecraft:green_balloon', 635 + 2 / 65536],
-  ['minecraft:brown_balloon', 635 + 3 / 65536],
-  ['minecraft:blue_balloon', 635 + 4 / 65536],
-  ['minecraft:purple_balloon', 635 + 5 / 65536],
-  ['minecraft:cyan_balloon', 635 + 6 / 65536],
-  ['minecraft:light_gray_balloon', 635 + 7 / 65536],
-  ['minecraft:gray_balloon', 635 + 8 / 65536],
-  ['minecraft:pink_balloon', 635 + 9 / 65536],
-  ['minecraft:lime_balloon', 635 + 10 / 65536],
-  ['minecraft:yellow_balloon', 635 + 11 / 65536],
-  ['minecraft:light_blue_balloon', 635 + 12 / 65536],
-  ['minecraft:magenta_balloon', 635 + 13 / 65536],
-  ['minecraft:orange_balloon', 635 + 14 / 65536],
-  ['minecraft:black_balloon', 635 + 15 / 65536],
+  ['minecraft:white_balloon', 634],
+  ['minecraft:red_balloon', 634 + 1 / 65536],
+  ['minecraft:green_balloon', 634 + 2 / 65536],
+  ['minecraft:brown_balloon', 634 + 3 / 65536],
+  ['minecraft:blue_balloon', 634 + 4 / 65536],
+  ['minecraft:purple_balloon', 634 + 5 / 65536],
+  ['minecraft:cyan_balloon', 634 + 6 / 65536],
+  ['minecraft:light_gray_balloon', 634 + 7 / 65536],
+  ['minecraft:gray_balloon', 634 + 8 / 65536],
+  ['minecraft:pink_balloon', 634 + 9 / 65536],
+  ['minecraft:lime_balloon', 634 + 10 / 65536],
+  ['minecraft:yellow_balloon', 634 + 11 / 65536],
+  ['minecraft:light_blue_balloon', 634 + 12 / 65536],
+  ['minecraft:magenta_balloon', 634 + 13 / 65536],
+  ['minecraft:orange_balloon', 634 + 14 / 65536],
+  ['minecraft:black_balloon', 634 + 15 / 65536],
 
-  ['minecraft:eye_drops', 636],
-  ['minecraft:tonic', 636 + 1 / 65536],
-  ['minecraft:antidote', 636 + 2 / 65536],
-  ['minecraft:elixir', 636 + 3 / 65536],
+  ['minecraft:eye_drops', 635],
+  ['minecraft:tonic', 635 + 1 / 65536],
+  ['minecraft:antidote', 635 + 2 / 65536],
+  ['minecraft:elixir', 635 + 3 / 65536],
 
-  ['minecraft:blue_sparkler', 637],
-  ['minecraft:red_sparkler', 637 + 1 / 65536],
-  ['minecraft:green_sparkler', 637 + 2 / 65536],
-  ['minecraft:pink_sparker', 637 + 5 / 65536],
-  ['minecraft:orange_sparkler', 637 + 14 / 65536],
-  ['minecraft:lit_blue_sparkler', 637 + 32 / 65536],
-  ['minecraft:lit_red_sparkler', 637 + 33 / 65536],
-  ['minecraft:lit_green_sparkler', 637 + 34 / 65536],
-  ['minecraft:lit_pink_sparker', 637 + 37 / 65536],
-  ['minecraft:lit_orange_sparkler', 637 + 46 / 65536],
+  ['minecraft:blue_sparkler', 636],
+  ['minecraft:red_sparkler', 636 + 1 / 65536],
+  ['minecraft:green_sparkler', 636 + 2 / 65536],
+  ['minecraft:pink_sparker', 636 + 5 / 65536],
+  ['minecraft:orange_sparkler', 636 + 14 / 65536],
+  ['minecraft:lit_blue_sparkler', 636 + 32 / 65536],
+  ['minecraft:lit_red_sparkler', 636 + 33 / 65536],
+  ['minecraft:lit_green_sparkler', 636 + 34 / 65536],
+  ['minecraft:lit_pink_sparker', 636 + 37 / 65536],
+  ['minecraft:lit_orange_sparkler', 636 + 46 / 65536],
 
-  ['minecraft:red_glowstick', 638 + 1 / 65536],
-  ['minecraft:green_glowstick', 638 + 2 / 65536],
-  ['minecraft:brown_glowstick', 638 + 3 / 65536],
-  ['minecraft:blue_glowstick', 638 + 4 / 65536],
-  ['minecraft:purple_glowstick', 638 + 5 / 65536],
-  ['minecraft:cyan_glowstick', 638 + 6 / 65536],
-  ['minecraft:red_glowstick', 638 + 7 / 65536],
-  ['minecraft:gray_glowstick', 638 + 8 / 65536],
-  ['minecraft:pink_glowstick', 638 + 9 / 65536],
-  ['minecraft:lime_glowstick', 638 + 10 / 65536],
-  ['minecraft:yellow_glowstick', 638 + 11 / 65536],
-  ['minecraft:light_blue_glowstick', 638 + 12 / 65536],
-  ['minecraft:magenta_glowstick', 638 + 13 / 65536],
-  ['minecraft:orange_glowstick', 638 + 14 / 65536],
-  ['minecraft:white_glowstick', 638 + 15 / 65536],
-  ['minecraft:lit_red_glowstick', 638 + 33 / 65536],
-  ['minecraft:lit_green_glowstick', 638 + 34 / 65536],
-  ['minecraft:lit_brown_glowstick', 638 + 35 / 65536],
-  ['minecraft:lit_blue_glowstick', 638 + 36 / 65536],
-  ['minecraft:lit_purple_glowstick', 638 + 37 / 65536],
-  ['minecraft:lit_cyan_glowstick', 638 + 38 / 65536],
-  ['minecraft:lit_red_glowstick', 638 + 39 / 65536],
-  ['minecraft:lit_gray_glowstick', 638 + 40 / 65536],
-  ['minecraft:lit_pink_glowstick', 638 + 41 / 65536],
-  ['minecraft:lit_lime_glowstick', 638 + 42 / 65536],
-  ['minecraft:lit_yellow_glowstick', 638 + 43 / 65536],
-  ['minecraft:lit_light_blue_glowstick', 638 + 44 / 65536],
-  ['minecraft:lit_magenta_glowstick', 638 + 45 / 65536],
-  ['minecraft:lit_orange_glowstick', 638 + 46 / 65536],
-  ['minecraft:lit_white_glowstick', 638 + 47 / 65536],
+  ['minecraft:red_glowstick', 637 + 1 / 65536],
+  ['minecraft:green_glowstick', 637 + 2 / 65536],
+  ['minecraft:brown_glowstick', 637 + 3 / 65536],
+  ['minecraft:blue_glowstick', 637 + 4 / 65536],
+  ['minecraft:purple_glowstick', 637 + 5 / 65536],
+  ['minecraft:cyan_glowstick', 637 + 6 / 65536],
+  ['minecraft:red_glowstick', 637 + 7 / 65536],
+  ['minecraft:gray_glowstick', 637 + 8 / 65536],
+  ['minecraft:pink_glowstick', 637 + 9 / 65536],
+  ['minecraft:lime_glowstick', 637 + 10 / 65536],
+  ['minecraft:yellow_glowstick', 637 + 11 / 65536],
+  ['minecraft:light_blue_glowstick', 637 + 12 / 65536],
+  ['minecraft:magenta_glowstick', 637 + 13 / 65536],
+  ['minecraft:orange_glowstick', 637 + 14 / 65536],
+  ['minecraft:white_glowstick', 637 + 15 / 65536],
+  ['minecraft:lit_red_glowstick', 637 + 33 / 65536],
+  ['minecraft:lit_green_glowstick', 637 + 34 / 65536],
+  ['minecraft:lit_brown_glowstick', 637 + 35 / 65536],
+  ['minecraft:lit_blue_glowstick', 637 + 36 / 65536],
+  ['minecraft:lit_purple_glowstick', 637 + 37 / 65536],
+  ['minecraft:lit_cyan_glowstick', 637 + 38 / 65536],
+  ['minecraft:lit_red_glowstick', 637 + 39 / 65536],
+  ['minecraft:lit_gray_glowstick', 637 + 40 / 65536],
+  ['minecraft:lit_pink_glowstick', 637 + 41 / 65536],
+  ['minecraft:lit_lime_glowstick', 637 + 42 / 65536],
+  ['minecraft:lit_yellow_glowstick', 637 + 43 / 65536],
+  ['minecraft:lit_light_blue_glowstick', 637 + 44 / 65536],
+  ['minecraft:lit_magenta_glowstick', 637 + 45 / 65536],
+  ['minecraft:lit_orange_glowstick', 637 + 46 / 65536],
+  ['minecraft:lit_white_glowstick', 637 + 47 / 65536],
 ])

src/lib/assets/custom-entity-types.ts

@@ -1,6 +1,6 @@
 // prettier-ignore
 /* eslint-disable */
-// This file is autogenerated by tools/build.js.
+// This file is autogenerated by tools/build.ts.
 // Do not modify manually.
 
 export enum CustomEntityTypes {