minecraft-data 3.33.0 → 3.34.0

package/data.js

@@ -1177,6 +1177,30 @@ module.exports =
       get loginPacket () { return require("./minecraft-data/data/pc/1.19.2/loginPacket.json") },
       get tints () { return require("./minecraft-data/data/pc/1.19.3/tints.json") },
       get mapIcons () { return require("./minecraft-data/data/pc/1.16/mapIcons.json") }
+    },
+    '1.19.4': {
+      get attributes () { return require("./minecraft-data/data/pc/1.17/attributes.json") },
+      get blocks () { return require("./minecraft-data/data/pc/1.19.4/blocks.json") },
+      get blockCollisionShapes () { return require("./minecraft-data/data/pc/1.19.4/blockCollisionShapes.json") },
+      get biomes () { return require("./minecraft-data/data/pc/1.19.4/biomes.json") },
+      get effects () { return require("./minecraft-data/data/pc/1.19.4/effects.json") },
+      get items () { return require("./minecraft-data/data/pc/1.19.4/items.json") },
+      get enchantments () { return require("./minecraft-data/data/pc/1.19.4/enchantments.json") },
+      get recipes () { return require("./minecraft-data/data/pc/1.19.4/recipes.json") },
+      get instruments () { return require("./minecraft-data/data/pc/1.19.4/instruments.json") },
+      get materials () { return require("./minecraft-data/data/pc/1.19.4/materials.json") },
+      get language () { return require("./minecraft-data/data/pc/1.19.4/language.json") },
+      get entities () { return require("./minecraft-data/data/pc/1.19.4/entities.json") },
+      get protocol () { return require("./minecraft-data/data/pc/1.19.4/protocol.json") },
+      get windows () { return require("./minecraft-data/data/pc/1.16.1/windows.json") },
+      get version () { return require("./minecraft-data/data/pc/1.19.4/version.json") },
+      get foods () { return require("./minecraft-data/data/pc/1.19.4/foods.json") },
+      get particles () { return require("./minecraft-data/data/pc/1.19.4/particles.json") },
+      get blockLoot () { return require("./minecraft-data/data/pc/1.19/blockLoot.json") },
+      get entityLoot () { return require("./minecraft-data/data/pc/1.19/entityLoot.json") },
+      get loginPacket () { return require("./minecraft-data/data/pc/1.19.2/loginPacket.json") },
+      get tints () { return require("./minecraft-data/data/pc/1.19.4/tints.json") },
+      get mapIcons () { return require("./minecraft-data/data/pc/1.16/mapIcons.json") }
     }
   },
   'bedrock': {

package/doc/history.md

@@ -1,5 +1,9 @@
 # History
 
+## 3.34.0
+
+* update `minecraft-data`
+
 ## 3.33.0
 
 * update `minecraft-data`

package/index.d.ts

@@ -34,9 +34,13 @@ declare namespace MinecraftData {
      */
     temperature: number;
     /**
-     * The type of precipitation: none, rain or snow
+     * The type of precipitation: none, rain or snow [before 1.19.4]
      */
-    precipitation: string;
+    precipitation?: string;
+    /**
+     * 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
      */
@@ -50,9 +54,9 @@ declare namespace MinecraftData {
      */
     color: number;
     /**
-     * How much rain there is in a biome
+     * How much rain there is in a biome [before 1.19.4]
      */
-    rainfall: number;
+    rainfall?: number;
     [k: string]: unknown;
   }
   

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

@@ -0,0 +1,59 @@
+if (!process.env.CI) {
+  // mock a bunch of things for testing locally -- https://github.com/actions/toolkit/issues/71
+  process.env.GITHUB_REPOSITORY = 'PrismarineJS/minecraft-data'
+  process.env.GITHUB_EVENT_NAME = 'issue_comment'
+  process.env.GITHUB_SHA = 'cb2fd97b6eae9f2c7fee79d5a86eb9c3b4ac80d8'
+  process.env.GITHUB_REF = 'refs/heads/master'
+  process.env.GITHUB_WORKFLOW = 'Issue comments'
+  process.env.GITHUB_ACTION = 'run1'
+  process.env.GITHUB_ACTOR = 'test-user'
+  module.exports = { getIssueStatus: () => ({}), updateIssue: () => {}, createIssue: () => {} }
+  return
+}
+
+// const { Octokit } = require('@octokit/rest') // https://github.com/octokit/rest.js
+const github = require('@actions/github')
+
+const token = process.env.GITHUB_TOKEN
+const octokit = github.getOctokit(token)
+const context = github.context
+
+async function getIssueStatus (title) {
+  // https://docs.github.com/en/rest/reference/search#search-issues-and-pull-requests
+  const existingIssues = await octokit.rest.search.issuesAndPullRequests({
+    q: `is:issue repo:${process.env.GITHUB_REPOSITORY} in:title ${title}`
+  })
+  // console.log('Existing issues', existingIssues)
+  const existingIssue = existingIssues.data.items.find(issue => issue.title === title)
+
+  if (!existingIssue) return {}
+
+  return { open: existingIssue.state === 'open', closed: existingIssue.state === 'closed', id: existingIssue.number }
+}
+
+async function updateIssue (id, payload) {
+  const issue = await octokit.rest.issues.update({
+    ...context.repo,
+    issue_number: id,
+    body: payload.body
+  })
+  console.log(`Updated issue ${issue.data.title}#${issue.data.number}: ${issue.data.html_url}`)
+}
+
+async function createIssue (payload) {
+  const issue = await octokit.rest.issues.create({
+    ...context.repo,
+    ...payload
+  })
+  console.log(`Created issue ${issue.data.title}#${issue.data.number}: ${issue.data.html_url}`)
+}
+
+async function close (id, reason) {
+  if (reason) await octokit.rest.issues.createComment({ ...context.repo, issue_number: id, body: reason })
+  const issue = await octokit.rest.issues.update({ ...context.repo, issue_number: id, state: 'closed' })
+  console.log(`Closed issue ${issue.data.title}#${issue.data.number}: ${issue.data.html_url}`)
+}
+
+if (process.env.CI) {
+  module.exports = { getIssueStatus, updateIssue, createIssue, close }
+}

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

@@ -0,0 +1,158 @@
+const fs = require('fs')
+const cp = require('child_process')
+const https = require('https')
+const helper = require('./github-helper')
+const pcManifestURL = 'https://launchermeta.mojang.com/mc/game/version_manifest.json'
+const changelogURL = 'https://feedback.minecraft.net/hc/en-us/sections/360001186971-Release-Changelogs'
+
+// this is a polyfill for node <18
+const fetch = globalThis.fetch || function (url) {
+  return new Promise((resolve, reject) => {
+    https.get(url, (res) => {
+      let data = ''
+      res.on('data', (chunk) => {
+        data += chunk
+      })
+      res.on('end', () => {
+        resolve({
+          ok: true,
+          text: () => Promise.resolve(data),
+          json: () => Promise.resolve(JSON.parse(data))
+        })
+      })
+    }).on('error', reject)
+  })
+}
+const download = (url, dest) => cp.execSync(`curl -L ${url} -o ${dest}`)
+
+function buildFirstIssue (title, result, jarData) {
+  const protocolVersion = jarData?.protocol_version || 'Failed to obtain from JAR'
+  const name = jarData?.name || result.id
+  const date = result.releaseTime
+
+  return {
+    title,
+    body: `
+A new Minecraft Java Edition version is available (as of ${date}), version **${result.id}**
+## Official Changelog
+* ${changelogURL}
+## Protocol Details
+(I will close this issue automatically if "${result.id}" is added to data/pc/common/versions.json on "master")
+<table>
+  <tr><td><b>Name</b></td><td>${name}</td>
+  <tr><td><b>Protocol ID</b></td><td>${protocolVersion}</td>
+  <tr><td><b>Release Date</b></td><td>${date}</td>
+  <tr><td><b>Release Type</b></td><td>${result.type}</td>
+  <tr><td><b>Data Version</b></td><td>${jarData?.world_version}</td>
+  <tr><td><b>Java Version</b></td><td>${jarData?.java_version}</td>
+</table>
+<hr/>
+🤖 I am a bot, I check for updates every 2 hours without a trigger. You can close this issue to prevent any further updates.
+    `
+  }
+}
+
+const protocolVersions = {
+  pc: require('../../data/pc/common/protocolVersions.json'),
+  bedrock: require('../../data/bedrock/common/protocolVersions.json')
+}
+const supportedVersions = {
+  pc: require('../../data/pc/common/versions.json'),
+  bedrock: require('../../data/bedrock/common/versions.json')
+}
+
+async function updateManifestPC () {
+  const manifest = await fetch(pcManifestURL).then(res => res.json())
+  // fs.writeFileSync('./manifest.json', JSON.stringify(manifest, null, 2))
+  const knownVersions = protocolVersions.pc.reduce((acc, cur) => (acc[cur.minecraftVersion] = cur, acc), {})
+  const latestRelease = manifest.latest.release
+
+  const title = `Support Minecraft PC ${latestRelease}`
+  const issueStatus = await helper.getIssueStatus(title)
+
+  if (supportedVersions.pc.includes(latestRelease)) {
+    if (issueStatus.open) {
+      helper.close(issueStatus.id, `Closing as PC ${latestRelease} is now supported`)
+    }
+    console.log('Latest PC version is supported.')
+    return
+  } else if (knownVersions[latestRelease]) {
+    console.log(`Latest PC version ${latestRelease} is known in protocolVersions.json, but not in versions.json (protocol version ${knownVersions[latestRelease].version})`)
+    return
+  } else {
+    console.log(`Latest PC version ${latestRelease} is not known in protocolVersions.json, adding and making issue`)
+  }
+  const latestReleaseData = manifest.versions.find(v => v.id === latestRelease)
+
+  // Note: We don't use the below check to track if the version is supported properly or not
+  // (data like protocol/blocks/items/etc is present), just to make sure the known protocol version is correct.
+  try {
+    const latestReleaseManifest = await fetch(latestReleaseData.url).then(res => res.json())
+    // Download client jar
+    if (!fs.existsSync(`./${latestRelease}.jar`)) {
+      const clientJarUrl = latestReleaseManifest.downloads.client.url
+      console.log('Downloading client jar', clientJarUrl)
+      download(clientJarUrl, `./${latestRelease}.jar`)
+    }
+
+    // Log the byte size of the client jar
+    const clientJarSize = fs.statSync(`./${latestRelease}.jar`).size
+    console.log(`Downloaded client jar ${latestRelease}.jar (${clientJarSize} bytes), extracting its version.json...`)
+
+    // unzip with tar / unzip, Actions image uses 7z
+    if (process.platform === 'win32') cp.execSync(`tar -xf ./${latestRelease}.jar version.json`)
+    else cp.execSync(`7z -y e ./${latestRelease}.jar version.json`, { stdio: 'inherit' })
+    const versionJson = require('./version.json')
+
+    let majorVersion
+    try {
+      majorVersion = versionJson.id.split('.', 2).join('.')
+    } catch (e) {
+      console.error('Failed to get major version from version.json.id', versionJson.id, ', falling back to protocolVersions.json latest (may be incorrect)')
+      majorVersion = protocolVersions.pc[0].majorVersion
+    }
+
+    const newEntry = {
+      minecraftVersion: versionJson.id,
+      version: versionJson.protocol_version,
+      dataVersion: versionJson.world_version,
+      usesNetty: true,
+      majorVersion,
+      releaseType: latestReleaseData.type
+    }
+    console.log('Adding new entry to pc protocolVersions.json', newEntry)
+    const updatedProtocolVersions = [newEntry, ...protocolVersions.pc]
+    fs.writeFileSync('../../data/pc/common/protocolVersions.json', JSON.stringify(updatedProtocolVersions, null, 2))
+
+    if (process.env.CI) {
+      console.log('Committing changes to protocolVersions.json')
+      // https://github.com/actions/checkout/pull/1184
+      cp.execSync('git config user.name "github-actions[bot]"')
+      cp.execSync('git config user.email "41898282+github-actions[bot]@users.noreply.github.com"')
+      cp.execSync('git add ../../data/pc/common/protocolVersions.json')
+      cp.execSync(`git commit -m "Add ${versionJson.id} to pc protocolVersions.json"`)
+      cp.execSync('git push')
+    }
+
+    if (!issueStatus.open && !issueStatus.closed) {
+      console.log('Opening issue', versionJson)
+      const issuePayload = buildFirstIssue(title, latestReleaseData, versionJson)
+
+      helper.createIssue(issuePayload)
+
+      fs.writeFileSync('./issue.md', issuePayload.body)
+      console.log('OK, wrote to ./issue.md', issuePayload)
+    }
+  } catch (e) {
+    console.error(e)
+
+    console.log('Latest PC version is not supported and we failed to load data. Opening issue...')
+    const issuePayload = buildFirstIssue(title, latestReleaseData)
+    helper.createIssue(issuePayload)
+
+    fs.writeFileSync('./issue.md', issuePayload.body)
+    console.log('OK, wrote to ./issue.md', issuePayload)
+  }
+}
+
+updateManifestPC()

package/minecraft-data/.github/workflows/update-helper.yml

@@ -0,0 +1,25 @@
+name: Update Helper
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 */2 * * *"
+
+jobs:
+  helper:
+    name: update-checker
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@master
+    - name: Set up Node.js
+      uses: actions/setup-node@master
+      with:
+        node-version: 16.0.0
+    - name: Install Github Actions toolkit
+      run: npm i @actions/github
+      working-directory: .github/helper-bot
+    # The env vars contain the relevant trigger information, so we don't need to pass it
+    - name: Runs helper
+      run: cd .github/helper-bot && node index.js
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package/minecraft-data/README.md

@@ -9,9 +9,10 @@ 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.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
 
+
 ## Wrappers
 
 Minecraft-data is language independent, you can use it with these language specific modules :

package/minecraft-data/data/dataPaths.json

@@ -1176,6 +1176,30 @@
       "loginPacket": "pc/1.19.2",
       "tints": "pc/1.19.3",
       "mapIcons": "pc/1.16"
+    },
+    "1.19.4": {
+      "attributes": "pc/1.17",
+      "blocks": "pc/1.19.4",
+      "blockCollisionShapes": "pc/1.19.4",
+      "biomes": "pc/1.19.4",
+      "effects": "pc/1.19.4",
+      "items": "pc/1.19.4",
+      "enchantments": "pc/1.19.4",
+      "recipes": "pc/1.19.4",
+      "instruments": "pc/1.19.4",
+      "materials": "pc/1.19.4",
+      "language": "pc/1.19.4",
+      "entities": "pc/1.19.4",
+      "protocol": "pc/1.19.4",
+      "windows": "pc/1.16.1",
+      "version": "pc/1.19.4",
+      "foods": "pc/1.19.4",
+      "particles": "pc/1.19.4",
+      "blockLoot": "pc/1.19",
+      "entityLoot": "pc/1.19",
+      "loginPacket": "pc/1.19.2",
+      "tints": "pc/1.19.4",
+      "mapIcons": "pc/1.16"
     }
   },
   "bedrock": {

package/minecraft-data/data/pc/1.19.3/protocol.json

@@ -6277,7 +6277,7 @@
             }
           ]
         ],
-        "packet_session": [
+        "packet_chat_session_update": [
         	"container",
         	[
         		{
@@ -6350,7 +6350,7 @@
                     "0x1d": "entity_action",
                     "0x1e": "steer_vehicle",
                     "0x1f": "pong",
-                    "0x20": "session",
+                    "0x20": "chat_session_update",
                     "0x21": "recipe_book",
                     "0x22": "displayed_recipe",
                     "0x23": "name_item",
@@ -6412,7 +6412,7 @@
                     "entity_action": "packet_entity_action",
                     "steer_vehicle": "packet_steer_vehicle",
                     "pong": "packet_pong",
-                    "session": "packet_session",
+                    "chat_session_update": "packet_chat_session_update",
                     "recipe_book": "packet_recipe_book",
                     "displayed_recipe": "packet_displayed_recipe",
                     "name_item": "packet_name_item",