Fix bedrock recipe text encoding issue (#808)

* bedrock: add latin1 string type and use for recipes * temp fix for outdated protodef-validate
PrismarineJS · Dec 25, 2023 · 900ebf2 · 900ebf2
1 parent 37e2880
commit 900ebf2
Show file tree

Hide file tree

Showing 79 changed files with 421 additions and 212 deletions.
diff --git a/data/bedrock/1.16.201/proto.yml b/data/bedrock/1.16.201/proto.yml
@@ -8,6 +8,7 @@ string: ["pstring",{"countType":"varint"}]
 ByteArray: ["buffer",{"countType":"varint"}]
 SignedByteArray: ["buffer",{"countType":"zigzag32"}]
 LittleString: ["pstring",{"countType":"li32"}]
+LatinString: ["pstring",{"countType":"varint", "encoding": "latin1"}]
 varint64: native                                      # Some primitives
 zigzag32: native
 zigzag64: native

diff --git a/data/bedrock/1.16.201/protocol.json b/data/bedrock/1.16.201/protocol.json
@@ -1203,7 +1203,7 @@
                       [
                         {
                           "name": "recipe_id",
-                          "type": "string"
+                          "type": "LatinString"
                         },
                         {
                           "name": "input",
@@ -1248,7 +1248,7 @@
                       [
                         {
                           "name": "recipe_id",
-                          "type": "string"
+                          "type": "LatinString"
                         },
                         {
                           "name": "input",
@@ -1293,7 +1293,7 @@
                       [
                         {
                           "name": "recipe_id",
-                          "type": "string"
+                          "type": "LatinString"
                         },
                         {
                           "name": "input",
@@ -1338,7 +1338,7 @@
                       [
                         {
                           "name": "recipe_id",
-                          "type": "string"
+                          "type": "LatinString"
                         },
                         {
                           "name": "width",
@@ -1397,7 +1397,7 @@
                       [
                         {
                           "name": "recipe_id",
-                          "type": "string"
+                          "type": "LatinString"
                         },
                         {
                           "name": "width",
@@ -7341,6 +7341,13 @@
         "countType": "li32"
       }
     ],
+    "LatinString": [
+      "pstring",
+      {
+        "countType": "varint",
+        "encoding": "latin1"
+      }
+    ],
     "AdventureFlags": [
       "bitflags",
       {

diff --git a/data/bedrock/1.16.201/types.yml b/data/bedrock/1.16.201/types.yml
@@ -455,15 +455,15 @@ Recipes: []varint
       '7': 'shaped_chemistry' #'ENTRY_SHAPED_CHEMISTRY', //TODO
    recipe: type?
       if shapeless or shulker_box or shapeless_chemistry:
-         recipe_id: string
+         recipe_id: LatinString
          input: RecipeIngredient[]varint
          output: Item[]varint
          uuid: uuid
          block: string
          priority: zigzag32
          network_id: zigzag32
       if shaped or shaped_chemistry:
-         recipe_id: string
+         recipe_id: LatinString
          width: zigzag32
          height: zigzag32
          # todo: can this become

diff --git a/data/bedrock/1.16.210/proto.yml b/data/bedrock/1.16.210/proto.yml
@@ -8,6 +8,7 @@ string: ["pstring",{"countType":"varint"}]
 ByteArray: ["buffer",{"countType":"varint"}]
 SignedByteArray: ["buffer",{"countType":"zigzag32"}]
 LittleString: ["pstring",{"countType":"li32"}]
+LatinString: ["pstring",{"countType":"varint", "encoding": "latin1"}]
 varint64: native                                      # Some primitives
 zigzag32: native
 zigzag64: native

diff --git a/data/bedrock/1.16.210/protocol.json b/data/bedrock/1.16.210/protocol.json
@@ -1225,7 +1225,7 @@
                       [
                         {
                           "name": "recipe_id",
-                          "type": "string"
+                          "type": "LatinString"
                         },
                         {
                           "name": "input",
@@ -1270,7 +1270,7 @@
                       [
                         {
                           "name": "recipe_id",
-                          "type": "string"
+                          "type": "LatinString"
                         },
                         {
                           "name": "input",
@@ -1315,7 +1315,7 @@
                       [
                         {
                           "name": "recipe_id",
-                          "type": "string"
+                          "type": "LatinString"
                         },
                         {
                           "name": "input",
@@ -1360,7 +1360,7 @@
                       [
                         {
                           "name": "recipe_id",
-                          "type": "string"
+                          "type": "LatinString"
                         },
                         {
                           "name": "width",
@@ -1419,7 +1419,7 @@
                       [
                         {
                           "name": "recipe_id",
-                          "type": "string"
+                          "type": "LatinString"
                         },
                         {
                           "name": "width",
@@ -7792,6 +7792,13 @@
         "countType": "li32"
       }
     ],
+    "LatinString": [
+      "pstring",
+      {
+        "countType": "varint",
+        "encoding": "latin1"
+      }
+    ],
     "MetadataFlags1": [
       "bitflags",
       {

diff --git a/data/bedrock/1.16.210/types.yml b/data/bedrock/1.16.210/types.yml
@@ -589,15 +589,15 @@ Recipes: []varint
       7: shaped_chemistry #'ENTRY_SHAPED_CHEMISTRY', //TODO
    recipe: type?
       if shapeless or shulker_box or shapeless_chemistry:
-         recipe_id: string
+         recipe_id: LatinString
          input: RecipeIngredient[]varint
          output: Item[]varint
          uuid: uuid
          block: string
          priority: zigzag32
          network_id: varint
       if shaped or shaped_chemistry:
-         recipe_id: string
+         recipe_id: LatinString
          width: zigzag32
          height: zigzag32
          # todo: can this become

diff --git a/data/bedrock/1.16.220/proto.yml b/data/bedrock/1.16.220/proto.yml
@@ -8,6 +8,7 @@ string: ["pstring",{"countType":"varint"}]
 ByteArray: ["buffer",{"countType":"varint"}]
 SignedByteArray: ["buffer",{"countType":"zigzag32"}]
 LittleString: ["pstring",{"countType":"li32"}]
+LatinString: ["pstring",{"countType":"varint", "encoding": "latin1"}]
 ShortArray: ["buffer",{"countType":"li16"}]
 ShortString: ["pstring",{"countType":"li16"}]
 varint64: native                                      # Some primitives

diff --git a/data/bedrock/1.16.220/protocol.json b/data/bedrock/1.16.220/protocol.json
@@ -1355,7 +1355,7 @@
                       [
                         {
                           "name": "recipe_id",
-                          "type": "string"
+                          "type": "LatinString"
                         },
                         {
                           "name": "input",
@@ -1400,7 +1400,7 @@
                       [
                         {
                           "name": "recipe_id",
-                          "type": "string"
+                          "type": "LatinString"
                         },
                         {
                           "name": "input",
@@ -1445,7 +1445,7 @@
                       [
                         {
                           "name": "recipe_id",
-                          "type": "string"
+                          "type": "LatinString"
                         },
                         {
                           "name": "input",
@@ -1490,7 +1490,7 @@
                       [
                         {
                           "name": "recipe_id",
-                          "type": "string"
+                          "type": "LatinString"
                         },
                         {
                           "name": "width",
@@ -1549,7 +1549,7 @@
                       [
                         {
                           "name": "recipe_id",
-                          "type": "string"
+                          "type": "LatinString"
                         },
                         {
                           "name": "width",
@@ -8690,6 +8690,13 @@
         "countType": "li32"
       }
     ],
+    "LatinString": [
+      "pstring",
+      {
+        "countType": "varint",
+        "encoding": "latin1"
+      }
+    ],
     "ShortArray": [
       "buffer",
       {

diff --git a/data/bedrock/1.16.220/types.yml b/data/bedrock/1.16.220/types.yml
@@ -626,15 +626,15 @@ Recipes: []varint
       7: shaped_chemistry #'ENTRY_SHAPED_CHEMISTRY', //TODO
    recipe: type?
       if shapeless or shulker_box or shapeless_chemistry:
-         recipe_id: string
+         recipe_id: LatinString
          input: RecipeIngredient[]varint
          output: ItemLegacy[]varint
          uuid: uuid
          block: string
          priority: zigzag32
          network_id: varint
       if shaped or shaped_chemistry:
-         recipe_id: string
+         recipe_id: LatinString
          width: zigzag32
          height: zigzag32
          # 2D input array, size of width*height

diff --git a/data/bedrock/1.17.0/proto.yml b/data/bedrock/1.17.0/proto.yml
@@ -8,6 +8,7 @@ string: ["pstring",{"countType":"varint"}]            # String / array types
 ByteArray: ["buffer",{"countType":"varint"}]
 SignedByteArray: ["buffer",{"countType":"zigzag32"}]
 LittleString: ["pstring",{"countType":"li32"}]
+LatinString: ["pstring",{"countType":"varint", "encoding": "latin1"}]
 ShortArray: ["buffer",{"countType":"li16"}]
 ShortString: ["pstring",{"countType":"li16"}]
 varint64: native                                      # Some primitives

diff --git a/data/bedrock/1.17.0/protocol.json b/data/bedrock/1.17.0/protocol.json
@@ -1358,7 +1358,7 @@
                       [
                         {
                           "name": "recipe_id",
-                          "type": "string"
+                          "type": "LatinString"
                         },
                         {
                           "name": "input",
@@ -1403,7 +1403,7 @@
                       [
                         {
                           "name": "recipe_id",
-                          "type": "string"
+                          "type": "LatinString"
                         },
                         {
                           "name": "input",
@@ -1448,7 +1448,7 @@
                       [
                         {
                           "name": "recipe_id",
-                          "type": "string"
+                          "type": "LatinString"
                         },
                         {
                           "name": "input",
@@ -1493,7 +1493,7 @@
                       [
                         {
                           "name": "recipe_id",
-                          "type": "string"
+                          "type": "LatinString"
                         },
                         {
                           "name": "width",
@@ -1552,7 +1552,7 @@
                       [
                         {
                           "name": "recipe_id",
-                          "type": "string"
+                          "type": "LatinString"
                         },
                         {
                           "name": "width",
@@ -8800,6 +8800,13 @@
         "countType": "li32"
       }
     ],
+    "LatinString": [
+      "pstring",
+      {
+        "countType": "varint",
+        "encoding": "latin1"
+      }
+    ],
     "ShortArray": [
       "buffer",
       {

diff --git a/data/bedrock/1.17.0/types.yml b/data/bedrock/1.17.0/types.yml
@@ -629,15 +629,15 @@ Recipes: []varint
       7: shaped_chemistry #'ENTRY_SHAPED_CHEMISTRY', //TODO
    recipe: type?
       if shapeless or shulker_box or shapeless_chemistry:
-         recipe_id: string
+         recipe_id: LatinString
          input: RecipeIngredient[]varint
          output: ItemLegacy[]varint
          uuid: uuid
          block: string
          priority: zigzag32
          network_id: varint
       if shaped or shaped_chemistry:
-         recipe_id: string
+         recipe_id: LatinString
          width: zigzag32
          height: zigzag32
          # 2D input array, size of width*height

diff --git a/data/bedrock/1.17.10/proto.yml b/data/bedrock/1.17.10/proto.yml
@@ -8,6 +8,7 @@ string: ["pstring",{"countType":"varint"}]            # String / array types
 ByteArray: ["buffer",{"countType":"varint"}]
 SignedByteArray: ["buffer",{"countType":"zigzag32"}]
 LittleString: ["pstring",{"countType":"li32"}]
+LatinString: ["pstring",{"countType":"varint", "encoding": "latin1"}]
 ShortArray: ["buffer",{"countType":"li16"}]
 ShortString: ["pstring",{"countType":"li16"}]
 varint64: native                                      # Some primitives