From 3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3 Mon Sep 17 00:00:00 2001
From: Alexdoru <57050655+Alexdoru@users.noreply.github.com>
Date: Wed, 2 Oct 2024 07:31:08 +0200
Subject: Cleanup the codebase (#3311)

Co-authored-by: boubou19 <miisterunknown@gmail.com>
---
 .../java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItem.java    |  2 --
 .../gtPlusPlus/xmod/gregtech/api/items/GTMetaItemBase.java     | 10 +++-------
 .../java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemX32.java |  2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'src/main/java/gtPlusPlus/xmod/gregtech/api/items')

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItem.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItem.java
index c98023bad7..befca0975f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItem.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItem.java
@@ -106,7 +106,6 @@ public abstract class GTMetaItem extends GTMetaItemBase {
                     }
                     if (tRandomData == SubTag.NO_UNIFICATION) {
                         GTOreDictUnificator.addToBlacklist(rStack);
-                        continue;
                     }
                 }
             }
@@ -140,7 +139,6 @@ public abstract class GTMetaItem extends GTMetaItemBase {
                     }
                     if (tUseOreDict) {
                         GTOreDictUnificator.registerOre(tRandomData, rStack);
-                        continue;
                     }
                 }
             }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemBase.java
index 3e7fcf1486..09c6d4467a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemBase.java
@@ -64,11 +64,8 @@ public abstract class GTMetaItemBase extends GTGenericItem
         if ((aMetaValue < 0) || (aMetaValue >= 32766) || (aBehavior == null)) {
             return this;
         }
-        ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) aMetaValue);
-        if (tList == null) {
-            tList = new ArrayList<>(1);
-            this.mItemBehaviors.put((short) aMetaValue, tList);
-        }
+        ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors
+            .computeIfAbsent((short) aMetaValue, k -> new ArrayList<>(1));
         tList.add(aBehavior);
         return this;
     }
@@ -278,8 +275,7 @@ public abstract class GTMetaItemBase extends GTGenericItem
                         EnumChatFormatting.AQUA + "Empty. You should recycle it properly." + EnumChatFormatting.GRAY);
                 } else {
                     aList.add(
-                        EnumChatFormatting.AQUA + ""
-                            + GTUtility.formatNumbers(tCharge)
+                        EnumChatFormatting.AQUA + GTUtility.formatNumbers(tCharge)
                             + " / "
                             + GTUtility.formatNumbers(Math.abs(tStats[0]))
                             + " EU - Voltage: "
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemX32.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemX32.java
index 31cdac4770..102a3cc0b7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemX32.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemX32.java
@@ -101,7 +101,7 @@ public abstract class GTMetaItemX32 extends GTMetaItem {
         // You have to check for at least these Conditions in every Case! So add a super Call like the following for
         // this before executing your Code:
         // if (!super.doesMaterialAllowGeneration(aPrefix, aMaterial)) return false;
-        return (aPrefix != null) && (aMaterial != null) && aPrefix.doGenerateItem(aMaterial);
+        return aPrefix != null && aPrefix.doGenerateItem(aMaterial);
     }
 
     /* ---------- OVERRIDEABLE FUNCTIONS ---------- */
-- 
cgit