Corrections

PrismarineJS · Sep 20, 2024 · 970701c · 970701c
1 parent b6d8b68
commit 970701c
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 59 deletions.
diff --git a/data/bedrock/1.21.20/protocol.json b/data/bedrock/1.21.20/protocol.json
@@ -2645,11 +2645,7 @@
       [
         {
           "name": "slot_type",
-          "type": "ContainerSlotType"
-        },
-        {
-          "name": "dynamic_container_id",
-          "type": "lu32"
+          "type": "FullContainerName"
         },
         {
           "name": "slot",
@@ -3081,7 +3077,7 @@
                                 [
                                   {
                                     "name": "slot_type",
-                                    "type": "ContainerSlotType"
+                                    "type": "FullContainerName"
                                   },
                                   {
                                     "name": "slots",
@@ -4660,6 +4656,19 @@
         }
       }
     ],
+    "FullContainerName": [
+      "container",
+      [
+        {
+          "name": "container_id",
+          "type": "ContainerSlotType"
+        },
+        {
+          "name": "dynamic_container_id",
+          "type": "u32"
+        }
+      ]
+    ],
     "mcpe_packet": [
       "container",
       [

diff --git a/data/bedrock/1.21.20/types.yml b/data/bedrock/1.21.20/types.yml
@@ -933,9 +933,7 @@ Action: zigzag32 =>
 # destination slot to which this item was moved.
 StackRequestSlotInfo:
    # ContainerID is the ID of the container that the slot was in.
-   slot_type: ContainerSlotType
-   # DynamicContainerID is the ID of the container if it is dynamic. If the container is not dynamic, this field is set to 0.
-   dynamic_container_id: lu32
+   slot_type: FullContainerName
    # Slot is the index of the slot within the container with the ContainerID above. 
    slot: u8
    # StackNetworkID is the unique stack ID that the client assumes to be present in this slot. The server
@@ -1143,7 +1141,7 @@ ItemStackResponses: []varint
             # inventory, this value seems to be 0x1b. For the cursor, this value seems to be 0x3a. For the crafting
             # grid, this value seems to be 0x0d.
             # * actually, this is ContainerSlotType - used by the inventory system that specifies the type of slot
-            slot_type: ContainerSlotType
+            slot_type: FullContainerName
             # SlotInfo holds information on what item stack should be present in specific slots in the container.
             slots: []varint
                # Slot and HotbarSlot seem to be the same value every time: The slot that was actually changed. I'm not
@@ -2402,3 +2400,7 @@ DisconnectFailReason: zigzag32 =>
    - server_shutdown
    - game_setup_cancelled
    - game_setup_failed
+
+FullContainerName:
+   container_id: ContainerSlotType
+   dynamic_container_id: u32
diff --git a/data/bedrock/1.21.30/protocol.json b/data/bedrock/1.21.30/protocol.json
@@ -2610,11 +2610,7 @@
       [
         {
           "name": "slot_type",
-          "type": "ContainerSlotType"
-        },
-        {
-          "name": "dynamic_container_id",
-          "type": "lu32"
+          "type": "FullContainerName"
         },
         {
           "name": "slot",
@@ -3046,7 +3042,7 @@
                                 [
                                   {
                                     "name": "slot_type",
-                                    "type": "ContainerSlotType"
+                                    "type": "FullContainerName"
                                   },
                                   {
                                     "name": "slots",
@@ -4652,8 +4648,8 @@
       "container",
       [
         {
-          "name": "container_name",
-          "type": "u8"
+          "name": "container_id",
+          "type": "ContainerSlotType"
         },
         {
           "name": "dynamic_container_id",
@@ -7109,14 +7105,14 @@
           "name": "window_id",
           "type": "WindowIDVarint"
         },
-        {
-          "name": "container",
-          "type": "FullContainerName"
-        },
         {
           "name": "input",
           "type": "ItemStacks"
         },
+        {
+          "name": "container",
+          "type": "FullContainerName"
+        },
         {
           "name": "dynamic_container_size",
           "type": "varint"
@@ -7130,14 +7126,14 @@
           "name": "window_id",
           "type": "WindowIDVarint"
         },
-        {
-          "name": "container",
-          "type": "FullContainerName"
-        },
         {
           "name": "slot",
           "type": "varint"
         },
+        {
+          "name": "container",
+          "type": "FullContainerName"
+        },
         {
           "name": "dynamic_container_size",
           "type": "varint"
@@ -12579,10 +12575,6 @@
       []
     ],
     "packet_serverbound_loading_screen": [
-      "container",
-      []
-    ],
-    "packet_camera_aim_assist": [
       "container",
       [
         {
@@ -12595,7 +12587,12 @@
             "option",
             "varint"
           ]
-        },
+        }
+      ]
+    ],
+    "packet_camera_aim_assist": [
+      "container",
+      [
         {
           "name": "view_angle",
           "type": "vec2f"
@@ -12633,10 +12630,6 @@
       ]
     ],
     "packet_serverbound_diagnostics": [
-      "container",
-      []
-    ],
-    "packet_container_registry_cleanup": [
       "container",
       [
         {
@@ -12674,14 +12667,19 @@
         {
           "name": "average_unaccounted_time_percent",
           "type": "lf32"
-        },
+        }
+      ]
+    ],
+    "packet_container_registry_cleanup": [
+      "container",
+      [
         {
           "name": "removed_containers",
           "type": [
             "array",
             {
-              "countType": "FullContainerName",
-              "type": "varint"
+              "countType": "varint",
+              "type": "FullContainerName"
             }
           ]
         }

diff --git a/data/bedrock/latest/proto.yml b/data/bedrock/latest/proto.yml
@@ -1250,11 +1250,11 @@ packet_inventory_content:
    # WindowID is the ID that identifies one of the windows that the client currently has opened, or one of
    # the consistent windows such as the main inventory.
    window_id: WindowIDVarint
-   # Container is the protocol.FullContainerName that describes the container that the content is for.
-   container: FullContainerName
    # Content is the new content of the inventory. The length of this slice must be equal to the full size of
    # the inventory window updated.
    input: ItemStacks
+   # Container is the protocol.FullContainerName that describes the container that the content is for.
+   container: FullContainerName
    # DynamicContainerSize is the size of the container, if the container is dynamic.
    dynamic_container_size: varint
 
@@ -1267,10 +1267,10 @@ packet_inventory_slot:
    # WindowID is the ID of the window that the packet modifies. It must point to one of the windows that the
    # client currently has opened.
    window_id: WindowIDVarint
-   # Container is the protocol.FullContainerName that describes the container that the content is for.
-   container: FullContainerName
    # Slot is the index of the slot that the packet modifies. The new item will be set to the slot at this index.
    slot: varint
+   # Container is the protocol.FullContainerName that describes the container that the content is for.
+   container: FullContainerName
    # DynamicContainerSize is the size of the container, if the container is dynamic.
    dynamic_container_size: varint
    # NewItem is the item to be put in the slot at Slot. It will overwrite any item that may currently
@@ -4229,13 +4229,15 @@ packet_clientbound_close_form:
 # screen that the client is currently displaying.
 packet_serverbound_loading_screen:
    !id: 0x137
-# CameraAimAssist is sent by the server to the client to set up aim assist for the client's camera.
-packet_camera_aim_assist:
-   !id: 0x138
    !bound: server
    # The type of the loading screen event.
    type: zigzag32
    loading_screen_id?: varint
+
+# CameraAimAssist is sent by the server to the client to set up aim assist for the client's camera.
+packet_camera_aim_assist:
+   !id: 0x138
+   !bound: server
    # CameraAimAssistTargetModeAngle.
    view_angle: vec2f
    # Distance is the distance that the camera should keep from the target, if TargetMode is set to
@@ -4268,10 +4270,6 @@ packet_current_structure_feature:
 # "Creator > Enable Client Diagnostics" setting is enabled.
 packet_serverbound_diagnostics:
    !id: 0x13B
-
-# ContainerRegistryCleanup is sent by the server to trigger a client-side cleanup of the dynamic container registry.
-packet_container_registry_cleanup:
-   !id: 0x140 
    !bound: server
    average_frames_per_second: lf32
    average_server_sim_tick_time: lf32
@@ -4282,5 +4280,10 @@ packet_container_registry_cleanup:
    average_end_frame_time: lf32
    average_remainder_time_percent: lf32
    average_unaccounted_time_percent: lf32
+
+# ContainerRegistryCleanup is sent by the server to trigger a client-side cleanup of the dynamic container registry.
+packet_container_registry_cleanup:
+   !id: 0x140
+   !bound: client
    # RemovedContainers is a list of protocol.FullContainerName's that should be removed from the client-side container registry.
-   removed_containers: varint[]FullContainerName
+   removed_containers: FullContainerName[]varint
diff --git a/data/bedrock/latest/types.yml b/data/bedrock/latest/types.yml
@@ -925,9 +925,7 @@ Action: zigzag32 =>
 # destination slot to which this item was moved.
 StackRequestSlotInfo:
    # ContainerID is the ID of the container that the slot was in.
-   slot_type: ContainerSlotType
-   # DynamicContainerID is the ID of the container if it is dynamic. If the container is not dynamic, this field is set to 0.
-   dynamic_container_id: lu32
+   slot_type: FullContainerName
    # Slot is the index of the slot within the container with the ContainerID above. 
    slot: u8
    # StackNetworkID is the unique stack ID that the client assumes to be present in this slot. The server
@@ -1135,7 +1133,7 @@ ItemStackResponses: []varint
             # inventory, this value seems to be 0x1b. For the cursor, this value seems to be 0x3a. For the crafting
             # grid, this value seems to be 0x0d.
             # * actually, this is ContainerSlotType - used by the inventory system that specifies the type of slot
-            slot_type: ContainerSlotType
+            slot_type: FullContainerName
             # SlotInfo holds information on what item stack should be present in specific slots in the container.
             slots: []varint
                # Slot and HotbarSlot seem to be the same value every time: The slot that was actually changed. I'm not
@@ -2404,5 +2402,5 @@ DisconnectFailReason: zigzag32 =>
    - game_setup_failed
 
 FullContainerName:
-   container_name: u8
+   container_id: ContainerSlotType
    dynamic_container_id?: u32
diff --git a/data/dataPaths.json b/data/dataPaths.json
@@ -2170,14 +2170,14 @@
       "materials": "pc/1.17",
       "enchantments": "bedrock/1.19.1",
       "effects": "pc/1.17",
-      "protocol": "bedrock/1.21.30",
+      "protocol": "bedrock/1.21.20",
       "windows": "bedrock/1.16.201",
       "steve": "bedrock/1.20.80",
       "blocksB2J": "bedrock/1.21.0",
       "blocksJ2B": "bedrock/1.21.0",
-      "proto": "bedrock/latest",
-      "types": "bedrock/latest",
-      "version": "bedrock/1.21.30",
+      "proto": "bedrock/1.21.20",
+      "types": "bedrock/1.21.20",
+      "version": "bedrock/1.21.20",
       "language": "bedrock/1.20.10"
     },
     "1.21.30": {