Add wet trafos just in case, change rendering and tiering internal logic

54 files changed, 505 insertions, 138 deletions

diff --git a/src/main/java/com/github/technus/tectech/CommonValues.java b/src/main/java/com/github/technus/tectech/CommonValues.java
index 81c7dc3450..352bb32e1f 100644
--- a/src/main/java/com/github/technus/tectech/CommonValues.java
+++ b/src/main/java/com/github/technus/tectech/CommonValues.java
@@ -29,5 +29,10 @@ public final class CommonValues {
     public static final byte MULTI_CHECK_AT = 12;// multiblock checks it's state
     public static final byte DISPERSE_AT = 14;// overflow hatches perform disperse
 
+    public static final long[] AatV = new long[]{268435455,67108863,16777215,4194303,1048575,262143,65535,16383,4095,1023,255,63,15,3,1,1};
+    public static final String[] VOLTAGE_NAMES = new String[]{"Ultra Low Voltage", "Low Voltage", "Medium Voltage", "High Voltage", "Extreme Voltage", "Insane Voltage", "Ludicrous Voltage", "ZPM Voltage", "Ultimate Voltage", "Ultimate High Voltage", "Ultimate Extreme Voltage", "Ultimate Insane Voltage", "Ultimate Mega Voltage", "Ultimate Extended Mega Voltage", "Overpowered Voltage", "Maximum Voltage"};
+    public static final String[] VN = new String[]{"ULV", "LV", "MV", "HV", "EV", "IV", "LuV", "ZPM", "UV", "UHV", "UEV", "UIV", "UMV", "UXV", "OpV", "MAX"};
+    public static final long[] V = new long[]{8L, 32L, 128L, 512L, 2048L, 8192L, 32768L, 131072L, 524288L, 2097152L, 8388608L, 33554432L, 134217728L, 536870912L, 1073741824L, Integer.MAX_VALUE - 7};
+
     private CommonValues() {}
 }
diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java
index f4dd1c826a..f1cb49f8c5 100644
--- a/src/main/java/com/github/technus/tectech/TecTech.java
+++ b/src/main/java/com/github/technus/tectech/TecTech.java
@@ -17,6 +17,7 @@ import cpw.mods.fml.common.registry.GameData;
 import cpw.mods.fml.common.registry.GameRegistry;
 import eu.usrv.yamcore.auxiliary.IngameErrorLog;
 import eu.usrv.yamcore.auxiliary.LogHelper;
+import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
 import gregtech.api.util.GT_Recipe;
 import net.minecraft.block.Block;
@@ -28,6 +29,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 
+import static com.github.technus.tectech.CommonValues.*;
 import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE;
 
 @Mod(modid = Reference.MODID, name = Reference.NAME, version = Reference.VERSION, dependencies = "required-after:Forge@[10.13.4.1614,);"
@@ -58,6 +60,11 @@ public class TecTech {
 
     @Mod.EventHandler
     public void PreLoad(FMLPreInitializationEvent PreEvent) {
+        for(int i=0;i<16;i++){
+            GT_Values.V[i]=V[i];
+            GT_Values.VN[i]=VN[i];
+            GT_Values.VOLTAGE_NAMES[i]=VOLTAGE_NAMES[i];
+        }
         Logger.setDebugOutput(true);
 
         ModConfig = new TecTechConfig(PreEvent.getModConfigurationDirectory(), Reference.COLLECTIONNAME,
diff --git a/src/main/java/com/github/technus/tectech/Util.java b/src/main/java/com/github/technus/tectech/Util.java
index fe623d7135..0bd48ede69 100644
--- a/src/main/java/com/github/technus/tectech/Util.java
+++ b/src/main/java/com/github/technus/tectech/Util.java
@@ -6,6 +6,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.GregTech_API;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.block.Block;
@@ -20,6 +21,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidStack;
 import org.apache.commons.lang3.StringUtils;
 
+import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -1252,19 +1254,15 @@ public final class Util {
         return GameRegistry.findUniqueIdentifierFor(is.getItem()).modId + ':' + is.getUnlocalizedName();
     }
 
-
-    public static final String[] VN = new String[]{"ULV", "LV", "MV", "HV", "EV", "IV", "LuV", "ZPM", "UV", "UHV", "UEV", "UIV", "UMV", "UXV", "OpV", "MAX"};
-    public static final long[] V = new long[]{8L, 32L, 128L, 512L, 2048L, 8192L, 32768L, 131072L, 524288L, 2097152L, 8388608L, 33554432L, 134217728L, 536870912L, 1073741824L, Integer.MAX_VALUE - 7};
-
     public static byte getTier(long l) {
         byte b = -1;
 
         do {
             ++b;
-            if (b >= V.length) {
+            if (b >= CommonValues.V.length) {
                 return b;
             }
-        } while (l > V[b]);
+        } while (l > CommonValues.V[b]);
 
         return b;
     }
@@ -1347,4 +1345,14 @@ public final class Util {
             return Integer.toString(hashCode()) + ' ' + (mItem == null ? "null" : mItem.getUnlocalizedName()) + ' ' + mMetaData + ' ' + mStackSize;
         }
     }
+
+    public static void setTier(int tier,Object me){
+        try{
+            Field field=GT_MetaTileEntity_TieredMachineBlock.class.getField("mTier");
+            field.setAccessible(true);
+            field.set(me,(byte)tier);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
 }
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
new file mode 100644
index 0000000000..7f2c9ede64
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java
@@ -0,0 +1,107 @@
+package com.github.technus.tectech.compatibility.dreamcraft;
+
+import com.github.technus.tectech.thing.CustomItemList;
+import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_WetTransformer;
+import cpw.mods.fml.common.Loader;
+import gregtech.api.metatileentity.MetaTileEntity;
+
+import java.lang.reflect.Constructor;
+
+public class NoDreamCraftMachineLoader implements Runnable{
+
+    @Override
+    public void run() {
+        CustomItemList.WetTransformer_LV_ULV.set(new GT_MetaTileEntity_WetTransformer(
+                12000, "wettransformer.tier.00", "Ultra Low Voltage Power Transformer", 0,
+                "LV -> ULV (Use Soft Mallet to invert)").getStackForm(1L));
+
+        CustomItemList.WetTransformer_MV_LV.set(new GT_MetaTileEntity_WetTransformer(
+                12001, "wetransformer.tier.01", "Low Voltage Power Transformer", 1,
+                "MV -> LV (Use Soft Mallet to invert)").getStackForm(1L));
+
+        CustomItemList.WetTransformer_HV_MV.set(new GT_MetaTileEntity_WetTransformer(
+                12002, "wettransformer.tier.02", "Medium Voltage Power Transformer", 2,
+                "HV -> MV (Use Soft Mallet to invert)").getStackForm(1L));
+
+        CustomItemList.WetTransformer_EV_HV.set(new GT_MetaTileEntity_WetTransformer(
+                12003, "wettransformer.tier.03", "High Voltage Power Transformer", 3,
+                "EV -> HV (Use Soft Mallet to invert)").getStackForm(1L));
+
+        CustomItemList.WetTransformer_IV_EV.set(new GT_MetaTileEntity_WetTransformer(
+                12004, "wettransformer.tier.04", "Extreme Power Transformer", 4,
+                "IV -> EV (Use Soft Mallet to invert)").getStackForm(1L));
+
+        CustomItemList.WetTransformer_LuV_IV.set(new GT_MetaTileEntity_WetTransformer(
+                12005, "wettransformer.tier.05", "Insane Power Transformer", 5,
+                "LuV -> IV (Use Soft Mallet to invert)").getStackForm(1L));
+
+        CustomItemList.WetTransformer_ZPM_LuV.set(new GT_MetaTileEntity_WetTransformer(
+                12006, "wettransformer.tier.06", "Ludicrous Power Transformer", 6,
+                "ZPM -> LuV (Use Soft Mallet to invert)").getStackForm(1L));
+
+        CustomItemList.WetTransformer_UV_ZPM.set(new GT_MetaTileEntity_WetTransformer(
+                12007, "wettransformer.tier.07", "ZPM Voltage Power Transformer", 7,
+                "UV -> ZPM (Use Soft Mallet to invert)").getStackForm(1L));
+
+        CustomItemList.WetTransformer_UHV_UV.set(new GT_MetaTileEntity_WetTransformer(
+                12008, "wettransformer.tier.08", "Ultimate Power Transformer", 8,
+                "UHV -> UV (Use Soft Mallet to invert)").getStackForm(1L));
+
+        CustomItemList.WetTransformer_UEV_UHV.set(new GT_MetaTileEntity_WetTransformer(
+                12009, "wettransformer.tier.09", "Highly Ultimate Power Transformer", 9,
+                "UEV -> UHV (Use Soft Mallet to invert)").getStackForm(1L));
+
+        CustomItemList.WetTransformer_UIV_UEV.set(new GT_MetaTileEntity_WetTransformer(
+                12010, "wettransformer.tier.10", "Extremely Ultimate Power Transformer",10,
+                "UIV -> UEV (Use Soft Mallet to invert)").getStackForm(1L));
+
+        CustomItemList.WetTransformer_UMV_UIV.set(new GT_MetaTileEntity_WetTransformer(
+                12011, "wettransformer.tier.11", "Insanely Ultimate Power Transformer",11,
+                "UMV -> UIV (Use Soft Mallet to invert)").getStackForm(1L));
+
+        CustomItemList.WetTransformer_UXV_UMV.set(new GT_MetaTileEntity_WetTransformer(
+                12012, "wettransformer.tier.12", "Mega Ultimate Power Transformer",12,
+                "UXV -> UMV (Use Soft Mallet to invert)").getStackForm(1L));
+
+        CustomItemList.WetTransformer_OPV_UXV.set(new GT_MetaTileEntity_WetTransformer(
+                12013, "wettransformer.tier.13", "Extended Mega Ultimate Power Transformer",13,
+                "OPV -> UXV (Use Soft Mallet to invert)").getStackForm(1L));
+
+        CustomItemList.WetTransformer_MAXV_OPV.set(new GT_MetaTileEntity_WetTransformer(
+                12014, "wettransformer.tier.14", "Overpowered Power Transformer",14,
+                "MAX -> OPV (Use Soft Mallet to invert)").getStackForm(1L));
+
+        if (Loader.isModLoaded("miscutils")) {
+            try {
+                Class clazz = Class.forName("gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTransformerHiAmp");
+                Constructor<MetaTileEntity> constructor=clazz.getConstructor(int.class,String.class,String.class,int.class,String.class);
+                CustomItemList.Transformer_HA_UEV_UHV.set(
+                        (constructor.newInstance(
+                                11989, "transformer.ha.tier.09", "Highly Ultimate Hi-Amp Transformer", 9,
+                                "UEV -> UHV (Use Soft Mallet to invert)")).getStackForm(1));
+                CustomItemList.Transformer_HA_UIV_UEV.set(
+                        (constructor.newInstance(
+                                11910, "transformer.ha.tier.10", "Extremely Ultimate Hi-Amp Transformer", 10,
+                                "UIV -> UEV (Use Soft Mallet to invert)")).getStackForm(1));
+                CustomItemList.Transformer_HA_UMV_UIV.set(
+                        (constructor.newInstance(
+                                11911, "transformer.ha.tier.11", "Insanely Ultimate Hi-Amp Transformer", 11,
+                                "UMV -> UIV (Use Soft Mallet to invert)")).getStackForm(1));
+                CustomItemList.Transformer_HA_UXV_UMV.set(
+                        (constructor.newInstance(
+                                11912, "transformer.ha.tier.12", "Mega Ultimate Hi-Amp Transformer", 12,
+                                "UXV -> UMV (Use Soft Mallet to invert)")).getStackForm(1));
+                CustomItemList.Transformer_HA_OPV_UXV.set(
+                        (constructor.newInstance(
+                                11913, "transformer.ha.tier.13", "Extended Mega Ultimate Hi-Amp Transformer", 13,
+                                "OPV -> UXV (Use Soft Mallet to invert)")).getStackForm(1));
+                CustomItemList.Transformer_HA_MAXV_OPV.set(
+                        (constructor.newInstance(
+                                11914, "transformer.ha.tier.14", "Overpowered Hi-Amp Transformer", 14,
+                                "MAX -> OPV (Use Soft Mallet to invert)")).getStackForm(1));
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java b/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java
index 7de7525cd2..5f0342bf77 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java
@@ -2,7 +2,6 @@ package com.github.technus.tectech.compatibility.gtpp;
 
 import com.github.technus.tectech.elementalMatter.core.stacks.cElementalDefinitionStack;
 import gregtech.api.enums.OrePrefixes;
-import gtPlusPlus.core.material.Material;
 import net.minecraftforge.fluids.FluidStack;
 
 import java.lang.reflect.Method;
@@ -52,7 +51,7 @@ public class GtppAtomLoader implements Runnable{
             getFluid=clazz.getMethod("getFluid", int.class);
 
             clazz=Class.forName("gtPlusPlus.core.material.MaterialGenerator");
-            generate=clazz.getMethod("generate", Material.class, boolean.class, boolean.class);
+            generate=clazz.getMethod("generate", Class.forName("gtPlusPlus.core.material.Material"), boolean.class, boolean.class);
         }catch (Exception e){
             throw new Error(e);
         }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
index db20de53c5..bcd5358281 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
@@ -23,7 +23,7 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import static com.github.technus.tectech.Util.StructureBuilderExtreme;
-import static com.github.technus.tectech.Util.V;
+import static com.github.technus.tectech.CommonValues.V;
 import static com.github.technus.tectech.compatibility.thaumcraft.EssentiaCompat.essentiaContainerCompat;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
index 8c5387160d..07e3c31db6 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
@@ -23,7 +23,7 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import static com.github.technus.tectech.Util.StructureBuilderExtreme;
-import static com.github.technus.tectech.Util.V;
+import static com.github.technus.tectech.CommonValues.V;
 import static com.github.technus.tectech.compatibility.thaumcraft.EssentiaCompat.essentiaContainerCompat;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalInstanceStackMap.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalInstanceStackMap.java
index e85166776f..436845af85 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalInstanceStackMap.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalInstanceStackMap.java
@@ -1,17 +1,13 @@
 package com.github.technus.tectech.elementalMatter.core;
 
-import com.github.technus.tectech.elementalMatter.core.stacks.iHasElementalDefinition;
 import com.github.technus.tectech.elementalMatter.core.stacks.cElementalDefinitionStack;
 import com.github.technus.tectech.elementalMatter.core.stacks.cElementalInstanceStack;
+import com.github.technus.tectech.elementalMatter.core.stacks.iHasElementalDefinition;
 import com.github.technus.tectech.elementalMatter.core.templates.iElementalDefinition;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
+import java.util.*;
 
 import static com.github.technus.tectech.elementalMatter.definitions.primitive.cPrimitiveDefinition.nbtE__;
 
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalMutableDefinitionStackMap.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalMutableDefinitionStackMap.java
index 9f7e14a154..8523280c0a 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalMutableDefinitionStackMap.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalMutableDefinitionStackMap.java
@@ -1,8 +1,8 @@
 package com.github.technus.tectech.elementalMatter.core;
 
-import com.github.technus.tectech.elementalMatter.core.stacks.iHasElementalDefinition;
 import com.github.technus.tectech.elementalMatter.core.stacks.cElementalDefinitionStack;
 import com.github.technus.tectech.elementalMatter.core.stacks.cElementalInstanceStack;
+import com.github.technus.tectech.elementalMatter.core.stacks.iHasElementalDefinition;
 imp