From b088958c9f6935d356b6c087c8e8106b400aa24f Mon Sep 17 00:00:00 2001 From: Raven Szewczyk 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 --- .../postload/chains/GT_PCBFactoryRecipes.java | 42 +++++++++++----------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'src/main/java/gregtech/loaders/postload/chains') diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java index cce0da00cd..8cbdc42301 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java @@ -80,7 +80,7 @@ public class GT_PCBFactoryRecipes { // Plastic Circuit Board for (int tier = 1; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 1)))); - List aBoards = new ArrayList(); + List aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Plastic_Advanced.get(64)); amountOfBoards -= 64; @@ -107,7 +107,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 1; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 0.5)))); - List aBoards = new ArrayList(); + List aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Plastic_Advanced.get(64)); amountOfBoards -= 64; @@ -135,7 +135,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 1; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier)))); - List aBoards = new ArrayList(); + List aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Plastic_Advanced.get(64)); amountOfBoards -= 64; @@ -165,7 +165,7 @@ public class GT_PCBFactoryRecipes { // Advanced Circuit Board for (int tier = 2; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 2)))); - List aBoards = new ArrayList(); + List aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Epoxy_Advanced.get(i)); amountOfBoards -= 64; @@ -192,7 +192,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 2; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 1.5)))); - List aBoards = new ArrayList(); + List aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Epoxy_Advanced.get(i)); amountOfBoards -= 64; @@ -220,7 +220,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 2; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 1)))); - List aBoards = new ArrayList(); + List aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Epoxy_Advanced.get(i)); amountOfBoards -= 64; @@ -250,7 +250,7 @@ public class GT_PCBFactoryRecipes { // More Advanced Circuit Board for (int tier = 3; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 3)))); - List aBoards = new ArrayList(); + List aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Fiberglass_Advanced.get(i)); amountOfBoards -= 64; @@ -277,7 +277,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 3; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 2.5)))); - List aBoards = new ArrayList(); + List aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Fiberglass_Advanced.get(i)); amountOfBoards -= 64; @@ -305,7 +305,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 3; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 2)))); - List aBoards = new ArrayList(); + List aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Fiberglass_Advanced.get(i)); amountOfBoards -= 64; @@ -335,7 +335,7 @@ public class GT_PCBFactoryRecipes { // Elite Circuit Board for (int tier = 4; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 4)))); - List aBoards = new ArrayList(); + List aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Multifiberglass_Elite.get(i)); amountOfBoards -= 64; @@ -362,7 +362,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 4; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 3.5)))); - List aBoards = new ArrayList(); + List aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Multifiberglass_Elite.get(i)); amountOfBoards -= 64; @@ -390,7 +390,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 4; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 3)))); - List aBoards = new ArrayList(); + List aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Multifiberglass_Elite.get(i)); amountOfBoards -= 64; @@ -420,7 +420,7 @@ public class GT_PCBFactoryRecipes { // Wetware Circuit Board for (int tier = 5; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 5)))); - List aBoards = new ArrayList(); + List aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Wetware_Extreme.get(i)); amountOfBoards -= 64; @@ -448,7 +448,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 5; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 4.5)))); - List aBoards = new ArrayList(); + List aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Wetware_Extreme.get(i)); amountOfBoards -= 64; @@ -477,7 +477,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 5; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 4)))); - List aBoards = new ArrayList(); + List aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Wetware_Extreme.get(i)); amountOfBoards -= 64; @@ -508,7 +508,7 @@ public class GT_PCBFactoryRecipes { // Bioware Circuit Board for (int tier = 6; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6)))); - List aBoards = new ArrayList(); + List aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Bio_Ultra.get(i)); amountOfBoards -= 64; @@ -536,7 +536,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 6; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 5.5)))); - List aBoards = new ArrayList(); + List aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Bio_Ultra.get(i)); amountOfBoards -= 64; @@ -565,7 +565,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 6; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 5)))); - List aBoards = new ArrayList(); + List aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Bio_Ultra.get(i)); amountOfBoards -= 64; @@ -597,7 +597,7 @@ public class GT_PCBFactoryRecipes { // Optical Circuit Board for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 7)))); - List aBoards = new ArrayList(); + List aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Optical.get(i)); amountOfBoards -= 64; @@ -630,7 +630,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6.5)))); - List aBoards = new ArrayList(); + List aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Optical.get(i)); amountOfBoards -= 64; @@ -664,7 +664,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6)))); - List aBoards = new ArrayList(); + List aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Optical.get(i)); amountOfBoards -= 64; -- cgit