aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/items/behaviors
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/items/behaviors
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/items/behaviors')
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow.java4
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java6
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java9
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java6
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java22
5 files changed, 19 insertions, 28 deletions
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow.java
index 93414ec8aa..7c03965cc0 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow.java
+++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow.java
@@ -122,7 +122,7 @@ public class Behaviour_Arrow extends Behaviour_None {
-1,
null,
true,
- new Object[] { aWorld, Double.valueOf(aX), Double.valueOf(aY), Double.valueOf(aZ) });
+ new Object[] { aWorld, aX, aY, aZ });
rArrow.setArrowItem(aStack);
return rArrow;
}
@@ -138,7 +138,7 @@ public class Behaviour_Arrow extends Behaviour_None {
-1,
null,
true,
- new Object[] { aWorld, aEntity, Float.valueOf(this.mSpeedMultiplier * aSpeed) });
+ new Object[] { aWorld, aEntity, this.mSpeedMultiplier * aSpeed });
rArrow.setArrowItem(aStack);
return rArrow;
}
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java
index 57e0750335..d0c589c09f 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java
+++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java
@@ -104,8 +104,7 @@ public class Behaviour_Cover_Tool extends Behaviour_None {
+ aWorld.provider.dimensionId
+ EnumChatFormatting.RESET
+ " -----");
- if (aTileEntity instanceof ICoverable) {
- ICoverable tCoverable = (ICoverable) aTileEntity;
+ if (aTileEntity instanceof ICoverable tCoverable) {
int tSide = tCoverable.getCoverItemAtSide((byte) aSide) != null ? aSide
: tCoverable.getCoverItemAtSide(GT_Utility.determineWrenchingSide((byte) aSide, hitX, hitY, hitZ))
!= null ? GT_Utility.determineWrenchingSide((byte) aSide, hitX, hitY, hitZ) : -1;
@@ -135,8 +134,7 @@ public class Behaviour_Cover_Tool extends Behaviour_None {
}
private void doPaste(TileEntity aTileEntity, int aSide, float hitX, float hitY, float hitZ, EntityPlayer aPlayer) {
- if (aTileEntity instanceof ICoverable) {
- ICoverable tCoverable = (ICoverable) aTileEntity;
+ if (aTileEntity instanceof ICoverable tCoverable) {
if (mCoverType == 0 || mStoredData == null) {
GT_Utility.sendChatToPlayer(aPlayer, "Please Copy a Valid Cover First.");
return;
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java
index 84b6513563..8b876a5b44 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java
+++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java
@@ -38,17 +38,14 @@ public class Behaviour_DataStick extends Behaviour_None {
aList.add("Rocket Schematic Tier: " + sTier);
} else if (sTier >= 100) {
switch (sTier) {
- case 100: {
+ case 100 -> {
aList.add("Moonbuggy Schematic");
- break;
}
- case 101: {
+ case 101 -> {
aList.add("Cargo-Rocket Schematic");
- break;
}
- case 102: {
+ case 102 -> {
aList.add("Astro-Miner Schematic");
- break;
}
}
}
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java
index 737caf9f5b..cf5b782200 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java
+++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java
@@ -55,11 +55,9 @@ public class Behaviour_Plunger_Fluid extends Behaviour_None {
}
}
}
- if (aTileEntity instanceof IGregTechTileEntity) {
- IGregTechTileEntity tTileEntity = (IGregTechTileEntity) aTileEntity;
+ if (aTileEntity instanceof IGregTechTileEntity tTileEntity) {
IMetaTileEntity mTileEntity = tTileEntity.getMetaTileEntity();
- if (mTileEntity instanceof GT_MetaTileEntity_BasicTank) {
- GT_MetaTileEntity_BasicTank machine = (GT_MetaTileEntity_BasicTank) mTileEntity;
+ if (mTileEntity instanceof GT_MetaTileEntity_BasicTank machine) {
if (machine.mFluid != null && machine.mFluid.amount > 0)
machine.mFluid.amount = machine.mFluid.amount - Math.min(machine.mFluid.amount, 1000);
GT_Utility.sendSoundToPlayers(
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java
index 51723469d6..6bb687a5a8 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java
+++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java
@@ -33,24 +33,22 @@ public class Behaviour_Scoop extends Behaviour_None {
}
if ((aPlayer.capabilities.isCreativeMode)
|| (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) {
- Object tButterfly = ((IEntityButterfly) aEntity).getButterfly();
- ((IButterfly) tButterfly).getGenome()
- .getPrimary()
- .getRoot()
- .getBreedingTracker(aEntity.worldObj, aPlayer.getGameProfile())
- .registerCatch((IButterfly) tButterfly);
+ IButterfly tButterfly = ((IEntityButterfly) aEntity).getButterfly();
+ tButterfly.getGenome()
+ .getPrimary()
+ .getRoot()
+ .getBreedingTracker(aEntity.worldObj, aPlayer.getGameProfile())
+ .registerCatch(tButterfly);
aPlayer.worldObj.spawnEntityInWorld(
new EntityItem(
aPlayer.worldObj,
aEntity.posX,
aEntity.posY,
aEntity.posZ,
- ((IButterfly) tButterfly).getGenome()
- .getPrimary()
- .getRoot()
- .getMemberStack(
- ((IButterfly) tButterfly).copy(),
- EnumFlutterType.BUTTERFLY.ordinal())));
+ tButterfly.getGenome()
+ .getPrimary()
+ .getRoot()
+ .getMemberStack(tButterfly.copy(), EnumFlutterType.BUTTERFLY.ordinal())));
aEntity.setDead();
}
return true;