From fde09b245b4336fa5a7b396d0432d7cc87b06efc Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Mon, 25 Oct 2021 10:19:37 +0800
Subject: Fix quantum tanks fluid amount flickering

par2 Might be negative under certain circumstance, causing the mContent counter to be temporarily negative.
---
 src/main/java/gregtech/api/gui/GT_Container_BasicTank.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/src/main/java/gregtech/api/gui/GT_Container_BasicTank.java b/src/main/java/gregtech/api/gui/GT_Container_BasicTank.java
index 12878b6a04..5a0f13051a 100644
--- a/src/main/java/gregtech/api/gui/GT_Container_BasicTank.java
+++ b/src/main/java/gregtech/api/gui/GT_Container_BasicTank.java
@@ -223,10 +223,10 @@ public class GT_Container_BasicTank extends GT_ContainerMetaTile_Machine {
         super.updateProgressBar(par1, par2);
         switch (par1) {
             case 100:
-                mContent = mContent & -65536 | par2;
+                mContent = mContent & 0xffff0000 | par2 & 0x0000ffff;
                 break;
             case 101:
-                mContent = mContent & 65535 | par2 << 16;
+                mContent = mContent & 0xffff | par2 << 16;
                 break;
         }
     }
-- 
cgit 


From afb32299855062c311ba8092dcadcaed55e5297e Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Mon, 25 Oct 2021 12:20:06 +0800
Subject: Only send mContent when necessary

---
 src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java | 4 ++--
 src/main/java/gregtech/api/gui/GT_Container_BasicTank.java       | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

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

diff --git a/src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java b/src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java
index 5903550a91..c2f2c96b80 100644
--- a/src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java
+++ b/src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java
@@ -36,8 +36,8 @@ public class GT_ContainerMetaTile_Machine extends GT_Container {
             oOutput = 0,
             oInput = 0,
             oID = 0,
-            oDisplayErrorCode = 0,
-            mTimer = 0;
+            oDisplayErrorCode = 0;
+    protected int mTimer = 0;
 
 
     public GT_ContainerMetaTile_Machine(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
diff --git a/src/main/java/gregtech/api/gui/GT_Container_BasicTank.java b/src/main/java/gregtech/api/gui/GT_Container_BasicTank.java
index 5a0f13051a..e8810c14c0 100644
--- a/src/main/java/gregtech/api/gui/GT_Container_BasicTank.java
+++ b/src/main/java/gregtech/api/gui/GT_Container_BasicTank.java
@@ -22,6 +22,7 @@ import net.minecraftforge.fluids.IFluidContainerItem;
 public class GT_Container_BasicTank extends GT_ContainerMetaTile_Machine {
 
     public int mContent = 0;
+    private int oContent = 0;
 
     public GT_Container_BasicTank(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
         super(aInventoryPlayer, aTileEntity);
@@ -212,9 +213,13 @@ public class GT_Container_BasicTank extends GT_ContainerMetaTile_Machine {
             mContent = 0;
         for (Object crafter : this.crafters) {
             ICrafting var1 = (ICrafting) crafter;
-            var1.sendProgressBarUpdate(this, 100, mContent & 65535);
-            var1.sendProgressBarUpdate(this, 101, mContent >>> 16);
+            if (mTimer % 500 == 0 || oContent != mContent) {
+                var1.sendProgressBarUpdate(this, 100, mContent & 65535);
+                var1.sendProgressBarUpdate(this, 101, mContent >>> 16);
+            }
         }
+
+        oContent = mContent;
     }
 
     @Override
-- 
cgit