From b088958c9f6935d356b6c087c8e8106b400aa24f Mon Sep 17 00:00:00 2001
From: Raven Szewczyk <git@eigenraven.me>
Date: Sat, 1 Apr 2023 20:06:12 +0100
Subject: Jabel, Generic injection and mostly automatic code cleanup (#1829)

* Enable Jabel&Generic injection, fix type error caused by this

* add missing <>

* Infer generic types automatically

* Parametrize cast types

* Use enhanced for loops

* Unnecessary boxing

* Unnecessary unboxing

* Use Objects.equals

* Explicit type can be replaced with `<>`

* Collapse identical catch blocks

* Add SafeVarargs where applicable

* Anonymous type can be replaced with lambda

* Use List.sort directly

* Lambda can be a method reference

* Statement lambda can be an expression lambda

* Use string switches

* Instanceof pattern matching

* Text block can be used

* Migrate to enhanced switch

* Java style array declarations

* Unnecessary toString()

* More unnecessary String conversions

* Unnecessary modifiers

* Unnecessary semicolons

* Fix duplicate conditions

* Extract common code from if branches

* Replace switches with ifs for 1-2 cases

* Inner class may be static

* Minor performance issues

* Replace string appending in loops with string builders

* Fix IntelliJ using the wrong empty list method

* Use Long.compare

* Generic arguments: getSubItems

* Generic arguments: getSubBlocks

* Raw types warnings

* Fix remaining missing generics

* Too weak variable type leads to unnecessary cast

* Redundant type casts

* Redundant array length check

* Redundant vararg arrays

* Manual min/max implementations

* A couple missed inspections

* Goodbye explosion power ternary ladder

* Apply spotless

* Get rid of the other two big ternary ladders

* Binary search explosion power

* Don't overcomplicate things
---
 .../GT_MetaTileEntity_MagicalEnergyAbsorber.java       | 14 +++++---------
 .../generators/GT_MetaTileEntity_NaquadahReactor.java  | 18 ++++++------------
 2 files changed, 11 insertions(+), 21 deletions(-)

(limited to 'src/main/java/gregtech/common/tileentities/generators')

diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java
index 491eeea306..391a212115 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java
+++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java
@@ -658,7 +658,7 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B
         MagicalEnergyBB(GT_MetaTileEntity_MagicalEnergyAbsorber aAbsorber, int aDefaultTier, int aMaxTier) {
             mAbsorber = aAbsorber;
             mListener = aAbsorber;
-            mMaxTier = Math.max(aMaxTier > 0 ? aMaxTier : 0, aDefaultTier > 0 ? aDefaultTier : 0);
+            mMaxTier = Math.max(Math.max(aMaxTier, 0), Math.max(aDefaultTier, 0));
             mDefaultTier = Math.min(aDefaultTier, mMaxTier);
             mTier = mDefaultTier;
             if (THAUMCRAFT_LOADED) mAvailableAspects = new ArrayList<>(Aspect.aspects.size());
@@ -676,11 +676,7 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B
          */
         int setTier(int aTier) {
             if (aTier >= 0) {
-                if (aTier <= mMaxTier) {
-                    mTier = aTier;
-                } else {
-                    mTier = mMaxTier;
-                }
+                mTier = Math.min(aTier, mMaxTier);
             } else {
                 mTier = 0;
             }
@@ -730,9 +726,9 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B
             World tWorld = mAbsorber.getBaseMetaTileEntity()
                                     .getWorld();
             mLivingCrystalIDs.clear();
-            for (Object o : tWorld.getEntitiesWithinAABB(EntityEnderCrystal.class, getAxisAlignedBB())) {
-                if (((EntityEnderCrystal) o).isEntityAlive()) {
-                    mLivingCrystalIDs.add(((EntityEnderCrystal) o).getPersistentID());
+            for (EntityEnderCrystal o : tWorld.getEntitiesWithinAABB(EntityEnderCrystal.class, getAxisAlignedBB())) {
+                if (o.isEntityAlive()) {
+                    mLivingCrystalIDs.add(o.getPersistentID());
                 }
             }
         }
diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java
index 615f512ff0..b81b0b956b 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java
+++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java
@@ -47,29 +47,23 @@ public class GT_MetaTileEntity_NaquadahReactor extends GT_MetaTileEntity_BasicGe
     public GT_Recipe.GT_Recipe_Map getRecipes() {
         GT_Recipe.GT_Recipe_Map ret;
         switch (mTier) {
-            case 4: {
+            case 4 -> {
                 ret = GT_Recipe.GT_Recipe_Map.sSmallNaquadahReactorFuels;
-                break;
             }
-            case 5: {
+            case 5 -> {
                 ret = GT_Recipe.GT_Recipe_Map.sLargeNaquadahReactorFuels;
-                break;
             }
-            case 6: {
+            case 6 -> {
                 ret = GT_Recipe.GT_Recipe_Map.sHugeNaquadahReactorFuels;
-                break;
             }
-            case 7: {
+            case 7 -> {
                 ret = GT_Recipe.GT_Recipe_Map.sExtremeNaquadahReactorFuels;
-                break;
             }
-            case 8: {
+            case 8 -> {
                 ret = GT_Recipe.GT_Recipe_Map.sUltraHugeNaquadahReactorFuels;
-                break;
             }
-            default: {
+            default -> {
                 ret = null;
-                break;
             }
         }
         return ret;
-- 
cgit