diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-10-25 10:21:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-25 10:21:05 +0200 |
| commit | 457687f41a736570202e2d69ec0142f5929c47e4 (patch) | |
| tree | c32f37f32a2bba01dcb777dfcfffbf24afcdef90 /src/main/java/gregtech | |
| parent | c224095cb6f73941d12adfb0b2e1cd2f144dfd82 (diff) | |
| parent | afb32299855062c311ba8092dcadcaed55e5297e (diff) | |
| download | GT5-Unofficial-457687f41a736570202e2d69ec0142f5929c47e4.tar.gz GT5-Unofficial-457687f41a736570202e2d69ec0142f5929c47e4.tar.bz2 GT5-Unofficial-457687f41a736570202e2d69ec0142f5929c47e4.zip | |
Merge pull request #705 from GTNewHorizons/basic-tank-occassional-negative
Fix quantum tanks fluid amount flickering
Diffstat (limited to 'src/main/java/gregtech')
| -rw-r--r-- | src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java | 4 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/gui/GT_Container_BasicTank.java | 13 |
2 files changed, 11 insertions, 6 deletions
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 12878b6a04..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 @@ -223,10 +228,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; } } |