require rework round 3

storage/Crafter.lua

@@ -24,10 +24,10 @@
    MMMMMM
 ]]--
 
-local InventoryAdapter = require('inventoryAdapter')
+local InventoryAdapter = require('core.inventoryAdapter')
 local Config         = require('config')
 local Event          = require('event')
-local itemDB         = require('itemDB')
+local itemDB         = require('core.itemDB')
 local Peripheral     = require('peripheral')
 local UI             = require('ui')
 local Terminal       = require('terminal')

storage/apis/controllerAdapter.lua

@@ -0,0 +1,18 @@
+local Adapter = { }
+
+function Adapter.wrap(args)
+	local adapters = {
+		'core.refinedAdapter',
+    'core.meAdapter',
+  }
+
+  for _,adapterType in ipairs(adapters) do
+		local adapter = require(adapterType)(args)
+
+		if adapter:isValid() then
+			return adapter
+		end
+	end
+end
+
+return Adapter

storage/chestManager.lua

@@ -84,14 +84,14 @@ local Ansi           = require('ansi')
 local Config         = require('config')
 local Craft          = require('turtle.craft')
 local Event          = require('event')
-local itemDB         = require('itemDB')
+local itemDB         = require('core.itemDB')
 local Peripheral     = require('peripheral')
 local Terminal       = require('terminal')
 local UI             = require('ui')
 local Util           = require('util')
 
 local ControllerAdapter = require('controllerAdapter')
-local InventoryAdapter  = require('inventoryAdapter')
+local InventoryAdapter  = require('core.inventoryAdapter')
 
 local colors     = _G.colors
 local device     = _G.device

storage/levelEmitter.lua

@@ -1,7 +1,7 @@
-local InventoryAdapter = require('inventoryAdapter')
+local InventoryAdapter = require('core.inventoryAdapter')
 local Config         = require('config')
 local Event          = require('event')
-local itemDB         = require('itemDB')
+local itemDB         = require('core.itemDB')
 local UI             = require('ui')
 local Util           = require('util')
 

storage/storageActivity.lua

@@ -1,4 +1,4 @@
-local InventoryAdapter = require('inventoryAdapter')
+local InventoryAdapter = require('core.inventoryAdapter')
 local Event            = require('event')
 local UI               = require('ui')
 local Util             = require('util')