Further sacrifices

8 files changed, 117 insertions, 130 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 0570299f4e..7807dd921e 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
@@ -4,6 +4,7 @@ import com.github.technus.tectech.Reference;
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.Util;
 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;
 import cpw.mods.fml.common.Loader;
 import gregtech.api.enums.GT_Values;
@@ -11,7 +12,6 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicHull;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Transformer;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
 
@@ -41,9 +41,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
     public void run() {
         try {
             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)
-                    StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.00.desc")).getStackForm(1L));
+                    12000, "wettransformer.tier.00", "Ultra Low Voltage Power Transformer", 0).getStackForm(1L));//LV -> ULV (Use Soft Mallet to invert)
         } catch (IllegalArgumentException e) {
             System.out.println(METATILEENTITIES[12000].getClass().getCanonicalName());
             TecTech.LOGGER.error(e);
@@ -52,74 +50,46 @@ public class NoDreamCraftMachineLoader implements Runnable {
         }
 
         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)
-                StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.01.desc")).getStackForm(1L));
+                12001, "wetransformer.tier.01", "Low Voltage Power Transformer", 1).getStackForm(1L));//MV -> LV (Use Soft Mallet to invert)
 
         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)
-                StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.02.desc")).getStackForm(1L));
+                12002, "wettransformer.tier.02", "Medium Voltage Power Transformer", 2).getStackForm(1L));//HV -> MV (Use Soft Mallet to invert)
 
         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)
-                StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.03.desc")).getStackForm(1L));
+                12003, "wettransformer.tier.03", "High Voltage Power Transformer", 3).getStackForm(1L));//EV -> HV (Use Soft Mallet to invert)
 
         CustomItemList.WetTransformer_IV_EV.set(new GT_MetaTileEntity_WetTransformer(
-                12004, "wettransformer.tier.04", "Extreme Power Transformer", 4,
-                //IV -> EV (Use Soft Mallet to invert)
-                StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.04.desc")).getStackForm(1L));
+                12004, "wettransformer.tier.04", "Extreme Power Transformer", 4).getStackForm(1L));//IV -> EV (Use Soft Mallet to invert)
 
         CustomItemList.WetTransformer_LuV_IV.set(new GT_MetaTileEntity_WetTransformer(
-                12005, "wettransformer.tier.05", "Insane Power Transformer", 5,
-                //LuV -> IV (Use Soft Mallet to invert)
-                StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.05.desc")).getStackForm(1L));
+                12005, "wettransformer.tier.05", "Insane Power Transformer", 5).getStackForm(1L));//LuV -> IV (Use Soft Mallet to invert)
 
         CustomItemList.WetTransformer_ZPM_LuV.set(new GT_MetaTileEntity_WetTransformer(
-                12006, "wettransformer.tier.06", "Ludicrous Power Transformer", 6,
-                //ZPM -> LuV (Use Soft Mallet to invert)
-                StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.06.desc")).getStackForm(1L));
+                12006, "wettransformer.tier.06", "Ludicrous Power Transformer", 6).getStackForm(1L));//ZPM -> LuV (Use Soft Mallet to invert)
 
         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)
-                StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.07.desc")).getStackForm(1L));
+                12007, "wettransformer.tier.07", "ZPM Voltage Power Transformer", 7).getStackForm(1L));//UV -> ZPM (Use Soft Mallet to invert)
 
         CustomItemList.WetTransformer_UHV_UV.set(new GT_MetaTileEntity_WetTransformer(
-                12008, "wettransformer.tier.08", "Ultimate Power Transformer", 8,
-                //UHV -> UV (Use Soft Mallet to invert)
-                StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.08.desc")).getStackForm(1L));
+                12008, "wettransformer.tier.08", "Ultimate Power Transformer", 8).getStackForm(1L));//UHV -> UV (Use Soft Mallet to invert)
 
         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)
-                StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.09.desc")).getStackForm(1L));
+                12009, "wettransformer.tier.09", "Highly Ultimate Power Transformer", 9).getStackForm(1L));//UEV -> UHV (Use Soft Mallet to invert)
 
         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)
-                StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.10.desc")).getStackForm(1L));
+                12010, "wettransformer.tier.10", "Extremely Ultimate Power Transformer", 10).getStackForm(1L));//UIV -> UEV (Use Soft Mallet to invert)
 
         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)
-                StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.11.desc")).getStackForm(1L));
+                12011, "wettransformer.tier.11", "Insanely Ultimate Power Transformer", 11).getStackForm(1L));//UMV -> UIV (Use Soft Mallet to invert)
 
         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)
-                StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.12.desc")).getStackForm(1L));
+                12012, "wettransformer.tier.12", "Mega Ultimate Power Transformer", 12).getStackForm(1L));//UXV -> UMV (Use Soft Mallet to invert)
 
         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)
-                StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.13.desc")).getStackForm(1L));
+                12013, "wettransformer.tier.13", "Extended Mega Ultimate Power Transformer", 13).getStackForm(1L));//OPV -> UXV (Use Soft Mallet to invert)
 
         CustomItemList.WetTransformer_MAXV_OPV.set(new GT_MetaTileEntity_WetTransformer(
-                12014, "wettransformer.tier.14", "Overpowered Power Transformer", 14,
-                //MAX -> OPV (Use Soft Mallet to invert)
-                StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier.14.desc")).getStackForm(1L));
+                12014, "wettransformer.tier.14", "Overpowered Power Transformer", 14).getStackForm(1L));//MAX -> OPV (Use Soft Mallet to invert)
 
         try {
             MetaTileEntity temp;
@@ -186,57 +156,44 @@ public class NoDreamCraftMachineLoader implements Runnable {
             }
             CustomItemList.Hull_MAXV.set(temp.getStackForm(1L));
 
-
-            temp = new GT_MetaTileEntity_Transformer(
-                    11220, "transformer.tier.09", "Highly Ultimate Transformer", 9,
-                    //UEV -> UHV (Use Soft Mallet to invert)
-                    StatCollector.translateToLocal("gt.blockmachines.transformer.tier.09.desc"));
+            temp = new GT_MetaTileEntity_TT_Transformer(
+                    11220, "tt.transformer.tier.09", "Highly Ultimate Transformer", 9);//UEV -> UHV (Use Soft Mallet to invert)
             CustomItemList.Transformer_UEV_UHV.set(temp.getStackForm(1L));
 
-            temp = new GT_MetaTileEntity_Transformer(
-                    11221, "transformer.tier.10", "Extremely Ultimate Transformer", 10,
-                    //UIV -> UEV (Use Soft Mallet to invert)
-                    StatCollector.translateToLocal("gt.blockmachines.transformer.tier.10.desc"));
+            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);
             if (GT_Values.GT.isClientSide()) {
                 field.set(temp, method.invoke(temp, iTexture));
             }
             CustomItemList.Transformer_UIV_UEV.set(temp.getStackForm(1L));
 
-            temp = new GT_MetaTileEntity_Transformer(
-                    11222, "transformer.tier.11", "Insanely Ultimate Transformer", 11,
-                    //UMV -> UIV (Use Soft Mallet to invert)
-                    StatCollector.translateToLocal("gt.blockmachines.transformer.tier.11.desc"));
+            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);
             if (GT_Values.GT.isClientSide()) {
                 field.set(temp, method.invoke(temp, iTexture));
             }
             CustomItemList.Transformer_UMV_UIV.set(temp.getStackForm(1L));
 
-            temp = new GT_MetaTileEntity_Transformer(
-                    11223, "transformer.tier.12", "Mega Ultimate Transformer", 12,
-                    //UXV -> UMV (Use Soft Mallet to invert)
-                    StatCollector.translateToLocal("gt.blockmachines.transformer.tier.12.desc"));
+            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);
             if (GT_Values.GT.isClientSide()) {
                 field.set(temp, method.invoke(temp, iTexture));
             }
             CustomItemList.Transformer_UXV_UMV.set(temp.getStackForm(1L));
 
-            temp = new GT_MetaTileEntity_Transformer(
-                    11224, "transformer.tier.13", "Extended Mega Ultimate Transformer", 13,
-                    //OPV -> UXV (Use Soft Mallet to invert)
-                    StatCollector.translateToLocal("gt.blockmachines.transformer.tier.13.desc"));
+            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);
             if (GT_Values.GT.isClientSide()) {
                 field.set(temp, method.invoke(temp, iTexture));
             }
             CustomItemList.Transformer_OPV_UXV.set(temp.getStackForm(1L));
 
-            temp = new GT_MetaTileEntity_Transformer(
-                    11225, "transformer.tier.14", "Overpowered Transformer", 14,
-                    //MAX -> OPV (Use Soft Mallet to invert)
-                    StatCollector.translateToLocal("gt.blockmachines.transformer.tier.14.desc"));
+            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);
             if (GT_Values.GT.isClientSide()) {
                 field.set(temp, method.invoke(temp, iTexture));
@@ -308,4 +265,4 @@ public class NoDreamCraftMachineLoader implements Runnable {
             e.printStackTrace();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/mechanics/data/RendererMessage.java b/src/main/java/com/github/technus/tectech/mechanics/data/RendererMessage.java
index 792255cd4d..449b68a846 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/data/RendererMessage.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/data/RendererMessage.java
@@ -15,7 +15,7 @@ import java.util.Arrays;
 import java.util.HashSet;
 
 public class RendererMessage implements IMessage {
-    HashSet<thaumSpark> sparkList = new HashSet<thaumSpark>();
+    HashSet<ThaumSpark> sparkList = new HashSet<ThaumSpark>();
 
     public RendererMessage() {
     }
@@ -29,7 +29,7 @@ public class RendererMessage implements IMessage {
             InputStream is = new ByteArrayInputStream(boop);
             ObjectInputStream ois = new ObjectInputStream(is);
             Object data = ois.readObject();
-            sparkList = (HashSet<thaumSpark>) data;
+            sparkList = (HashSet<ThaumSpark>) data;
         } catch (IOException | ClassNotFoundException ex) {
         }
     }
@@ -51,7 +51,7 @@ public class RendererMessage implements IMessage {
         public RendererData() {
         }
 
-        public RendererData(HashSet<thaumSpark> eSparkList) {
+        public RendererData(HashSet<ThaumSpark> eSparkList) {
             sparkList = eSparkList;
         }
     }
@@ -60,7 +60,7 @@ public class RendererMessage implements IMessage {
     public static class ClientHandler extends AbstractClientMessageHandler<RendererData> {
         @Override
         public IMessage handleClientMessage(EntityPlayer pPlayer, RendererData pMessage, MessageContext pCtx) {
-            for (thaumSpark sp : pMessage.sparkList) {
+            for (ThaumSpark sp : pMessage.sparkList) {
                 thaumLightning(sp.x, sp.y, sp.z, sp.xR, sp.yR, sp.zR, sp.wID);
             }
             pMessage.sparkList.clear();
diff --git a/src/main/java/com/github/technus/tectech/mechanics/data/thaumSpark.java b/src/main/java/com/github/technus/tectech/mechanics/data/thaumSpark.java
index df578e7849..59462679de 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/data/thaumSpark.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/data/thaumSpark.java
@@ -3,12 +3,12 @@ package com.github.technus.tectech.mechanics.data;
 import java.io.Serializable;

 import java.util.Objects;

 

-public class thaumSpark implements Serializable {

+public class ThaumSpark implements Serializable {

     private static final long serialVersionUID = -7037856938316679566L;

     public int x, y, z, wID;

     public byte xR, yR, zR;

 

-    public thaumSpark(){

+    public ThaumSpark(){

         this.x = 0;

         this.z = 0;

         this.y = 0;

@@ -20,7 +20,7 @@ public class thaumSpark implements Serializable {
         this.wID = 0;

     }

 

-    public thaumSpark(int x, int y, int z, byte xR, byte yR, byte zR, int wID) {

+    public ThaumSpark(int x, int y, int z, byte xR, byte yR, byte zR, int wID) {

         this.x = x;

         this.z = z;

         this.y = y;

@@ -36,7 +36,7 @@ public class thaumSpark implements Serializable {
     public boolean equals(Object o) {

         if (this == o) return true;

         if (o == null || getClass() != o.getClass()) return false;

-        thaumSpark that = (thaumSpark) o;

+        ThaumSpark that = (ThaumSpark) o;

         return x == that.x &&

                 y == that.y &&

                 z == that.z &&

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 08050ad40c..a82bf9be99 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
@@ -4,7 +4,7 @@ import com.github.technus.tectech.CommonValues;
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.loader.NetworkDispatcher;
 import com.github.technus.tectech.mechanics.data.RendererMessage;
-import com.github.technus.tectech.mechanics.data.thaumSpark;
+import com.github.technus.tectech.mechanics.data.ThaumSpark;
 import com.github.technus.tectech.thing.cover.GT_Cover_TM_TeslaCoil;
 import com.github.technus.tectech.thing.cover.GT_Cover_TM_TeslaCoil_Ultimate;
 import com.github.technus.tectech.thing.metaTileEntity.IConstructable;
@@ -42,7 +42,7 @@ import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStat
 import static gregtech.api.enums.GT_Values.E;
 
 public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
-    private final static HashSet<thaumSpark> sparkList = new HashSet<>();
+    private final static HashSet<ThaumSpark> sparkList = new HashSet<>();
 
     private static Textures.BlockIcons.CustomIcon ScreenOFF;
     private static Textures.BlockIcons.CustomIcon ScreenON;
@@ -537,7 +537,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
 
         int wID = mte.getWorld().provider.dimensionId;
 
-        sparkList.add(new thaumSpark(posTop[0], posTop[1], posTop[2], xR, yR, zR, wID));
+        sparkList.add(new ThaumSpark(posTop[0], posTop[1], posTop[2], xR, yR, zR, wID));
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TT_Transformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TT_Transformer.java
new file mode 100644
index 0000000000..325fe4906b
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TT_Transformer.java
@@ -0,0 +1,54 @@
+package com.github.technus.tectech.thing.metaTileEntity.single;
+
+import com.github.technus.tectech.CommonValues;
+import com.github.technus.tectech.Util;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Transformer;
+import net.minecraft.util.StatCollector;
+
+import static com.github.technus.tectech.thing.metaTileEntity.Textures.*;
+
+public class GT_MetaTileEntity_TT_Transformer extends GT_MetaTileEntity_Transformer {
+    public GT_MetaTileEntity_TT_Transformer(int aID, String aName, String aNameRegional, int aTier) {
+        super(aID, aName, aNameRegional, aTier, "");
+        Util.setTier(aTier, this);
+    }
+
+    public GT_MetaTileEntity_TT_Transformer(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+        super(aName, aTier, aDescription, aTextures);
+        Util.setTier(aTier, this);
+    }
+
+    @Override
+    public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_TT_Transformer(mName, mTier, mDescription, mTextures);
+    }
+
+    @Override
+    public ITexture[][][] getTextureSet(ITexture[] aTextures) {
+        ITexture[][][] rTextures = new ITexture[12][17][];
+        for (byte b = -1; b < 16; b++) {
+            rTextures[0][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_OUT_MULTI_TT[mTier]};
+            rTextures[1][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_OUT_MULTI_TT[mTier]};
+            rTextures[2][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_OUT_MULTI_TT[mTier]};
+            rTextures[3][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_IN_POWER_TT[mTier + 1]};
+            rTextures[4][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_IN_POWER_TT[mTier + 1]};
+            rTextures[5][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_IN_POWER_TT[mTier + 1]};
+            rTextures[6][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_IN_MULTI_TT[mTier]};
+            rTextures[7][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_IN_MULTI_TT[mTier]};
+            rTextures[8][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_IN_MULTI_TT[mTier]};
+            rTextures[9][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_OUT_POWER_TT[mTier + 1]};
+            rTextures[10][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_OUT_POWER_TT[mTier + 1]};
+            rTextures[11][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_OUT_POWER_TT[mTier + 1]};
+        }
+        return rTextures;
+    }
+
+    @Override
+    public String[] getDescription() {
+        return new String[]{StatCollector.translateToLocal("gt.blockmachines.tt.transformer.tier." + (mTier > 9 ? "" : "0") + mTier + ".desc"), CommonValues.TEC_MARK_GENERAL};
+    }
+}
\ No newline at end of file
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 802fa8fb21..efa85a6ea5 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
@@ -5,7 +5,7 @@ import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.Util;

 import com.github.technus.tectech.loader.NetworkDispatcher;

 import com.github.technus.tectech.mechanics.data.RendererMessage;

-import com.github.technus.tectech.mechanics.data.thaumSpark;

+import com.github.technus.tectech.mechanics.data.ThaumSpark;

 import com.github.technus.tectech.thing.cover.GT_Cover_TM_TeslaCoil;

 import com.github.technus.tectech.thing.cover.GT_Cover_TM_TeslaCoil_Ultimate;

 import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_TM_teslaCoil;

@@ -34,7 +34,7 @@ import static java.lang.Math.round;
 

 

 public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryBuffer {

-    private final static HashSet<thaumSpark> sparkList = new HashSet<>();

+    private final static HashSet<ThaumSpark> sparkList = new HashSet<>();

     private byte sparkCount = 0;

 

     private int maxTier = 4; //Max tier of transceiver

@@ -214,7 +214,7 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB
 

         int wID = mte.getWorld().provider.dimensionId;

 

-        sparkList.add(new thaumSpark(x, y, z, xR, yR, zR, wID));

+        sparkList.add(new ThaumSpark(x, y, z, xR, yR, zR, wID));

     }

 

     private long getEnergyEfficiency(long voltage, int distance, boolean overDriveToggle) {

diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java
index 375e8ba655..d104ef0141 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java
@@ -1,25 +1,20 @@
 package com.github.technus.tectech.thing.metaTileEntity.single;
 
 import com.github.technus.tectech.CommonValues;
-import com.github.technus.tectech.Util;
-import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Transformer;
+import net.minecraft.util.StatCollector;
 
 import static com.github.technus.tectech.CommonValues.V;
-import static com.github.technus.tectech.thing.metaTileEntity.Textures.*;
 
-public class GT_MetaTileEntity_WetTransformer extends GT_MetaTileEntity_Transformer {
-    public GT_MetaTileEntity_WetTransformer(int aID, String aName, String aNameRegional, int aTier, String aDescription) {
-        super(aID,aName,aNameRegional,aTier,aDescription);
-        Util.setTier(aTier,this);
+public class GT_MetaTileEntity_WetTransformer extends GT_MetaTileEntity_TT_Transformer {
+    public GT_MetaTileEntity_WetTransformer(int aID, String aName, String aNameRegional, int aTier) {
+        super(aID, aName, aNameRegional, aTier);
     }
 
     public GT_MetaTileEntity_WetTransformer(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
-        super(aName,aTier,aDescription,aTextures);
-        Util.setTier(aTier,this);
+        super(aName, aTier, aDescription, aTextures);
     }
 
     @Override
@@ -28,28 +23,8 @@ public class GT_MetaTileEntity_WetTransformer extends GT_MetaTileEntity_Transfor
     }
 
     @Override
-    public ITexture[][][] getTextureSet(ITexture[] aTextures) {
-        ITexture[][][] rTextures = new ITexture[12][17][];
-        for (byte b = -1; b < 16; b++) {
-            rTextures[0][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_OUT_MULTI_TT[mTier]};
-            rTextures[1][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_OUT_MULTI_TT[mTier]};
-            rTextures[2][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_OUT_MULTI_TT[mTier]};
-            rTextures[3][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_IN_POWER_TT[mTier + 1]};
-            rTextures[4][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_IN_POWER_TT[mTier + 1]};
-            rTextures[5][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_IN_POWER_TT[mTier + 1]};
-            rTextures[6][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_IN_MULTI_TT[mTier]};
-            rTextures[7][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_IN_MULTI_TT[mTier]};
-            rTextures[8][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_IN_MULTI_TT[mTier]};
-            rTextures[9][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_OUT_POWER_TT[mTier + 1]};
-            rTextures[10][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_OUT_POWER_TT[mTier + 1]};
-            rTextures[11][b + 1] = new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][b + 1], OVERLAYS_ENERGY_OUT_POWER_TT[mTier + 1]};
-        }
-        return rTextures;
-    }
-
-    @Override
     public String[] getDescription() {
-        return new String[]{mDescription, "Accepts 16A and outputs 64A", CommonValues.TEC_MARK_GENERAL};
+        return new String[]{StatCollector.translateToLocal("gt.blockmachines.wetransformer.tier." + (mTier > 9 ? "" : "0") + mTier + ".desc"), "Accepts 16A and outputs 64A", CommonValues.TEC_MARK_GENERAL};
     }
 
     @Override
@@ -72,4 +47,4 @@ public class GT_MetaTileEntity_WetTransformer extends GT_MetaTileEntity_Transfor
     public long maxAmperesIn() {
         return getBaseMetaTileEntity().isAllowedToWork() ? 16 : 64;
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang
index 8d14c74dbe..755022d6a3 100644
--- a/src/main/resources/assets/tectech/lang/en_US.lang
+++ b/src/main/resources/assets/tectech/lang/en_US.lang
@@ -13,6 +13,7 @@ item.em.parametrizerMemoryCard.name=Parametrizer Memory Card
 item.em.EuMeterGT.name=GT EU meter
 item.tm.teslaCover.0.name=Tesla Coil Cover
 item.tm.teslaCover.1.name=Tesla Coil Cover Rich Edition
+item.tm.teslaStaff.name=Tesla Staff
 
 item.tm.teslaCoilCapacitor.0.name=LV Tesla Capacitor
 item.tm.teslaCoilCapacitor.1.name=MV Tesla Capacitor
@@ -68,18 +69,18 @@ gt.blockmachines.wetransformer.tier.13.desc=OPV -> UXV (Use Soft Mallet to inver
 gt.blockmachines.wetransformer.tier.14.name=Overpowered Power Transformer
 gt.blockmachines.wetransformer.tier.14.desc=MAX -> OPV (Use Soft Mallet to invert)
 
-gt.blockmachines.transformer.tier.09.name=Highly Ultimate Transformer
-gt.blockmachines.transformer.tier.09.desc=UEV -> UHV (Use Soft Mallet to invert)
-gt.blockmachines.transformer.tier.10.name=Extremely Ultimate Transformer
-gt.blockmachines.transformer.tier.10.desc=UIV -> UEV (Use Soft Mallet to invert)
-gt.blockmachines.transformer.tier.11.name=Insanely Ultimate Transformer
-gt.blockmachines.transformer.tier.11.desc=UMV -> UIV (Use Soft Mallet to invert)
-gt.blockmachines.transformer.tier.12.name=Mega Ultimate Transformer
-gt.blockmachines.transformer.tier.12.desc=UXV -> UMV (Use Soft Mallet to invert)
-gt.blockmachines.transformer.tier.13.name=Extended Mega Ultimate Transformer
-gt.blockmachines.transformer.tier.13.desc=OPV -> UXV (Use Soft Mallet to invert)
-gt.blockmachines.transformer.tier.14.name=Overpowered Transformer
-gt.blockmachines.transformer.tier.14.desc=MAX -> OPV (Use Soft Mallet to invert)
+gt.blockmachines.tt.transformer.tier.09.name=Highly Ultimate Transformer
+gt.blockmachines.tt.transformer.tier.09.desc=UEV -> UHV (Use Soft Mallet to invert)
+gt.blockmachines.tt.transformer.tier.10.name=Extremely Ultimate Transformer
+gt.blockmachines.tt.transformer.tier.10.desc=UIV -> UEV (Use Soft Mallet to invert)
+gt.blockmachines.tt.transformer.tier.11.name=Insanely Ultimate Transformer
+gt.blockmachines.tt.transformer.tier.11.desc=UMV -> UIV (Use Soft Mallet to invert)
+gt.blockmachines.tt.transformer.tier.12.name=Mega Ultimate Transformer
+gt.blockmachines.tt.transformer.tier.12.desc=UXV -> UMV (Use Soft Mallet to invert)
+gt.blockmachines.tt.transformer.tier.13.name=Extended Mega Ultimate Transformer
+gt.blockmachines.tt.transformer.tier.13.desc=OPV -> UXV (Use Soft Mallet to invert)
+gt.blockmachines.tt.transformer.tier.14.name=Overpowered Transformer
+gt.blockmachines.tt.transformer.tier.14.desc=MAX -> OPV (Use Soft Mallet to invert)
 
 gt.blockmachines.transformer.ha.tier.09.name=Highly Ultimate Hi-Amp Transformer
 gt.blockmachines.transformer.ha.tier.09.desc=UEV -> UHV (Use Soft Mallet to invert