Cleanup the codebase (#3311)

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

7 files changed, 36 insertions, 67 deletions

diff --git a/src/main/java/kubatech/api/DynamicInventory.java b/src/main/java/kubatech/api/DynamicInventory.java
index f718101384..20d9ef23b9 100644
--- a/src/main/java/kubatech/api/DynamicInventory.java
+++ b/src/main/java/kubatech/api/DynamicInventory.java
@@ -266,20 +266,15 @@ public class DynamicInventory<T> {
                                     ItemStack leftover = inventoryInjector.inject(copy);
                                     if (leftover == null) return;
                                     input.stackSize--;
-                                    if (input.stackSize > 0) {
-                                        ((EntityPlayerMP) player).isChangingQuantityOnly = true;
-                                        ((EntityPlayerMP) player).updateHeldItem();
-                                        return;
-                                    } else player.inventory.setItemStack(null);
                                 } else {
                                     ItemStack leftover = inventoryInjector.inject(input);
                                     if (leftover == null) return;
-                                    if (input.stackSize > 0) {
-                                        ((EntityPlayerMP) player).isChangingQuantityOnly = true;
-                                        ((EntityPlayerMP) player).updateHeldItem();
-                                        return;
-                                    } else player.inventory.setItemStack(null);
                                 }
+                                if (input.stackSize > 0) {
+                                    ((EntityPlayerMP) player).isChangingQuantityOnly = true;
+                                    ((EntityPlayerMP) player).updateHeldItem();
+                                    return;
+                                } else player.inventory.setItemStack(null);
                             }
                             ((EntityPlayerMP) player).isChangingQuantityOnly = false;
                             ((EntityPlayerMP) player).updateHeldItem();
@@ -367,20 +362,15 @@ public class DynamicInventory<T> {
                         ItemStack leftover = inventoryInjector.inject(copy);
                         if (leftover == null) return;
                         input.stackSize--;
-                        if (input.stackSize > 0) {
-                            ((EntityPlayerMP) player).isChangingQuantityOnly = true;
-                            ((EntityPlayerMP) player).updateHeldItem();
-                            return;
-                        } else player.inventory.setItemStack(null);
                     } else {
                         ItemStack leftover = inventoryInjector.inject(input);
                         if (leftover == null) return;
-                        if (input.stackSize > 0) {
-                            ((EntityPlayerMP) player).isChangingQuantityOnly = true;
-                            ((EntityPlayerMP) player).updateHeldItem();
-                            return;
-                        } else player.inventory.setItemStack(null);
                     }
+                    if (input.stackSize > 0) {
+                        ((EntityPlayerMP) player).isChangingQuantityOnly = true;
+                        ((EntityPlayerMP) player).updateHeldItem();
+                        return;
+                    } else player.inventory.setItemStack(null);
                     ((EntityPlayerMP) player).isChangingQuantityOnly = false;
                     ((EntityPlayerMP) player).updateHeldItem();
                     return;
@@ -407,8 +397,7 @@ public class DynamicInventory<T> {
             DynamicPositionedRow row = new DynamicPositionedRow().setSynced(false);
             for (int j = 0, jmax = (i == imax ? (buttons.size() - 1) % perRow : (perRow - 1)); j <= jmax; j++) {
                 final int finalI = i * perRow;
-                final int finalJ = j;
-                final int ID = finalI + finalJ;
+                final int ID = finalI + j;
                 row.widget(buttons.get(ID));
             }
             dynamicInventoryWidget.widget(row.setPos(0, i * 18));
diff --git a/src/main/java/kubatech/api/EIGDynamicInventory.java b/src/main/java/kubatech/api/EIGDynamicInventory.java
index 1b709a2654..0d4c7d2ec6 100644
--- a/src/main/java/kubatech/api/EIGDynamicInventory.java
+++ b/src/main/java/kubatech/api/EIGDynamicInventory.java
@@ -281,27 +281,18 @@ public class EIGDynamicInventory<T> {
                                 inventoryInjector.inject(copy);
                                 if (copy.stackSize == 1) return;
                                 input.stackSize--;
-                                if (input.stackSize > 0) {
-                                    // clearing and updating the held item value like this is the only
-                                    // way i found to be able to reliably update the item count in the UI.
-                                    player.inventory.setItemStack(null);
-                                    ((EntityPlayerMP) player).updateHeldItem();
-                                    player.inventory.setItemStack(input);
-                                    ((EntityPlayerMP) player).updateHeldItem();
-                                    return;
-                                } else player.inventory.setItemStack(null);
                             } else {
                                 inventoryInjector.inject(input);
-                                if (input.stackSize > 0) {
-                                    // clearing and updating the held item value like this is the only
-                                    // way i found to be able to reliably update the item count in the UI.
-                                    player.inventory.setItemStack(null);
-                                    ((EntityPlayerMP) player).updateHeldItem();
-                                    player.inventory.setItemStack(input);
-                                    ((EntityPlayerMP) player).updateHeldItem();
-                                    return;
-                                } else player.inventory.setItemStack(null);
                             }
+                            if (input.stackSize > 0) {
+                                // clearing and updating the held item value like this is the only
+                                // way I found to be able to reliably update the item count in the UI.
+                                player.inventory.setItemStack(null);
+                                ((EntityPlayerMP) player).updateHeldItem();
+                                player.inventory.setItemStack(input);
+                                ((EntityPlayerMP) player).updateHeldItem();
+                                return;
+                            } else player.inventory.setItemStack(null);
                             ((EntityPlayerMP) player).isChangingQuantityOnly = false;
                             ((EntityPlayerMP) player).updateHeldItem();
                             return;
@@ -338,7 +329,7 @@ public class EIGDynamicInventory<T> {
                         for (Object o : stack.getTooltip(player, false)) {
                             tip.add(o.toString());
                         }
-                        if (tip.size() >= 1 && tip.get(0) != null) {
+                        if (!tip.isEmpty() && tip.get(0) != null) {
                             tip.set(0, stack.stackSize + " x " + tip.get(0));
                         }
                         return tip;
@@ -387,27 +378,18 @@ public class EIGDynamicInventory<T> {
                             if (copy.stackSize == 1) return;
 
                             input.stackSize--;
-                            if (input.stackSize > 0) {
-                                // clearing and updating the held item value like this is the only
-                                // way i found to be able to reliably update the item count in the UI.
-                                player.inventory.setItemStack(null);
-                                ((EntityPlayerMP) player).updateHeldItem();
-                                player.inventory.setItemStack(input);
-                                ((EntityPlayerMP) player).updateHeldItem();
-                                return;
-                            } else player.inventory.setItemStack(null);
                         } else {
                             inventoryInjector.inject(input);
-                            if (input.stackSize > 0) {
-                                // clearing and updating the held item value like this is the only
-                                // way i found to be able to reliably update the item count in the UI.
-                                player.inventory.setItemStack(null);
-                                ((EntityPlayerMP) player).updateHeldItem();
-                                player.inventory.setItemStack(input);
-                                ((EntityPlayerMP) player).updateHeldItem();
-                                return;
-                            } else player.inventory.setItemStack(null);
                         }
+                        if (input.stackSize > 0) {
+                            // clearing and updating the held item value like this is the only
+                            // way i found to be able to reliably update the item count in the UI.
+                            player.inventory.setItemStack(null);
+                            ((EntityPlayerMP) player).updateHeldItem();
+                            player.inventory.setItemStack(input);
+                            ((EntityPlayerMP) player).updateHeldItem();
+                            return;
+                        } else player.inventory.setItemStack(null);
                         ((EntityPlayerMP) player).isChangingQuantityOnly = false;
                         ((EntityPlayerMP) player).updateHeldItem();
                         return;
@@ -443,8 +425,7 @@ public class EIGDynamicInventory<T> {
             DynamicPositionedRow row = new DynamicPositionedRow().setSynced(false);
             for (int j = 0, jmax = (i == imax ? (buttons.size() - 1) % perRow : (perRow - 1)); j <= jmax; j++) {
                 final int finalI = i * perRow;
-                final int finalJ = j;
-                final int ID = finalI + finalJ;
+                final int ID = finalI + j;
                 row.widget(buttons.get(ID));
             }
             dynamicInventoryWidget.widget(row.setPos(0, i * 18));
diff --git a/src/main/java/kubatech/api/Variables.java b/src/main/java/kubatech/api/Variables.java
index a5821325e2..ee17a1a1b1 100644
--- a/src/main/java/kubatech/api/Variables.java
+++ b/src/main/java/kubatech/api/Variables.java
@@ -51,7 +51,6 @@ public class Variables {
         + EnumChatFormatting.DARK_BLUE
         + "Lib"
         + EnumChatFormatting.RESET
-        + ""
         + EnumChatFormatting.GRAY
         + " Hologram Projector on the Controller!";
 
diff --git a/src/main/java/kubatech/api/enums/EIGSetupPhase.java b/src/main/java/kubatech/api/enums/EIGSetupPhase.java
index 95e8854347..9545bc45dc 100644
--- a/src/main/java/kubatech/api/enums/EIGSetupPhase.java
+++ b/src/main/java/kubatech/api/enums/EIGSetupPhase.java
@@ -9,7 +9,7 @@ public enum EIGSetupPhase {
     public final int id;
     public final String name;
 
-    private EIGSetupPhase(int id, String name) {
+    EIGSetupPhase(int id, String name) {
         this.id = id;
         this.name = name;
     }
diff --git a/src/main/java/kubatech/api/enums/ItemList.java b/src/main/java/kubatech/api/enums/ItemList.java
index 92a5fca22b..97b42bc2ab 100644
--- a/src/main/java/kubatech/api/enums/ItemList.java
+++ b/src/main/java/kubatech/api/enums/ItemList.java
@@ -171,7 +171,7 @@ public enum ItemList implements IItemContainer {
         StringBuilder tCamelCasedDisplayNameBuilder = new StringBuilder();
         final String[] tDisplayNameWords = aDisplayName.split("\\W");
         for (String tWord : tDisplayNameWords) {
-            if (tWord.length() > 0) tCamelCasedDisplayNameBuilder.append(
+            if (!tWord.isEmpty()) tCamelCasedDisplayNameBuilder.append(
                 tWord.substring(0, 1)
                     .toUpperCase(Locale.US));
             if (tWord.length() > 1) tCamelCasedDisplayNameBuilder.append(
diff --git a/src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java b/src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java
index a6305b2f5f..a1afd3561a 100644
--- a/src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java
+++ b/src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java
@@ -206,7 +206,7 @@ public abstract class KubaTechGTMultiBlockBase<T extends MTEExtendedPowerMultiBl
     }
 
     protected boolean tryOutputAll(List<ItemStack> list) {
-        return tryOutputAll(list, l -> Collections.singletonList((ItemStack) l));
+        return tryOutputAll(list, l -> Collections.singletonList(l));
     }
 
     protected <Y> boolean tryOutputAll(List<Y> list, Function<Y, List<ItemStack>> mappingFunction) {
@@ -311,7 +311,7 @@ public abstract class KubaTechGTMultiBlockBase<T extends MTEExtendedPowerMultiBl
                 .setPos(173, 167 - 1));
 
         final DynamicPositionedColumn screenElements = new DynamicPositionedColumn();
-        drawTexts(screenElements, slotWidgets.size() > 0 ? slotWidgets.get(0) : null);
+        drawTexts(screenElements, !slotWidgets.isEmpty() ? slotWidgets.get(0) : null);
         builder.widget(
             new Scrollable().setVerticalScroll()
                 .widget(screenElements.setPos(10, 0))
diff --git a/src/main/java/kubatech/api/tea/TeaNetwork.java b/src/main/java/kubatech/api/tea/TeaNetwork.java
index 68c8275bfd..e91e3e88a7 100644
--- a/src/main/java/kubatech/api/tea/TeaNetwork.java
+++ b/src/main/java/kubatech/api/tea/TeaNetwork.java
@@ -16,7 +16,7 @@ public class TeaNetwork {
     public BigInteger teaAmount = BigInteger.ZERO;
     public BigInteger teaLimit = BigInteger.valueOf(Long.MAX_VALUE);
     PlayerData owner;
-    private HashSet<TeaStorageTile> teaStorageExtenders = new HashSet<>();
+    private final HashSet<TeaStorageTile> teaStorageExtenders = new HashSet<>();
 
     public static TeaNetwork getNetwork(UUID player) {
         PlayerData p = PlayerDataManager.getPlayer(player);