require rework round 3

milo/Milo.lua

@@ -1,22 +1,17 @@
 local Event      = require('event')
 local Milo       = require('milo')
 local Sound      = require('sound')
-local Storage    = require('storage')
+local Storage    = require('milo.storage')
 local UI         = require('ui')
 local Util       = require('util')
 
 local colors     = _G.colors
 local device     = _G.device
 local fs         = _G.fs
-local multishell = _ENV.multishell
 local os         = _G.os
 local shell      = _ENV.shell
 local turtle     = _G.turtle
 
-if multishell then
-  multishell.setTitle(multishell.getCurrent(), 'Milo')
-end
-
 local function Syntax(msg)
   print([[
 Turtle must be provided with:

milo/MiloRemote.lua

@@ -1,6 +1,6 @@
 local Config = require('config')
 local Event  = require('event')
-local fuzzy  = require('fuzzyMatch')
+local fuzzy  = require('milo.fuzzyMatch')
 local Sound  = require('sound')
 local Socket = require('socket')
 local sync   = require('sync').sync

milo/apis/craft2.lua

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

milo/apis/init.lua

@@ -1,6 +1,6 @@
 local Config = require('config')
-local Craft  = require('craft2')
-local itemDB = require('itemDB')
+local Craft  = require('milo.craft2')
+local itemDB = require('core.itemDB')
 local Sound  = require('sound')
 local Util   = require('util')
 
@@ -147,7 +147,7 @@ function Milo:requestCrafting(item)
 	end
 end
 
--- queue up an action that relies on the crafting grid
+-- queue an action that interacts with storage
 function Milo:queueRequest(request, callback)
 	os.queueEvent('milo_queue')
 	table.insert(self.context.queue, {

milo/apis/massAdapter.lua

@@ -1,6 +1,6 @@
 local class   = require('class')
-local itemDB  = require('itemDB')
-local Mini    = require('miniAdapter')
+local itemDB  = require('core.itemDB')
+local Mini    = require('milo.miniAdapter')
 
 local os      = _G.os
 

milo/apis/miniAdapter.lua

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

milo/apis/storage.lua

@@ -1,8 +1,8 @@
-local Adapter = require('miniAdapter')
+local Adapter = require('milo.miniAdapter')
 local class   = require('class')
 local Config  = require('config')
 local Event   = require('event')
-local itemDB  = require('itemDB')
+local itemDB  = require('core.itemDB')
 local Util    = require('util')
 
 local device   = _G.device

milo/core/listing.lua

@@ -1,6 +1,6 @@
-local Craft  = require('craft2')
+local Craft  = require('milo.craft2')
 local Event  = require('event')
-local fuzzy  = require('fuzzyMatch')
+local fuzzy  = require('milo.fuzzyMatch')
 local Milo   = require('milo')
 local Sound  = require('sound')
 local UI     = require('ui')

milo/core/machines.lua

@@ -1,5 +1,5 @@
 local Event  = require('event')
-local itemDB = require('itemDB')
+local itemDB = require('core.itemDB')
 local Milo   = require('milo')
 local UI     = require('ui')
 local Util   = require('util')

milo/plugins/craftTask.lua

@@ -1,4 +1,4 @@
-local Craft  = require('craft2')
+local Craft  = require('milo.craft2')
 local Milo   = require('milo')
 local Sound  = require('sound')
 local Util   = require('util')
@@ -60,7 +60,7 @@ function craftTask:cycle()
           end
         end
 
-      elseif not context.controllerAdapter then
+      else
         item.status = '(no recipe)'
         item.statusCode = Craft.STATUS_ERROR
         item.crafted = 0

milo/plugins/demandCraft.lua

@@ -1,5 +1,5 @@
-local Craft  = require('craft2')
-local itemDB = require('itemDB')
+local Craft  = require('milo.craft2')
+local itemDB = require('core.itemDB')
 local Milo   = require('milo')
 local UI     = require('ui')
 local Util   = require('util')

milo/plugins/exportTask.lua

@@ -1,4 +1,4 @@
-local itemDB = require('itemDB')
+local itemDB = require('core.itemDB')
 local Milo   = require('milo')
 
 local ExportTask = {

milo/plugins/exportView.lua

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

milo/plugins/importTask.lua

@@ -1,4 +1,4 @@
-local itemDB = require('itemDB')
+local itemDB = require('core.itemDB')
 local Milo   = require('milo')
 
 local ImportTask = {

milo/plugins/importView.lua

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

milo/plugins/item/machinesTab.lua

@@ -1,4 +1,4 @@
-local Craft   = require('craft2')
+local Craft   = require('milo.craft2')
 local Milo    = require('milo')
 local UI      = require('ui')
 local Util    = require('util')

milo/plugins/item/manageTab.lua

@@ -1,4 +1,4 @@
-local itemDB = require('itemDB')
+local itemDB = require('core.itemDB')
 local Milo   = require('milo')
 local UI     = require('ui')
 local Util   = require('util')

milo/plugins/item/recipeTab.lua

@@ -1,5 +1,5 @@
-local Craft  = require('craft2')
-local itemDB = require('itemDB')
+local Craft  = require('milo.craft2')
+local itemDB = require('core.itemDB')
 local Milo   = require('milo')
 local UI     = require('ui')
 

milo/plugins/item/resetTab.lua

@@ -1,4 +1,4 @@
-local Craft   = require('craft2')
+local Craft   = require('milo.craft2')
 local Milo    = require('milo')
 local UI      = require('ui')
 local Util    = require('util')

milo/plugins/jobMonitor.lua

@@ -1,6 +1,6 @@
-local Craft   = require('craft2')
+local Craft   = require('milo.craft2')
 local Event   = require('event')
-local itemDB  = require('itemDB')
+local itemDB  = require('core.itemDB')
 local Milo    = require('milo')
 local Sound   = require('sound')
 local UI      = require('ui')

milo/plugins/limitTask.lua

@@ -1,4 +1,4 @@
-local itemDB = require('itemDB')
+local itemDB = require('core.itemDB')
 local Milo   = require('milo')
 
 local LimitTask = {

milo/plugins/machineLearn.lua

@@ -1,4 +1,4 @@
-local itemDB = require('itemDB')
+local itemDB = require('core.itemDB')
 local Milo   = require('milo')
 local UI     = require('ui')
 local Util   = require('util')

milo/plugins/machineMover.lua

@@ -1,4 +1,4 @@
-local Craft  = require('craft2')
+local Craft  = require('milo.craft2')
 local Milo   = require('milo')
 local UI     = require('ui')
 local Util   = require('util')

milo/plugins/potionImportTask.lua

@@ -1,5 +1,5 @@
-local Craft  = require('craft2')
-local itemDB = require('itemDB')
+local Craft  = require('milo.craft2')
+local itemDB = require('core.itemDB')
 local Milo   = require('milo')
 
 local BLAZE_POWDER = "minecraft:blaze_powder:0"

milo/plugins/remote.lua

@@ -1,5 +1,5 @@
 local Event  = require('event')
-local itemDB = require('itemDB')
+local itemDB = require('core.itemDB')
 local Milo   = require('milo')
 local Socket = require('socket')
 

milo/plugins/remote/autostore.lua

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

milo/plugins/remote/depositAll.lua

@@ -1,6 +1,6 @@
 local Config = require('config')
 local UI     = require('ui')
-local itemDB = require('itemDB')
+local itemDB = require('core.itemDB')
 
 local args   = { ... }
 local colors = _G.colors

milo/plugins/remoteCraft.lua

@@ -1,4 +1,4 @@
-local itemDB  = require('itemDB')
+local itemDB  = require('core.itemDB')
 local Milo    = require('milo')
 
 local context = Milo:getContext()

milo/plugins/replenishTask.lua

@@ -1,4 +1,4 @@
-local itemDB = require('itemDB')
+local itemDB = require('core.itemDB')
 local Milo   = require('milo')
 
 local ReplenishTask = {

milo/plugins/storageView.lua

@@ -1,4 +1,4 @@
-local itemDB = require('itemDB')
+local itemDB = require('core.itemDB')
 local UI     = require('ui')
 
 local colors = _G.colors

milo/plugins/turtleLearn.lua

@@ -1,4 +1,4 @@
-local itemDB = require('itemDB')
+local itemDB = require('core.itemDB')
 local Milo   = require('milo')
 local UI     = require('ui')