move apis into rom/modules/main for shell compatibility

builder/apis/blocks.lua

@@ -1,7 +1,7 @@
-local class   = require('class')
-local Util    = require('util')
+local class   = require('opus.class')
+local Util    = require('opus.util')
 local TableDB = require('core.tableDB')
-local JSON    = require('json')
+local JSON    = require('opus.json')
 
 -- see https://github.com/Khroki/MCEdit-Unified/blob/master/pymclevel/minecraft.yaml
 -- see https://github.com/Khroki/MCEdit-Unified/blob/master/Items/minecraft/blocks.json

builder/apis/builder.lua

@@ -1,7 +1,7 @@
 local Blocks    = require('builder.blocks')
-local class     = require('class')
+local class     = require('opus.class')
 local Message   = require('core.message')
-local Util      = require('util')
+local Util      = require('opus.util')
 
 local device     = _G.device
 local fs         = _G.fs

builder/apis/commands.lua

@@ -1,6 +1,6 @@
 local Builder   = require('builder.builder')
-local Event     = require('event')
-local Util      = require('util')
+local Event     = require('opus.event')
+local Util      = require('opus.util')
 
 local commands   = _G.commands
 local fs         = _G.fs

builder/apis/schematic.lua

@@ -1,7 +1,7 @@
-local class   = require('class')
-local Util    = require('util')
+local class   = require('opus.class')
+local Util    = require('opus.util')
 local DEFLATE = require('builder.deflatelua')
-local Point   = require('point')
+local Point   = require('opus.point')
 
 local bit    = _G.bit
 local fs     = _G.fs

builder/apis/turtle.lua

@@ -1,12 +1,12 @@
 local Adapter   = require('core.inventoryAdapter')
 local Builder   = require('builder.builder')
-local class     = require('class')
-local Event     = require('event')
+local class     = require('opus.class')
+local Event     = require('opus.event')
 local itemDB    = require('core.itemDB')
 local Message   = require('core.message')
-local Point     = require('point')
-local UI        = require('ui')
-local Util      = require('util')
+local Point     = require('opus.point')
+local UI        = require('opus.ui')
+local Util      = require('opus.util')
 
 local device     = _G.device
 local fs         = _G.fs

builder/builder.lua

@@ -3,13 +3,13 @@ if not _G.turtle and not _G.commands then
 end
 
 local Adapter   = require('core.inventoryAdapter')
-local Event     = require('event')
-local GPS       = require('gps')
+local Event     = require('opus.event')
+local GPS       = require('opus.gps')
 local itemDB    = require('core.itemDB')
 local Schematic = require('builder.schematic')
 local TableDB   = require('core.tableDB')
-local UI        = require('ui')
-local Util      = require('util')
+local UI        = require('opus.ui')
+local Util      = require('opus.util')
 
 local colors     = _G.colors
 local fs         = _G.fs

builder/supplier.lua

@@ -1,9 +1,9 @@
-local Event      = require('event')
+local Event      = require('opus.event')
 local MEProvider = require('core.meProvider')
 local Message    = require('core.message')
-local Point      = require('point')
+local Point      = require('opus.point')
 local TableDB    = require('core.tableDB')
-local Util       = require('util')
+local Util       = require('opus.util')
 
 local device = _G.device
 local os     = _G.os

builder/viewer.lua

@@ -1,7 +1,7 @@
 local Builder   = require('builder.builder')
 local Schematic = require('builder.schematic')
 local TableDB   = require('core.tableDB')
-local Util      = require('util')
+local Util      = require('opus.util')
 
 local device    = _G.device
 local fs        = _G.fs
@@ -157,4 +157,4 @@ for i = 1, #Builder.schematic.blocks do
 end
 
 pcall(_G.read)
-cn.clear()
+cn.clear()

ccemux/autorun/startup.lua

@@ -6,7 +6,7 @@ if ccemux then
 	-- add a System setup tab
 	fs.mount('sys/apps/system/ccemux.lua', 'linkfs', 'packages/ccemux/system/ccemux.lua')
 
-	local Config = require('config')
+	local Config = require('opus.config')
 
 	for k,v in pairs(Config.load('ccemux')) do
 		if not peripheral.getType(k) then

ccemux/system/ccemux.lua

@@ -1,5 +1,5 @@
-local Config = require('config')
-local UI     = require('ui')
+local Config = require('opus.config')
+local UI     = require('opus.ui')
 
 local ccemux = _G.ccemux
 

common/Appstore.lua

@@ -1,7 +1,7 @@
-local Ansi   = require('ansi')
+local Ansi   = require('opus.ansi')
 local SHA    = require('crypto.sha2')
-local UI     = require('ui')
-local Util   = require('util')
+local UI     = require('opus.ui')
+local Util   = require('opus.util')
 
 local fs         = _G.fs
 local http       = _G.http

common/Devices.lua

@@ -1,9 +1,9 @@
 _G.requireInjector(_ENV)
 
-local Ansi  = require('ansi')
-local Event = require('event')
-local UI    = require('ui')
-local Util  = require('util')
+local Ansi  = require('opus.ansi')
+local Event = require('opus.event')
+local UI    = require('opus.ui')
+local Util  = require('opus.util')
 
 local colors = _G.colors
 local peripheral = _G.peripheral

common/DiskCopy.lua

@@ -1,8 +1,8 @@
-local Ansi       = require('ansi')
-local Config     = require('config')
-local Event      = require('event')
-local UI         = require('ui')
-local Util       = require('util')
+local Ansi       = require('opus.ansi')
+local Config     = require('opus.config')
+local Event      = require('opus.event')
+local UI         = require('opus.ui')
+local Util       = require('opus.util')
 
 local colors     = _G.colors
 local fs         = _G.fs

common/Events.lua

@@ -1,6 +1,6 @@
-local Event = require('event')
-local UI    = require('ui')
-local Util  = require('util')
+local Event = require('opus.event')
+local UI    = require('opus.ui')
+local Util  = require('opus.util')
 
 local multishell = _ENV.multishell
 local os         = _G.os

common/Follow.lua

@@ -1,10 +1,10 @@
-local Event  = require('event')
-local GPS    = require('gps')
-local Point  = require('point')
-local Socket = require('socket')
+local Event  = require('opus.event')
+local GPS    = require('opus.gps')
+local Point  = require('opus.point')
+local Socket = require('opus.socket')
 local Swarm  = require('core.swarm')
-local UI     = require('ui')
-local Util   = require('util')
+local UI     = require('opus.ui')
+local Util   = require('opus.util')
 
 local colors  = _G.colors
 local network = _G.network

common/SoundPlayer.lua

@@ -1,7 +1,6 @@
-local Sound = require('sound')
-
-local UI    = require('ui')
-local Util  = require('util')
+local Sound = require('opus.sound')
+local UI    = require('opus.ui')
+local Util  = require('opus.util')
 
 local peripheral = _G.peripheral
 

common/Turtles.lua

@@ -1,10 +1,10 @@
-local Config   = require('config')
-local Event    = require('event')
+local Config   = require('opus.config')
+local Event    = require('opus.event')
 local itemDB   = require('core.itemDB')
-local Socket   = require('socket')
-local Terminal = require('terminal')
-local UI       = require('ui')
-local Util     = require('util')
+local Socket   = require('opus.socket')
+local Terminal = require('opus.terminal')
+local UI       = require('opus.ui')
+local Util     = require('opus.util')
 
 local colors     = _G.colors
 local fs         = _G.fs

common/canvasClient.lua

@@ -1,5 +1,5 @@
-local Point  = require('point')
-local Util   = require('util')
+local Point  = require('opus.point')
+local Util   = require('opus.util')
 
 local device = _G.device
 local os     = _G.os

common/debugMonitor.lua

@@ -1,4 +1,4 @@
-local Util = require('util')
+local Util = require('opus.util')
 
 local os         = _G.os
 local peripheral = _G.peripheral

common/edit.lua

@@ -1,4 +1,4 @@
-local input = require('input')
+local input = require('opus.input')
 
 local colors     = _G.colors
 local fs         = _G.fs

common/multiMiner.lua

@@ -1,11 +1,11 @@
-local Event   = require('event')
-local GPS     = require('gps')
+local Event   = require('opus.event')
+local GPS     = require('opus.gps')
 local itemDB  = require('core.itemDB')
-local Point   = require('point')
-local Socket  = require('socket')
-local Sound   = require('sound')
-local Util    = require('util')
-local UI      = require('ui')
+local Point   = require('opus.point')
+local Socket  = require('opus.socket')
+local Sound   = require('opus.sound')
+local Util    = require('opus.util')
+local UI      = require('opus.ui')
 
 local colors  = _G.colors
 local device  = _G.device

common/recorder.lua

@@ -14,7 +14,7 @@ local version = "Version 1.1.6"
 -- Original code by Bomb Bloke
 -- Modified to integrate with opus os
 
-local Util = require('util')
+local Util = require('opus.util')
 
 local multishell = _ENV.multishell
 local os         = _G.os

core/apis/chestAdapter.lua

@@ -1,7 +1,7 @@
-local class      = require('class')
+local class      = require('opus.class')
 local itemDB     = require('core.itemDB')
-local Peripheral = require('peripheral')
-local Util       = require('util')
+local Peripheral = require('opus.peripheral')
+local Util       = require('opus.util')
 
 local os = _G.os
 

core/apis/chestAdapter18.lua

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

core/apis/itemDB.lua

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

core/apis/meAdapter.lua

@@ -1,7 +1,7 @@
-local class      = require('class')
+local class      = require('opus.class')
 local itemDB     = require('core.itemDB')
-local Peripheral = require('peripheral')
-local Util       = require('util')
+local Peripheral = require('opus.peripheral')
+local Util       = require('opus.util')
 
 local os         = _G.os
 

core/apis/meAdapter18.lua

@@ -1,7 +1,7 @@
-local class      = require('class')
+local class      = require('opus.class')
 local RSAdapter  = require('core.refinedAdapter')
-local Peripheral = require('peripheral')
-local Util       = require('util')
+local Peripheral = require('opus.peripheral')
+local Util       = require('opus.util')
 
 local MEAdapter = class(RSAdapter)
 

core/apis/message.lua

@@ -1,4 +1,4 @@
-local Event = require('event')
+local Event = require('opus.event')
 
 local Message = { }
 
@@ -92,4 +92,4 @@ function Message.waitForMessage(msgType, timeout, fromId)
 	until e == 'timer' and side == timerId
 end
 
-return Message
+return Message

core/apis/nameDB.lua

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

core/apis/proxy.lua

@@ -1,4 +1,4 @@
-local Socket  = require('socket')
+local Socket  = require('opus.socket')
 
 local Proxy = { }
 

core/apis/refinedAdapter.lua

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

core/apis/swarm.lua

@@ -1,6 +1,6 @@
-local class   = require('class')
-local Event   = require('event')
-local Map     = require('map')
+local class   = require('opus.class')
+local Event   = require('opus.event')
+local Map     = require('opus.map')
 local Proxy   = require('core.proxy')
 
 local Swarm = class()

core/apis/tableDB.lua

@@ -1,5 +1,5 @@
-local class = require('class')
-local Util  = require('util')
+local class = require('opus.class')
+local Util  = require('opus.util')
 
 local TableDB = class()
 function TableDB:init(args)

farms/apis/craft.lua

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

farms/apis/level.lua

@@ -1,5 +1,5 @@
-local Point = require('point')
-local Util  = require('util')
+local Point = require('opus.point')
+local Util  = require('opus.util')
 
 local turtle = _G.turtle
 

farms/attack.lua

@@ -1,6 +1,6 @@
 local Equipper   = require('turtle.equipper')
-local Point      = require('point')
-local Util       = require('util')
+local Point      = require('opus.point')
+local Util       = require('opus.util')
 
 local os         = _G.os
 local turtle     = _G.turtle

farms/farmer.lua

@@ -1,6 +1,6 @@
 local Equipper    = require('turtle.equipper')
-local Point       = require('point')
-local Util        = require('util')
+local Point       = require('opus.point')
+local Util        = require('opus.util')
 
 local fs          = _G.fs
 local os          = _G.os

farms/rancher.lua

@@ -1,7 +1,7 @@
 local Adapter    = require('core.chestAdapter18')
-local Config     = require('config')
+local Config     = require('opus.config')
 local Equipper   = require('turtle.equipper')
-local Util       = require('util')
+local Util       = require('opus.util')
 
 local fs         = _G.fs
 local os         = _G.os

farms/spawner.lua

@@ -1,6 +1,6 @@
 local Equipper   = require('turtle.equipper')
-local Point      = require('point')
-local Util       = require('util')
+local Point      = require('opus.point')
+local Util       = require('opus.util')
 
 local fs         = _G.fs
 local os         = _G.os

farms/superTreefarm.lua

@@ -1,7 +1,7 @@
 local Equipper   = require('turtle.equipper')
-local GPS        = require('gps')
-local Point      = require('point')
-local Util       = require('util')
+local GPS        = require('opus.gps')
+local Point      = require('opus.point')
+local Util       = require('opus.util')
 
 local fs         = _G.fs
 local os         = _G.os

farms/treefarm.lua

@@ -18,8 +18,8 @@
 		place the turtle in the original position before restarting the program.
 ]]--
 
-local Point  = require('point')
-local Util   = require('util')
+local Point  = require('opus.point')
+local Util   = require('opus.util')
 
 local fs     = _G.fs
 local os     = _G.os

forestry/alveary.lua

@@ -1,7 +1,7 @@
 _G.requireInjector(_ENV)
 
-local Event = require('event')
-local UI = require('ui')
+local Event = require('opus.event')
+local UI = require('opus.ui')
 
 redstone.setBundledOutput('bottom', 0)
 

forestry/filing.lua

@@ -1,7 +1,7 @@
 _G.requireInjector(_ENV)
 
-local Event = require('event')
-local Util = require('util')
+local Event = require('opus.event')
+local Util = require('opus.util')
  
 local chest = peripheral.wrap('top')
 

games/ccTunes.lua

@@ -1,4 +1,4 @@
-local Sound = require('sound')
+local Sound = require('opus.sound')
 
 local os = _G.os
 

gps/gpsServer.lua

@@ -1,6 +1,6 @@
-local Config = require('config')
-local GPS    = require('gps')
-local Util   = require('util')
+local Config = require('opus.config')
+local GPS    = require('opus.gps')
+local Util   = require('opus.util')
 
 local args       = { ... }
 local colors     = _G.colors

ignore/glasses.lua

@@ -1,7 +1,7 @@
-local class = require('class')
-local UI = require('ui')
-local Event = require('event')
-local Peripheral = require('peripheral')
+local class = require('opus.class')
+local UI = require('opus.ui')
+local Event = require('opus.event')
+local Peripheral = require('opus.peripheral')
 
 --[[-- Glasses device --]]--
 local Glasses = class()

ignore/neuralFly.lua

@@ -1,7 +1,7 @@
 _G.requireInjector(_ENV)
 
-local Config = require('config')
-local GPS = require('gps')
+local Config = require('opus.config')
+local GPS = require('opus.gps')
 local ni = _G.device.neuralInterface
 
 local os       = _G.os

mbs/.package

@@ -0,0 +1,11 @@
+{
+	title = 'MBS - Mildly Better Shell',
+	repository = 'kepler155c/opus-apps/{{OPUS_BRANCH}}/mbs',
+	description = [[
+		A shell alternative and more by SquidDev-CC. See:
+		https://github.com/SquidDev-CC/mbs
+
+		MBS is a series of utilities for improving the default CraftOS experience.
+	]],
+	licence = 'MIT',
+}

mbs/autorun/startup.lua

@@ -0,0 +1,7 @@
+if not fs.exists('.mbs') then
+  print('Installing MBS')
+  shell.run('mbs download')
+end
+print('Initializing MBS')
+shell.run('mbs startup')
+

mbs/etc/apps.db

@@ -0,0 +1,7 @@
+{
+	[ "mbs" ] = {
+		title = "MBS",
+		category = "Apps",
+		run = ".mbs/bin/shell.lua",
+	},
+}

mbs/mbs.lua

@@ -0,0 +1,260 @@
+local arg = table.pack(...)
+local root_dir = ".mbs"
+local rom_dir = "rom/.mbs"
+local install_dir = fs.exists(root_dir) and root_dir or rom_dir
+local repo_url = "https://raw.githubusercontent.com/SquidDev-CC/mbs/master/"
+
+--- Write a string with the given colour to the terminal
+local function write_coloured(colour, text)
+  local old = term.getTextColour()
+  term.setTextColour(colour)
+  io.write(text)
+  term.setTextColour(old)
+end
+
+--- Print usage for this program
+local commands = { "install", "modules", "module", "download" }
+local function print_usage()
+  local name = fs.getName(shell.getRunningProgram()):gsub("%.lua$", "")
+  write_coloured(colours.cyan, name .. " modules  ") io.write("Print the status of all modules\n")
+  write_coloured(colours.cyan, name .. " module   ") io.write("Print information about a given module\n")
+  write_coloured(colours.cyan, name .. " install  ") io.write("Download all modules and create a startup file\n")
+  write_coloured(colours.cyan, name .. " download ") io.write("Download all modules WITHOUT creating a startup file\n")
+end
+
+--- Attempt to load a module from the given path, returning the module or false
+-- and an error message.
+local function load_module(path)
+  if fs.isDir(path) then return false, "Invalid module (is directory)" end
+
+  local fn, err = loadfile(path, _ENV)
+  if not fn then return false, "Invalid module (" .. err .. ")" end
+
+  local ok, res = pcall(fn)
+  if not ok then return false, "Invalid module (" .. res .. ")" end
+
+  if type(res) ~= "table" or type(res.description) ~= "string" or type(res.enabled) ~= "function" then
+    return false, "Malformed module"
+  end
+
+  return res
+end
+
+--- Setup all modules
+local function setup_module(module)
+  for _, setting in ipairs(module.settings) do
+    if settings.get(setting.name) == nil then
+      settings.set(setting.name, setting.default)
+    end
+  end
+end
+
+--- Download a set of files
+local function download_files(files)
+  if #files == 0 then return end
+
+  local urls = {}
+  for _, file in ipairs(files) do
+    local url = repo_url .. file
+    http.request(url)
+    urls[url] = file
+  end
+
+  while true do
+    local event, url, arg1 = os.pullEvent()
+    if event == "http_success" and urls[url] then
+      local handle = fs.open(fs.combine(root_dir, urls[url]), "w")
+      handle.write(arg1.readAll())
+      handle.close()
+      arg1.close()
+
+      urls[url] = nil
+      if next(urls) == nil then return end
+    elseif event == "http_failure" and urls[url] then
+      error("Could not download " .. urls[url], 0)
+    end
+  end
+end
+
+--- read completion helper, completes text using the given options
+local function complete_multi(text, options, add_spaces)
+  local results = {}
+  for n = 1, #options do
+    local option = options[n]
+    if #option + (add_spaces and 1 or 0) > #text and option:sub(1, #text) == text then
+      local result = option:sub(#text + 1)
+      if add_spaces then
+        results[#results + 1] = result .. " "
+      else
+        results[#results + 1] = result
+      end
+    end
+  end
+  return results
+end
+
+--- Append an object to a list if it is not already contained within
+local function add_unique(list, x)
+  for i = 1, #list do if list[i] == x then return end end
+  list[#list + 1] = x
+end
+
+local function load_all_modules()
+  -- Load all modules and update them.
+  local module_dir = fs.combine(root_dir, "modules")
+  local modules = fs.isDir(module_dir) and fs.list(module_dir) or {}
+
+  -- Add the default modules if not already there.
+  for _, module in ipairs { "lua.lua", "pager.lua", "readline.lua", "shell.lua" } do
+    add_unique(modules, module)
+  end
+
+  local files = {}
+  for i = 1, #modules do files[i] = "modules/" .. modules[i] end
+  download_files(files)
+
+  -- Scan for dependencies in enabled modules, downloading them as well
+  local deps = {}
+  for i = 1, #files do
+    local module = load_module(fs.combine(root_dir, files[i]))
+    if module then
+      setup_module(module)
+      if module.enabled() then
+        for _, dep in ipairs(module.dependencies) do deps[#deps + 1] = dep end
+      end
+    end
+  end
+  download_files(deps)
+end
+
+if arg.n == 0 then
+  printError("Expected some command")
+  print_usage()
+  error()
+elseif arg[1] == "download" then
+  load_all_modules()
+elseif arg[1] == "install" then
+  load_all_modules()
+
+  -- Move the existing startup file. We have to read the whole thing,
+  -- as otherwise we'd end up copying inside ourselves.
+  if fs.exists("startup") and not fs.isDir("startup") then
+    write_coloured(colours.cyan, "Moving your existing startup file to startup/30_startup.lua.\n")
+
+    local handle = fs.open("startup", "r")
+    local contents = handle.readAll()
+    handle.close()
+    fs.delete("startup")
+
+    handle = fs.open("startup/30_startup.lua", "w")
+    handle.write(contents)
+    handle.close()
+  end
+
+  -- Also move the startup.lua file afterwards
+  if fs.exists("startup.lua") and not fs.isDir("startup.lua") then
+    write_coloured(colours.cyan, "Moving your existing startup.lua file to startup/31_startup.lua.\n")
+    fs.move("startup.lua", "startup/31_startup.lua")
+  end
+
+  if fs.exists("startup/99_mbs.lua") then
+    write_coloured(colours.cyan, "Deleting the old startup/99_mbs.lua file. We now run before other startup files.\n")
+    fs.delete("startup/99_mbs.lua")
+  end
+
+  -- We'll run at the first possible position to ensure
+  local handle = fs.open("startup/00_mbs.lua", "w")
+  handle.writeLine(("assert(loadfile(%q, _ENV))('startup')"):format(shell.getRunningProgram()))
+  handle.close()
+
+  write_coloured(colours.green, "Installed! ")
+  io.write("Please reboot to apply changes.\n")
+elseif arg[1] == "startup" then
+  -- Gather a list of all modules
+  local module_dir = fs.combine(install_dir, "modules")
+  local files = fs.isDir(module_dir) and fs.list(module_dir) or {}
+
+  -- Load those modules and determine which are enabled.
+  local enabled = {}
+  local module_names = {}
+  for _, file in ipairs(files) do
+    local module = load_module(fs.combine(module_dir, file))
+    if module then
+      setup_module(module)
+      module_names[#module_names + 1] = file:gsub("%.lua$", "")
+      if module.enabled() then enabled[#enabled + 1] = module end
+    end
+  end
+
+  shell.setCompletionFunction(shell.getRunningProgram(), function(_, index, text, previous)
+    if index == 1 then
+      return complete_multi(text, commands, true)
+    elseif index == 2 and previous[#previous] == "module" then
+      return complete_multi(text, module_names, false)
+    end
+  end)
+
+  -- Setup those modules
+  for _, module in ipairs(enabled) do
+    if type(module.setup) == "function" then module.setup(install_dir) end
+  end
+
+  -- And run the startup hook if needed
+  for _, module in ipairs(enabled) do
+    --if type(module.startup) == "function" then module.startup(install_dir) end
+  end
+
+elseif arg[1] == "modules" then
+  local module_dir = fs.combine(install_dir, "modules")
+  local files = fs.isDir(module_dir) and fs.list(module_dir) or {}
+  local found_any = false
+
+  for _, file in ipairs(files) do
+    local res, err = load_module(fs.combine(module_dir, file))
+    write_coloured(colours.cyan, file:gsub("%.lua$", "") .. " ")
+    if res then
+      write(res.description)
+      if res.enabled() then
+        write_coloured(colours.green, " (enabled)")
+      else
+        write_coloured(colours.red, " (disabled)")
+      end
+      found_any = true
+    else
+      write_coloured(colours.red, err)
+    end
+
+    io.write("\n")
+  end
+
+  if not found_any then error("No modules found. Maybe try running the `install` command?", 0) end
+elseif arg[1] == "module" then
+  if not arg[2] then error("Expected module name", 0) end
+  local module, err = load_module(fs.combine(install_dir, fs.combine("modules", arg[2] .. ".lua")))
+  if not module then error(err, 0) end
+
+  io.write(module.description)
+  if module.enabled() then
+    write_coloured(colours.green, " (enabled)")
+  else
+    write_coloured(colours.red, " (disabled)")
+  end
+  io.write("\n\n")
+
+  for _, setting in ipairs(module.settings) do
+    local value = settings.get(setting.name)
+    write_coloured(colours.cyan, setting.name)
+    io.write(" " .. setting.description .. " (")
+    write_coloured(colours.yellow, textutils.serialise(value))
+    if value ~= setting.default then
+      io.write(", default is \n")
+      write_coloured(colours.yellow, textutils.serialise(setting.default))
+    end
+
+    io.write(")\n")
+  end
+else
+  printError("Unknown command")
+  print_usage()
+  error()
+end

milo/MiloLocal.lua

@@ -1,9 +1,9 @@
-local Event      = require('event')
+local Event      = require('opus.event')
 local Milo       = require('milo')
-local Sound      = require('sound')
+local Sound      = require('opus.sound')
 local Storage    = require('milo.storage')
-local UI         = require('ui')
-local Util       = require('util')
+local UI         = require('opus.ui')
+local Util       = require('opus.util')
 
 local colors     = _G.colors
 local device     = _G.device

milo/MiloRemote.lua

@@ -1,11 +1,11 @@
-local Config = require('config')
-local Event  = require('event')
+local Config = require('opus.config')
+local Event  = require('opus.event')
 local fuzzy  = require('milo.fuzzyMatch')
-local Sound  = require('sound')
-local Socket = require('socket')
-local sync   = require('sync').sync
-local UI     = require('ui')
-local Util   = require('util')
+local Sound  = require('opus.sound')
+local Socket = require('opus.socket')
+local sync   = require('opus.sync').sync
+local UI     = require('opus.ui')
+local Util   = require('opus.util')
 
 local colors     = _G.colors
 local fs         = _G.fs

milo/apis/craft2.lua

@@ -1,6 +1,6 @@
 local itemDB = require('core.itemDB')
 local Tasks  = require('milo.taskRunner')
-local Util   = require('util')
+local Util   = require('opus.util')
 
 local fs       = _G.fs
 local turtle   = _G.turtle

milo/apis/init.lua

@@ -1,8 +1,8 @@
-local Config = require('config')
+local Config = require('opus.config')
 local Craft  = require('milo.craft2')
 local itemDB = require('core.itemDB')
-local Sound  = require('sound')
-local Util   = require('util')
+local Sound  = require('opus.sound')
+local Util   = require('opus.util')
 
 local os     = _G.os
 local turtle = _G.turtle

milo/apis/massAdapter.lua

@@ -1,4 +1,4 @@
-local class   = require('class')
+local class   = require('opus.class')
 local itemDB  = require('core.itemDB')
 local Mini    = require('milo.miniAdapter')
 

milo/apis/miniAdapter.lua

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

milo/apis/storage.lua

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

milo/apis/taskRunner.lua

@@ -1,4 +1,4 @@
-local class = require('class')
+local class = require('opus.class')
 
 local os = _G.os
 

milo/apps/brewArray.lua

@@ -19,8 +19,8 @@ CONFIGURATION:
 Use this turtle for machine crafting.
 --]]
 
-local Event      = require('event')
-local Util       = require('util')
+local Event      = require('opus.event')
+local Util       = require('opus.util')
 
 local device     = _G.device
 local fs         = _G.fs

milo/apps/cobblegen.lua

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

milo/apps/enderchest.lua

@@ -2,8 +2,8 @@
 Send items to a players enderchest.
 --]]
 
-local Event  = require('event')
-local Util   = require('util')
+local Event  = require('opus.event')
+local Util   = require('opus.util')
 
 local device = _G.device
 local fs     = _G.fs

milo/apps/furni.lua

@@ -15,8 +15,8 @@ CONFIGURATION:
 Use this turtle for machine crafting.
 --]]
 
-local Event      = require('event')
-local Util       = require('util')
+local Event      = require('opus.event')
+local Util       = require('opus.util')
 
 local device     = _G.device
 local fs         = _G.fs

milo/apps/storageGen.lua

@@ -2,7 +2,7 @@
 	For initially setting up large amounts of storage chests.
 ]]
 
-local Util = require('util')
+local Util = require('opus.util')
 
 local peripheral = _G.peripheral
 

milo/apps/water.lua

@@ -1,5 +1,5 @@
-local Sound  = require('sound')
-local Util   = require('util')
+local Sound  = require('opus.sound')
+local Util   = require('opus.util')
 
 local fs     = _G.fs
 local os     = _G.os

milo/core/learnWizard.lua

@@ -1,5 +1,5 @@
 local Milo   = require('milo')
-local UI     = require('ui')
+local UI     = require('opus.ui')
 
 local turtle = _G.turtle
 

milo/core/listing.lua

@@ -1,10 +1,10 @@
 local Craft  = require('milo.craft2')
-local Event  = require('event')
+local Event  = require('opus.event')
 local fuzzy  = require('milo.fuzzyMatch')
 local Milo   = require('milo')
-local Sound  = require('sound')
-local UI     = require('ui')
-local Util   = require('util')
+local Sound  = require('opus.sound')
+local UI     = require('opus.ui')
+local Util   = require('opus.util')
 
 local colors      = _G.colors
 local context     = Milo:getContext()

milo/core/machines.lua

@@ -1,9 +1,9 @@
-local Event  = require('event')
+local Event  = require('opus.event')
 local itemDB = require('core.itemDB')
-local Map    = require('map')
+local Map    = require('opus.map')
 local Milo   = require('milo')
-local UI     = require('ui')
-local Util   = require('util')
+local UI     = require('opus.ui')
+local Util   = require('opus.util')
 
 local colors = _G.colors
 local device = _G.device

milo/plugins/activityView.lua

@@ -1,8 +1,8 @@
-local Ansi       = require('ansi')
-local Event      = require('event')
+local Ansi       = require('opus.ansi')
+local Event      = require('opus.event')
 local Milo       = require('milo')
-local UI         = require('ui')
-local Util       = require('util')
+local UI         = require('opus.ui')
+local Util       = require('opus.util')
 
 local colors     = _G.colors
 local context    = Milo:getContext()

milo/plugins/backupView.lua

@@ -1,7 +1,7 @@
-local Ansi       = require('ansi')
-local Event      = require('event')
+local Ansi       = require('opus.ansi')
+local Event      = require('opus.event')
 local Milo       = require('milo')
-local UI         = require('ui')
+local UI         = require('opus.ui')
 
 local colors     = _G.colors
 local device     = _G.device

milo/plugins/brewingStandView.lua

@@ -1,5 +1,5 @@
-local Ansi = require('ansi')
-local UI   = require('ui')
+local Ansi = require('opus.ansi')
+local UI   = require('opus.ui')
 
 local colors = _G.colors
 local device = _G.device

milo/plugins/craftTask.lua

@@ -1,7 +1,7 @@
 local Craft  = require('milo.craft2')
 local Milo   = require('milo')
-local Sound  = require('sound')
-local Util   = require('util')
+local Sound  = require('opus.sound')
+local Util   = require('opus.util')
 
 local context = Milo:getContext()
 
@@ -79,4 +79,4 @@ function craftTask:cycle()
 	end
 end
 
-Milo:registerTask(craftTask)
+Milo:registerTask(craftTask)

milo/plugins/demandCraft.lua

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

milo/plugins/exportView.lua

@@ -1,6 +1,6 @@
 local itemDB = require('core.itemDB')
-local UI     = require('ui')
-local Util   = require('util')
+local UI     = require('opus.ui')
+local Util   = require('opus.util')
 
 local colors = _G.colors
 local device = _G.device

milo/plugins/importView.lua

@@ -1,6 +1,6 @@
 local itemDB = require('core.itemDB')
-local UI     = require('ui')
-local Util   = require('util')
+local UI     = require('opus.ui')
+local Util   = require('opus.util')
 
 local colors = _G.colors
 local device = _G.device

milo/plugins/inputChestView.lua

@@ -1,5 +1,5 @@
-local Ansi       = require('ansi')
-local UI         = require('ui')
+local Ansi       = require('opus.ansi')
+local UI         = require('opus.ui')
 
 local colors     = _G.colors
 local device     = _G.device

milo/plugins/item.lua

@@ -1,6 +1,6 @@
 local Milo   = require('milo')
-local UI     = require('ui')
-local Util   = require('util')
+local UI     = require('opus.ui')
+local Util   = require('opus.util')
 
 local context = Milo:getContext()
 

milo/plugins/item/infoTab.lua

@@ -1,5 +1,5 @@
-local Ansi   = require('ansi')
-local UI     = require('ui')
+local Ansi   = require('opus.ansi')
+local UI     = require('opus.ui')
 
 local colors = _G.colors
 

milo/plugins/item/machinesTab.lua

@@ -1,7 +1,7 @@
 local Craft   = require('milo.craft2')
 local Milo    = require('milo')
-local UI      = require('ui')
-local Util    = require('util')
+local UI      = require('opus.ui')
+local Util    = require('opus.util')
 
 local colors  = _G.colors
 local context = Milo:getContext()

milo/plugins/item/manageTab.lua

@@ -1,8 +1,8 @@
 local itemDB = require('core.itemDB')
-local Map    = require('map')
+local Map    = require('opus.map')
 local Milo   = require('milo')
-local UI     = require('ui')
-local Util   = require('util')
+local UI     = require('opus.ui')
+local Util   = require('opus.util')
 
 local context = Milo:getContext()
 

milo/plugins/item/recipeTab.lua

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

milo/plugins/item/resetTab.lua

@@ -1,7 +1,7 @@
 local Craft   = require('milo.craft2')
 local Milo    = require('milo')
-local UI      = require('ui')
-local Util    = require('util')
+local UI      = require('opus.ui')
+local Util    = require('opus.util')
 
 local colors  = _G.colors
 local context = Milo:getContext()

milo/plugins/jobMonitor.lua

@@ -1,10 +1,10 @@
 local Craft   = require('milo.craft2')
-local Event   = require('event')
+local Event   = require('opus.event')
 local itemDB  = require('core.itemDB')
 local Milo    = require('milo')
-local Sound   = require('sound')
-local UI      = require('ui')
-local Util    = require('util')
+local Sound   = require('opus.sound')
+local UI      = require('opus.ui')
+local Util    = require('opus.util')
 
 local colors  = _G.colors
 local context = Milo:getContext()
@@ -87,11 +87,11 @@ local function createPage(node)
 				{ heading = 'Qty',      key = 'remaining',   width = 4 },
 				{ heading = 'Crafting', key = 'displayName', },
 				{ heading = 'Status',   key = 'status',      },
-				{ heading = 'need',   key = 'need',    width = 4  },
+	--			{ heading = 'need',   key = 'need',    width = 4  },
 	--      { heading = 'total',   key = 'total',  width = 4    },
 	--      { heading = 'used',   key = 'used',   width = 4   },
 	--      { heading = 'count',   key = 'count', width = 4     },
-				{ heading = 'crafted',   key = 'crafted',  width = 5    },
+	--			{ heading = 'crafted',   key = 'crafted',  width = 5    },
 	--      { heading = 'Progress', key = 'progress',    width = 8 },
 			},
 			headerBackgroundColor = colors.black,

milo/plugins/machineLearn.lua

@@ -1,7 +1,7 @@
 local itemDB = require('core.itemDB')
 local Milo   = require('milo')
-local UI     = require('ui')
-local Util   = require('util')
+local UI     = require('opus.ui')
+local Util   = require('opus.util')
 
 local colors = _G.colors
 local device = _G.device

milo/plugins/machineMover.lua

@@ -1,7 +1,7 @@
 local Craft  = require('milo.craft2')
 local Milo   = require('milo')
-local UI     = require('ui')
-local Util   = require('util')
+local UI     = require('opus.ui')
+local Util   = require('opus.util')
 
 local colors  = _G.colors
 local context = Milo:getContext()

milo/plugins/massStorageView.lua

@@ -1,5 +1,5 @@
-local Ansi       = require('ansi')
-local UI         = require('ui')
+local Ansi       = require('opus.ansi')
+local UI         = require('opus.ui')
 
 local colors     = _G.colors
 local device     = _G.device

milo/plugins/remote.lua

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

milo/plugins/remote/autostore.lua

@@ -1,7 +1,7 @@
 local itemDB = require('core.itemDB')
-local Event  = require('event')
-local UI     = require('ui')
-local Util   = require('util')
+local Event  = require('opus.event')
+local UI     = require('opus.ui')
+local Util   = require('opus.util')
 
 local args       = { ... }
 local colors     = _G.colors

milo/plugins/remote/craft.lua

@@ -1,4 +1,4 @@
-local Sound   = require('sound')
+local Sound   = require('opus.sound')
 
 local args    = { ... }
 local context = args[1]

milo/plugins/remote/deposit.lua

@@ -1,4 +1,4 @@
-local Event  = require('event')
+local Event  = require('opus.event')
 
 local device = _G.device
 local os     = _G.os

milo/plugins/remote/depositAll.lua

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

milo/plugins/remote/feeder.lua

@@ -1,7 +1,7 @@
 local itemDB = require('core.itemDB')
-local Event  = require('event')
-local Sound  = require('sound')
-local UI     = require('ui')
+local Event  = require('opus.event')
+local Sound  = require('opus.sound')
+local UI     = require('opus.ui')
 
 local args       = { ... }
 local colors     = _G.colors

milo/plugins/remote/setup.lua

@@ -1,6 +1,6 @@
-local Config = require('config')
-local UI     = require('ui')
-local Util   = require('util')
+local Config = require('opus.config')
+local UI     = require('opus.ui')
+local Util   = require('opus.util')
 
 local colors = _G.colors
 local fs     = _G.fs

milo/plugins/speakerView.lua

@@ -1,6 +1,6 @@
 local Milo    = require('milo')
-local Sound   = require('sound')
-local UI      = require('ui')
+local Sound   = require('opus.sound')
+local UI      = require('opus.ui')
 
 local colors  = _G.colors
 local device  = _G.device

milo/plugins/statsView.lua

@@ -1,8 +1,8 @@
-local Ansi       = require('ansi')
-local Event      = require('event')
+local Ansi       = require('opus.ansi')
+local Event      = require('opus.event')
 local Milo       = require('milo')
-local UI         = require('ui')
-local Util       = require('util')
+local UI         = require('opus.ui')
+local Util       = require('opus.util')
 
 local colors     = _G.colors
 local context    = Milo:getContext()

milo/plugins/storageView.lua

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

milo/plugins/transferView.lua

@@ -1,8 +1,8 @@
-local Ansi       = require('ansi')
+local Ansi       = require('opus.ansi')
 local Milo       = require('milo')
 local Tasks      = require('milo.taskRunner')
-local UI         = require('ui')
-local Util       = require('util')
+local UI         = require('opus.ui')
+local Util       = require('opus.util')
 
 local colors     = _G.colors
 local device     = _G.device

milo/plugins/trashcanView.lua

@@ -1,6 +1,6 @@
 local Milo  = require('milo')
 local Tasks = require('milo.taskRunner')
-local UI    = require('ui')
+local UI    = require('opus.ui')
 
 local colors   = _G.colors
 local device   = _G.device

milo/plugins/turtleLearn.lua

@@ -1,6 +1,6 @@
 local itemDB = require('core.itemDB')
 local Milo   = require('milo')
-local UI     = require('ui')
+local UI     = require('opus.ui')
 
 local colors = _G.colors
 local turtle = _G.turtle

miners/findSwarm.lua

@@ -1,9 +1,9 @@
-local Event   = require('event')
-local GPS     = require('gps')
-local Point   = require('point')
-local Sound   = require('sound')
+local Event   = require('opus.event')
+local GPS     = require('opus.gps')
+local Point   = require('opus.point')
+local Sound   = require('opus.sound')
 local Swarm   = require('core.swarm')
-local Util    = require('util')
+local Util    = require('opus.util')
 
 local os         = _G.os
 local peripheral = _G.peripheral