View difference between Paste ID: pchSsrqD and V71Lx1Uv

---0x0B4387
+
---0x4E8741
+
 local storageFunctions
 local textObjects = {}
 local boxObjects = {}
 
 local function addPeripheral(peripheralName,barColor)
   wrappedPeripherals[peripheralName] = peripheral.wrap(peripheralName)
   textObjects[peripheralName] = {}
-local function printInfoText(text)
+  textObjects[peripheralName][1] = terminalGlassesBridge.addText(1,0,"",barColor)
-  textObjects["infoText"] = terminalGlassesBridge.addText(2,2,text,0xFFFFFF)
+  textObjects[peripheralName][2] = terminalGlassesBridge.addText(0,70,"",0xFFFFFF)
   textObjects[peripheralName][2].setScale(0.5)
   textObjects[peripheralName][2].setZIndex(4)
-local function addPeripheral(peripheralName,barColor,label)
+  boxObjects[peripheralName] = {}
-  if not peripheral.getType(peripheralName) then
+  boxObjects[peripheralName][1] = terminalGlassesBridge.addBox(0,66,20,0,barColor,0.8)
-    textObjects["infoText"].setText("Invalid peripheral")
+
-    return
+  boxObjects[peripheralName][2] = terminalGlassesBridge.addBox(0,66,20,0,0x000000,0.5)
-  elseif not storageFunctions[peripheral.getType(peripheralName)] then
+
-    textObjects["infoText"].setText("Function rules not found for peripheral type '"..peripheral.getType(peripheralName).."'. To add them, use the command '$$rule <type> <getStoredRule> <getCapacityRule>', e.g. '$$rule batbox getStored getCapacity' for a BatBox, MFE or MFSU.")
+
-    return
+
 local function updateReadings()
-  if type(barColor) ~= "number" then
+
-    barColor = math.random(0,16777215)
+
     for k,v in pairs(wrappedPeripherals) do
-  if type(label) ~= "string" then
+      textObjects[k][1].setY(peripheralCounter*9+1)
-    label = ""
+      textObjects[k][1].setText(k..": "..tostring(wrappedPeripherals[k][storageFunctions[peripheral.getType(k)][1]]()))
       textObjects[k][2].setText(tostring(math.floor(wrappedPeripherals[k][storageFunctions[peripheral.getType(k)][1]]()/wrappedPeripherals[k][storageFunctions[peripheral.getType(k)][2]]()*100)).."%")
-  if not wrappedPeripherals[peripheralName] then
+
-    wrappedPeripherals[peripheralName] = peripheral.wrap(peripheralName)
+
-    textObjects[peripheralName] = {}
+
-    textObjects[peripheralName][1] = terminalGlassesBridge.addText(0,0,label,0xFFFFFF)
+
-    --textObjects[peripheralName][1] = terminalGlassesBridge.addText(1,0,"",barColor)
+
-    textObjects[peripheralName][2] = terminalGlassesBridge.addText(0,70,"",0xFFFFFF)
+
-    boxObjects[peripheralName] = {}
+
-    boxObjects[peripheralName][1] = terminalGlassesBridge.addBox(0,66,20,0,barColor,0.8)
+
-    boxObjects[peripheralName][2] = terminalGlassesBridge.addBox(0,66,20,0,0x000000,0.5)
+
     boxObjects["backgroundShader"].setWidth(22*peripheralCounter+2)
-  textObjects[peripheralName][1].setText(label)
+
-  textObjects[peripheralName][1].setScale(1.75-#textObjects[peripheralName][1].getText()*0.25)
+
-  textObjects[peripheralName][1].setY(55)
+
 
 local function commandListener()
   while true do
-  boxObjects[peripheralName][1].setColor(barColor)
+
     local eventData = {os.pullEvent("chat_command")}
     for word in string.gmatch(eventData[2],"%S+") do
       table.insert(words,word)
     end
     if words[1] == "add" and not wrappedPeripherals[words[2]] then
       addPeripheral(words[2],math.random(0,16777215))
       for k,v in pairs(words) do
-      --textObjects[k][1].setY(peripheralCounter*9+1)
+        if string.sub(v,1,6) == "color:" then
-      textObjects[k][1].setX(22*peripheralCounter+8)
+          textObjects[words[2]][1].setColor(tonumber(string.match(v,"%d.+")))
-      --textObjects[k][1].setText(k..": "..tostring(wrappedPeripherals[k][storageFunctions[peripheral.getType(k)][1]]()))
+          boxObjects[words[2]][1].setColor(tonumber(string.match(v,"%d.+")))
         elseif string.sub(v,1,6) == "label:" then
           tonumber(string.match(v,"[^:]+$"))
         end
       end
       local fileHandle = io.open(".energyMonitor_peripherals","w")
       for k,v in pairs(wrappedPeripherals) do
         fileHandle:write(textutils.serialize({k,boxObjects[k][1].getColor()}).."\n")
       end
       fileHandle:close()
     elseif words[1] == "remove" then
       wrappedPeripherals[words[2]] = nil
       textObjects[words[2]][1].delete()
       textObjects[words[2]][2].delete()
       textObjects[words[2]] = nil
       boxObjects[words[2]][1].delete()
       boxObjects[words[2]][2].delete()
-
+      boxObjects[words[2]] = nil
-  local function add(words)
+      local fileHandle = io.open(".energyMonitor_peripherals","w")
-    local barColor
+      for k,v in pairs(wrappedPeripherals) do
-    local label = ""
+        fileHandle:write(textutils.serialize({k,boxObjects[k][1].getColor()}).."\n")
-    for k,v in pairs(words) do
+
-      if string.sub(v,1,6) == "color:" then
+      fileHandle:close()
-        barColor = tonumber(string.match(v,"%d.+"))
+    elseif words[1] == "exit" then
-      elseif string.sub(v,1,6) == "label:" then
+      return
-        label = string.match(v,"[^:]+$")
+
   end
 end
-    addPeripheral(words[2],barColor,label)
+
-    local fileHandle = io.open(".energyMonitor_peripherals","w")
+
   if peripheral.getType(v) == "terminal_glasses_bridge" then
-      fileHandle:write(textutils.serialize({k,boxObjects[k][1].getColor(),textObjects[k][1].getText()}).."\n")
+
   end
-    fileHandle:close()
+
 
-
+
-  local function rule(words)
+
-    storageFunctions[words[2]] = {words[3],words[4]}
+
-    local fileHandle = io.open(".energyMonitor_functions","w")
+
-    fileHandle:write(textutils.serialize(storageFunctions))
+
-    fileHandle:close()
+
 if not fs.exists(".energyMonitor_peripherals") then io.open(".energyMonitor_peripherals","w"):close() end
-
+
-  local function remove(words)
+
-    wrappedPeripherals[words[2]] = nil
+
-    textObjects[words[2]][1].delete()
+
-    textObjects[words[2]][2].delete()
+
-    textObjects[words[2]] = nil
+
-    boxObjects[words[2]][1].delete()
+
-    boxObjects[words[2]][2].delete()
+
-    boxObjects[words[2]] = nil
+  addPeripheral(line[1],line[2])
-    local fileHandle = io.open(".energyMonitor_peripherals","w")
+
 fileHandle:close()
-      fileHandle:write(textutils.serialize({k,boxObjects[k][1].getColor()}).."\n")
+
 terminalGlassesBridge.clear()
-    fileHandle:close()
+
 boxObjects["backgroundShader"].setZIndex(1)
-
+parallel.waitForAny(updateReadings,commandListener)
-  local function exit()
+terminalGlassesBridge.clear()