From 900ebf212eb2b97fdbca3aa8527d2ec530a90f2b Mon Sep 17 00:00:00 2001 From: extremeheat Date: Mon, 25 Dec 2023 14:27:32 -0500 Subject: [PATCH] Fix bedrock recipe text encoding issue (#808) * bedrock: add latin1 string type and use for recipes * temp fix for outdated protodef-validate --- data/bedrock/1.16.201/proto.yml | 1 + data/bedrock/1.16.201/protocol.json | 17 ++++++++++++----- data/bedrock/1.16.201/types.yml | 4 ++-- data/bedrock/1.16.210/proto.yml | 1 + data/bedrock/1.16.210/protocol.json | 17 ++++++++++++----- data/bedrock/1.16.210/types.yml | 4 ++-- data/bedrock/1.16.220/proto.yml | 1 + data/bedrock/1.16.220/protocol.json | 17 ++++++++++++----- data/bedrock/1.16.220/types.yml | 4 ++-- data/bedrock/1.17.0/proto.yml | 1 + data/bedrock/1.17.0/protocol.json | 17 ++++++++++++----- data/bedrock/1.17.0/types.yml | 4 ++-- data/bedrock/1.17.10/proto.yml | 1 + data/bedrock/1.17.10/protocol.json | 17 ++++++++++++----- data/bedrock/1.17.10/types.yml | 4 ++-- data/bedrock/1.17.30/proto.yml | 1 + data/bedrock/1.17.30/protocol.json | 17 ++++++++++++----- data/bedrock/1.17.30/types.yml | 4 ++-- data/bedrock/1.17.40/proto.yml | 1 + data/bedrock/1.17.40/protocol.json | 17 ++++++++++++----- data/bedrock/1.17.40/types.yml | 4 ++-- data/bedrock/1.18.0/proto.yml | 1 + data/bedrock/1.18.0/protocol.json | 17 ++++++++++++----- data/bedrock/1.18.0/types.yml | 4 ++-- data/bedrock/1.18.11/proto.yml | 1 + data/bedrock/1.18.11/protocol.json | 17 ++++++++++++----- data/bedrock/1.18.11/types.yml | 4 ++-- data/bedrock/1.18.30/proto.yml | 1 + data/bedrock/1.18.30/protocol.json | 17 ++++++++++++----- data/bedrock/1.18.30/types.yml | 4 ++-- data/bedrock/1.19.1/proto.yml | 1 + data/bedrock/1.19.1/protocol.json | 17 ++++++++++++----- data/bedrock/1.19.1/types.yml | 4 ++-- data/bedrock/1.19.10/proto.yml | 1 + data/bedrock/1.19.10/protocol.json | 17 ++++++++++++----- data/bedrock/1.19.10/types.yml | 4 ++-- data/bedrock/1.19.20/proto.yml | 1 + data/bedrock/1.19.20/protocol.json | 17 ++++++++++++----- data/bedrock/1.19.20/types.yml | 4 ++-- data/bedrock/1.19.21/proto.yml | 1 + data/bedrock/1.19.21/protocol.json | 17 ++++++++++++----- data/bedrock/1.19.21/types.yml | 4 ++-- data/bedrock/1.19.30/proto.yml | 1 + data/bedrock/1.19.30/protocol.json | 17 ++++++++++++----- data/bedrock/1.19.30/types.yml | 4 ++-- data/bedrock/1.19.40/proto.yml | 1 + data/bedrock/1.19.40/protocol.json | 17 ++++++++++++----- data/bedrock/1.19.40/types.yml | 4 ++-- data/bedrock/1.19.50/proto.yml | 1 + data/bedrock/1.19.50/protocol.json | 17 ++++++++++++----- data/bedrock/1.19.50/types.yml | 4 ++-- data/bedrock/1.19.60/proto.yml | 1 + data/bedrock/1.19.60/protocol.json | 19 +++++++++++++------ data/bedrock/1.19.60/types.yml | 6 +++--- data/bedrock/1.19.62/proto.yml | 1 + data/bedrock/1.19.62/protocol.json | 19 +++++++++++++------ data/bedrock/1.19.62/types.yml | 6 +++--- data/bedrock/1.19.70/proto.yml | 1 + data/bedrock/1.19.70/protocol.json | 19 +++++++++++++------ data/bedrock/1.19.70/types.yml | 6 +++--- data/bedrock/1.19.80/proto.yml | 1 + data/bedrock/1.19.80/protocol.json | 21 ++++++++++++++------- data/bedrock/1.19.80/types.yml | 8 ++++---- data/bedrock/1.20.0/proto.yml | 1 + data/bedrock/1.20.0/protocol.json | 21 ++++++++++++++------- data/bedrock/1.20.0/types.yml | 8 ++++---- data/bedrock/1.20.10/proto.yml | 1 + data/bedrock/1.20.10/protocol.json | 21 ++++++++++++++------- data/bedrock/1.20.10/types.yml | 8 ++++---- data/bedrock/1.20.30/proto.yml | 1 + data/bedrock/1.20.30/protocol.json | 21 ++++++++++++++------- data/bedrock/1.20.30/types.yml | 8 ++++---- data/bedrock/1.20.40/proto.yml | 1 + data/bedrock/1.20.40/protocol.json | 21 ++++++++++++++------- data/bedrock/1.20.40/types.yml | 8 ++++---- data/bedrock/1.20.50/protocol.json | 21 ++++++++++++++------- data/bedrock/latest/proto.yml | 1 + data/bedrock/latest/types.yml | 8 ++++---- tools/js/test/test.js | 1 + 79 files changed, 421 insertions(+), 212 deletions(-) diff --git a/data/bedrock/1.16.201/proto.yml b/data/bedrock/1.16.201/proto.yml index 9a8667652..43cd377de 100644 --- 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 index 7bce07fb3..74b51bd87 100644 --- 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 index cf37ea967..afbdf2138 100644 --- a/data/bedrock/1.16.201/types.yml +++ b/data/bedrock/1.16.201/types.yml @@ -455,7 +455,7 @@ 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 @@ -463,7 +463,7 @@ Recipes: []varint 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 index 1889075f3..e4838355b 100644 --- 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 index dbf1498ca..ca84af2eb 100644 --- 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 index 84535c251..2210a93a8 100644 --- a/data/bedrock/1.16.210/types.yml +++ b/data/bedrock/1.16.210/types.yml @@ -589,7 +589,7 @@ 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 @@ -597,7 +597,7 @@ Recipes: []varint 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 index 03f858620..53aba9ecc 100644 --- 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 index bed8f7f1b..6e04fcd98 100644 --- 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 index b68125224..22ff8bb11 100644 --- a/data/bedrock/1.16.220/types.yml +++ b/data/bedrock/1.16.220/types.yml @@ -626,7 +626,7 @@ 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 @@ -634,7 +634,7 @@ Recipes: []varint 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 index 9b00a144d..a0b353945 100644 --- 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 index b577314ff..605bc00ae 100644 --- 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 index c7c027f8d..3cea54920 100644 --- a/data/bedrock/1.17.0/types.yml +++ b/data/bedrock/1.17.0/types.yml @@ -629,7 +629,7 @@ 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 @@ -637,7 +637,7 @@ Recipes: []varint 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 index 3fc5619e4..5c9580a5d 100644 --- 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 diff --git a/data/bedrock/1.17.10/protocol.json b/data/bedrock/1.17.10/protocol.json index af2220937..966c652f0 100644 --- a/data/bedrock/1.17.10/protocol.json +++ b/data/bedrock/1.17.10/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", @@ -8974,6 +8974,13 @@ "countType": "li32" } ], + "LatinString": [ + "pstring", + { + "countType": "varint", + "encoding": "latin1" + } + ], "ShortArray": [ "buffer", { diff --git a/data/bedrock/1.17.10/types.yml b/data/bedrock/1.17.10/types.yml index fbd8e22fb..03d776295 100644 --- a/data/bedrock/1.17.10/types.yml +++ b/data/bedrock/1.17.10/types.yml @@ -629,7 +629,7 @@ 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 @@ -637,7 +637,7 @@ Recipes: []varint 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.30/proto.yml b/data/bedrock/1.17.30/proto.yml index 3e35f5807..00917c15f 100644 --- a/data/bedrock/1.17.30/proto.yml +++ b/data/bedrock/1.17.30/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.30/protocol.json b/data/bedrock/1.17.30/protocol.json index ce6a369c2..e085908d9 100644 --- a/data/bedrock/1.17.30/protocol.json +++ b/data/bedrock/1.17.30/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", @@ -9272,6 +9272,13 @@ "countType": "li32" } ], + "LatinString": [ + "pstring", + { + "countType": "varint", + "encoding": "latin1" + } + ], "ShortArray": [ "buffer", { diff --git a/data/bedrock/1.17.30/types.yml b/data/bedrock/1.17.30/types.yml index 6b7257231..59d06cdc8 100644 --- a/data/bedrock/1.17.30/types.yml +++ b/data/bedrock/1.17.30/types.yml @@ -629,7 +629,7 @@ 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 @@ -637,7 +637,7 @@ Recipes: []varint 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.40/proto.yml b/data/bedrock/1.17.40/proto.yml index 918f39214..131292387 100644 --- a/data/bedrock/1.17.40/proto.yml +++ b/data/bedrock/1.17.40/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.40/protocol.json b/data/bedrock/1.17.40/protocol.json index 65fda5c14..0fdc76437 100644 --- a/data/bedrock/1.17.40/protocol.json +++ b/data/bedrock/1.17.40/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", @@ -9369,6 +9369,13 @@ "countType": "li32" } ], + "LatinString": [ + "pstring", + { + "countType": "varint", + "encoding": "latin1" + } + ], "ShortArray": [ "buffer", { diff --git a/data/bedrock/1.17.40/types.yml b/data/bedrock/1.17.40/types.yml index 2e91bed8a..23ab79a50 100644 --- a/data/bedrock/1.17.40/types.yml +++ b/data/bedrock/1.17.40/types.yml @@ -629,7 +629,7 @@ 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 @@ -637,7 +637,7 @@ Recipes: []varint 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.18.0/proto.yml b/data/bedrock/1.18.0/proto.yml index 85e29029f..fa7226cf1 100644 --- a/data/bedrock/1.18.0/proto.yml +++ b/data/bedrock/1.18.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.18.0/protocol.json b/data/bedrock/1.18.0/protocol.json index 857dedfa5..3896eb6fc 100644 --- a/data/bedrock/1.18.0/protocol.json +++ b/data/bedrock/1.18.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", @@ -9431,6 +9431,13 @@ "countType": "li32" } ], + "LatinString": [ + "pstring", + { + "countType": "varint", + "encoding": "latin1" + } + ], "ShortArray": [ "buffer", { diff --git a/data/bedrock/1.18.0/types.yml b/data/bedrock/1.18.0/types.yml index ca90e9113..6c9466970 100644 --- a/data/bedrock/1.18.0/types.yml +++ b/data/bedrock/1.18.0/types.yml @@ -629,7 +629,7 @@ 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 @@ -637,7 +637,7 @@ Recipes: []varint 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.18.11/proto.yml b/data/bedrock/1.18.11/proto.yml index f7713f16c..f4ef64a63 100644 --- a/data/bedrock/1.18.11/proto.yml +++ b/data/bedrock/1.18.11/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.18.11/protocol.json b/data/bedrock/1.18.11/protocol.json index 82c5b1931..2b6be4cc6 100644 --- a/data/bedrock/1.18.11/protocol.json +++ b/data/bedrock/1.18.11/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", @@ -9687,6 +9687,13 @@ "countType": "li32" } ], + "LatinString": [ + "pstring", + { + "countType": "varint", + "encoding": "latin1" + } + ], "ShortArray": [ "buffer", { diff --git a/data/bedrock/1.18.11/types.yml b/data/bedrock/1.18.11/types.yml index 1422d9268..75f479793 100644 --- a/data/bedrock/1.18.11/types.yml +++ b/data/bedrock/1.18.11/types.yml @@ -633,7 +633,7 @@ 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 @@ -641,7 +641,7 @@ Recipes: []varint 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.18.30/proto.yml b/data/bedrock/1.18.30/proto.yml index d9556ea33..2c2fe5806 100644 --- a/data/bedrock/1.18.30/proto.yml +++ b/data/bedrock/1.18.30/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.18.30/protocol.json b/data/bedrock/1.18.30/protocol.json index 9ac6861f5..cc156c2a2 100644 --- a/data/bedrock/1.18.30/protocol.json +++ b/data/bedrock/1.18.30/protocol.json @@ -1362,7 +1362,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1407,7 +1407,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1452,7 +1452,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1497,7 +1497,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -1556,7 +1556,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -9925,6 +9925,13 @@ "countType": "li32" } ], + "LatinString": [ + "pstring", + { + "countType": "varint", + "encoding": "latin1" + } + ], "ShortArray": [ "buffer", { diff --git a/data/bedrock/1.18.30/types.yml b/data/bedrock/1.18.30/types.yml index d76166243..1d2543d44 100644 --- a/data/bedrock/1.18.30/types.yml +++ b/data/bedrock/1.18.30/types.yml @@ -641,7 +641,7 @@ 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 @@ -649,7 +649,7 @@ Recipes: []varint 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.19.1/proto.yml b/data/bedrock/1.19.1/proto.yml index 1ba299e8b..d60536929 100644 --- a/data/bedrock/1.19.1/proto.yml +++ b/data/bedrock/1.19.1/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.19.1/protocol.json b/data/bedrock/1.19.1/protocol.json index 01ff3fdad..5d5b7cce4 100644 --- a/data/bedrock/1.19.1/protocol.json +++ b/data/bedrock/1.19.1/protocol.json @@ -1362,7 +1362,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1407,7 +1407,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1452,7 +1452,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1497,7 +1497,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -1556,7 +1556,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -10093,6 +10093,13 @@ "countType": "li32" } ], + "LatinString": [ + "pstring", + { + "countType": "varint", + "encoding": "latin1" + } + ], "ShortArray": [ "buffer", { diff --git a/data/bedrock/1.19.1/types.yml b/data/bedrock/1.19.1/types.yml index 9ab5e7a31..e5d00a787 100644 --- a/data/bedrock/1.19.1/types.yml +++ b/data/bedrock/1.19.1/types.yml @@ -641,7 +641,7 @@ 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 @@ -649,7 +649,7 @@ Recipes: []varint 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.19.10/proto.yml b/data/bedrock/1.19.10/proto.yml index c5214d954..247882af7 100644 --- a/data/bedrock/1.19.10/proto.yml +++ b/data/bedrock/1.19.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 diff --git a/data/bedrock/1.19.10/protocol.json b/data/bedrock/1.19.10/protocol.json index 2959c9300..ca96c0927 100644 --- a/data/bedrock/1.19.10/protocol.json +++ b/data/bedrock/1.19.10/protocol.json @@ -1362,7 +1362,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1407,7 +1407,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1452,7 +1452,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1497,7 +1497,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -1556,7 +1556,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -10241,6 +10241,13 @@ "countType": "li32" } ], + "LatinString": [ + "pstring", + { + "countType": "varint", + "encoding": "latin1" + } + ], "ShortArray": [ "buffer", { diff --git a/data/bedrock/1.19.10/types.yml b/data/bedrock/1.19.10/types.yml index a0eda104b..09412b98f 100644 --- a/data/bedrock/1.19.10/types.yml +++ b/data/bedrock/1.19.10/types.yml @@ -641,7 +641,7 @@ 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 @@ -649,7 +649,7 @@ Recipes: []varint 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.19.20/proto.yml b/data/bedrock/1.19.20/proto.yml index aab9ae706..3011333a2 100644 --- a/data/bedrock/1.19.20/proto.yml +++ b/data/bedrock/1.19.20/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.19.20/protocol.json b/data/bedrock/1.19.20/protocol.json index 9a2d99b43..1cf4fe944 100644 --- a/data/bedrock/1.19.20/protocol.json +++ b/data/bedrock/1.19.20/protocol.json @@ -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": "input", @@ -1535,7 +1535,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -1594,7 +1594,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -10433,6 +10433,13 @@ "countType": "li32" } ], + "LatinString": [ + "pstring", + { + "countType": "varint", + "encoding": "latin1" + } + ], "ShortArray": [ "buffer", { diff --git a/data/bedrock/1.19.20/types.yml b/data/bedrock/1.19.20/types.yml index 5b83dca3e..ffc06b3b1 100644 --- a/data/bedrock/1.19.20/types.yml +++ b/data/bedrock/1.19.20/types.yml @@ -648,7 +648,7 @@ 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 @@ -656,7 +656,7 @@ Recipes: []varint 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.19.21/proto.yml b/data/bedrock/1.19.21/proto.yml index c61c89050..a9c9f75a6 100644 --- a/data/bedrock/1.19.21/proto.yml +++ b/data/bedrock/1.19.21/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.19.21/protocol.json b/data/bedrock/1.19.21/protocol.json index 9a2d99b43..1cf4fe944 100644 --- a/data/bedrock/1.19.21/protocol.json +++ b/data/bedrock/1.19.21/protocol.json @@ -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": "input", @@ -1535,7 +1535,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -1594,7 +1594,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -10433,6 +10433,13 @@ "countType": "li32" } ], + "LatinString": [ + "pstring", + { + "countType": "varint", + "encoding": "latin1" + } + ], "ShortArray": [ "buffer", { diff --git a/data/bedrock/1.19.21/types.yml b/data/bedrock/1.19.21/types.yml index 5b83dca3e..ffc06b3b1 100644 --- a/data/bedrock/1.19.21/types.yml +++ b/data/bedrock/1.19.21/types.yml @@ -648,7 +648,7 @@ 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 @@ -656,7 +656,7 @@ Recipes: []varint 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.19.30/proto.yml b/data/bedrock/1.19.30/proto.yml index 2540039c8..1fd699656 100644 --- a/data/bedrock/1.19.30/proto.yml +++ b/data/bedrock/1.19.30/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.19.30/protocol.json b/data/bedrock/1.19.30/protocol.json index 3e7fc911d..52f693dea 100644 --- a/data/bedrock/1.19.30/protocol.json +++ b/data/bedrock/1.19.30/protocol.json @@ -1460,7 +1460,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1505,7 +1505,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1550,7 +1550,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1595,7 +1595,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -1654,7 +1654,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -10646,6 +10646,13 @@ "countType": "li32" } ], + "LatinString": [ + "pstring", + { + "countType": "varint", + "encoding": "latin1" + } + ], "ShortArray": [ "buffer", { diff --git a/data/bedrock/1.19.30/types.yml b/data/bedrock/1.19.30/types.yml index 9f4c3e5f1..d618fb5ad 100644 --- a/data/bedrock/1.19.30/types.yml +++ b/data/bedrock/1.19.30/types.yml @@ -677,7 +677,7 @@ 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 @@ -685,7 +685,7 @@ Recipes: []varint 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.19.40/proto.yml b/data/bedrock/1.19.40/proto.yml index 32ed035cf..46e32f515 100644 --- a/data/bedrock/1.19.40/proto.yml +++ b/data/bedrock/1.19.40/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.19.40/protocol.json b/data/bedrock/1.19.40/protocol.json index ac64962a2..1c554ddef 100644 --- a/data/bedrock/1.19.40/protocol.json +++ b/data/bedrock/1.19.40/protocol.json @@ -1512,7 +1512,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1557,7 +1557,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1602,7 +1602,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1647,7 +1647,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -1706,7 +1706,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -10718,6 +10718,13 @@ "countType": "li32" } ], + "LatinString": [ + "pstring", + { + "countType": "varint", + "encoding": "latin1" + } + ], "ShortArray": [ "buffer", { diff --git a/data/bedrock/1.19.40/types.yml b/data/bedrock/1.19.40/types.yml index e4b4ca690..1e1e19dce 100644 --- a/data/bedrock/1.19.40/types.yml +++ b/data/bedrock/1.19.40/types.yml @@ -688,7 +688,7 @@ 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 @@ -696,7 +696,7 @@ Recipes: []varint 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.19.50/proto.yml b/data/bedrock/1.19.50/proto.yml index 852901e0f..496622e9c 100644 --- a/data/bedrock/1.19.50/proto.yml +++ b/data/bedrock/1.19.50/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.19.50/protocol.json b/data/bedrock/1.19.50/protocol.json index 886844acf..b117cb969 100644 --- a/data/bedrock/1.19.50/protocol.json +++ b/data/bedrock/1.19.50/protocol.json @@ -1512,7 +1512,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1557,7 +1557,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1602,7 +1602,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1647,7 +1647,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -1706,7 +1706,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -10749,6 +10749,13 @@ "countType": "li32" } ], + "LatinString": [ + "pstring", + { + "countType": "varint", + "encoding": "latin1" + } + ], "ShortArray": [ "buffer", { diff --git a/data/bedrock/1.19.50/types.yml b/data/bedrock/1.19.50/types.yml index 4cb214157..608db090f 100644 --- a/data/bedrock/1.19.50/types.yml +++ b/data/bedrock/1.19.50/types.yml @@ -692,7 +692,7 @@ 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 @@ -700,7 +700,7 @@ Recipes: []varint 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.19.60/proto.yml b/data/bedrock/1.19.60/proto.yml index 7d49a0063..2317a2bcf 100644 --- a/data/bedrock/1.19.60/proto.yml +++ b/data/bedrock/1.19.60/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.19.60/protocol.json b/data/bedrock/1.19.60/protocol.json index 935bf0109..4ace4e89d 100644 --- a/data/bedrock/1.19.60/protocol.json +++ b/data/bedrock/1.19.60/protocol.json @@ -1513,7 +1513,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1558,7 +1558,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1603,7 +1603,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1648,7 +1648,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -1707,7 +1707,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -1817,7 +1817,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "base", @@ -10830,6 +10830,13 @@ "countType": "li32" } ], + "LatinString": [ + "pstring", + { + "countType": "varint", + "encoding": "latin1" + } + ], "ShortArray": [ "buffer", { diff --git a/data/bedrock/1.19.60/types.yml b/data/bedrock/1.19.60/types.yml index 4455ebadd..e8ee4d8d9 100644 --- a/data/bedrock/1.19.60/types.yml +++ b/data/bedrock/1.19.60/types.yml @@ -695,7 +695,7 @@ Recipes: []varint 8: smithing_transform recipe: type? if shapeless or shulker_box or shapeless_chemistry: - recipe_id: string + recipe_id: LatinString input: RecipeIngredient[]varint output: ItemLegacy[]varint uuid: uuid @@ -703,7 +703,7 @@ Recipes: []varint 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 @@ -729,7 +729,7 @@ Recipes: []varint if smithing_transform: # RecipeID is a unique ID of the recipe. This ID must be unique amongst all other types of recipes too, # but its functionality is not exactly known. - recipe_id: string + recipe_id: LatinString # Base is the item that the Addition is being applied to in the smithing table. base: RecipeIngredient # Addition is the item that is being added to the Base item to result in a modified item. diff --git a/data/bedrock/1.19.62/proto.yml b/data/bedrock/1.19.62/proto.yml index d0a850294..0a61f0771 100644 --- a/data/bedrock/1.19.62/proto.yml +++ b/data/bedrock/1.19.62/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.19.62/protocol.json b/data/bedrock/1.19.62/protocol.json index 5a01a1ea5..f4291ff87 100644 --- a/data/bedrock/1.19.62/protocol.json +++ b/data/bedrock/1.19.62/protocol.json @@ -1513,7 +1513,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1558,7 +1558,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1603,7 +1603,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1648,7 +1648,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -1707,7 +1707,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -1817,7 +1817,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "base", @@ -10834,6 +10834,13 @@ "countType": "li32" } ], + "LatinString": [ + "pstring", + { + "countType": "varint", + "encoding": "latin1" + } + ], "ShortArray": [ "buffer", { diff --git a/data/bedrock/1.19.62/types.yml b/data/bedrock/1.19.62/types.yml index 0a5048e92..c0ea7b012 100644 --- a/data/bedrock/1.19.62/types.yml +++ b/data/bedrock/1.19.62/types.yml @@ -695,7 +695,7 @@ Recipes: []varint 8: smithing_transform recipe: type? if shapeless or shulker_box or shapeless_chemistry: - recipe_id: string + recipe_id: LatinString input: RecipeIngredient[]varint output: ItemLegacy[]varint uuid: uuid @@ -703,7 +703,7 @@ Recipes: []varint 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 @@ -729,7 +729,7 @@ Recipes: []varint if smithing_transform: # RecipeID is a unique ID of the recipe. This ID must be unique amongst all other types of recipes too, # but its functionality is not exactly known. - recipe_id: string + recipe_id: LatinString # Base is the item that the Addition is being applied to in the smithing table. base: RecipeIngredient # Addition is the item that is being added to the Base item to result in a modified item. diff --git a/data/bedrock/1.19.70/proto.yml b/data/bedrock/1.19.70/proto.yml index fe6ba963b..81d82aa76 100644 --- a/data/bedrock/1.19.70/proto.yml +++ b/data/bedrock/1.19.70/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.19.70/protocol.json b/data/bedrock/1.19.70/protocol.json index 672d188ec..193e6f413 100644 --- a/data/bedrock/1.19.70/protocol.json +++ b/data/bedrock/1.19.70/protocol.json @@ -1523,7 +1523,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1568,7 +1568,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1613,7 +1613,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1658,7 +1658,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -1717,7 +1717,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -1827,7 +1827,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "base", @@ -10893,6 +10893,13 @@ "countType": "li32" } ], + "LatinString": [ + "pstring", + { + "countType": "varint", + "encoding": "latin1" + } + ], "ShortArray": [ "buffer", { diff --git a/data/bedrock/1.19.70/types.yml b/data/bedrock/1.19.70/types.yml index e015e1c73..7468f13c0 100644 --- a/data/bedrock/1.19.70/types.yml +++ b/data/bedrock/1.19.70/types.yml @@ -705,7 +705,7 @@ Recipes: []varint 8: smithing_transform recipe: type? if shapeless or shulker_box or shapeless_chemistry: - recipe_id: string + recipe_id: LatinString input: RecipeIngredient[]varint output: ItemLegacy[]varint uuid: uuid @@ -713,7 +713,7 @@ Recipes: []varint 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 @@ -739,7 +739,7 @@ Recipes: []varint if smithing_transform: # RecipeID is a unique ID of the recipe. This ID must be unique amongst all other types of recipes too, # but its functionality is not exactly known. - recipe_id: string + recipe_id: LatinString # Base is the item that the Addition is being applied to in the smithing table. base: RecipeIngredient # Addition is the item that is being added to the Base item to result in a modified item. diff --git a/data/bedrock/1.19.80/proto.yml b/data/bedrock/1.19.80/proto.yml index 3d41422a4..64ad5b60b 100644 --- a/data/bedrock/1.19.80/proto.yml +++ b/data/bedrock/1.19.80/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.19.80/protocol.json b/data/bedrock/1.19.80/protocol.json index 39dd63c3d..3127d797e 100644 --- a/data/bedrock/1.19.80/protocol.json +++ b/data/bedrock/1.19.80/protocol.json @@ -1524,7 +1524,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1569,7 +1569,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1614,7 +1614,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1659,7 +1659,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -1718,7 +1718,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -1828,7 +1828,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "template", @@ -1861,7 +1861,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "template", @@ -11031,6 +11031,13 @@ "countType": "li32" } ], + "LatinString": [ + "pstring", + { + "countType": "varint", + "encoding": "latin1" + } + ], "ShortArray": [ "buffer", { diff --git a/data/bedrock/1.19.80/types.yml b/data/bedrock/1.19.80/types.yml index 5624a14cf..b69a8ad06 100644 --- a/data/bedrock/1.19.80/types.yml +++ b/data/bedrock/1.19.80/types.yml @@ -706,7 +706,7 @@ Recipes: []varint 9: smithing_trim recipe: type? if shapeless or shulker_box or shapeless_chemistry: - recipe_id: string + recipe_id: LatinString input: RecipeIngredient[]varint output: ItemLegacy[]varint uuid: uuid @@ -714,7 +714,7 @@ Recipes: []varint 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 @@ -740,7 +740,7 @@ Recipes: []varint if smithing_transform: # RecipeID is a unique ID of the recipe. This ID must be unique amongst all other types of recipes too, # but its functionality is not exactly known. - recipe_id: string + recipe_id: LatinString template: RecipeIngredient # Base is the item that the Addition is being applied to in the smithing table. base: RecipeIngredient @@ -755,7 +755,7 @@ Recipes: []varint # This field must never be 0. network_id: varint if smithing_trim: - recipe_id: string + recipe_id: LatinString template: RecipeIngredient input: RecipeIngredient addition: RecipeIngredient diff --git a/data/bedrock/1.20.0/proto.yml b/data/bedrock/1.20.0/proto.yml index 40056c713..beb031a5d 100644 --- a/data/bedrock/1.20.0/proto.yml +++ b/data/bedrock/1.20.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.20.0/protocol.json b/data/bedrock/1.20.0/protocol.json index c7576958d..a0d86212c 100644 --- a/data/bedrock/1.20.0/protocol.json +++ b/data/bedrock/1.20.0/protocol.json @@ -1524,7 +1524,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1569,7 +1569,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1614,7 +1614,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1659,7 +1659,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -1718,7 +1718,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -1828,7 +1828,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "template", @@ -1861,7 +1861,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "template", @@ -11062,6 +11062,13 @@ "countType": "li32" } ], + "LatinString": [ + "pstring", + { + "countType": "varint", + "encoding": "latin1" + } + ], "ShortArray": [ "buffer", { diff --git a/data/bedrock/1.20.0/types.yml b/data/bedrock/1.20.0/types.yml index 6b87d4f41..c2f47b39b 100644 --- a/data/bedrock/1.20.0/types.yml +++ b/data/bedrock/1.20.0/types.yml @@ -706,7 +706,7 @@ Recipes: []varint 9: smithing_trim recipe: type? if shapeless or shulker_box or shapeless_chemistry: - recipe_id: string + recipe_id: LatinString input: RecipeIngredient[]varint output: ItemLegacy[]varint uuid: uuid @@ -714,7 +714,7 @@ Recipes: []varint 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 @@ -740,7 +740,7 @@ Recipes: []varint if smithing_transform: # RecipeID is a unique ID of the recipe. This ID must be unique amongst all other types of recipes too, # but its functionality is not exactly known. - recipe_id: string + recipe_id: LatinString template: RecipeIngredient # Base is the item that the Addition is being applied to in the smithing table. base: RecipeIngredient @@ -755,7 +755,7 @@ Recipes: []varint # This field must never be 0. network_id: varint if smithing_trim: - recipe_id: string + recipe_id: LatinString template: RecipeIngredient input: RecipeIngredient addition: RecipeIngredient diff --git a/data/bedrock/1.20.10/proto.yml b/data/bedrock/1.20.10/proto.yml index 59567740d..1ea6aa619 100644 --- a/data/bedrock/1.20.10/proto.yml +++ b/data/bedrock/1.20.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 diff --git a/data/bedrock/1.20.10/protocol.json b/data/bedrock/1.20.10/protocol.json index 5b5ec3eb7..743cedfa1 100644 --- a/data/bedrock/1.20.10/protocol.json +++ b/data/bedrock/1.20.10/protocol.json @@ -1525,7 +1525,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1570,7 +1570,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1615,7 +1615,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1660,7 +1660,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -1719,7 +1719,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -1829,7 +1829,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "template", @@ -1862,7 +1862,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "template", @@ -11155,6 +11155,13 @@ "countType": "li32" } ], + "LatinString": [ + "pstring", + { + "countType": "varint", + "encoding": "latin1" + } + ], "ShortArray": [ "buffer", { diff --git a/data/bedrock/1.20.10/types.yml b/data/bedrock/1.20.10/types.yml index 8ab58fc18..97818ab16 100644 --- a/data/bedrock/1.20.10/types.yml +++ b/data/bedrock/1.20.10/types.yml @@ -708,7 +708,7 @@ Recipes: []varint 9: smithing_trim recipe: type? if shapeless or shulker_box or shapeless_chemistry: - recipe_id: string + recipe_id: LatinString input: RecipeIngredient[]varint output: ItemLegacy[]varint uuid: uuid @@ -716,7 +716,7 @@ Recipes: []varint 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 @@ -742,7 +742,7 @@ Recipes: []varint if smithing_transform: # RecipeID is a unique ID of the recipe. This ID must be unique amongst all other types of recipes too, # but its functionality is not exactly known. - recipe_id: string + recipe_id: LatinString template: RecipeIngredient # Base is the item that the Addition is being applied to in the smithing table. base: RecipeIngredient @@ -757,7 +757,7 @@ Recipes: []varint # This field must never be 0. network_id: varint if smithing_trim: - recipe_id: string + recipe_id: LatinString template: RecipeIngredient input: RecipeIngredient addition: RecipeIngredient diff --git a/data/bedrock/1.20.30/proto.yml b/data/bedrock/1.20.30/proto.yml index 05d2aa030..85d24f807 100644 --- a/data/bedrock/1.20.30/proto.yml +++ b/data/bedrock/1.20.30/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.20.30/protocol.json b/data/bedrock/1.20.30/protocol.json index 305f9aa96..3ec2d5ebf 100644 --- a/data/bedrock/1.20.30/protocol.json +++ b/data/bedrock/1.20.30/protocol.json @@ -1570,7 +1570,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1615,7 +1615,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1660,7 +1660,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1705,7 +1705,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -1764,7 +1764,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -1874,7 +1874,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "template", @@ -1907,7 +1907,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "template", @@ -11419,6 +11419,13 @@ "countType": "li32" } ], + "LatinString": [ + "pstring", + { + "countType": "varint", + "encoding": "latin1" + } + ], "ShortArray": [ "buffer", { diff --git a/data/bedrock/1.20.30/types.yml b/data/bedrock/1.20.30/types.yml index 0ca1503b9..a13c8c5cb 100644 --- a/data/bedrock/1.20.30/types.yml +++ b/data/bedrock/1.20.30/types.yml @@ -717,7 +717,7 @@ Recipes: []varint 9: smithing_trim recipe: type? if shapeless or shulker_box or shapeless_chemistry: - recipe_id: string + recipe_id: LatinString input: RecipeIngredient[]varint output: ItemLegacy[]varint uuid: uuid @@ -725,7 +725,7 @@ Recipes: []varint 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 @@ -751,7 +751,7 @@ Recipes: []varint if smithing_transform: # RecipeID is a unique ID of the recipe. This ID must be unique amongst all other types of recipes too, # but its functionality is not exactly known. - recipe_id: string + recipe_id: LatinString template: RecipeIngredient # Base is the item that the Addition is being applied to in the smithing table. base: RecipeIngredient @@ -766,7 +766,7 @@ Recipes: []varint # This field must never be 0. network_id: varint if smithing_trim: - recipe_id: string + recipe_id: LatinString template: RecipeIngredient input: RecipeIngredient addition: RecipeIngredient diff --git a/data/bedrock/1.20.40/proto.yml b/data/bedrock/1.20.40/proto.yml index b63968c2f..3d6a238a1 100644 --- a/data/bedrock/1.20.40/proto.yml +++ b/data/bedrock/1.20.40/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.20.40/protocol.json b/data/bedrock/1.20.40/protocol.json index 95213e05a..126116e98 100644 --- a/data/bedrock/1.20.40/protocol.json +++ b/data/bedrock/1.20.40/protocol.json @@ -1570,7 +1570,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1615,7 +1615,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1660,7 +1660,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1705,7 +1705,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -1764,7 +1764,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -1874,7 +1874,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "template", @@ -1907,7 +1907,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "template", @@ -11547,6 +11547,13 @@ "countType": "li32" } ], + "LatinString": [ + "pstring", + { + "countType": "varint", + "encoding": "latin1" + } + ], "ShortArray": [ "buffer", { diff --git a/data/bedrock/1.20.40/types.yml b/data/bedrock/1.20.40/types.yml index 831ed76ab..37b8009f2 100644 --- a/data/bedrock/1.20.40/types.yml +++ b/data/bedrock/1.20.40/types.yml @@ -720,7 +720,7 @@ Recipes: []varint 9: smithing_trim recipe: type? if shapeless or shulker_box or shapeless_chemistry: - recipe_id: string + recipe_id: LatinString input: RecipeIngredient[]varint output: ItemLegacy[]varint uuid: uuid @@ -728,7 +728,7 @@ Recipes: []varint 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 @@ -754,7 +754,7 @@ Recipes: []varint if smithing_transform: # RecipeID is a unique ID of the recipe. This ID must be unique amongst all other types of recipes too, # but its functionality is not exactly known. - recipe_id: string + recipe_id: LatinString template: RecipeIngredient # Base is the item that the Addition is being applied to in the smithing table. base: RecipeIngredient @@ -769,7 +769,7 @@ Recipes: []varint # This field must never be 0. network_id: varint if smithing_trim: - recipe_id: string + recipe_id: LatinString template: RecipeIngredient input: RecipeIngredient addition: RecipeIngredient diff --git a/data/bedrock/1.20.50/protocol.json b/data/bedrock/1.20.50/protocol.json index 29d58b310..6895cde65 100644 --- a/data/bedrock/1.20.50/protocol.json +++ b/data/bedrock/1.20.50/protocol.json @@ -1587,7 +1587,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1632,7 +1632,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1677,7 +1677,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "input", @@ -1722,7 +1722,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -1781,7 +1781,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "width", @@ -1891,7 +1891,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "template", @@ -1924,7 +1924,7 @@ [ { "name": "recipe_id", - "type": "string" + "type": "LatinString" }, { "name": "template", @@ -11692,6 +11692,13 @@ "countType": "li32" } ], + "LatinString": [ + "pstring", + { + "countType": "varint", + "encoding": "latin1" + } + ], "ShortArray": [ "buffer", { diff --git a/data/bedrock/latest/proto.yml b/data/bedrock/latest/proto.yml index 3e0bc72a2..d4a733d95 100644 --- a/data/bedrock/latest/proto.yml +++ b/data/bedrock/latest/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/latest/types.yml b/data/bedrock/latest/types.yml index b8baa83bd..bffb6dadc 100644 --- a/data/bedrock/latest/types.yml +++ b/data/bedrock/latest/types.yml @@ -725,7 +725,7 @@ Recipes: []varint 9: smithing_trim recipe: type? if shapeless or shulker_box or shapeless_chemistry: - recipe_id: string + recipe_id: LatinString input: RecipeIngredient[]varint output: ItemLegacy[]varint uuid: uuid @@ -733,7 +733,7 @@ Recipes: []varint 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 @@ -759,7 +759,7 @@ Recipes: []varint if smithing_transform: # RecipeID is a unique ID of the recipe. This ID must be unique amongst all other types of recipes too, # but its functionality is not exactly known. - recipe_id: string + recipe_id: LatinString template: RecipeIngredient # Base is the item that the Addition is being applied to in the smithing table. base: RecipeIngredient @@ -774,7 +774,7 @@ Recipes: []varint # This field must never be 0. network_id: varint if smithing_trim: - recipe_id: string + recipe_id: LatinString template: RecipeIngredient input: RecipeIngredient addition: RecipeIngredient diff --git a/tools/js/test/test.js b/tools/js/test/test.js index cd45c2b62..26dfae889 100644 --- a/tools/js/test/test.js +++ b/tools/js/test/test.js @@ -27,6 +27,7 @@ require('./version_iterator')(function (p, versionString) { if (dataName === 'protocol') { const validator = new Validator() + instance.types.LatinString = 'native' // TODO: Update protodef validator validator.addType('entityMetadataItem', require('../../../schemas/protocol_types/entity_metadata_item.json')) validator.addType('entityMetadataLoop', require('../../../schemas/protocol_types/entity_metadata_loop.json')) validator.validateProtocol(instance)