Add pc 1.21.1 data (#925)

* Add pc 1.21 protocol data * fix * Update dataPaths.json * to 1.21.1 * Fix packet_explosion * Fix ChatTypes * Fix SlotComponentType missing repair_cost * 1.21: Add some data (#927) * 1.21: add blocks enchantments foods language materials & tints * Fix enchantment category * 1.20.5: fix enchantCategories * 1.21: Add items.json * Add update informations for foods.json * 1.21: Add recipes.json * 1.21: protocol.json fix vibration particle * 1.21.1: Add sounds.json * add default in packet explosion switch for sound id * use empty container instead of void in packet explosion so it works well with anon top level * also on 1.20.5 * recipes should have null not -1 --------- Co-authored-by: Romain Beaumont <[email protected]> Co-authored-by: Grooble <[email protected]>
PrismarineJS · Oct 26, 2024 · d56346a · d56346a
1 parent 8ef58b1
commit d56346a
Show file tree

Hide file tree

Showing 21 changed files with 105,009 additions and 182 deletions.
diff --git a/data/dataPaths.json b/data/dataPaths.json
@@ -1421,7 +1421,7 @@
       "mapIcons": "pc/1.20.2",
       "commands": "pc/1.20.3",
       "sounds": "pc/1.20.4",
-      "proto": "pc/latest"
+      "proto": "pc/1.20.5"
     },
     "1.20.6": {
       "attributes": "pc/1.17",
@@ -1448,6 +1448,33 @@
       "mapIcons": "pc/1.20.2",
       "commands": "pc/1.20.3",
       "sounds": "pc/1.20.4",
+      "proto": "pc/1.20.5"
+    },
+    "1.21.1": {
+      "attributes": "pc/1.17",
+      "blocks": "pc/1.21.1",
+      "blockCollisionShapes": "pc/1.20.5",
+      "biomes": "pc/1.20.5",
+      "effects": "pc/1.20.5",
+      "items": "pc/1.21.1",
+      "enchantments": "pc/1.21.1",
+      "recipes": "pc/1.21.1",
+      "instruments": "pc/1.20.5",
+      "materials": "pc/1.21.1",
+      "language": "pc/1.21.1",
+      "entities": "pc/1.20.5",
+      "protocol": "pc/1.21.1",
+      "windows": "pc/1.16.1",
+      "version": "pc/1.21.1",
+      "foods": "pc/1.21.1",
+      "particles": "pc/1.20.5",
+      "blockLoot": "pc/1.20",
+      "entityLoot": "pc/1.20",
+      "loginPacket": "pc/1.20.5",
+      "tints": "pc/1.21.1",
+      "mapIcons": "pc/1.20.2",
+      "commands": "pc/1.20.3",
+      "sounds": "pc/1.21.1",
       "proto": "pc/latest"
     }
   },

diff --git a/data/pc/1.20.3/proto.yml b/data/pc/1.20.3/proto.yml
@@ -1104,8 +1104,13 @@
       block_interaction_type: varint
       small_explosion_particle: particle
       large_explosion_particle: particle
-      explosion_sound_name: string
-      sound_range?: f32
+      soundId: varint
+      _: soundId ?
+         if 0:
+            soundName: string
+            range?: f32
+         default:
+
    # MC: ClientboundForgetLevelChunkPacket
    packet_unload_chunk:
       chunkZ: i32

diff --git a/data/pc/1.20.3/protocol.json b/data/pc/1.20.3/protocol.json
@@ -2942,14 +2942,38 @@
               "type": "particle"
             },
             {
-              "name": "explosion_sound_name",
-              "type": "string"
+              "name": "soundId",
+              "type": "varint"
             },
             {
-              "name": "sound_range",
+              "anon": true,
               "type": [
-                "option",
-                "f32"
+                "switch",
+                {
+                  "compareTo": "soundId",
+                  "fields": {
+                    "0": [
+                      "container",
+                      [
+                        {
+                          "name": "soundName",
+                          "type": "string"
+                        },
+                        {
+                          "name": "range",
+                          "type": [
+                            "option",
+                            "f32"
+                          ]
+                        }
+                      ]
+                    ]
+                  },
+                  "default": [
+                    "container",
+                    []
+                  ]
+                }
               ]
             }
           ]

diff --git a/data/pc/1.20.5/enchantments.json b/data/pc/1.20.5/enchantments.json
@@ -65,7 +65,7 @@
     "treasureOnly": false,
     "curse": false,
     "exclude": [],
-    "category": "tagkey[minecraft:item / minecraft:enchantable/foot_armor]",
+    "category": "foot_armor",
     "weight": 5,
     "tradeable": true,
     "discoverable": true
@@ -136,7 +136,7 @@
     "treasureOnly": false,
     "curse": false,
     "exclude": [],
-    "category": "tagkey[minecraft:item / minecraft:enchantable/head_armor]",
+    "category": "head_armor",
     "weight": 2,
     "tradeable": true,
     "discoverable": true
@@ -157,7 +157,7 @@
     "treasureOnly": false,
     "curse": false,
     "exclude": [],
-    "category": "tagkey[minecraft:item / minecraft:enchantable/head_armor]",
+    "category": "head_armor",
     "weight": 2,
     "tradeable": true,
     "discoverable": true
@@ -201,7 +201,7 @@
     "exclude": [
       "frost_walker"
     ],
-    "category": "tagkey[minecraft:item / minecraft:enchantable/foot_armor]",
+    "category": "foot_armor",
     "weight": 2,
     "tradeable": true,
     "discoverable": true
@@ -224,7 +224,7 @@
     "exclude": [
       "depth_strider"
     ],
-    "category": "tagkey[minecraft:item / minecraft:enchantable/foot_armor]",
+    "category": "foot_armor",
     "weight": 2,
     "tradeable": true,
     "discoverable": true
@@ -245,7 +245,7 @@
     "treasureOnly": true,
     "curse": true,
     "exclude": [],
-    "category": "wearable",
+    "category": "equippable",
     "weight": 1,
     "tradeable": true,
     "discoverable": true
@@ -266,7 +266,7 @@
     "treasureOnly": true,
     "curse": false,
     "exclude": [],
-    "category": "tagkey[minecraft:item / minecraft:enchantable/foot_armor]",
+    "category": "foot_armor",
     "weight": 1,
     "tradeable": false,
     "discoverable": false
@@ -287,7 +287,7 @@
     "treasureOnly": true,
     "curse": false,
     "exclude": [],
-    "category": "tagkey[minecraft:item / minecraft:enchantable/leg_armor]",
+    "category": "leg_armor",
     "weight": 1,
     "tradeable": false,
     "discoverable": false
@@ -312,7 +312,7 @@
       "bane_of_arthropods",
       "impaling"
     ],
-    "category": "tagkey[minecraft:item / minecraft:enchantable/sharp_weapon]",
+    "category": "sharp_weapon",
     "weight": 10,
     "tradeable": true,
     "discoverable": true
@@ -383,7 +383,7 @@
     "treasureOnly": false,
     "curse": false,
     "exclude": [],
-    "category": "tagkey[minecraft:item / minecraft:enchantable/sword]",
+    "category": "sword",
     "weight": 5,
     "tradeable": true,
     "discoverable": true
@@ -404,7 +404,7 @@
     "treasureOnly": false,
     "curse": false,
     "exclude": [],
-    "category": "tagkey[minecraft:item / minecraft:enchantable/fire_aspect]",
+    "category": "fire_aspect",
     "weight": 2,
     "tradeable": true,
     "discoverable": true
@@ -427,7 +427,7 @@
     "exclude": [
       "silk_touch"
     ],
-    "category": "tagkey[minecraft:item / minecraft:enchantable/sword]",
+    "category": "sword",
     "weight": 2,
     "tradeable": true,
     "discoverable": true
@@ -448,8 +448,8 @@
     "treasureOnly": false,
     "curse": false,
     "exclude": [],
-    "category": "tagkey[minecraft:item / minecraft:enchantable/sword]",
-    "weight": 3,
+    "category": "sword",
+    "weight": 2,
     "tradeable": true,
     "discoverable": true
   },
@@ -469,7 +469,7 @@
     "treasureOnly": false,
     "curse": false,
     "exclude": [],
-    "category": "digger",
+    "category": "mining",
     "weight": 10,
     "tradeable": true,
     "discoverable": true
@@ -494,7 +494,7 @@
       "fortune",
       "luck_of_the_sea"
     ],
-    "category": "tagkey[minecraft:item / minecraft:enchantable/mining_loot]",
+    "category": "mining_loot",
     "weight": 1,
     "tradeable": true,
     "discoverable": true
@@ -515,7 +515,7 @@
     "treasureOnly": false,
     "curse": false,
     "exclude": [],
-    "category": "breakable",
+    "category": "durability",
     "weight": 5,
     "tradeable": true,
     "discoverable": true
@@ -538,7 +538,7 @@
     "exclude": [
       "silk_touch"
     ],
-    "category": "tagkey[minecraft:item / minecraft:enchantable/mining_loot]",
+    "category": "mining_loot",
     "weight": 2,
     "tradeable": true,
     "discoverable": true
@@ -647,7 +647,7 @@
     "exclude": [
       "silk_touch"
     ],
-    "category": "fishing_rod",
+    "category": "fishing",
     "weight": 2,
     "tradeable": true,
     "discoverable": true
@@ -668,7 +668,7 @@
     "treasureOnly": false,
     "curse": false,
     "exclude": [],
-    "category": "fishing_rod",
+    "category": "fishing",
     "weight": 2,
     "tradeable": true,
     "discoverable": true
@@ -851,8 +851,8 @@
     "treasureOnly": false,
     "curse": false,
     "exclude": [],
-    "category": "tagkey[minecraft:item / minecraft:enchantable/mace]",
-    "weight": 5,
+    "category": "mace",
+    "weight": 10,
     "tradeable": true,
     "discoverable": true
   },
@@ -872,8 +872,8 @@
     "treasureOnly": false,
     "curse": false,
     "exclude": [],
-    "category": "tagkey[minecraft:item / minecraft:enchantable/mace]",
-    "weight": 4,
+    "category": "mace",
+    "weight": 2,
     "tradeable": true,
     "discoverable": true
   },
@@ -893,8 +893,8 @@
     "treasureOnly": false,
     "curse": false,
     "exclude": [],
-    "category": "tagkey[minecraft:item / minecraft:enchantable/mace]",
-    "weight": 3,
+    "category": "mace",
+    "weight": 2,
     "tradeable": false,
     "discoverable": false
   },
@@ -916,7 +916,7 @@
     "exclude": [
       "infinity"
     ],
-    "category": "breakable",
+    "category": "durability",
     "weight": 2,
     "tradeable": true,
     "discoverable": true
@@ -937,7 +937,7 @@
     "treasureOnly": true,
     "curse": true,
     "exclude": [],
-    "category": "vanishable",
+    "category": "vanishing",
     "weight": 1,
     "tradeable": true,
     "discoverable": true