Merge remote-tracking branch 'origin/master' into bassAdditions

2 files changed, 25 insertions, 11 deletions

diff --git a/src/main/java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java b/src/main/java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
index 343a1e5ebd..286f12d853 100644
--- a/src/main/java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
+++ b/src/main/java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
@@ -19,48 +19,55 @@ import openmodularturrets.util.TurretHeadUtil;
 public class TileTurretHeadEM extends TurretHead{
     private cElementalInstanceStackMap hatchContentPointer;
 
-    public TileTurretHeadEM() {
-    }
-
+    @Override
     public int getTurretRange() {
         return ConfigHandler.getLaserTurretSettings().getRange()<<1;
     }
 
+    @Override
     public int getTurretPowerUsage() {
         return ConfigHandler.getLaserTurretSettings().getPowerUsage()<<4;
     }
 
+    @Override
     public int getTurretFireRate() {
         return (int)Math.ceil(ConfigHandler.getLaserTurretSettings().getFireRate()/2f);
     }
 
+    @Override
     public double getTurretAccuracy() {
         return (int)Math.ceil(ConfigHandler.getLaserTurretSettings().getAccuracy() / 10.0F);
     }
 
     @Override
     public void updateEntity() {
-        if(!worldObj.isRemote && base instanceof TileTurretBaseEM)
-            hatchContentPointer =((TileTurretBaseEM) base).getContainerHandler();
+        if(!worldObj.isRemote && base instanceof TileTurretBaseEM) {
+            hatchContentPointer = ((TileTurretBaseEM) base).getContainerHandler();
+        }
         super.updateEntity();
     }
 
+    @Override
     public boolean requiresAmmo() {
         return hatchContentPointer == null || !hatchContentPointer.hasStacks();
     }
 
+    @Override
     public boolean requiresSpecificAmmo() {
         return true;//to enable failure in shooting when there is no EM to use
     }
 
+    @Override
     public Item getAmmo() {
         return DebugElementalInstanceContainer_EM.INSTANCE;//Placeholder item that cannot be achieved, yet still usable for debug
     }
 
+    @Override
     public final TurretProjectile createProjectile(World world, Entity target, ItemStack ammo) {
         return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), hatchContentPointer);
     }
 
+    @Override
     public String getLaunchSoundEffect() {
         return "laser";
     }
diff --git a/src/main/java/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java b/src/main/java/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java
index acecfb4a37..7bb87c8826 100644
--- a/src/main/java/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java
+++ b/src/main/java/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java
@@ -16,6 +16,7 @@ public class TileTurretBaseEM extends TurretBaseTierFiveTileEntity {
         super(MaxEnergyStorage, MaxIO);
     }
 
+    @Override
     @Optional.Method(
             modid = "OpenComputers"
     )
@@ -27,28 +28,34 @@ public class TileTurretBaseEM extends TurretBaseTierFiveTileEntity {
         World worldIn = getWorldObj();
         TileEntity te;
         if ((te = worldIn.getTileEntity(xCoord + 1, yCoord, zCoord)) instanceof IGregTechTileEntity &&
-                ((IGregTechTileEntity) te).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_InputElemental)
+                ((IGregTechTileEntity) te).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_InputElemental) {
             return getFromHatch((GT_MetaTileEntity_Hatch_InputElemental) ((IGregTechTileEntity) te).getMetaTileEntity());
+        }
 
         if ((te = worldIn.getTileEntity(xCoord - 1, yCoord, zCoord)) instanceof IGregTechTileEntity &&
-                ((IGregTechTileEntity) te).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_InputElemental)
+                ((IGregTechTileEntity) te).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_InputElemental) {
             return getFromHatch((GT_MetaTileEntity_Hatch_InputElemental) ((IGregTechTileEntity) te).getMetaTileEntity());
+        }
 
         if ((te = worldIn.getTileEntity(xCoord, yCoord + 1, zCoord)) instanceof IGregTechTileEntity &&
-                ((IGregTechTileEntity) te).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_InputElemental)
+                ((IGregTechTileEntity) te).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_InputElemental) {
             return getFromHatch((GT_MetaTileEntity_Hatch_InputElemental) ((IGregTechTileEntity) te).getMetaTileEntity());
+        }
 
         if ((te = worldIn.getTileEntity(xCoord, yCoord - 1, zCoord)) instanceof IGregTechTileEntity &&
-                ((IGregTechTileEntity) te).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_InputElemental)
+                ((IGregTechTileEntity) te).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_InputElemental) {
             return getFromHatch((GT_MetaTileEntity_Hatch_InputElemental) ((IGregTechTileEntity) te).getMetaTileEntity());
+        }
 
         if ((te = worldIn.getTileEntity(xCoord, yCoord, zCoord + 1)) instanceof IGregTechTileEntity &&
-                ((IGregTechTileEntity) te).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_InputElemental)
+                ((IGregTechTileEntity) te).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_InputElemental) {
             return getFromHatch((GT_MetaTileEntity_Hatch_InputElemental) ((IGregTechTileEntity) te).getMetaTileEntity());
+        }
 
         if ((te = worldIn.getTileEntity(xCoord, yCoord, zCoord - 1)) instanceof IGregTechTileEntity &&
-                ((IGregTechTileEntity) te).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_InputElemental)
+                ((IGregTechTileEntity) te).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_InputElemental) {
             return getFromHatch((GT_MetaTileEntity_Hatch_InputElemental) ((IGregTechTileEntity) te).getMetaTileEntity());
+        }
 
         return null;
     }