From 9050c8744f2c81b74f7a3deeee8ddd811b05140d Mon Sep 17 00:00:00 2001
From: Ethryan <dborrfors@gmail.com>
Date: Fri, 6 Oct 2017 11:39:41 +0200
Subject: Try at chemical forumlas

Not tested
---
 src/main/java/gregtech/api/enums/Materials.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/main/java/gregtech/api')

diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 26a8fbb91c..afd760dc4c 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -1258,32 +1258,32 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
         Naquadah.mChemicalFormula = "Nq";
         NaquadahEnriched.mChemicalFormula = "Nq+";
         Naquadria.mChemicalFormula = "Nq*";
-        NaquadahAlloy.mChemicalFormula="Nq2KeC";
+        NaquadahAlloy.mChemicalFormula="Nq\u2082KeC";
         Sunnarium.mChemicalFormula = "Su";
         Adamantium.mChemicalFormula="Ad";
         InfusedGold.mChemicalFormula="AuMa*";
         MeteoricIron.mChemicalFormula="SpFe";
-        MeteoricSteel.mChemicalFormula="SpFe50C";
+        MeteoricSteel.mChemicalFormula="SpFe\u2085\u2080C";
         Duranium.mChemicalFormula="Du";
         Tritanium.mChemicalFormula="Tt";
         Ardite.mChemicalFormula="Ai";
         Manyullyn.mChemicalFormula="AiCo";
-        Mytryl.mChemicalFormula="SpPt2FeMa";
+        Mytryl.mChemicalFormula="SpPt\u2082FeMa";
         BlackPlutonium.mChemicalFormula="SpPu";
         Ledox.mChemicalFormula="SpPb";
-        CallistoIce.mChemicalFormula="SpH2O";
+        CallistoIce.mChemicalFormula="SpH\u2082O";
         Quantium.mChemicalFormula="Qt";
         Desh.mChemicalFormula="De";
         Draconium.mChemicalFormula="D";
         DraconiumAwakened.mChemicalFormula="D*";
-        BlueAlloy.mChemicalFormula="AgRp4";
-        RedAlloy.mChemicalFormula="Cu("+Redstone.mChemicalFormula+")4";
+        BlueAlloy.mChemicalFormula="AgRp\u2084";
+        RedAlloy.mChemicalFormula="Cu("+Redstone.mChemicalFormula+")\u2084";
         AnyIron.mChemicalFormula="Fe";
         AnyCopper.mChemicalFormula="Cu";
         ElectrumFlux.mChemicalFormula="The formula is too long...";
-        DeepIron.mChemicalFormula="Sp2Fe";
+        DeepIron.mChemicalFormula="Sp\u2082Fe";
         Ichorium.mChemicalFormula="IcMa";
-//      Duralumin.mChemicalFormula="Al6CuMnMg";
+//      Duralumin.mChemicalFormula="Al\u2086CuMnMg";
     }
 
     private static void initSubTags() {
-- 
cgit 


From a44e1199e50e60852959545fdf10d0516b4dc5ac Mon Sep 17 00:00:00 2001
From: Ethryan <dborrfors@gmail.com>
Date: Fri, 6 Oct 2017 11:55:01 +0200
Subject: Chemical 2

try2
---
 src/main/java/gregtech/api/objects/MaterialStack.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/gregtech/api')

diff --git a/src/main/java/gregtech/api/objects/MaterialStack.java b/src/main/java/gregtech/api/objects/MaterialStack.java
index e7ffe782d6..8c75724cb4 100644
--- a/src/main/java/gregtech/api/objects/MaterialStack.java
+++ b/src/main/java/gregtech/api/objects/MaterialStack.java
@@ -34,7 +34,7 @@ public class MaterialStack implements Cloneable {
     public String toString() {
          String temp1 = "", temp2 = mMaterial.getToolTip(true), temp3 = "", temp4 = "";
          if (mAmount > 1) {
-             temp4 = String.valueOf(mAmount);
+             temp4 = ("\u208"+String.valueOf(mAmount));
              
              if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
                 temp1 = "(";
@@ -58,4 +58,4 @@ public class MaterialStack implements Cloneable {
     public int hashCode() {
         return mMaterial.hashCode();
     }
-}
\ No newline at end of file
+}
-- 
cgit 


From 8e6f1d42d064a019672cea395b1b045f4349c0f1 Mon Sep 17 00:00:00 2001
From: Ethryan <dborrfors@gmail.com>
Date: Fri, 6 Oct 2017 12:48:29 +0200
Subject: Chemicals 3

---
 src/main/java/gregtech/api/objects/MaterialStack.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/main/java/gregtech/api')

diff --git a/src/main/java/gregtech/api/objects/MaterialStack.java b/src/main/java/gregtech/api/objects/MaterialStack.java
index 8c75724cb4..4a3882e925 100644
--- a/src/main/java/gregtech/api/objects/MaterialStack.java
+++ b/src/main/java/gregtech/api/objects/MaterialStack.java
@@ -33,9 +33,17 @@ public class MaterialStack implements Cloneable {
     @Override
     public String toString() {
          String temp1 = "", temp2 = mMaterial.getToolTip(true), temp3 = "", temp4 = "";
-         if (mAmount > 1) {
+         if (mAmount > 1 && mAmount < 10) {
              temp4 = ("\u208"+String.valueOf(mAmount));
              
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+
+          if (mAmount >= 10 && mAmount < 20) {
+             temp4 = ("\u2081"+"\u208"+String.valueOf(mAmount));
+             
              if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
                 temp1 = "(";
                 temp3 = ")";
-- 
cgit 


From 87fc93f11d69250f7312e876bb1f7054203ce78b Mon Sep 17 00:00:00 2001
From: Ethryan <dborrfors@gmail.com>
Date: Fri, 6 Oct 2017 12:54:37 +0200
Subject: Small Fix

---
 src/main/java/gregtech/api/objects/MaterialStack.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/gregtech/api')

diff --git a/src/main/java/gregtech/api/objects/MaterialStack.java b/src/main/java/gregtech/api/objects/MaterialStack.java
index 4a3882e925..a5abffc0da 100644
--- a/src/main/java/gregtech/api/objects/MaterialStack.java
+++ b/src/main/java/gregtech/api/objects/MaterialStack.java
@@ -34,7 +34,7 @@ public class MaterialStack implements Cloneable {
     public String toString() {
          String temp1 = "", temp2 = mMaterial.getToolTip(true), temp3 = "", temp4 = "";
          if (mAmount > 1 && mAmount < 10) {
-             temp4 = ("\u208"+String.valueOf(mAmount));
+             temp4 = ("\u208("+String.valueOf(mAmount)+")");
              
              if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
                 temp1 = "(";
@@ -42,7 +42,7 @@ public class MaterialStack implements Cloneable {
              }
 
           if (mAmount >= 10 && mAmount < 20) {
-             temp4 = ("\u2081"+"\u208"+String.valueOf(mAmount));
+             temp4 = ("\u2081"+"\u208("+String.valueOf(mAmount)+")");
              
              if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
                 temp1 = "(";
-- 
cgit 


From da736d6c70e37fb91c93d88f020799c787bb5560 Mon Sep 17 00:00:00 2001
From: Ethryan <dborrfors@gmail.com>
Date: Fri, 6 Oct 2017 20:14:20 +0200
Subject: Messy but it works i think

---
 .../java/gregtech/api/objects/MaterialStack.java   | 388 ++++++++++++++++++++-
 1 file changed, 383 insertions(+), 5 deletions(-)

(limited to 'src/main/java/gregtech/api')

diff --git a/src/main/java/gregtech/api/objects/MaterialStack.java b/src/main/java/gregtech/api/objects/MaterialStack.java
index a5abffc0da..4662404e0e 100644
--- a/src/main/java/gregtech/api/objects/MaterialStack.java
+++ b/src/main/java/gregtech/api/objects/MaterialStack.java
@@ -31,24 +31,402 @@ public class MaterialStack implements Cloneable {
     }
 
     @Override
+	//Done sub numbering up to 50. couldn't find a better way to do this
     public String toString() {
          String temp1 = "", temp2 = mMaterial.getToolTip(true), temp3 = "", temp4 = "";
-         if (mAmount > 1 && mAmount < 10) {
-             temp4 = ("\u208("+String.valueOf(mAmount)+")");
+         if (mAmount == 2) {
+             temp4 = "\u2082";
              
              if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
                 temp1 = "(";
                 temp3 = ")";
              }
-
-          if (mAmount >= 10 && mAmount < 20) {
-             temp4 = ("\u2081"+"\u208("+String.valueOf(mAmount)+")");
+         }
+         if (mAmount == 3) {
+             temp4 = "\u2083";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+         if (mAmount == 4) {
+             temp4 = "\u2084";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+         if (mAmount == 5) {
+             temp4 = "\u2085";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+         if (mAmount == 6) {
+             temp4 = "\u2086";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+         if (mAmount == 7) {
+             temp4 = "\u2087";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+         if (mAmount == 8) {
+             temp4 = "\u2088";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }	
+		 if (mAmount == 9) {
+             temp4 = "\u2089";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }	
+		 if (mAmount == 10) {
+             temp4 = "\u2081"+"\u2080";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 11) {
+             temp4 = "\u2081"+"\u2081";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 12) {
+             temp4 = "\u2081"+"\u2082";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 13) {
+             temp4 = "\u2081"+"\u2083";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 14) {
+             temp4 = "\u2081"+"\u2084";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 15) {
+             temp4 = "\u2081"+"\u2085";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 16) {
+             temp4 = "\u2081"+"\u2086";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 17) {
+             temp4 = "\u2081"+"\u2087";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 18) {
+             temp4 = "\u2081"+"\u2088";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 19) {
+             temp4 = "\u2081"+"\u2089";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 20) {
+             temp4 = "\u2082"+"\u2080";
              
              if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
                 temp1 = "(";
                 temp3 = ")";
              }
          }
+		 if (mAmount == 21) {
+             temp4 = "\u2082"+"\u2081";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 22) {
+             temp4 = "\u2082"+"\u2082";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 23) {
+             temp4 = "\u2082"+"\u2083";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 24) {
+             temp4 = "\u2082"+"\u2084";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 25) {
+             temp4 = "\u2082"+"\u2085";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 26) {
+             temp4 = "\u2082"+"\u2086";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 27) {
+             temp4 = "\u2082"+"\u2087";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 28) {
+             temp4 = "\u2082"+"\u2088";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 29) {
+             temp4 = "\u2082"+"\u2089";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 30) {
+             temp4 = "\u2083"+"\u2080";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 31) {
+             temp4 = "\u2083"+"\u2081";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 32) {
+             temp4 = "\u2083"+"\u2082";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 33) {
+             temp4 = "\u2083"+"\u2083";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 34) {
+             temp4 = "\u2083"+"\u2084";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 35) {
+             temp4 = "\u2083"+"\u2085";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 36) {
+             temp4 = "\u2083"+"\u2086";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 37) {
+             temp4 = "\u2083"+"\u2087";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 38) {
+             temp4 = "\u2083"+"\u2088";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 39) {
+             temp4 = "\u2083"+"\u2089";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 40) {
+             temp4 = "\u2084"+"\u2080";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 41) {
+             temp4 = "\u2084"+"\u2081";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 42) {
+             temp4 = "\u2084"+"\u2082";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 43) {
+             temp4 = "\u2084"+"\u2083";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 44) {
+             temp4 = "\u2084"+"\u2084";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 45) {
+             temp4 = "\u2084"+"\u2085";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 46) {
+             temp4 = "\u2084"+"\u2086";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 47) {
+             temp4 = "\u2084"+"\u2087";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 48) {
+             temp4 = "\u2084"+"\u2088";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 49) {
+             temp4 = "\u2084"+"\u2089";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+		 if (mAmount == 50) {
+             temp4 = "\u2083"+"\u2081";
+             
+             if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
+                temp1 = "(";
+                temp3 = ")";
+             }
+         }
+
         return String.valueOf(new StringBuilder().append(temp1).append(temp2).append(temp3).append(temp4));
     }
 
-- 
cgit 


From 9cd0c4a106dbdc95f3a4a2ea0c0749aa1385cbcc Mon Sep 17 00:00:00 2001
From: Ethryan <dborrfors@gmail.com>
Date: Fri, 6 Oct 2017 20:31:17 +0200
Subject: Small bugfix

---
 src/main/java/gregtech/api/objects/MaterialStack.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/gregtech/api')

diff --git a/src/main/java/gregtech/api/objects/MaterialStack.java b/src/main/java/gregtech/api/objects/MaterialStack.java
index 4662404e0e..472298bf77 100644
--- a/src/main/java/gregtech/api/objects/MaterialStack.java
+++ b/src/main/java/gregtech/api/objects/MaterialStack.java
@@ -419,7 +419,7 @@ public class MaterialStack implements Cloneable {
              }
          }
 		 if (mAmount == 50) {
-             temp4 = "\u2083"+"\u2081";
+             temp4 = "\u2085"+"\u2080";
              
              if (mMaterial.mMaterialList.size() > 1 || isMaterialListComplex(this)) {
                 temp1 = "(";
-- 
cgit