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
---
 .../machine/MultiTileBasicMachine.java             | 38 ++++++++++++----------
 1 file changed, 20 insertions(+), 18 deletions(-)

(limited to 'src/main/java/gregtech/api/multitileentity/machine')

diff --git a/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java b/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java
index 8d96ff58f5..740496a8b6 100644
--- a/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java
+++ b/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java
@@ -451,7 +451,7 @@ public abstract class MultiTileBasicMachine extends TickableMultiTileEntity impl
 
     /**
      * Runs only on server side
-     * 
+     *
      * @param tick The current tick of the machine
      */
     protected void runMachine(long tick) {
@@ -483,7 +483,7 @@ public abstract class MultiTileBasicMachine extends TickableMultiTileEntity impl
 
     /**
      * Runs only on server side
-     * 
+     *
      * @param tick The current tick of the machine
      */
     protected void runningTick(long tick) {
@@ -569,13 +569,17 @@ public abstract class MultiTileBasicMachine extends TickableMultiTileEntity impl
 
     public void doSound(byte aIndex, double aX, double aY, double aZ) {
         switch (aIndex) {
-            case PROCESS_START_SOUND_INDEX:
+            case PROCESS_START_SOUND_INDEX -> {
                 if (getProcessStartSound() != null)
                     GT_Utility.doSoundAtClient(getProcessStartSound(), getTimeBetweenProcessSounds(), 1.0F, aX, aY, aZ);
-                break;
-            case INTERRUPT_SOUND_INDEX:
-                GT_Utility.doSoundAtClient(SoundResource.IC2_MACHINES_INTERRUPT_ONE, 100, 1.0F, aX, aY, aZ);
-                break;
+            }
+            case INTERRUPT_SOUND_INDEX -> GT_Utility.doSoundAtClient(
+                    SoundResource.IC2_MACHINES_INTERRUPT_ONE,
+                    100,
+                    1.0F,
+                    aX,
+                    aY,
+                    aZ);
         }
     }
 
@@ -854,7 +858,7 @@ public abstract class MultiTileBasicMachine extends TickableMultiTileEntity impl
         this.soundEventValue = soundEventValue;
         if (isClientSide()) {
             switch (soundEventValue) {
-                case PROCESS_START_SOUND_INDEX:
+                case PROCESS_START_SOUND_INDEX -> {
                     if (getProcessStartSound() != null) GT_Utility.doSoundAtClient(
                             getProcessStartSound(),
                             getTimeBetweenProcessSounds(),
@@ -862,16 +866,14 @@ public abstract class MultiTileBasicMachine extends TickableMultiTileEntity impl
                             getXCoord(),
                             getYCoord(),
                             getZCoord());
-                    break;
-                case INTERRUPT_SOUND_INDEX:
-                    GT_Utility.doSoundAtClient(
-                            SoundResource.IC2_MACHINES_INTERRUPT_ONE,
-                            100,
-                            1.0F,
-                            getXCoord(),
-                            getYCoord(),
-                            getZCoord());
-                    break;
+                }
+                case INTERRUPT_SOUND_INDEX -> GT_Utility.doSoundAtClient(
+                        SoundResource.IC2_MACHINES_INTERRUPT_ONE,
+                        100,
+                        1.0F,
+                        getXCoord(),
+                        getYCoord(),
+                        getZCoord());
             }
         }
     }
-- 
cgit