minecraft-data 3.95.1 → 3.96.0

package/data.js

@@ -1584,7 +1584,7 @@ module.exports =
       get tints () { return require("./minecraft-data/data/pc/1.21.5/tints.json") },
       get version () { return require("./minecraft-data/data/pc/1.21.5/version.json") },
       get windows () { return require("./minecraft-data/data/pc/1.16.1/windows.json") },
-      proto: __dirname + '/minecraft-data/data/pc/latest/proto.yml'
+      proto: __dirname + '/minecraft-data/data/pc/1.21.5/proto.yml'
     },
     '1.21.6': {
       get attributes () { return require("./minecraft-data/data/pc/1.21.6/attributes.json") },
@@ -1605,7 +1605,7 @@ module.exports =
       get mapIcons () { return require("./minecraft-data/data/pc/1.20.2/mapIcons.json") },
       get materials () { return require("./minecraft-data/data/pc/1.21.6/materials.json") },
       get particles () { return require("./minecraft-data/data/pc/1.21.6/particles.json") },
-      get protocol () { return require("./minecraft-data/data/pc/1.21.5/protocol.json") },
+      get protocol () { return require("./minecraft-data/data/pc/1.21.6/protocol.json") },
       get recipes () { return require("./minecraft-data/data/pc/1.21.6/recipes.json") },
       get sounds () { return require("./minecraft-data/data/pc/1.21.6/sounds.json") },
       get tints () { return require("./minecraft-data/data/pc/1.21.6/tints.json") },

package/doc/history.md

@@ -1,5 +1,9 @@
 # History
 
+## 3.96.0
+
+* update `minecraft-data`
+
 ## 3.95.1
 
 * update `minecraft-data`

package/index.d.ts

@@ -48,13 +48,13 @@ declare namespace MinecraftData {
     /**
      * The type of precipitation: none, rain or snow [before 1.19.4]
      */
-    precipitation?: string;
+    precipitation?: "none" | "rain" | "snow";
     /**
      * True if a biome has any precipitation (rain or snow) [1.19.4+]
      */
     has_precipitation?: boolean;
     /**
-     * The dimension of a biome: overworld, nether or end
+     * The dimension of a biome: overworld, nether, end, or the_end (bedrock)
      */
     dimension: string;
     /**
@@ -69,7 +69,73 @@ declare namespace MinecraftData {
      * How much rain there is in a biome [before 1.19.4]
      */
     rainfall?: number;
-    [k: string]: unknown;
+    /**
+     * The depth/height variation of the biome terrain
+     */
+    depth?: number;
+    /**
+     * Climate data for the biome
+     *
+     * @minItems 1
+     */
+    climates?: [
+      {
+        /**
+         * Climate temperature value
+         */
+        temperature: number;
+        /**
+         * Climate humidity value
+         */
+        humidity: number;
+        /**
+         * Climate altitude value
+         */
+        altitude: number;
+        /**
+         * Climate weirdness value
+         */
+        weirdness: number;
+        /**
+         * Climate offset value
+         */
+        offset: number;
+      },
+      ...{
+        /**
+         * Climate temperature value
+         */
+        temperature: number;
+        /**
+         * Climate humidity value
+         */
+        humidity: number;
+        /**
+         * Climate altitude value
+         */
+        altitude: number;
+        /**
+         * Climate weirdness value
+         */
+        weirdness: number;
+        /**
+         * Climate offset value
+         */
+        offset: number;
+      }[]
+    ];
+    /**
+     * Legacy name of the biome used in older versions
+     */
+    name_legacy?: string;
+    /**
+     * Parent biome name for variant biomes
+     */
+    parent?: string;
+    /**
+     * Child biome ID for variant biomes
+     */
+    child?: number;
   }
   
   
@@ -414,7 +480,6 @@ declare namespace MinecraftData {
      * Can this enchantment be discovered
      */
     discoverable: boolean;
-    [k: string]: unknown;
   }
   
   
@@ -604,16 +669,42 @@ declare namespace MinecraftData {
      * the amount of durability an item has before being damaged/used
      */
     maxDurability?: number;
+    /**
+     * durability value for editions that specify it alongside maxDurability
+     */
+    durability?: number;
+    /**
+     * legacy data value used in some editions at the item level
+     */
+    metadata?: number;
     /**
      * The name of an item
      */
     name: string;
+    /**
+     * Block state id associated with this item in some editions
+     */
+    blockStateId?: number;
     variations?: {
       metadata: number;
       displayName: string;
-      [k: string]: unknown;
+      /**
+       * The unique identifier for a variation (when applicable)
+       */
+      id?: number;
+      /**
+       * The name of a variation (when applicable)
+       */
+      name?: string;
+      /**
+       * Stack size for a variation (when applicable)
+       */
+      stackSize?: number;
+      /**
+       * describes categories of enchants this variation can use
+       */
+      enchantCategories?: string[];
     }[];
-    [k: string]: unknown;
   }
   
   
@@ -1383,6 +1474,9 @@ declare namespace MinecraftData {
     /** `1.21.5 - latest`
      * chatGlobalIndexAndChecksum */
     "chatGlobalIndexAndChecksum": boolean;
+    /** `1.21.6 - latest`
+     * entity_action packet uses string mappings instead of numeric actionId */
+    "entityActionUsesStringMapper": boolean;
   }
 
   type Object = { [key: string]: any }

package/minecraft-data/.github/helper-bot/index.js

@@ -1,10 +1,11 @@
 const fs = require('fs')
 const cp = require('child_process')
-const helper = require('gh-helpers')()
+const github = require('gh-helpers')()
+const exec = (cmd) => github.mock ? console.log('> ', cmd) : (console.log('> ', cmd), cp.execSync(cmd, { stdio: 'inherit' }))
 const pcManifestURL = 'https://launchermeta.mojang.com/mc/game/version_manifest.json'
 const changelogURL = 'https://feedback.minecraft.net/hc/en-us/sections/360001186971-Release-Changelogs'
 
-const download = (url, dest) => cp.execSync(`curl -L ${url} -o ${dest}`)
+const download = (url, dest) => exec(`curl -L ${url} -o ${dest}`)
 
 function buildFirstIssue (title, result, jarData) {
   const protocolVersion = jarData?.protocol_version || 'Failed to obtain from JAR'
@@ -33,6 +34,21 @@ A new Minecraft Java Edition version is available (as of ${date}), version **${r
   }
 }
 
+async function createInitialPull (edition, issueUrl, { version, protocolVersion }) {
+  exec('cd tools/js && npm install')
+  exec(`cd tools/js && npm run version ${edition} ${version} ${protocolVersion}`)
+  const branchNameVersion = version.replace(/[^a-zA-Z0-9]/g, '.').toLowerCase()
+  const branchName = `${edition}-${branchNameVersion}`
+  const title = `Initial data for ${edition} ${version}`
+  exec(`git checkout -b ${branchName}`)
+  exec(`git add --all`)
+  exec(`git commit -m "${title}"`)
+  exec(`git push origin ${branchName}`)
+  //     createPullRequest(title: string, body: string, fromBranch: string, intoBranch?: string): Promise<{ number: number, url: string }>;
+  const pr = await github.createPullRequest(title, `${title}.\n\nRef: ${issueUrl}`, branchName, 'master')
+  return pr
+}
+
 const protocolVersions = {
   pc: require('../../data/pc/common/protocolVersions.json'),
   bedrock: require('../../data/bedrock/common/protocolVersions.json')
@@ -51,7 +67,7 @@ async function updateManifestPC () {
   const latestVersionIsSnapshot = latestVersionData.type !== 'release'
 
   const title = `Support Minecraft PC ${latestVersion}`
-  const issueStatus = await helper.findIssue({ titleIncludes: title }) || {}
+  const issueStatus = await github.findIssue({ titleIncludes: title }) || {}
 
   if (latestVersionIsSnapshot) {
     // don't make issues for snapshots
@@ -62,7 +78,7 @@ async function updateManifestPC () {
   } else {
     if (supportedVersions.pc.includes(latestVersion)) {
       if (issueStatus.isOpen) {
-        helper.close(issueStatus.id, `Closing as PC ${latestVersion} is now supported`)
+        github.close(issueStatus.id, `Closing as PC ${latestVersion} is now supported`)
       }
       console.log('Latest PC version is supported.')
       return
@@ -85,7 +101,7 @@ async function updateManifestPC () {
     } else {
       console.log('Latest PC version is not supported and we failed to load data. Opening issue...')
       const issuePayload = buildFirstIssue(title, latestVersionData)
-      helper.createIssue(issuePayload)
+      github.createIssue(issuePayload)
 
       fs.writeFileSync('./issue.md', issuePayload.body)
       console.log('OK, wrote to ./issue.md', issuePayload)
@@ -96,10 +112,30 @@ async function updateManifestPC () {
     console.log('Opening issue', versionJson)
     const issuePayload = buildFirstIssue(title, latestVersionData, versionJson)
 
-    helper.createIssue(issuePayload)
+    const issue = await github.createIssue(issuePayload)
 
     fs.writeFileSync('./issue.md', issuePayload.body)
-    console.log('OK, wrote to ./issue.md', issuePayload)
+    console.log('Created issue', issue)
+
+    // Now create an initial PR with the new version data
+    const pr = await createInitialPull('pc', issue.url, {
+      minecraftVersion: versionJson.id,
+      version: latestVersion,
+      protocolVersion: versionJson.protocol_version
+    })
+    console.log('Created PR', pr)
+    // Ask minecraft-data-generator to handle new update
+    const dispatchPayload = {
+      owner: 'PrismarineJS',
+      repo: 'minecraft-data-generator',
+      workflow: 'handle-mcdata-update.yml',
+      branch: 'main',
+      inputs: {
+        version: latestVersion
+      }
+    }
+    console.log('Sending workflow dispatch', dispatchPayload)
+    await github.sendWorkflowDispatch(dispatchPayload)
   }
 
   async function addEntryFor (releaseVersion, releaseData) {

package/minecraft-data/README.md

@@ -10,7 +10,9 @@ 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), 1.20 (1.20, 1.20.1, 1.20.2, 1.20.3, 1.20.4, 1.20.5, 1.20.6), 1.21 (1.21, 1.21.1, 1.21.3)
+<!--NEXT PC-->
 * 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, 1.20.30, 1.20.40, 1.20.50, 1.20.61, 1.20.71, 1.20.80, 1.21.0, 1.21.2, 1.21.20, 1.21.30, 1.21.42, 1.21.50, 1.21.60, 1.21.70, 1.21.80, 1.21.90, 1.21.93, 1.21.100
+<!--NEXT BEDROCK-->
 
 ## Wrappers