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 --- .../gregtech/common/misc/spaceprojects/base/SP_Requirements.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/main/java/gregtech/common/misc/spaceprojects/base') diff --git a/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Requirements.java b/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Requirements.java index 0cce6f08f0..b910b5e344 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Requirements.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Requirements.java @@ -1,6 +1,7 @@ package gregtech.common.misc.spaceprojects.base; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import gregtech.common.misc.spaceprojects.enums.SpaceBodyType; @@ -60,16 +61,12 @@ public class SP_Requirements implements ISP_Requirements { } public SP_Requirements setUpgrades(ISP_Upgrade... requirementUpgrades) { - for (ISP_Upgrade upgrade : requirementUpgrades) { - upgrades.add(upgrade); - } + upgrades.addAll(Arrays.asList(requirementUpgrades)); return this; } public SP_Requirements setSpaceProjects(ISpaceProject... requirementProjects) { - for (ISpaceProject project : requirementProjects) { - spaceProjects.add(project); - } + spaceProjects.addAll(Arrays.asList(requirementProjects)); return this; } -- cgit