require rework round 3

core/Turtles.lua

@@ -1,6 +1,6 @@
 local Config   = require('config')
 local Event    = require('event')
-local itemDB   = require('itemDB')
+local itemDB   = require('core.itemDB')
 local Socket   = require('socket')
 local Terminal = require('terminal')
 local UI       = require('ui')

core/apis/chestAdapter.lua

@@ -1,5 +1,5 @@
 local class      = require('class')
-local itemDB     = require('itemDB')
+local itemDB     = require('core.itemDB')
 local Peripheral = require('peripheral')
 local Util       = require('util')
 

core/apis/chestAdapter18.lua

@@ -1,6 +1,6 @@
 local class      = require('class')
 local Util       = require('util')
-local itemDB     = require('itemDB')
+local itemDB     = require('core.itemDB')
 local Peripheral = require('peripheral')
 
 local ChestAdapter = class()

core/apis/controllerAdapter.lua

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

core/apis/inventoryAdapter.lua

@@ -2,13 +2,13 @@ local Adapter = { }
 
 function Adapter.wrap(args)
 	local adapters = {
-		'refinedAdapter',
-		'meAdapter18',
-    'chestAdapter18',
+		'core.refinedAdapter',
+		'core.meAdapter18',
+    'core.chestAdapter18',
 
     -- adapters for version 1.7
-    'meAdapter',
-    'chestAdapter',
+    'core.meAdapter',
+    'core.chestAdapter',
   }
 
   for _,adapterType in ipairs(adapters) do

core/apis/itemDB.lua

@@ -1,5 +1,5 @@
-local nameDB  = require('nameDB')
-local TableDB = require('tableDB')
+local nameDB  = require('core.nameDB')
+local TableDB = require('core.tableDB')
 local Util    = require('util')
 
 local itemDB = TableDB({ fileName = 'usr/config/items.db' })

core/apis/meAdapter.lua

@@ -1,5 +1,5 @@
 local class      = require('class')
-local itemDB     = require('itemDB')
+local itemDB     = require('core.itemDB')
 local Peripheral = require('peripheral')
 local Util       = require('util')
 

core/apis/nameDB.lua

@@ -1,5 +1,5 @@
 local JSON    = require('json')
-local TableDB = require('tableDB')
+local TableDB = require('core.tableDB')
 local Util    = require('util')
 
 local fs = _G.fs

core/apis/refinedAdapter.lua

@@ -1,5 +1,5 @@
 local class      = require('class')
-local itemDB     = require('itemDB')
+local itemDB     = require('core.itemDB')
 local Peripheral = require('peripheral')
 local Util       = require('util')
 

core/apis/turtle/craft.lua

@@ -1,4 +1,4 @@
-local itemDB = require('itemDB')
+local itemDB = require('core.itemDB')
 local Util   = require('util')
 
 local fs     = _G.fs

core/apis/turtle/crafting.lua

@@ -1,4 +1,4 @@
-local Adapter = require('inventoryAdapter')
+local Adapter = require('core.inventoryAdapter')
 local Craft   = require('turtle.craft')
 
 local turtle     = _G.turtle