1.20.1 version update

lib/button.lua

@@ -75,6 +75,8 @@ function checkxy(x, y)
 end
 
 function clickEvent()
+   while true do
       local myEvent={os.pullEvent("monitor_touch")}
       checkxy(myEvent[3], myEvent[4])
    end
+end

reactor.lua

@@ -9,13 +9,11 @@ local lowFieldPer = 15
 
 local activateOnCharge = true
 
-local version = 0.2
+local version = 0.3
 
 local autoInputGate = 1
 local curInputGate = 222000
 
-
-
 local mon, monitor, monX, monY
 
 local reactor
@@ -30,20 +28,106 @@ local emergencyCharge = false
 local emergencyTemp = false
 
 monitor = f.periphSearch("monitor")
-inputFluxgate = f.periphSearch("flux_gate")
+-- inputFluxgate = f.periphSearch("flow_gate")
-fluxgate = f.getPeripheral("flux_gate")
+-- fluxgate = f.getPeripheral("flow_gate")
-reactor = f.getPeripheral("draconic_reactor")
+reactor = f.periphSearch("draconic_reactor")
+
+function detectFlowGates()
+    local gates = {peripheral.find("flow_gate")}
+    if #gates < 2 then
+        error("Error: Less than 2 flow gates detected!")
+        return nil, nil
+    end
+
+    print("Please set input flow gate to **10 RF/t** manually.")
+
+    local inputGate, outputGate, inputName, outputName
+
+    while not inputGate do
+        sleep(1)  -- Wait before checking again
+
+        for _, name in pairs(peripheral.getNames()) do
+            if peripheral.getType(name) == "flow_gate" then
+                local gate = peripheral.wrap(name)
+                local setFlow = gate.getSignalLowFlow()
+
+                if setFlow == 10 then
+                    inputGate, inputName = gate, name
+                    print("Detected input gate:", name)
+                else
+                    outputGate, outputName = gate, name
+                end
+            end
+        end
+    end
+
+    if not outputGate then
+        print("Error: Could not identify output gate!")
+        return nil, nil
+    end
+
+    return inputGate, outputGate, inputName, outputName
+end
+
+function saveFlowGateNames(inputName, outputName)
+    local file = fs.open("flowgate_names.txt", "w")
+    file.writeLine(inputName)
+    file.writeLine(outputName)
+    file.close()
+    print("Saved flow gate names for reboot!")
+end
+
+function loadFlowGateNames()
+    if not fs.exists("flowgate_names.txt") then
+        print("No saved flow gate names found! Running detection again...")
+        return nil, nil, nil, nil
+    end
+
+    local file = fs.open("flowgate_names.txt", "r")
+    local inputName = file.readLine()
+    local outputName = file.readLine()
+    file.close()
+
+    print("Loaded saved flow gate names:", inputName, outputName)
+
+    if peripheral.isPresent(inputName) and peripheral.isPresent(outputName) then
+        return peripheral.wrap(inputName), peripheral.wrap(outputName), inputName, outputName
+    else
+        print("Saved peripherals not found! Running detection again...")
+        return nil, nil, nil, nil
+    end
+end
+
+function setupFlowGates()
+    -- Try to load saved names
+    local inputFluxgate, outputFluxgate, inputName, outputName = loadFlowGateNames()
+
+    -- If names don't exist, detect manually
+    if not inputFluxgate or not outputFluxgate then
+        inputFluxgate, outputFluxgate, inputName, outputName = detectFlowGates()
+        if inputFluxgate and outputFluxgate then
+            saveFlowGateNames(inputName, outputName)
+        else
+            error("Flow gate setup failed! Make sure to set the input flow gate to 10 before running the script again!")
+            return nil, nil
+        end
+    end
+
+    return inputFluxgate, outputFluxgate
+end
+
+inputFluxgate, fluxgate = setupFlowGates()
 
 if monitor == nil then
 	error("No valid monitor was found")
 end
 
 if fluxgate == nil then
-	error("No valid fluxgate was found")
+	error("No valid flow gate was found")
 end
 
 if inputFluxgate == nil then
-	error("No input fluxgate was found")
+	error("No input flow gate was found. Please put the low signal value to 10")
 end
 
 if reactor == nil then
@@ -73,7 +157,6 @@ end
 
 function load_config()
 	sr = fs.open("reactorconfig.txt", "r")
-	version = sr.readLine()
 	autoInputGate = tonumber(sr.readLine())
 	curInputGate = tonumber(sr.readLine())
 	sr.close()
@@ -106,18 +189,40 @@ function reactorStatus(r)
 	return tbl
 end
 
+local lastTerminalValues = {}
+
+function drawTerminalText(x, y, label, newValue)
+    local key = label  -- Use label as key to track changes
+
+    -- Only update if the value changed
+    if lastTerminalValues[key] ~= newValue then
+        term.setCursorPos(x, y)
+        term.clearLine()  -- Clear only the current line
+        term.write(label .. ": " .. newValue)
+        lastTerminalValues[key] = newValue  -- Store new value
+    end
+end
+
 function reactorControl()
+	reset()
+    while true do
         ri = reactor.getReactorInfo()
         
+        --reset()
+
         if ri == nil then
             error("Reactor not setup correctly")
         end
 
+		local i = 1
         for k, v in pairs(ri) do
-		print(k..": "..tostring(v))
+            drawTerminalText(1, i, k, tostring(v))
+			i = i + 1
         end
-	print("Output Gate: ", fluxgate.getSignalLowFlow())
+		i = i + 1
-	print("Input Gate: ", inputFluxgate.getSignalLowFlow())
+		drawTerminalText(1, i, "Output Gate", fluxgate.getSignalLowFlow()) 
+        i = i + 1
+		drawTerminalText(1, i, "Input Gate", inputFluxgate.getSignalLowFlow())
 
         if emergencyCharge == true then
             reactor.chargeReactor()
@@ -140,19 +245,17 @@ function reactorControl()
         if ri.status == "running" then
             if autoInputGate == 1 then
                 fluxval = ri.fieldDrainRate / (1 - (targetStrength/100))
-			print("Target Gate: "..fluxval)
+				i = i + 1
+				drawTerminalText(1, i, "Target Gate", fluxval)
                 inputFluxgate.setSignalLowFlow(fluxval)
             else
                 inputFluxgate.setSignalLowFlow(curInputGate)
             end
         end
 
-	--safe guards
+        -- Safe guards
-	local fuelPercent
+        local fuelPercent = 100 - math.ceil(ri.fuelConversion / ri.maxFuelConversion * 10000)*.01
-    fuelPercent = 100 - math.ceil(ri.fuelConversion / ri.maxFuelConversion * 10000)*.01
+        local fieldPercent = math.ceil(ri.fieldStrength / ri.maxFieldStrength * 10000)*.01
-	
-	local fieldPercent
-    fieldPercent = math.ceil(ri.fieldStrength / ri.maxFieldStrength * 10000)*.01
 
         if fuelPercent <= 10 then
             reactor.stopReactor()
@@ -178,11 +281,27 @@ function reactorControl()
             emergencyTemp = true
         end
 
-	sleep(0.2)
+        sleep(0.5) -- Prevents excessive CPU usage
+    end
 end
 
+
 local MenuText = "Loading..."
 
+function clearMenuArea()
+    -- Ensure we clear enough space for buttons
+    for i = 26, monY-1 do
+        f.draw_line(mon, 2, i, monX-2, colors.black)
+    end
+    button.clearTable() -- Clear stored button references
+
+	f.draw_line(mon, 2, 26, monX-2, colors.gray)  -- Redraw top of the menu box
+	f.draw_line(mon, 2, monY-1, monX-2, colors.gray)  -- Redraw bottom border
+	f.draw_line_y(mon, 2, 26, monY-1, colors.gray)  -- Left border
+	f.draw_line_y(mon, monX-1, 26, monY-1, colors.gray)  -- Right border
+	f.draw_text(mon, 4, 26, " "..MenuText.." ", colors.white, colors.black)
+end
+
 function toggleReactor()
 	ri = reactor.getReactorInfo()
 
@@ -206,18 +325,18 @@ function rebootSystem()
 end
 
 function buttonControls()
-
+    if currentMenu == "controls" then return end
-	mon.clear()
+    currentMenu = "controls"
-	button.clearTable()
 	
     MenuText = "CONTROLS"
 
-	local sLength = 4+(string.len("Toggle Reactor")+1)
+    clearMenuArea() -- Clear old buttons
 
-	button.setButton("toggle", "Toggle Reactor", toggleReactor, 4, 28, sLength, 30, 0, 0, colors.blue)
+    local sLength = 6+(string.len("Toggle Reactor")+1)
+    button.setButton("toggle", "Toggle Reactor", toggleReactor, 6, 28, sLength, 30, 0, 0, colors.blue)
 
-	local sLength2 = (sLength+10+(string.len("Reboot")+1))
+    local sLength2 = (sLength+12+(string.len("Reboot"))+1)
-	button.setButton("reboot", "Reboot", rebootSystem, sLength+10, 28, sLength2, 30, 0, 0, colors.blue)
+    button.setButton("reboot", "Reboot", rebootSystem, sLength+12, 28, sLength2, 30, 0, 0, colors.blue)
 
     local sLength3 = 4+(string.len("Back")+1)
     button.setButton("back", "Back", buttonMain, 4, 32, sLength3, 34, 0, 0, colors.blue)
@@ -234,14 +353,17 @@ function changeOutputValue(num, val)
 		cFlow = cFlow-num
 	end
 	fluxgate.setSignalLowFlow(cFlow)
+	updateReactorInfo()
 end
 
 function outputMenu()
-
+    if currentMenu == "output" then return end
-	button.clearTable()
+    currentMenu = "output"
 
 	MenuText = "OUTPUT"
 
+    clearMenuArea() -- Clear old buttons
+
     local sLengthX = monX-3-(string.len(">>>")+1)
     local sLength = sLengthX+string.len(">>>")+1
     button.setButton("+100,000", ">>>", changeOutputValue, sLengthX, 28, sLength, 30, 100000, 1, colors.blue)
@@ -254,7 +376,6 @@ function outputMenu()
     local sLength3 = sLengthX3+string.len(">")+1
     button.setButton("+1,000", ">", changeOutputValue, sLengthX3, 28, sLength3, 30, 1000, 1, colors.blue)
 
-
     local nLength = 4+(string.len("<<<")+1)
     button.setButton("-100,000", "<<<", changeOutputValue, 4, 28, nLength, 30, 100000, 0, colors.blue)
 
@@ -267,16 +388,17 @@ function outputMenu()
     local sLength4 = 4+(string.len("Back")+1)
     button.setButton("back", "Back", buttonMain, 4, 32, sLength4, 34, 0, 0, colors.blue)
 
-
+    button.screen()
 end
 
 function buttonMain()
-
+    if currentMenu == "main" then return end
-	mon.clear()
+    currentMenu = "main"
-	button.clearTable()
 
     MenuText = "MAIN MENU"
 
+    clearMenuArea() -- Clear old buttons
+
     local sLength = 4+(string.len("Controls")+1)
     button.setButton("controls", "Controls", buttonControls, 4, 28, sLength, 30, 0, 0, colors.blue)
 
@@ -284,91 +406,100 @@ function buttonMain()
     button.setButton("output", "Output", outputMenu, sLength+13, 28, sLength2, 30, 0, 0, colors.blue)
 
     button.screen()
-
 end
 
-function reactorInfoScreen()
+local lastValues = {}
 
-	reset()
+function reactorInfoScreen()
     mon.clear()
 
     f.draw_text(mon, 2, 38, "Made by: StormFusions  v"..version, colors.gray, colors.black)
 
-	--Info Box
+    -- Draw Static UI Elements (Frames, Labels)
     f.draw_line(mon, 2, 22, monX-2, colors.gray)
     f.draw_line(mon, 2, 2, monX-2, colors.gray)
-	
     f.draw_line_y(mon, 2, 2, 22, colors.gray)
     f.draw_line_y(mon, monX-1, 2, 22, colors.gray)
     f.draw_text(mon, 4, 2, " INFO ", colors.white, colors.black)
 
-	--Button Box
     f.draw_line(mon, 2, 26, monX-2, colors.gray)
     f.draw_line(mon, 2, monY-1, monX-2, colors.gray)
-
     f.draw_line_y(mon, 2, 26, monY-1, colors.gray)
     f.draw_line_y(mon, monX-1, 26, monY-1, colors.gray)
     f.draw_text(mon, 4, 26, " "..MenuText.." ", colors.white, colors.black)
 
-	--f.draw_text(mon, 5, 28, MenuText, colors.white, colors.black)
+    -- Loop to continuously update screen
+    while true do
+        updateReactorInfo()
+        sleep(1)
+    end
+end
 
+
+function updateReactorInfo()
     ri = reactor.getReactorInfo()
 	
-	local stat = reactorStatus(ri.status)
+    if not ri then return end
 
-	f.draw_text_lr(mon, 4, 4, 3, "Status:", stat[1], colors.white, stat[2], colors.black)
+    -- Update only when values change
-	f.draw_text_lr(mon, 4, 5, 3, "Generation:", f.format_int(ri.generationRate).." rf/t", colors.white, colors.lime, colors.black)
+    drawUpdatedText(4, 4, "Status:", reactorStatus(ri.status)[1], reactorStatus(ri.status)[2])
+    drawUpdatedText(4, 5, "Generation:", f.format_int(ri.generationRate).." rf/t", colors.lime)
 
-	local tempColor = colors.red
+    local tempColor = getTempColor(ri.temperature)
-	if ri.temperature <= 5000 then tempColor = colors.green end
+    drawUpdatedText(4, 7, "Temperature:", f.format_int(ri.temperature).."C", tempColor)
-	if ri.temperature >= 5000 and ri.temperature <= 6500 then tempColor = colors.orange end
-	f.draw_text_lr(mon, 4, 7, 3, "Temperature:", f.format_int(ri.temperature).."C", colors.white, tempColor, colors.black)
 
-	f.draw_text_lr(mon, 4, 9, 3, "Output Gate:", f.format_int(fluxgate.getSignalLowFlow()).." rf/t", colors.white, colors.lightBlue, colors.black)
+    drawUpdatedText(4, 9, "Output Gate:", f.format_int(fluxgate.getSignalLowFlow()).." rf/t", colors.lightBlue)
-	f.draw_text_lr(mon, 4, 10, 3, "Input Gate:", f.format_int(inputFluxgate.getSignalLowFlow()).." rf/t", colors.white, colors.lightBlue, colors.black)
+    drawUpdatedText(4, 10, "Input Gate:", f.format_int(inputFluxgate.getSignalLowFlow()).." rf/t", colors.lightBlue)
 
-	local satPercent 
+    local satPercent = getPercentage(ri.energySaturation, ri.maxEnergySaturation)
-	satPercent = math.ceil(ri.energySaturation / ri.maxEnergySaturation * 10000)*.01
+    drawUpdatedText(4, 12, "Energy Saturation:", satPercent.."%", colors.green)
-
-	f.draw_text_lr(mon, 4, 12, 3, "Energy Saturation:", satPercent.."%", colors.white, colors.green, colors.black)
     f.progress_bar(mon, 4, 13, monX-7, satPercent, 100, colors.green, colors.lightGray)
 
-	local fieldPercent, fieldColor
+    local fieldPercent = getPercentage(ri.fieldStrength, ri.maxFieldStrength)
-	fieldPercent = math.ceil(ri.fieldStrength / ri.maxFieldStrength * 10000)*.01
+    local fieldColor = getFieldColor(fieldPercent)
-
+    drawUpdatedText(4, 15, "Field Strength:", fieldPercent.."%", fieldColor)
-	fieldColor = colors.red
-	if fieldPercent >= 50 then fieldColor = colors.blue end
-	if fieldPercent < 50 and fieldPercent > 30 then fieldColor = colors.orange end
-
-	if autoInputGate == 1 then
-		f.draw_text_lr(mon, 4, 15, 3, "Field Strength T:"..targetStrength, fieldPercent.."%", colors.white, fieldColor, colors.black)
-	else
-		f.draw_text_lr(mon, 4, 15, 3, "Field Strength:", fieldPercent.."%", colors.white, fieldColor, colors.black)
-	end
     f.progress_bar(mon, 4, 16, monX-7, fieldPercent, 100, fieldColor, colors.lightGray)
 
-	local fuelPercent, fuelColor
+    local fuelPercent = 100 - getPercentage(ri.fuelConversion, ri.maxFuelConversion)
-	fuelPercent = 100 - math.ceil(ri.fuelConversion / ri.maxFuelConversion * 10000)*.01
+    local fuelColor = getFuelColor(fuelPercent)
-
+    drawUpdatedText(4, 18, "Fuel:", fuelPercent.."%", fuelColor)
-	fuelColor = colors.red
-	if fuelPercent >=70 then fuelColor = colors.green end
-	if fuelPercent < 70 and fuelPercent > 30 then fuelColor = colors.orange end
-
-	f.draw_text_lr(mon, 4, 18, 3, "Fuel:", fuelPercent.."%", colors.white, fuelColor, colors.black)
-
     f.progress_bar(mon, 4, 19, monX-7, fuelPercent, 100, fuelColor, colors.lightGray)
-
-	sleep(1.25)
-
-	while true do
-		parallel.waitForAny(reactorInfoScreen, reactorControl, button.clickEvent)
 end
 
+function drawUpdatedText(x, y, label, value, color)
+    local key = label
+    if lastValues[key] ~= value then
+		f.draw_text(mon, x, y, "       ", colors.white, colors.black)
+        f.draw_text_lr(mon, x, y, 3, label, value, colors.white, color, colors.black)
+        lastValues[key] = value
+    end
+end
+
+function getTempColor(temp)
+    if temp <= 5000 then return colors.green end
+    if temp <= 6500 then return colors.orange end
+    return colors.red
+end
+
+function getFieldColor(percent)
+    if percent >= 50 then return colors.blue end
+    if percent > 30 then return colors.orange end
+    return colors.red
+end
+
+function getFuelColor(percent)
+    if percent >= 70 then return colors.green end
+    if percent > 30 then return colors.orange end
+    return colors.red
+end
+
+function getPercentage(value, maxValue)
+    return math.ceil(value / maxValue * 10000) * 0.01
 end
 
 mon.clear()
 mon.monitor.setTextScale(0.5)
 
-buttonMain()
+buttonMain() -- Initialize buttons before the event listener
 
-reactorInfoScreen()
+parallel.waitForAny(reactorInfoScreen, reactorControl, button.clickEvent)