aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/gui
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2021-10-25 17:45:32 +0200
committerGitHub <noreply@github.com>2021-10-25 17:45:32 +0200
commit4b324cbc5359852ee756a8ca721ff90a3fcf75eb (patch)
tree0874677be42f6b8d0200187ee4f611665388034b /src/main/java/gregtech/api/gui
parent457687f41a736570202e2d69ec0142f5929c47e4 (diff)
parente8cd377738820bfebb9101e369e13c013871bad2 (diff)
downloadGT5-Unofficial-4b324cbc5359852ee756a8ca721ff90a3fcf75eb.tar.gz
GT5-Unofficial-4b324cbc5359852ee756a8ca721ff90a3fcf75eb.tar.bz2
GT5-Unofficial-4b324cbc5359852ee756a8ca721ff90a3fcf75eb.zip
Merge pull request #706 from GTNewHorizons/fix-flickering
Fix more flickering
Diffstat (limited to 'src/main/java/gregtech/api/gui')
-rw-r--r--src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java24
1 files changed, 12 insertions, 12 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;
}
}