aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authorAlexdoru <57050655+Alexdoru@users.noreply.github.com>2024-10-02 07:31:08 +0200
committerGitHub <noreply@github.com>2024-10-02 05:31:08 +0000
commit3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3 (patch)
tree107d9d2442891990ef1cdef1d8bb2df6bb96952a /src/main/java/gregtech/common
parentbfc7b2b07f72d0903a70791ff96f9c837ddd5ff0 (diff)
downloadGT5-Unofficial-3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3.tar.gz
GT5-Unofficial-3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3.tar.bz2
GT5-Unofficial-3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3.zip
Cleanup the codebase (#3311)
Co-authored-by: boubou19 <miisterunknown@gmail.com>
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/GTProxy.java6
-rw-r--r--src/main/java/gregtech/common/GTWorldgenerator.java8
-rw-r--r--src/main/java/gregtech/common/Pollution.java4
-rw-r--r--src/main/java/gregtech/common/WorldgenGTOreLayer.java2
-rw-r--r--src/main/java/gregtech/common/WorldgenGTOreSmallPieces.java2
-rw-r--r--src/main/java/gregtech/common/WorldgenStone.java4
-rw-r--r--src/main/java/gregtech/common/blocks/BlockGlass1.java2
-rw-r--r--src/main/java/gregtech/common/blocks/BlockMachines.java2
-rw-r--r--src/main/java/gregtech/common/blocks/BlockOresAbstract.java2
-rw-r--r--src/main/java/gregtech/common/blocks/ItemMachines.java2
-rw-r--r--src/main/java/gregtech/common/covers/CoverConveyor.java6
-rw-r--r--src/main/java/gregtech/common/covers/CoverDoesWork.java9
-rw-r--r--src/main/java/gregtech/common/covers/CoverFluidRegulator.java3
-rw-r--r--src/main/java/gregtech/common/covers/CoverPump.java6
-rw-r--r--src/main/java/gregtech/common/covers/redstone/CoverWirelessDoesWorkDetector.java3
-rw-r--r--src/main/java/gregtech/common/gui/modularui/widget/TextButtonWidget.java4
-rw-r--r--src/main/java/gregtech/common/items/behaviors/BehaviourDataOrb.java2
-rw-r--r--src/main/java/gregtech/common/items/behaviors/BehaviourSwitchMode.java3
-rw-r--r--src/main/java/gregtech/common/render/BlackholeRenderer.java2
-rw-r--r--src/main/java/gregtech/common/render/FluidDisplayStackRenderer.java2
-rw-r--r--src/main/java/gregtech/common/render/GTRendererBlock.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/casings/upgrade/Inventory.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/casings/upgrade/Tank.java4
-rw-r--r--src/main/java/gregtech/common/tileentities/generators/MTEMagicalEnergyAbsorber.java10
-rw-r--r--src/main/java/gregtech/common/tileentities/generators/MTENaquadahReactor.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/generators/MTESteamTurbine.java1
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/IDualInputHatch.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/ISmartInputHatch.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/MTEHatchCraftingInputME.java14
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputBusME.java5
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputME.java5
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/MTEPump.java4
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/MTETurboCharger.java6
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/MTEWorldAccelerator.java10
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineBase.java10
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineFluid.java10
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineItem.java10
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialElectromagneticSeparator.java4
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialLaserEngraver.java5
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTELargeFluidExtractor.java11
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbine.java3
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineGas.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineGasAdvanced.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbinePlasma.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineSteam.java1
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiAutoclave.java5
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiCanner.java3
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiLathe.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiSolidifier.java8
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java6
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTEPlasmaForge.java8
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTEWormholeGenerator.java27
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEBlackHoleCompressor.java4
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/drone/MTEDroneCentre.java3
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationPlant.java6
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitDegasser.java22
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multiblock/DistillationTower.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/storage/MTEDigitalChestBase.java2
58 files changed, 131 insertions, 170 deletions
diff --git a/src/main/java/gregtech/common/GTProxy.java b/src/main/java/gregtech/common/GTProxy.java
index 659c626e2f..01d6315ebf 100644
--- a/src/main/java/gregtech/common/GTProxy.java
+++ b/src/main/java/gregtech/common/GTProxy.java
@@ -1816,7 +1816,7 @@ public abstract class GTProxy implements IGTMod, IFuelHandler {
return;
}
String tName = aEvent.Name.replaceFirst(aPrefix.toString(), "");
- if (tName.length() > 0) {
+ if (!tName.isEmpty()) {
char firstChar = tName.charAt(0);
if (Character.isUpperCase(firstChar) || Character.isLowerCase(firstChar)
|| firstChar == '_'
@@ -2197,7 +2197,7 @@ public abstract class GTProxy implements IGTMod, IFuelHandler {
&& ((this.mItemDespawnTime != 6000) || (this.mMaxEqualEntitiesAtOneSpot > 0))) {
long startTime = System.nanoTime();
double oldX = 0, oldY = 0, oldZ = 0;
- if (debugEntityCramming && (aEvent.world.loadedEntityList.size() != 0)) {
+ if (debugEntityCramming && (!aEvent.world.loadedEntityList.isEmpty())) {
GTLog.out.println("CRAM: Entity list size " + aEvent.world.loadedEntityList.size());
}
for (int i = 0; i < aEvent.world.loadedEntityList.size(); i++) {
@@ -2247,7 +2247,7 @@ public abstract class GTProxy implements IGTMod, IFuelHandler {
}
}
}
- if (debugEntityCramming && (aEvent.world.loadedEntityList.size() != 0)) {
+ if (debugEntityCramming && (!aEvent.world.loadedEntityList.isEmpty())) {
GTLog.out.println(
"CRAM: Time spent checking " + (System.nanoTime() - startTime) / 1000 + " microseconds");
}
diff --git a/src/main/java/gregtech/common/GTWorldgenerator.java b/src/main/java/gregtech/common/GTWorldgenerator.java
index 14073d3325..17cba34369 100644
--- a/src/main/java/gregtech/common/GTWorldgenerator.java
+++ b/src/main/java/gregtech/common/GTWorldgenerator.java
@@ -204,7 +204,7 @@ public class GTWorldgenerator implements IWorldGenerator {
public enum OregenPattern {
// The last value is used when creating a new world
AXISSYMMETRICAL,
- EQUAL_SPACING;
+ EQUAL_SPACING
}
public static class WorldGenContainer implements Runnable {
@@ -326,7 +326,7 @@ public class GTWorldgenerator implements IWorldGenerator {
// Search for a valid orevein for this dimension
if (!validOreveins.containsKey(oreveinSeed)) {
if ((oreveinPercentageRoll < oreveinPercentage) && (WorldgenGTOreLayer.sWeight > 0)
- && (WorldgenGTOreLayer.sList.size() > 0)) {
+ && (!WorldgenGTOreLayer.sList.isEmpty())) {
int placementAttempts = 0;
boolean oreveinFound = false;
int i;
@@ -549,7 +549,7 @@ public class GTWorldgenerator implements IWorldGenerator {
}
// Now process each oreseed vs this requested chunk
- for (; seedList.size() != 0; seedList.remove(0)) {
+ for (; !seedList.isEmpty(); seedList.remove(0)) {
if (debugWorldGen)
GTLog.out.println("Processing seed x=" + seedList.get(0).mX + " z=" + seedList.get(0).mZ);
worldGenFindVein(seedList.get(0).mX, seedList.get(0).mZ);
@@ -593,7 +593,7 @@ public class GTWorldgenerator implements IWorldGenerator {
short secondaryMeta = 0;
short betweenMeta = 0;
short sporadicMeta = 0;
- if ((WorldgenGTOreLayer.sWeight > 0) && (WorldgenGTOreLayer.sList.size() > 0)) {
+ if ((WorldgenGTOreLayer.sWeight > 0) && (!WorldgenGTOreLayer.sList.isEmpty())) {
boolean temp = true;
int tRandomWeight;
for (int i = 0; (i < oreveinAttempts) && (temp); i++) {
diff --git a/src/main/java/gregtech/common/Pollution.java b/src/main/java/gregtech/common/Pollution.java
index 928b944142..4245a0ef12 100644
--- a/src/main/java/gregtech/common/Pollution.java
+++ b/src/main/java/gregtech/common/Pollution.java
@@ -107,13 +107,13 @@ public class Pollution {
// make a snapshot of what to work on
pollutionList = new ArrayList<>(pollutedChunks);
// set operations per tick
- if (pollutionList.size() > 0) operationsPerTick = Math.max(1, pollutionList.size() / cycleLen);
+ if (!pollutionList.isEmpty()) operationsPerTick = Math.max(1, pollutionList.size() / cycleLen);
else operationsPerTick = 0; // SANity
blank = false;
}
for (int chunksProcessed = 0; chunksProcessed < operationsPerTick; chunksProcessed++) {
- if (pollutionList.size() == 0) break; // no more stuff to do
+ if (pollutionList.isEmpty()) break; // no more stuff to do
ChunkCoordIntPair actualPos = pollutionList.remove(pollutionList.size() - 1); // faster
// get pollution
ChunkData currentData = STORAGE.get(world, actualPos);
diff --git a/src/main/java/gregtech/common/WorldgenGTOreLayer.java b/src/main/java/gregtech/common/WorldgenGTOreLayer.java
index a8f57ef1de..2a31395a69 100644
--- a/src/main/java/gregtech/common/WorldgenGTOreLayer.java
+++ b/src/main/java/gregtech/common/WorldgenGTOreLayer.java
@@ -92,7 +92,7 @@ public class WorldgenGTOreLayer extends GTWorldgen {
if (this.mEnd) {
allowedProviders.add(WorldProviderEnd.class);
}
- mAllowedProviders = allowedProviders.toArray(new Class[allowedProviders.size()]);
+ mAllowedProviders = allowedProviders.toArray(new Class[0]);
}
@Override
diff --git a/src/main/java/gregtech/common/WorldgenGTOreSmallPieces.java b/src/main/java/gregtech/common/WorldgenGTOreSmallPieces.java
index 86d9c84e5f..4eb4eb4cce 100644
--- a/src/main/java/gregtech/common/WorldgenGTOreSmallPieces.java
+++ b/src/main/java/gregtech/common/WorldgenGTOreSmallPieces.java
@@ -59,7 +59,7 @@ public class WorldgenGTOreSmallPieces extends GTWorldgen {
if (this.mEnd) {
allowedProviders.add(WorldProviderEnd.class);
}
- mAllowedProviders = allowedProviders.toArray(new Class[allowedProviders.size()]);
+ mAllowedProviders = allowedProviders.toArray(new Class[0]);
}
@Override
diff --git a/src/main/java/gregtech/common/WorldgenStone.java b/src/main/java/gregtech/common/WorldgenStone.java
index 9533fd46e8..dd42146ea7 100644
--- a/src/main/java/gregtech/common/WorldgenStone.java
+++ b/src/main/java/gregtech/common/WorldgenStone.java
@@ -129,9 +129,9 @@ public class WorldgenStone extends GTWorldgen {
}
}
- boolean result = stones.size() != 0;
+ boolean result = !stones.isEmpty();
// Now process each oreseed vs this requested chunk
- for (; stones.size() != 0; stones.remove(0)) {
+ for (; !stones.isEmpty(); stones.remove(0)) {
int x = stones.get(0).mX * 16;
int z = stones.get(0).mZ * 16;
diff --git a/src/main/java/gregtech/common/blocks/BlockGlass1.java b/src/main/java/gregtech/common/blocks/BlockGlass1.java
index a8a287248b..6081b79d64 100644
--- a/src/main/java/gregtech/common/blocks/BlockGlass1.java
+++ b/src/main/java/gregtech/common/blocks/BlockGlass1.java
@@ -16,7 +16,7 @@ import gregtech.api.util.GTLanguageManager;
/**
* The glass is split into separate files because they are registered as regular blocks, and a regular block can have
* 16 subtypes at most.
- *
+ * <p>
* This class hosts various special types of tiered glass with not many tiers.
*/
public class BlockGlass1 extends BlockCasingsAbstract {
diff --git a/src/main/java/gregtech/common/blocks/BlockMachines.java b/src/main/java/gregtech/common/blocks/BlockMachines.java
index 4c392f8cf5..f19a986529 100644
--- a/src/main/java/gregtech/common/blocks/BlockMachines.java
+++ b/src/main/java/gregtech/common/blocks/BlockMachines.java
@@ -140,7 +140,7 @@ public class BlockMachines extends GTGenericBlock implements IDebugableBlock, IT
if (GTRendererBlock.INSTANCE == null) {
return super.getRenderType();
}
- return GTRendererBlock.INSTANCE.mRenderID;
+ return GTRendererBlock.mRenderID;
}
@Override
diff --git a/src/main/java/gregtech/common/blocks/BlockOresAbstract.java b/src/main/java/gregtech/common/blocks/BlockOresAbstract.java
index 358ae50e7f..ef17deb6c8 100644
--- a/src/main/java/gregtech/common/blocks/BlockOresAbstract.java
+++ b/src/main/java/gregtech/common/blocks/BlockOresAbstract.java
@@ -215,7 +215,7 @@ public abstract class BlockOresAbstract extends GTGenericBlock implements ITileE
if (GTRendererBlock.INSTANCE == null) {
return super.getRenderType();
}
- return GTRendererBlock.INSTANCE.mRenderID;
+ return GTRendererBlock.mRenderID;
}
@Override
diff --git a/src/main/java/gregtech/common/blocks/ItemMachines.java b/src/main/java/gregtech/common/blocks/ItemMachines.java
index f6816f468a..92f1675a44 100644
--- a/src/main/java/gregtech/common/blocks/ItemMachines.java
+++ b/src/main/java/gregtech/common/blocks/ItemMachines.java
@@ -179,7 +179,7 @@ public class ItemMachines extends ItemBlock implements IFluidContainerItem {
if (aList != null) aList.add(tTranslated);
} else {
String tTranslated = GTLanguageManager.addStringLocalization(tKey, tDescLine);
- if (aList != null) aList.add(tTranslated.equals("") ? tDescLine : tTranslated);
+ if (aList != null) aList.add(tTranslated.isEmpty() ? tDescLine : tTranslated);
}
}
}
diff --git a/src/main/java/gregtech/common/covers/CoverConveyor.java b/src/main/java/gregtech/common/covers/CoverConveyor.java
index cb2690d95b..582e0b4e0c 100644
--- a/src/main/java/gregtech/common/covers/CoverConveyor.java
+++ b/src/main/java/gregtech/common/covers/CoverConveyor.java
@@ -2,7 +2,7 @@ package gregtech.common.covers;
import static gregtech.api.util.GTUtility.moveMultipleItemStacks;
-import java.util.Arrays;
+import java.util.Collections;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
@@ -226,7 +226,7 @@ public class CoverConveyor extends CoverBehavior {
})
.dynamicTooltip(() -> {
ISerializableObject.LegacyCoverData coverData = getCoverData();
- return Arrays.asList(
+ return Collections.singletonList(
coverData == null || coverData.get() % 2 == 0
? GTUtility.trans("314", "Allow Input")
: GTUtility.trans("312", "Allow Output"));
@@ -243,7 +243,7 @@ public class CoverConveyor extends CoverBehavior {
})
.dynamicTooltip(() -> {
ISerializableObject.LegacyCoverData coverData = getCoverData();
- return Arrays.asList(
+ return Collections.singletonList(
coverData == null || coverData.get() % 2 == 0
? GTUtility.trans("313", "Block Input")
: GTUtility.trans("311", "Block Output"));
diff --git a/src/main/java/gregtech/common/covers/CoverDoesWork.java b/src/main/java/gregtech/common/covers/CoverDoesWork.java
index 1575f243ab..4998373a64 100644
--- a/src/main/java/gregtech/common/covers/CoverDoesWork.java
+++ b/src/main/java/gregtech/common/covers/CoverDoesWork.java
@@ -20,9 +20,9 @@ import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget;
public class CoverDoesWork extends CoverBehavior {
- private static int FLAG_INVERTED = 0x1;
- private static int FLAG_PROGRESS = 0x2;
- private static int FLAG_ENABLED = 0x4;
+ private static final int FLAG_INVERTED = 0x1;
+ private static final int FLAG_PROGRESS = 0x2;
+ private static final int FLAG_ENABLED = 0x4;
public CoverDoesWork(ITexture coverTexture) {
super(coverTexture);
@@ -37,8 +37,7 @@ public class CoverDoesWork extends CoverBehavior {
@Override
public int doCoverThings(ForgeDirection side, byte aInputRedstone, int aCoverID, int aCoverVariable,
ICoverable aTileEntity, long aTimer) {
- if ((aTileEntity instanceof IMachineProgress)) {
- IMachineProgress mProgress = (IMachineProgress) aTileEntity;
+ if ((aTileEntity instanceof IMachineProgress mProgress)) {
boolean inverted = isFlagSet(aCoverVariable, FLAG_INVERTED);
int signal = 0;
diff --git a/src/main/java/gregtech/common/covers/CoverFluidRegulator.java b/src/main/java/gregtech/common/covers/CoverFluidRegulator.java
index 1895df509d..98e881753a 100644
--- a/src/main/java/gregtech/common/covers/CoverFluidRegulator.java
+++ b/src/main/java/gregtech/common/covers/CoverFluidRegulator.java
@@ -91,17 +91,14 @@ public class CoverFluidRegulator extends CoverBehaviorBase<CoverFluidRegulator.F
final IFluidHandler tTank1;
final IFluidHandler tTank2;
final ForgeDirection directionFrom;
- final ForgeDirection directionTo;
if (aCoverVariable.speed > 0) {
tTank2 = aTileEntity.getITankContainerAtSide(side);
tTank1 = (IFluidHandler) aTileEntity;
directionFrom = side;
- directionTo = side.getOpposite();
} else {
tTank1 = aTileEntity.getITankContainerAtSide(side);
tTank2 = (IFluidHandler) aTileEntity;
directionFrom = side.getOpposite();
- directionTo = side;
}
if (tTank1 != null && tTank2 != null) {
allowFluid = true;
diff --git a/src/main/java/gregtech/common/covers/CoverPump.java b/src/main/java/gregtech/common/covers/CoverPump.java
index 99d39dccad..15dd1fccfc 100644
--- a/src/main/java/gregtech/common/covers/CoverPump.java
+++ b/src/main/java/gregtech/common/covers/CoverPump.java
@@ -1,6 +1,6 @@
package gregtech.common.covers;
-import java.util.Arrays;
+import java.util.Collections;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.common.util.ForgeDirection;
@@ -232,7 +232,7 @@ public class CoverPump extends CoverBehavior {
})
.dynamicTooltip(() -> {
ISerializableObject.LegacyCoverData coverData = getCoverData();
- return Arrays.asList(
+ return Collections.singletonList(
coverData == null || coverData.get() % 2 == 0
? GTUtility.trans("314", "Allow Input")
: GTUtility.trans("312", "Allow Output"));
@@ -249,7 +249,7 @@ public class CoverPump extends CoverBehavior {
})
.dynamicTooltip(() -> {
ISerializableObject.LegacyCoverData coverData = getCoverData();
- return Arrays.asList(
+ return Collections.singletonList(
coverData == null || coverData.get() % 2 == 0
? GTUtility.trans("313", "Block Input")
: GTUtility.trans("311", "Block Output"));
diff --git a/src/main/java/gregtech/common/covers/redstone/CoverWirelessDoesWorkDetector.java b/src/main/java/gregtech/common/covers/redstone/CoverWirelessDoesWorkDetector.java
index ed55280b7f..54d71d2c8b 100644
--- a/src/main/java/gregtech/common/covers/redstone/CoverWirelessDoesWorkDetector.java
+++ b/src/main/java/gregtech/common/covers/redstone/CoverWirelessDoesWorkDetector.java
@@ -43,8 +43,7 @@ public class CoverWirelessDoesWorkDetector
private static byte computeSignalBasedOnActivity(ActivityTransmitterData coverVariable, ICoverable tileEntity) {
- if (tileEntity instanceof IMachineProgress) {
- IMachineProgress mProgress = (IMachineProgress) tileEntity;
+ if (tileEntity instanceof IMachineProgress mProgress) {
boolean inverted = coverVariable.invert;
int signal = 0;
diff --git a/src/main/java/gregtech/common/gui/modularui/widget/TextButtonWidget.java b/src/main/java/gregtech/co