GabrielTofvesson/cc-utilities
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify attaching multiple chests after initializing storage

Browse Source
This commit is contained in:
Gabriel Tofvesson 2024-12-07 02:05:38 +01:00
parent 6b78404821
commit 8d3b351083
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
storage/init.lua
View File

@ -4,6 +4,10 @@ local Sentinel = require("storage.sentinel")
local Storage = Sentinel:tag({}, Sentinel.STORAGE) local Storage = Sentinel:tag({}, Sentinel.STORAGE)
Storage.__index = Storage Storage.__index = Storage
local function _attach(stor, name, homogeneous)
table.insert(stor, Chest:fromPeripheral(name, homogeneous))
end
function Storage.assumeHomogeneous(names) function Storage.assumeHomogeneous(names)
local mappings = {} local mappings = {}
for _,name in ipairs(names) do for _,name in ipairs(names) do
@ -12,12 +16,13 @@ function Storage.assumeHomogeneous(names)
return mappings return mappings
end end
function Storage:fromPeripherals(names) function Storage:fromPeripherals(peripheralDefs)
local obj = { local obj = {
count = #names count = #peripheralDefs
} }
for name,homogeneous in pairs(names) do
table.insert(obj, Chest:fromPeripheral(name, homogeneous)) for name,homogeneous in pairs(peripheralDefs) do
_attach(obj, name, homogeneous)
end end
setmetatable(obj, self) setmetatable(obj, self)
@ -30,6 +35,7 @@ function Storage:toSerializable()
local ser = { local ser = {
count = self.count count = self.count
} }
for _,chest in ipairs(self) do for _,chest in ipairs(self) do
table.insert(ser, chest:toSerializable()) table.insert(ser, chest:toSerializable())
end end
@ -43,10 +49,10 @@ function Storage:fromSerializable(ser)
for _,chestSer in ipairs(ser) do for _,chestSer in ipairs(ser) do
local chest = Chest:fromSerializable(chestSer) local chest = Chest:fromSerializable(chestSer)
if chest ~= nil then if chest ~= nil then
table.insert(obj, chest) table.insert(obj, chest)
end end
end end
setmetatable(obj, self) setmetatable(obj, self)
obj.__index = self obj.__index = self
@ -67,7 +73,14 @@ function Storage:attach(name, homogeneous)
return return
end end
table.insert(self, Chest:fromPeripheral(name, homogeneous)) _attach(self, name, homogeneous)
end
function Storage:attachAll(peripheralDefs)
for name,homogeneous in pairs(peripheralDefs) do
self:attach(name, homogeneous)
end
return self
end end
function Storage:detach(name) function Storage:detach(name)