aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities/machines/basic
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/tileentities/machines/basic
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/tileentities/machines/basic')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java3
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java32
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java50
4 files changed, 39 insertions, 48 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java
index 28caaef181..f273197026 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java
@@ -59,8 +59,7 @@ public class GT_MetaTileEntity_Charger extends GT_MetaTileEntity_BasicBatteryBuf
super.onPostTick(aBaseMetaTileEntity, aTick);
if (this.getBaseMetaTileEntity() instanceof BaseMetaTileEntity) {
BaseMetaTileEntity mBaseMetaTileEntity = (BaseMetaTileEntity) getBaseMetaTileEntity();
- if (mBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity) {
- MetaTileEntity mMetaTileEntity = (MetaTileEntity) mBaseMetaTileEntity.getMetaTileEntity();
+ if (mBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity mMetaTileEntity) {
// for (int t = 0; t < 6; t++) {
if (mMetaTileEntity.dechargerSlotCount() > 0
&& mBaseMetaTileEntity.getStoredEU() < mBaseMetaTileEntity.getEUCapacity()) {
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java
index 71b01f4cc2..444121cc79 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java
@@ -47,7 +47,7 @@ public class GT_MetaTileEntity_Printer extends GT_MetaTileEntity_BasicMachine {
tList.add(tList.get(0));
int i = 0;
for (int j = tList.size() - 1; i < j; i++) {
- if (GT_Utility.areStacksEqual(getInputAt(0), (ItemStack) tList.get(i))) {
+ if (GT_Utility.areStacksEqual(getInputAt(0), tList.get(i))) {
this.mOutputItems[0] = GT_Utility.copyAmount(1L, tList.get(i + 1));
calculateOverclockedNess(1, 32);
// In case recipe is too OP for that machine
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java
index 18929fcb55..021511032b 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java
@@ -154,7 +154,7 @@ public class GT_MetaTileEntity_SeismicProspector extends GT_MetaTileEntity_Basic
&& aStack.getItem() == ItemList.Tool_DataStick.getItem()) {
this.ready = false;
GT_Utility.ItemNBT.setBookTitle(aPlayer.getCurrentEquippedItem(), "Raw Prospection Data");
- List<String> tStringList = new ArrayList<String>();
+ List<String> tStringList = new ArrayList<>();
// range by tier
int min = -range();
@@ -238,26 +238,20 @@ public class GT_MetaTileEntity_SeismicProspector extends GT_MetaTileEntity_Basic
}
private int range() {
- switch (mTier) {
- case 1:
- return 16;
- case 2:
- return 32;
- case 3:
- return 48;
- }
- return 0;
+ return switch (mTier) {
+ case 1 -> 16;
+ case 2 -> 32;
+ case 3 -> 48;
+ default -> 0;
+ };
}
private int step() {
- switch (mTier) {
- case 1:
- return 1;
- case 2:
- return 3;
- case 3:
- return 4;
- }
- return 1;
+ return switch (mTier) {
+ case 1 -> 1;
+ case 2 -> 3;
+ case 3 -> 4;
+ default -> 1;
+ };
}
}
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
index 210c55578f..08b5897298 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
@@ -111,8 +111,7 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank
if ((aEntity instanceof EntityWeatherEffect)) {
return -1.0F;
}
- if ((aEntity instanceof EntityPlayer)) {
- EntityPlayer tPlayer = (EntityPlayer) aEntity;
+ if ((aEntity instanceof EntityPlayer tPlayer)) {
int tCount = 64;
for (int i = 0; i < 36; i++) {
if (tPlayer.inventory.getStackInSlot(i) != null) {
@@ -366,32 +365,31 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank
}
}
}
- List entities_in_box = getBaseMetaTileEntity().getWorld()
- .getEntitiesWithinAABB(
- Entity.class,
- AxisAlignedBB.getBoundingBox(
- getBaseMetaTileEntity().getOffsetX(
- getBaseMetaTileEntity().getFrontFacing(),
- 2) - 1,
- getBaseMetaTileEntity().getOffsetY(
- getBaseMetaTileEntity().getFrontFacing(),
- 2) - 1,
- getBaseMetaTileEntity().getOffsetZ(
- getBaseMetaTileEntity().getFrontFacing(),
- 2) - 1,
- getBaseMetaTileEntity().getOffsetX(
- getBaseMetaTileEntity().getFrontFacing(),
- 2) + 2,
- getBaseMetaTileEntity().getOffsetY(
- getBaseMetaTileEntity().getFrontFacing(),
- 2) + 2,
- getBaseMetaTileEntity().getOffsetZ(
- getBaseMetaTileEntity().getFrontFacing(),
- 2) + 2));
+ List<Entity> entities_in_box = getBaseMetaTileEntity().getWorld()
+ .getEntitiesWithinAABB(
+ Entity.class,
+ AxisAlignedBB.getBoundingBox(
+ getBaseMetaTileEntity().getOffsetX(
+ getBaseMetaTileEntity().getFrontFacing(),
+ 2) - 1,
+ getBaseMetaTileEntity().getOffsetY(
+ getBaseMetaTileEntity().getFrontFacing(),
+ 2) - 1,
+ getBaseMetaTileEntity().getOffsetZ(
+ getBaseMetaTileEntity().getFrontFacing(),
+ 2) - 1,
+ getBaseMetaTileEntity().getOffsetX(
+ getBaseMetaTileEntity().getFrontFacing(),
+ 2) + 2,
+ getBaseMetaTileEntity().getOffsetY(
+ getBaseMetaTileEntity().getFrontFacing(),
+ 2) + 2,
+ getBaseMetaTileEntity().getOffsetZ(
+ getBaseMetaTileEntity().getFrontFacing(),
+ 2) + 2));
for (Object tObject : entities_in_box) {
- if (((tObject instanceof Entity)) && (!((Entity) tObject).isDead)) {
- Entity tEntity = (Entity) tObject;
+ if (((tObject instanceof Entity tEntity)) && (!((Entity) tObject).isDead)) {
// GT_FML_LOGGER.info("teleport"+(Math.pow(tDistance, 1.5)));
if (getBaseMetaTileEntity().decreaseStoredEnergyUnits(
(long) (Math.pow(tDistance, 1.5) * weightCalculation(tEntity) * sFPowerMultiplyer),