MayaTheShy/opus-apps
1
0
Fork 0
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

chest manager config

Browse Source
This commit is contained in:
kepler155c
2017-09-26 18:51:27 -04:00
parent 8078a1cfdb
commit e5215bb5b0
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
apps/chestManager.lua
View File

@@ -19,11 +19,12 @@ multishell.setTitle(multishell.getCurrent(), 'Resource Manager')
-- adjust directions in that file if needed -- adjust directions in that file if needed
local config = { local config = {
trashDirection = 'up', -- trash /chest in relation to chest trashDirection = 'up', -- trash /chest in relation to chest
turtleDirection = 'down', -- turtle in relation to chest inventoryDirection = { direction = 'north', wrapSide = 'back' },
chestDirection = { direction = 'down', wrapSide = 'top' },
} }
Config.load('resourceManager', config) Config.load('chestManager', config)
local controller = RefinedAdapter() local controller = RefinedAdapter()
if not controller:isValid() then if not controller:isValid() then
@@ -32,8 +33,8 @@ if not controller:isValid() then
end end
---------------------------------------------------------------------- FIX ME ---------------------------------------------------------------------- FIX ME
local chestAdapter = ChestAdapter({ direction = 'north', wrapSide = 'back' }) local inventoryAdapter = ChestAdapter(config.inventoryDirection)
local turtleChestAdapter = ChestAdapter({ direction = 'down', wrapSide = 'top' }) local turtleChestAdapter = ChestAdapter(config.chestDirection)
local RESOURCE_FILE = 'usr/config/resources.db' local RESOURCE_FILE = 'usr/config/resources.db'
local RECIPES_FILE = 'usr/etc/recipes.db' local RECIPES_FILE = 'usr/etc/recipes.db'
@@ -171,7 +172,7 @@ local function clearGrid()
for i = 1, 16 do for i = 1, 16 do
local count = turtle.getItemCount(i) local count = turtle.getItemCount(i)
if count > 0 then if count > 0 then
chestAdapter:insert(i, count) inventoryAdapter:insert(i, count)
if turtle.getItemCount(i) ~= 0 then if turtle.getItemCount(i) ~= 0 then
return false return false
end end
@@ -206,9 +207,9 @@ local function craftItem(recipe, items, originalItem, craftList, count)
end end
if toCraft > 0 then if toCraft > 0 then
Craft.craftRecipe(recipe, toCraft, chestAdapter) Craft.craftRecipe(recipe, toCraft, inventoryAdapter)
clearGrid() clearGrid()
items = chestAdapter:listItems() items = inventoryAdapter:listItems()
end end
count = count - toCraft count = count - toCraft
@@ -232,7 +233,7 @@ local function craftItems(craftList, allItems)
local recipe = recipes[key] local recipe = recipes[key]
if recipe then if recipe then
craftItem(recipe, allItems, item, craftList, item.count) craftItem(recipe, allItems, item, craftList, item.count)
allItems = chestAdapter:listItems() -- refresh counts allItems = inventoryAdapter:listItems() -- refresh counts
elseif item.rsControl then elseif item.rsControl then
item.status = 'Activated' item.status = 'Activated'
end end
@@ -360,7 +361,7 @@ local function watchResources(items)
end end
if res.limit and item.count > res.limit then if res.limit and item.count > res.limit then
chestAdapter:provide( inventoryAdapter:provide(
{ name = item.name, damage = item.damage }, { name = item.name, damage = item.damage },
item.count - res.limit, item.count - res.limit,
nil, nil,
@@ -717,7 +718,7 @@ function listingPage:enable()
end end
function listingPage:refresh() function listingPage:refresh()
self.allItems = chestAdapter:listItems() self.allItems = inventoryAdapter:listItems()
mergeResources(self.allItems) mergeResources(self.allItems)
self:applyFilter() self:applyFilter()
end end
@@ -913,9 +914,7 @@ jobMonitor()
Event.onInterval(5, function() Event.onInterval(5, function()
if not craftingPaused then if not craftingPaused then
local items = chestAdapter:listItems() local items = inventoryAdapter:listItems()
_G._adapter = chestAdapter
_G._items = items
if Util.size(items) == 0 then if Util.size(items) == 0 then
jobListGrid.parent:clear() jobListGrid.parent:clear()
jobListGrid.parent:centeredWrite(math.ceil(jobListGrid.parent.height/2), 'No items in system') jobListGrid.parent:centeredWrite(math.ceil(jobListGrid.parent.height/2), 'No items in system')