aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/gui/modularui/UIHelper.java
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2023-04-01 20:06:12 +0100
committerGitHub <noreply@github.com>2023-04-01 19:06:12 +0000
commitb088958c9f6935d356b6c087c8e8106b400aa24f (patch)
treebe608fac08ba158f1226a4fb9f5b1ed459bac2a9 /src/main/java/gregtech/common/gui/modularui/UIHelper.java
parente52cd9c3458584e58073df5cd9cde1302994f266 (diff)
downloadGT5-Unofficial-b088958c9f6935d356b6c087c8e8106b400aa24f.tar.gz
GT5-Unofficial-b088958c9f6935d356b6c087c8e8106b400aa24f.tar.bz2
GT5-Unofficial-b088958c9f6935d356b6c087c8e8106b400aa24f.zip
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
Diffstat (limited to 'src/main/java/gregtech/common/gui/modularui/UIHelper.java')
-rw-r--r--src/main/java/gregtech/common/gui/modularui/UIHelper.java52
1 files changed, 18 insertions, 34 deletions
diff --git a/src/main/java/gregtech/common/gui/modularui/UIHelper.java b/src/main/java/gregtech/common/gui/modularui/UIHelper.java
index 2135d3686a..1337ce18ca 100644
--- a/src/main/java/gregtech/common/gui/modularui/UIHelper.java
+++ b/src/main/java/gregtech/common/gui/modularui/UIHelper.java
@@ -83,46 +83,30 @@ public class UIHelper {
* @return Display positions for GUI, including border (18x18 size)
*/
public static List<Pos2d> getItemInputPositions(int itemInputCount) {
- switch (itemInputCount) {
- case 0:
- return Collections.emptyList();
- case 1:
- return getGridPositions(itemInputCount, 52, 24, 1, 1);
- case 2:
- return getGridPositions(itemInputCount, 34, 24, 2, 1);
- case 3:
- return getGridPositions(itemInputCount, 16, 24, 3, 1);
- case 4:
- return getGridPositions(itemInputCount, 34, 15, 2, 2);
- case 5:
- case 6:
- return getGridPositions(itemInputCount, 16, 15, 3, 2);
- default:
- return getGridPositions(itemInputCount, 16, 6, 3);
- }
+ return switch (itemInputCount) {
+ case 0 -> Collections.emptyList();
+ case 1 -> getGridPositions(itemInputCount, 52, 24, 1, 1);
+ case 2 -> getGridPositions(itemInputCount, 34, 24, 2, 1);
+ case 3 -> getGridPositions(itemInputCount, 16, 24, 3, 1);
+ case 4 -> getGridPositions(itemInputCount, 34, 15, 2, 2);
+ case 5, 6 -> getGridPositions(itemInputCount, 16, 15, 3, 2);
+ default -> getGridPositions(itemInputCount, 16, 6, 3);
+ };
}
/**
* @return Display positions for GUI, including border (18x18 size)
*/
public static List<Pos2d> getItemOutputPositions(int itemOutputCount) {
- switch (itemOutputCount) {
- case 0:
- return Collections.emptyList();
- case 1:
- return getGridPositions(itemOutputCount, 106, 24, 1, 1);
- case 2:
- return getGridPositions(itemOutputCount, 106, 24, 2, 1);
- case 3:
- return getGridPositions(itemOutputCount, 106, 24, 3, 1);
- case 4:
- return getGridPositions(itemOutputCount, 106, 15, 2, 2);
- case 5:
- case 6:
- return getGridPositions(itemOutputCount, 106, 15, 3, 2);
- default:
- return getGridPositions(itemOutputCount, 106, 6, 3);
- }
+ return switch (itemOutputCount) {
+ case 0 -> Collections.emptyList();
+ case 1 -> getGridPositions(itemOutputCount, 106, 24, 1, 1);
+ case 2 -> getGridPositions(itemOutputCount, 106, 24, 2, 1);
+ case 3 -> getGridPositions(itemOutputCount, 106, 24, 3, 1);
+ case 4 -> getGridPositions(itemOutputCount, 106, 15, 2, 2);
+ case 5, 6 -> getGridPositions(itemOutputCount, 106, 15, 3, 2);
+ default -> getGridPositions(itemOutputCount, 106, 6, 3);
+ };
}
/**