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
---
 .../gui/modularui/widget/FluidDisplaySlotWidget.java      | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java')

diff --git a/src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java
index 13bcc12504..4f9f19d49a 100644
--- a/src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java
+++ b/src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java
@@ -209,8 +209,7 @@ public class FluidDisplaySlotWidget extends SlotWidget {
         if (tStackSizedOne == null || tStackHeld.stackSize == 0) return null;
         int tOriginalFluidAmount = tTankStack.amount;
         ItemStack tFilledContainer = GT_Utility.fillFluidContainer(tTankStack, tStackSizedOne, true, false);
-        if (tFilledContainer == null && tStackSizedOne.getItem() instanceof IFluidContainerItem) {
-            IFluidContainerItem tContainerItem = (IFluidContainerItem) tStackSizedOne.getItem();
+        if (tFilledContainer == null && tStackSizedOne.getItem() instanceof IFluidContainerItem tContainerItem) {
             int tFilledAmount = tContainerItem.fill(tStackSizedOne, tTankStack, true);
             if (tFilledAmount > 0) {
                 tFilledContainer = tStackSizedOne;
@@ -260,9 +259,8 @@ public class FluidDisplaySlotWidget extends SlotWidget {
             tStackEmptied = GT_Utility.getContainerForFilledItem(tStackSizedOne, false);
             tAmountTaken = aFluidHeld.amount;
         }
-        if (tStackEmptied == null && tStackSizedOne.getItem() instanceof IFluidContainerItem) {
+        if (tStackEmptied == null && tStackSizedOne.getItem() instanceof IFluidContainerItem container) {
             // either partially accepted, or is IFluidContainerItem
-            IFluidContainerItem container = (IFluidContainerItem) tStackSizedOne.getItem();
             FluidStack tDrained = container.drain(tStackSizedOne, tFreeSpace, true);
             if (tDrained != null && tDrained.amount > 0) {
                 // something is actually drained - change the cell and drop it to player
@@ -319,8 +317,7 @@ public class FluidDisplaySlotWidget extends SlotWidget {
     }
 
     protected void lockFluid(ItemStack cursorStack) {
-        if (!(iHasFluidDisplay instanceof IFluidLockable)) return;
-        IFluidLockable mteToLock = (IFluidLockable) iHasFluidDisplay;
+        if (!(iHasFluidDisplay instanceof IFluidLockable mteToLock)) return;
 
         if (cursorStack == null) {
             if (!mteToLock.allowChangingLockedFluid(null)) return;
@@ -417,7 +414,7 @@ public class FluidDisplaySlotWidget extends SlotWidget {
 
     /**
      * Sets function called before {@link #executeRealClick}.
-     * 
+     *
      * @param beforeRealClick (click data, this widget) -> if allow click
      */
     public FluidDisplaySlotWidget setBeforeRealClick(
@@ -428,7 +425,7 @@ public class FluidDisplaySlotWidget extends SlotWidget {
 
     /**
      * Sets function called before {@link #executeDragAndDrop}.
-     * 
+     *
      * @param beforeDragAndDrop (click data, this widget) -> if allow click
      */
     public FluidDisplaySlotWidget setBeforeDragAndDrop(
@@ -439,7 +436,7 @@ public class FluidDisplaySlotWidget extends SlotWidget {
 
     /**
      * Sets function called before both of {@link #executeRealClick} and {@link #executeDragAndDrop}.
-     * 
+     *
      * @param beforeClick (click data, this widget) -> if allow click
      */
     public FluidDisplaySlotWidget setBeforeClick(BiFunction<ClickData, FluidDisplaySlotWidget, Boolean> beforeClick) {
-- 
cgit