Cleanup the codebase (#3311)

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

4 files changed, 28 insertions, 37 deletions

diff --git a/src/main/java/gtPlusPlus/core/gui/beta/GUIIDRegistry.java b/src/main/java/gtPlusPlus/core/gui/beta/GUIIDRegistry.java
index f6d899d247..fbb34ee5b7 100644
--- a/src/main/java/gtPlusPlus/core/gui/beta/GUIIDRegistry.java
+++ b/src/main/java/gtPlusPlus/core/gui/beta/GUIIDRegistry.java
@@ -12,14 +12,12 @@ public class GUIIDRegistry {
     private static final Map<Integer, MUGuild> idMap = new HashMap<>();
     private static int nextId = 0;
 
-    static {}
-
     private static void registerGuiHandlers(final GUITypes MU_GuiType,
         final List<Class<? extends IGuiManagerMiscUtils>> guiHandlerClasses) {
         for (final Class<? extends IGuiManagerMiscUtils> tileGuiHandlerClass : guiHandlerClasses) {
             final MUGuild guiId = new MUGuild(nextId++, MU_GuiType, tileGuiHandlerClass);
             classMap.put(tileGuiHandlerClass, guiId);
-            idMap.put(Integer.valueOf(guiId.getId()), guiId);
+            idMap.put(guiId.getId(), guiId);
         }
     }
 
@@ -29,7 +27,8 @@ public class GUIIDRegistry {
         if (guiId == null) {
             for (final Map.Entry<Class<? extends IGuiManagerMiscUtils>, MUGuild> classGuiIdEntry : classMap
                 .entrySet()) {
-                if (((Class<?>) classGuiIdEntry.getKey()).isAssignableFrom(guiHandlerClass)) {
+                if (classGuiIdEntry.getKey()
+                    .isAssignableFrom(guiHandlerClass)) {
                     guiId = classGuiIdEntry.getValue();
                     break;
                 }
@@ -42,6 +41,6 @@ public class GUIIDRegistry {
     }
 
     public static MUGuild getGuiId(final int id) {
-        return idMap.get(Integer.valueOf(id));
+        return idMap.get(id);
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/gui/beta/GUITypes.java b/src/main/java/gtPlusPlus/core/gui/beta/GUITypes.java
index 124e2fc276..40d0442b59 100644
--- a/src/main/java/gtPlusPlus/core/gui/beta/GUITypes.java
+++ b/src/main/java/gtPlusPlus/core/gui/beta/GUITypes.java
@@ -6,5 +6,5 @@ public enum GUITypes {
     Tile,
     Entity;
 
-    private GUITypes() {}
+    GUITypes() {}
 }
diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUIPestKiller.java b/src/main/java/gtPlusPlus/core/gui/machine/GUIPestKiller.java
index 0f3e1fc832..e42f6a9da9 100644
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUIPestKiller.java
+++ b/src/main/java/gtPlusPlus/core/gui/machine/GUIPestKiller.java
@@ -37,7 +37,7 @@ public class GUIPestKiller extends GuiContainer {
     @Override
     protected void drawGuiContainerForegroundLayer(final int i, final int j) {
         if (mTileKiller != null) {
-            this.fontRendererObj.drawString(I18n.format(mTileKiller.getInventoryName(), new Object[0]), 4, 6, 4210752);
+            this.fontRendererObj.drawString(I18n.format(mTileKiller.getInventoryName()), 4, 6, 4210752);
             drawFluidTank(mTileKiller.getTank(), 134, 35);
         }
     }
@@ -77,7 +77,7 @@ public class GUIPestKiller extends GuiContainer {
                     if (aTank != null && aTank.getFluidAmount() > 0) {
                         aPercentage = MathUtils.findPercentage(aTank.getFluidAmount(), aTank.getCapacity());
                         // Logger.INFO("Percent = "+aPercentage);
-                        aFrameHeight = (int) (aPercentage / aDivisor);
+                        // aFrameHeight = (int) (aPercentage / aDivisor);
                         // Logger.INFO("Frame Height = "+aFrameHeight);
                     }
                     this.fontRendererObj.drawString("Tier: 0", 4, 18, 4210752);
@@ -99,7 +99,7 @@ public class GUIPestKiller extends GuiContainer {
                     this.fontRendererObj.drawString("Range: 5x5", 4, 30, 4210752);
                     this.fontRendererObj.drawString("Poison: ", 4, 42, 4210752);
                     this.fontRendererObj.drawString(
-                        "" + aTile.getTank()
+                        aTile.getTank()
                             .getFluid()
                             .getLocalizedName(),
                         4,
@@ -127,7 +127,7 @@ public class GUIPestKiller extends GuiContainer {
                     this.fontRendererObj.drawString("Range: 9x9", 4, 30, 4210752);
                     this.fontRendererObj.drawString("Poison: ", 4, 42, 4210752);
                     this.fontRendererObj.drawString(
-                        "" + aTile.getTank()
+                        aTile.getTank()
                             .getFluid()
                             .getLocalizedName(),
                         4,
diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUIVolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/gui/machine/GUIVolumetricFlaskSetter.java
index 3e1a735f7e..8a57b3987f 100644
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUIVolumetricFlaskSetter.java
+++ b/src/main/java/gtPlusPlus/core/gui/machine/GUIVolumetricFlaskSetter.java
@@ -24,10 +24,10 @@ public class GUIVolumetricFlaskSetter extends GuiContainer {
     private static final ResourceLocation mGuiTextures = new ResourceLocation(
         GTPlusPlus.ID,
         "textures/gui/VolumetricFlaskSetter.png");
-    private ContainerVolumetricFlaskSetter mContainer;
+    private final ContainerVolumetricFlaskSetter mContainer;
     private boolean mIsOpen = false;
     private GuiValueField mText;
-    private TileEntityVolumetricFlaskSetter mTile;
+    private final TileEntityVolumetricFlaskSetter mTile;
 
     public GUIVolumetricFlaskSetter(ContainerVolumetricFlaskSetter aContainer) {
         super(aContainer);
@@ -48,16 +48,16 @@ public class GUIVolumetricFlaskSetter extends GuiContainer {
     protected void drawGuiContainerForegroundLayer(final int i, final int j) {
         super.drawGuiContainerForegroundLayer(i, j);
         this.mText.drawTextBox();
-        this.fontRendererObj.drawString(I18n.format("container.VolumetricFlaskSetter", new Object[0]), 4, 3, 4210752);
+        this.fontRendererObj.drawString(I18n.format("container.VolumetricFlaskSetter"), 4, 3, 4210752);
         int aYVal = 49;
-        this.fontRendererObj.drawString(I18n.format("0 = 16l", new Object[0]), 8, aYVal, 4210752);
-        this.fontRendererObj.drawString(I18n.format("4 = 576l", new Object[0]), 64, aYVal, 4210752);
-        this.fontRendererObj.drawString(I18n.format("1 = 36l", new Object[0]), 8, aYVal += 8, 4210752);
-        this.fontRendererObj.drawString(I18n.format("5 = 720l", new Object[0]), 64, aYVal, 4210752);
-        this.fontRendererObj.drawString(I18n.format("2 = 144l", new Object[0]), 8, aYVal += 8, 4210752);
-        this.fontRendererObj.drawString(I18n.format("6 = 864l", new Object[0]), 64, aYVal, 4210752);
-        this.fontRendererObj.drawString(I18n.format("3 = 432l", new Object[0]), 8, aYVal += 8, 4210752);
-        this.fontRendererObj.drawString(I18n.format("-> = Custom", new Object[0]), 59, aYVal, 4210752);
+        this.fontRendererObj.drawString(I18n.format("0 = 16l"), 8, aYVal, 4210752);
+        this.fontRendererObj.drawString(I18n.format("4 = 576l"), 64, aYVal, 4210752);
+        this.fontRendererObj.drawString(I18n.format("1 = 36l"), 8, aYVal += 8, 4210752);
+        this.fontRendererObj.drawString(I18n.format("5 = 720l"), 64, aYVal, 4210752);
+        this.fontRendererObj.drawString(I18n.format("2 = 144l"), 8, aYVal += 8, 4210752);
+        this.fontRendererObj.drawString(I18n.format("6 = 864l"), 64, aYVal, 4210752);
+        this.fontRendererObj.drawString(I18n.format("3 = 432l"), 8, aYVal += 8, 4210752);
+        this.fontRendererObj.drawString(I18n.format("-> = Custom"), 59, aYVal, 4210752);
     }
 
     @Override
@@ -127,7 +127,7 @@ public class GUIVolumetricFlaskSetter extends GuiContainer {
                 } else if (par2 == Keyboard.KEY_BACK) {
                     log("Pressed Backspace.");
                     String aCurrentText = getText();
-                    if (aCurrentText.length() > 0) {
+                    if (!aCurrentText.isEmpty()) {
                         this.mText.setText(aCurrentText.substring(0, aCurrentText.length() - 1));
                         if (getText().length() <= 0) {
                             setText(0);
@@ -137,14 +137,8 @@ public class GUIVolumetricFlaskSetter extends GuiContainer {
                 } else {
                     if (isNumber(par2) || isNumber(par1)) {
                         log("Pressed number.");
-                        if (this.mText.getText()
-                            .equals("0")) {
-                            this.mText.textboxKeyTyped(par1, par2);
-                            sendUpdateToServer();
-                        } else {
-                            this.mText.textboxKeyTyped(par1, par2);
-                            sendUpdateToServer();
-                        }
+                        this.mText.textboxKeyTyped(par1, par2);
+                        sendUpdateToServer();
                     } else {
                         log("Pressed unused key.");
                         super.keyTyped(par1, par2);
@@ -191,7 +185,7 @@ public class GUIVolumetricFlaskSetter extends GuiContainer {
     }
 
     public void sendUpdateToServer() {
-        if (getText().length() > 0) {
+        if (!getText().isEmpty()) {
             PacketHandler.sendToServer(new PacketVolumetricFlaskGui(mTile, parse(getText())));
         }
     }
@@ -211,13 +205,11 @@ public class GUIVolumetricFlaskSetter extends GuiContainer {
         this.mText.updateCursorCounter();
 
         // Check TextBox Value is correct
-        if (getText().length() > 0) {
+        if (!getText().isEmpty()) {
             int aCustomValue = parse(getText());
-            int aTileValue = ((ContainerVolumetricFlaskSetter) mContainer).mCustomValue;
-            if (mContainer != null) {
-                if (aTileValue != aCustomValue) {
-                    setText(aTileValue);
-                }
+            int aTileValue = mContainer.mCustomValue;
+            if (aTileValue != aCustomValue) {
+                setText(aTileValue);
             }
         }
     }