Rework paramaterization

22 files changed, 512 insertions, 405 deletions

diff --git a/src/main/java/com/github/technus/tectech/Util.java b/src/main/java/com/github/technus/tectech/Util.java
index c0aec1baf8..dfda035f19 100644
--- a/src/main/java/com/github/technus/tectech/Util.java
+++ b/src/main/java/com/github/technus/tectech/Util.java
@@ -31,14 +31,29 @@ import static gregtech.api.enums.GT_Values.E;
  * Created by Tec on 21.03.2017.
  */
 public class Util {
-    public static String intToString(int number, int groupSize) {
+    public static String intToString(int number) {
         StringBuilder result = new StringBuilder();
 
         for (int i = 31; i >= 0; i--) {
             int mask = 1 << i;
             result.append((number & mask) != 0 ? "1" : "0");
 
-            if (i % groupSize == 0)
+            if (i % 8 == 0)
+                result.append(" ");
+        }
+        result.replace(result.length() - 1, result.length(), "");
+
+        return result.toString();
+    }
+
+    public static String intToShortString(int number) {
+        StringBuilder result = new StringBuilder();
+
+        for (int i = 31; i >= 0; i--) {
+            int mask = 1 << i;
+            result.append((number & mask) != 0 ? "!" : ".");
+
+            if (i % 8 == 0)
                 result.append(" ");
         }
         result.replace(result.length() - 1, result.length(), "");
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
index 00717007c1..666053ad1f 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
@@ -101,7 +101,7 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_
     }
 
     @Override
-    public boolean checkRecipe_EM(ItemStack itemStack) {
+    public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizers) {
         container=essentiaContainerCompat.getContainer(this);
         if (eInputHatches.size() < 1 || container==null) {
             stopMachine();
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
index b9b674f880..e5bde00836 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
@@ -110,7 +110,7 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu
     }
 
     @Override
-    public boolean checkRecipe_EM(ItemStack itemStack) {
+    public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizers) {
         container=essentiaContainerCompat.getContainer(this);
         cElementalInstanceStack newStack=essentiaContainerCompat.getFromContainer(container);
         if(newStack!=null){
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 0e38d253e8..2fc27ac6a2 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
@@ -1,6 +1,7 @@
 package com.github.technus.tectech.thing.item;
 
 import com.github.technus.tectech.CommonValues;
+import com.github.technus.tectech.Util;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Param;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
@@ -52,19 +53,15 @@ public class ParametrizerMemoryCard extends Item {
                     if (aStack.getItemDamage()==1) {
                         //write to parametrizer
                         parametrizer.param = tNBT.getInteger("param");
-                        parametrizer.data0 = tNBT.getInteger("value1");
-                        parametrizer.data1 = tNBT.getInteger("value2");
-                        parametrizer.value0f = tNBT.getFloat("value1f");
-                        parametrizer.value1f = tNBT.getFloat("value2f");
-                        parametrizer.extra = tNBT.getInteger("exponent");
+                        parametrizer.value0i = tNBT.getInteger("value0i");
+                        parametrizer.value1i = tNBT.getInteger("value1i");
+                        parametrizer.usesFloat = tNBT.getInteger("extra");
                     } else {
                         //read from parametrizer
                         tNBT.setInteger("param", parametrizer.param);
-                        tNBT.setInteger("value1", parametrizer.data0);
-                        tNBT.setInteger("value2", parametrizer.data1);
-                        tNBT.setFloat("value2f", parametrizer.value1f);
-                        tNBT.setFloat("value1f", parametrizer.value0f);
-                        tNBT.setInteger("exponent", parametrizer.extra);
+                        tNBT.setInteger("value0i", parametrizer.value0i);
+                        tNBT.setInteger("value1i", parametrizer.value1i);
+                        tNBT.setInteger("extra", parametrizer.usesFloat);
                     }
                     return true;
                 }
@@ -100,13 +97,17 @@ public class ParametrizerMemoryCard extends Item {
         }
         aList.add(EnumChatFormatting.BLUE + "Sneak right click to lock/unlock");
 
+        int temp;
         if(tNBT!=null && tNBT.hasKey("param")) {
             aList.add("Hatch ID: "+EnumChatFormatting.AQUA + tNBT.getInteger("param"));
-            aList.add("Value 0|F: "+EnumChatFormatting.AQUA + tNBT.getFloat("value1f"));
-            aList.add("Value 1|F: "+EnumChatFormatting.AQUA + tNBT.getFloat("value2f"));
-            aList.add("Data 0|I: "+EnumChatFormatting.AQUA + tNBT.getInteger("value1"));
-            aList.add("Data 1|I: "+EnumChatFormatting.AQUA + tNBT.getInteger("value2"));
-            aList.add("Data x|I: "+EnumChatFormatting.AQUA + tNBT.getInteger("exponent"));
+            temp=tNBT.getInteger("value0i");
+            aList.add("Value 0|I: "+EnumChatFormatting.AQUA + temp);
+            aList.add("Value 0|F: "+EnumChatFormatting.AQUA + Float.intBitsToFloat(temp));
+            aList.add("Value 0|B: "+EnumChatFormatting.AQUA + Util.intToShortString(temp));
+            temp=tNBT.getInteger("value1i");
+            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));
         }
 
     }
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 cb83c9eb93..5b9e1faa98 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
@@ -26,14 +26,13 @@ import net.minecraftforge.fluids.FluidStack;
  * Created by danie_000 on 15.12.2016.
  */
 public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch {
-    public int extra = 0;
-    public int data1 = 0;
-    public int data0 = 0;
+    private boolean usesFloat = false;
+    public int pointer = 0;
     public int param = -1;
-    public float value0f = 0;
-    public float value1f = 0;
-    public float input1f = 0;
-    public float input2f = 0;
+    public int value0i = 0;
+    public int value1i = 0;
+    public int input0i = 0;
+    public int input1i = 0;
     private static Textures.BlockIcons.CustomIcon ScreenON;
     private static Textures.BlockIcons.CustomIcon ScreenOFF;
 
@@ -101,36 +100,24 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch {
 
     @Override
     public String[] getInfoData() {
-        int temp;
-        if(mTier>=10){
+        if(mTier>=10)
             return new String[]{
                     "Parametrizer ID: " + EnumChatFormatting.GREEN + param,
-                    "Value 0|F: " + EnumChatFormatting.AQUA + value0f,
-                    "Value 0|I: " + EnumChatFormatting.AQUA + (temp=Float.floatToIntBits(value0f)),
-                    "Value 0|B: " + EnumChatFormatting.AQUA + Util.intToString(temp,8),
-                    "Value 1|F: " + EnumChatFormatting.BLUE + value1f,
-                    "Value 1|I: " + EnumChatFormatting.BLUE + (temp=Float.floatToIntBits(value1f)),
-                    "Value 1|B: " + EnumChatFormatting.BLUE + Util.intToString(temp,8),
-                    "Input 0|F: " + EnumChatFormatting.GOLD   + input1f,
-                    "Input 0|I: " + EnumChatFormatting.GOLD   + (temp=Float.floatToIntBits(input1f)),
-                    "Input 0|B: " + EnumChatFormatting.GOLD   + Util.intToString(temp,8),
-                    "Input 1|F: " + EnumChatFormatting.YELLOW + input2f,
-                    "Input 1|I: " + EnumChatFormatting.YELLOW + (temp=Float.floatToIntBits(input2f)),
-                    "Input 1|B: " + EnumChatFormatting.YELLOW + Util.intToString(temp,8),
-                    "Data 0|I" + data0,
-                    "Data 1|I" + data1,
-                    "Data x|I" + extra,
+                    "Value 0I: " + EnumChatFormatting.AQUA + value0i,
+                    "Value 0FB: " + EnumChatFormatting.AQUA + Float.intBitsToFloat(value0i)+" "+ Util.intToShortString(value0i),
+                    "Value 1I: " + EnumChatFormatting.BLUE + value1i,
+                    "Value 1FB: " + EnumChatFormatting.BLUE + Float.intBitsToFloat(value1i)+" "+ Util.intToShortString(value1i),
+                    "Input 0I: " + EnumChatFormatting.GOLD   + input0i,
+                    "Input 0FB: " + EnumChatFormatting.GOLD   + Float.intBitsToFloat(input0i)+" "+ Util.intToShortString(input0i),
+                    "Input 1I: " + EnumChatFormatting.YELLOW + input1i,
+                    "Input 1FB: " + EnumChatFormatting.YELLOW + Float.intBitsToFloat(input1i)+" "+ Util.intToShortString(input1i),
             };
-        }
         return new String[]{
                 "Parametrizer ID: " + EnumChatFormatting.GREEN + param,
-                "Value 0|F: " + EnumChatFormatting.AQUA + value0f,
-                "Value 1|F: " + EnumChatFormatting.BLUE + value1f,
-                "Input 0|F: " + EnumChatFormatting.GOLD   + input1f,
-                "Input 1|F: " + EnumChatFormatting.YELLOW + input2f,
-                "Data 0|I" + data0,
-                "Data 1|I" + data1,
-                "Data x|I" + extra,
+                "Value 0I: " + EnumChatFormatting.AQUA + value0i,
+                "Value 1I: " + EnumChatFormatting.BLUE + value1i,
+                "Input 0I: " + EnumChatFormatting.GOLD   + input0i,
+                "Input 1I: " + EnumChatFormatting.YELLOW + input1i,
         };
     }
 
@@ -151,30 +138,24 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch {
 
     public void saveNBTData(NBTTagCompound aNBT) {
         super.saveNBTData(aNBT);
-        aNBT.setInteger("mEXP", extra);
-        if(mTier>=10) {
-            aNBT.setInteger("mV2", Float.floatToIntBits(value1f));
-            aNBT.setInteger("mV1", Float.floatToIntBits(value0f));
-        }else {
-            aNBT.setInteger("mV2", data1);
-            aNBT.setInteger("mV1", data0);
-        }
-        aNBT.setInteger("mParam", param);
+        aNBT.setBoolean("eFloats", usesFloat);
+        aNBT.setInteger("ePointer", pointer);
+        aNBT.setInteger("eValue0i", value0i);
+        aNBT.setInteger("eValue1i", value1i);
+        aNBT.setInteger("eInput0i", value0i);
+        aNBT.setInteger("eInput1i", value1i);
+        aNBT.setInteger("eParam", param);
     }
 
     public void loadNBTData(NBTTagCompound aNBT) {
         super.loadNBTData(aNBT);
-        extra = aNBT.getInteger("mEXP");
-        data1 = aNBT.getInteger("mV2");
-        data0 = aNBT.getInteger("mV1");
-        param = aNBT.getInteger("mParam");
-        if(mTier>=10) {
-            value0f =Float.intBitsToFloat(data0);
-            value1f =Float.intBitsToFloat(data1);
-        }else{
-            value0f = (float) (data0 * Math.pow(2, extra));
-            value1f = (float) (data1 * Math.pow(2, extra));
-        }
+        usesFloat = aNBT.getBoolean("eFloats");
+        pointer = aNBT.getInteger("ePointer");
+        value0i=aNBT.getInteger("eValue0i");
+        value1i=aNBT.getInteger("eValue1i");
+        value0i=aNBT.getInteger("eInput0i");
+        value1i=aNBT.getInteger("eInput1i");
+        param = aNBT.getInteger("eParam");
     }
 
     @Override
@@ -217,4 +198,16 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch {
                 EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "E=mine*craft^2"
         };
     }
+
+    public boolean isUsingFloats() {
+        return mTier >= 10 && usesFloat;
+    }
+
+    public boolean setUsingFloats(boolean value){
+        if(mTier>=10){
+            usesFloat=value;
+            return value;
+        }
+        return false;
+    }
 }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Param.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Param.java
index 56b66a46d8..22142b7d12 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Param.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Param.java
@@ -15,16 +15,11 @@ import net.minecraft.item.ItemStack;
 import java.util.Iterator;
 
 public class GT_Container_Param extends GT_ContainerMetaTile_Machine {
-    public int extra = 0;
-    public int data1 = 0;
-    public int data0 = 0;
     public int param = 0;
-    public float value1f = 0;
-    public float value0f = 0;
-    public float input0f = 0;
-    public float input1f = 0;
-    private int input0Bits = 0;
-    private int input1Bits = 0;
+    public int value0f = 0;
+    public int value1f = 0;
+    public int input0f = 0;
+    public int input1f = 0;
 
     public GT_Container_Param(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
         super(aInventoryPlayer, aTileEntity);
@@ -64,52 +59,56 @@ public class GT_Container_Param extends GT_ContainerMetaTile_Machine {
             GT_MetaTileEntity_Hatch_Param paramH = (GT_MetaTileEntity_Hatch_Param) this.mTileEntity.getMetaTileEntity();
             switch (aSlotIndex) {
                 case 0:
-                    paramH.param -= (aShifthold == 1 ? 512 : 64);
+                    paramH.param -= (aShifthold == 1 ? 16 : 4);
                     break;
                 case 1:
-                    paramH.data0 -= (aShifthold == 1 ? 512 : 64);
+                    paramH.value0i -= (aShifthold == 1 ? 512 : 64);
                     break;
                 case 2:
-                    paramH.data1 -= (aShifthold == 1 ? 512 : 64);
+                    paramH.value1i -= (aShifthold == 1 ? 512 : 64);
                     break;
                 case 3:
-                    paramH.extra -= (aShifthold == 1 ? 16 : 8);
+                    paramH.value0i >>= aShifthold == 1 ? 16 : 4;
+                    paramH.value1i >>= aShifthold == 1 ? 16 : 4;
                     break;
                 case 4:
-                    paramH.param -= (aShifthold == 1 ? 16 : 1);
+                    paramH.param -= (aShifthold == 1 ? 2 : 1);
                     break;
                 case 5:
-                    paramH.data0 -= (aShifthold == 1 ? 16 : 1);
+                    paramH.value0i -= (aShifthold == 1 ? 16 : 1);
                     break;
                 case 6:
-                    paramH.data1 -= (aShifthold == 1 ? 16 : 1);
+                    paramH.value1i -= (aShifthold == 1 ? 16 : 1);
                     break;
                 case 7:
-                    paramH.extra -= (aShifthold == 1 ? 4 : 1);
+                    paramH.value0i >>= aShifthold == 1 ? 2 : 1;
+                    paramH.value1i >>= aShifthold == 1 ? 2 : 1;
                     break;
                 case 8:
-                    paramH.param += (aShifthold == 1 ? 512 : 64);
+                    paramH.param += (aShifthold == 1 ? 16 : 4);
                     break;
                 case 9:
-                    paramH.data0 += (aShifthold == 1 ? 512 : 64);
+                    paramH.value0i += (aShifthold == 1 ? 512 : 64);
                     break;
                 case 10:
-                    paramH.data1 += (aShifthold == 1 ? 512 : 64);
+                    paramH.value1i += (aShifthold == 1 ? 512 : 64);
                     break;
                 case 11:
-                    paramH.extra += (aShifthold == 1 ? 16 : 8);
+                    paramH.value0i <<= aShifthold == 1 ? 16 : 4;
+                    paramH.value1i <<= aShifthold == 1 ? 16 : 4;
                     break;
                 case 12:
-                    paramH.param += (aShifthold == 1 ? 16 : 1);
+                    paramH.param += (aShifthold == 1 ? 2 : 1);
                     break;
                 case 13:
-                    paramH.data0 += (aShifthold == 1 ? 16 : 1);
+                    paramH.value0i += (aShifthold == 1 ? 16 : 1);
                     break;
                 case 14:
-                    paramH.data1 += (aShifthold == 1 ? 16 : 1);
+                    paramH.value1i += (aShifthold == 1 ? 16 : 1);
                     break;
                 case 15:
-                    paramH.extra += (aShifthold == 1 ? 4 : 1);
+                    paramH.value0i <<= aShifthold == 1 ? 2 : 1;
+                    paramH.value1i <<= aShifthold == 1 ? 2 : 1;
                     break;
                 default:
                     doStuff = false;
@@ -117,8 +116,6 @@ public class GT_Container_Param extends GT_ContainerMetaTile_Machine {
             if (doStuff) {
                 if (paramH.param > 9) paramH.param = 9;
                 else if (paramH.param < -1) paramH.param = -1;
-                paramH.value0f =Float.intBitsToFloat(Float.floatToIntBits((float) (paramH.data0 * Math.pow(2, paramH.extra))));
-                paramH.value1f =Float.intBitsToFloat(Float.floatToIntBits((float) (paramH.data1 * Math.pow(2, paramH.extra))));
             }
         }
         return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
@@ -131,27 +128,24 @@ public class GT_Container_Param extends GT_ContainerMetaTile_Machine {
             return;
         }
         this.param = ((GT_MetaTileEntity_Hatch_Param) this.mTileEntity.getMetaTileEntity()).param;
-        this.data0 = ((GT_MetaTileEntity_Hatch_Param) this.mTileEntity.getMetaTileEntity()).data0;
-        this.data1 = ((GT_MetaTileEntity_Hatch_Param) this.mTileEntity.getMetaTileEntity()).data1;
-        this.extra = ((GT_MetaTileEntity_Hatch_Param) this.mTileEntity.getMetaTileEntity()).extra;
-        this.input0Bits = Float.floatToIntBits(((GT_MetaTileEntity_Hatch_Param) this.mTileEntity.getMetaTileEntity()).input1f);
-        this.input1Bits = Float.floatToIntBits(((GT_MetaTileEntity_Hatch_Param) this.mTileEntity.getMetaTileEntity()).input2f);
+        this.value0f = ((GT_MetaTileEntity_Hatch_Param) this.mTileEntity.getMetaTileEntity()).value0i;
+        this.value1f = ((GT_MetaTileEntity_Hatch_Param) this.mTileEntity.getMetaTileEntity()).value1i;
+        this.input0f = ((GT_MetaTileEntity_Hatch_Param) this.mTileEntity.getMetaTileEntity()).input0i;
+        this.input1f = ((GT_MetaTileEntity_Hatch_Param) this.mTileEntity.getMetaTileEntity()).input1i;
 
         Iterator var2 = this.crafters.iterator();
         while (var2.hasNext()) {
             ICrafting var1 = (ICrafting) var2.next();
             var1.sendProgressBarUpdate(this, 100, this.param & 0xFFFF);
             var1.sendProgressBarUpdate(this, 101, this.param >>> 16);
-            var1.sendProgressBarUpdate(this, 102, this.data0 & 0xFFFF);
-            var1.sendProgressBarUpdate(this, 103, this.data0 >>> 16);
-            var1.sendProgressBarUpdate(this, 104, this.data1 & 0xFFFF);
-            var1.sendProgressBarUpdate(this, 105, this.data1 >>> 16);
-            var1.sendProgressBarUpdate(this, 106, this.extra & 0xFFFF);
-            var1.sendProgressBarUpdate(this, 107, this.extra >>> 16);
-            var1.sendProgressBarUpdate(this, 108, this.input0Bits & 0xFFFF);
-            var1.sendProgressBarUpdate(this, 109, this.input0Bits >>> 16);
-            var1.sendProgressBarUpdate(this, 110, this.input1Bits & 0xFFFF);
-            var1.sendProgressBarUpdate(this, 111, this.input1Bits >>> 16);
+            var1.sendProgressBarUpdate(this, 102, this.value0f & 0xFFFF);
+            var1.sendProgressBarUpdate(this, 103, this.value0f >>> 16);
+            var1.sendProgressBarUpdate(this, 104, this.value1f & 0xFFFF);
+            var1.sendProgressBarUpdate(this, 105, this.value1f >>> 16);
+            var1.sendProgressBarUpdate(this, 106, this.input0f & 0xFFFF);
+            var1.sendProgressBarUpdate(this, 107, this.input0f >>> 16);
+            var1.sendProgressBarUpdate(this, 108, this.input1f & 0xFFFF);
+            var1.sendProgressBarUpdate(this, 109, this.input1f >>> 16);
         }
     }
 
@@ -166,43 +160,30 @@ public class GT_Container_Param extends GT_ContainerMetaTile_Machine {
                 this.param = (this.param & 0xFFFF | (par2 << 16));
                 return;
             case 102:
-                this.data0 = (this.data0 & 0xFFFF0000 | par2);
+                this.value0f = (this.value0f & 0xFFFF0000 | par2);
                 break;
             case 103:
-                this.data0 = (this.data0 & 0xFFFF | (par2 << 16));
+                this.value0f = (this.value0f & 0xFFFF | (par2 << 16));
                 break;
             case 104:
-                this.data1 = (this.data1 & 0xFFFF0000 | par2);
+                this.value1f = (this.value1f & 0xFFFF0000 | par2);
                 break;
             case 105:
-                this.data1 = (this.data1 & 0xFFFF | (par2 << 16));
+                this.value1f = (this.value1f & 0xFFFF | (par2 << 16));
                 break;
             case 106:
-                this.extra = (this.extra & 0xFFFF0000 | par2);
+                this.input0f = (this.input0f & 0xFFFF0000 | par2);
                 break;
             case 107:
-                this.extra = (this.extra & 0xFFFF | (par2 << 16));
+                this.input0f = (this.input0f & 0xFFFF | (par2 << 16));
                 break;
             case 108:
-                this.input0Bits = (this.input0Bits & 0xFFFF0000 | par2);
-                this.input0f = Float.intBitsToFloat(input0Bits);
+                this.input1f = (this.input1f & 0xFFFF0000 | par2);
                 return;
             case 109:
-                this.input0Bits = (this.input0Bits & 0xFFFF | (par2 << 16));
-                this.input0f = Float.intBitsToFloat(input0Bits);
-                return;
-            case 110:
-                this.input1Bits = (this.input1Bits & 0xFFFF0000 | par2);
-                this.input1f = Float.intBitsToFloat(input1Bits);
-                return;
-            case 111:
-                this.input1Bits = (this.input1Bits & 0xFFFF | (par2 << 16));
-                this.input1f = Float.intBitsToFloat(input1Bits);
+                this.input1f = (this.input1f & 0xFFFF | (par2 << 16));
                 return;
             default:
-                return;
         }
-        this.value0f = (float) (this.data0 * Math.pow(2, this.extra));
-        this.value1f = (float) (this.data1 * Math.pow(2, this.extra));
     }
 }
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 5c67caa42a..2c4670e52f 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
@@ -15,16 +15,13 @@ import net.minecraft.item.ItemStack;
 import java.util.Iterator;
 
 public class GT_Container_ParamAdv extends GT_ContainerMetaTile_Machine {
-    public int extra = 0;
-    public int data1 = 0;
-    public int data0 = 0;
+    public boolean usesFloats = false;
+    public int pointer=0;
     public int param = 0;
-    public float value1f = 0;
-    public float value0f = 0;
-    public float input0f = 0;
-    public float input1f = 0;
-    private int input0Bits = 0;
-    private int input1Bits = 0;
+    public int value1f = 0;
+    public int value0f = 0;
+    public int input0f = 0;
+    public int input1f = 0;
 
     public GT_Container_ParamAdv(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
         super(aInventoryPlayer, aTileEntity);
@@ -62,84 +59,83 @@ public class GT_Container_ParamAdv extends GT_ContainerMetaTile_Machine {
         boolean doStuff = true;
         if ((tSlot != null) && (this.mTileEntity.getMetaTileEntity() != null)) {
             GT_MetaTileEntity_Hatch_Param paramH = (GT_MetaTileEntity_Hatch_Param) this.mTileEntity.getMetaTileEntity();
-            int columnPointer=paramH.extra&0xff;
-            boolean secondRow=(paramH.extra&0x0100)!=0;
-            boolean showInts=(paramH.extra&0x10000)!=0;
+            int columnPointer=paramH.pointer &0xff;
+            boolean secondRow=(paramH.pointer &0x0100)!=0;
+            boolean showInts=!paramH.isUsingFloats();
             switch (aSlotIndex) {
                 case 0:
                     paramH.param -= (aShifthold == 1 ? 16 : 4);
                     break;
                 case 1:
-                    if (secondRow) {secondRow=false;} else {columnPointer -= (aShifthold == 1 ? 16 : 4);}
+                    if (secondRow) secondRow = false;
+                    else columnPointer -= (aShifthold == 1 ? 16 : 4);
                     break;
                 case 2:
-                    if (secondRow) {columnPointer -= (aShifthold == 1 ? 16 : 4);} else {secondRow=true;}
+                    if (secondRow) columnPointer -= (aShifthold == 1 ? 16 : 4);
+                    else secondRow = true;
                     break;
                 case 3:
-                    if(aShifthold==1){
-                        if(secondRow) data1=0xFFFFFFFF;
-                        else  data0=0xFFFFFFFF;
-                    }else {
-                        if(secondRow){
-                            data1|=1<<columnPointer;
-                        }else {
-                            data0|=1<<columnPointer;
-                        }
+                    if (aShifthold == 1) {
+                        if (secondRow) paramH.value1i = 0xFFFFFFFF;
+                        else paramH.value0i = 0xFFFFFFFF;
+                    } else {
+                        if (secondRow) paramH.value1i |= 1 << columnPointer;
+                        else paramH.value0i |= 1 << columnPointer;
                     }
                     break;
                 case 4:
                     paramH.param -= (aShifthold == 1 ? 2 : 1);
                     break;
                 case 5:
-                    if (secondRow) {secondRow=false;} else {columnPointer -= (aShifthold == 1 ? 2 : 1);}
+                    if (secondRow) secondRow = false;
+                    else columnPointer -= (aShifthold == 1 ? 2 : 1);
                     break;
                 case 6:
-                    if (secondRow) {columnPointer -= (aShifthold == 1 ? 2 : 1);} else {secondRow=true;}
+                    if (secondRow) columnPointer -= (aShifthold == 1 ? 2 : 1);
+                    else secondRow = true;
                     break;
                 case 7:
-                    if(aShifthold==1){
-                        if(secondRow) data1=0;
-                        else  data0=0;
-                    }else {
-                        if(secondRow){
-                            data1&=~(1<<columnPointer);
-                        }else {
-                            data0&=~(1<<columnPointer);
-                        }
+                    if (aShifthold == 1) {
+                        if (secondRow) paramH.value1i = 0;
+                        else paramH.value0i = 0;
+                    } else {
+                        if (secondRow) paramH.value1i &= ~(1 << columnPointer);
+                        else paramH.value0i &= ~(1 << columnPointer);
                     }
                     break;
                 case 8:
                     paramH.param += (aShifthold == 1 ? 16 : 4);
                     break;
                 case 9:
-                    if (secondRow) {secondRow=false;} else {columnPointer += (aShifthold == 1 ? 16 : 4);}
+                    if (secondRow) secondRow = false;
+                    else columnPointer += (aShifthold == 1 ? 16 : 4);
                     break;
                 case 10:
-                    if (secondRow) {columnPointer += (aShifthold == 1 ? 16 : 4);} else {secondRow=true;}
+                    if (secondRow) columnPointer += (aShifthold == 1 ? 16 : 4);
+                    else secondRow = true;
                     break;
                 case 11:
-                    if(aShifthold==1){
-                        if(secondRow) data1^=0xFFFFFFFF;
-                        else  data0^=0xFFFFFFFF;
-                    }else {
-                        if(secondRow){
-                            data1^=1<<columnPointer;
-                        }else {
-                            data0^=1<<columnPointer;
-                        }
-                    }
+                    showInts ^= true;
                     break;
                 case 12:
                     paramH.param += (aShifthold == 1 ? 2 : 1);
                     break;
                 case 13:
-                    if (secondRow) {secondRow=false;} else {columnPointer += (aShifthold == 1 ? 2 : 1);}
+                    if (secondRow) secondRow = false;
+                    else columnPointer += (aShifthold == 1 ? 2 : 1);
                     break;
                 case