Fix cartography table for newer MC versions

- Add 'minecraft:generic' to allowed window types for 1.19+
- Use moveSlotItem instead of transfer for put operations
- Fix chunk packet generation for newer versions (bitMap computing)

Author: Simeon Kummer

lib/plugins/cartography_table.js

@@ -3,7 +3,7 @@ const assert = require('assert')
 module.exports = inject
 
 function inject (bot) {
-  const allowedWindowTypes = ['minecraft:cartography']
+  const allowedWindowTypes = ['minecraft:cartography', 'minecraft:generic']
 
   function matchWindowType (window) {
     for (const type of allowedWindowTypes) {
@@ -18,14 +18,18 @@ function inject (bot) {
       throw new Error('This is not a cartographyTable-like window')
     }
 
+    const mapSlot = 0
+    const modifierSlot = 1
+    const outputSlot = 2
+
     cartographyTable.takeMap = takeMap
     cartographyTable.takeModifier = takeModifier
     cartographyTable.takeOutput = takeOutput
     cartographyTable.putMap = putMap
     cartographyTable.putModifier = putModifier
-    cartographyTable.mapItem = function () { return this.slots[0] }
-    cartographyTable.modifierItem = function () { return this.slots[1] }
-    cartographyTable.outputItem = function () { return this.slots[2] }
+    cartographyTable.mapItem = function () { return this.slots[mapSlot] }
+    cartographyTable.modifierItem = function () { return this.slots[modifierSlot] }
+    cartographyTable.outputItem = function () { return this.slots[outputSlot] }
 
     return cartographyTable
 
@@ -47,26 +51,31 @@ function inject (bot) {
       return takeSomething(cartographyTable.outputItem())
     }
 
-    async function putSomething (destSlot, itemType, metadata, count) {
-      const options = {
-        window: cartographyTable,
-        itemType,
-        metadata,
-        count,
-        sourceStart: cartographyTable.inventoryStart,
-        sourceEnd: cartographyTable.inventoryEnd,
-        destStart: destSlot,
-        destEnd: destSlot + 1
+    async function putMap (itemType, metadata, count) {
+      const sourceSlot = findItemInInventory(itemType, metadata)
+      if (sourceSlot === null) {
+        throw new Error(`Cannot find item ${itemType} in inventory`)
       }
-      await bot.transfer(options)
+      await bot.moveSlotItem(sourceSlot, mapSlot)
     }
 
-    async function putMap (itemType, metadata, count) {
-      await putSomething(0, itemType, metadata, count)
+    async function putModifier (itemType, metadata, count) {
+      const sourceSlot = findItemInInventory(itemType, metadata)
+      if (sourceSlot === null) {
+        throw new Error(`Cannot find item ${itemType} in inventory`)
+      }
+      await bot.moveSlotItem(sourceSlot, modifierSlot)
     }
 
-    async function putModifier (itemType, metadata, count) {
-      await putSomething(1, itemType, metadata, count)
+    function findItemInInventory (itemType, metadata) {
+      const inventory = bot.inventory
+      for (let i = inventory.inventoryStart; i < inventory.inventoryEnd; i++) {
+        const item = inventory.slots[i]
+        if (item && item.type === itemType && (metadata === null || item.metadata === metadata)) {
+          return i
+        }
+      }
+      return null
     }
   }
 

test/internalTest.js

@@ -22,21 +22,28 @@ for (const supportedVersion of mineflayer.testedVersions) {
       : JSON.stringify({ text })
   }
 
-  function generateChunkPacket (chunk) {
+  function generateChunkPacket (chunk, version) {
     const lights = chunk.dumpLight()
+    const biomes = chunk.dumpBiomes?.()
+    let bitMap = chunk.getMask()
+    if (bitMap === undefined && chunk.numSections) {
+      for (let i = 0; i < chunk.numSections; i++) {
+        bitMap |= (1 << i)
+      }
+    }
     return {
       x: 0,
       z: 0,
       groundUp: true,
-      biomes: chunk.dumpBiomes !== undefined ? chunk.dumpBiomes() : undefined,
+      biomes: biomes !== undefined ? biomes : undefined,
       heightmaps: {
         type: 'compound',
         name: '',
         value: {
           MOTION_BLOCKING: { type: 'longArray', value: new Array(36).fill([0, 0]) }
         }
       }, // send fake heightmap
-      bitMap: chunk.getMask(),
+      bitMap,
       chunkData: chunk.dump(),
       blockEntities: [],
       trustEdges: false,