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

4 files changed, 18 insertions, 17 deletions

diff --git a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadEM.java b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadEM.java
index 90318ef390..e7746a8291 100644
--- a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadEM.java
+++ b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadEM.java
@@ -20,12 +20,12 @@ public class TurretHeadEM extends Block implements ITileEntityProvider {
 
     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");
+        setCreativeTab(TecTech.mainTab);
+        setBlockUnbreakable();
+        setResistance(6000000.0F);
+        setStepSound(Block.soundTypeMetal);
+        setBlockBounds(0.2F, 0.0F, 0.2F, 0.8F, 1F, 0.8F);
+        setBlockName("turretHeadEM");
         //this.setBlockTextureName(Reference.MODID+":turretHeadEM");
     }
 
diff --git a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java
index 742e7b94fe..db3c089e47 100644
--- a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java
+++ b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java
@@ -19,23 +19,24 @@ 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
     public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) {
         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/TurretHeadItemRenderEM.java b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemRenderEM.java
index 6a46c627f2..4760e2b16e 100644
--- a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemRenderEM.java
+++ b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemRenderEM.java
@@ -17,21 +17,24 @@ public class TurretHeadItemRenderEM implements IItemRenderer {
     public TurretHeadItemRenderEM(TurretHeadRenderEM turretRenderer, TileTurretHeadEM turretTileEntity) {
         this.turretRenderer = turretRenderer;
         this.turretTileEntity = turretTileEntity;
-        this.model = new ModelLaserTurret();
+        model = new ModelLaserTurret();
     }
 
+    @Override
     public boolean handleRenderType(ItemStack item, ItemRenderType type) {
         return true;
     }
 
+    @Override
     public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
         return true;
     }
 
+    @Override
     public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
         GL11.glPushMatrix();
         GL11.glTranslated(-0.5D, -0.5D, -0.5D);
-        this.turretRenderer.renderTileEntityAt(this.turretTileEntity, 0.0D, 0.0D, 0.0D, 0.0F);
+        turretRenderer.renderTileEntityAt(turretTileEntity, 0.0D, 0.0D, 0.0D, 0.0F);
         GL11.glPopMatrix();
     }
 }
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 {}