aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-12-16 19:51:32 +0100
committerTechnus <daniel112092@gmail.com>2017-12-16 19:51:32 +0100
commit73a464172d6c003f4389d954613804c22146a5f5 (patch)
treea234a4189cff8616a30c9abaaca7c1fd8602aaab /src
parent1a582d7e629e8b83c31eedd8fcb59458195e317b (diff)
downloadGT5-Unofficial-73a464172d6c003f4389d954613804c22146a5f5.tar.gz
GT5-Unofficial-73a464172d6c003f4389d954613804c22146a5f5.tar.bz2
GT5-Unofficial-73a464172d6c003f4389d954613804c22146a5f5.zip
Fix errors
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java13
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java5
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java4
3 files changed, 14 insertions, 8 deletions
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java b/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java
index 2fc27ac6a2..7cf7e4d726 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java
@@ -53,15 +53,19 @@ public class ParametrizerMemoryCard extends Item {
if (aStack.getItemDamage()==1) {
//write to parametrizer
parametrizer.param = tNBT.getInteger("param");
- parametrizer.value0i = tNBT.getInteger("value0i");
- parametrizer.value1i = tNBT.getInteger("value1i");
- parametrizer.usesFloat = tNBT.getInteger("extra");
+ if(parametrizer.setUsingFloats(tNBT.getBoolean("usesFloats"))) {
+ parametrizer.value0i = (int)Float.intBitsToFloat(tNBT.getInteger("value0i"));
+ parametrizer.value1i = (int)Float.intBitsToFloat(tNBT.getInteger("value1i"));
+ }else{
+ parametrizer.value0i = tNBT.getInteger("value0i");
+ parametrizer.value1i = tNBT.getInteger("value1i");
+ }
} else {
//read from parametrizer
tNBT.setInteger("param", parametrizer.param);
+ tNBT.setBoolean("usesFloats", parametrizer.isUsingFloats());
tNBT.setInteger("value0i", parametrizer.value0i);
tNBT.setInteger("value1i", parametrizer.value1i);
- tNBT.setInteger("extra", parametrizer.usesFloat);
}
return true;
}
@@ -108,6 +112,7 @@ public class ParametrizerMemoryCard extends Item {
aList.add("Value 1|I: "+EnumChatFormatting.AQUA + temp);
aList.add("Value 1|F: "+EnumChatFormatting.AQUA + Float.intBitsToFloat(temp));
aList.add("Value 1|B: "+EnumChatFormatting.AQUA + Util.intToShortString(temp));
+ aList.add("Uses Floats: "+(tNBT.getBoolean("usesFloats")?EnumChatFormatting.GREEN+"TRUE":EnumChatFormatting.RED+"FALSE"));
}
}
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 5b9e1faa98..182ffc6574 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
@@ -203,11 +203,12 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch {
return mTier >= 10 && usesFloat;
}
+ //returns - succeded
public boolean setUsingFloats(boolean value){
if(mTier>=10){
usesFloat=value;
- return value;
+ return true;
}
- return false;
+ return !value;
}
}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java
index 65a0b7c3bf..a86bbb1a3a 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java
@@ -75,8 +75,8 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
private final int[] iParamsOut = new int[20];//number O to parametrizers
private final boolean[] bParamsAreFloats = new boolean[10];
- private final byte[] eParamsInStatus = new byte[20];//LED status for I
- private final byte[] eParamsOutStatus = new byte[20];//LED status for O
+ public final byte[] eParamsInStatus = new byte[20];//LED status for I
+ public final byte[] eParamsOutStatus = new byte[20];//LED status for O
public final static byte STATUS_UNUSED = 0,
STATUS_TOO_LOW = 1, STATUS_LOW = 2,
STATUS_WRONG = 3, STATUS_OK = 4,