prismarine-windows 2.4.4 → 2.6.0

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

@@ -13,13 +13,20 @@ jobs:
     - name: Set up Node.js
       uses: actions/setup-node@master
       with:
-        node-version: 10.0.0
-    - name: Publish if version has been updated
-      uses: pascalgn/npm-publish-action@4f4bf159e299f65d21cd1cbd96fc5d53228036df
-      with: # All of theses inputs are optional
-        tag_name: "%s"
-        tag_message: "%s"
-        commit_pattern: "^Release (\\S+)"
-      env: # More info about the environment variables in the README
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Leave this as is, it's automatically generated
-        NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }} # You need to set this in your repo settings
+        node-version: 14.0.0
+    - id: publish
+      uses: JS-DevTools/npm-publish@v1
+      with:
+        token: ${{ secrets.NPM_AUTH_TOKEN }}
+    - name: Create Release
+      if: steps.publish.outputs.type != 'none'
+      id: create_release
+      uses: actions/create-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ steps.publish.outputs.version }}
+        release_name: Release ${{ steps.publish.outputs.version }}
+        body: ${{ steps.publish.outputs.version }}
+        draft: false
+        prerelease: false

package/HISTORY.md

@@ -1,3 +1,11 @@
+## 2.6.0
+
+* mcData to registry refactoring + anticipation of feature check refactoring
+
+## 2.5.0
+
+* Extend the events used for  windows
+
 ## 2.4.4
 * update mcdata
 

package/index.d.ts

@@ -2,9 +2,10 @@
 /// <reference types="prismarine-item" />
 
 import {EventEmitter} from 'events';
+import TypedEmitter from 'typed-emitter'
 import {Item} from 'prismarine-item';
 
-export class Window extends EventEmitter {
+export class Window<T = unknown> extends (EventEmitter as new <T>() => TypedEmitter<T>)<T> {
     constructor (id: number, type: number | string, title: string, slotCount: number, inventorySlotsRange: { start: number, end: number }, craftingResultSlot: number, requiresConfirmation: boolean);
 
     /**

package/index.js

@@ -1,10 +1,11 @@
-function loader (mcVersion) {
-  const Item = require('prismarine-item')(mcVersion)
+function loader (registryOrVersion) {
+  const registry = typeof registryOrVersion === 'string' ? require('prismarine-registry')(registryOrVersion) : registryOrVersion
+  const Item = require('prismarine-item')(registry)
   const Window = require('./lib/Window')(Item)
-  const mcData = require('minecraft-data')(mcVersion)
 
   let windows
-  if (mcData.isNewerOrEqualTo('1.14')) {
+  // if (registry.supportFeature("village&pillageInventoryWindows")) {
+  if (registry.isNewerOrEqualTo('1.14')) { // this line should be discarded for the one above when the corresponding feature is added to minecraft-data
     // https://wiki.vg/Inventory
     windows = {}
     let protocolId = -1
@@ -29,7 +30,8 @@ function loader (mcVersion) {
     windows['minecraft:loom'] = { type: protocolId++, inventory: { start: 4, end: 39 }, slots: 40, craft: 3, requireConfirmation: true }
     windows['minecraft:merchant'] = { type: protocolId++, inventory: { start: 3, end: 38 }, slots: 39, craft: 2, requireConfirmation: true }
     windows['minecraft:shulker_box'] = { type: protocolId++, inventory: { start: 27, end: 62 }, slots: 63, craft: -1, requireConfirmation: true }
-    if (mcData.isNewerOrEqualTo('1.16')) {
+    // if (registry.supportFeature("netherUpdateInventoryWindows")) {
+    if (registry.isNewerOrEqualTo('1.16')) { // this line should be discarded for the one above when the corresponding feature is added to minecraft-data
       windows['minecraft:smithing'] = { type: protocolId++, inventory: { start: 3, end: 38 }, slots: 39, craft: 2, requireConfirmation: true }
     }
     windows['minecraft:smoker'] = { type: protocolId++, inventory: { start: 3, end: 38 }, slots: 39, craft: 2, requireConfirmation: true }
@@ -37,8 +39,10 @@ function loader (mcVersion) {
     windows['minecraft:stonecutter'] = { type: protocolId++, inventory: { start: 2, end: 37 }, slots: 38, craft: 1, requireConfirmation: true }
   } else {
     // https://wiki.vg/index.php?title=Inventory&oldid=14093
+    // const inventorySlots = registry.supportFeature("shieldSlot") ? 46 : 45
+    const inventorySlots = registry.isNewerOrEqualTo('1.9') ? 46 : 45// this line should be discarded for the one above when the corresponding feature is added to minecraft-data
     windows = {
-      'minecraft:inventory': { type: 'minecraft:inventory', inventory: { start: 9, end: 44 }, slots: mcData.isNewerOrEqualTo('1.9') ? 46 : 45, craft: 0, requireConfirmation: true },
+      'minecraft:inventory': { type: 'minecraft:inventory', inventory: { start: 9, end: 44 }, slots: inventorySlots ? 46 : 45, craft: 0, requireConfirmation: true },
       'minecraft:chest': null,
       'minecraft:crafting_table': { type: 'minecraft:crafting_table', inventory: { start: 10, end: 45 }, slots: 46, craft: 0, requireConfirmation: true },
       'minecraft:furnace': { type: 'minecraft:furnace', inventory: { start: 3, end: 38 }, slots: 39, craft: 2, requireConfirmation: true },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prismarine-windows",
-  "version": "2.4.4",
+  "version": "2.6.0",
   "description": "Represent minecraft windows",
   "main": "index.js",
   "scripts": {
@@ -13,12 +13,13 @@
     "url": "git+ssh://git@github.com/PrismarineJS/prismarine-windows.git"
   },
   "dependencies": {
-    "minecraft-data": "^3.0.0",
-    "prismarine-item": "^1.5.0"
+    "prismarine-registry": "^1.5.0",
+    "prismarine-item": "^1.5.0",
+    "typed-emitter": "^1.0.0"
   },
   "devDependencies": {
-    "@types/node": "^17.0.4",
-    "standard": "^16.0.3"
+    "@types/node": "^18.6.4",
+    "standard": "^17.0.0"
   },
   "keywords": [
     "minecraft",