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 --- .../misc/spaceprojects/interfaces/ISpaceProject.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/main/java/gregtech/common/misc/spaceprojects/interfaces') diff --git a/src/main/java/gregtech/common/misc/spaceprojects/interfaces/ISpaceProject.java b/src/main/java/gregtech/common/misc/spaceprojects/interfaces/ISpaceProject.java index 3de3ef2b94..369c7c8c7a 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/interfaces/ISpaceProject.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/interfaces/ISpaceProject.java @@ -205,7 +205,7 @@ public interface ISpaceProject { /** * Checks if the project meets all requirements with its current location - * + * * @param team Team wanting said project and checking their projects * @return true if all requirements met, false otherwise */ @@ -214,7 +214,7 @@ public interface ISpaceProject { /** * Checks if the project meets requirements if it requires other projects, unless {@code checkLocation} is true, * then it also checks for the location - * + * * @param team Team wanting said project and checking their projects * @param checkLocation If the location position should be checked * @return true if all requirements met, false otherwise @@ -228,7 +228,7 @@ public interface ISpaceProject { /** * Checks if the project has a certain upgrade installed or not - * + * * @param upgradeName Upgrade being searched for * @return True if that upgrade has been installed, false otherwise */ @@ -237,7 +237,7 @@ public interface ISpaceProject { /** * @author BlueWeabo */ - public interface ISP_Upgrade { + interface ISP_Upgrade { /** * @return internal name of the upgrade @@ -373,14 +373,14 @@ public interface ISpaceProject { /** * Sets the current stage of the upgrade - * + * * @param stage */ void setUpgradeCurrentStage(int stage); /** * Checks if the team has met all requirements to be able to build said upgrade - * + * * @param team The one starting the upgrade * @return true if all requirements are met, false otherwise */ @@ -405,7 +405,7 @@ public interface ISpaceProject { /** * @author BlueWeabo */ - public interface ISP_Requirements { + interface ISP_Requirements { /** * @return Space Body Type required by the project/upgrade -- cgit