Refactor

15 files changed, 50 insertions, 23 deletions

diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsBA0.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsBA0.java
index 748626fd2e..2de2847a9c 100644
--- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsBA0.java
+++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsBA0.java
@@ -1,6 +1,7 @@
 package com.github.technus.tectech.thing.casing;
 
 import static com.github.technus.tectech.util.CommonValues.*;
+import static gregtech.api.util.GT_Utility.formatNumbers;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 import gregtech.common.blocks.GT_Item_Casings_Abstract;
@@ -18,7 +19,7 @@ public class GT_Item_CasingsBA0 extends GT_Item_Casings_Abstract {
     @Override
     public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
         if (aStack.getItemDamage() < 15) {
-            aList.add(BASS_MARK);
+            aList.add(THETA_MOVEMENT);
         } else {
             aList.add(COSMIC_MARK);
         }
@@ -29,7 +30,7 @@ public class GT_Item_CasingsBA0 extends GT_Item_Casings_Abstract {
             case 3: // "EV Superconductor Primary Tesla Windings"
             case 4: // "IV Superconductor Primary Tesla Windings"
             case 5: // "LuV Superconductor Primary Tesla Windings"
-                aList.add(translateToLocal("gt.blockcasingsBA0.0.desc.0") + " " + V[aStack.getItemDamage() + 1]
+                aList.add(translateToLocal("gt.blockcasingsBA0.0.desc.0") + " " + formatNumbers(V[aStack.getItemDamage() + 1])
                         + " EU/t"); // Handles up to
                 aList.add(EnumChatFormatting.AQUA.toString()
                         + EnumChatFormatting.BOLD
@@ -55,7 +56,7 @@ public class GT_Item_CasingsBA0 extends GT_Item_Casings_Abstract {
                         + translateToLocal("gt.blockcasingsBA0.8.desc.1")); // Who wouldn't want a 32k epoxy multi?
                 break;
             case 9: // "ZPM Superconductor Primary Tesla Windings"
-                aList.add(translateToLocal("gt.blockcasingsBA0.0.desc.0") + " " + V[7] + " EU/t"); // Handles up to
+                aList.add(translateToLocal("gt.blockcasingsBA0.0.desc.0") + " " + formatNumbers(V[7]) + " EU/t"); // Handles up to
                 aList.add(EnumChatFormatting.AQUA.toString()
                         + EnumChatFormatting.BOLD
                         + translateToLocal("gt.blockcasingsBA0.0.desc.1")); // What one man calls God, another calls the
diff --git a/src/main/java/com/github/technus/tectech/thing/item/EnderFluidLinkCover.java b/src/main/java/com/github/technus/tectech/thing/item/EnderFluidLinkCover.java
index 43fae5565b..666888d85e 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/EnderFluidLinkCover.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/EnderFluidLinkCover.java
@@ -26,7 +26,7 @@ public final class EnderFluidLinkCover extends Item {
 
     @Override
     public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) {
-        aList.add(CommonValues.BASS_MARK);
+        aList.add(CommonValues.THETA_MOVEMENT);
         aList.add(translateToLocal("item.tm.enderfluidlinkcover.desc.0")); // Ender-Fluid-Enables Machines!
         aList.add(EnumChatFormatting.BLUE
                 + translateToLocal(
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 666a3c4c47..df43c23a2a 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
@@ -138,7 +138,7 @@ public final class ParametrizerMemoryCard extends Item {
     @Override
     public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) {
         NBTTagCompound tNBT = aStack.getTagCompound();
-        aList.add(CommonValues.BASS_MARK);
+        aList.add(CommonValues.THETA_MOVEMENT);
         aList.add(translateToLocal("item.em.parametrizerMemoryCard.desc.0")); // Stores Parameters
 
         if (aStack.getItemDamage() == 1) {
diff --git a/src/main/java/com/github/technus/tectech/thing/item/PowerPassUpgradeCover.java b/src/main/java/com/github/technus/tectech/thing/item/PowerPassUpgradeCover.java
index b58d198e38..cd1f651661 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/PowerPassUpgradeCover.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/PowerPassUpgradeCover.java
@@ -26,7 +26,7 @@ public final class PowerPassUpgradeCover extends Item {
 
     @Override
     public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) {
-        aList.add(CommonValues.BASS_MARK);
+        aList.add(CommonValues.THETA_MOVEMENT);
         aList.add(translateToLocal(
                 "item.tm.powerpassupgradecover.desc.0")); // Add power pass functionality to TecTech Multiblocks
         aList.add(EnumChatFormatting.BLUE
diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java
index 9b847b98d6..0070a965a4 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCapacitor.java
@@ -30,7 +30,7 @@ public final class TeslaCoilCapacitor extends Item {
 
     @Override
     public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) {
-        aList.add(CommonValues.BASS_MARK);
+        aList.add(CommonValues.THETA_MOVEMENT);
         if (aStack.getItemDamage() >= 0 && aStack.getItemDamage() <= 6) {
             aList.add(translateToLocal("item.tm.teslaCoilCapacitor.desc.0") + " " + V[aStack.getItemDamage() + 1] * 512
                     + " " + translateToLocal("item.tm.teslaCoilCapacitor.desc.1") + " " + V[aStack.getItemDamage() + 1]
diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java
index 769ee589b9..8f636b5c5e 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java
@@ -29,7 +29,7 @@ public final class TeslaCoilComponent extends Item {
 
     @Override
     public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) {
-        aList.add(CommonValues.BASS_MARK);
+        aList.add(CommonValues.THETA_MOVEMENT);
         aList.add(EnumChatFormatting.BLUE
                 + translateToLocal("item.tm.itemTeslaComponent.desc")); // Tesla bois need these!
     }
diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java
index b8997f82cd..8bb9b19816 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java
@@ -29,7 +29,7 @@ public final class TeslaCoilCover extends Item {
 
     @Override
     public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) {
-        aList.add(CommonValues.BASS_MARK);
+        aList.add(CommonValues.THETA_MOVEMENT);
         switch (aStack.getItemDamage()) {
             case 0:
                 aList.add(translateToLocal("item.tm.teslaCover.desc.0")); // Tesla-Enables Machines!
diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaStaff.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaStaff.java
index 3346d57504..e2a6fade93 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/TeslaStaff.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaStaff.java
@@ -25,7 +25,7 @@ public final class TeslaStaff extends Item {
 
     @Override
     public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) {
-        aList.add(CommonValues.BASS_MARK);
+        aList.add(CommonValues.THETA_MOVEMENT);
         aList.add(translateToLocal("item.tm.teslaStaff.desc"));
     }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java
index 041e60eefe..37d08728e1 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java
@@ -119,7 +119,7 @@ public class GT_MetaTileEntity_Hatch_Capacitor extends GT_MetaTileEntity_Hatch i
     @Override
     public String[] getDescription() {
         return new String[] {
-            CommonValues.BASS_MARK,
+            CommonValues.THETA_MOVEMENT,
             translateToLocal("gt.blockmachines.hatch.capacitor.desc.0"), // For Tesla Tower
             EnumChatFormatting.AQUA
                     + translateToLocal("gt.blockmachines.hatch.capacitor.desc.1") // Stores 'nergy! (for a while)
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeMaintenance.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeMaintenance.java
index 5e946e2223..b838aa470f 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeMaintenance.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeMaintenance.java
@@ -33,7 +33,7 @@ public class GT_MetaTileEntity_Hatch_CreativeMaintenance extends GT_MetaTileEnti
     @Override
     public String[] getDescription() {
         return new String[] {
-            CommonValues.BASS_MARK,
+            CommonValues.THETA_MOVEMENT,
             translateToLocal(
                     "gt.blockmachines.debug.tt.maintenance.desc.0"), // For automatically maintaining Multiblocks
             translateToLocal("gt.blockmachines.debug.tt.maintenance.desc.1"), // Does fix everything but itself.
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java
index e34fbdf95f..dce03adfd6 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java
@@ -1258,7 +1258,15 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl
                                             Pair.of(
                                                     TT_Block_SpacetimeCompressionFieldGenerators
                                                             .SpacetimeCompressionFieldGenerators,
-                                                    6)),
+                                                    6),
+                                            Pair.of(
+                                                    TT_Block_SpacetimeCompressionFieldGenerators
+                                                            .SpacetimeCompressionFieldGenerators,
+                                                    7),
+                                            Pair.of(
+                                                    TT_Block_SpacetimeCompressionFieldGenerators
+                                                            .SpacetimeCompressionFieldGenerators,
+                                                    8)),
                                     -1,
                                     (t, meta) -> t.spacetimeCompressionFieldMetadata = meta,
                                     t -> t.spacetimeCompressionFieldMetadata))
@@ -1290,7 +1298,13 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl
                                                     5),
                                             Pair.of(
                                                     TT_Block_StabilisationFieldGenerators.StabilisationFieldGenerators,
-                                                    6)),
+                                                    6),
+                                            Pair.of(
+                                                    TT_Block_StabilisationFieldGenerators.StabilisationFieldGenerators,
+                                                    7),
+                                            Pair.of(
+                                                    TT_Block_StabilisationFieldGenerators.StabilisationFieldGenerators,
+                                                    8)),
                                     -1,
                                     (t, meta) -> t.stabilisationFieldMetadata = meta,
                                     t -> t.stabilisationFieldMetadata))
@@ -1333,7 +1347,16 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl
                                             Pair.of(
                                                     TT_Block_TimeAccelerationFieldGenerators
                                                             .TimeAccelerationFieldGenerator,
-                                                    6)),
+                                                    6),
+                                            Pair.of(
+                                                    TT_Block_TimeAccelerationFieldGenerators
+                                                            .TimeAccelerationFieldGenerator,
+                                                    7),
+                                            Pair.of(
+                                                    TT_Block_TimeAccelerationFieldGenerators
+                                                            .TimeAccelerationFieldGenerator,
+                                                    8)),
+
                                     -1,
                                     (t, meta) -> t.timeAccelerationFieldMetadata = meta,
                                     t -> t.timeAccelerationFieldMetadata))
@@ -1359,7 +1382,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl
     private double heliumOverflowProbabilityAdjustment;
 
     // Maximum additional chance of recipe success that can be obtained from adding computation.
-    private static final double max_percentage_chance_gain_from_computation_per_second = 0.3;
+    private static final double maxPercentageChanceGainFromComputationPerSecond = 0.3;
 
     // todo: make higher on final release.
     private static final long ticksBetweenHatchDrain = 20;
@@ -1385,7 +1408,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl
                 + stabilisationFieldMetadata * 0.05
                 - hydrogenOverflowProbabilityAdjustment
                 - heliumOverflowProbabilityAdjustment
-                + max_percentage_chance_gain_from_computation_per_second * (1 - exp(-10e-5 * getComputation())));
+                + maxPercentageChanceGainFromComputationPerSecond * (1 - exp(-10e-5 * getComputation())));
 
         return clamp(chance, 0.0, 1.0);
     }
@@ -1501,7 +1524,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl
                 .addInfo(GOLD + "--------------------------------------------------------------------------------")
                 .addInfo("This multiblock will constantly consume hydrogen and helium when it is")
                 .addInfo("not running. It will store this internally, you can see the totals by")
-                .addInfo("using a scanner. This multi also has three tiered blocks with " + RED + "7" + GRAY + " tiers")
+                .addInfo("using a scanner. This multi also has three tiered blocks with " + RED + "9" + GRAY + " tiers")
                 .addInfo("each. They are as follows and have the associated effects on the multi.")
                 .addInfo(BLUE + "Spacetime Compression Field Generator:")
                 .addInfo("- The tier of this block determines what recipes can be run. If the multiblocks")
@@ -1520,7 +1543,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl
                 .addInfo("  Decreases the yield of a recipe by " + RED + "5%" + GRAY + " per tier (additive). ")
                 .addInfo(GOLD + "--------------------------------------------------------------------------------")
                 .addInfo("Computation/s provided to the multiblock can increase the chance by up to " + RED
-                        + GT_Utility.formatNumbers(max_percentage_chance_gain_from_computation_per_second * 100) + GRAY
+                        + GT_Utility.formatNumbers(maxPercentageChanceGainFromComputationPerSecond * 100) + GRAY
                         + "%.")
                 .addInfo("The associated formula is " + GREEN
                         + "additional_chance = 0.3 * exp(10^(-5) * computation_per_second)" + GRAY + ".")
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java
index 112405ff05..d910d02939 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java
@@ -234,7 +234,7 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock
                 .addMaintenanceHatch(
                         translateToLocal("tt.keyword.Structure.AnyOuterCasingOnBottom"),
                         1) // Maintenance Hatch: Any outer casing on the bottom layer
-                .toolTipFinisher(CommonValues.BASS_MARK);
+                .toolTipFinisher(CommonValues.THETA_MOVEMENT);
         return tt;
     }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
index 00b99036c4..7bc6888cfb 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
@@ -672,7 +672,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
                 .addMaintenanceHatch(
                         translateToLocal("tt.keyword.Structure.AnyTeslaBaseCasingOuter"),
                         1) // Maintenance Hatch: Any outer Tesla Base Casing
-                .toolTipFinisher(CommonValues.BASS_MARK);
+                .toolTipFinisher(CommonValues.THETA_MOVEMENT);
         return tt;
     }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java
index 899ebc603c..ff3410d29b 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java
@@ -76,7 +76,7 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB
     @Override
     public String[] getDescription() {
         String[] jargon = new String[] {
-            CommonValues.BASS_MARK,
+            CommonValues.THETA_MOVEMENT,
             translateToLocal("gt.blockmachines.machine.tt.tesla.desc.0"), // Your Tesla I/O machine of choice
             EnumChatFormatting.AQUA
                     + translateToLocal("gt.blockmachines.machine.tt.tesla.desc.1") // Lightning stoves for the rich
diff --git a/src/main/java/com/github/technus/tectech/util/CommonValues.java b/src/main/java/com/github/technus/tectech/util/CommonValues.java
index 5b3ee851d1..1419c204de 100644
--- a/src/main/java/com/github/technus/tectech/util/CommonValues.java
+++ b/src/main/java/com/github/technus/tectech/util/CommonValues.java
@@ -6,11 +6,12 @@ import net.minecraft.util.EnumChatFormatting;
 /**
  * Created by danie_000 on 11.01.2017.
  */
+@SuppressWarnings("SpellCheckingInspection")
 public final class CommonValues {
     public static final String TEC_MARK_SHORT = EnumChatFormatting.BLUE + "Tec" + EnumChatFormatting.DARK_BLUE + "Tech";
     public static final String TEC_MARK_GENERAL = TEC_MARK_SHORT + EnumChatFormatting.BLUE + ": Interdimensional";
     public static final String TEC_MARK_EM = TEC_MARK_SHORT + EnumChatFormatting.BLUE + ": Elemental Matter";
-    public static final String BASS_MARK = TEC_MARK_SHORT + EnumChatFormatting.BLUE + ": Theta Movement";
+    public static final String THETA_MOVEMENT = TEC_MARK_SHORT + EnumChatFormatting.BLUE + ": Theta Movement";
     public static final String COSMIC_MARK = TEC_MARK_SHORT + EnumChatFormatting.BLUE
             + ": Cosmic"; // TODO get a better name than cosmic for *UNDEFINED* thing
 
@@ -32,5 +33,7 @@ public final class CommonValues {
     public static final String[] VN = GT_Values.VN;
     public static final long[] V = GT_Values.V;
 
+    public static final String[] EOH_TIER_FANCY_NAMES = {"Crude", "Primitive", "Stable", "Advanced", "Superb", "Exotic", "Perfect", "Tipler", "Gallifreyan"};
+
     private CommonValues() {}
 }