diff --git a/src/.beta-installer.lua b/src/.beta-installer.lua index cfe7963..3e98c68 100644 --- a/src/.beta-installer.lua +++ b/src/.beta-installer.lua @@ -43,6 +43,7 @@ local function traverse_and_download(folder_data, prefix) local response = http.get(subdir_url) if response then local body = response.readAll() + if not body then return end response.close() local subdir_data = textutils.unserializeJSON(body) traverse_and_download(subdir_data, prefix .. dir.href) diff --git a/src/lib/primeui.lua b/src/lib/primeui.lua index 39dc1df..40c9485 100644 --- a/src/lib/primeui.lua +++ b/src/lib/primeui.lua @@ -1,6 +1,9 @@ -- PrimeUI by JackMacWindows -- Public domain/CC0 +---@alias window ccTweaked.term.Redirect +---@alias color integer + local expect = require "cc.expect".expect -- Initialization code diff --git a/src/modules/inv.lua b/src/modules/inv.lua index 3e8a3a8..dcc56dd 100644 --- a/src/modules/inv.lua +++ b/src/modules/inv.lua @@ -30,7 +30,7 @@ local function sync() print("Synced."); end ---@param itemName string ----@param perip ccTweaked.peripheral.Inventory|nil +---@param perip ccTweaked.peripheral.Inventory|string|nil ---@param maxAmount number|nil local function sendItemToSelf(itemName, perip, maxAmount) if perip == nil then @@ -62,7 +62,7 @@ local function sendItemToSelf(itemName, perip, maxAmount) local ok, moved = pcall(function() ail.performTransfer() - --chatbox.tell("hartbreix", tostring(perip) .. " <> " .. tostring(itemName) .. " <> " .. tostring(toSend) .. " <> " .. tostring(chosenNBT), "debug") + local amount = ail.pushItems(perip, itemName, toSend, nil, chosenNBT, { ["allowBadTransfers"] = true, ["optimal"] = true @@ -96,6 +96,8 @@ local function sendItemAwayMultiple(slots, perip, id, maxAmount) end local srcId = id or turtleId + if srcId == nil then return end + local itemsInSlots = {} for _, slot in ipairs(slots) do local item = perip.getItemDetail(slot) diff --git a/src/modules/ui.lua b/src/modules/ui.lua index 3cf09b1..7fec5e6 100644 --- a/src/modules/ui.lua +++ b/src/modules/ui.lua @@ -23,7 +23,7 @@ local function runUi() return refiltered end - local com = getFiltered("") + local com = getFiltered() PrimeUI.clear() local updateEntries = PrimeUI.selectionBox(