Fix param x

3 files changed, 41 insertions, 41 deletions

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 0ff0e284ee..56b66a46d8 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,9 +15,9 @@ import net.minecraft.item.ItemStack;
 import java.util.Iterator;
 
 public class GT_Container_Param extends GT_ContainerMetaTile_Machine {
-    public int exponent = 0;
-    public int value1 = 0;
-    public int value0 = 0;
+    public int extra = 0;
+    public int data1 = 0;
+    public int data0 = 0;
     public int param = 0;
     public float value1f = 0;
     public float value0f = 0;
@@ -131,9 +131,9 @@ public class GT_Container_Param extends GT_ContainerMetaTile_Machine {
             return;
         }
         this.param = ((GT_MetaTileEntity_Hatch_Param) this.mTileEntity.getMetaTileEntity()).param;
-        this.value0 = ((GT_MetaTileEntity_Hatch_Param) this.mTileEntity.getMetaTileEntity()).data0;
-        this.value1 = ((GT_MetaTileEntity_Hatch_Param) this.mTileEntity.getMetaTileEntity()).data1;
-        this.exponent = ((GT_MetaTileEntity_Hatch_Param) this.mTileEntity.getMetaTileEntity()).extra;
+        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);
 
@@ -142,12 +142,12 @@ public class GT_Container_Param extends GT_ContainerMetaTile_Machine {
             ICrafting var1 = (ICrafting) var2.next();
             var1.sendProgressBarUpdate(this, 100, this.param & 0xFFFF);
             var1.sendProgressBarUpdate(this, 101, this.param >>> 16);
-            var1.sendProgressBarUpdate(this, 102, this.value0 & 0xFFFF);
-            var1.sendProgressBarUpdate(this, 103, this.value0 >>> 16);
-            var1.sendProgressBarUpdate(this, 104, this.value1 & 0xFFFF);
-            var1.sendProgressBarUpdate(this, 105, this.value1 >>> 16);
-            var1.sendProgressBarUpdate(this, 106, this.exponent & 0xFFFF);
-            var1.sendProgressBarUpdate(this, 107, this.exponent >>> 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);
@@ -166,22 +166,22 @@ public class GT_Container_Param extends GT_ContainerMetaTile_Machine {
                 this.param = (this.param & 0xFFFF | (par2 << 16));
                 return;
             case 102:
-                this.value0 = (this.value0 & 0xFFFF0000 | par2);
+                this.data0 = (this.data0 & 0xFFFF0000 | par2);
                 break;
             case 103:
-                this.value0 = (this.value0 & 0xFFFF | (par2 << 16));
+                this.data0 = (this.data0 & 0xFFFF | (par2 << 16));
                 break;
             case 104:
-                this.value1 = (this.value1 & 0xFFFF0000 | par2);
+                this.data1 = (this.data1 & 0xFFFF0000 | par2);
                 break;
             case 105:
-                this.value1 = (this.value1 & 0xFFFF | (par2 << 16));
+                this.data1 = (this.data1 & 0xFFFF | (par2 << 16));
                 break;
             case 106:
-                this.exponent = (this.exponent & 0xFFFF0000 | par2);
+                this.extra = (this.extra & 0xFFFF0000 | par2);
                 break;
             case 107:
-                this.exponent = (this.exponent & 0xFFFF | (par2 << 16));
+                this.extra = (this.extra & 0xFFFF | (par2 << 16));
                 break;
             case 108:
                 this.input0Bits = (this.input0Bits & 0xFFFF0000 | par2);
@@ -202,7 +202,7 @@ public class GT_Container_Param extends GT_ContainerMetaTile_Machine {
             default:
                 return;
         }
-        this.value0f = (float) (this.value0 * Math.pow(2, this.exponent));
-        this.value1f = (float) (this.value1 * Math.pow(2, this.exponent));
+        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_GUIContainer_Param.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_Param.java
index b40bbc9654..25945608d9 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_Param.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_Param.java
@@ -15,13 +15,13 @@ public class GT_GUIContainer_Param extends GT_GUIContainerMetaTile_Machine {
     protected void drawGuiContainerForegroundLayer(int par1, int par2) {
         if (this.mContainer != null) {
             proxy.renderUnicodeString("Parametrizer: " + ((GT_Container_Param) this.mContainer).param, 46, 7, 167, 0xffffff);
-            proxy.renderUnicodeString("\u24EA\u2b07" + String.format(java.util.Locale.ENGLISH, "%+.5E", ((GT_Container_Param) this.mContainer).input0f), 46, 16, 167, 0x22ddff);
-            proxy.renderUnicodeString("\u2460\u2b07" + String.format(java.util.Locale.ENGLISH, "%+.5E", ((GT_Container_Param) this.mContainer).input1f), 46, 24, 167, 0x00ffff);
-            proxy.renderUnicodeString("\u24EA\u2b06" + String.format(java.util.Locale.ENGLISH, "%+.5E", ((GT_Container_Param) this.mContainer).value0f), 46, 33, 167, 0x00bbff);
-            proxy.renderUnicodeString("\u2460\u2b06" + String.format(java.util.Locale.ENGLISH, "%+.5E", ((GT_Container_Param) this.mContainer).value1f), 46, 41, 167, 0x0077ff);
-            proxy.renderUnicodeString("M\u24EA: " + ((GT_Container_Param) this.mContainer).value0, 46, 50, 167, 0x00bbff);
-            proxy.renderUnicodeString("M\u2460: " + ((GT_Container_Param) this.mContainer).value1, 46, 58, 167, 0x0077ff);
-            proxy.renderUnicodeString("E\u24EA\u2460: " + ((GT_Container_Param) this.mContainer).exponent, 46, 66, 167, 0x0033ff);
+            proxy.renderUnicodeString("\u24EA\u2b07|F" + String.format(java.util.Locale.ENGLISH, "%+.5E", ((GT_Container_Param) this.mContainer).input0f), 46, 16, 167, 0x22ddff);
+            proxy.renderUnicodeString("\u2460\u2b07|F" + String.format(java.util.Locale.ENGLISH, "%+.5E", ((GT_Container_Param) this.mContainer).input1f), 46, 24, 167, 0x00ffff);
+            proxy.renderUnicodeString("\u24EA\u2b06|F" + String.format(java.util.Locale.ENGLISH, "%+.5E", ((GT_Container_Param) this.mContainer).value0f), 46, 33, 167, 0x00bbff);
+            proxy.renderUnicodeString("\u2460\u2b06|F" + String.format(java.util.Locale.ENGLISH, "%+.5E", ((GT_Container_Param) this.mContainer).value1f), 46, 41, 167, 0x0077ff);
+            proxy.renderUnicodeString("M\u24EA: " + ((GT_Container_Param) this.mContainer).data0, 46, 50, 167, 0x00bbff);
+            proxy.renderUnicodeString("M\u2460: " + ((GT_Container_Param) this.mContainer).data1, 46, 58, 167, 0x0077ff);
+            proxy.renderUnicodeString("E\u24EA\u2460: " + ((GT_Container_Param) this.mContainer).extra, 46, 66, 167, 0x0033ff);
         } else {
             proxy.renderUnicodeString("Parametrizer", 46, 7, 167, 0xffffff);
         }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_ParamAdv.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_ParamAdv.java
index 12257ef979..04ded38c18 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_ParamAdv.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_ParamAdv.java
@@ -14,21 +14,21 @@ public class GT_GUIContainer_ParamAdv extends GT_GUIContainerMetaTile_Machine {
 
     protected void drawGuiContainerForegroundLayer(int par1, int par2) {
         if (this.mContainer != null) {
-            proxy.renderUnicodeString("Parametrizer X: " + ((GT_Container_Param) this.mContainer).param, 46, 7, 167, 0xffffff);
-            if(((GT_Container_Param) this.mContainer).exponent>=0x10000){
-                proxy.renderUnicodeString("\u24EA\u2b07|I" + String.format(java.util.Locale.ENGLISH, "%d", Float.floatToIntBits(((GT_Container_Param) this.mContainer).input0f)), 46, 16, 167, 0x22ddff);
-                proxy.renderUnicodeString("\u2460\u2b07|I" + String.format(java.util.Locale.ENGLISH, "%d", Float.floatToIntBits(((GT_Container_Param) this.mContainer).input1f)), 46, 24, 167, 0x00ffff);
-                proxy.renderUnicodeString("\u24EA\u2b06|I" + String.format(java.util.Locale.ENGLISH, "%d", Float.floatToIntBits(((GT_Container_Param) this.mContainer).input0f)), 46, 33, 167, 0x00bbff);
-                proxy.renderUnicodeString("\u2460\u2b06|I" + String.format(java.util.Locale.ENGLISH, "%d", Float.floatToIntBits(((GT_Container_Param) this.mContainer).input1f)), 46, 41, 167, 0x0077ff);
-            }else {
-                proxy.renderUnicodeString("\u24EA\u2b07|F" + String.format(java.util.Locale.ENGLISH, "%+.5E", ((GT_Container_Param) this.mContainer).input0f), 46, 16, 167, 0x22ddff);
-                proxy.renderUnicodeString("\u2460\u2b07|F" + String.format(java.util.Locale.ENGLISH, "%+.5E", ((GT_Container_Param) this.mContainer).input1f), 46, 24, 167, 0x00ffff);
-                proxy.renderUnicodeString("\u24EA\u2b06|F" + String.format(java.util.Locale.ENGLISH, "%+.5E", ((GT_Container_Param) this.mContainer).value0f), 46, 33, 167, 0x00bbff);
-                proxy.renderUnicodeString("\u2460\u2b06|F" + String.format(java.util.Locale.ENGLISH, "%+.5E", ((GT_Container_Param) this.mContainer).value1f), 46, 41, 167, 0x0077ff);
+            proxy.renderUnicodeString("Parametrizer X: " + ((GT_Container_ParamAdv) this.mContainer).param, 46, 7, 167, 0xffffff);
+            if (((GT_Container_ParamAdv) this.mContainer).extra >= 0x10000) {
+                proxy.renderUnicodeString("\u24EA\u2b07|I" + String.format(java.util.Locale.ENGLISH, "%d", Float.floatToIntBits(((GT_Container_ParamAdv) this.mContainer).input0f)), 46, 16, 167, 0x22ddff);
+                proxy.renderUnicodeString("\u2460\u2b07|I" + String.format(java.util.Locale.ENGLISH, "%d", Float.floatToIntBits(((GT_Container_ParamAdv) this.mContainer).input1f)), 46, 24, 167, 0x00ffff);
+                proxy.renderUnicodeString("\u24EA\u2b06|I" + String.format(java.util.Locale.ENGLISH, "%d", Float.floatToIntBits(((GT_Container_ParamAdv) this.mContainer).input0f)), 46, 33, 167, 0x00bbff);
+                proxy.renderUnicodeString("\u2460\u2b06|I" + String.format(java.util.Locale.ENGLISH, "%d", Float.floatToIntBits(((GT_Container_ParamAdv) this.mContainer).input1f)), 46, 41, 167, 0x0077ff);
+            } else {
+                proxy.renderUnicodeString("\u24EA\u2b07|F" + String.format(java.util.Locale.ENGLISH, "%+.5E", ((GT_Container_ParamAdv) this.mContainer).input0f), 46, 16, 167, 0x22ddff);
+                proxy.renderUnicodeString("\u2460\u2b07|F" + String.format(java.util.Locale.ENGLISH, "%+.5E", ((GT_Container_ParamAdv) this.mContainer).input1f), 46, 24, 167, 0x00ffff);
+                proxy.renderUnicodeString("\u24EA\u2b06|F" + String.format(java.util.Locale.ENGLISH, "%+.5E", ((GT_Container_ParamAdv) this.mContainer).value0f), 46, 33, 167, 0x00bbff);
+                proxy.renderUnicodeString("\u2460\u2b06|F" + String.format(java.util.Locale.ENGLISH, "%+.5E", ((GT_Container_ParamAdv) this.mContainer).value1f), 46, 41, 167, 0x0077ff);
             }
-            proxy.renderUnicodeString("\u24EA\u2b06|B" + ((GT_Container_Param) this.mContainer).value0, 46, 50, 167, 0x00bbff);
-            proxy.renderUnicodeString("\u2460\u2b06|B" + ((GT_Container_Param) this.mContainer).value1, 46, 58, 167, 0x0077ff);
-            proxy.renderUnicodeString("Pointer: 0x" + Integer.toHexString(((((GT_Container_Param) this.mContainer).exponent&0xFFFF))|0x10000).substring(1), 46, 66, 167, 0x0033ff);
+            proxy.renderUnicodeString("\u24EA\u2b06|B" + ((GT_Container_ParamAdv) this.mContainer).data0, 46, 50, 167, 0x00bbff);
+            proxy.renderUnicodeString("\u2460\u2b06|B" + ((GT_Container_ParamAdv) this.mContainer).data1, 46, 58, 167, 0x0077ff);
+            proxy.renderUnicodeString("Pointer: 0x" + Integer.toHexString(((((GT_Container_ParamAdv) this.mContainer).extra & 0xFFFF)) | 0x10000).substring(1), 46, 66, 167, 0x0033ff);
         } else {
             proxy.renderUnicodeString("Parametrizer X", 46, 7, 167, 0xffffff);
         }