Cleanup the codebase (#3311)

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

6 files changed, 14 insertions, 59 deletions

diff --git a/src/main/java/detrav/commands/DetravScannerCommand.java b/src/main/java/detrav/commands/DetravScannerCommand.java
index 783a522aa4..774900b265 100644
--- a/src/main/java/detrav/commands/DetravScannerCommand.java
+++ b/src/main/java/detrav/commands/DetravScannerCommand.java
@@ -22,7 +22,7 @@ import gregtech.common.blocks.TileEntityOres;
  */
 public class DetravScannerCommand implements ICommand {
 
-    private List aliases;
+    private final List aliases;
 
     public DetravScannerCommand() {
         this.aliases = new ArrayList<String>();
@@ -57,7 +57,7 @@ public class DetravScannerCommand implements ICommand {
             }
 
             for (i++; i < args.length; i++) {
-                String temp = (String) strs.get(strs.size() - 1);
+                String temp = strs.get(strs.size() - 1);
                 temp = temp + " " + args[i];
                 temp = temp.replace("\"", "");
                 strs.set(strs.size() - 1, temp);
diff --git a/src/main/java/detrav/enums/IDDetraveMetaGeneratedTool01.java b/src/main/java/detrav/enums/IDDetraveMetaGeneratedTool01.java
index 2149252ff3..7ff72f05fb 100644
--- a/src/main/java/detrav/enums/IDDetraveMetaGeneratedTool01.java
+++ b/src/main/java/detrav/enums/IDDetraveMetaGeneratedTool01.java
@@ -19,7 +19,7 @@ public enum IDDetraveMetaGeneratedTool01 {
 
     public final int ID;
 
-    private IDDetraveMetaGeneratedTool01(int ID) {
+    IDDetraveMetaGeneratedTool01(int ID) {
         this.ID = ID;
     }
 }
diff --git a/src/main/java/detrav/events/DetravLoginEventHandler.java b/src/main/java/detrav/events/DetravLoginEventHandler.java
deleted file mode 100644
index 9a28c1ab93..0000000000
--- a/src/main/java/detrav/events/DetravLoginEventHandler.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package detrav.events;
-
-import net.minecraftforge.common.MinecraftForge;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-
-/**
- * Created by wital_000 on 18.04.2016.
- */
-public class DetravLoginEventHandler {
-
-    static boolean inited = false;
-
-    public static void register() {
-        if (!inited) {
-            inited = true;
-            DetravLoginEventHandler handler = new DetravLoginEventHandler();
-            MinecraftForge.EVENT_BUS.register(handler);
-            FMLCommonHandler.instance()
-                .bus()
-                .register(handler);
-        }
-    }
-}
diff --git a/src/main/java/detrav/gui/textures/DetravMapTexture.java b/src/main/java/detrav/gui/textures/DetravMapTexture.java
index e8e35dc82d..4a316e4523 100644
--- a/src/main/java/detrav/gui/textures/DetravMapTexture.java
+++ b/src/main/java/detrav/gui/textures/DetravMapTexture.java
@@ -119,26 +119,10 @@ public class DetravMapTexture extends AbstractTexture {
         int u = 0, v = 0;
         Tessellator tessellator = Tessellator.instance;
         tessellator.startDrawingQuads();
-        tessellator.addVertexWithUV(
-            (double) (x),
-            (double) (y + height),
-            0,
-            (double) ((float) (u) * f),
-            (double) ((float) (v + height) * f1));
-        tessellator.addVertexWithUV(
-            (double) (x + width),
-            (double) (y + height),
-            0,
-            (double) ((float) (u + width) * f),
-            (double) ((float) (v + height) * f1));
-        tessellator.addVertexWithUV(
-            (double) (x + width),
-            (double) (y),
-            0,
-            (double) ((float) (u + width) * f),
-            (double) ((float) (v) * f1));
-        tessellator
-            .addVertexWithUV((double) (x), (double) (y), 0, (double) ((float) (u) * f), (double) ((float) (v) * f1));
+        tessellator.addVertexWithUV(x, y + height, 0, (float) (u) * f, (float) (v + height) * f1);
+        tessellator.addVertexWithUV(x + width, y + height, 0, (float) (u + width) * f, (float) (v + height) * f1);
+        tessellator.addVertexWithUV(x + width, y, 0, (float) (u + width) * f, (float) (v) * f1);
+        tessellator.addVertexWithUV(x, y, 0, (float) (u) * f, (float) (v) * f1);
         tessellator.draw();
     }
 
diff --git a/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java b/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java
index 7038d42817..a21896e8ee 100644
--- a/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java
+++ b/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java
@@ -99,7 +99,7 @@ public class BehaviourDetravToolProspector extends BehaviourNone {
                 .getMaterial() == Material.ground
             || aWorld.getBlock(aX, aY, aZ) == GregTechAPI.sBlockOres1) {
             if (!aWorld.isRemote) {
-                prospectChunks((DetravMetaGeneratedTool01) aItem, aStack, aPlayer, aWorld, aX, aY, aZ, aRandom, chance);
+                prospectChunks(aItem, aStack, aPlayer, aWorld, aX, aY, aZ, aRandom, chance);
             }
             return true;
         }
@@ -114,7 +114,7 @@ public class BehaviourDetravToolProspector extends BehaviourNone {
         badluck = 0;
         ores = new HashMap<>();
 
-        int range = ((DetravMetaGeneratedTool01) aItem).getHarvestLevel(aStack, "") / 2 + (aStack.getItemDamage() / 4);
+        int range = aItem.getHarvestLevel(aStack, "") / 2 + (aStack.getItemDamage() / 4);
         if ((range % 2) == 0) {
             range += 1; // kinda not needed here, divide takes it out, but we put it back in with the range+1 in the
                         // loop
@@ -163,7 +163,7 @@ public class BehaviourDetravToolProspector extends BehaviourNone {
         }
 
         // List to hold unsorted scanner messages
-        List<ChatComponentText> oreMessages = new ArrayList<ChatComponentText>();
+        List<ChatComponentText> oreMessages = new ArrayList<>();
 
         for (String key : ores.keySet()) {
             int value = ores.get(key);
@@ -178,7 +178,7 @@ public class BehaviourDetravToolProspector extends BehaviourNone {
             StatCollector.translateToLocal("detrav.scanner.distance.texts.1"),
             StatCollector.translateToLocal("detrav.scanner.distance.texts.0"));
 
-        List<ChatComponentText> oreMessagesSorted = new ArrayList<ChatComponentText>();
+        List<ChatComponentText> oreMessagesSorted = new ArrayList<>();
         oreMessagesSorted.add(new ChatComponentText(CHAT_MSG_SEPARATOR));
 
         // Sort ore messages by distance, separated by -----
@@ -298,7 +298,7 @@ public class BehaviourDetravToolProspector extends BehaviourNone {
                     if (tBlock instanceof BlockOresAbstract) {
                         TileEntity tTileEntity = aChunk.getTileEntityUnsafe(x, y, z);
                         if ((tTileEntity instanceof TileEntityOres) && ((TileEntityOres) tTileEntity).mNatural) {
-                            tMetaID = (short) ((TileEntityOres) tTileEntity).getMetaData();
+                            tMetaID = ((TileEntityOres) tTileEntity).getMetaData();
                             try {
                                 String format = LanguageRegistry.instance()
                                     .getStringLocalization(tBlock.getUnlocalizedName() + "." + tMetaID + ".name");
diff --git a/src/main/java/detrav/proxies/CommonProxy.java b/src/main/java/detrav/proxies/CommonProxy.java
index 9df2179b71..712960ffd1 100644
--- a/src/main/java/detrav/proxies/CommonProxy.java
+++ b/src/main/java/detrav/proxies/CommonProxy.java
@@ -4,7 +4,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.network.IGuiHandler;
-import detrav.events.DetravLoginEventHandler;
 import detrav.gui.DetravScannerGUI;
 
 /**
@@ -12,13 +11,9 @@ import detrav.gui.DetravScannerGUI;
  */
 public class CommonProxy implements IGuiHandler {
 
-    public void onLoad() {
+    public void onLoad() {}
 
-    }
-
-    public void onPostLoad() {
-        DetravLoginEventHandler.register();
-    }
+    public void onPostLoad() {}
 
     @Override
     public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {