Code cleanup

7 files changed, 42 insertions, 33 deletions

diff --git a/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java b/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java
index 5bbfee8b1e..61f877e81b 100644
--- a/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java
+++ b/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java
@@ -14,8 +14,8 @@ import java.util.List;
  * Created by Bass on 28/07/2017.
  */
 public class TurretBaseItemEM extends ItemBlock {
-    public TurretBaseItemEM(Block b) {
-        super(b);
+    public TurretBaseItemEM(Block block) {
+        super(block);
     }
 
     @Override
diff --git a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java
index e368973f7a..db3c089e47 100644
--- a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java
+++ b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java
@@ -19,8 +19,8 @@ import static com.github.technus.tectech.CommonValues.TEC_MARK_EM;
 public class TurretHeadItemEM extends ItemBlock {
     private static final DecimalFormat df = new DecimalFormat("0.0");
 
-    public TurretHeadItemEM(Block b) {
-        super(b);
+    public TurretHeadItemEM(Block block) {
+        super(block);
     }
 
     @Override
@@ -28,15 +28,15 @@ public class TurretHeadItemEM extends ItemBlock {
         list.add(TEC_MARK_EM);
         list.add("");
         list.add(EnumChatFormatting.GOLD + "--" + StatCollector.translateToLocal("tooltip.info") + "--");
-        list.add(StatCollector.translateToLocal("tooltip.tier") + ": " + EnumChatFormatting.WHITE + "5");
+        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.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("");
diff --git a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadRenderEM.java b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadRenderEM.java
index f0aa331645..23379b9585 100644
--- a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadRenderEM.java
+++ b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadRenderEM.java
@@ -5,7 +5,4 @@ import openmodularturrets.client.render.renderers.blockitem.LaserTurretRenderer;
 /**
  * Created by Bass on 28/07/2017.
  */
-public class TurretHeadRenderEM extends LaserTurretRenderer {
-    public TurretHeadRenderEM() {
-    }
-}
+public class TurretHeadRenderEM extends LaserTurretRenderer {}
diff --git a/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java b/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java
index 28f305c85b..53e6186a25 100644
--- a/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java
+++ b/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java
@@ -51,11 +51,18 @@ public class projectileEM extends TurretProjectile {
                 cElementalInstanceStack consumeFromThis=avalableEM.get(TecTech.Rnd.nextInt(avalableEM.size()));
                 massFactor =consumeFromThis.definition.getMass()/ dHadronDefinition.hadron_n_.getMass();
 
-                if(consumeFromThis.definition.getType()>1 || consumeFromThis.definition.getType()<-1) exotic = true;
-                if(consumeFromThis.definition.getType()<0) antiMatter = true;
+                if(consumeFromThis.definition.getType()>1 || consumeFromThis.definition.getType()<-1) {
+                    exotic = true;
+                }
+                if(consumeFromThis.definition.getType()<0) {
+                    antiMatter = true;
+                }
 
-                if (consumeFromThis.definition.getCharge() == 0) gravity = massFactor/100f;
-                else gravity = Math.min(0.0025F/Math.abs(consumeFromThis.definition.getCharge()),massFactor/100f);
+                if (consumeFromThis.definition.getCharge() == 0) {
+                    gravity = massFactor / 100f;
+                } else {
+                    gravity = Math.min(0.0025F / Math.abs(consumeFromThis.definition.getCharge()), massFactor / 100f);
+                }
 
                 avalableEM.removeAmount(false,consumeFromThis.definition.getStackForm(1));
             }
@@ -96,12 +103,16 @@ public class projectileEM extends TurretProjectile {
                         if(canDamagePlayer((EntityPlayer)movingobjectposition.entityHit)) {
                             movingobjectposition.entityHit.setFire((exotic?10:1)*2);
                             movingobjectposition.entityHit.attackEntityFrom(new NormalDamageSource("laser"), damage);
-                            if(antiMatter) movingobjectposition.entityHit.hurtResistantTime = 0;
+                            if(antiMatter) {
+                                movingobjectposition.entityHit.hurtResistantTime = 0;
+                            }
                         }
                     } else {
                         movingobjectposition.entityHit.setFire((exotic?10:1)*2);
                         movingobjectposition.entityHit.attackEntityFrom(new NormalDamageSource("laser"), damage);
-                        if(antiMatter) movingobjectposition.entityHit.hurtResistantTime = 0;
+                        if(antiMatter) {
+                            movingobjectposition.entityHit.hurtResistantTime = 0;
+                        }
                     }
 
                     if (TecTech.ModConfig.ENABLE_TURRET_EXPLOSIONS && antiMatter) {
diff --git a/src/main/java/openmodularturrets/entity/projectiles/projectileRenderEM.java b/src/main/java/openmodularturrets/entity/projectiles/projectileRenderEM.java
index 7580ee1c5c..9faeb02da6 100644
--- a/src/main/java/openmodularturrets/entity/projectiles/projectileRenderEM.java
+++ b/src/main/java/openmodularturrets/entity/projectiles/projectileRenderEM.java
@@ -18,9 +18,6 @@ import org.lwjgl.opengl.GL11;
 public class projectileRenderEM extends Render {
     private static final ResourceLocation textures = new ResourceLocation(Reference.MODID + ":textures/entity/projectileEM.png");
 
-    public projectileRenderEM() {
-    }
-
     private void render(projectileEM entity, double par2, double par4, double par6, float par9) {
         bindEntityTexture(entity);
         GL11.glPushMatrix();
@@ -37,8 +34,8 @@ public class projectileRenderEM extends Render {
         GL11.glEnable('\u803a');
         float f11 = - par9;
         if(f11 > 0.0F) {
-            float i = -MathHelper.sin(f11 * 3.0F) * f11;
-            GL11.glRotatef(i, 0.0F, 0.0F, 1.0F);
+            float f = -MathHelper.sin(f11 * 3.0F) * f11;
+            GL11.glRotatef(f, 0.0F, 0.0F, 1.0F);
         }
 
         GL11.glDisable(2896);
diff --git a/src/main/java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java b/src/main/java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
index eab654f486..286f12d853 100644
--- a/src/main/java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
+++ b/src/main/java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
@@ -19,9 +19,6 @@ import openmodularturrets.util.TurretHeadUtil;
 public class TileTurretHeadEM extends TurretHead{
     private cElementalInstanceStackMap hatchContentPointer;
 
-    public TileTurretHeadEM() {
-    }
-
     @Override
     public int getTurretRange() {
         return ConfigHandler.getLaserTurretSettings().getRange()<<1;
@@ -44,8 +41,9 @@ public class TileTurretHeadEM extends TurretHead{
 
     @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();
     }
 
diff --git a/src/main/java/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java b/src/main/java/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java
index 3a0679aee6..7bb87c8826 100644
--- a/src/main/java/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java
+++ b/src/main/java/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java
@@ -28,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;
     }