prismarine-windows 2.3.0 → 2.4.3

package/HISTORY.md

@@ -1,3 +1,18 @@
+## 2.4.3
+* fixed typescript typings
+
+## 2.4.2
+* Fixed Exporting correctly and better window typings (#49)
+
+### 2.4.1
+* revert avoid emitting references
+
+### 2.4.0
+
+* fix bug with emitting null items (@imharvol)
+* add typings to containerType
+* fix slot count for generic 3x3 containers
+
 ### 2.3.0
 
 * Click API endpoints returns changedSlots array (@nickelpro)

package/index.d.ts

@@ -4,7 +4,7 @@
 import {EventEmitter} from 'events';
 import {Item} from 'prismarine-item';
 
-declare class Window extends EventEmitter {
+export class Window extends EventEmitter {
     constructor (id: number, type: number | string, title: string, slotCount: number, inventorySlotsRange: { start: number, end: number }, craftingResultSlot: number, requiresConfirmation: boolean);
 
     /**
@@ -106,7 +106,7 @@ declare class Window extends EventEmitter {
      * @param metadata metadata value that you are looking for. null means unspecified
      * @param notFull (optional) - if true, means that the returned item should not be at its stackSize
      */
-    findContainerItem(itemType: number, metadata: number | null, notFull: boolean)
+    findContainerItem(itemType: number, metadata: number | null, notFull: boolean): Item | null
 
     /**
      * Return the id of the first empty slot between start and end
@@ -189,12 +189,12 @@ declare class Window extends EventEmitter {
      */
     clear(blockId?: number, count?: number): void;
 }
-declare interface Click {
+export interface Click {
     mode: number;
     mouseButton: number;
     slot: number;
 }
-declare interface WindowInfo {
+export interface WindowInfo {
     type: number | string;
     inventory: { start: number, end: number };
     slots: number;
@@ -202,9 +202,39 @@ declare interface WindowInfo {
     requireConfirmation: boolean;
 }
 
-declare interface WindowsExports {
+export interface WindowsExports {
     createWindow(id: number, type: number | string, title: string, slotCount?: number): Window;
     Window: typeof Window;
-    windows: {[key: string]: WindowInfo};
+    windows: {[key in WindowName]: WindowInfo};
 }
+
 export declare function loader(mcVersion: string): WindowsExports;
+
+export default loader;
+
+export type WindowName = 
+    'minecraft:inventory' |
+    'minecraft:generic_9x1' |
+    'minecraft:generic_9x2' |
+    'minecraft:generic_9x3' |
+    'minecraft:generic_9x4' |
+    'minecraft:generic_9x5' |
+    'minecraft:generic_9x6' |
+    'minecraft:generic_3x3' |
+    'minecraft:anvil' |
+    'minecraft:beacon' |
+    'minecraft:blast_furnace' |
+    'minecraft:brewing_stand' |
+    'minecraft:crafting' |
+    'minecraft:enchantment' |
+    'minecraft:furnace' |
+    'minecraft:grindstone' |
+    'minecraft:hopper' |
+    'minecraft:lectern' |
+    'minecraft:loom' |
+    'minecraft:merchant' |
+    'minecraft:shulker_box' |
+    'minecraft:smithing' |
+    'minecraft:smoker' |
+    'minecraft:cartography' |
+    'minecraft:stonecutter'

package/index.js

@@ -15,7 +15,7 @@ function loader (mcVersion) {
     windows['minecraft:generic_9x4'] = { type: protocolId++, inventory: { start: 4 * 9, end: 4 * 9 + 35 }, slots: 4 * 9 + 36, craft: -1, requireConfirmation: true }
     windows['minecraft:generic_9x5'] = { type: protocolId++, inventory: { start: 5 * 9, end: 5 * 9 + 35 }, slots: 5 * 9 + 36, craft: -1, requireConfirmation: true }
     windows['minecraft:generic_9x6'] = { type: protocolId++, inventory: { start: 6 * 9, end: 6 * 9 + 35 }, slots: 6 * 9 + 36, craft: -1, requireConfirmation: true }
-    windows['minecraft:generic_3x3'] = { type: protocolId++, inventory: { start: 7 * 9, end: 7 * 9 + 35 }, slots: 7 * 9 + 36, craft: -1, requireConfirmation: true }
+    windows['minecraft:generic_3x3'] = { type: protocolId++, inventory: { start: 3 * 3, end: 3 * 3 + 35 }, slots: 3 * 3 + 36, craft: -1, requireConfirmation: true }
     windows['minecraft:anvil'] = { type: protocolId++, inventory: { start: 3, end: 38 }, slots: 39, craft: 2, requireConfirmation: true }
     windows['minecraft:beacon'] = { type: protocolId++, inventory: { start: 1, end: 36 }, slots: 37, craft: -1, requireConfirmation: true }
     windows['minecraft:blast_furnace'] = { type: protocolId++, inventory: { start: 3, end: 38 }, slots: 39, craft: 2, requireConfirmation: true }

package/lib/Window.js

@@ -147,8 +147,9 @@ module.exports = (Item) => {
       if (newItem) newItem.slot = slot
       const oldItem = this.slots[slot]
       this.slots[slot] = newItem
-      this.emit('updateSlot', slot, { ...oldItem }, { ...newItem })
-      this.emit(`updateSlot:${slot}`, { ...oldItem }, { ...newItem })
+
+      this.emit('updateSlot', slot, oldItem, newItem)
+      this.emit(`updateSlot:${slot}`, oldItem, newItem)
     }
 
     findItemRange (start, end, itemType, metadata, notFull, nbt) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prismarine-windows",
-  "version": "2.3.0",
+  "version": "2.4.3",
   "description": "Represent minecraft windows",
   "main": "index.js",
   "scripts": {