This commit is contained in:
kepler155c
2018-10-26 01:03:31 -04:00
parent 6d3389c9c6
commit 9ee67c1fad
6 changed files with 18 additions and 67 deletions

View File

@@ -1,55 +0,0 @@
local Adapter = { }
function Adapter.wrap(args)
local adapters = {
'networkedAdapter18',
'refinedAdapter',
'meAdapter18',
'chestAdapter18',
-- adapters for version 1.7
'meAdapter',
'chestAdapter',
}
for _,adapterType in ipairs(adapters) do
local adapter = require(adapterType)(args)
if adapter:isValid() then
-- figure out which direction to push/pull items from an inventory
-- based on the side the inventory is attached and which way the
-- turtle/computer is facing
if args and args.facing and adapter.side and not adapter.direction then
local horz = { top = 'down', bottom = 'up' }
adapter.direction = horz[adapter.side]
if not adapter.direction then
local sides = {
front = 0,
right = 1,
back = 2,
left = 3,
}
-- pretty sure computer/turtle have sides reversed
local cards = {
east = 0,
south = 1,
west = 2,
north = 3,
}
local icards = {
[ 0 ] = 'west',
[ 1 ] = 'north',
[ 2 ] = 'east',
[ 3 ] = 'south',
}
adapter.direction = icards[(cards[args.facing] + sides[adapter.side]) % 4]
end
end
return adapter
end
end
end
return Adapter

View File

@@ -201,8 +201,7 @@ end
-- Return a list of everything in the system
function Milo:listItems()
self.items = self.context.inventoryAdapter:listItems()
return self.items
return self.context.inventoryAdapter:listItems()
end
return Milo

View File

@@ -1,6 +1,6 @@
local class = require('class')
local Util = require('util')
local InventoryAdapter = require('inventoryAdapter')
local InventoryAdapter = require('inventoryAdapter')
local Peripheral = require('peripheral')
local NetworkedAdapter = class()