From fbdbb388c369fae549cfde3eed38b536f7461d90 Mon Sep 17 00:00:00 2001
From: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>
Date: Wed, 18 Oct 2023 17:03:23 +0100
Subject: Cleaning up (#767)

* Kill playerAPI

* Gut more events and compat that is now obsolete

* Remove commented out code

* Remove final modifier from methods

* Make more stuff final

* Remove slow building ring

* Protected -> private in final classes

* More cleaning

* More cleaning v2

* Purging

* Clean DevHelper

* Clean DevHelper 2

* delete DevHelper

* remove useless IFMLLoadingPlugin.MCVersion annotation from @Mod files

* check for obfuscation only once in the IFMLloadingPlugin.injectData

* don't instantiate the static class ASMConfig

* delete unused and empty implementation of IFMLCallHook

* delete empty class

* delete ClassesToTransform class that just holds the class names constants

* delete unused methods and unsless logging in dummymod container

* delete unused transformer ClassTransformer_TT_ThaumicRestorer

* spotless

* Clean

* Clean utils

* Build checkpoint

* Purge

* Stage 2

* Stage 3

* Stage 4

* Stage 5

* Stage 6

* Spotless

* Imports

* Stage idk

* Stage 1

* Fix issue

* Spotless

* Format numbers

---------

Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: Alexdoru <57050655+Alexdoru@users.noreply.github.com>
Co-authored-by: Connor Colenso <colen@CONNORSPC>
---
 .../xmod/gregtech/api/objects/GregtechItemData.java  | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

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

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java
index b9dc5d4b70..77ad6cd4ac 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java
@@ -2,8 +2,6 @@ package gtPlusPlus.xmod.gregtech.api.objects;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 
 import net.minecraft.item.ItemStack;
@@ -47,9 +45,9 @@ public class GregtechItemData {
             final GregtechMaterialStack[] tByProducts = aByProducts.length < 1 ? EMPTY_GT_MaterialStack_ARRAY
                     : new GregtechMaterialStack[aByProducts.length];
             int j = 0;
-            for (int i = 0; i < aByProducts.length; i++) {
-                if ((aByProducts[i] != null) && (aByProducts[i].mMaterial != null)) {
-                    tByProducts[j++] = aByProducts[i].clone();
+            for (GregtechMaterialStack aByProduct : aByProducts) {
+                if ((aByProduct != null) && (aByProduct.mMaterial != null)) {
+                    tByProducts[j++] = aByProduct.clone();
                 }
             }
             this.mByProducts = j > 0 ? new GregtechMaterialStack[j] : EMPTY_GT_MaterialStack_ARRAY;
@@ -102,13 +100,7 @@ public class GregtechItemData {
             }
         }
 
-        Collections.sort(rList, new Comparator<GregtechMaterialStack>() {
-
-            @Override
-            public int compare(final GregtechMaterialStack a, final GregtechMaterialStack b) {
-                return a.mAmount == b.mAmount ? 0 : a.mAmount > b.mAmount ? -1 : +1;
-            }
-        });
+        rList.sort((a, b) -> Long.compare(b.mAmount, a.mAmount));
 
         if (rList.isEmpty()) {
             this.mMaterial = null;
@@ -117,7 +109,7 @@ public class GregtechItemData {
             rList.remove(0);
         }
 
-        this.mByProducts = rList.toArray(new GregtechMaterialStack[rList.size()]);
+        this.mByProducts = rList.toArray(new GregtechMaterialStack[0]);
     }
 
     public boolean hasValidPrefixMaterialData() {
@@ -133,7 +125,7 @@ public class GregtechItemData {
     }
 
     public ArrayList<GregtechMaterialStack> getAllGT_MaterialStacks() {
-        final ArrayList<GregtechMaterialStack> rList = new ArrayList<GregtechMaterialStack>();
+        final ArrayList<GregtechMaterialStack> rList = new ArrayList<>();
         if (this.hasValidMaterialData()) {
             rList.add(this.mMaterial);
         }
-- 
cgit