prismarine-windows 2.7.0 → 2.9.0

package/HISTORY.md

@@ -1,3 +1,11 @@
+### 2.9.0
+* [Add Crafter into windows list for 1.20.3+ (#105)](https://github.com/PrismarineJS/prismarine-windows/commit/e081bc34c8282ef2a380e3f09d5f57f19703fab7) (thanks @wgaylord)
+
+### 2.8.0
+* [Export changedSlots computation to mineflayer (#102)](https://github.com/PrismarineJS/prismarine-windows/commit/98c3d66ae6aca733bb234d487686e2e534d1924d) (thanks @kaduvert)
+* [Ensure numberClick with same slots doesn't do anything (#103)](https://github.com/PrismarineJS/prismarine-windows/commit/50e6bfbdb9c3bc26f06ea45760527b2da53eb1f3) (thanks @kaduvert)
+* [Fix broken behaviour with craftingResultSlots (#101)](https://github.com/PrismarineJS/prismarine-windows/commit/51cc06e0f7dd39ddbb617962dfc1bb659fc172ce) (thanks @kaduvert)
+
 ### 2.7.0
 * [More click modes (with tests!) (#74)](https://github.com/PrismarineJS/prismarine-windows/commit/9f19fb357b2a96e09060fa5c2393b9041cc869fe) (thanks @kaduvert)
 * [Add command gh workflow allowing to use release command in comments (#98)](https://github.com/PrismarineJS/prismarine-windows/commit/6ddc90092d63f3838136d83e583d7c1d7ace3ae2) (thanks @rom1504)

package/index.js

@@ -16,6 +16,9 @@ function loader (registryOrVersion) {
     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: 3 * 3, end: 3 * 3 + 35 }, slots: 3 * 3 + 36, craft: -1, requireConfirmation: true }
+    if (registry.version['>=']('1.20.3')) {
+      windows['minecraft:crafter_3x3'] = { type: protocolId++, inventory: { start: 10, end: 45 }, slots: 46, 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

@@ -31,49 +31,35 @@ module.exports = (Item, registry) => {
          (this.type === 'minecraft:inventory' && slot === 45)),
         'invalid operation')
 
-      // can not use structuredClone because of
-      // potentially incompatible node versions
-      const oldSlots = JSON.parse(JSON.stringify(this.slots))
-
       switch (click.mode) {
         case 0:
           assert.ok(mouseButton <= 1, 'invalid operation')
-          this.mouseClick(click)
-          break
+          return this.mouseClick(click)
 
         case 1:
           assert.ok(mouseButton <= 1, 'invalid operation')
-          this.shiftClick(click)
-          break
+          return this.shiftClick(click)
 
         case 2:
           assert.ok(mouseButton <= 8, 'invalid operation')
-          this.numberClick(click)
-          break
+          return this.numberClick(click)
 
         case 3:
           assert.ok(mouseButton === 2, 'invalid operation')
-          this.middleClick(click, gamemode)
-          break
+          return this.middleClick(click, gamemode)
 
         case 4:
           assert.ok(mouseButton <= 1, 'invalid operation')
-          this.dropClick(click)
-          break
+          return this.dropClick(click)
 
         case 5:
           assert.ok([1, 5, 9, 2, 6, 10].includes(mouseButton), 'invalid operation')
-          this.dragClick(click, gamemode)
-          break
+          return this.dragClick(click, gamemode)
 
         case 6:
           assert.ok(mouseButton === 0, 'invalid operation')
-          this.doubleClick(click)
-          break
+          return this.doubleClick(click)
       }
-
-      // this is required to satisfy mc versions >= 1.17
-      return this.getChangedSlotsAsNotch(oldSlots, this.slots)
     }
 
     mouseClick (click) {
@@ -85,7 +71,11 @@ module.exports = (Item, registry) => {
           if (item && this.selectedItem) {
             if (Item.equal(item, this.selectedItem, false)) {
               if (click.slot === this.craftingResultSlot) {
-                if (item.count + this.selectedItem.count > item.stackSize) {
+                const maxTransferrable = this.selectedItem.stackSize - this.selectedItem.count
+                if (item.count > maxTransferrable) {
+                  this.selectedItem.count += maxTransferrable
+                  item.count -= maxTransferrable
+                } else if (item.count <= maxTransferrable) {
                   this.selectedItem.count += item.count
                   this.updateSlot(item.slot, null)
                 }
@@ -95,8 +85,12 @@ module.exports = (Item, registry) => {
             } else {
               this.swapSelectedItem(click.slot, item)
             }
+
+            return [click.slot]
           } else if (this.selectedItem || item) {
             this.swapSelectedItem(click.slot, item)
+
+            return [click.slot]
           }
         } else if (click.mouseButton === 1) { // right click
           if (this.selectedItem) {
@@ -111,15 +105,17 @@ module.exports = (Item, registry) => {
               this.updateSlot(click.slot, item)
               this.fillSlotWithSelectedItem(item, false)
             }
-          } else if (item) {
-            if (click.slot !== this.craftingResultSlot) {
-              this.splitSlot(item)
-            } else {
-              this.swapSelectedItem(click.slot, item)
-            }
+
+            return [click.slot]
+          } else if (item && click.slot !== this.craftingResultSlot) {
+            this.splitSlot(item)
+
+            return [click.slot]
           }
         }
       }
+
+      return []
     }
 
     shiftClick (click) {
@@ -149,9 +145,10 @@ module.exports = (Item, registry) => {
       const { item } = click
       const hotbarSlot = this.hotbarStart + click.mouseButton
       const itemAtHotbarSlot = this.slots[hotbarSlot]
+      if (Item.equal(item, itemAtHotbarSlot) && item?.slot === hotbarSlot) return
       if (item) {
         if (itemAtHotbarSlot) {
-          if (this.type === 'minecraft:inventory' || registry.version['>=']('1.9')) {
+          if ((this.type === 'minecraft:inventory' || registry.version['>=']('1.9')) && click.slot !== this.craftingResultSlot) {
             this.updateSlot(click.slot, itemAtHotbarSlot)
             this.updateSlot(hotbarSlot, item)
           } else {
@@ -179,19 +176,23 @@ module.exports = (Item, registry) => {
     }
 
     middleClick (click, gamemode) {
-      if (this.selectedItem) return
+      if (this.selectedItem) return []
       const { item } = click
       if (gamemode === 1 && item) {
         this.selectedItem = new Item(item.type, item.stackSize, item.metadata, item.nbt)
       }
+      return []
     }
 
     dropClick (click) {
-      if (this.selectedItem) return
+      const { item } = click
+      if (this.selectedItem || item === null) return []
       if (click.mouseButton === 0) {
         if (--click.item.count === 0) this.updateSlot(click.slot, null)
+        return [click.slot]
       } else if (click.mouseButton === 1) {
         this.updateSlot(click.slot, null)
+        return [click.slot]
       }
     }
 
@@ -435,23 +436,6 @@ module.exports = (Item, registry) => {
       return this.requiresConfirmation
     }
 
-    getChangedSlotsAsNotch (slots1, slots2) {
-      assert.equal(slots1.length, slots2.length)
-
-      const changedSlots = []
-
-      for (let i = 0; i < slots2.length; i++) {
-        if (!Item.equal(slots1[i], slots2[i])) {
-          changedSlots.push({
-            location: i,
-            item: Item.toNotch(slots2[i])
-          })
-        }
-      }
-
-      return changedSlots
-    }
-
     clear (blockId, count) {
       let clearedCount = 0
 

package/package.json

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

package/test/test.js

@@ -289,6 +289,19 @@ describe('mode 2 | number click', () => {
         testWindow.assertSlot(-9).isNotEmpty().hasCount(64).hasType(secondItem)
       }
     })
+
+    it('same slot click does nothing', () => {
+      testWindow = createTestWindow('chest')
+        .prepareSlot(62, 64, firstItem)
+
+      // slot 62 = hotbarEnd
+      // mouseButton 8 = hotbarEnd
+      // slot 0 = windowStart
+      testWindow.executeClick(2, 8, 62)
+
+      // no asserts, test would fail regardless
+      // if something did change
+    })
   })
 })
 
@@ -348,9 +361,7 @@ it('returning changed slots works', () => {
   testWindow.assertSlot(0).isEmpty()
   testWindow.assertSelectedItem().isNotEmpty()
 
-  assert.ok(
-    changedSlots.find(changedSlot => changedSlot.location === 0) !== undefined &&
-    Item.fromNotch(changedSlots.find(changedSlot => changedSlot.location === 0)?.item) === null
-    // selectedItem isn't included in changedSlots
-  )
+  assert.equal(changedSlots.length, 1)
+  assert.equal(changedSlots[0], 0)
+  // selectedItem isn't included in changedSlots
 })