Merge pull request #148 from Jonodonozym/master

Add YOTT compatibility beyond integer limit
S4mpsa · Sep 28, 2023 · f8d319a · f8d319a
2 parents 544295c + 6b4ff7a
commit f8d319a
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 3 deletions.
diff --git a/hud/init.lua b/hud/init.lua
@@ -9,6 +9,7 @@ local fluidDisplay = require("hud.fluiddisplay")
 local component = require("component")
 local serialization = require("serialization")
 local colors = require("lib.graphics.colors")
+local parser = require("lib.utils.parser")
 --
 
 local glassData = {}
@@ -184,14 +185,14 @@ local function updateFluidData()
                 local data = fluidMaximums[id]
                 local maximum = 0
                 if not data then
-                    maxium = getMax(amount)
-                    fluidMaximums[id] = {max=maxium, name=name}
+                    maximum = getMax(amount)
+                    fluidMaximums[id] = {max=maximum, name=name}
                     doSave = true
                 else
                     maximum = data.max
                     if data.max < amount then
                         maxium = getMax(amount)
-                        fluidMaximums[id] = {max=maxium, name=name}
+                        fluidMaximums[id] = {max=maximum, name=name}
                         doSave = true
                     end
                 end
@@ -206,6 +207,34 @@ local function updateFluidData()
             saveFluidData()
         end
     end
+
+    -- YOTT tanks
+    for address, _ in pairs(component.list("gt_machine")) do
+        local info = component.proxy(address).getSensorInformation()
+        if (info[1] == "Fluid Name:") then
+            local name = parser.stripColors(info[2])
+            local id = string.lower(string.gsub(name, " ", ""))
+            local amount = parser.getInteger(info[6]) / 10
+            local capacity = parser.getInteger(info[4])
+            local data = fluidMaximums[id]
+            local maximum = 0
+
+            if not data then
+                maximum = getMax(capacity)
+                fluidMaximums[id] = {max=maximum, name=name}
+                doSave = true
+            else
+                maximum = data.max
+                if data.max ~= amount then
+                    maximum = getMax(capacity)
+                    fluidMaximums[id] = {max=maximum, name=name}
+                    doSave = true
+                end
+            end
+
+            fluidData[id] = {amount=amount, name=name, max=maximum, id=id}
+        end
+    end
 end
 
 function hud.updateFluidSettings()

diff --git a/lib/utils/parser.lua b/lib/utils/parser.lua
@@ -51,4 +51,8 @@ end
 function parser.percentage(number) return
     (math.floor(number * 1000) / 10) .. "%" end
 
+function parser.stripColors(string)
+    return string.gsub(string, "§.", "")
+end
+
 return parser