Merge pull request #706 from GTNewHorizons/fix-flickering

Fix more flickering

4 files changed, 22 insertions, 22 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 c2f2c96b80..26b94a00e4 100644
--- a/src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java
+++ b/src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java
@@ -148,16 +148,16 @@ public class GT_ContainerMetaTile_Machine extends GT_Container {
         super.updateProgressBar(par1, par2);
         switch (par1) {
             case 0:
-                mEnergy = mEnergy & -65536 | par2;
+                mEnergy = mEnergy & 0xffff0000 | par2 & 0x0000ffff;
                 break;
             case 1:
-                mEnergy = mEnergy & 65535 | par2 << 16;
+                mEnergy = mEnergy & 0x0000ffff | par2 << 16;
                 break;
             case 2:
-                mStorage = mStorage & -65536 | par2;
+                mStorage = mStorage & 0xffff0000 | par2 & 0x0000ffff;
                 break;
             case 3:
-                mStorage = mStorage & 65535 | par2 << 16;
+                mStorage = mStorage & 0x0000ffff | par2 << 16;
                 break;
             case 4:
                 mOutput = par2;
@@ -169,16 +169,16 @@ public class GT_ContainerMetaTile_Machine extends GT_Container {
                 mDisplayErrorCode = par2;
                 break;
             case 11:
-                mProgressTime = mProgressTime & -65536 | par2;
+                mProgressTime = mProgressTime & 0xffff0000 | par2;
                 break;
             case 12:
-                mProgressTime = mProgressTime & 65535 | par2 << 16;
+                mProgressTime = mProgressTime & 0x0000ffff | par2 << 16;
                 break;
             case 13:
-                mMaxProgressTime = mMaxProgressTime & -65536 | par2;
+                mMaxProgressTime = mMaxProgressTime & 0xffff0000 | par2 & 0x0000ffff;
                 break;
             case 14:
-                mMaxProgressTime = mMaxProgressTime & 65535 | par2 << 16;
+                mMaxProgressTime = mMaxProgressTime & 0x0000ffff | par2 << 16;
                 break;
             case 15:
                 mID = par2;
@@ -187,16 +187,16 @@ public class GT_ContainerMetaTile_Machine extends GT_Container {
                 mActive = par2;
                 break;
             case 17:
-                mSteam = mSteam & -65536 | par2;
+                mSteam = mSteam & 0xffff0000 | par2 & 0x0000ffff;
                 break;
             case 18:
-                mSteam = mSteam & 65535 | par2 << 16;
+                mSteam = mSteam & 0x0000ffff | par2 << 16;
                 break;
             case 19:
-                mSteamStorage = mSteamStorage & -65536 | par2;
+                mSteamStorage = mSteamStorage & 0xffff0000 | par2 & 0x0000ffff;
                 break;
             case 20:
-                mSteamStorage = mSteamStorage & 65535 | par2 << 16;
+                mSteamStorage = mSteamStorage & 0x0000ffff | par2 << 16;
                 break;
         }
     }
diff --git a/src/main/java/gregtech/common/gui/GT_Container_MicrowaveEnergyTransmitter.java b/src/main/java/gregtech/common/gui/GT_Container_MicrowaveEnergyTransmitter.java
index 0e5cc35e02..96e918e27b 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_MicrowaveEnergyTransmitter.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_MicrowaveEnergyTransmitter.java
@@ -138,25 +138,25 @@ public class GT_Container_MicrowaveEnergyTransmitter extends GT_ContainerMetaTil
         super.updateProgressBar(par1, par2);
         switch (par1) {
             case 100:
-                this.mTargetX = (this.mTargetX & 0xFFFF0000 | par2);
+                this.mTargetX = (this.mTargetX & 0xFFFF0000 | par2 & 0xFFFF);
                 break;
             case 101:
                 this.mTargetX = (this.mTargetX & 0xFFFF | par2 << 16);
                 break;
             case 102:
-                this.mTargetY = (this.mTargetY & 0xFFFF0000 | par2);
+                this.mTargetY = (this.mTargetY & 0xFFFF0000 | par2 & 0xFFFF);
                 break;
             case 103:
                 this.mTargetY = (this.mTargetY & 0xFFFF | par2 << 16);
                 break;
             case 104:
-                this.mTargetZ = (this.mTargetZ & 0xFFFF0000 | par2);
+                this.mTargetZ = (this.mTargetZ & 0xFFFF0000 | par2 & 0xFFFF);
                 break;
             case 105:
                 this.mTargetZ = (this.mTargetZ & 0xFFFF | par2 << 16);
                 break;
             case 106:
-                this.mTargetD = (this.mTargetD & 0xFFFF0000 | par2);
+                this.mTargetD = (this.mTargetD & 0xFFFF0000 | par2 & 0xFFFF);
                 break;
             case 107:
                 this.mTargetD = (this.mTargetD & 0xFFFF | par2 << 16);
diff --git a/src/main/java/gregtech/common/gui/GT_Container_QuantumChest.java b/src/main/java/gregtech/common/gui/GT_Container_QuantumChest.java
index c50bb5ce52..22098a0350 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_QuantumChest.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_QuantumChest.java
@@ -53,10 +53,10 @@ public class GT_Container_QuantumChest 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 & 0x0000ffff | par2 << 16;
                 break;
         }
     }
diff --git a/src/main/java/gregtech/common/gui/GT_Container_Teleporter.java b/src/main/java/gregtech/common/gui/GT_Container_Teleporter.java
index 2337a21c12..2b1bc3b584 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_Teleporter.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_Teleporter.java
@@ -141,25 +141,25 @@ public class GT_Container_Teleporter extends GT_ContainerMetaTile_Machine {
         super.updateProgressBar(par1, par2);
         switch (par1) {
             case 100:
-                this.mTargetX = (this.mTargetX & 0xFFFF0000 | par2);
+                this.mTargetX = (this.mTargetX & 0xFFFF0000 | par2 & 0xFFFF);
                 break;
             case 101:
                 this.mTargetX = (this.mTargetX & 0xFFFF | par2 << 16);
                 break;
             case 102:
-                this.mTargetY = (this.mTargetY & 0xFFFF0000 | par2);
+                this.mTargetY = (this.mTargetY & 0xFFFF0000 | par2 & 0xFFFF);
                 break;
             case 103:
                 this.mTargetY = (this.mTargetY & 0xFFFF | par2 << 16);
                 break;
             case 104:
-                this.mTargetZ = (this.mTargetZ & 0xFFFF0000 | par2);
+                this.mTargetZ = (this.mTargetZ & 0xFFFF0000 | par2 & 0xFFFF);
                 break;
             case 105:
                 this.mTargetZ = (this.mTargetZ & 0xFFFF | par2 << 16);
                 break;
             case 106:
-                this.mTargetD = (this.mTargetD & 0xFFFF0000 | par2);
+                this.mTargetD = (this.mTargetD & 0xFFFF0000 | par2 & 0xFFFF);
                 break;
             case 107:
                 this.mTargetD = (this.mTargetD & 0xFFFF | par2 << 16);