Merge branch 'release/5.0.1'

70 files changed, 309 insertions, 308 deletions

diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java
index 798ffec36c..c8eda64bea 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.compatibility.dreamcraft;
 
 import com.github.technus.tectech.Reference;
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.thing.CustomItemList;
 import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_TT_Transformer;
 import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_WetTransformer;
@@ -105,7 +105,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
             temp = new GT_MetaTileEntity_BasicHull(
                     11230, "hull.tier.10", "UEV Machine Hull", 10,
                     imagination);
-            Util.setTier(10, temp);
+            TT_Utility.setTier(10, temp);
             if (GT_Values.GT.isClientSide()) {
                 field.set(temp, method.invoke(temp, iTexture));
             }
@@ -114,7 +114,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
             temp = new GT_MetaTileEntity_BasicHull(
                     11231, "hull.tier.11", "UIV Machine Hull", 11,
                     imagination);
-            Util.setTier(11, temp);
+            TT_Utility.setTier(11, temp);
             if (GT_Values.GT.isClientSide()) {
                 field.set(temp, method.invoke(temp, iTexture));
             }
@@ -123,7 +123,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
             temp = new GT_MetaTileEntity_BasicHull(
                     11232, "hull.tier.12", "UMV Machine Hull", 12,
                     imagination);
-            Util.setTier(12, temp);
+            TT_Utility.setTier(12, temp);
             if (GT_Values.GT.isClientSide()) {
                 field.set(temp, method.invoke(temp, iTexture));
             }
@@ -132,7 +132,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
             temp = new GT_MetaTileEntity_BasicHull(
                     11233, "hull.tier.13", "UXV Machine Hull", 13,
                     imagination);
-            Util.setTier(13, temp);
+            TT_Utility.setTier(13, temp);
             if (GT_Values.GT.isClientSide()) {
                 field.set(temp, method.invoke(temp, iTexture));
             }
@@ -141,7 +141,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
             temp = new GT_MetaTileEntity_BasicHull(
                     11234, "hull.tier.14", "OPV Machine Hull", 14,
                     imagination);
-            Util.setTier(14, temp);
+            TT_Utility.setTier(14, temp);
             if (GT_Values.GT.isClientSide()) {
                 field.set(temp, method.invoke(temp, iTexture));
             }
@@ -150,7 +150,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
             temp = new GT_MetaTileEntity_BasicHull(
                     11235, "hull.tier.15", "MAX Machine Hull", 15,
                     imagination);
-            Util.setTier(15, temp);
+            TT_Utility.setTier(15, temp);
             if (GT_Values.GT.isClientSide()) {
                 field.set(temp, method.invoke(temp, iTexture));
             }
@@ -162,7 +162,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
 
             temp = new GT_MetaTileEntity_TT_Transformer(
                     11221, "tt.transformer.tier.10", "Extremely Ultimate Transformer", 10);//UIV -> UEV (Use Soft Mallet to invert)
-            Util.setTier(10, temp);
+            TT_Utility.setTier(10, temp);
             if (GT_Values.GT.isClientSide()) {
                 field.set(temp, method.invoke(temp, iTexture));
             }
@@ -170,7 +170,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
 
             temp = new GT_MetaTileEntity_TT_Transformer(
                     11222, "tt.transformer.tier.11", "Insanely Ultimate Transformer", 11);//UMV -> UIV (Use Soft Mallet to invert)
-            Util.setTier(11, temp);
+            TT_Utility.setTier(11, temp);
             if (GT_Values.GT.isClientSide()) {
                 field.set(temp, method.invoke(temp, iTexture));
             }
@@ -178,7 +178,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
 
             temp = new GT_MetaTileEntity_TT_Transformer(
                     11223, "tt.transformer.tier.12", "Mega Ultimate Transformer", 12);//UXV -> UMV (Use Soft Mallet to invert)
-            Util.setTier(12, temp);
+            TT_Utility.setTier(12, temp);
             if (GT_Values.GT.isClientSide()) {
                 field.set(temp, method.invoke(temp, iTexture));
             }
@@ -186,7 +186,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
 
             temp = new GT_MetaTileEntity_TT_Transformer(
                     11224, "tt.transformer.tier.13", "Extended Mega Ultimate Transformer", 13);//OPV -> UXV (Use Soft Mallet to invert)
-            Util.setTier(13, temp);
+            TT_Utility.setTier(13, temp);
             if (GT_Values.GT.isClientSide()) {
                 field.set(temp, method.invoke(temp, iTexture));
             }
@@ -194,7 +194,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
 
             temp = new GT_MetaTileEntity_TT_Transformer(
                     11225, "tt.transformer.tier.14", "Overpowered Transformer", 14);//MAX -> OPV (Use Soft Mallet to invert)
-            Util.setTier(14, temp);
+            TT_Utility.setTier(14, temp);
             if (GT_Values.GT.isClientSide()) {
                 field.set(temp, method.invoke(temp, iTexture));
             }
@@ -215,7 +215,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
                         11910, "transformer.ha.tier.10", "Extremely Ultimate Hi-Amp Transformer", 10,
                         //UIV -> UEV (Use Soft Mallet to invert)
                         translateToLocal("gt.blockmachines.transformer.ha.tier.10.desc"));
-                Util.setTier(10, temp);
+                TT_Utility.setTier(10, temp);
                 if (GT_Values.GT.isClientSide()) {
                     field.set(temp, method.invoke(temp, iTexture));
                 }
@@ -225,7 +225,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
                         11911, "transformer.ha.tier.11", "Insanely Ultimate Hi-Amp Transformer", 11,
                         //UMV -> UIV (Use Soft Mallet to invert)
                         translateToLocal("gt.blockmachines.transformer.ha.tier.11.desc"));
-                Util.setTier(11, temp);
+                TT_Utility.setTier(11, temp);
                 if (GT_Values.GT.isClientSide()) {
                     field.set(temp, method.invoke(temp, iTexture));
                 }
@@ -235,7 +235,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
                         11912, "transformer.ha.tier.12", "Mega Ultimate Hi-Amp Transformer", 12,
                         //UXV -> UMV (Use Soft Mallet to invert)
                         translateToLocal("gt.blockmachines.transformer.ha.tier.12.desc"));
-                Util.setTier(12, temp);
+                TT_Utility.setTier(12, temp);
                 if (GT_Values.GT.isClientSide()) {
                     field.set(temp, method.invoke(temp, iTexture));
                 }
@@ -245,7 +245,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
                         11913, "transformer.ha.tier.13", "Extended Mega Ultimate Hi-Amp Transformer", 13,
                         //OPV -> UXV (Use Soft Mallet to invert)
                         translateToLocal("gt.blockmachines.transformer.ha.tier.13.desc"));
-                Util.setTier(13, temp);
+                TT_Utility.setTier(13, temp);
                 if (GT_Values.GT.isClientSide()) {
                     field.set(temp, method.invoke(temp, iTexture));
                 }
@@ -255,7 +255,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
                         11914, "transformer.ha.tier.14", "Overpowered Hi-Amp Transformer", 14,
                         //MAX -> OPV (Use Soft Mallet to invert)
                         translateToLocal("gt.blockmachines.transformer.ha.tier.14.desc"));
-                Util.setTier(14, temp);
+                TT_Utility.setTier(14, temp);
                 if (GT_Values.GT.isClientSide()) {
                     field.set(temp, method.invoke(temp, iTexture));
                 }
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 8c90dc939c..be1ed9bd51 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
@@ -10,7 +10,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.reg
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 
 import java.util.ArrayList;
 
@@ -233,30 +233,30 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate {
 
     @Override
     public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS, capabilities)) {
             lines.add(getShortSymbol());
         }
     }
 
     @Override
     public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if (Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
             lines.add(translateToLocal("tt.keyword.CLASS") + " = " + nbtType + ' ' + getMatterMassType());
         }
-        if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS, capabilities)) {
             lines.add(translateToLocal("tt.keyword.NAME") + " = " + getLocalizedName());
             //lines.add("SYMBOL = "+getSymbol());
         }
-        if (Util.areBitsSet(SCAN_GET_CHARGE, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_CHARGE, capabilities)) {
             lines.add(translateToLocal("tt.keyword.CHARGE") + " = " + getCharge() / 3f + " e");
         }
-        if (Util.areBitsSet(SCAN_GET_COLOR, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_COLOR, capabilities)) {
             lines.add(hasColor() ? translateToLocal("tt.keyword.COLORLESS") : translateToLocal("tt.keyphrase.CARRIES_COLOR"));
         }
-        if (Util.areBitsSet(SCAN_GET_MASS, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_MASS, capabilities)) {
             lines.add(translateToLocal("tt.keyword.MASS") + " = " + getMass() + " eV/c\u00b2");
         }
-        if (Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)) {
             lines.add(translateToLocal("tt.keyphrase.LIFE_TIME") + " = " + getRawTimeSpan(energyLevel) + " s");
             lines.add("    " + translateToLocal("tt.keyphrase.At_current_energy_level"));
         }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java b/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
index a61490b162..bd25b05a0c 10064