diff --git a/apis/meAdapter.lua b/apis/meAdapter.lua index 554fbbe..389a131 100644 --- a/apis/meAdapter.lua +++ b/apis/meAdapter.lua @@ -208,13 +208,13 @@ end function MEAdapter:provide(item, qty, slot, direction) return pcall(function() - for _,stack in Util.rpairs(self.getAllStacks(false)) do - if stack.id == item.name and - (not item.damage or stack.dmg == item.damage) and - (not item.nbtHash or stack.nbt_hash == item.nbtHash) then - local amount = math.min(qty, stack.qty) + for _,stack in pairs(self.getAllStacks(false)) do + if stack.item.id == item.name and + (not item.damage or stack.item.dmg == item.damage) and + (not item.nbtHash or stack.item.nbt_hash == item.nbtHash) then + local amount = math.min(qty, stack.item.qty) if amount > 0 then - self.exportItem(stack, direction or self.direction, amount, slot) + self.exportItem(stack.item, direction or self.direction, amount, slot) end qty = qty - amount if qty <= 0 then diff --git a/apps/chestManager.lua b/apps/chestManager.lua index 6826511..8f055a3 100644 --- a/apps/chestManager.lua +++ b/apps/chestManager.lua @@ -106,6 +106,7 @@ local config = { inventory = 'top', -- main inventory craftingChest = 'bottom', -- required in 1.8+ for crafting + duckAntenna = false, controller = 'none', -- AE / RS controller stock = 'none', -- another inventory for restocking main inventory @@ -125,17 +126,15 @@ if not inventoryAdapter then error('Invalid inventory configuration') end -if device.workbench then +if device.workbench and config.duckAntenna then local oppositeSide = { [ 'left' ] = 'right', [ 'right' ] = 'left', } local duckAntennaSide = oppositeSide[device.workbench.side] - if Peripheral.getType(duckAntennaSide) == os.getComputerLabel() then - duckAntenna = Peripheral.wrap(duckAntennaSide) - if duckAntenna and not duckAntenna.getAllStacks then - duckAntenna = nil - end + duckAntenna = Peripheral.wrap(duckAntennaSide) + if duckAntenna and not duckAntenna.getAllStacks then + duckAntenna = nil end end