Refactor turret to gain accees to package private things...

Also fixes projectile and adds most of the mechanics to it.

34 files changed, 75 insertions, 430 deletions

diff --git a/src/main/java/com/github/technus/tectech/auxiliary/TecTechConfig.java b/src/main/java/com/github/technus/tectech/auxiliary/TecTechConfig.java
index 633bbc5097..59b3e2e0fe 100644
--- a/src/main/java/com/github/technus/tectech/auxiliary/TecTechConfig.java
+++ b/src/main/java/com/github/technus/tectech/auxiliary/TecTechConfig.java
@@ -15,6 +15,9 @@ public class TecTechConfig extends ConfigManager {
     public static final boolean DEBUG_MODE = true;
     public boolean BOOM_ENABLE;
     public boolean NERF_FUSION;
+    public boolean ENABLE_TURRET_EXPLOSIONS;
+    public float TURRET_DAMAGE_FACTOR;
+    public float TURRET_EXPLOSION_FACTOR;
 
     @Override
     protected void PreInit() {
@@ -22,6 +25,9 @@ public class TecTechConfig extends ConfigManager {
         //DEBUG_MODE = false;
         BOOM_ENABLE = true;
         NERF_FUSION = true;
+        ENABLE_TURRET_EXPLOSIONS = true;
+        TURRET_DAMAGE_FACTOR=10;
+        TURRET_EXPLOSION_FACTOR=1;
     }
 
     @Override
@@ -34,6 +40,12 @@ public class TecTechConfig extends ConfigManager {
                 "Set to false to disable explosions on everything bad that you can do (this will not be available after release)");
         NERF_FUSION = _mainConfig.getBoolean("NerfFusion", "Features", NERF_FUSION,
                 "Set to false to disable nerfing of plasmas heavier than Fe");
+        ENABLE_TURRET_EXPLOSIONS = _mainConfig.getBoolean("TurretBoomEnable", "Features", ENABLE_TURRET_EXPLOSIONS,
+                "Set to false to disable explosions caused by EM turrets");
+        TURRET_DAMAGE_FACTOR = _mainConfig.getFloat("TurretDamageFactor", "Features", TURRET_DAMAGE_FACTOR, 0, Short.MAX_VALUE,
+                "Damage is multiplied by this number");
+        TURRET_EXPLOSION_FACTOR = _mainConfig.getFloat("TurretExplosionFactor", "Features", TURRET_EXPLOSION_FACTOR, 0, Short.MAX_VALUE,
+                "Explosion strength is multiplied by this number");
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalInstanceStackMap.java b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalInstanceStackMap.java
index 3443463718..7d27f573bb 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalInstanceStackMap.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalInstanceStackMap.java
@@ -267,6 +267,10 @@ public final class cElementalInstanceStackMap implements Comparable<cElementalIn
         return map.get(def);
     }
 
+    public cElementalInstanceStack get(int i){
+        return map.values().toArray(new cElementalInstanceStack[0])[i];
+    }
+
     public String[] getElementalInfo() {
         final String[] info = new String[map.size() * 4];
         int i = 0;
diff --git a/src/main/java/com/github/technus/tectech/loader/EntityLoader.java b/src/main/java/com/github/technus/tectech/loader/EntityLoader.java
new file mode 100644
index 0000000000..f77312850c
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/loader/EntityLoader.java
@@ -0,0 +1,15 @@
+package com.github.technus.tectech.loader;
+
+import com.github.technus.tectech.TecTech;
+import cpw.mods.fml.common.registry.EntityRegistry;
+import openmodularturrets.entity.projectiles.projectileEM;
+
+/**
+ * Created by Tec on 30.07.2017.
+ */
+public class EntityLoader implements Runnable {
+    @Override
+    public void run() {
+        EntityRegistry.registerModEntity(projectileEM.class, "projectileEM", 0, TecTech.instance, 16, 5, true);
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
index 9355c20c9b..a370e8a4a4 100644
--- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
@@ -10,7 +10,9 @@ import com.github.technus.tectech.thing.casing.GT_Container_CasingsTT;
 import com.github.technus.tectech.thing.item.DebugBuilder;
 import com.github.technus.tectech.thing.item.DebugContainer_EM;
 import com.github.technus.tectech.thing.machineTT;
+import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.ProgressManager;
+import cpw.mods.fml.common.registry.EntityRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.GregTech_API;
@@ -18,6 +20,7 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.DamageSource;
+import openmodularturrets.entity.projectiles.projectileEM;
 
 import java.util.List;
 
@@ -30,7 +33,7 @@ public final class MainLoader {//TODO add checks for - is mod loaded dreamcraft
     public static DamageSource microwaving;
 
     public void load() {
-        ProgressManager.ProgressBar progressBarLoad = ProgressManager.push("TecTech Loader", 5);
+        ProgressManager.ProgressBar progressBarLoad = ProgressManager.push("TecTech Loader", 6);
 
         progressBarLoad.step("Elemental Things");
         new ElementalLoader().run();
@@ -43,6 +46,7 @@ public final class MainLoader {//TODO add checks for - is mod loaded dreamcraft
         } else {
             essentiaContainerCompat = new EssentiaCompat();
         }
+        TecTech.Logger.info("Thaumcraft Compatibility Done");
 
         progressBarLoad.step("Regular Things");
         new ThingsLoader().run();
@@ -52,6 +56,10 @@ public final class MainLoader {//TODO add checks for - is mod loaded dreamcraft
         new MachineLoader().run();
         TecTech.Logger.info("Machine Init Done");
 
+        progressBarLoad.step("Register entities");
+        new EntityLoader().run();
+        TecTech.Logger.info("Entities registered");
+
         progressBarLoad.step("Add damage types");
         microwaving=new DamageSource("microwaving");
         microwaving.setDamageAllowedInCreativeMode();
diff --git a/src/main/java/com/github/technus/tectech/loader/ThingsLoader.java b/src/main/java/com/github/technus/tectech/loader/ThingsLoader.java
index 8a3523f9df..3f4b92c3c4 100644
--- a/src/main/java/com/github/technus/tectech/loader/ThingsLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/ThingsLoader.java
@@ -2,13 +2,14 @@ package com.github.technus.tectech.loader;
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
-import com.github.technus.tectech.thing.block.TurretBaseEM;
-import com.github.technus.tectech.thing.block.TurretHeadEM;
+import openmodularturrets.blocks.turretbases.TurretBaseEM;
+import openmodularturrets.blocks.turretheads.TurretHeadEM;
 import com.github.technus.tectech.thing.casing.GT_Block_CasingsTT;
 import com.github.technus.tectech.thing.casing.GT_Container_CasingsTT;
 import com.github.technus.tectech.thing.item.DebugBuilder;
 import com.github.technus.tectech.thing.item.DebugContainer_EM;
 import cpw.mods.fml.common.Loader;
+import openmodularturrets.entity.projectiles.projectileEM;
 
 /**
  * Created by danie_000 on 16.11.2016.
diff --git a/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java b/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
index 4a94679a6d..af93f0ca06 100644
--- a/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
+++ b/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
@@ -16,6 +16,7 @@ import net.minecraft.util.EnumChatFormatting;
 
 import static com.github.technus.tectech.Util.StructureBuilder;
 import static com.github.technus.tectech.magicAddon.EssentiaCompat.essentiaContainerCompat;
+import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT;
 import static gregtech.api.enums.GT_Values.E;
 import static gregtech.api.enums.GT_Values.V;
diff --git a/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java b/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
index c1783fc774..fc704d7ecb 100644
--- a/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
+++ b/src/main/java/com/github/technus/tectech/magicAddon/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
@@ -16,6 +16,7 @@ import net.minecraft.util.EnumChatFormatting;
 
 import static com.github.technus.tectech.Util.StructureBuilder;
 import static com.github.technus.tectech.magicAddon.EssentiaCompat.essentiaContainerCompat;
+import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT;
 import static gregtech.api.enums.GT_Values.E;
 import static gregtech.api.enums.GT_Values.V;
diff --git a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java
index d68ef8b9a3..ba76c0ec44 100644
--- a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java
+++ b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java
@@ -2,8 +2,12 @@ package com.github.technus.tectech.proxy;
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.thing.block.QuantumGlassRender;
-import com.github.technus.tectech.thing.block.TurretHeadRenderEM;
-import com.github.technus.tectech.thing.tileEntity.TileTurretHeadEM;
+import openmodularturrets.blocks.turretheads.TurretHeadEM;
+import openmodularturrets.blocks.turretheads.TurretHeadItemRenderEM;
+import openmodularturrets.blocks.turretheads.TurretHeadRenderEM;
+import openmodularturrets.entity.projectiles.projectileEM;
+import openmodularturrets.entity.projectiles.projectileRenderEM;
+import openmodularturrets.tileentity.turret.TileTurretHeadEM;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.client.registry.RenderingRegistry;
@@ -14,12 +18,12 @@ import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.particle.EntityExplodeFX;
 import net.minecraft.client.particle.EntityFX;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
 import net.minecraft.world.World;
+import net.minecraftforge.client.MinecraftForgeClient;
 import net.minecraftforge.common.util.ForgeDirection;
 import org.lwjgl.opengl.GL11;
 
-import static openmodularturrets.client.render.renderers.blockitem.TileEntityRenderers.laserTurretRenderer;
-
 public class ClientProxy extends CommonProxy {
     @Override
     public void registerRenderInfo() {
@@ -29,6 +33,9 @@ public class ClientProxy extends CommonProxy {
         if(Loader.isModLoaded("openmodularturrets")) {
             TurretHeadRenderEM turretHeadRenderEM=new TurretHeadRenderEM();
             ClientRegistry.bindTileEntitySpecialRenderer(TileTurretHeadEM.class, turretHeadRenderEM);
+            MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(TurretHeadEM.INSTANCE), new TurretHeadItemRenderEM(turretHeadRenderEM, new TileTurretHeadEM()));
+
+            RenderingRegistry.registerEntityRenderingHandler(projectileEM.class, new projectileRenderEM());
         }
     }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/block/TurretBaseEM.java b/src/main/java/com/github/technus/tectech/thing/block/TurretBaseEM.java
deleted file mode 100644
index ac410c36ab..0000000000
--- a/src/main/java/com/github/technus/tectech/thing/block/TurretBaseEM.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.github.technus.tectech.thing.block;
-
-import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.auxiliary.Reference;
-import com.github.technus.tectech.thing.tileEntity.TileTurretBaseEM;
-import cpw.mods.fml.common.registry.GameRegistry;
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import openmodularturrets.blocks.turretbases.BlockAbstractTurretBase;
-
-/**
- * Created by Bass on 27/07/2017.
- */
-public class TurretBaseEM extends BlockAbstractTurretBase {
-    public static TurretBaseEM INSTANCE;
-
-    public TurretBaseEM(){
-        super();
-        setCreativeTab(TecTech.mainTab);
-        this.setResistance(16);
-        this.setBlockName("turretBaseEM");
-        this.setStepSound(Block.soundTypeMetal);
-        this.setBlockTextureName(Reference.MODID+":turretBaseEM");
-    }
-
-    @Override
-    public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
-        return new TileTurretBaseEM(1000000000,50000);
-    }
-
-    public void registerBlockIcons(IIconRegister p_149651_1_) {
-        super.registerBlockIcons(p_149651_1_);
-        this.blockIcon = p_149651_1_.registerIcon(Reference.MODID+":turretBaseEM");
-    }
-
-    public static void run() {
-        INSTANCE = new TurretBaseEM();
-        GameRegistry.registerBlock(INSTANCE, TurretBaseItemEM.class, INSTANCE.getUnlocalizedName());
-        GameRegistry.registerTileEntity(TileTurretBaseEM.class,"TileTurretBaseEM");
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/thing/block/TurretBaseItemEM.java b/src/main/java/com/github/technus/tectech/thing/block/TurretBaseItemEM.java
deleted file mode 100644
index 1c8dc311cf..0000000000
--- a/src/main/java/com/github/technus/tectech/thing/block/TurretBaseItemEM.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.github.technus.tectech.thing.block;
-
-import com.github.technus.tectech.CommonValues;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
-
-import java.util.List;
-
-/**
- * Created by Bass on 28/07/2017.
- */
-public class TurretBaseItemEM extends ItemBlock {
-    public TurretBaseItemEM(Block b) {
-        super(b);
-    }
-
-    public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) {
-        list.add(CommonValues.tecMark);
-        list.add("");
-        list.add(EnumChatFormatting.AQUA + "--" + StatCollector.translateToLocal("tooptip.energy.label") + "--");
-        list.add(StatCollector.translateToLocal("tooltip.rf.max") + ": " + EnumChatFormatting.WHITE + 1000000000);
-        list.add(StatCollector.translateToLocal("tooltip.rf.io") + ": " + EnumChatFormatting.WHITE + 50000);
-        list.add("");
-        list.add(EnumChatFormatting.GREEN + "--" + StatCollector.translateToLocal("tooltip.extras.label") + "--");
-        list.add(StatCollector.translateToLocal("tooltip.extras.addons.0"));
-        list.add("");
-        list.add(EnumChatFormatting.DARK_GRAY + StatCollector.translateToLocal("flavour.base.0"));
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/thing/block/TurretHeadEM.java b/src/main/java/com/github/technus/tectech/thing/block/TurretHeadEM.java
deleted file mode 100644
index d6fc241aef..0000000000
--- a/src/main/java/com/github/technus/tectech/thing/block/TurretHeadEM.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.github.technus.tectech.thing.block;
-
-import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.auxiliary.Reference;
-import com.github.technus.tectech.thing.tileEntity.TileTurretHeadEM;
-import cpw.mods.fml.common.registry.GameRegistry;
-import net.minecraft.block.Block;
-import net.minecraft.block.ITileEntityProvider;
-import net.minecraft.block.material.Material;
-import net.minecraft.entity.EnumCreatureType;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-import openmodularturrets.tileentity.turretbase.TurretBase;
-
-/**
- * Created by Bass on 27/07/2017.
- */
-public class TurretHeadEM extends Block implements ITileEntityProvider {
-    public static TurretHeadEM INSTANCE;
-
-    public TurretHeadEM(){
-        super(Material.glass);
-        this.setCreativeTab(TecTech.mainTab);
-        this.setBlockUnbreakable();
-        this.setResistance(6000000.0F);
-        this.setStepSound(Block.soundTypeMetal);
-        this.setBlockBounds(0.2F, 0.0F, 0.2F, 0.8F, 1F, 0.8F);
-        this.setBlockName("turretHeadEM");
-        this.setBlockTextureName(Reference.MODID+":turretHeadEM");
-    }
-
-    @Override
-    public int getRenderType() {
-        return -1;
-    }
-
-    @Override
-    public boolean isOpaqueCube() {
-        return false;
-    }
-
-    @Override
-    public boolean canPlaceBlockAt(World worldIn, int x, int y, int z) {
-        return worldIn.getTileEntity(x + 1, y, z) instanceof TurretBase ||
-                worldIn.getTileEntity(x - 1, y, z) instanceof TurretBase ||
-                worldIn.getTileEntity(x,y + 1, z) instanceof TurretBase ||
-                worldIn.getTileEntity(x,y - 1, z) instanceof TurretBase ||
-                worldIn.getTileEntity(x,y, z + 1) instanceof TurretBase ||
-                worldIn.getTileEntity(x,y, z - 1) instanceof TurretBase;
-    }
-
-    @Override
-    public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) {
-        return false;
-    }
-
-    @Override
-    public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
-        return new TileTurretHeadEM();
-    }
-
-    public static void run() {
-        INSTANCE = new TurretHeadEM();
-        GameRegistry.registerBlock(INSTANCE, TurretHeadItemEM.class, INSTANCE.getUnlocalizedName());
-        GameRegistry.registerTileEntity(TileTurretHeadEM.class,"TileTurretHeadEM");
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/thing/block/TurretHeadItemEM.java b/src/main/java/com/github/technus/tectech/thing/block/TurretHeadItemEM.java
deleted file mode 100644
index e8ee236809..0000000000
--- a/src/main/java/com/github/technus/tectech/thing/block/TurretHeadItemEM.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.github.technus.tectech.thing.block;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
-import openmodularturrets.handler.ConfigHandler;
-
-import java.text.DecimalFormat;
-import java.util.List;
-
-import static com.github.technus.tectech.CommonValues.tecMark;
-
-/**
- * Created by Bass on 28/07/2017.
- */
-public class TurretHeadItemEM extends ItemBlock {
-    private static final DecimalFormat df = new DecimalFormat("0.0");
-
-    public TurretHeadItemEM(Block b) {
-        super(b);
-    }
-
-    public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) {
-        list.add(tecMark);
-        list.add("");
-        list.add(EnumChatFormatting.GOLD + "--" + StatCollector.translateToLocal("tooltip.info") + "--");
-        list.add(StatCollector.translateToLocal("tooltip.tier") + ": " + EnumChatFormatting.WHITE + "5");
-        list.add(StatCollector.translateToLocal("tooltip.range") + ": " + EnumChatFormatting.WHITE + ConfigHandler.getLaserTurretSettings().getRange());
-        list.add(StatCollector.translateToLocal("tooltip.accuracy") + ": " + EnumChatFormatting.WHITE + StatCollector.translateToLocal("turret.accuracy.high"));
-        list.add(StatCollector.translateToLocal("tooltip.ammo") + ": " + EnumChatFormatting.WHITE + StatCollector.translateToLocal("turret.ammo.4"));
-        list.add(StatCollector.translateToLocal("tooltip.tierRequired") + ": " + EnumChatFormatting.WHITE + StatCollector.translateToLocal("base.tier.5"));
-        list.add("");
-        list.add(EnumChatFormatting.DARK_PURPLE + "--" + StatCollector.translateToLocal("tooltip.damage.label") + "--");
-        list.add(StatCollector.translateToLocal("tooltip.damage.stat") + ": " + EnumChatFormatting.WHITE + (float)ConfigHandler.getLaserTurretSettings().getDamage() / 2.0F + " " + StatCollector.translateToLocal("tooltip.health"));
-        list.add(StatCollector.translateToLocal("tooltip.aoe") + ": " + EnumChatFormatting.WHITE + "0");
-        list.add(StatCollector.translateToLocal("tooltip.firerate") + ": " + EnumChatFormatting.WHITE + df.format((double)(20.0F / (float)ConfigHandler.getLaserTurretSettings().getFireRate())));
-        list.add(StatCollector.translateToLocal("tooltip.energy.stat") + ": " + EnumChatFormatting.WHITE + ConfigHandler.getLaserTurretSettings().getPowerUsage() + " RF");
-        list.add("");
-        list.add(EnumChatFormatting.DARK_GRAY + StatCollector.translateToLocal("flavour.turret.4"));
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/thing/block/TurretHeadRenderEM.java b/src/main/java/com/github/technus/tectech/thing/block/TurretHeadRenderEM.java
deleted file mode 100644
index 6d10a0cde5..0000000000
--- a/src/main/java/com/github/technus/tectech/thing/block/TurretHeadRenderEM.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.github.technus.tectech.thing.block;
-
-import openmodularturrets.client.render.renderers.blockitem.LaserTurretRenderer;
-
-/**
- * Created by Bass on 28/07/2017.
- */
-public class TurretHeadRenderEM extends LaserTurretRenderer {
-    public TurretHeadRenderEM() {
-    }
-}
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 85036897a3..4961bc784e 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
@@ -22,13 +22,14 @@ import java.util.List;
  */
 public class GT_Block_CasingsTT extends GT_Block_Casings_Abstract {
 
+    public final static int textureOffset = 96;
     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 debug[] = new IIcon[6];
 
     public GT_Block_CasingsTT() {
         super(GT_Item_CasingsTT.class, "gt.blockcasingsTT", GT_Material_Casings.INSTANCE);
         for (byte i = 0; i < 15; i = (byte) (i + 1)) {
-            Textures.BlockIcons.CASING_BLOCKS[(i + 96)] = new GT_CopiedBlockTexture(this, 6, i);
+            Textures.BlockIcons.CASING_BLOCKS[(i + textureOffset)] = new GT_CopiedBlockTexture(this, 6, i);
             /*IMPORTANT for block recoloring**/
         }
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "High Power Casing");
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/entity/projectileEM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/entity/projectileEM.java
deleted file mode 100644
index 76b0071527..0000000000
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/entity/projectileEM.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.github.technus.tectech.thing.metaTileEntity.entity;
-
-import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStackMap;
-import net.minecraft.block.Block;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.world.World;
-import openmodularturrets.entity.projectiles.LaserProjectile;
-import openmodularturrets.entity.projectiles.damagesources.NormalDamageSource;
-import openmodularturrets.handler.ConfigHandler;
-import openmodularturrets.tileentity.turretbase.TurretBase;
-import openmodularturrets.util.PlayerUtil;
-
-import java.util.Random;
-
-/**
- * Created by Bass on 27/07/2017.
- */
-public class projectileEM extends LaserProjectile {
-    private TurretBase turretBase;
-
-    public projectileEM(World par1World) {
-        super(par1World);
-        this.gravity = 0.0F;
-    }
-
-    public projectileEM(World par1World, TurretBase turretBase, cElementalInstanceStackMap avalableEM) {
-        super(par1World, turretBase);
-        this.turretBase = turretBase;
-        this.gravity = 0.0F;
-    }
-
-    protected void onImpact(MovingObjectPosition movingobjectposition) {
-        if(this.ticksExisted > 1) {
-            if(movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) {
-                Block hitBlock = this.worldObj.getBlock(movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ);
-                if(hitBlock != null && !hitBlock.getMaterial().isSolid()) {
-                    return;
-                }
-            }
-
-            if(movingobjectposition.entityHit != null && !this.worldObj.isRemote) {
-