From 5c28bc736ff7e5e5bc59e7522e034407b8c305ff Mon Sep 17 00:00:00 2001 From: "kepler155c@gmail.com" Date: Fri, 7 Dec 2018 13:43:33 -0500 Subject: [PATCH] milo: tweaks --- core/apis/itemDB.lua | 3 +++ milo/Milo.lua | 13 ++++--------- milo/MiloRemote.lua | 1 - milo/plugins/remote.lua | 1 + 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/core/apis/itemDB.lua b/core/apis/itemDB.lua index eec7ce8..a5adfa4 100644 --- a/core/apis/itemDB.lua +++ b/core/apis/itemDB.lua @@ -142,6 +142,9 @@ function itemDB:add(baseItem) -- disks elseif baseItem.media then -- don't ignore nbt... as disks can be labeled + if baseItem.media.recordTitle then + nItem.displayName = nItem.displayName .. ': ' .. baseItem.media.recordTitle + end -- potions elseif nItem.name == 'minecraft:potion' or nItem.name == 'minecraft:lingering_potion' then diff --git a/milo/Milo.lua b/milo/Milo.lua index 4d06bc0..ab7b60e 100644 --- a/milo/Milo.lua +++ b/milo/Milo.lua @@ -1,23 +1,17 @@ --[[ - Provides: autocrafting, resource limits, on-demand crafting, storage stocker. - - Using a turtle allows for crafting of items eliminating the need for AE/RS - molecular assemblers / crafters. + Provides: autocrafting, resource limits, on-demand crafting. Turtle crafting: 1. The turtle must have a crafting table equipped. 2. Equip the turtle with an introspection module. ]]-- - --- TODO: fix which is primary wired modem - _G.requireInjector(_ENV) local Config = require('config') local Event = require('event') local Milo = require('milo') -local Peripheral = require('peripheral') +local Sound = require('sound') local Storage = require('storage') local UI = require('ui') local Util = require('util') @@ -145,9 +139,9 @@ context.storage.turtleInventory = context.turtleInventory local function loadDirectory(dir) for _, file in pairs(fs.list(dir)) do -_debug('loading: ' .. file) local s, m = Util.run(_ENV, fs.combine(dir, file)) if not s and m then + _G.printError('Error loading: ' .. file) error(m or 'Unknown error') end end @@ -169,6 +163,7 @@ end Milo:clearGrid() UI:setPage(UI:getPage('listing')) +Sound.play('ui.toast.challenge_complete') local processing diff --git a/milo/MiloRemote.lua b/milo/MiloRemote.lua index 4a36429..ee9853f 100644 --- a/milo/MiloRemote.lua +++ b/milo/MiloRemote.lua @@ -329,7 +329,6 @@ function page.grid:eventHandler(event) end function page:transfer(item, count, msg) - --Sound.play('ui.button.click', .3) self:sendRequest({ request = 'transfer', item = item, count = count }, msg) end diff --git a/milo/plugins/remote.lua b/milo/plugins/remote.lua index 2aaab82..e0398e2 100644 --- a/milo/plugins/remote.lua +++ b/milo/plugins/remote.lua @@ -139,6 +139,7 @@ local function client(socket) nil, request.requested, data.item) + local item = Milo:listItems()[request.key] socket:write({ type = 'transfer',