aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/util/GT_StructureUtility.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/api/util/GT_StructureUtility.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/api/util/GT_StructureUtility.java')
-rw-r--r--src/main/java/gregtech/api/util/GT_StructureUtility.java19
1 files changed, 9 insertions, 10 deletions
diff --git a/src/main/java/gregtech/api/util/GT_StructureUtility.java b/src/main/java/gregtech/api/util/GT_StructureUtility.java
index 80fc64a8c3..703e056bc9 100644
--- a/src/main/java/gregtech/api/util/GT_StructureUtility.java
+++ b/src/main/java/gregtech/api/util/GT_StructureUtility.java
@@ -59,15 +59,14 @@ public class GT_StructureUtility {
public static <T> IStructureElement<T> ofFrame(Materials aFrameMaterial) {
if (aFrameMaterial == null) throw new IllegalArgumentException();
- return new IStructureElement<T>() {
+ return new IStructureElement<>() {
private IIcon[] mIcons;
@Override
public boolean check(T t, World world, int x, int y, int z) {
TileEntity tBase = world.getTileEntity(x, y, z);
- if (tBase instanceof BaseMetaPipeEntity) {
- BaseMetaPipeEntity tPipeBase = (BaseMetaPipeEntity) tBase;
+ if (tBase instanceof BaseMetaPipeEntity tPipeBase) {
if (tPipeBase.isInvalidTileEntity()) return false;
if (tPipeBase.getMetaTileEntity() instanceof GT_MetaPipeEntity_Frame)
return aFrameMaterial == ((GT_MetaPipeEntity_Frame) tPipeBase.getMetaTileEntity()).mMaterial;
@@ -88,9 +87,9 @@ public class GT_StructureUtility {
@Override
public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
ItemStack tFrameStack = getFrameStack();
- if (!GT_Utility.isStackValid(tFrameStack) || !(tFrameStack.getItem() instanceof ItemBlock))
+ if (!GT_Utility.isStackValid(tFrameStack)
+ || !(tFrameStack.getItem() instanceof ItemBlock tFrameStackItem))
return false;
- ItemBlock tFrameStackItem = (ItemBlock) tFrameStack.getItem();
return tFrameStackItem.placeBlockAt(
tFrameStack,
null,
@@ -171,7 +170,7 @@ public class GT_StructureUtility {
if (aHatchAdder == null || aHintBlock == null) {
throw new IllegalArgumentException();
}
- return new IStructureElementNoPlacement<T>() {
+ return new IStructureElementNoPlacement<>() {
@Override
public boolean check(T t, World world, int x, int y, int z) {
@@ -194,7 +193,7 @@ public class GT_StructureUtility {
if (aHatchAdder == null) {
throw new IllegalArgumentException();
}
- return new IStructureElement<T>() {
+ return new IStructureElement<>() {
@Override
public boolean check(T t, World world, int x, int y, int z) {
@@ -280,7 +279,7 @@ public class GT_StructureUtility {
if (aHatchAdder == null) {
throw new IllegalArgumentException();
}
- return new IStructureElement<T>() {
+ return new IStructureElement<>() {
@Override
public boolean check(T t, World world, int x, int y, int z) {
@@ -379,7 +378,7 @@ public class GT_StructureUtility {
if (aHatchAdder == null || aHintBlock == null) {
throw new IllegalArgumentException();
}
- return new IStructureElement<T>() {
+ return new IStructureElement<>() {
@Override
public boolean check(T t, World world, int x, int y, int z) {
@@ -446,7 +445,7 @@ public class GT_StructureUtility {
if (aHeatingCoilSetter == null || aHeatingCoilGetter == null) {
throw new IllegalArgumentException();
}
- return new IStructureElement<T>() {
+ return new IStructureElement<>() {
@Override
public boolean check(T t, World world, int x, int y, int z) {