diff --git a/keypadOS.lua b/keypadOS.lua index efb0afe..6d784bd 100644 --- a/keypadOS.lua +++ b/keypadOS.lua @@ -94,6 +94,14 @@ rawset(__BUNDLER_FILES, "ui.lua", function () --- @field unlockDoor function --- @field addToPin function --- @param ui Ui + local function resetEverything(ui) + sleep(2) + ui.pin = "" + ui.pinLabel:setText("") + redstone.setOutput("front", false) + ui.enterButton:setBackground(colors.blue) + end + --- @param ui Ui local function unlockDoor(ui) if drive.isDiskPresent() then if drive.getDiskLabel() == config.correctPin then @@ -118,18 +126,10 @@ rawset(__BUNDLER_FILES, "ui.lua", function () ui.enterButton:setBackground(colors.red) end ui.main:addThread():start(function() - ui.resetEverything(ui) + resetEverything(ui) end) end --- @param ui Ui - local function resetEverything(ui) - sleep(2) - ui.pin = "" - ui.pinLabel:setText("") - redstone.setOutput("front", false) - ui.enterButton:setBackground(colors.blue) - end - --- @param ui Ui local function addToPin(ui, i) if #ui.pin >= 5 then return @@ -139,9 +139,6 @@ rawset(__BUNDLER_FILES, "ui.lua", function () end function mod.InitUi() local ui = { - resetEverything, - unlockDoor, - addToPin, pin = "", main = basalt.addMonitor(), } diff --git a/src/ui.lua b/src/ui.lua index fe2ddcc..19063fb 100644 --- a/src/ui.lua +++ b/src/ui.lua @@ -18,6 +18,15 @@ local mod = {} --- @field unlockDoor function --- @field addToPin function +--- @param ui Ui +local function resetEverything(ui) + sleep(2) + ui.pin = "" + ui.pinLabel:setText("") + redstone.setOutput("front", false) + ui.enterButton:setBackground(colors.blue) +end + --- @param ui Ui local function unlockDoor(ui) if drive.isDiskPresent() then @@ -45,19 +54,10 @@ local function unlockDoor(ui) ui.enterButton:setBackground(colors.red) end ui.main:addThread():start(function() - ui.resetEverything(ui) + resetEverything(ui) end) end ---- @param ui Ui -local function resetEverything(ui) - sleep(2) - ui.pin = "" - ui.pinLabel:setText("") - redstone.setOutput("front", false) - ui.enterButton:setBackground(colors.blue) -end - --- @param ui Ui local function addToPin(ui, i) @@ -71,9 +71,6 @@ end function mod.InitUi() local ui = { - resetEverything, - unlockDoor, - addToPin, pin = "", main = basalt.addMonitor(), }