minecraft-data 3.30.0 → 3.31.0

package/.github/workflows/npm-publish.yml

@@ -2,7 +2,7 @@ name: npm-publish
 on:
   push:
     branches:
-      - master
+      - revert-261-dependabot/npm_and_yarn/json-schema-to-typescript-12.0.0
   workflow_dispatch:
 jobs:
   npm-publish:

package/data.js

@@ -1562,8 +1562,8 @@ module.exports =
       get steve () { return require("./minecraft-data/data/bedrock/1.16.201/steve.json") },
       get blocksB2J () { return require("./minecraft-data/data/bedrock/1.19.1/blocksB2J.json") },
       get blocksJ2B () { return require("./minecraft-data/data/bedrock/1.19.1/blocksJ2B.json") },
-      proto: __dirname + '/minecraft-data/data/bedrock/latest/proto.yml',
-      types: __dirname + '/minecraft-data/data/bedrock/latest/types.yml',
+      proto: __dirname + '/minecraft-data/data/bedrock/1.19.62/proto.yml',
+      types: __dirname + '/minecraft-data/data/bedrock/1.19.62/types.yml',
       get version () { return require("./minecraft-data/data/bedrock/1.19.62/version.json") }
     },
     '1.19.63': {
@@ -1583,9 +1583,30 @@ module.exports =
       get steve () { return require("./minecraft-data/data/bedrock/1.16.201/steve.json") },
       get blocksB2J () { return require("./minecraft-data/data/bedrock/1.19.1/blocksB2J.json") },
       get blocksJ2B () { return require("./minecraft-data/data/bedrock/1.19.1/blocksJ2B.json") },
+      proto: __dirname + '/minecraft-data/data/bedrock/1.19.62/proto.yml',
+      types: __dirname + '/minecraft-data/data/bedrock/1.19.62/types.yml',
+      get version () { return require("./minecraft-data/data/bedrock/1.19.63/version.json") }
+    },
+    '1.19.70': {
+      get blocks () { return require("./minecraft-data/data/bedrock/1.19.1/blocks.json") },
+      get blockStates () { return require("./minecraft-data/data/bedrock/1.19.1/blockStates.json") },
+      get blockCollisionShapes () { return require("./minecraft-data/data/bedrock/1.19.1/blockCollisionShapes.json") },
+      get biomes () { return require("./minecraft-data/data/bedrock/1.19.1/biomes.json") },
+      get entities () { return require("./minecraft-data/data/bedrock/1.19.1/entities.json") },
+      get items () { return require("./minecraft-data/data/bedrock/1.19.10/items.json") },
+      get recipes () { return require("./minecraft-data/data/bedrock/1.19.10/recipes.json") },
+      get instruments () { return require("./minecraft-data/data/bedrock/1.17.0/instruments.json") },
+      get materials () { return require("./minecraft-data/data/pc/1.17/materials.json") },
+      get enchantments () { return require("./minecraft-data/data/bedrock/1.19.1/enchantments.json") },
+      get effects () { return require("./minecraft-data/data/pc/1.17/effects.json") },
+      get protocol () { return require("./minecraft-data/data/bedrock/1.19.70/protocol.json") },
+      get windows () { return require("./minecraft-data/data/bedrock/1.16.201/windows.json") },
+      get steve () { return require("./minecraft-data/data/bedrock/1.16.201/steve.json") },
+      get blocksB2J () { return require("./minecraft-data/data/bedrock/1.19.1/blocksB2J.json") },
+      get blocksJ2B () { return require("./minecraft-data/data/bedrock/1.19.1/blocksJ2B.json") },
       proto: __dirname + '/minecraft-data/data/bedrock/latest/proto.yml',
       types: __dirname + '/minecraft-data/data/bedrock/latest/types.yml',
-      get version () { return require("./minecraft-data/data/bedrock/1.19.63/version.json") }
+      get version () { return require("./minecraft-data/data/bedrock/1.19.70/version.json") }
     }
   }
 }

package/doc/api.md

@@ -54,6 +54,10 @@ Example:
 console.log(mcData.blocksByStateId[100]) // Object containing information for "Lava" (as Lava has a state range from 91 to 106)
 ```
 
+### mcData.blockMappings
+
+Contains a list of block mappings between pc/bedrock edition for the current Minecraft version
+
 ### mcData.blockStates
 
 **_Bedrock edition only_**

package/doc/history.md

@@ -1,5 +1,9 @@
 # History
 
+## 3.31.0
+
+* update `minecraft-data`
+
 ## 3.30.0
 
 * update `minecraft-data`

package/index.d.ts

@@ -992,11 +992,15 @@ declare namespace MinecraftData {
   export interface IndexedData {
     isOlderThan(version: string): boolean
     isNewerOrEqualTo(version: string): boolean
-    
+  
     blocks: { [id: number]: Block }
     blocksByName: { [name: string]: Block }
     blocksByStateId: { [id: number]: Block }
     blocksArray: Block[]
+    blockMappings: {
+      pc: { name: string, states: Record<string, string | number> },
+      pe: { name: string, states: Record<string, string | number> }
+    }[]
     /**
      * Bedrock edition only
      */

package/lib/loader.js

@@ -7,7 +7,7 @@ function mcDataToNode (mcData) {
     blocksByName: indexes.blocksByName,
     blocksArray: mcData.blocks,
     blocksByStateId: indexes.blocksByStateId,
-
+    blockMappings: mcData.blockMappings,
     blockStates: mcData.blockStates, // bedrock
 
     blockCollisionShapes: mcData.blockCollisionShapes,

package/minecraft-data/README.md

@@ -10,7 +10,7 @@ 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)
-* 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
+* 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
 
 ## Wrappers
 

package/minecraft-data/data/bedrock/1.16.220/proto.yml

@@ -9,6 +9,7 @@ ByteArray: ["buffer",{"countType":"varint"}]
 SignedByteArray: ["buffer",{"countType":"zigzag32"}]
 LittleString: ["pstring",{"countType":"li32"}]
 ShortArray: ["buffer",{"countType":"li16"}]
+ShortString: ["pstring",{"countType":"li16"}]
 varint64: native                                      # Some primitives
 zigzag32: native
 zigzag64: native

package/minecraft-data/data/bedrock/1.16.220/protocol.json

@@ -306,7 +306,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         },
@@ -316,7 +316,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         },
@@ -373,7 +373,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         },
@@ -383,7 +383,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         }
@@ -8595,6 +8595,12 @@
         "countType": "li16"
       }
     ],
+    "ShortString": [
+      "pstring",
+      {
+        "countType": "li16"
+      }
+    ],
     "MetadataFlags1": [
       "bitflags",
       {

package/minecraft-data/data/bedrock/1.16.220/types.yml

@@ -86,8 +86,8 @@ ItemExtraDataWithBlockingTick:
          version: u8
          nbt: lnbt
       default: void
-   can_place_on: ShortArray[]li32
-   can_destroy: ShortArray[]li32
+   can_place_on: ShortString[]li32
+   can_destroy: ShortString[]li32
    blocking_tick: li64
 
 ItemExtraDataWithoutBlockingTick:
@@ -99,8 +99,8 @@ ItemExtraDataWithoutBlockingTick:
          version: u8
          nbt: lnbt
       default: void
-   can_place_on: ShortArray[]li32
-   can_destroy: ShortArray[]li32
+   can_place_on: ShortString[]li32
+   can_destroy: ShortString[]li32
 
 # Same as below but without a "networkStackID" boolean
 ItemLegacy:

package/minecraft-data/data/bedrock/1.17.0/proto.yml

@@ -9,6 +9,7 @@ ByteArray: ["buffer",{"countType":"varint"}]
 SignedByteArray: ["buffer",{"countType":"zigzag32"}]
 LittleString: ["pstring",{"countType":"li32"}]
 ShortArray: ["buffer",{"countType":"li16"}]
+ShortString: ["pstring",{"countType":"li16"}]
 varint64: native                                      # Some primitives
 zigzag32: native
 zigzag64: native

package/minecraft-data/data/bedrock/1.17.0/protocol.json

@@ -310,7 +310,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         },
@@ -320,7 +320,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         },
@@ -377,7 +377,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         },
@@ -387,7 +387,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         }
@@ -8705,6 +8705,12 @@
         "countType": "li16"
       }
     ],
+    "ShortString": [
+      "pstring",
+      {
+        "countType": "li16"
+      }
+    ],
     "MetadataFlags1": [
       "bitflags",
       {

package/minecraft-data/data/bedrock/1.17.0/types.yml

@@ -87,8 +87,8 @@ ItemExtraDataWithBlockingTick:
          version: u8
          nbt: lnbt
       default: void
-   can_place_on: ShortArray[]li32
-   can_destroy: ShortArray[]li32
+   can_place_on: ShortString[]li32
+   can_destroy: ShortString[]li32
    blocking_tick: li64
 
 ItemExtraDataWithoutBlockingTick:
@@ -100,8 +100,8 @@ ItemExtraDataWithoutBlockingTick:
          version: u8
          nbt: lnbt
       default: void
-   can_place_on: ShortArray[]li32
-   can_destroy: ShortArray[]li32
+   can_place_on: ShortString[]li32
+   can_destroy: ShortString[]li32
 
 # Same as below but without a "networkStackID" boolean
 ItemLegacy:

package/minecraft-data/data/bedrock/1.17.10/proto.yml

@@ -9,6 +9,7 @@ ByteArray: ["buffer",{"countType":"varint"}]
 SignedByteArray: ["buffer",{"countType":"zigzag32"}]
 LittleString: ["pstring",{"countType":"li32"}]
 ShortArray: ["buffer",{"countType":"li16"}]
+ShortString: ["pstring",{"countType":"li16"}]
 varint64: native                                      # Some primitives
 zigzag32: native
 zigzag64: native

package/minecraft-data/data/bedrock/1.17.10/protocol.json

@@ -310,7 +310,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         },
@@ -320,7 +320,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         },
@@ -377,7 +377,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         },
@@ -387,7 +387,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         }
@@ -8879,6 +8879,12 @@
         "countType": "li16"
       }
     ],
+    "ShortString": [
+      "pstring",
+      {
+        "countType": "li16"
+      }
+    ],
     "MetadataFlags1": [
       "bitflags",
       {

package/minecraft-data/data/bedrock/1.17.10/types.yml

@@ -87,8 +87,8 @@ ItemExtraDataWithBlockingTick:
          version: u8
          nbt: lnbt
       default: void
-   can_place_on: ShortArray[]li32
-   can_destroy: ShortArray[]li32
+   can_place_on: ShortString[]li32
+   can_destroy: ShortString[]li32
    blocking_tick: li64
 
 ItemExtraDataWithoutBlockingTick:
@@ -100,8 +100,8 @@ ItemExtraDataWithoutBlockingTick:
          version: u8
          nbt: lnbt
       default: void
-   can_place_on: ShortArray[]li32
-   can_destroy: ShortArray[]li32
+   can_place_on: ShortString[]li32
+   can_destroy: ShortString[]li32
 
 # Same as below but without a "networkStackID" boolean
 ItemLegacy:

package/minecraft-data/data/bedrock/1.17.30/proto.yml

@@ -9,6 +9,7 @@ ByteArray: ["buffer",{"countType":"varint"}]
 SignedByteArray: ["buffer",{"countType":"zigzag32"}]
 LittleString: ["pstring",{"countType":"li32"}]
 ShortArray: ["buffer",{"countType":"li16"}]
+ShortString: ["pstring",{"countType":"li16"}]
 varint64: native                                      # Some primitives
 zigzag32: native
 zigzag64: native

package/minecraft-data/data/bedrock/1.17.30/protocol.json

@@ -310,7 +310,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         },
@@ -320,7 +320,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         },
@@ -377,7 +377,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         },
@@ -387,7 +387,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         }
@@ -9159,6 +9159,12 @@
         "countType": "li16"
       }
     ],
+    "ShortString": [
+      "pstring",
+      {
+        "countType": "li16"
+      }
+    ],
     "MetadataFlags1": [
       "bitflags",
       {

package/minecraft-data/data/bedrock/1.17.30/types.yml

@@ -87,8 +87,8 @@ ItemExtraDataWithBlockingTick:
          version: u8
          nbt: lnbt
       default: void
-   can_place_on: ShortArray[]li32
-   can_destroy: ShortArray[]li32
+   can_place_on: ShortString[]li32
+   can_destroy: ShortString[]li32
    blocking_tick: li64
 
 ItemExtraDataWithoutBlockingTick:
@@ -100,8 +100,8 @@ ItemExtraDataWithoutBlockingTick:
          version: u8
          nbt: lnbt
       default: void
-   can_place_on: ShortArray[]li32
-   can_destroy: ShortArray[]li32
+   can_place_on: ShortString[]li32
+   can_destroy: ShortString[]li32
 
 # Same as below but without a "networkStackID" boolean
 ItemLegacy:

package/minecraft-data/data/bedrock/1.17.40/proto.yml

@@ -9,6 +9,7 @@ ByteArray: ["buffer",{"countType":"varint"}]
 SignedByteArray: ["buffer",{"countType":"zigzag32"}]
 LittleString: ["pstring",{"countType":"li32"}]
 ShortArray: ["buffer",{"countType":"li16"}]
+ShortString: ["pstring",{"countType":"li16"}]
 varint64: native                                      # Some primitives
 zigzag32: native
 zigzag64: native

package/minecraft-data/data/bedrock/1.17.40/protocol.json

@@ -310,7 +310,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         },
@@ -320,7 +320,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         },
@@ -377,7 +377,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         },
@@ -387,7 +387,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         }
@@ -9256,6 +9256,12 @@
         "countType": "li16"
       }
     ],
+    "ShortString": [
+      "pstring",
+      {
+        "countType": "li16"
+      }
+    ],
     "MetadataFlags1": [
       "bitflags",
       {

package/minecraft-data/data/bedrock/1.17.40/types.yml

@@ -87,8 +87,8 @@ ItemExtraDataWithBlockingTick:
          version: u8
          nbt: lnbt
       default: void
-   can_place_on: ShortArray[]li32
-   can_destroy: ShortArray[]li32
+   can_place_on: ShortString[]li32
+   can_destroy: ShortString[]li32
    blocking_tick: li64
 
 ItemExtraDataWithoutBlockingTick:
@@ -100,8 +100,8 @@ ItemExtraDataWithoutBlockingTick:
          version: u8
          nbt: lnbt
       default: void
-   can_place_on: ShortArray[]li32
-   can_destroy: ShortArray[]li32
+   can_place_on: ShortString[]li32
+   can_destroy: ShortString[]li32
 
 # Same as below but without a "networkStackID" boolean
 ItemLegacy:

package/minecraft-data/data/bedrock/1.18.0/proto.yml

@@ -9,6 +9,7 @@ ByteArray: ["buffer",{"countType":"varint"}]
 SignedByteArray: ["buffer",{"countType":"zigzag32"}]
 LittleString: ["pstring",{"countType":"li32"}]
 ShortArray: ["buffer",{"countType":"li16"}]
+ShortString: ["pstring",{"countType":"li16"}]
 varint64: native                                      # Some primitives
 zigzag32: native
 zigzag64: native

package/minecraft-data/data/bedrock/1.18.0/protocol.json

@@ -310,7 +310,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         },
@@ -320,7 +320,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         },
@@ -377,7 +377,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         },
@@ -387,7 +387,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         }
@@ -9318,6 +9318,12 @@
         "countType": "li16"
       }
     ],
+    "ShortString": [
+      "pstring",
+      {
+        "countType": "li16"
+      }
+    ],
     "MetadataFlags1": [
       "bitflags",
       {

package/minecraft-data/data/bedrock/1.18.0/types.yml

@@ -87,8 +87,8 @@ ItemExtraDataWithBlockingTick:
          version: u8
          nbt: lnbt
       default: void
-   can_place_on: ShortArray[]li32
-   can_destroy: ShortArray[]li32
+   can_place_on: ShortString[]li32
+   can_destroy: ShortString[]li32
    blocking_tick: li64
 
 ItemExtraDataWithoutBlockingTick:
@@ -100,8 +100,8 @@ ItemExtraDataWithoutBlockingTick:
          version: u8
          nbt: lnbt
       default: void
-   can_place_on: ShortArray[]li32
-   can_destroy: ShortArray[]li32
+   can_place_on: ShortString[]li32
+   can_destroy: ShortString[]li32
 
 # Same as below but without a "networkStackID" boolean
 ItemLegacy:

package/minecraft-data/data/bedrock/1.18.11/proto.yml

@@ -9,6 +9,7 @@ ByteArray: ["buffer",{"countType":"varint"}]
 SignedByteArray: ["buffer",{"countType":"zigzag32"}]
 LittleString: ["pstring",{"countType":"li32"}]
 ShortArray: ["buffer",{"countType":"li16"}]
+ShortString: ["pstring",{"countType":"li16"}]
 varint64: native                                      # Some primitives
 zigzag32: native
 zigzag64: native

package/minecraft-data/data/bedrock/1.18.11/protocol.json

@@ -310,7 +310,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         },
@@ -320,7 +320,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         },
@@ -377,7 +377,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         },
@@ -387,7 +387,7 @@
             "array",
             {
               "countType": "li32",
-              "type": "ShortArray"
+              "type": "ShortString"
             }
           ]
         }
@@ -9574,6 +9574,12 @@
         "countType": "li16"
       }
     ],
+    "ShortString": [
+      "pstring",
+      {
+        "countType": "li16"
+      }
+    ],
     "MetadataFlags1": [
       "bitflags",
       {