Merge branch 'master' into effect-fix

PrismarineJS · Jul 26, 2023 · 5afdff2 · 5afdff2
2 parents dfe3bef + fa4c64e
commit 5afdff2
Show file tree

Hide file tree

Showing 119 changed files with 265,703 additions and 2,645 deletions.
diff --git a/.github/workflows/commands.yml b/.github/workflows/commands.yml
@@ -0,0 +1,22 @@
+name: Repo Commands
+
+on:
+  issue_comment:        # Handle comment commands
+    types: [created]
+  pull_request:         # Handle renamed PRs
+    types: [edited]
+
+jobs:
+  comment-trigger:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check out repository
+      uses: actions/checkout@v3
+    - name: Run command handlers
+      uses: PrismarineJS/prismarine-repo-actions@master
+      with:
+        # NOTE: You must specify a Personal Access Token (PAT) with repo access here. While you can use the default GITHUB_TOKEN, actions taken with it will not trigger other actions, so if you have a CI workflow, commits created by this action will not trigger it.
+        token: ${{ secrets.PAT_PASSWORD }}
+        # See `Options` section below for more info on these options
+        install-command: cd tools/js && npm install
+        /fixlint.fix-command: cd tools/js && npm run fix
diff --git a/README.md b/README.md
@@ -9,8 +9,8 @@ Language independent module providing minecraft data for minecraft clients, serv
 
 Supports
 * Minecraft PC version 0.30c (classic), 1.7.10, 1.8.8, 1.9 (15w40b, 1.9, 1.9.1-pre2, 1.9.2, 1.9.4),
-1.10 (16w20a, 1.10-pre1, 1.10, 1.10.1, 1.10.2), 1.11 (16w35a, 1.11, 1.11.2), 1.12 (17w15a, 17w18b, 1.12-pre4, 1.12, 1.12.1, 1.12.2), 1.13 (17w50a, 1.13, 1.13.1, 1.13.2-pre1, 1.13.2-pre2, 1.13.2), 1.14 (1.14, 1.14.1, 1.14.3, 1.14.4), 1.15 (1.15, 1.15.1, 1.15.2), 1.16 (20w13b, 20w14a, 1.16-rc1, 1.16, 1.16.1, 1.16.2, 1.16.3, 1.16.4, 1.16.5), 1.17, 1.17.1, 1.18 (1.18, 1.18.1, 1.18.2), 1.19 (1.19, 1.19.2, 1.19.3, 1.19.4)
-* Minecraft bedrock version 0.14, 0.15, 1.0, 1.16.201, 1.16.210, 1.16.220, 1.17.0, 1.17.10, 1.17.30, 1.17.40, 1.18.0, 1.18.11, 1.18.30, 1.19.1, 1.19.10, 1.19.20, 1.19.21, 1.19.30, 1.19.40, 1.19.50, 1.19.60, 1.19.62, 1.19.63, 1.19.70, 1.19.80, 1.20.0
+1.10 (16w20a, 1.10-pre1, 1.10, 1.10.1, 1.10.2), 1.11 (16w35a, 1.11, 1.11.2), 1.12 (17w15a, 17w18b, 1.12-pre4, 1.12, 1.12.1, 1.12.2), 1.13 (17w50a, 1.13, 1.13.1, 1.13.2-pre1, 1.13.2-pre2, 1.13.2), 1.14 (1.14, 1.14.1, 1.14.3, 1.14.4), 1.15 (1.15, 1.15.1, 1.15.2), 1.16 (20w13b, 20w14a, 1.16-rc1, 1.16, 1.16.1, 1.16.2, 1.16.3, 1.16.4, 1.16.5), 1.17, 1.17.1, 1.18 (1.18, 1.18.1, 1.18.2), 1.19 (1.19, 1.19.2, 1.19.3, 1.19.4), 1.20 (1.20, 1.20.1)
+* Minecraft bedrock version 0.14, 0.15, 1.0, 1.16.201, 1.16.210, 1.16.220, 1.17.0, 1.17.10, 1.17.30, 1.17.40, 1.18.0, 1.18.11, 1.18.30, 1.19.1, 1.19.10, 1.19.20, 1.19.21, 1.19.30, 1.19.40, 1.19.50, 1.19.60, 1.19.62, 1.19.63, 1.19.70, 1.19.80, 1.20.0, 1.20.10
 
 
 ## Wrappers

diff --git a/data/bedrock/1.16.201/attributes.json b/data/bedrock/1.16.201/attributes.json
@@ -0,0 +1,107 @@
+[
+  {
+    "name": "followRange",
+    "resource": "generic.follow_range",
+    "default": 32,
+    "min": 0,
+    "max": 2048
+  },
+  {
+    "name": "knockbackResistance",
+    "resource": "generic.knockback_resistance",
+    "default": 0,
+    "min": 0,
+    "max": 1
+  },
+  {
+    "name": "movementSpeed",
+    "resource": "generic.movement_speed",
+    "default": 0.7,
+    "min": 0,
+    "max": 1024
+  },
+  {
+    "name": "attackDamage",
+    "resource": "generic.attack_damage",
+    "default": 2,
+    "min": 0,
+    "max": 2048
+  },
+  {
+    "name": "horseJumpStrength",
+    "resource": "horse.jump_strength",
+    "default": 0.7,
+    "min": 0,
+    "max": 2
+  },
+  {
+    "name": "zombieSpawnReinforcements",
+    "resource": "zombie.spawn_reinforcements",
+    "default": 0,
+    "min": 0,
+    "max": 1
+  },
+  {
+    "name": "flyingSpeed",
+    "resource": "generic.flying_speed",
+    "default": 0.4,
+    "min": 0,
+    "max": 1024
+  },
+  {
+    "name": "luck",
+    "resource": "generic.luck",
+    "default": 0,
+    "min": -1024,
+    "max": 1024
+  },
+  {
+    "name": "health",
+    "resource": "health",
+    "default": 20,
+    "min": 0,
+    "max": 20
+  },
+  {
+    "name": "absorption",
+    "resource": "absorption",
+    "default": 0,
+    "min": 0,
+    "max": 1024
+  },
+  {
+    "name": "exhaustion",
+    "resource": "player.exhaustion",
+    "default": 0,
+    "min": 0,
+    "max": 5
+  },
+  {
+    "name": "experienceProgress",
+    "resource": "player.experience",
+    "default": 0,
+    "min": 0,
+    "max": 1
+  },
+  {
+    "name": "experienceLevel",
+    "resource": "player.level",
+    "default": 0,
+    "min": 0,
+    "max": 24791
+  },
+  {
+    "name": "hunger",
+    "resource": "player.hunger",
+    "default": 20,
+    "min": 0,
+    "max": 20
+  },
+  {
+    "name": "saturation",
+    "resource": "player.saturation",
+    "default": 20,
+    "min": 0,
+    "max": 20
+  }
+]
diff --git a/data/bedrock/1.16.201/proto.yml b/data/bedrock/1.16.201/proto.yml
@@ -699,15 +699,18 @@ packet_entity_event:
       71: balloon_pop 
       72: treasure_hunt 
       73: agent_summon 
-      74: charged_crossbow 
+      74: charged_item 
       75: fall 
    data: zigzag32
 
 packet_mob_effect:
    !id: 0x1c
    !bound: client
    runtime_entity_id: varint
-   event_id: u8
+   event_id: u8 =>
+      1: add
+      2: update
+      3: remove
    effect_id: zigzag32
    amplifier: zigzag32
    particles: bool
@@ -753,6 +756,7 @@ packet_interact:
    action_id: u8 =>
       3: leave_vehicle
       4: mouse_over_entity
+      5: npc_open
       6: open_inventory
    # TargetEntityRuntimeID is the runtime ID of the entity that the player interacted with. This is empty
    # for the InteractActionOpenInventory action type.
@@ -1162,7 +1166,11 @@ packet_player_list:
 packet_simple_event:
    !id: 0x40
    !bound: client
-   event_type: lu16
+   event_type: lu16 =>
+      0: uninitialized_subtype
+      1: enable_commands
+      2: disable_commands
+      3: unlock_world_template_settings
 
 # Event is sent by the server to send an event with additional data. It is typically sent to the client for
 # telemetry reasons, much like the SimpleEvent packet.
@@ -1324,7 +1332,7 @@ packet_available_commands:
       # The list of overload parameters for this command
       overloads: []varint
          # Each of the parameters gets an array of posible overloads
-         _: []varint
+         parameters: []varint
             # The name of the parameter shown to the user (the `amount` in `/xp <amount: int>`)
             parameter_name: string
             value_type: lu16 =>
@@ -1344,9 +1352,9 @@ packet_available_commands:
             # In MC, this + prior field are combined to one 32bit bitfield
             enum_type: lu16 =>
                0x10: valid
-               0x20: enum
+               0x30: enum
                0x100: suffixed
-               0x400: soft_enum
+               0x410: soft_enum
             # Is this parameter required?
             optional: bool
             # Additinal options for this command (thanks macroshaft...)
@@ -1601,9 +1609,14 @@ packet_show_store_offer:
    unknown0: string
    unknown1: bool
 
+# PurchaseReceipt is sent by the client to the server to notify the server it purchased an item from the
+# Marketplace store that was offered by the server. The packet is only used for partnered servers.
 packet_purchase_receipt:
    !id: 0x5c
    !bound: server
+   # Receipts is a list of receipts, or proofs of purchases, for the offers that have been purchased by the
+   # player.
+   receipts: string[]varint
 
 packet_player_skin:
    !id: 0x5d
@@ -1614,9 +1627,18 @@ packet_player_skin:
    old_skin_name: string
    is_verified: bool
 
+# SubClientLogin is sent when a sub-client joins the server while another client is already connected to it.
+# The packet is sent as a result of split-screen game play, and allows up to four players to play using the
+# same network connection. After an initial Login packet from the 'main' client, each sub-client that
+# connects sends a SubClientLogin to request their own login.
 packet_sub_client_login:
    !id: 0x5e
-   !bound: client
+   !bound: server
+   # ConnectionRequest is a string containing information about the player and JWTs that may be used to
+   # verify if the player is connected to XBOX Live. The connection request also contains the necessary
+   # client public key to initiate encryption.
+   # The ConnectionRequest in this packet is identical to the one found in the Login packet.
+   tokens: '["encapsulated", { "lengthType": "varint", "type": "LoginTokens" }]'
 
 packet_initiate_web_socket_connection:
    !id: 0x5f
@@ -1628,9 +1650,11 @@ packet_set_last_hurt_by:
    !bound: client
    unknown: varint
 
+# BookEdit is sent by the client when it edits a book. It is sent each time a modification was made and the
+# player stops its typing 'session', rather than simply after closing the book.
 packet_book_edit:
    !id: 0x61
-   !bound: client
+   !bound: server
    type: u8 =>
       0: replace_page
       1: add_page
@@ -1701,7 +1725,7 @@ packet_show_profile:
 # in the settings UI.
 packet_set_default_game_type:
    !id: 0x69
-   !bound: client
+   !bound: server
    # GameType is the new game type that is set. When sent by the client, this is the requested new default
    # game type.
    gamemode: GameMode
@@ -1736,6 +1760,7 @@ packet_lab_table:
    action_type: u8 =>
       0: combine
       1: react
+      2: reset
    # Position is the position at which the lab table used was located.
    position: vec3i
    # ReactionType is the type of the reaction that took place as a result of the items put into the lab
@@ -1889,7 +1914,7 @@ packet_level_event_generic:
 # or if the book should be removed from it.
 packet_lectern_update:
    !id: 0x7d
-   !bound: client
+   !bound: server
    # Page is the page number in the book that was opened by the player on the lectern.
    page: u8
    # PageCount is the number of pages that the book opened in the lectern has.
@@ -1905,7 +1930,9 @@ packet_video_stream_connect:
    !bound: client
    server_uri: string
    frame_send_frequency: lf32
-   action: u8
+   action: u8 =>
+      1: none
+      2: close
    resolution_x: li32
    resolution_y: li32
 
@@ -1945,7 +1972,7 @@ packet_map_create_locked_copy:
 
 packet_structure_template_data_export_request:
    !id: 0x84
-   !bound: client
+   !bound: server
 
 packet_structure_template_data_export_response:
    !id: 0x85
@@ -1960,7 +1987,7 @@ packet_update_block_properties:
 # what blobs it needs and which blobs it already has, in an ACK type system.
 packet_client_cache_blob_status:
    !id: 0x87
-   !bound: client
+   !bound: server
    # The number of MISSes in this packet
    misses: varint
    # The number of HITs in this packet
@@ -2224,7 +2251,7 @@ ArmorDamageType: [ "bitflags",
 # identical to the SetPlayerGameType packet.
 packet_update_player_game_type:
    !id: 0x97
-   !bound: server
+   !bound: client
    # GameType is the new game type of the player. It is one of the constants that can be found in
    # set_player_game_type.go. Some of these game types require additional flags to be set in an
    # AdventureSettings packet for the game mode to obtain its full functionality.
@@ -2399,7 +2426,7 @@ packet_item_component:
 # safer version of the text.
 packet_filter_text_packet:
    !id: 0xa3
-   !bound: client
+   !bound: both
    # Text is either the text from the client or the safer version of the text sent by the server.
    text: string
    # FromServer indicates if the packet was sent by the server or not.