From 16dc222b95a9b45258a678f7b884121c4ba25a8a Mon Sep 17 00:00:00 2001
From: Matej Dipčár <492666@mail.muni.cz>
Date: Thu, 22 Sep 2022 03:14:01 +0200
Subject: Abstract `convertRatioToRedstone` properly

---
 src/main/java/gregtech/api/util/GT_Utility.java | 27 +++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

(limited to 'src/main/java/gregtech/api/util')

diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index 706694d6dd..f7fd9ce914 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -4254,10 +4254,29 @@ public class GT_Utility {
         return Textures.BlockIcons.ERROR_TEXTURE_INDEX;
     }
 
-    public static byte convertRatioToRedstone(long value, long max) {
-        if (value <= 0) return 0;               // Empty
-        if (value >= max) return 15;            // Full
-        return (byte) (1 + (14 * value) / max); // Range 1-14
+    public static byte convertRatioToRedstone(long used, long max, int threshold, boolean inverted) {
+        byte signal;
+        if (used <= 0) {           // Empty
+            signal = 0;
+        } else if (used >= max) {  // Full
+            signal = 15;
+        } else {                    // Range 1-14
+            signal = (byte) (1 + (14 * used) / max);
+        }
+
+        if (inverted) {
+            signal = (byte) (15 - signal);
+        }
+
+        if (threshold > 0) {
+            if (inverted && used >= threshold) {
+                return 0;
+            } else if (!inverted && used < threshold) {
+                return 0;
+            }
+        }
+
+        return signal;
     }
 
     @AutoValue
-- 
cgit