Undo gradle changes on this branch for a touch

4 files changed, 62 insertions, 67 deletions

diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
index 2609a81860..4fb21a2387 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
@@ -43,7 +43,7 @@ public class DreamCraftRecipeLoader implements Runnable {
         try {
             ADD_ASSEMBLER_RECIPE.invoke(GT_Values.RA, items, fluid, output, time, eut, true);
         } catch (Exception e) {
-            throw new RuntimeException("Failed to add clean room assembler recipe! " +output.getDisplayName(),e);
+            throw new RuntimeException("Failed to add clean room assembler recipe! " + output.getDisplayName(), e);
         }
     }
     //endregion
@@ -269,9 +269,9 @@ public class DreamCraftRecipeLoader implements Runnable {
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Transformer_LuV_IV.get(1), CustomItemList.eM_energyMulti4_IV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Tungsten, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 4)}, Materials.Electrum.getMolten(144), CustomItemList.eM_energyMulti16_IV.get(1), 200, 1920);
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("WetTransformer_LuV_IV").get(1), CustomItemList.eM_energyMulti16_IV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Tungsten, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 6)}, Materials.Tungsten.getMolten(144), CustomItemList.eM_energyMulti64_IV.get(1), 400, 1920);
 
-        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Hatch_Energy_LuV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 2), GT_OreDictUnificator.get(OrePrefixes.plate,  getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 2)}, Materials.Silver.getMolten(288), CustomItemList.eM_energyMulti4_LuV.get(1), 100, 7680);
-        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Transformer_ZPM_LuV.get(1), CustomItemList.eM_energyMulti4_LuV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 2), GT_OreDictUnificator.get(OrePrefixes.plate,  getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 4)}, Materials.Electrum.getMolten(288), CustomItemList.eM_energyMulti16_LuV.get(1), 200, 7680);
-        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("WetTransformer_ZPM_LuV").get(1), CustomItemList.eM_energyMulti16_LuV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.VanadiumGallium, 2), GT_OreDictUnificator.get(OrePrefixes.plate,  getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 6)}, Materials.Tungsten.getMolten(288), CustomItemList.eM_energyMulti64_LuV.get(1), 400, 7680);
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Hatch_Energy_LuV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.VanadiumGallium, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 2)}, Materials.Silver.getMolten(288), CustomItemList.eM_energyMulti4_LuV.get(1), 100, 7680);
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Transformer_ZPM_LuV.get(1), CustomItemList.eM_energyMulti4_LuV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.VanadiumGallium, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 4)}, Materials.Electrum.getMolten(288), CustomItemList.eM_energyMulti16_LuV.get(1), 200, 7680);
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("WetTransformer_ZPM_LuV").get(1), CustomItemList.eM_energyMulti16_LuV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.VanadiumGallium, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 6)}, Materials.Tungsten.getMolten(288), CustomItemList.eM_energyMulti64_LuV.get(1), 400, 7680);
 
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Hatch_Energy_ZPM.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2)}, Materials.Silver.getMolten(576), CustomItemList.eM_energyMulti4_ZPM.get(1), 100, 30720);
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Transformer_UV_ZPM.get(1), CustomItemList.eM_energyMulti4_ZPM.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 4)}, Materials.Electrum.getMolten(576), CustomItemList.eM_energyMulti16_ZPM.get(1), 200, 30720);
@@ -294,9 +294,9 @@ public class DreamCraftRecipeLoader implements Runnable {
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("WetTransformer_UMV_UIV").get(1), CustomItemList.eM_energyMulti16_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NetherStar, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 6)}, Materials.Tungsten.getMolten(8000), CustomItemList.eM_energyMulti64_UIV.get(1), 400, 8000000);
 
         //Buck Converter IV-UIV
-        if(Loader.isModLoaded("bartworks")) {
+        if (Loader.isModLoaded("bartworks")) {
             GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Transformer_LuV_IV.get(1), getItemContainer("Display").get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 4), GT_ModHandler.getModItem("bartworks", "BW_GlasBlocks", 2L, 2)}, Materials.TungstenSteel.getMolten(288), CustomItemList.Machine_BuckConverter_IV.get(1), 100, 7680);
-            GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Transformer_ZPM_LuV.get(1), getItemContainer("Display").get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), GT_OreDictUnificator.get(OrePrefixes.plate,  getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NiobiumTitanium, 4), GT_ModHandler.getModItem("bartworks", "BW_GlasBlocks", 2L, 3)},  new FluidStack(FluidRegistry.getFluid("molten.rhodium-plated palladium"), 288), CustomItemList.Machine_BuckConverter_LuV.get(1), 100, 30720);
+            GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Transformer_ZPM_LuV.get(1), getItemContainer("Display").get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NiobiumTitanium, 4), GT_ModHandler.getModItem("bartworks", "BW_GlasBlocks", 2L, 3)}, new FluidStack(FluidRegistry.getFluid("molten.rhodium-plated palladium"), 288), CustomItemList.Machine_BuckConverter_LuV.get(1), 100, 30720);
             GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Transformer_UV_ZPM.get(1), getItemContainer("Display").get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 4), GT_ModHandler.getModItem("bartworks", "BW_GlasBlocks", 2L, 4)}, Materials.Iridium.getMolten(288), CustomItemList.Machine_BuckConverter_ZPM.get(1), 100, 122880);
             GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Transformer_MAX_UV.get(1), getItemContainer("Display").get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Superconductor, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Naquadah, 4), GT_ModHandler.getModItem("bartworks", "BW_GlasBlocks", 2L, 5)}, Materials.Osmium.getMolten(288), CustomItemList.Machine_BuckConverter_UV.get(1), 100, 500000);
             GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("Transformer_UEV_UHV").get(1), getItemContainer("Display").get(1), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Infinite, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.ElectrumFlux, 4), GT_ModHandler.getModItem("bartworks", "BW_GlasBlocks", 4L, 5)}, Materials.Neutronium.getMolten(288), CustomItemList.Machine_BuckConverter_UHV.get(1), 100, 2000000);
@@ -560,7 +560,7 @@ public class DreamCraftRecipeLoader implements Runnable {
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
                 getItemContainer("WetTransformer_ZPM_LuV").get(1),
                 getItemContainer("HighEnergyFlowCircuit").get(1),
-                GT_OreDictUnificator.get(OrePrefixes.wireGt01, getOrDefault("SuperconductorLuV",Materials.Superconductor), 16),
+                GT_OreDictUnificator.get(OrePrefixes.wireGt01, getOrDefault("SuperconductorLuV", Materials.Superconductor), 16),
                 ItemList.valueOf("Circuit_Chip_UHPIC").get(2),
         }, Materials.TungstenSteel.getMolten(576), CustomItemList.Machine_Multi_Transformer.get(1), 400, 30720);
 
@@ -608,48 +608,48 @@ public class DreamCraftRecipeLoader implements Runnable {
         //Matter Junction
         TT_recipeAdder.addResearchableAssemblylineRecipe(CustomItemList.Machine_Multi_Switch.get(1),
                 8000, 32, 500000, 4, new ItemStack[]{
-                CustomItemList.Machine_Multi_Transformer.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 4),
-                ItemList.Robot_Arm_LuV.get(2),
-                ItemList.Electric_Piston_LuV.get(2),
-                ItemList.Circuit_Wetwaresupercomputer.get(2),
-                GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 4),
-        }, new FluidStack[]{
-                Materials.UUMatter.getFluid(1000),
-                Materials.Naquadah.getMolten(1296),
-                new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000),
-                Materials.Osmium.getMolten(1296),
-        }, CustomItemList.Machine_Multi_EMjunction.get(1), 12000, 100000);
+                        CustomItemList.Machine_Multi_Transformer.get(1),
+                        GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 4),
+                        ItemList.Robot_Arm_LuV.get(2),
+                        ItemList.Electric_Piston_LuV.get(2),
+                        ItemList.Circuit_Wetwaresupercomputer.get(2),
+                        GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 4),
+                }, new FluidStack[]{
+                        Materials.UUMatter.getFluid(1000),
+                        Materials.Naquadah.getMolten(1296),
+                        new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000),
+                        Materials.Osmium.getMolten(1296),
+                }, CustomItemList.Machine_Multi_EMjunction.get(1), 12000, 100000);
 
         //Matter Quantizer
         TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Hatch_Input_UV.get(1),
                 12000, 32, 500000, 6, new ItemStack[]{
-                CustomItemList.Machine_Multi_Transformer.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 4),
-                ItemList.Emitter_UV.get(2),
-                ItemList.Circuit_Wetwaresupercomputer.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 2),
-        }, new FluidStack[]{
-                Materials.UUMatter.getFluid(1000),
-                Materials.Naquadah.getMolten(1296),
-                new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000),
-                Materials.Osmium.getMolten(1296),
-        }, CustomItemList.Machine_Multi_MatterToEM.get(1), 12000, 100000);
+                        CustomItemList.Machine_Multi_Transformer.get(1),
+                        GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 4),
+                        ItemList.Emitter_UV.get(2),
+                        ItemList.Circuit_Wetwaresupercomputer.get(1),
+                        GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 2),
+                }, new FluidStack[]{
+                        Materials.UUMatter.getFluid(1000),
+                        Materials.Naquadah.getMolten(1296),
+                        new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000),
+                        Materials.Osmium.getMolten(1296),
+                }, CustomItemList.Machine_Multi_MatterToEM.get(1), 12000, 100000);
 
         //Matter DeQuantizer
         TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Hatch_Output_UV.get(1),
                 12000, 32, 500000, 6, new ItemStack[]{
-                CustomItemList.Machine_Multi_Transformer.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 4),
-                ItemList.Sensor_UV.get(2),
-                ItemList.Circuit_Wetwaresupercomputer.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 2),
-        }, new FluidStack[]{
-                Materials.UUMatter.getFluid(1000),
-                Materials.Naquadah.getMolten(1296),
-                new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000),
-                Materials.Osmium.getMolten(1296),
-        }, CustomItemList.Machine_Multi_EMToMatter.get(1), 12000, 100000);
+                        CustomItemList.Machine_Multi_Transformer.get(1),
+                        GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 4),
+                        ItemList.Sensor_UV.get(2),
+                        ItemList.Circuit_Wetwaresupercomputer.get(1),
+                        GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 2),
+                }, new FluidStack[]{
+                        Materials.UUMatter.getFluid(1000),
+                        Materials.Naquadah.getMolten(1296),
+                        new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000),
+                        Materials.Osmium.getMolten(1296),
+                }, CustomItemList.Machine_Multi_EMToMatter.get(1), 12000, 100000);
 
         //Essentia Quantizer
         TT_recipeAdder.addResearchableAssemblylineRecipe(CustomItemList.Machine_Multi_MatterToEM.get(1),
@@ -1193,22 +1193,22 @@ public class DreamCraftRecipeLoader implements Runnable {
             //Deep Dark Portal
             TT_recipeAdder.addResearchableAssemblylineRecipe(GT_ModHandler.getModItem("dreamcraft", "item.HeavyDutyPlateTier8", 1, 0),
                     16777216, 2048, 2000000, 64, new Object[]{
-                    GT_ModHandler.getModItem("ExtraUtilities", "cobblestone_compressed", 1, 7),
-                    GT_ModHandler.getModItem("IC2", "blockMachine2", 1, 0),
-                    GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 4L),
-                    new Object[]{OrePrefixes.circuit.get(Materials.Nano), 1},
-                    new Object[]{OrePrefixes.circuit.get(Materials.Nano), 1},
-                    new Object[]{OrePrefixes.circuit.get(Materials.Nano), 1},
-                    new Object[]{OrePrefixes.circuit.get(Materials.Nano), 1},
-                    GT_ModHandler.getModItem("dreamcraft", "item.PicoWafer", 32, 0),
-                    ItemList.Robot_Arm_UEV.get(4),
-                    ItemList.Emitter_UEV.get(4),
-                    ItemList.Sensor_UEV.get(4),
-            }, new FluidStack[]{
-                    new FluidStack(FluidRegistry.getFluid("oganesson"), 50000),
-                    Materials.Infinity.getMolten(9216L),
-                    Materials.Cheese.getMolten(232000L),
-            }, ItemList.Block_BedrockiumCompressed.get(1), 10000, 5000000);
+                            GT_ModHandler.getModItem("ExtraUtilities", "cobblestone_compressed", 1, 7),
+                            GT_ModHandler.getModItem("IC2", "blockMachine2", 1, 0),
+                            GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 4L),
+                            new Object[]{OrePrefixes.circuit.get(Materials.Nano), 1},
+                            new Object[]{OrePrefixes.circuit.get(Materials.Nano), 1},
+                            new Object[]{OrePrefixes.circuit.get(Materials.Nano), 1},
+                            new Object[]{OrePrefixes.circuit.get(Materials.Nano), 1},
+                            GT_ModHandler.getModItem("dreamcraft", "item.PicoWafer", 32, 0),
+                            ItemList.Robot_Arm_UEV.get(4),
+                            ItemList.Emitter_UEV.get(4),
+                            ItemList.Sensor_UEV.get(4),
+                    }, new FluidStack[]{
+                            new FluidStack(FluidRegistry.getFluid("oganesson"), 50000),
+                            Materials.Infinity.getMolten(9216L),
+                            Materials.Cheese.getMolten(232000L),
+                    }, ItemList.Block_BedrockiumCompressed.get(1), 10000, 5000000);
 
 
             //Batteries
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
index 0d2f710ae9..d2c34941ef 100644
--- 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
@@ -18,14 +18,12 @@ import net.minecraft.world.IBlockAccess;
 import java.util.List;
 
 import static com.github.technus.tectech.TecTech.tectechTexturePage1;
+import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage;
 
 /**
  * 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) + 16;//Start of PAGE 8 (which is the 9th page)  (8*128)+16
-
     private static IIcon[] tM0 = new IIcon[2];
     private static IIcon[] tM1 = new IIcon[2];
     private static IIcon[] tM2 = new IIcon[2];
@@ -37,10 +35,12 @@ public class GT_Block_CasingsBA0 extends GT_Block_Casings_Abstract {
     private static IIcon[] tM8 = new IIcon[2];
     private static IIcon[] tM9 = new IIcon[2];
 
+    private static final byte START_INDEX = 16;
+
     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 + 16] = new GT_CopiedBlockTexture(this, 6, b);
+            Textures.BlockIcons.casingTexturePages[texturePage][b + START_INDEX] = new GT_CopiedBlockTexture(this, 6, b);
             /*IMPORTANT for block recoloring**/
         }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java
index 03c612c190..c5243b8bc5 100644
--- a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java
+++ b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java
@@ -12,7 +12,6 @@ import gregtech.api.gui.widgets.GT_GuiIntegerTextBox;
 import gregtech.api.interfaces.IGuiScreen;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
-import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.net.GT_Packet_TileEntityCover;
 import gregtech.api.util.GT_CoverBehavior;
 import gregtech.api.util.GT_Utility;
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 580e6195ad..864b68e21f 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
@@ -72,10 +72,6 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
     private static final float overDriveLoss = TecTech.configTecTech.TESLA_MULTI_LOSS_FACTOR_OVERDRIVE;//Default is 0.25F;
     private static final boolean doFluidOutput = TecTech.configTecTech.TESLA_MULTI_GAS_OUTPUT; //Default is false
 
-    //Face icons
-    private static Textures.BlockIcons.CustomIcon ScreenOFF;
-    private static Textures.BlockIcons.CustomIcon ScreenON;
-
     private int mTier = 0; //Determines max voltage (LV to ZPM)
     private int plasmaTier = 0; //0 is None, 1 is Helium or Nitrogen, 2 is Radon (Does not match actual plasma tiers)
 
@@ -443,9 +439,9 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
     @Override
     @SideOnly(Side.CLIENT)
     public void registerIcons(IIconRegister aBlockIconRegister) {
+        super.registerIcons(aBlockIconRegister);
         ScreenOFF = new Textures.BlockIcons.CustomIcon("iconsets/TM_TESLA_TOWER");
         ScreenON = new Textures.BlockIcons.CustomIcon("iconsets/TM_TESLA_TOWER_ACTIVE");
-        super.registerIcons(aBlockIconRegister);
     }
 
     @Override