Cleanup Atoms Localization, and FontRenderer

14 files changed, 72 insertions, 46 deletions

diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
index 40419604e4..8c90dc939c 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
@@ -72,14 +72,18 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate {
     }
 
     @Override
-    public String getLocalizedName() {
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.Aspect");
+    }
+
+    @Override
+    public String getShortLocalizedName() {
         String name = AspectDefinitionCompat.aspectDefinitionCompat.getAspectLocalizedName(this);
         if (name != null) {
-            name = name.substring(0, 1).toUpperCase() + name.substring(1);
+            return name.substring(0, 1).toUpperCase() + name.substring(1);
         } else {
-            name = getSymbol();
+            return getSymbol();
         }
-        return translateToLocal("tt.keyword.Aspect") + ": " + name;
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java
index 885a71ef28..6fa709ef3e 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java
@@ -13,12 +13,12 @@ import static net.minecraft.util.StatCollector.translateToLocal;
  */
 public final class EMPrimalAspectDefinition extends EMPrimitiveTemplate {
     public static final EMPrimalAspectDefinition
-            magic_air = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Air"), "a`", 1e1D, 45,"a`"),
-            magic_earth = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Earth"), "e`", 1e9D, 44,"e`"),
-            magic_fire = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Fire"), "f`", 1e3D, 43,"f`"),
-            magic_water = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Water"), "w`", 1e7D, 42,"w`"),
-            magic_order = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Order"), "o`", 1e5D, 40,"o`"),
-            magic_entropy = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Chaos"), "c`", 1e5D, 41,"c`");
+            magic_air = new EMPrimalAspectDefinition("tt.keyword.Air", "a`", 1e1D, 45,"a`"),
+            magic_earth = new EMPrimalAspectDefinition("tt.keyword.Earth", "e`", 1e9D, 44,"e`"),
+            magic_fire = new EMPrimalAspectDefinition("tt.keyword.Fire", "f`", 1e3D, 43,"f`"),
+            magic_water = new EMPrimalAspectDefinition("tt.keyword.Water", "w`", 1e7D, 42,"w`"),
+            magic_order = new EMPrimalAspectDefinition("tt.keyword.Order", "o`", 1e5D, 40,"o`"),
+            magic_entropy = new EMPrimalAspectDefinition("tt.keyword.Chaos", "c`", 1e5D, 41,"c`");
 
     private EMPrimalAspectDefinition(String name, String symbol, double mass, int ID,String bind) {
         super(name, symbol, 0, mass, 0, -1, ID,bind);
@@ -35,13 +35,14 @@ public final class EMPrimalAspectDefinition extends EMPrimitiveTemplate {
     }
 
     @Override
-    public String getLocalizedName() {
+    public String getShortLocalizedName() {
         String name = AspectDefinitionCompat.aspectDefinitionCompat.getAspectLocalizedName(this);
-        if (name != null) {
-            return translateToLocal("tt.keyword.Primal") + ": " + getUnlocalizedName()+" ("+name+")";
-        } else {
-            return translateToLocal("tt.keyword.Primal") + ": " + getUnlocalizedName();
-        }
+        return name != null ? super.getShortLocalizedName() + " (" + name + ")" : super.getShortLocalizedName();
+    }
+
+    @Override
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.Primal");
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
index 0f25d73704..a1f606c3c2 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
@@ -10,6 +10,7 @@ import java.util.ArrayList;
 
 import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
 import static com.github.technus.tectech.util.Util.areBitsSet;
+import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 22.10.2016.
@@ -73,6 +74,11 @@ public abstract class EMPrimitiveTemplate extends EMComplexTemplate {
     }
 
     @Override
+    public String getShortLocalizedName() {
+        return translateToLocal(getUnlocalizedName());
+    }
+
+    @Override
     public IEMDefinition getAnti() {
         return anti;//no need for copy
     }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java
index 8125812dc6..aae5a8caca 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java
@@ -19,12 +19,18 @@ public interface IEMDefinition extends Comparable<IEMDefinition>,Cloneable {//IM
     //add text based creators for recipe formula input?
 
     //Nomenclature
-    String getLocalizedName();
+    String getLocalizedTypeName();
 
-    String getSymbol();
+    String getShortLocalizedName();
+
+    default String getLocalizedName(){
+        return getLocalizedTypeName()+": "+getShortLocalizedName();
+    }
 
     String getShortSymbol();
 
+    String getSymbol();
+
     void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel);
 
     void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel);
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
index 49fd8b5b54..0eced7bd3c 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
@@ -338,9 +338,14 @@ public class EMAtomDefinition extends EMComplexTemplate {
     }
 
     @Override
-    public String getLocalizedName() {
-        int     element  = abs(this.getElement());
-        boolean anti = this.getElement() < 0;
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.Element");
+    }
+
+    @Override
+    public String getShortLocalizedName() {
+        int     element  = abs(getElement());
+        boolean anti = getElement() < 0;
         boolean weird = abs(getGeneration()) != 1;
         if(element>=NAME.length){
             StringBuilder s = new StringBuilder();
@@ -357,7 +362,9 @@ public class EMAtomDefinition extends EMComplexTemplate {
                 }
                 s.append(translateToLocal("tt.IUPAC."+SYMBOL_IUPAC[element + 10]));
             }
-            s.append(weird?translateToLocal("tt.keyword.Weird"):"");
+            if(weird){
+                s.append(translateToLocal("tt.keyword.Weird"));
+            }
             return s.toString();
         }
         return translateToLocal("tt.element."+(anti?"Anti":"")+NAME[element])+(weird?translateToLocal("tt.keyword.Weird"):"");
@@ -365,13 +372,13 @@ public class EMAtomDefinition extends EMComplexTemplate {
 
     @Override
     public String getSymbol() {
-        return getShortSymbol() + " N:" + getNeutralCount() + " I:" + (getNeutralCount() + element) + " C:" + getCharge();
+        return getShortSymbol() + " N:" + getNeutralCount() + " I:" + (getNeutralCount() + getElement()) + " C:" + getCharge();
     }
 
     @Override
     public String getShortSymbol() {
-        int     element  = abs(this.getElement());
-        boolean anti = this.getElement() < 0;
+        int     element  = abs(getElement());
+        boolean anti = getElement() < 0;
         boolean weird = abs(getGeneration()) != 1;
         if(element>=SYMBOL.length){
             StringBuilder s = new StringBuilder(anti?"~":"");
@@ -380,7 +387,9 @@ public class EMAtomDefinition extends EMComplexTemplate {
                 element = element / 10;
             }
             s.append(SYMBOL_IUPAC[element + 10]);
-            s.append(weird?translateToLocal("tt.keyword.Weird"):"");
+            if(weird){
+                s.append(translateToLocal("tt.keyword.Weird"));
+            }
             return s.toString();
         }
         return (anti?"~":"")+SYMBOL[element]+(weird?translateToLocal("tt.keyword.Weird"):"");
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
index aedb11ac05..19208fbf4a 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
@@ -137,9 +137,8 @@ public class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize map i
     }
 
     @Override
-    public String getLocalizedName() {
-        StringBuilder name = new StringBuilder(getSimpleName());
-        name.append(':');
+    public String getShortLocalizedName() {
+        StringBuilder name = new StringBuilder();
         String sym = translateToLocal(UNLOCALIZED_NAME_MAP.get(this));
         if (sym != null) {
             name.append(' ').append(sym);
@@ -151,7 +150,8 @@ public class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize map i
         return name.toString();
     }
 
-    private String getSimpleName() {
+    @Override
+    public String getLocalizedTypeName() {
         switch (getAmount()) {
             case 2:
                 return translateToLocal("tt.keyword.Meson");
@@ -472,7 +472,7 @@ public class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize map i
             lines.add("CLASS = " + getIndirectTagValue() + ' ' + getMatterMassType());
         }
         if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS | SCAN_GET_TIMESPAN_INFO, capabilities)) {
-            lines.add("NAME = " + getSimpleName());
+            lines.add("NAME = " + getLocalizedTypeName());
             //lines.add("SYMBOL = "+getSymbol());
         }
         if (Util.areBitsSet(SCAN_GET_CHARGE, capabilities)) {
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
index 9b77a6cab8..affebf91a2 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
@@ -10,7 +10,7 @@ public abstract class EMBosonDefinition extends EMPrimitiveTemplate {
     }
 
     @Override
-    public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Boson")+": " + translateToLocal(getUnlocalizedName());
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.Boson");
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMFermionDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMFermionDefinition.java
index f8f05b80ee..4c0e1d28bc 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMFermionDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMFermionDefinition.java
@@ -10,7 +10,7 @@ public abstract class EMFermionDefinition extends EMPrimitiveTemplate {
     }
 
     @Override
-    public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Fermion")+": " + translateToLocal(getUnlocalizedName());
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.Fermion");
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMGaugeBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMGaugeBosonDefinition.java
index fb8128c3a5..cf59c1fffd 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMGaugeBosonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMGaugeBosonDefinition.java
@@ -72,8 +72,8 @@ public class EMGaugeBosonDefinition extends EMBosonDefinition {
     }
 
     @Override
-    public String getLocalizedName() {
-        return translateToLocal("tt.keyword.GaugeBoson") + ": " + translateToLocal(getUnlocalizedName());
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.GaugeBoson");
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
index c665bf23b4..324d790de6 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
@@ -63,7 +63,7 @@ public class EMLeptonDefinition extends EMFermionDefinition {
 
     @Override
     public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Lepton")+": " + translateToLocal(getUnlocalizedName());
+        return translateToLocal("tt.keyword.Lepton")+": " + getShortLocalizedName();
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
index 9ef04e8c7e..9bb05d2cbf 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
@@ -52,8 +52,8 @@ public class EMNeutrinoDefinition extends EMLeptonDefinition {
     }
 
     @Override
-    public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Neutrino")+": " + translateToLocal(getUnlocalizedName());
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.Neutrino");
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
index 60f87ac83b..785d426a0b 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
@@ -47,8 +47,8 @@ public class EMPrimitiveDefinition extends EMPrimitiveTemplate {
     }
 
     @Override
-    public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Primitive") + ": " + translateToLocal(getUnlocalizedName());
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.Primitive");
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
index 19162bf90d..a93b16ca0d 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
@@ -99,8 +99,8 @@ public class EMQuarkDefinition extends EMFermionDefinition {
     }
 
     @Override
-    public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Quark")+": " + translateToLocal(getUnlocalizedName());
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.Quark");
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMScalarBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMScalarBosonDefinition.java
index 5070954847..760ce48068 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMScalarBosonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMScalarBosonDefinition.java
@@ -35,8 +35,8 @@ public class EMScalarBosonDefinition extends EMBosonDefinition {
     }
 
     @Override
-    public String getLocalizedName() {
-        return translateToLocal("tt.keyword.ScalarBoson")+": " + translateToLocal(getUnlocalizedName());
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.ScalarBoson");
     }
 
     @Override