diff --git a/apis/chestAdapter18.lua b/apis/chestAdapter18.lua index 25d043b..c5a7dc3 100644 --- a/apis/chestAdapter18.lua +++ b/apis/chestAdapter18.lua @@ -23,12 +23,26 @@ function ChestAdapter:init(args) Util.merge(self, defaults) Util.merge(self, args) - local chest = Peripheral.getBySide(self.wrapSide) + local chest + if not self.autoDetect then + chest = Peripheral.getBySide(self.wrapSide) + if chest and not chest.list then + chest = nil + end + end if not chest then chest = Peripheral.getByMethod('list') end + if chest then Util.merge(self, chest) + + local sides = { + top = 'down', + bottom = 'up', + } + + self.direction = sides[self.side] or self.direction end end diff --git a/apis/meAdapter.lua b/apis/meAdapter.lua index 1f3b7d9..b5f2c49 100644 --- a/apis/meAdapter.lua +++ b/apis/meAdapter.lua @@ -58,12 +58,11 @@ function MEAdapter:init(args) jobList = { }, direction = 'up', wrapSide = 'bottom', - auto = false, } Util.merge(self, defaults) Util.merge(self, args) - if self.auto then + if self.autoDetect then local mep = Peripheral.getByMethod('getAvailableItems') if mep then Util.merge(self, mep) diff --git a/apps/edit.lua b/apps/edit.lua index e5a4df3..e388b72 100644 --- a/apps/edit.lua +++ b/apps/edit.lua @@ -1064,7 +1064,6 @@ local __actions = { clipboard.setData(text) clipboard.useInternal(true) else - debug(text) os.queueEvent('clipboard_copy', text) end setStatus('%d chars copied', size) diff --git a/apps/storageActivity.lua b/apps/storageActivity.lua index 5065032..4982cb9 100644 --- a/apps/storageActivity.lua +++ b/apps/storageActivity.lua @@ -12,12 +12,11 @@ local multishell = _ENV.multishell local storage = RefinedAdapter() if not storage:isValid() then - storage = MEAdapter({ auto = true }) - if not storage:isValid() then - storage = ChestAdapter() - end + storage = MEAdapter({ autoDetect = true }) +end +if not storage:isValid() then + storage = ChestAdapter({ autoDetect = true }) end - if not storage:isValid() then error('Not connected to a storage device') end