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
---
 src/main/java/gregtech/api/util/GT_RenderingWorld.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/main/java/gregtech/api/util/GT_RenderingWorld.java')

diff --git a/src/main/java/gregtech/api/util/GT_RenderingWorld.java b/src/main/java/gregtech/api/util/GT_RenderingWorld.java
index b8caa59554..4ada7decab 100644
--- a/src/main/java/gregtech/api/util/GT_RenderingWorld.java
+++ b/src/main/java/gregtech/api/util/GT_RenderingWorld.java
@@ -3,6 +3,7 @@ package gregtech.api.util;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 import net.minecraft.block.Block;
@@ -181,7 +182,7 @@ public class GT_RenderingWorld implements IBlockAccess {
             BlockInfo blockInfo = (BlockInfo) o;
 
             if (meta != blockInfo.meta) return false;
-            return block != null ? block.equals(blockInfo.block) : blockInfo.block == null;
+            return Objects.equals(block, blockInfo.block);
         }
 
         @Override
-- 
cgit