Merge branch 'BassAddons' of https://github.com/Technus/TecTech into BassAddons

8 files changed, 206 insertions, 117 deletions

diff --git a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java
index a0ce184c4e..13d8861d31 100644
--- a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java
@@ -7,10 +7,7 @@ import com.github.technus.tectech.compatibility.openmodularturrets.blocks.turret
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
 import com.github.technus.tectech.thing.block.QuantumStuffBlock;
 import com.github.technus.tectech.thing.block.ReactorSimBlock;
-import com.github.technus.tectech.thing.casing.GT_Block_CasingsNH;
-import com.github.technus.tectech.thing.casing.GT_Block_CasingsTT;
-import com.github.technus.tectech.thing.casing.GT_Block_HintTT;
-import com.github.technus.tectech.thing.casing.TT_Container_Casings;
+import com.github.technus.tectech.thing.casing.*;
 import com.github.technus.tectech.thing.item.*;
 import cpw.mods.fml.common.Loader;
 import gregtech.api.enums.Textures;
@@ -34,6 +31,8 @@ public class ThingsLoader implements Runnable {
         TecTech.LOGGER.info("Added texture page if was null");
         TT_Container_Casings.sBlockCasingsTT = new GT_Block_CasingsTT();
         TecTech.LOGGER.info("Elemental Casing registered");
+        TT_Container_Casings.sBlockCasingsBA0 = new GT_Block_CasingsBA0();
+        TecTech.LOGGER.info("Nikolai's Casing registered");
         TT_Container_Casings.sHintCasingsTT = new GT_Block_HintTT();
         TecTech.LOGGER.info("Hint Blocks registered");
 
diff --git a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java
index 8d77610ffc..b52298d1a2 100644
--- a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java
+++ b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java
@@ -78,7 +78,7 @@ public enum CustomItemList implements IItemContainer {
     eM_Containment, eM_Containment_Field, eM_Containment_Advanced, eM_Coil, eM_Teleportation, eM_Dimensional, eM_Ultimate_Containment, eM_Ultimate_Containment_Advanced, eM_Ultimate_Containment_Field, eM_Spacetime, eM_Computer_Casing, eM_Computer_Bus, eM_Computer_Vent, eM_Hollow, eM_Power,

     debugBlock,

 

-    tM_TeslaBase, tM_TeslaToroid, tM_TeslaFrame, tM_TeslaPrimary_0, tM_TeslaPrimary_1, tM_TeslaPrimary_2, tM_TeslaSecondary_0, tM_TeslaSecondary_1, tM_TeslaSecondary_2,

+    tM_TeslaBase, tM_TeslaToroid, tM_TeslaFrame, tM_TeslaPrimary_0, tM_TeslaPrimary_1, tM_TeslaPrimary_2, tM_TeslaPrimary_3, tM_TeslaPrimary_4, tM_TeslaPrimary_5,

 

     Machine_Multi_Microwave, Machine_Multi_teslaCoil,

     Machine_Multi_Transformer,

diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsBA0.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsBA0.java
new file mode 100644
index 0000000000..50559c0582
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsBA0.java
@@ -0,0 +1,114 @@
+package com.github.technus.tectech.thing.casing;
+
+import com.github.technus.tectech.thing.CustomItemList;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.enums.Textures;
+import gregtech.api.objects.GT_CopiedBlockTexture;
+import gregtech.api.util.GT_LanguageManager;
+import gregtech.common.blocks.GT_Block_Casings_Abstract;
+import gregtech.common.blocks.GT_Material_Casings;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+
+import java.util.List;
+
+import static com.github.technus.tectech.TecTech.tectechTexturePage1;
+
+/**
+ * Created by danie_000 on 03.10.2016.
+ */
+public class GT_Block_CasingsBA0 extends GT_Block_Casings_Abstract {
+    public static final byte texturePage=tectechTexturePage1;
+    public static final short textureOffset = texturePage << 7;//Start of PAGE 8 (which is the 9th page)  (8*128)
+    private static IIcon tM0, tM1, tM2, tM3, tM4, tM5, tM6, tM7, tM8;
+    private static IIcon[] debug = new IIcon[6];
+
+    public GT_Block_CasingsBA0() {
+        super(GT_Item_CasingsBA0.class, "gt.blockcasingsBA0", GT_Material_Casings.INSTANCE);
+        for (byte b = 0; b < 16; b = (byte) (b + 1)) {
+            Textures.BlockIcons.casingTexturePages[texturePage][b] = new GT_CopiedBlockTexture(this, 6, b);
+            /*IMPORTANT for block recoloring**/
+        }
+
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "T0 Primary Tesla Windings");//TODO Decide tesla coil winding materials to rename
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "T1 Primary Tesla Windings");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "T2 Primary Tesla Windings");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "T3 Primary Tesla Windings");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "T4 Primary Tesla Windings");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "T5 Primary Tesla Windings");
+
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Tesla Base Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Tesla Toroid Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Tesla Structural Frame");
+
+        CustomItemList.tM_TeslaPrimary_0.set(new ItemStack(this, 1, 0));
+        CustomItemList.tM_TeslaPrimary_1.set(new ItemStack(this, 1, 1));
+        CustomItemList.tM_TeslaPrimary_2.set(new ItemStack(this, 1, 2));
+        CustomItemList.tM_TeslaPrimary_3.set(new ItemStack(this, 1, 3));
+        CustomItemList.tM_TeslaPrimary_4.set(new ItemStack(this, 1, 4));
+        CustomItemList.tM_TeslaPrimary_5.set(new ItemStack(this, 1, 5));
+
+        CustomItemList.tM_TeslaBase.set(new ItemStack(this, 1, 6));
+        CustomItemList.tM_TeslaToroid.set(new ItemStack(this, 1, 7));
+        CustomItemList.tM_TeslaFrame.set(new ItemStack(this, 1, 8));
+    }
+
+    @Override
+    public void registerBlockIcons(IIconRegister aIconRegister) {
+        tM0 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER");
+        tM1 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER");
+        tM2 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER");
+        tM3 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER");
+        tM4 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER");
+        tM5 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER");
+
+        tM6 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER");
+        tM7 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER");
+        tM8 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER");
+    }
+
+    @Override
+    public IIcon getIcon(int aSide, int aMeta) {
+        switch (aMeta) {
+            case 0:
+                return tM0;
+            case 1:
+                return tM1;
+            case 2:
+                return tM2;
+            case 3:
+                return tM3;
+            case 4:
+                return tM4;
+            case 5:
+                return tM5;
+            case 6:
+                return tM6;
+            case 7:
+                return tM7;
+            case 8:
+                return tM8;
+            default:
+                return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
+        }
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, int aSide) {
+        int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord);
+        return getIcon(aSide, tMeta);
+    }
+
+    @Override
+    public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) {
+        for (int i = 0; i <= 8; i++) {
+            aList.add(new ItemStack(aItem, 1, i));
+        }
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java
index 3f513741d2..639e68fef6 100644
--- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java
+++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java
@@ -26,7 +26,6 @@ public class GT_Block_CasingsTT extends GT_Block_Casings_Abstract {
     public static final byte texturePage=tectechTexturePage1;
     public static final short textureOffset = texturePage << 7;//Start of PAGE 8 (which is the 9th page)  (8*128)
     private static IIcon eM0, eM1, eM1s, eM2, eM2s, eM3, eM3s, eM4, eM5, eM6, eM7, eM7s, eM8, eM9, eM10, eM11, eM12, eM13, eM14;
-    private static IIcon tM0, tM1, tM2, tM3, tM4, tM5, tM6, tM7, tM8;
     private static IIcon[] debug = new IIcon[6];
 
     public GT_Block_CasingsTT() {
@@ -58,19 +57,6 @@ public class GT_Block_CasingsTT extends GT_Block_Casings_Abstract {
 
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Debug Sides");//NOT REGISTER AS TEXTURE FOR HATCHES!
 
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".200.name", "Tesla Base Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".201.name", "Tesla Toroid Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".202.name", "Tesla Structural Frame");
-
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".203.name", "T0 Primary Tesla Windings");//TODO Decide tesla coil winding materials to rename
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".204.name", "T1 Primary Tesla Windings");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".205.name", "T2 Primary Tesla Windings");
-
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".206.name", "T3 Primary Tesla Windings");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".207.name", "T4 Primary Tesla Windings");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".208.name", "T5 Primary Tesla Windings");
-
-
         CustomItemList.eM_Power.set(new ItemStack(this, 1, 0));
 
         CustomItemList.eM_Computer_Casing.set(new ItemStack(this, 1, 1));
@@ -93,18 +79,6 @@ public class GT_Block_CasingsTT extends GT_Block_Casings_Abstract {
         CustomItemList.eM_Ultimate_Containment_Field.set(new ItemStack(this, 1, 14));
 
         CustomItemList.debugBlock.set(new ItemStack(this, 1, 15));
-
-        CustomItemList.tM_TeslaBase.set(new ItemStack(this, 1, 200));
-        CustomItemList.tM_TeslaToroid.set(new ItemStack(this, 1, 201));
-        CustomItemList.tM_TeslaFrame.set(new ItemStack(this, 1, 202));
-
-        CustomItemList.tM_TeslaPrimary_0.set(new ItemStack(this, 1, 203));
-        CustomItemList.tM_TeslaPrimary_1.set(new ItemStack(this, 1, 204));
-        CustomItemList.tM_TeslaPrimary_2.set(new ItemStack(this, 1, 205));
-
-        CustomItemList.tM_TeslaSecondary_0.set(new ItemStack(this, 1, 206));
-        CustomItemList.tM_TeslaSecondary_1.set(new ItemStack(this, 1, 207));
-        CustomItemList.tM_TeslaSecondary_2.set(new ItemStack(this, 1, 208));
     }
 
     @Override
@@ -141,18 +115,6 @@ public class GT_Block_CasingsTT extends GT_Block_Casings_Abstract {
         debug[3] = aIconRegister.registerIcon("gregtech:iconsets/DEBUG_3");
         debug[4] = aIconRegister.registerIcon("gregtech:iconsets/DEBUG_4");
         debug[5] = aIconRegister.registerIcon("gregtech:iconsets/DEBUG_5");
-
-        tM0 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER");//TODO Configure custom tesla texture sets
-        tM1 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER");
-        tM2 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER");
-
-        tM3 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER");
-        tM4 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER");
-        tM5 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER");
-
-        tM6 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER");
-        tM7 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER");
-        tM8 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER");
     }
 
     @Override
@@ -202,24 +164,6 @@ public class GT_Block_CasingsTT extends GT_Block_Casings_Abstract {
                 return eM14;
             case 15:
                 return debug[aSide];
-            case 200:
-                return tM0;
-            case 201:
-                return tM1;
-            case 202:
-                return tM2;
-            case 203:
-                return tM3;
-            case 204:
-                return tM4;
-            case 205:
-                return tM5;
-            case 206:
-                return tM6;
-            case 207:
-                return tM7;
-            case 208:
-                return tM8;
             default:
                 return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
         }
@@ -234,13 +178,8 @@ public class GT_Block_CasingsTT extends GT_Block_Casings_Abstract {
 
     @Override
     public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) {
-        //Add Tec's Casings
         for (int i = 0; i <= 15; i++) {
             aList.add(new ItemStack(aItem, 1, i));
         }
-        //Add Bass' Casings
-        for (int i = 200; i <= 208; i++) {
-            aList.add(new ItemStack(aItem, 1, i));
-        }
     }
 }
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
new file mode 100644
index 0000000000..0c84692dba
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsBA0.java
@@ -0,0 +1,70 @@
+package com.github.technus.tectech.thing.casing;
+
+import gregtech.common.blocks.GT_Item_Casings_Abstract;
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+
+import java.util.List;
+
+import static com.github.technus.tectech.CommonValues.*;
+
+/**
+ * Created by danie_000 on 03.10.2016.
+ */
+public class GT_Item_CasingsBA0 extends GT_Item_Casings_Abstract {
+    public GT_Item_CasingsBA0(Block par1) {
+        super(par1);
+    }
+
+    @Override
+    public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
+        if(aStack.getItemDamage() < 15) {
+            aList.add(BASS_MARK);
+        } else {
+            aList.add(COSMIC_MARK);
+        }
+        switch (aStack.getItemDamage()) {
+            case 0://"T0 Primary Tesla Windings"
+                aList.add("Well suited for high power applications.");
+                aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "The power levels are rising!");
+                break;
+            case 1://"T1 Primary Tesla Windings"
+                aList.add("Nice and clean casing.");
+                aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Dust can break it!?");
+                break;
+            case 2://"T2 Primary Tesla Windings"
+                aList.add("Air vent with a filter.");
+                aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Perfectly muffled sound!");
+                break;
+            case 3://"T3 Primary Tesla Windings"
+                aList.add("Contains high bandwidth bus");
+                aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "couple thousand qubits wide.");
+                break;
+            case 4://"T4 Primary Tesla Windings"
+                aList.add("Stops elemental things.");
+                aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Radiation and emotions too...");
+                break;
+            case 5://"T5 Primary Tesla Windings"
+                aList.add("Cooling and stabilization.");
+                aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "A comfortable machine bed.");
+                break;
+            case 6://"Tesla Base Casing"
+                aList.add("Creates a field that...");
+                aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "can stop even force carriers.");
+                break;
+            case 7://"Tesla Toroid Casing"
+                aList.add("Well it does things too...");
+                aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "[Use this coil!]");
+                break;
+            case 8://"Tesla Structural Frame"
+                aList.add("Reinforced accelerator tunnel.");
+                aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Most advanced pipe ever.");
+                break;
+            default://WTF?
+                aList.add("Damn son where did you get that!?");
+                aList.add(EnumChatFormatting.BLUE.toString() + "From outer space... I guess...");
+        }
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java
index 8137a1d655..2fd58c408f 100644
--- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java
+++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java
@@ -18,14 +18,10 @@ public class GT_Item_CasingsTT extends GT_Item_Casings_Abstract {
         super(par1);
     }
 
-    @Override //TODO Negotiate Casing space with Tec
+    @Override
     public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
         if(aStack.getItemDamage() < 15) {
             aList.add(TEC_MARK_EM);
-        } else if ((aStack.getItemDamage() < 200)) {
-            aList.add(TEC_MARK_GENERAL);
-        } else if (aStack.getItemDamage() < 300){
-            aList.add(BASS_MARK);
         } else {
             aList.add(COSMIC_MARK);
         }
@@ -94,42 +90,6 @@ public class GT_Item_CasingsTT extends GT_Item_Casings_Abstract {
                 aList.add("Lazy man way of determining sides.");
                 aList.add(EnumChatFormatting.BLUE.toString() + "0, 1, 2, 3, 4, 5, 6?!");
                 break;
-            case 200://"Tesla Base Casing"
-                aList.add("Lazy man way of determining sides.");
-                aList.add(EnumChatFormatting.BLUE.toString() + "0, 1, 2, 3, 4, 5, 6?!");
-                break;
-            case 201://"Tesla Toroid Casing"
-                aList.add("Lazy man way of determining sides.");
-                aList.add(EnumChatFormatting.BLUE.toString() + "0, 1, 2, 3, 4, 5, 6?!");
-                break;
-            case 202://"Tesla Structural Frame"
-                aList.add("Lazy man way of determining sides.");
-                aList.add(EnumChatFormatting.BLUE.toString() + "0, 1, 2, 3, 4, 5, 6?!");
-                break;
-            case 203://"T0 Primary Tesla Windings"
-                aList.add("Lazy man way of determining sides.");
-                aList.add(EnumChatFormatting.BLUE.toString() + "0, 1, 2, 3, 4, 5, 6?!");
-                break;
-            case 204://"T1 Primary Tesla Windings"
-                aList.add("Lazy man way of determining sides.");
-                aList.add(EnumChatFormatting.BLUE.toString() + "0, 1, 2, 3, 4, 5, 6?!");
-                break;
-            case 205://"T2 Primary Tesla Windings"
-                aList.add("Lazy man way of determining sides.");
-                aList.add(EnumChatFormatting.BLUE.toString() + "0, 1, 2, 3, 4, 5, 6?!");
-                break;
-            case 206://"T0 Secondary Tesla Windings"
-                aList.add("Lazy man way of determining sides.");
-                aList.add(EnumChatFormatting.BLUE.toString() + "0, 1, 2, 3, 4, 5, 6?!");
-                break;
-            case 207://"T1 Secondary Tesla Windings"
-                aList.add("Lazy man way of determining sides.");
-                aList.add(EnumChatFormatting.BLUE.toString() + "0, 1, 2, 3, 4, 5, 6?!");
-                break;
-            case 208://"T2 Secondary Tesla Windings"
-                aList.add("Lazy man way of determining sides.");
-                aList.add(EnumChatFormatting.BLUE.toString() + "0, 1, 2, 3, 4, 5, 6?!");
-                break;
             default://WTF?
                 aList.add("Damn son where did you get that!?");
                 aList.add(EnumChatFormatting.BLUE.toString() + "From outer space... I guess...");
diff --git a/src/main/java/com/github/technus/tectech/thing/casing/TT_Container_Casings.java b/src/main/java/com/github/technus/tectech/thing/casing/TT_Container_Casings.java
index 851046f34b..071a4ae28f 100644
--- a/src/main/java/com/github/technus/tectech/thing/casing/TT_Container_Casings.java
+++ b/src/main/java/com/github/technus/tectech/thing/casing/TT_Container_Casings.java
@@ -8,6 +8,8 @@ import net.minecraft.block.Block;
 public final class TT_Container_Casings {
     public static Block sBlockCasingsTT;
     public static Block sHintCasingsTT;
+    public static Block sBlockCasingsBA0;
+
     public static Block sBlockCasingsNH;
 
     private TT_Container_Casings() {}
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 58c212eeb6..75f849d9ac 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
@@ -31,6 +31,8 @@ import static com.github.technus.tectech.CommonValues.V;
 import static com.github.technus.tectech.Util.StructureBuilder;
 import static com.github.technus.tectech.Util.entriesSortedByValues;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage;
+import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsBA0;
+import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
 import static gregtech.api.GregTech_API.*;
 import static gregtech.api.enums.GT_Values.E;
 
@@ -121,11 +123,14 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
     };
 
     private static final String[][][] shapes = new String[][][]{shape0,shape1,shape2,shape3};
-    private static final Block[] blockType = new Block[]{sBlockCasings1, sBlockCasings5, sBlockCasings2, sBlockCasings5};//TODO Give it it's own casing type, add a primary coil type, add a secondary coil type and add toroid casing type
-    private static final byte[] blockMetaT0 = new byte[]{15, 0, 13, 0};
-    private static final byte[] blockMetaT1 = new byte[]{15, 1, 13, 0};
-    private static final byte[] blockMetaT2 = new byte[]{15, 2, 13, 0};
-    private static final byte[][] blockMetas = new byte[][]{blockMetaT0,blockMetaT1,blockMetaT2};
+    private static final Block[] blockType = new Block[]{sBlockCasingsBA0,sBlockCasingsBA0,sBlockCasingsBA0,sBlockCasingsBA0};
+    private static final byte[] blockMetaT0 = new byte[]{7, 0, 6, 8};
+    private static final byte[] blockMetaT1 = new byte[]{7, 1, 6, 8};
+    private static final byte[] blockMetaT2 = new byte[]{7, 2, 6, 8};
+    private static final byte[] blockMetaT3 = new byte[]{7, 3, 6, 8};
+    private static final byte[] blockMetaT4 = new byte[]{7, 4, 6, 8};
+    private static final byte[] blockMetaT5 = new byte[]{7, 5, 6, 8};
+    private static final byte[][] blockMetas = new byte[][]{blockMetaT0,blockMetaT1,blockMetaT2,blockMetaT3,blockMetaT4,blockMetaT5};
     private final HatchAdder[] addingMethods = new HatchAdder[]{this::addCapacitorToMachineList, this::addFrameToMachineList};
     private static final short[] casingTextures = new short[]{29, 0};
     private static final Block[] blockTypeFallback = new Block[]{sBlockCasings2, null};
@@ -250,25 +255,25 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
         int yOffset;
         int zOffset;
 
-        if (coil0 == sBlockCasings5) {
+        if (coil0 == sBlockCasingsTT) {
             xOffset = 3;
             yOffset = 16;
             zOffset = 0;
             orientation = 0;
             tier = iGregTechTileEntity.getMetaIDOffset(coilX0, coilY0, coilZ0);
-        } else if (coil1 == sBlockCasings5) {
+        } else if (coil1 == sBlockCasingsTT) {
             xOffset = 3;
             yOffset = 0;
             zOffset = 0;
             orientation = 1;
             tier = iGregTechTileEntity.getMetaIDOffset(coilX0, -coilY0, coilZ0);
-        } else if (coil2 == sBlockCasings5) {
+        } else if (coil2 == sBlockCasingsTT) {
             xOffset = 16;
             yOffset = 3;
             zOffset = 0;
             orientation = 2;
             tier = iGregTechTileEntity.getMetaIDOffset(coilX1, coilY1, coilZ1);
-        } else if (coil3 == sBlockCasings5) {
+        } else if (coil3 == sBlockCasingsTT) {
             xOffset = 0;
             yOffset = 3;
             zOffset = 0;
@@ -291,7 +296,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
 
     @Override
     public void construct(int stackSize, boolean hintsOnly) {
-        StructureBuilder(shapes[0], blockType, blockMetas[(stackSize-1)%3], 3, 16, 0, getBaseMetaTileEntity(), hintsOnly);
+        StructureBuilder(shapes[0], blockType, blockMetas[(stackSize-1)%6], 3, 16, 0, getBaseMetaTileEntity(), hintsOnly);
     }
 
     @Override