Cleanup the codebase (#3311)

Co-authored-by: boubou19 <miisterunknown@gmail.com>

6 files changed, 17 insertions, 27 deletions

diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java
index d39c194dfd..7747deb5da 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java
@@ -31,7 +31,7 @@ public class BasicBlock extends BlockContainer {
         this.setStepSound(soundTypeMetal);
     }
 
-    public static enum BlockTypes {
+    public enum BlockTypes {
 
         STANDARD("blockBlock", "pickaxe", soundTypeMetal),
         FRAME("blockFrameGt", "wrench", soundTypeMetal),
diff --git a/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java b/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java
index 7e64f19bf3..a85e700db2 100644
--- a/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java
+++ b/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java
@@ -7,8 +7,6 @@ import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EnumCreatureType;
-import net.minecraft.entity.boss.EntityDragon;
-import net.minecraft.entity.boss.EntityWither;
 import net.minecraft.entity.boss.IBossDisplayData;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -73,8 +71,7 @@ public class BlockWitherProof extends Block {
         if ((entity == null) || !entity.isEntityAlive()) {
             return false;
         }
-        if ((entity instanceof EntityWither) || (entity instanceof EntityDragon)
-            || (entity instanceof IBossDisplayData)) {
+        if (entity instanceof IBossDisplayData) {
             return false;
         } else {
             return super.canEntityDestroy(world, x, y, z, entity);
@@ -109,7 +106,7 @@ public class BlockWitherProof extends Block {
     @Override
     public float getPlayerRelativeBlockHardness(EntityPlayer aPlayer, World p_149737_2_, int p_149737_3_,
         int p_149737_4_, int p_149737_5_) {
-        if (aPlayer != null && aPlayer instanceof EntityPlayerMP) {
+        if (aPlayer instanceof EntityPlayerMP) {
             return 1f;
         }
         return -1f;
@@ -131,10 +128,7 @@ public class BlockWitherProof extends Block {
         if ((entity == null) || !entity.isEntityAlive()) {
             return;
         }
-        if ((entity instanceof EntityWither) || (entity instanceof EntityDragon)
-            || (entity instanceof IBossDisplayData)) {
-            return;
-        } else {
+        if (!(entity instanceof IBossDisplayData)) {
             super.onEntityCollidedWithBlock(world, x, y, z, entity);
         }
     }
@@ -147,7 +141,7 @@ public class BlockWitherProof extends Block {
 
     @Override
     public boolean canHarvestBlock(EntityPlayer player, int meta) {
-        if (player != null && player instanceof EntityPlayerMP) {
+        if (player instanceof EntityPlayerMP) {
             return true;
         }
         return super.canHarvestBlock(player, meta);
diff --git a/src/main/java/gtPlusPlus/core/block/machine/BlockCircuitProgrammer.java b/src/main/java/gtPlusPlus/core/block/machine/BlockCircuitProgrammer.java
index dcbe41f150..568df08922 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/BlockCircuitProgrammer.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockCircuitProgrammer.java
@@ -147,7 +147,6 @@ public class BlockCircuitProgrammer extends BasicTileBlockWithTooltip {
             GTPlusPlus.ID + ":metro/TEXTURE_TECH_PANEL_B", GTPlusPlus.ID + ":metro/TEXTURE_METAL_PANEL_I",
             GTPlusPlus.ID + ":metro/TEXTURE_METAL_PANEL_I", GTPlusPlus.ID + ":metro/TEXTURE_METAL_PANEL_I",
             GTPlusPlus.ID + ":metro/TEXTURE_METAL_PANEL_I" };
-        CubicObject<String>[] aTextureData = new CubicObject[] { new CubicObject<>(aTexData) };
-        return aTextureData;
+        return (CubicObject<String>[]) new CubicObject[] { new CubicObject<>(aTexData) };
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/block/machine/BlockFlaskSetter.java b/src/main/java/gtPlusPlus/core/block/machine/BlockFlaskSetter.java
index 5ec07bb9e3..134bbafd6b 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/BlockFlaskSetter.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockFlaskSetter.java
@@ -151,7 +151,6 @@ public class BlockFlaskSetter extends BasicTileBlockWithTooltip {
             GTPlusPlus.ID + ":metro/TEXTURE_TECH_PANEL_C", GTPlusPlus.ID + ":metro/TEXTURE_METAL_PANEL_H",
             GTPlusPlus.ID + ":metro/TEXTURE_METAL_PANEL_H", GTPlusPlus.ID + ":metro/TEXTURE_METAL_PANEL_H",
             GTPlusPlus.ID + ":metro/TEXTURE_METAL_PANEL_H" };
-        CubicObject<String>[] aTextureData = new CubicObject[] { new CubicObject<>(aTexData) };
-        return aTextureData;
+        return (CubicObject<String>[]) new CubicObject[] { new CubicObject<>(aTexData) };
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/block/machine/BlockPooCollector.java b/src/main/java/gtPlusPlus/core/block/machine/BlockPooCollector.java
index 6a371a3284..b7c84ddc8c 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/BlockPooCollector.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockPooCollector.java
@@ -85,13 +85,11 @@ public class BlockPooCollector extends BlockContainer {
         } else {
             TileEntityBaseFluidCollector tank = (TileEntityBaseFluidCollector) world.getTileEntity(x, y, z);
             if (tank != null) {
-                Item handItem;
-                try {
-                    handItem = player.getHeldItem()
-                        .getItem();
-                } catch (Throwable t) {
-                    handItem = null;
-                }
+                // Item handItem;
+                // try {
+                // handItem = player.getHeldItem()
+                // .getItem();
+                // } catch (Throwable t) {}
 
                 // Fluid container code
                 /*
diff --git a/src/main/java/gtPlusPlus/core/block/machine/BlockSuperJukebox.java b/src/main/java/gtPlusPlus/core/block/machine/BlockSuperJukebox.java
index be55db80a0..9d6f76ca2c 100644
--- a/src/main/java/gtPlusPlus/core/block/machine/BlockSuperJukebox.java
+++ b/src/main/java/gtPlusPlus/core/block/machine/BlockSuperJukebox.java
@@ -77,7 +77,7 @@ public class BlockSuperJukebox extends BlockJukebox {
         }
 
         final TileEntity te = world.getTileEntity(x, y, z);
-        if ((te != null) && (te instanceof TileEntitySuperJukebox)) {
+        if (te instanceof TileEntitySuperJukebox) {
             player.openGui(GTplusplus.instance, GuiHandler.GUI14, world, x, y, z);
             return true;
         }
@@ -328,7 +328,7 @@ public class BlockSuperJukebox extends BlockJukebox {
             Logger.INFO("b1");
             // Select First Record
             ItemStack aRecordToPlay;
-            if (mValidRecords.size() == 0) {
+            if (mValidRecords.isEmpty()) {
                 Logger.INFO("bX");
                 return false;
             } else {
@@ -399,8 +399,8 @@ public class BlockSuperJukebox extends BlockJukebox {
                     ItemStack aRecordToPlay = tileentityjukebox.func_145856_a();
                     if (aRecordToPlay != null) {
                         aWorld.playAuxSFX(1005, aX, aY, aZ, 0);
-                        aWorld.playRecord((String) null, aX, aY, aZ);
-                        tileentityjukebox.func_145857_a((ItemStack) null);
+                        aWorld.playRecord(null, aX, aY, aZ);
+                        tileentityjukebox.func_145857_a(null);
                         this.markDirty();
                     }
                 }
@@ -568,7 +568,7 @@ public class BlockSuperJukebox extends BlockJukebox {
 
         @Override
         public boolean hasCustomInventoryName() {
-            return (this.customName != null) && !this.customName.equals("");
+            return (this.customName != null) && !this.customName.isEmpty();
         }
     }
 }