Tweaks and bug fixes

7 files changed, 39 insertions, 24 deletions

diff --git a/src/main/java/com/github/technus/tectech/Util.java b/src/main/java/com/github/technus/tectech/Util.java
index dfda035f19..b1b7135298 100644
--- a/src/main/java/com/github/technus/tectech/Util.java
+++ b/src/main/java/com/github/technus/tectech/Util.java
@@ -31,7 +31,7 @@ import static gregtech.api.enums.GT_Values.E;
  * Created by Tec on 21.03.2017.
  */
 public class Util {
-    public static String intToString(int number) {
+    public static String intBitsToString(int number) {
         StringBuilder result = new StringBuilder();
 
         for (int i = 31; i >= 0; i--) {
@@ -46,15 +46,30 @@ public class Util {
         return result.toString();
     }
 
-    public static String intToShortString(int number) {
+    public static String intBitsToShortString0(int number) {
         StringBuilder result = new StringBuilder();
 
         for (int i = 31; i >= 0; i--) {
             int mask = 1 << i;
-            result.append((number & mask) != 0 ? "!" : ".");
+            result.append((number & mask) != 0 ? ":" : ".");
 
             if (i % 8 == 0)
-                result.append(" ");
+                result.append("|");
+        }
+        result.replace(result.length() - 1, result.length(), "");
+
+        return result.toString();
+    }
+
+    public static String intBitsToShortString1(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/thing/item/ParametrizerMemoryCard.java b/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java
index 7cf7e4d726..d055997109 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
@@ -107,11 +107,11 @@ public class ParametrizerMemoryCard extends Item {
             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));
+            aList.add("Value 0|B: "+EnumChatFormatting.AQUA + Util.intBitsToShortString0(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));
+            aList.add("Value 1|B: "+EnumChatFormatting.AQUA + Util.intBitsToShortString1(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 182ffc6574..214c7c754d 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
@@ -104,13 +104,13 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch {
             return new String[]{
                     "Parametrizer ID: " + EnumChatFormatting.GREEN + param,
                     "Value 0I: " + EnumChatFormatting.AQUA + value0i,
-                    "Value 0FB: " + EnumChatFormatting.AQUA + Float.intBitsToFloat(value0i)+" "+ Util.intToShortString(value0i),
+                    "Value 0FB: " + EnumChatFormatting.AQUA + Float.intBitsToFloat(value0i)+" "+ Util.intBitsToShortString0(value0i),
                     "Value 1I: " + EnumChatFormatting.BLUE + value1i,
-                    "Value 1FB: " + EnumChatFormatting.BLUE + Float.intBitsToFloat(value1i)+" "+ Util.intToShortString(value1i),
+                    "Value 1FB: " + EnumChatFormatting.BLUE + Float.intBitsToFloat(value1i)+" "+ Util.intBitsToShortString1(value1i),
                     "Input 0I: " + EnumChatFormatting.GOLD   + input0i,
-                    "Input 0FB: " + EnumChatFormatting.GOLD   + Float.intBitsToFloat(input0i)+" "+ Util.intToShortString(input0i),
+                    "Input 0FB: " + EnumChatFormatting.GOLD   + Float.intBitsToFloat(input0i)+" "+ Util.intBitsToShortString0(input0i),
                     "Input 1I: " + EnumChatFormatting.YELLOW + input1i,
-                    "Input 1FB: " + EnumChatFormatting.YELLOW + Float.intBitsToFloat(input1i)+" "+ Util.intToShortString(input1i),
+                    "Input 1FB: " + EnumChatFormatting.YELLOW + Float.intBitsToFloat(input1i)+" "+ Util.intBitsToShortString1(input1i),
             };
         return new String[]{
                 "Parametrizer ID: " + EnumChatFormatting.GREEN + param,
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 22142b7d12..3a6d4b74fa 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
@@ -62,10 +62,10 @@ public class GT_Container_Param extends GT_ContainerMetaTile_Machine {
                     paramH.param -= (aShifthold == 1 ? 16 : 4);
                     break;
                 case 1:
-                    paramH.value0i -= (aShifthold == 1 ? 512 : 64);
+                    paramH.value0i -= (aShifthold == 1 ? 4096 : 256);
                     break;
                 case 2:
-                    paramH.value1i -= (aShifthold == 1 ? 512 : 64);
+                    paramH.value1i -= (aShifthold == 1 ? 4096 : 256);
                     break;
                 case 3:
                     paramH.value0i >>= aShifthold == 1 ? 16 : 4;
@@ -88,10 +88,10 @@ public class GT_Container_Param extends GT_ContainerMetaTile_Machine {
                     paramH.param += (aShifthold == 1 ? 16 : 4);
                     break;
                 case 9:
-                    paramH.value0i += (aShifthold == 1 ? 512 : 64);
+                    paramH.value0i += (aShifthold == 1 ? 4096 : 256);
                     break;
                 case 10:
-                    paramH.value1i += (aShifthold == 1 ? 512 : 64);
+                    paramH.value1i += (aShifthold == 1 ? 4096 : 256);
                     break;
                 case 11:
                     paramH.value0i <<= aShifthold == 1 ? 16 : 4;
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 0741c69235..87111a9108 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
@@ -23,8 +23,8 @@ public class GT_GUIContainer_Param extends GT_GUIContainerMetaTile_Machine {
             proxy.renderUnicodeString("\u2460\u2b07" + String.format(locale, "%+d", ((GT_Container_Param) this.mContainer).input1f), 46, 24, 167, 0x00ffff);
             proxy.renderUnicodeString("\u24EA\u2b06" + String.format(locale, "%+d", ((GT_Container_Param) this.mContainer).value0f), 46, 33, 167, 0x00bbff);
             proxy.renderUnicodeString("\u2460\u2b06" + String.format(locale, "%+d", ((GT_Container_Param) this.mContainer).value1f), 46, 41, 167, 0x0077ff);
-            proxy.renderUnicodeString("\u24EA\u2b06" + Util.intToShortString(((GT_Container_Param) this.mContainer).value0f), 46, 50, 167, 0x00bbff);
-            proxy.renderUnicodeString("\u2460\u2b06" + Util.intToShortString(((GT_Container_Param) this.mContainer).value1f), 46, 58, 167, 0x0077ff);
+            proxy.renderUnicodeString("\u24EA\u2b06" + Util.intBitsToShortString0(((GT_Container_Param) this.mContainer).value0f), 46, 50, 167, 0x00bbff);
+            proxy.renderUnicodeString("\u2460\u2b06" + Util.intBitsToShortString1(((GT_Container_Param) this.mContainer).value1f), 46, 58, 167, 0x0077ff);
         } else {
             proxy.renderUnicodeString("Parameters", 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 d7ecba8a86..8f146f5ed2 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
@@ -20,18 +20,18 @@ public class GT_GUIContainer_ParamAdv extends GT_GUIContainerMetaTile_Machine {
             proxy.renderUnicodeString("Parameters X: " + ((GT_Container_ParamAdv) this.mContainer).param, 46, 7, 167, 0xffffff);
             Locale locale=java.util.Locale.getDefault();
             if (((GT_Container_ParamAdv) this.mContainer).usesFloats) {
-                proxy.renderUnicodeString("\u24EA\u2b07" + String.format(locale, "%+d", ((GT_Container_ParamAdv) this.mContainer).input0f), 46, 16, 167, 0x22ddff);
-                proxy.renderUnicodeString("\u2460\u2b07" + String.format(locale, "%+d", ((GT_Container_ParamAdv) this.mContainer).input1f), 46, 24, 167, 0x00ffff);
-                proxy.renderUnicodeString("\u24EA\u2b06" + String.format(locale, "%+d", ((GT_Container_ParamAdv) this.mContainer).input0f), 46, 33, 167, 0x00bbff);
-                proxy.renderUnicodeString("\u2460\u2b06" + String.format(locale, "%+d", ((GT_Container_ParamAdv) this.mContainer).input1f), 46, 41, 167, 0x0077ff);
-            } else {
                 proxy.renderUnicodeString("\u24EA\u2b07" + String.format(locale, "%+.5E", Float.intBitsToFloat(((GT_Container_ParamAdv) this.mContainer).input0f)), 46, 16, 167, 0x22ddff);
                 proxy.renderUnicodeString("\u2460\u2b07" + String.format(locale, "%+.5E", Float.intBitsToFloat(((GT_Container_ParamAdv) this.mContainer).input1f)), 46, 24, 167, 0x00ffff);
                 proxy.renderUnicodeString("\u24EA\u2b06" + String.format(locale, "%+.5E", Float.intBitsToFloat(((GT_Container_ParamAdv) this.mContainer).value0f)), 46, 33, 167, 0x00bbff);
                 proxy.renderUnicodeString("\u2460\u2b06" + String.format(locale, "%+.5E", Float.intBitsToFloat(((GT_Container_ParamAdv) this.mContainer).value1f)), 46, 41, 167, 0x0077ff);
+            } else {
+                proxy.renderUnicodeString("\u24EA\u2b07" + String.format(locale, "%+d", ((GT_Container_ParamAdv) this.mContainer).input0f), 46, 16, 167, 0x22ddff);
+                proxy.renderUnicodeString("\u2460\u2b07" + String.format(locale, "%+d", ((GT_Container_ParamAdv) this.mContainer).input1f), 46, 24, 167, 0x00ffff);
+                proxy.renderUnicodeString("\u24EA\u2b06" + String.format(locale, "%+d", ((GT_Container_ParamAdv) this.mContainer).value0f), 46, 33, 167, 0x00bbff);
+                proxy.renderUnicodeString("\u2460\u2b06" + String.format(locale, "%+d", ((GT_Container_ParamAdv) this.mContainer).value1f), 46, 41, 167, 0x0077ff);
             }
-            proxy.renderUnicodeString("\u24EA\u2b06" + Util.intToShortString(((GT_Container_ParamAdv) this.mContainer).value0f), 46, 50, 167, 0x00bbff);
-            proxy.renderUnicodeString("\u2460\u2b06" + Util.intToShortString(((GT_Container_ParamAdv) this.mContainer).value1f), 46, 58, 167, 0x0077ff);
+            proxy.renderUnicodeString("\u24EA\u2b06" + Util.intBitsToShortString0(((GT_Container_ParamAdv) this.mContainer).value0f), 46, 50, 167, 0x00bbff);
+            proxy.renderUnicodeString("\u2460\u2b06" + Util.intBitsToShortString1(((GT_Container_ParamAdv) this.mContainer).value1f), 46, 58, 167, 0x0077ff);
             proxy.renderUnicodeString("Pointer " + Integer.toHexString(((GT_Container_ParamAdv) this.mContainer).pointer | 0x10000).substring(1), 46, 66, 167, 0x0033ff);
         } else {
             proxy.renderUnicodeString("Parameters X", 46, 7, 167, 0xffffff);
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java
index bc43f05787..01d620db7e 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java
@@ -300,7 +300,7 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB
     public String[] getDescription() {
         return new String[]{
                 CommonValues.TEC_MARK_EM,
-                Util.intToString(TecTech.Rnd.nextInt()),
+                Util.intBitsToString(TecTech.Rnd.nextInt()),
                 EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "You need it to process the number above"
         };
     }