Code cleanup

5 files changed, 19 insertions, 14 deletions

diff --git a/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseEM.java b/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseEM.java
index 02d9c59cfe..d79ab16f12 100644
--- a/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseEM.java
+++ b/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseEM.java
@@ -19,12 +19,11 @@ 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");
+        setResistance(16);
+        setBlockName("turretBaseEM");
+        setStepSound(Block.soundTypeMetal);
+        setBlockTextureName(Reference.MODID+":turretBaseEM");
     }
 
     @Override
@@ -32,9 +31,10 @@ public class TurretBaseEM extends BlockAbstractTurretBase {
         return new TileTurretBaseEM(MaxCharge,MaxIO);
     }
 
+    @Override
     public void registerBlockIcons(IIconRegister p_149651_1_) {
         super.registerBlockIcons(p_149651_1_);
-        this.blockIcon = p_149651_1_.registerIcon(Reference.MODID+":turretBaseEM");
+        blockIcon = p_149651_1_.registerIcon(Reference.MODID+":turretBaseEM");
     }
 
     public static void run() {
diff --git a/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java b/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java
index c7b3b547c0..5bbfee8b1e 100644
--- a/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java
+++ b/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java
@@ -18,6 +18,7 @@ public class TurretBaseItemEM extends ItemBlock {
         super(b);
     }
 
+    @Override
     public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) {
         list.add(CommonValues.TEC_MARK_EM);
         list.add("");
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..e368973f7a 100644
--- a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java
+++ b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java
@@ -23,6 +23,7 @@ public class TurretHeadItemEM extends ItemBlock {
         super(b);
     }
 
+    @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("");
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();
     }
 }