From 8078a1cfdb934d6f7af09a1ff299d6ab43e23324 Mon Sep 17 00:00:00 2001 From: kepler155c Date: Tue, 26 Sep 2017 01:37:27 -0400 Subject: [PATCH] better startup --- .gitignore | 1 + apps/builder.lua | 5 ----- apps/chestManager.lua | 8 +++++--- apps/mwm.lua | 4 ++-- 4 files changed, 8 insertions(+), 10 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a9004eb --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/etc/fstab diff --git a/apps/builder.lua b/apps/builder.lua index 43a5721..5934647 100644 --- a/apps/builder.lua +++ b/apps/builder.lua @@ -20,11 +20,6 @@ if Util.getVersion() == 1.8 then ChestAdapter = require('chestAdapter18') end -if not _G.device then - local Opus = require('opus') - Opus.loadExtensions() -end - local BUILDER_DIR = 'usr/builder' local schematic = Schematic() diff --git a/apps/chestManager.lua b/apps/chestManager.lua index 9796257..f61c663 100644 --- a/apps/chestManager.lua +++ b/apps/chestManager.lua @@ -32,7 +32,7 @@ if not controller:isValid() then end ---------------------------------------------------------------------- FIX ME -local chestAdapter = ChestAdapter({ direction = 'north', wrapSide = 'colossalchests:colossalChest' }) +local chestAdapter = ChestAdapter({ direction = 'north', wrapSide = 'back' }) local turtleChestAdapter = ChestAdapter({ direction = 'down', wrapSide = 'top' }) local RESOURCE_FILE = 'usr/config/resources.db' @@ -620,9 +620,9 @@ function listingPage.grid:getRowTextColor(row, selected) end if row.has_recipe then if selected then - return colors.blue + return colors.cyan end - return colors.lightBlue + return colors.cyan end return UI.Grid:getRowTextColor(row, selected) end @@ -914,6 +914,8 @@ Event.onInterval(5, function() if not craftingPaused then local items = chestAdapter:listItems() +_G._adapter = chestAdapter +_G._items = items if Util.size(items) == 0 then jobListGrid.parent:clear() jobListGrid.parent:centeredWrite(math.ceil(jobListGrid.parent.height/2), 'No items in system') diff --git a/apps/mwm.lua b/apps/mwm.lua index 8cab342..2bcb88b 100644 --- a/apps/mwm.lua +++ b/apps/mwm.lua @@ -153,7 +153,7 @@ end function Process:focus(focused) if focused then - self.titleBar.setBackgroundColor(colors.green) + self.titleBar.setBackgroundColor(colors.yellow) else self.titleBar.setBackgroundColor(colors.gray) end @@ -337,7 +337,7 @@ local function addShell() self.window.setVisible(focused) if focused then self.window.restoreCursor() - self.container.setTextColor(colors.green) + self.container.setTextColor(colors.yellow) self.container.setBackgroundColor(colors.black) else parentTerm.clear()