aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com
diff options
context:
space:
mode:
authorminecraft7771 <maxim235@gmx.de>2022-07-23 18:51:04 +0200
committerminecraft7771 <maxim235@gmx.de>2022-07-23 18:51:04 +0200
commit57eda603dbf97d975c56d45608fa6796a8149dd9 (patch)
tree25a2c607fb70a7b2df4a4bf4da850a82aa04375a /src/main/java/com
parent8c4b9a40cee6e9f0127a146751b469437fcd279b (diff)
downloadGT5-Unofficial-57eda603dbf97d975c56d45608fa6796a8149dd9.tar.gz
GT5-Unofficial-57eda603dbf97d975c56d45608fa6796a8149dd9.tar.bz2
GT5-Unofficial-57eda603dbf97d975c56d45608fa6796a8149dd9.zip
Added casts to long to fix overflow when doing the bit-manpulation
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java20
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_ParamAdv.java14
2 files changed, 17 insertions, 17 deletions
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java
index d53e0683cd..150bbb1782 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java
@@ -138,12 +138,12 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch {
@Override
public void saveNBTData(NBTTagCompound aNBT) {
super.saveNBTData(aNBT);
- aNBT.setInteger("ePointer", pointer);
+ aNBT.setLong("ePointer", pointer);
aNBT.setDouble("eValue0D", value0D);
aNBT.setDouble("eValue1D", value1D);
aNBT.setDouble("eInput0D", input0D);
aNBT.setDouble("eInput1D", input1D);
- aNBT.setInteger("eParam", param);
+ aNBT.setLong("eParam", param);
}
@Override
@@ -157,15 +157,15 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch {
aNBT.hasKey("eInput1i")){
boolean usesFloat = aNBT.getBoolean("eFloats");
if(usesFloat){
- value0D=Float.intBitsToFloat(aNBT.getInteger("eValue0i"));
- value1D=Float.intBitsToFloat(aNBT.getInteger("eValue1i"));
- input0D=Float.intBitsToFloat(aNBT.getInteger("eInput0i"));
- input1D=Float.intBitsToFloat(aNBT.getInteger("eInput1i"));
+ value0D=Double.longBitsToDouble(aNBT.getLong("eValue0i"));
+ value1D=Double.longBitsToDouble(aNBT.getLong("eValue1i"));
+ input0D=Double.longBitsToDouble(aNBT.getLong("eInput0i"));
+ input1D=Double.longBitsToDouble(aNBT.getLong("eInput1i"));
}else {
- value0D=aNBT.getInteger("eValue0i");
- value1D=aNBT.getInteger("eValue1i");
- input0D=aNBT.getInteger("eInput0i");
- input1D=aNBT.getInteger("eInput1i");
+ value0D=aNBT.getLong("eValue0i");
+ value1D=aNBT.getLong("eValue1i");
+ input0D=aNBT.getLong("eInput0i");
+ input1D=aNBT.getLong("eInput1i");
}
}else{
value0D=aNBT.getDouble("eValue0D");
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_ParamAdv.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_ParamAdv.java
index 44608ec204..9d6a93b026 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_ParamAdv.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_ParamAdv.java
@@ -92,11 +92,11 @@ public class GT_Container_ParamAdv extends GT_ContainerMetaTile_Machine {
} else {
if (secondRow) {
long temp=Double.doubleToLongBits(paramH.value1D);
- temp |= 1 << columnPointer;
+ temp |= 1L << (long)columnPointer;
paramH.value1D=Double.longBitsToDouble(temp);
} else {
long temp=Double.doubleToLongBits(paramH.value0D);
- temp |= 1 << columnPointer;
+ temp |= 1L << (long)columnPointer;
paramH.value0D=Double.longBitsToDouble(temp);
}
}
@@ -128,11 +128,11 @@ public class GT_Container_ParamAdv extends GT_ContainerMetaTile_Machine {
} else {
if (secondRow) {
long temp=Double.doubleToLongBits(paramH.value1D);
- temp &= ~(1 << columnPointer);
+ temp &= ~(1L << (long)columnPointer);
paramH.value1D=Double.longBitsToDouble(temp);
} else {
long temp=Double.doubleToLongBits(paramH.value0D);
- temp &= ~(1 << columnPointer);
+ temp &= ~(1L << (long)columnPointer);
paramH.value0D=Double.longBitsToDouble(temp);
}
}
@@ -185,11 +185,11 @@ public class GT_Container_ParamAdv extends GT_ContainerMetaTile_Machine {
} else {
if (secondRow) {
long temp=Double.doubleToLongBits(paramH.value1D);
- temp ^= 1 << columnPointer;
+ temp ^= 1L << (long)columnPointer;
paramH.value1D=Double.longBitsToDouble(temp);
} else {
long temp=Double.doubleToLongBits(paramH.value0D);
- temp ^= 1 << columnPointer;
+ temp ^= 1L << (long)columnPointer;
paramH.value0D=Double.longBitsToDouble(temp);
}
}
@@ -243,7 +243,7 @@ public class GT_Container_ParamAdv extends GT_ContainerMetaTile_Machine {
@Override
@SideOnly(Side.CLIENT)
public void updateProgressBar(int par1, int par2) {
- super.updateProgressBar(par1, par2);
+ super.updateProgressBar(par1, par2);
switch (par1) {
case 100:
case 101: