aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/api')
-rw-r--r--src/main/java/gregtech/api/enums/Element.java1
-rw-r--r--src/main/java/gregtech/api/enums/GTStones.java2
-rw-r--r--src/main/java/gregtech/api/enums/InventoryType.java2
-rw-r--r--src/main/java/gregtech/api/enums/ItemList.java2
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java6
-rw-r--r--src/main/java/gregtech/api/enums/MetaTileEntityIDs.java2
-rw-r--r--src/main/java/gregtech/api/enums/OreMixes.java2
-rw-r--r--src/main/java/gregtech/api/enums/SmallOres.java2
-rw-r--r--src/main/java/gregtech/api/graphs/paths/PowerNodePath.java4
-rw-r--r--src/main/java/gregtech/api/interfaces/IToolStats.java2
-rw-r--r--src/main/java/gregtech/api/items/ItemBreederCell.java4
-rw-r--r--src/main/java/gregtech/api/items/ItemRadioactiveCell.java4
-rw-r--r--src/main/java/gregtech/api/items/ItemRadioactiveCellIC.java2
-rw-r--r--src/main/java/gregtech/api/items/MetaBaseItem.java4
-rw-r--r--src/main/java/gregtech/api/items/MetaGeneratedTool.java43
-rw-r--r--src/main/java/gregtech/api/logic/AbstractProcessingLogic.java2
-rw-r--r--src/main/java/gregtech/api/logic/ComplexParallelProcessingLogic.java16
-rw-r--r--src/main/java/gregtech/api/logic/ControllerFluidLogic.java4
-rw-r--r--src/main/java/gregtech/api/logic/ControllerItemLogic.java4
-rw-r--r--src/main/java/gregtech/api/logic/FluidInventoryLogic.java13
-rw-r--r--src/main/java/gregtech/api/logic/ItemInventoryLogic.java6
-rw-r--r--src/main/java/gregtech/api/logic/PowerLogic.java2
-rw-r--r--src/main/java/gregtech/api/logic/interfaces/ProcessingLogicHost.java2
-rw-r--r--src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java4
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/MTECable.java2
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/MTEEnhancedMultiBlockBase.java2
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/MTEFluid.java2
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMaintenance.java1
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/MTEHatchOutput.java2
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java6
-rw-r--r--src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java1
-rw-r--r--src/main/java/gregtech/api/multitileentity/MultiTileEntityItem.java2
-rw-r--r--src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java15
-rw-r--r--src/main/java/gregtech/api/multitileentity/interfaces/SyncedMultiTileEntity.java2
-rw-r--r--src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java3
-rw-r--r--src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java7
-rw-r--r--src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java7
-rw-r--r--src/main/java/gregtech/api/multitileentity/multiblock/base/StackableModularController.java2
-rw-r--r--src/main/java/gregtech/api/multitileentity/multiblock/base/WallShareablePart.java4
-rw-r--r--src/main/java/gregtech/api/net/GTPacketSendOregenPattern.java9
-rw-r--r--src/main/java/gregtech/api/objects/GTChunkManager.java2
-rw-r--r--src/main/java/gregtech/api/objects/ItemData.java2
-rw-r--r--src/main/java/gregtech/api/objects/MaterialStack.java2
-rw-r--r--src/main/java/gregtech/api/objects/blockupdate/BlockUpdateHandler.java8
-rw-r--r--src/main/java/gregtech/api/objects/blockupdate/RandomCooldown.java4
-rw-r--r--src/main/java/gregtech/api/util/AssemblyLineUtils.java2
-rw-r--r--src/main/java/gregtech/api/util/AveragePerTickCounter.java10
-rw-r--r--src/main/java/gregtech/api/util/GTBaseCrop.java5
-rw-r--r--src/main/java/gregtech/api/util/GTMusicSystem.java6
-rw-r--r--src/main/java/gregtech/api/util/GTOreDictUnificator.java2
-rw-r--r--src/main/java/gregtech/api/util/GTStructureUtility.java2
-rw-r--r--src/main/java/gregtech/api/util/GTTooltipDataCache.java2
-rw-r--r--src/main/java/gregtech/api/util/GTUtil.java4
-rw-r--r--src/main/java/gregtech/api/util/GTUtility.java42
-rw-r--r--src/main/java/gregtech/api/util/GTWaila.java17
-rw-r--r--src/main/java/gregtech/api/util/GT_StructureUtilityMuTE.java5
-rw-r--r--src/main/java/gregtech/api/util/GasSpargingRecipe.java37
-rw-r--r--src/main/java/gregtech/api/util/HatchElementBuilder.java2
-rw-r--r--src/main/java/gregtech/api/util/MultiblockTooltipBuilder.java5
-rw-r--r--src/main/java/gregtech/api/util/OverclockCalculator.java3
-rw-r--r--src/main/java/gregtech/api/util/TurbineStatCalculator.java6
-rw-r--r--src/main/java/gregtech/api/world/GTWorldgen.java5
62 files changed, 164 insertions, 211 deletions
diff --git a/src/main/java/gregtech/api/enums/Element.java b/src/main/java/gregtech/api/enums/Element.java
index 0931663b0b..3eaacb01f4 100644
--- a/src/main/java/gregtech/api/enums/Element.java
+++ b/src/main/java/gregtech/api/enums/Element.java
@@ -287,7 +287,6 @@ public enum Element {
* Links to every pure Material containing just this Element.
*/
// bartworks.system.material.werkstoff_loaders.registration.BridgeMaterialsLoader reassigns it, so no final here
- @SuppressWarnings("NonFinalFieldInEnum")
public ArrayList<Materials> mLinkedMaterials = new ArrayList<>();
/**
diff --git a/src/main/java/gregtech/api/enums/GTStones.java b/src/main/java/gregtech/api/enums/GTStones.java
index af14301a5d..2a9aeca409 100644
--- a/src/main/java/gregtech/api/enums/GTStones.java
+++ b/src/main/java/gregtech/api/enums/GTStones.java
@@ -387,7 +387,7 @@ public enum GTStones {
public final StoneBuilder stone;
- private GTStones(StoneBuilder stone) {
+ GTStones(StoneBuilder stone) {
this.stone = stone;
}
diff --git a/src/main/java/gregtech/api/enums/InventoryType.java b/src/main/java/gregtech/api/enums/InventoryType.java
index f8e3c47741..5092738174 100644
--- a/src/main/java/gregtech/api/enums/InventoryType.java
+++ b/src/main/java/gregtech/api/enums/InventoryType.java
@@ -3,5 +3,5 @@ package gregtech.api.enums;
public enum InventoryType {
Input,
Output,
- Both;
+ Both
}
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index 52e3484156..540b8bf37d 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -2724,7 +2724,7 @@ public enum ItemList implements IItemContainer {
StringBuilder tCamelCasedDisplayNameBuilder = new StringBuilder();
final String[] tDisplayNameWords = aDisplayName.split("\\W");
for (String tWord : tDisplayNameWords) {
- if (tWord.length() > 0) tCamelCasedDisplayNameBuilder.append(
+ if (!tWord.isEmpty()) tCamelCasedDisplayNameBuilder.append(
tWord.substring(0, 1)
.toUpperCase(Locale.US));
if (tWord.length() > 1) tCamelCasedDisplayNameBuilder.append(
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 95463122f1..9a2c5b5125 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -2792,7 +2792,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
public long getProtons() {
if (mElement != null) return mElement.getProtons();
- if (mMaterialList.size() == 0) return Element.Tc.getProtons();
+ if (mMaterialList.isEmpty()) return Element.Tc.getProtons();
long rAmount = 0, tAmount = 0;
for (MaterialStack tMaterial : mMaterialList) {
tAmount += tMaterial.mAmount;
@@ -2803,7 +2803,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
public long getNeutrons() {
if (mElement != null) return mElement.getNeutrons();
- if (mMaterialList.size() == 0) return Element.Tc.getNeutrons();
+ if (mMaterialList.isEmpty()) return Element.Tc.getNeutrons();
long rAmount = 0, tAmount = 0;
for (MaterialStack tMaterial : mMaterialList) {
tAmount += tMaterial.mAmount;
@@ -2814,7 +2814,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
public long getMass() {
if (mElement != null) return mElement.getMass();
- if (mMaterialList.size() == 0) return Element.Tc.getMass();
+ if (mMaterialList.isEmpty()) return Element.Tc.getMass();
long rAmount = 0, tAmount = 0;
for (MaterialStack tMaterial : mMaterialList) {
tAmount += tMaterial.mAmount;
diff --git a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java
index c3cbbb02cf..3cebf19b0f 100644
--- a/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java
+++ b/src/main/java/gregtech/api/enums/MetaTileEntityIDs.java
@@ -1952,7 +1952,7 @@ public enum MetaTileEntityIDs {
public final int ID;
- private MetaTileEntityIDs(int ID) {
+ MetaTileEntityIDs(int ID) {
this.ID = ID;
}
}
diff --git a/src/main/java/gregtech/api/enums/OreMixes.java b/src/main/java/gregtech/api/enums/OreMixes.java
index 8c9800ba00..034e73763e 100644
--- a/src/main/java/gregtech/api/enums/OreMixes.java
+++ b/src/main/java/gregtech/api/enums/OreMixes.java
@@ -1003,7 +1003,7 @@ public enum OreMixes {
public final OreMixBuilder oreMixBuilder;
- private OreMixes(OreMixBuilder oreMixBuilder) {
+ OreMixes(OreMixBuilder oreMixBuilder) {
this.oreMixBuilder = oreMixBuilder;
}
diff --git a/src/main/java/gregtech/api/enums/SmallOres.java b/src/main/java/gregtech/api/enums/SmallOres.java
index 3cd15b5f86..ec11c211c2 100644
--- a/src/main/java/gregtech/api/enums/SmallOres.java
+++ b/src/main/java/gregtech/api/enums/SmallOres.java
@@ -541,7 +541,7 @@ public enum SmallOres {
public final SmallOreBuilder smallOreBuilder;
- private SmallOres(gregtech.common.SmallOreBuilder smallOreBuilder) {
+ SmallOres(gregtech.common.SmallOreBuilder smallOreBuilder) {
this.smallOreBuilder = smallOreBuilder;
}
diff --git a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java
index e9421056af..60bd4c9017 100644
--- a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java
+++ b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java
@@ -20,8 +20,8 @@ public class PowerNodePath extends NodePath {
int mTick = 0;
boolean mCountUp = true;
- private AveragePerTickCounter avgAmperageCounter = new AveragePerTickCounter(TickTime.SECOND);
- private AveragePerTickCounter avgVoltageCounter = new AveragePerTickCounter(TickTime.SECOND);
+ private final AveragePerTickCounter avgAmperageCounter = new AveragePerTickCounter(TickTime.SECOND);
+ private final AveragePerTickCounter avgVoltageCounter = new AveragePerTickCounter(TickTime.SECOND);
public PowerNodePath(MetaPipeEntity[] aCables) {
super(aCables);
diff --git a/src/main/java/gregtech/api/interfaces/IToolStats.java b/src/main/java/gregtech/api/interfaces/IToolStats.java
index 6f506a6ee1..64fc81196c 100644
--- a/src/main/java/gregtech/api/interfaces/IToolStats.java
+++ b/src/main/java/gregtech/api/interfaces/IToolStats.java
@@ -198,7 +198,7 @@ public interface IToolStats {
default String getToolTypeName() {
return null;
- };
+ }
default byte getMaxMode() {
return 1;
diff --git a/src/main/java/gregtech/api/items/ItemBreederCell.java b/src/main/java/gregtech/api/items/ItemBreederCell.java
index 33a4ce3253..9b3fcb630c 100644
--- a/src/main/java/gregtech/api/items/ItemBreederCell.java
+++ b/src/main/java/gregtech/api/items/ItemBreederCell.java
@@ -92,8 +92,8 @@ public class ItemBreederCell extends GTGenericItem implements IReactorComponent
aList.add(
String.format(
transItem("020", "Progress: %s/%s"),
- "" + color2 + formatNumbers(aStack.getItemDamage()) + EnumChatFormatting.RESET,
- "" + formatNumbers(getMaxDamage())));
+ color2 + formatNumbers(aStack.getItemDamage()) + EnumChatFormatting.RESET,
+ formatNumbers(getMaxDamage())));
if (aStack.getItemDamage() > 0) aList.add(EnumChatFormatting.RED + transItem("021", "Radiation Hazard"));
}
diff --git a/src/main/java/gregtech/api/items/ItemRadioactiveCell.java b/src/main/java/gregtech/api/items/ItemRadioactiveCell.java
index 6efc652ef9..c91a8dd1fa 100644
--- a/src/main/java/gregtech/api/items/ItemRadioactiveCell.java
+++ b/src/main/java/gregtech/api/items/ItemRadioactiveCell.java
@@ -148,8 +148,8 @@ public class ItemRadioactiveCell extends GTGenericItem implements IBoxable {
aList.add(
color1 + String.format(
transItem("001", "Durability: %s/%s"),
- "" + color2 + formatNumbers(this.maxDmg - getDurabilityOfStack(aStack)) + color1,
- "" + formatNumbers(this.maxDmg)));
+ color2 + formatNumbers(this.maxDmg - getDurabilityOfStack(aStack)) + color1,
+ formatNumbers(this.maxDmg)));
}
@Override
diff --git a/src/main/java/gregtech/api/items/ItemRadioactiveCellIC.java b/src/main/java/gregtech/api/items/ItemRadioactiveCellIC.java
index de60fe9c33..751ead1d74 100644
--- a/src/main/java/gregtech/api/items/ItemRadioactiveCellIC.java
+++ b/src/main/java/gregtech/api/items/ItemRadioactiveCellIC.java
@@ -112,7 +112,7 @@ public class ItemRadioactiveCellIC extends ItemRadioactiveCell implements IReact
checkHeatAcceptor(reactor, x, y - 1, heatAcceptors);
checkHeatAcceptor(reactor, x, y + 1, heatAcceptors);
heat = Math.round(heat * sHeat);
- while ((heatAcceptors.size() > 0) && (heat > 0)) {
+ while ((!heatAcceptors.isEmpty()) && (heat > 0)) {
int dheat = heat / heatAcceptors.size();
heat -= dheat;
diff --git a/src/main/java/gregtech/api/items/MetaBaseItem.java b/src/main/java/gregtech/api/items/MetaBaseItem.java
index fa47043fcc..7369d5d1b2 100644
--- a/src/main/java/gregtech/api/items/MetaBaseItem.java
+++ b/src/main/java/gregtech/api/items/MetaBaseItem.java
@@ -262,8 +262,8 @@ public abstract class MetaBaseItem extends GTGenericItem
aList.add(
EnumChatFormatting.BLUE + String.format(
transItem("013", "%sL / %sL"),
- "" + (tFluid == null ? 0 : formatNumbers(tFluid.amount)),
- "" + formatNumbers(tStats[0])) + EnumChatFormatting.GRAY);
+ tFluid == null ? 0 : formatNumbers(tFluid.amount),
+ formatNumbers(tStats[0])) + EnumChatFormatting.GRAY);
}
ArrayList<IItemBehaviour<MetaBaseItem>> behaviours = mItemBehaviors.get((short) getDamage(aStack));
diff --git a/src/main/java/gregtech/api/items/MetaGeneratedTool.java b/src/main/java/gregtech/api/items/MetaGeneratedTool.java
index dd3d50b739..eaa1fe7c8d 100644
--- a/src/main/java/gregtech/api/items/MetaGeneratedTool.java
+++ b/src/main/java/gregtech/api/items/MetaGeneratedTool.java
@@ -100,7 +100,7 @@ public abstract class MetaGeneratedTool extends MetaBaseItem
/* ---------- FOR ADDING CUSTOM ITEMS INTO THE REMAINING 766 RANGE ---------- */
- public static final Materials getPrimaryMaterial(ItemStack aStack) {
+ public static Materials getPrimaryMaterial(ItemStack aStack) {
NBTTagCompound aNBT = aStack.getTagCompound();
if (aNBT != null) {
aNBT = aNBT.getCompoundTag("GT.ToolStats");
@@ -109,7 +109,7 @@ public abstract class MetaGeneratedTool extends MetaBaseItem
return Materials._NULL;
}
- public static final Materials getSecondaryMaterial(ItemStack aStack) {
+ public static Materials getSecondaryMaterial(ItemStack aStack) {
NBTTagCompound aNBT = aStack.getTagCompound();
if (aNBT != null) {
aNBT = aNBT.getCompoundTag("GT.ToolStats");
@@ -120,7 +120,7 @@ public abstract class MetaGeneratedTool extends MetaBaseItem
/* ---------- INTERNAL OVERRIDES ---------- */
- public static final long getToolMaxDamage(ItemStack aStack) {
+ public static long getToolMaxDamage(ItemStack aStack) {
NBTTagCompound aNBT = aStack.getTagCompound();
if (aNBT != null) {
aNBT = aNBT.getCompoundTag("GT.ToolStats");
@@ -129,7 +129,7 @@ public abstract class MetaGeneratedTool extends MetaBaseItem
return 0;
}
- public static final long getToolDamage(ItemStack aStack) {
+ public static long getToolDamage(ItemStack aStack) {
NBTTagCompound aNBT = aStack.getTagCompound();
if (aNBT != null) {
aNBT = aNBT.getCompoundTag("GT.ToolStats");
@@ -138,7 +138,7 @@ public abstract class MetaGeneratedTool extends MetaBaseItem
return 0;
}
- public static final boolean setToolDamage(ItemStack aStack, long aDamage) {
+ public static boolean setToolDamage(ItemStack aStack, long aDamage) {
NBTTagCompound aNBT = aStack.getTagCompound();
if (aNBT != null) {
aNBT = aNBT.getCompoundTag("GT.ToolStats");
@@ -150,7 +150,7 @@ public abstract class MetaGeneratedTool extends MetaBaseItem
return false;
}
- public static final boolean setToolMode(ItemStack aStack, byte aMode) {
+ public static boolean setToolMode(ItemStack aStack, byte aMode) {
NBTTagCompound aNBT = aStack.getTagCompound();
if (aNBT != null) {
aNBT = aNBT.getCompoundTag("GT.ToolStats");
@@ -162,7 +162,7 @@ public abstract class MetaGeneratedTool extends MetaBaseItem
return false;
}
- public static final byte getToolMode(ItemStack aStack) {
+ public static byte getToolMode(ItemStack aStack) {
NBTTagCompound aNBT = aStack.getTagCompound();
if (aNBT != null) {
aNBT = aNBT.getCompoundTag("GT.ToolStats");
@@ -431,13 +431,12 @@ public abstract class MetaGeneratedTool extends MetaBaseItem
TurbineStatCalculator turbine = new TurbineStatCalculator((MetaGeneratedTool) aStack.getItem(), aStack);
// It was noted by IntelliJ that replacing ((GT_MetaGenerated_Tool) aStack.getItem()) with
// GT_MetaGenerated_Tool can have side effects. This refactoring will need tests.
- @SuppressWarnings("AccessStaticViaInstance")
float aOptFlow = (Math.max(Float.MIN_NORMAL, turbine.getOptimalFlow()));
aList.add(
tOffset + 0,
EnumChatFormatting.GRAY + String.format(
transItem("001", "Durability: %s/%s"),
- "" + EnumChatFormatting.GREEN + formatNumbers(turbine.getCurrentDurability()) + " ",
+ EnumChatFormatting.GREEN + formatNumbers(turbine.getCurrentDurability()) + " ",
" " + formatNumbers(turbine.getMaxDurability())) + EnumChatFormatting.GRAY);
aList.add(
tOffset + 1,
@@ -463,10 +462,10 @@ public abstract class MetaGeneratedTool extends MetaBaseItem
+ " | "
+ String.format(
"%s L/t > %s EU/t | %s",
- "" + EnumChatFormatting.GOLD
+ EnumChatFormatting.GOLD
+ formatNumbers(GTUtility.safeInt((long) (turbine.getOptimalSteamFlow())))
+ EnumChatFormatting.GRAY,
- "" + EnumChatFormatting.DARK_GREEN
+ EnumChatFormatting.DARK_GREEN
+ formatNumbers(GTUtility.safeInt((long) (turbine.getOptimalSteamEUt())))
+ EnumChatFormatting.GRAY,
"" + EnumChatFormatting.BLUE
@@ -480,10 +479,10 @@ public abstract class MetaGeneratedTool extends MetaBaseItem
+ " | "
+ String.format(
"%s L/t > %s EU/t | %s",
- "" + EnumChatFormatting.GOLD
+ EnumChatFormatting.GOLD
+ formatNumbers(GTUtility.safeInt((long) (turbine.getOptimalLooseSteamFlow())))
+ EnumChatFormatting.GRAY,
- "" + EnumChatFormatting.DARK_GREEN
+ EnumChatFormatting.DARK_GREEN
+ formatNumbers(GTUtility.safeInt((long) (turbine.getOptimalLooseSteamEUt())))
+ EnumChatFormatting.GRAY,
"" + EnumChatFormatting.BLUE
@@ -500,10 +499,10 @@ public abstract class MetaGeneratedTool extends MetaBaseItem
+ " | "
+ String.format(
"%s EU/t > %s EU/t | %s",
- "" + EnumChatFormatting.GOLD
+ EnumChatFormatting.GOLD
+ formatNumbers(GTUtility.safeInt((long) (turbine.getOptimalGasFlow())))
+ EnumChatFormatting.GRAY,
- "" + EnumChatFormatting.DARK_GREEN
+ EnumChatFormatting.DARK_GREEN
+ formatNumbers(GTUtility.safeInt((long) (turbine.getOptimalGasEUt())))
+ EnumChatFormatting.GRAY,
"" + EnumChatFormatting.BLUE
@@ -517,10 +516,10 @@ public abstract class MetaGeneratedTool extends MetaBaseItem
+ " | "
+ String.format(
"%s EU/t > %s EU/t | %s",
- "" + EnumChatFormatting.GOLD
+ EnumChatFormatting.GOLD
+ formatNumbers(GTUtility.safeInt((long) (turbine.getOptimalLooseGasFlow())))
+ EnumChatFormatting.GRAY,
- "" + EnumChatFormatting.DARK_GREEN
+ EnumChatFormatting.DARK_GREEN
+ formatNumbers(GTUtility.safeInt((long) (turbine.getOptimalLooseGasEUt())))
+ EnumChatFormatting.GRAY,
"" + EnumChatFormatting.BLUE
@@ -534,10 +533,10 @@ public abstract class MetaGeneratedTool extends MetaBaseItem
+ " | "
+ String.format(
"%s EU/t > %s EU/t | %s",
- "" + EnumChatFormatting.GOLD
+ EnumChatFormatting.GOLD
+ formatNumbers(GTUtility.safeInt((long) (turbine.getOptimalPlasmaFlow())))
+ EnumChatFormatting.GRAY,
- "" + EnumChatFormatting.DARK_GREEN
+ EnumChatFormatting.DARK_GREEN
+ formatNumbers(GTUtility.safeInt((long) (turbine.getOptimalPlasmaEUt())))
+ EnumChatFormatting.GRAY,
"" + EnumChatFormatting.BLUE
@@ -551,10 +550,10 @@ public abstract class MetaGeneratedTool extends MetaBaseItem
+ " | "
+ String.format(
"%s EU/t > %s EU/t | %s",
- "" + EnumChatFormatting.GOLD
+ EnumChatFormatting.GOLD
+ formatNumbers(GTUtility.safeInt((long) (turbine.getOptimalLoosePlasmaFlow())))
+ EnumChatFormatting.GRAY,
- "" + EnumChatFormatting.DARK_GREEN
+ EnumChatFormatting.DARK_GREEN
+ formatNumbers(GTUtility.safeInt((long) (turbine.getOptimalLoosePlasmaEUt())))
+ EnumChatFormatting.GRAY,
"" + EnumChatFormatting.BLUE
@@ -571,7 +570,7 @@ public abstract class MetaGeneratedTool extends MetaBaseItem
tOffset,
EnumChatFormatting.WHITE + String.format(
transItem("001", "Durability: %s/%s"),
- "" + EnumChatFormatting.GREEN + formatNumbers(tMaxDamage - getToolDamage(aStack)) + " ",
+ EnumChatFormatting.GREEN + formatNumbers(tMaxDamage - getToolDamage(aStack)) + " ",
" " + formatNumbers(tMaxDamage)) + EnumChatFormatting.GRAY);
aList.add(
tOffset + 1,
diff --git a/src/main/java/gregtech/api/logic/AbstractProcessingLogic.java b/src/main/java/gregtech/api/logic/AbstractProcessingLogic.java
index af86e7a9fa..57fbf22700 100644
--- a/src/main/java/gregtech/api/logic/AbstractProcessingLogic.java
+++ b/src/main/java/gregtech/api/logic/AbstractProcessingLogic.java
@@ -282,7 +282,7 @@ public abstract class AbstractProcessingLogic<P extends AbstractProcessingLogic<
/**
* Override to perform additional logic when recipe starts.
- *
+ * <p>
* This is called when the recipe processing logic has finished all
* checks, consumed all inputs, but has not yet set the outputs to
* be produced. Returning a result other than SUCCESSFUL will void
diff --git a/src/main/java/gregtech/api/logic/ComplexParallelProcessingLogic.java b/src/main/java/gregtech/api/logic/ComplexParallelProcessingLogic.java
index 72a74ebd04..91df0bb1b6 100644
--- a/src/main/java/gregtech/api/logic/ComplexParallelProcessingLogic.java
+++ b/src/main/java/gregtech/api/logic/ComplexParallelProcessingLogic.java
@@ -102,20 +102,12 @@ public class ComplexParallelProcessingLogic<P extends ComplexParallelProcessingL
calculatedEutValues = new long[maxComplexParallels];
durations = new int[maxComplexParallels];
progresses = new int[maxComplexParallels];
- for (int i = 0; i < oldOutputItems.length; i++) {
- outputItems[i] = oldOutputItems[i];
- }
- for (int i = 0; i < oldOutputFluids.length; i++) {
- outputFluids[i] = oldOutputFluids[i];
- }
- for (int i = 0; i < oldCalculatedEutValues.length; i++) {
- calculatedEutValues[i] = oldCalculatedEutValues[i];
- }
+ System.arraycopy(oldOutputItems, 0, outputItems, 0, oldOutputItems.length);
+ System.arraycopy(oldOutputFluids, 0, outputFluids, 0, oldOutputFluids.length);
+ System.arraycopy(oldCalculatedEutValues, 0, calculatedEutValues, 0, oldCalculatedEutValues.length);
for (int i = 0; i < oldDurations[i]; i++) {
durations[i] = oldDurations[i];
}
- for (int i = 0; i < oldProgresses.length; i++) {
- progresses[i] = oldProgresses[i];
- }
+ System.arraycopy(oldProgresses, 0, progresses, 0, oldProgresses.length);
}
}
diff --git a/src/main/java/gregtech/api/logic/ControllerFluidLogic.java b/src/main/java/gregtech/api/logic/ControllerFluidLogic.java
index 211c1c2982..227f7641ce 100644
--- a/src/main/java/gregtech/api/logic/ControllerFluidLogic.java
+++ b/src/main/java/gregtech/api/logic/ControllerFluidLogic.java
@@ -20,7 +20,7 @@ import org.apache.commons.lang3.tuple.Pair;
/**
* Controller logic for Fluid inventories
- *
+ *
* @author BlueWeabo
*/
public class ControllerFluidLogic {
@@ -54,7 +54,7 @@ public class ControllerFluidLogic {
@Nullable
private Pair<UUID, FluidInventoryLogic> checkIfInventoryExistsAsUnallocated(
@Nonnull FluidInventoryLogic inventory) {
- if (unallocatedInventories.size() == 0) {
+ if (unallocatedInventories.isEmpty()) {
return null;
}
return unallocatedInventories.stream()
diff --git a/src/main/java/gregtech/api/logic/ControllerItemLogic.java b/src/main/java/gregtech/api/logic/ControllerItemLogic.java
index 2863c2f49c..28cc75313a 100644
--- a/src/main/java/gregtech/api/logic/ControllerItemLogic.java
+++ b/src/main/java/gregtech/api/logic/ControllerItemLogic.java
@@ -20,7 +20,7 @@ import org.apache.commons.lang3.tuple.Pair;
/**
* Logic of the Item logic for the controller. This is controlling all of the inventories.
- *
+ *
* @author BlueWeabo
*/
public class ControllerItemLogic {
@@ -53,7 +53,7 @@ public class ControllerItemLogic {
@Nullable
private Pair<UUID, ItemInventoryLogic> checkIfInventoryExistsAsUnallocated(@Nonnull ItemInventoryLogic inventory) {
- if (unallocatedInventories.size() == 0) {
+ if (unallocatedInventories.isEmpty()) {
return null;
}
return unallocatedInventories.stream()
diff --git a/src/main/java/gregtech/api/logic/FluidInventoryLogic.java b/src/main/java/gregtech/api/logic/FluidInventoryLogic.java
index 88c0c954ec..1949a27e2a 100644
--- a/src/main/java/gregtech/api/logic/FluidInventoryLogic.java
+++ b/src/main/java/gregtech/api/logic/FluidInventoryLogic.java
@@ -3,7 +3,7 @@ package gregtech.api.logic;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import java.util.stream.Collectors;
+import java.util.Objects;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -25,7 +25,7 @@ import com.gtnewhorizons.modularui.common.widget.Scrollable;
/**
* Generic Fluid logic for MuTEs.
- *
+ *
* @author BlueWeabo
*/
public class FluidInventoryLogic {
@@ -82,7 +82,7 @@ public class FluidInventoryLogic {
}
/**
- *
+ *
* @return The Fluid Inventory Logic as an NBTTagList to be saved in another nbt as how one wants.
*/
@Nonnull
@@ -137,9 +137,8 @@ public class FluidInventoryLogic {
public FluidStack[] getStoredFluids() {
final FluidStack[] fluids = inventory.getFluids()
.stream()
- .filter(fluid -> fluid != null)
- .collect(Collectors.toList())
- .toArray(new FluidStack[0]);
+ .filter(Objects::nonNull)
+ .toArray(FluidStack[]::new);
if (fluids == null) {
return new FluidStack[0];
}
@@ -181,7 +180,7 @@ public class FluidInventoryLogic {
/**
* Try and drain the first fluid found for that amount. Used by GT_Cover_Pump
- *
+ *
* @param amount Fluid to drain from the tank
* @return A fluidstack with the possible amount drained
*/
diff --git a/src/main/java/gregtech/api/logic/ItemInventoryLogic.java b/src/main/java/gregtech/api/logic/ItemInventoryLogic.java
index 22d4a9a627..b37920d206 100644
--- a/src/main/java/gregtech/api/logic/ItemInventoryLogic.java
+++ b/src/main/java/gregtech/api/logic/ItemInventoryLogic.java
@@ -5,6 +5,7 @@ import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;
@@ -164,9 +165,8 @@ public class ItemInventoryLogic {
public ItemStack[] getStoredItems() {
final ItemStack[] items = inventory.getStacks()
.stream()
- .filter(item -> item != null)
- .collect(Collectors.toList())
- .toArray(new ItemStack[0]);
+ .filter(Objects::nonNull)
+ .toArray(ItemStack[]::new);
if (items == null) {
return new ItemStack[0];
}
diff --git a/src/main/java/gregtech/api/logic/PowerLogic.java b/src/main/java/gregtech/api/logic/PowerLogic.java
index afc1877deb..52fc762d1b 100644
--- a/src/main/java/gregtech/api/logic/PowerLogic.java
+++ b/src/main/java/gregtech/api/logic/PowerLogic.java
@@ -22,7 +22,7 @@ public class PowerLogic {
public static final int RECEIVER = 1;
public static final int EMITTER = 2;
public static final int BOTH = RECEIVER | EMITTER;
- private static float wirelessChargeFactor = 0.5F;
+ private static final float wirelessChargeFactor = 0.5F;
private long storedEnergy = 0;
private long energyCapacity = 0;
private long voltage = 0;
diff --git a/src/main/java/gregtech/api/logic/interfaces/ProcessingLogicHost.java b/src/main/java/gregtech/api/logic/interfaces/ProcessingLogicHost.java
index b8291c9843..314d0d3d97 100644
--- a/src/main/java/gregtech/api/logic/interfaces/ProcessingLogicHost.java
+++ b/src/main/java/gregtech/api/logic/interfaces/ProcessingLogicHost.java
@@ -70,7 +70,7 @@ public interface ProcessingLogicHost<P extends MuTEProcessingLogic<P>>
/**
* DO NOT CALL YOURSELF!!!
- *
+ * <p>
* If you want to make the processing logic be updated call {@link #setProcessingUpdate(boolean)}
*/
boolean needsUpdate();
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
index 1229dfcc5b..e39f78cee0 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
@@ -1342,8 +1342,8 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
public boolean playerOwnsThis(EntityPlayer aPlayer, boolean aCheckPrecicely) {
if (!canAccessData()) return false;
- if (aCheckPrecicely || privateAccess() || (mOwnerName.length() == 0))
- if ((mOwnerName.length() == 0) && isServerSide()) {
+ if (aCheckPrecicely || privateAccess() || (mOwnerName.isEmpty()))
+ if ((mOwnerName.isEmpty()) && isServerSide()) {
setOwnerName(aPlayer.getDisplayName());
setOwnerUuid(aPlayer.getUniqueID());
} else return !privateAccess() || aPlayer.getDisplayName()
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTECable.java b/src/main/java/gregtech/api/metatileentity/implementations/MTECable.java
index b56769c59b..ef1a3fe96b 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/MTECable.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTECable.java
@@ -210,7 +210,7 @@ public class MTECable extends MetaPipeEntity implements IMetaTileEntityCable {
@Override
public int getProgresstime() {
- return (int) mTransferredAmperage * 64;
+ return mTransferredAmperage * 64;
}
@Override
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEEnhancedMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEEnhancedMultiBlockBase.java
index 2cf4398e87..a576295f07 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/MTEEnhancedMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEEnhancedMultiBlockBase.java
@@ -164,7 +164,7 @@ public abstract class MTEEnhancedMultiBlockBase<T extends MTEEnhancedMultiBlockB
* current {@link #getAlignmentLimits()}, this method will be called to retrieve a corrected version. This method
* is currently only intended to be used as a mean to migrate alignment limits, so if you never change the alignment
* limit then you can probably just use the default implementation.
- *
+ * <p>
* The returned new facing must be able to pass the test of {@link #isNewExtendedFacingValid(ExtendedFacing)}
*/
protected ExtendedFacing getCorrectedAlignment(ExtendedFacing aOldFacing) {
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEFluid.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEFluid.java
index 2613aa23c0..bfd40ee0b6 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/MTEFluid.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEFluid.java
@@ -561,7 +561,7 @@ public class MTEFluid extends MetaPipeEntity {
wasActionPerformed = true;
- currentPipeBase = (IGregTechTileEntity) nextPipeBase;
+ currentPipeBase = nextPipeBase;
currentPipe = nextPipe;
}
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMaintenance.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMaintenance.java
index 3a715a541a..b617c954f7 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMaintenance.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchMaintenance.java
@@ -272,7 +272,6 @@ public class MTEHatchMaintenance extends MTEHatch implements IAddUIWidgets, IAli
aStack.stackSize = 0;
} else {
aStack.stackSize -= amt;
- amt = 0;
break;
}
}
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchOutput.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchOutput.java
index 3a9dd0dc96..00101bf5ad 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchOutput.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEHatchOutput.java
@@ -143,7 +143,7 @@ public class MTEHatchOutput extends MTEHatch implements IFluidStore, IFluidLocka
public void saveNBTData(NBTTagCompound aNBT) {
super.saveNBTData(aNBT);
aNBT.setByte("mMode", mMode);
- if (isFluidLocked() && lockedFluidName != null && lockedFluidName.length() != 0)
+ if (isFluidLocked() && lockedFluidName != null && !lockedFluidName.isEmpty())
aNBT.setString("lockedFluidName", lockedFluidName);
else aNBT.removeTag("lockedFluidName");
}
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java
index 5da5bff57d..0eb0d770c9 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEMultiBlockBase.java
@@ -133,7 +133,7 @@ public abstract class MTEMultiBlockBase extends MetaTileEntity
public int damageFactorLow = 5;
public float damageFactorHigh = 0.6f;
public int machineMode = 0;
- public List<UITexture> machineModeIcons = new ArrayList<UITexture>();
+ public List<UITexture> machineModeIcons = new ArrayList<>();
public boolean mLockedToSingleRecipe = getDefaultRecipeLockingMode();
protected boolean inputSeparation = getDefaultInputSeparationMode();
@@ -1323,7 +1323,6 @@ public abstract class MTEMultiBlockBase extends MetaTileEntity
}
boolean outputSuccess = true;
- // noinspection DataFlowIssue
final List<MTEHatchOutput> filteredHatches = filterValidMTEs(mOutputHatches);
while (outputSuccess && aStack.stackSize > 0) {
outputSuccess = false;
@@ -1511,8 +1510,7 @@ public abstract class MTEMultiBlockBase extends MetaTileEntity
if (items == null) {
continue;
}
- for (int i = 0; i < items.length; i++) {
- ItemStack item = items[i];
+ for (ItemStack item : items) {
if (item != null) {
rList.add(item);
}
diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java
index f1f4b8591a..3f2cc71e54 100644
--- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java
+++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java
@@ -182,7 +182,6 @@ public class MultiTileEntityBlock extends BlockContainer implements IDebugableBl
}
@Override
- @SuppressWarnings("unchecked")
public final void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB aAABB,
List<AxisAlignedBB> aList, Entity aEntity) {
final TileEntity tileEntity = world.getTileEntity(x, y, z);
diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityItem.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityItem.java
index bf7259626f..d5917aa6c9 100644
--- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityItem.java
+++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityItem.java
@@ -38,7 +38,6 @@ public class MultiTileEntityItem extends ItemBlock {
}
@Override
- @SuppressWarnings("unchecked")
public void addInformation(ItemStack stack, EntityPlayer player, List<String> list, boolean F3_H) {
final IMultiTileEntity mute = block.getRegistry()
.getReferenceTileEntity(stack);
@@ -58,7 +57,6 @@ public class MultiTileEntityItem extends ItemBlock {
@Override
@SideOnly(Side.CLIENT)
- @SuppressWarnings("unchecked")
public void getSubItems(Item aItem, CreativeTabs aTab, List<ItemStack> aList) {
for (MultiTileEntityClassContainer tClass : block.getRegistry().registrations) {
if (!tClass.hidden && ((IMultiTileEntity) tClass.getReferenceTileEntity())
diff --git a/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java b/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java
index 5ca30b6df6..b776e5e3b9 100644
--- a/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java
+++ b/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java
@@ -1016,12 +1016,11 @@ public abstract class MultiTileEntity extends CoverableTileEntity
@Override
public boolean playerOwnsThis(EntityPlayer aPlayer, boolean aCheckPrecicely) {
- if (aCheckPrecicely || privateAccess() || (ownerName.length() == 0))
- if ((ownerName.length() == 0) && isServerSide()) {
- setOwnerName(aPlayer.getDisplayName());
- setOwnerUuid(aPlayer.getUniqueID());
- } else return !privateAccess() || aPlayer.getDisplayName()
- .equals("Player") || ownerName.equals("Player") || ownerName.equals(aPlayer.getDisplayName());
+ if (aCheckPrecicely || privateAccess() || (ownerName.isEmpty())) if ((ownerName.isEmpty()) && isServerSide()) {
+ setOwnerName(aPlayer.getDisplayName());
+ setOwnerUuid(aPlayer.getUniqueID());
+ } else return !privateAccess() || aPlayer.getDisplayName()
+ .equals("Player") || ownerName.equals("Player") || ownerName.equals(aPlayer.getDisplayName());
return true;
}
@@ -1034,9 +1033,7 @@ public abstract class MultiTileEntity extends CoverableTileEntity
* @return a Packet containing all Data which has to be synchronised to the Client - Override as needed
*/
public GTPacketMultiTileEntity getClientDataPacket() {
-
- final GTPacketMultiTileEntity packet = new GTPacketMultiTileEntity();
- return packet;
+ return new GTPacketMultiTileEntity();
}
@Override
diff --git a/src/main/java/gregtech/api/multitileentity/interfaces/SyncedMultiTileEntity.java b/src/main/java/gregtech/api/multitileentity/interfaces/SyncedMultiTileEntity.java
index 0f959c6bce..92a147ff53 100644
--- a/src/main/java/gregtech/api/multitileentity/interfaces/SyncedMultiTileEntity.java
+++ b/src/main/java/gregtech/api/multitileentity/interfaces/SyncedMultiTileEntity.java
@@ -8,7 +8,7 @@ import gregtech.api.net.GTPacketMultiTileEntity;
public interface SyncedMultiTileEntity {
- public static final int DEFAULT_TIMED_PACKET_PERIOD = 20;
+ int DEFAULT_TIMED_PACKET_PERIOD = 20;
/**
* Will send a packet to the client when they open the controller or access a casing.
diff --git a/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java b/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java
index 32b87126ca..13810520bb 100644
--- a/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java
+++ b/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java
@@ -247,10 +247,9 @@ public abstract class MultiTileBasicMachine<P extends MuTEProcessingLogic<P>> ex
super.copyTextures();
final TileEntity tCanonicalTileEntity = MultiTileEntityRegistry
.getReferenceTileEntity(getMultiTileEntityRegistryID(), getMultiTileEntityID());
- if (!(tCanonicalTileEntity instanceof MultiTileBasicMachine)) {
+ if (!(tCanonicalTileEntity instanceof MultiTileBasicMachine canonicalEntity)) {
return;
}
- final MultiTileBasicMachine canonicalEntity = (MultiTileBasicMachine) tCanonicalTileEntity;
activeOverlayTexture = canonicalEntity.activeOverlayTexture;
activeOverlayGlowTexture = canonicalEntity.activeOverlayGlowTexture;
inactiveOverlayTexture = canonicalEntity.inactiveOverlayTexture;
diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java
index 1eaae5997d..d6b4ef7fe3 100644
--- a/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java
+++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java
@@ -158,7 +158,7 @@ public abstract class Controller<C extends Controller<C, P>, P extends MuTEProce
}
protected void calculateTier() {
- if (functionalCasings.size() == 0) {
+ if (functionalCasings.isEmpty()) {
return;
}
double sum = 0;
@@ -1018,10 +1018,7 @@ public abstract class Controller<C extends Controller<C, P>, P extends MuTEProce
@Override
public GTPacketMultiTileEntity getClientDataPacket() {
- final GTPacketMultiTileEntity packet = super.getClientDataPacket();
-
- return packet;
-
+ return super.getClientDataPacket();
}
@Override
diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java
index 2c3cafc67d..faf3f1ae8a 100644
--- a/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java
+++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java
@@ -347,8 +347,8 @@ public abstract class MultiBlockPart extends NonTickableMultiTileEntity
if (te instanceof MultiBlockPart part) {
final IMultiBlockController tController = part.getTarget(false);
if (tController != null) tController.onStructureChange();
- } else if (te instanceof IMultiBlockController controller) {
- controller.onStructureChange();
+ } else if (te instanceof IMultiBlockController blockController) {
+ blockController.onStructureChange();
}
}
}
@@ -675,8 +675,7 @@ public abstract class MultiBlockPart extends NonTickableMultiTileEntity
if (!canOpenControllerGui()) return guiProvider;
if (uiContext.getPlayer()
.isSneaking()) return guiProvider;
- GUIProvider<?> controllerGUI = controller.getGUI(uiContext);
- return controllerGUI;
+ return controller.getGUI(uiContext);
}
@Override
diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/StackableModularController.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/StackableModularController.java
index 1dfd497151..5e7a928399 100644
--- a/src/main/java/gregtech/api/multitileentity/multiblock/base/StackableModularController.java
+++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/StackableModularController.java
@@ -49,7 +49,7 @@ public abstract class StackableModularController<C extends StackableModularContr
@Override
public void resetMucCount() {
Map<UpgradeCasings, int[]> mucCounters = getMucMap();
- mucCounters.forEach((type, casingCount) -> { Arrays.fill(casingCount, 0); });
+ mucCounters.forEach((type, casingCount) -> Arrays.fill(casingCount, 0));
}
// Returns the cheapest MUC that is possible for the multi, which gets the minimum bonuses.
diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/WallShareablePart.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/WallShareablePart.java
index 238ce1eb2d..c736456437 100644
--- a/src/main/java/gregtech/api/multitileentity/multiblock/base/WallShareablePart.java
+++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/WallShareablePart.java
@@ -17,7 +17,7 @@ public class WallShareablePart extends MultiBlockPart {
@Override
public void setTarget(IMultiBlockController newController, int allowedModes) {
- if (targets.size() >= 1) {
+ if (!targets.isEmpty()) {
this.allowedModes = 0;
setMode((byte) 0);
controller.invalidate();
@@ -30,7 +30,7 @@ public class WallShareablePart extends MultiBlockPart {
return;
}
- targets.add(new WeakTargetRef<IMultiBlockController>(IMultiBlockController.class, true));
+ targets.add(new WeakTargetRef<>(IMultiBlockController.class, true));
}
@Override
diff --git a/src/main/java/gregtech/api/net/GTPacketSendOregenPattern.java b/src/main/java/gregtech/api/net/GTPacketSendOregenPattern.java
index dc9119d80a..c2180f1971 100644
--- a/src/main/java/gregtech/api/net/GTPacketSendOregenPattern.java
+++ b/src/main/java/gregtech/api/net/GTPacketSendOregenPattern.java
@@ -35,11 +35,10 @@ public class GTPacketSendOregenPattern extends GTPacket {
return new GTPacketSendOregenPattern(OregenPattern.values()[ordinal]);
}
// invalid data, default to AXISSYMMETRICAL:
- GTLog.err.println(
- String.format(
- "Received invalid data! Received %d but value must be between 0 and %d! Default (0) will be used.",
- ordinal,
- OregenPattern.values().length - 1));
+ GTLog.err.printf(
+ "Received invalid data! Received %d but value must be between 0 and %d! Default (0) will be used.%n",
+ ordinal,
+ OregenPattern.values().length - 1);
return new GTPacketSendOregenPattern();
}
diff --git a/src/main/java/gregtech/api/objects/GTChunkManager.java b/src/main/java/gregtech/api/objects/GTChunkManager.java
index 436fd0d7d8..2fc87f148d 100644
--- a/src/main/java/gregtech/api/objects/GTChunkManager.java
+++ b/src/main/java/gregtech/api/objects/GTChunkManager.java
@@ -116,7 +116,7 @@ public class GTChunkManager
ForgeChunkManager.forceChunk(instance.registeredTickets.get(owner), chunkXZ);
} else {
Ticket ticket;
- if (player.equals("")) ticket = ForgeChunkManager
+ if (player.isEmpty()) ticket = ForgeChunkManager
.requestTicket(GTMod.instance, owner.getWorldObj(), ForgeChunkManager.Type.NORMAL);
else ticket = ForgeChunkManager
.requestPlayerTicket(GTMod.instance, player, owner.getWorldObj(), ForgeChunkManager.Type.NORMAL);
diff --git a/src/main/java/gregtech/api/objects/ItemData.java b/src/main/java/gregtech/api/objects/ItemData.java
index 071b09a55f..5c36ea68e1 100644
--- a/src/main/java/gregtech/api/objects/ItemData.java
+++ b/src/main/java/gregtech/api/objects/ItemData.java
@@ -117,6 +117,6 @@ public class ItemData {
@Override
public String toString() {
if (mPrefix == null || mMaterial == null || mMaterial.mMaterial == null) return "";
- return String.valueOf(mPrefix.name() + mMaterial.mMaterial.mName);
+ return mPrefix.name() + mMaterial.mMaterial.mName;
}
}
diff --git a/src/main/java/gregtech/api/objects/MaterialStack.java b/src/main/java/gregtech/api/objects/MaterialStack.java
index 742c210901..4a0af6f948 100644
--- a/src/main/java/gregtech/api/objects/MaterialStack.java
+++ b/src/main/java/gregtech/api/objects/MaterialStack.java
@@ -57,7 +57,7 @@ public class MaterialStack implements Cloneable {
if (materialStack.mMaterial.mMaterialList.size() > 1) {
return true;
}
- if (materialStack.mMaterial.mMaterialList.size() == 0) {
+ if (materialStack.mMaterial.mMaterialList.isEmpty()) {
return false;
}
return isMaterialListComplex(materialStack.mMaterial.mMaterialList.get(0));
diff --git a/src/main/java/gregtech/api/objects/blockupdate/BlockUpdateHandler.java b/src/main/java/gregtech/api/objects/blockupdate/BlockUpdateHandler.java
index e8f084ea34..78924f1a47 100644
--- a/src/main/java/gregtech/api/objects/blockupdate/BlockUpdateHandler.java
+++ b/src/main/java/gregtech/api/objects/blockupdate/BlockUpdateHandler.java
@@ -35,8 +35,8 @@ public class BlockUpdateHandler {
private BlockUpdateHandler() {
- blocksToUpdate = new HashMap<ChunkCoordIntPair, WorldCoord>();
- cooldowns = new HashMap<ChunkCoordIntPair, RandomCooldown>();
+ blocksToUpdate = new HashMap<>();
+ cooldowns = new HashMap<>();
FMLCommonHandler.instance()
.bus()
@@ -110,8 +110,8 @@ public class BlockUpdateHandler {
return chunk.getChunkCoordIntPair();
}
- private HashMap<ChunkCoordIntPair, WorldCoord> blocksToUpdate;
- private HashMap<ChunkCoordIntPair, RandomCooldown> cooldowns;
+ private final HashMap<ChunkCoordIntPair, WorldCoord> blocksToUpdate;
+ private final HashMap<ChunkCoordIntPair, RandomCooldown> cooldowns;
private World currWorld = null;
private long internalTickCounter = 0;
}
diff --git a/src/main/java/gregtech/api/objects/blockupdate/RandomCooldown.java b/src/main/java/gregtech/api/objects/blockupdate/RandomCooldown.java
index d275c29744..8c46e5a1ec 100644
--- a/src/main/java/gregtech/api/objects/blockupdate/RandomCooldown.java
+++ b/src/main/java/gregtech/api/objects/blockupdate/RandomCooldown.java
@@ -26,6 +26,6 @@ public class RandomCooldown extends Cooldown {
lengthInTicks = minLengthInTicks + XSTR_INSTANCE.nextInt(maxLengthInTicks - minLengthInTicks + 1);
}
- private int minLengthInTicks;
- private int maxLengthInTicks;
+ private final int minLengthInTicks;
+ private final int maxLengthInTicks;
}
diff --git a/src/main/java/gregtech/api/util/AssemblyLineUtils.java b/src/main/java/gregtech/api/util/AssemblyLineUtils.java
index 22bed1884b..b211432ca5 100644
--- a/src/main/java/gregtech/api/util/AssemblyLineUtils.java
+++ b/src/main/java/gregtech/api/util/AssemblyLineUtils.java
@@ -259,7 +259,7 @@ public class AssemblyLineUtils {
* @return Is this Recipe Hash String valid?
*/
public static boolean isValidHash(String aHash) {
- if (aHash != null && aHash.length() > 0) {
+ if (aHash != null && !aHash.isEmpty()) {
// persistent hash can never be 0
return !aHash.equals("Invalid.Recipe.Hash") && !aHash.equals("Hash.0");
}
diff --git a/src/main/java/gregtech/api/util/AveragePerTickCounter.java b/src/main/java/gregtech/api/util/AveragePerTickCounter.java
index c9b1275deb..d51b97a6cb 100644
--- a/src/main/java/gregtech/api/util/AveragePerTickCounter.java
+++ b/src/main/java/gregtech/api/util/AveragePerTickCounter.java
@@ -11,7 +11,7 @@ public class AveragePerTickCounter {
* Averages a value over a certain amount of ticks
*
* @param period amount of ticks to average (20 for 1 second)
- *
+ *
*/
public AveragePerTickCounter(int period) throws InvalidParameterException {
@@ -120,13 +120,13 @@ public class AveragePerTickCounter {
.getTickCounter();
}
- private ArrayDeque<Measurement> values;
- private int period;
+ private final ArrayDeque<Measurement> values;
+ private final int period;
- private double cachedAverage = 0;
+ private final double cachedAverage = 0;
private boolean isCachedAverageValid = true;
- private class Measurement {
+ private static class Measurement {
public int TimestampInWorldTicks;
public long Value;
diff --git a/src/main/java/gregtech/api/util/GTBaseCrop.java b/src/main/java/gregtech/api/util/GTBaseCrop.java
index 2ddf37bbeb..1b8a817a7b 100644
--- a/src/main/java/gregtech/api/util/GTBaseCrop.java
+++ b/src/main/java/gregtech/api/util/GTBaseCrop.java
@@ -281,10 +281,7 @@ public class GTBaseCrop extends CropCard implements ICropCardInfo {
}
// return true if it's a block of the material
- if (tAssociation.mPrefix == OrePrefixes.block && tAssociation.mMaterial.mMaterial == mBlock) {
- return true;
- }
- return false;
+ return tAssociation.mPrefix == OrePrefixes.block && tAssociation.mMaterial.mMaterial == mBlock;
}
@Override
diff --git a/src/main/java/gregtech/api/util/GTMusicSystem.java b/src/main/java/gregtech/api/util/GTMusicSystem.java
index 362c397e67..48a78faa6f 100644
--- a/src/main/java/gregtech/api/util/GTMusicSystem.java
+++ b/src/main/java/gregtech/api/util/GTMusicSystem.java
@@ -298,7 +298,7 @@ public final class GTMusicSystem {
}
static synchronized void onPauseMs(long pauseDurationMs) {
- musicSources.forEach((uuid, source) -> { source.startedPlayingAtMs += pauseDurationMs; });
+ musicSources.forEach((uuid, source) -> source.startedPlayingAtMs += pauseDurationMs);
}
}
@@ -503,7 +503,7 @@ public final class GTMusicSystem {
for (int i = 0; i < baublesSize; i++) {
final ItemStack item = baubles.getStackInSlot(i);
if (item != null && item.getItem() instanceof ItemWirelessHeadphones headphones) {
- final UUID id = headphones.getBoundJukeboxUUID(item);
+ final UUID id = ItemWirelessHeadphones.getBoundJukeboxUUID(item);
if (id != null) {
wornHeadphones.add(id);
}
@@ -594,7 +594,7 @@ public final class GTMusicSystem {
// We manipulate server state here, because we've checked this is singleplayer pausing.
GTMusicSystem.ServerSystem.onPauseMs(pauseDurationMs);
- musicSources.forEach((uuid, source) -> { source.startedPlayingAtMs += pauseDurationMs; });
+ musicSources.forEach((uuid, source) -> source.startedPlayingAtMs += pauseDurationMs);
activelyPlayingMusic.forEach((uuid, data) -> {
data.originalStartTime += pauseDurationMs;
data.clientReferenceStartTime += pauseDurationMs;
diff --git a/src/main/java/gregtech/api/util/GTOreDictUnificator.java b/src/main/java/gregtech/api/util/GTOreDictUnificator.java
index af7f249cec..a9527fc07b 100644
--- a/src/main/java/gregtech/api/util/GTOreDictUnificator.java
+++ b/src/main/java/gregtech/api/util/GTOreDictUnificator.java
@@ -316,7 +316,7 @@ public class GTOreDictUnificator {
ItemStack[] aStacks = {};
if (obj instanceof ItemStack) aStacks = new ItemStack[] { (ItemStack) obj };
else if (obj instanceof ItemStack[]) aStacks = (ItemStack[]) obj;
- else if (obj instanceof List) aStacks = (ItemStack[]) ((List<?>) obj).toArray(new ItemStack[0]);
+ else if (obj instanceof List) aStacks = ((List<?>) obj).toArray(new ItemStack[0]);
List<ItemStack> rList = new ArrayList<>();
for (ItemStack aStack : aStacks) {
if (aStack == null) continue;
diff --git a/src/main/java/gregtech/api/util/GTStructureUtility.java b/src/main/java/gregtech/api/util/GTStructureUtility.java
index 2109a7e75b..1ee55ed200 100644
--- a/src/main/java/gregtech/api/util/GTStructureUtility.java
+++ b/src/main/java/gregtech/api/util/GTStructureUtility.java
@@ -76,7 +76,7 @@ public class GTStructureUtility {
Block block = world.getBlock(x, y, z);
if (block instanceof BlockFrameBox frameBox) {
int meta = world.getBlockMetadata(x, y, z);
- Materials material = frameBox.getMaterial(meta);
+ Materials material = BlockFrameBox.getMaterial(meta);
return aFrameMaterial == material;
}
return false;
diff --git a/src/main/java/gregtech/api/util/GTTooltipDataCache.java b/src/main/java/gregtech/api/util/GTTooltipDataCache.java
index a26f7a84d8..4b0a7eb396 100644
--- a/src/main/java/gregtech/api/util/GTTooltipDataCache.java
+++ b/src/main/java/gregtech/api/util/GTTooltipDataCache.java
@@ -54,7 +54,7 @@ public class GTTooltipDataCache {
lines.addAll(getAllLines(key + ".extended", args)); // Are extended lines enabled? If so add them to the
// lines
}
- if (lines.size() == 0) {
+ if (lines.isEmpty()) {
lines.add(key); // Fallback in case no lines could be found at all
}
return new TooltipData(
diff --git a/src/main/java/gregtech/api/util/GTUtil.java b/src/main/java/gregtech/api/util/GTUtil.java
index 8923bca954..0d226e4827 100644
--- a/src/main/java/gregtech/api/util/GTUtil.java
+++ b/src/main/java/gregtech/api/util/GTUtil.java
@@ -320,10 +320,10 @@ public class GTUtil {
tag.getTagList("mDualInputHatches", Constants.NBT.TAG_COMPOUND),
player,
dualInputHatches)) {
- if (!loadConfigurationFromDataStick(
+ return loadConfigurationFromDataStick(
tag.getTagList("mDualInputHatches", Constants.NBT.TAG_COMPOUND),
player,
- dualInputHatches)) return false;
+ dualInputHatches);
}
return true;
diff --git a/src/main/java/gregtech/api/util/GTUtility.java b/src/main/java/gregtech/api/util/GTUtility.java
index 3294b0523d..bb31b86ef0 100644
--- a/src/main/java/gregtech/api/util/GTUtility.java
+++ b/src/main/java/gregtech/api/util/GTUtility.java
@@ -1643,7 +1643,7 @@ public class GTUtility {
/**
* Move up to maxAmount amount of fluid from source to dest, with optional filtering via allowMove. note that this
* filter cannot bypass filtering done by IFluidHandlers themselves.
- *
+ * <p>
* this overload will assume the fill side is the opposite of drainSide
*
* @param source tank to drain from. method become noop if this is null
@@ -1892,7 +1892,7 @@ public class GTUtility {
tmp = aFluid.getFluid()
.getID();
} catch (Exception e) {
- System.err.println(e);
+ e.printStackTrace();
}
ItemStack rStack = ItemList.Display_Fluid.getWithDamage(1, tmp);
NBTTagCompound tNBT = new NBTTagCompound();
@@ -2903,7 +2903,7 @@ public class GTUtility {
ItemStack rStack = copy(aStack);
if (isStackInvalid(rStack)) return null;
else if (aAmount < 0) aAmount = 0;
- rStack.stackSize = (int) aAmount;
+ rStack.stackSize = aAmount;
return rStack;
}
@@ -3344,7 +3344,7 @@ public class GTUtility {
EnumChatFormatting.GOLD + GTUtility.trans("166", "Is valid Beacon Pyramid Material")
+ EnumChatFormatting.RESET);
} catch (Throwable e) {
- tList.add(String.format("§cAn exception was thrown while fetching this block's info.§r"));
+ tList.add("§cAn exception was thrown while fetching this block's info.§r");
if (D1) e.printStackTrace(GTLog.err);
}
}
@@ -3373,7 +3373,7 @@ public class GTUtility {
}
}
} catch (Throwable e) {
- tList.add(String.format("§cAn exception was thrown while fetching this tile's fluid tank info.§r"));
+ tList.add("§cAn exception was thrown while fetching this tile's fluid tank info.§r");
if (D1) e.printStackTrace(GTLog.err);
}
return rEUAmount;
@@ -3389,7 +3389,7 @@ public class GTUtility {
if (temp != null) tList.addAll(temp);
}
} catch (Throwable e) {
- tList.add(String.format("§cAn exception was thrown while fetching this block's debug info.§r"));
+ tList.add("§cAn exception was thrown while fetching this block's debug info.§r");
if (D1) e.printStackTrace(GTLog.err);
}
return rEUAmount;
@@ -3444,7 +3444,7 @@ public class GTUtility {
}
}
} catch (Throwable e) {
- tList.add(String.format("§cAn exception was thrown while fetching this leaves' info.§r"));
+ tList.add("§cAn exception was thrown while fetching this leaves' info.§r");
if (D1) e.printStackTrace(GTLog.err);
}
return rEUAmount;
@@ -3496,7 +3496,7 @@ public class GTUtility {
}
}
} catch (Throwable e) {
- tList.add(String.format("§cAn exception was thrown while fetching this crop's info.§r"));
+ tList.add("§cAn exception was thrown while fetching this crop's info.§r");
if (D1) e.printStackTrace(GTLog.err);
}
return rEUAmount;
@@ -3508,7 +3508,7 @@ public class GTUtility {
tList.addAll(Arrays.asList(info.getInfoData()));
}
} catch (Throwable e) {
- tList.add(String.format("§cAn exception was thrown while fetching this device's info.§r"));
+ tList.add("§cAn exception was thrown while fetching this device's info.§r");
if (D1) e.printStackTrace(GTLog.err);
}
}
@@ -3522,7 +3522,7 @@ public class GTUtility {
+ EnumChatFormatting.RESET);
}
} catch (Throwable e) {
- tList.add(String.format("§cAn exception was thrown while fetching this device's owner.§r"));
+ tList.add("§cAn exception was thrown while fetching this device's owner.§r");
if (D1) e.printStackTrace(GTLog.err);
}
}
@@ -3565,7 +3565,7 @@ public class GTUtility {
+ " EU");
}
} catch (Throwable e) {
- tList.add(String.format("§cAn exception was thrown while fetching this device's energy info.§r"));
+ tList.add("§cAn exception was thrown while fetching this device's energy info.§r");
if (D1) e.printStackTrace(GTLog.err);
}
}
@@ -3580,7 +3580,7 @@ public class GTUtility {
if (tString != null && !tString.equals(E)) tList.add(tString);
}
} catch (Throwable e) {
- tList.add(String.format("§cAn exception was thrown while fetching this device's covers.§r"));
+ tList.add("§cAn exception was thrown while fetching this device's covers.§r");
if (D1) e.printStackTrace(GTLog.err);
}
return rEUAmount;
@@ -3612,7 +3612,7 @@ public class GTUtility {
+ EnumChatFormatting.RESET);
}
} catch (Throwable e) {
- tList.add(String.format("§cAn exception was thrown while fetching this device's progress.§r"));
+ tList.add("§cAn exception was thrown while fetching this device's progress.§r");
if (D1) e.printStackTrace(GTLog.err);
}
return rEUAmount;
@@ -3628,7 +3628,7 @@ public class GTUtility {
+ EnumChatFormatting.RESET);
}
} catch (Throwable e) {
- tList.add(String.format("§cAn exception was thrown while fetching this device's upgrades.§r"));
+ tList.add("§cAn exception was thrown while fetching this device's upgrades.§r");
if (D1) e.printStackTrace(GTLog.err);
}
return rEUAmount;
@@ -3650,7 +3650,7 @@ public class GTUtility {
+ " EU");
}
} catch (Throwable e) {
- tList.add(String.format("§cAn exception was thrown while fetching this device's IC2 energy info.§r"));
+ tList.add("§cAn exception was thrown while fetching this device's IC2 energy info.§r");
if (D1) e.printStackTrace(GTLog.err);
}
return rEUAmount;
@@ -3667,7 +3667,7 @@ public class GTUtility {
+ EnumChatFormatting.RESET);
}
} catch (Throwable e) {
- tList.add(String.format("§cAn exception was thrown while fetching this device's EU conduction info.§r"));
+ tList.add("§cAn exception was thrown while fetching this device's EU conduction info.§r");
if (D1) e.printStackTrace(GTLog.err);
}
return rEUAmount;
@@ -3695,7 +3695,7 @@ public class GTUtility {
+ EnumChatFormatting.RESET);
}
} catch (Throwable e) {
- tList.add(String.format("§cAn exception was thrown while fetching this device's IC@ wrenchability.§r"));
+ tList.add("§cAn exception was thrown while fetching this device's IC@ wrenchability.§r");
if (D1) e.printStackTrace(GTLog.err);
}
return rEUAmount;
@@ -3715,7 +3715,7 @@ public class GTUtility {
}
}
} catch (Throwable e) {
- tList.add(String.format("§cAn exception was thrown while fetching this device's alignment info.§r"));
+ tList.add("§cAn exception was thrown while fetching this device's alignment info.§r");
if (D1) e.printStackTrace(GTLog.err);
}
return rEUAmount;
@@ -3740,7 +3740,7 @@ public class GTUtility {
+ EnumChatFormatting.RESET);
}
} catch (Throwable e) {
- tList.add(String.format("§cAn exception was thrown while fetching this reactor's info.§r"));
+ tList.add("§cAn exception was thrown while fetching this reactor's info.§r");
if (D1) e.printStackTrace(GTLog.err);
}
return rEUAmount;
@@ -4266,14 +4266,14 @@ public class GTUtility {
tPageText.append((tPageText.length() == 0) ? "" : aListDelimiter)
.append(list[i]);
- if (tPageText.length() > 0) {
+ if (tPageText.length() != 0) {
String tPageCounter = tTotalPages > 1 ? String.format(aPageFormatter, tPage + 1, tTotalPages) : "";
NBTTagString tPageTag = new NBTTagString(String.format(aPageHeader, tPageCounter) + tPageText);
aBook.appendTag(tPageTag);
}
++tPage;
- } while (tPageText.length() > 0);
+ } while (tPageText.length() != 0);
}
public static void addEnchantment(ItemStack aStack, Enchantment aEnchantment, int aLevel) {
diff --git a/src/main/java/gregtech/api/util/GTWaila.java b/src/main/java/gregtech/api/util/GTWaila.java
index a52dd2e459..676335a760 100644
--- a/src/main/java/gregtech/api/util/GTWaila.java
+++ b/src/main/java/gregtech/api/util/GTWaila.java
@@ -3,21 +3,18 @@ package gregtech.api.util;
public abstract class GTWaila {
public static String getMachineProgressString(boolean isActive, int maxProgresstime, int progresstime) {
- return getMachineProgressString(isActive, (long) maxProgresstime, (long) progresstime);
+ return getMachineProgressString(isActive, maxProgresstime, (long) progresstime);
}
public static String getMachineProgressString(boolean isActive, long maxProgresstime, long progresstime) {
if (!isActive) return "Idle";
- StringBuilder ret = new StringBuilder("In progress: ")
- .append(String.format("%,.2f", (double) progresstime / 20))
- .append("s / ")
- .append(String.format("%,.2f", (double) maxProgresstime / 20))
- .append("s (")
- .append(GTUtility.formatNumbers((Math.round((double) progresstime / maxProgresstime * 1000) / 10.0)))
- .append("%)");
-
- return ret.toString();
+ return "In progress: " + String.format("%,.2f", (double) progresstime / 20)
+ + "s / "
+ + String.format("%,.2f", (double) maxProgresstime / 20)
+ + "s ("
+ + GTUtility.formatNumbers((Math.round((double) progresstime / maxProgresstime * 1000) / 10.0))
+ + "%)";
}
}
diff --git a/src/main/java/gregtech/api/util/GT_StructureUtilityMuTE.java b/src/main/java/gregtech/api/util/GT_StructureUtilityMuTE.java
index 3efbebdcbf..9ad3ff1fed 100644
--- a/src/main/java/gregtech/api/util/GT_StructureUtilityMuTE.java
+++ b/src/main/java/gregtech/api/util/GT_StructureUtilityMuTE.java
@@ -181,8 +181,7 @@ public class GT_StructureUtilityMuTE {
mIcons = new IIcon[6];
Arrays.fill(mIcons, TextureSet.SET_NONE.mTextures[OrePrefixes.block.mTextureIndex].getIcon());
}
- final short[] RGBA = DEFAULT;
- StructureLibAPI.hintParticleTinted(world, x, y, z, mIcons, RGBA);
+ StructureLibAPI.hintParticleTinted(world, x, y, z, mIcons, DEFAULT);
return true;
}
@@ -219,7 +218,7 @@ public class GT_StructureUtilityMuTE {
*/
public static class MuTEStructureCasing {
- private String registryName;
+ private final String registryName;
private int registryId = GTValues.W;
private final int defaultMeta;
private final Integer[] validIds;
diff --git a/src/main/java/gregtech/api/util/GasSpargingRecipe.java b/src/main/java/gregtech/api/util/GasSpargingRecipe.java
index 0e8deb285b..39ea9e902e 100644
--- a/src/main/java/gregtech/api/util/GasSpargingRecipe.java
+++ b/src/main/java/gregtech/api/util/GasSpargingRecipe.java
@@ -36,9 +36,7 @@ public class GasSpargingRecipe implements Comparable<GasSpargingRecipe> {
@Override
public boolean equals(Object o) {
if (o instanceof GasSpargingRecipe i) {
- if (this.mInputGas.equals(i.mInputGas) && this.mInputSpentFuel.equals(i.mInputSpentFuel)) {
- return true;
- }
+ return this.mInputGas.equals(i.mInputGas) && this.mInputSpentFuel.equals(i.mInputSpentFuel);
}
return false;
}
@@ -57,39 +55,28 @@ public class GasSpargingRecipe implements Comparable<GasSpargingRecipe> {
}
public boolean isValid() {
- if (mInputGas == null || mInputGas.amount <= 0
- || mInputSpentFuel == null
- || mInputSpentFuel.amount <= 0
- || mFluidOutputs == null
- || mFluidOutputs.length < 1
- || mMaxOutputQuantity == null
- || mMaxOutputQuantity.length < 1
- || mFluidOutputs.length != mMaxOutputQuantity.length) {
- return false;
- }
- return true;
+ return mInputGas != null && mInputGas.amount > 0
+ && mInputSpentFuel != null
+ && mInputSpentFuel.amount > 0
+ && mFluidOutputs != null
+ && mFluidOutputs.length >= 1
+ && mMaxOutputQuantity != null
+ && mMaxOutputQuantity.length >= 1
+ && mFluidOutputs.length == mMaxOutputQuantity.length;
}
public boolean containsInputs(FluidStack aSpargeGas, FluidStack aSpentFuel) {
if (aSpargeGas != null && aSpargeGas.getFluid()
.equals(this.mInputGas.getFluid())) {
- if (aSpentFuel != null && aSpentFuel.getFluid()
- .equals(this.mInputSpentFuel.getFluid())) {
- return true;
- }
+ return aSpentFuel != null && aSpentFuel.getFluid()
+ .equals(this.mInputSpentFuel.getFluid());
}
return false;
}
@Override
public int compareTo(GasSpargingRecipe o) {
- if (o.mFluidOutputs.length > this.mFluidOutputs.length) {
- return 1;
- } else if (o.mFluidOutputs.length == this.mFluidOutputs.length) {
- return 0;
- } else {
- return -1;
- }
+ return Integer.compare(o.mFluidOutputs.length, this.mFluidOutputs.length);
}
public String[] getRecipeInfo() {
diff --git a/src/main/java/gregtech/api/util/HatchElementBuilder.java b/src/main/java/gregtech/api/util/HatchElementBuilder.java
index 8b93861114..d5517a451e 100644
--- a/src/main/java/gregtech/api/util/HatchElementBuilder.java
+++ b/src/main/java/gregtech/api/util/HatchElementBuilder.java
@@ -177,7 +177,7 @@ public class HatchElementBuilder<T> {
/**
* Mark this hatch element as the only candidate of given structure element. (e.g. muffler hatch on top of EBF)
* Currently, this will make the built IStructureElement to ignore gt_no_hatch directive from player
- *
+ * <p>
* Do note that {@link #buildAndChain(IStructureElement[])} and its overloads will force the resulting structure
* element
* to be non-exclusive.
diff --git a/src/main/java/gregtech/api/util/MultiblockTooltipBuilder.java b/src/main/java/gregtech/api/util/MultiblockTooltipBuilder.java
index e51f3a0524..dd142fdf9f 100644
--- a/src/main/java/gregtech/api/util/MultiblockTooltipBuilder.java
+++ b/src/main/java/gregtech/api/util/MultiblockTooltipBuilder.java
@@ -1,5 +1,6 @@
package gregtech.api.util;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
@@ -118,9 +119,7 @@ public class MultiblockTooltipBuilder {
*/
public MultiblockTooltipBuilder addInfoAll(String... infoStrings) {
- for (String str : infoStrings) {
- iLines.add(str);
- }
+ iLines.addAll(Arrays.asList(infoStrings));
return this;
}
diff --git a/src/main/java/gregtech/api/util/OverclockCalculator.java b/src/main/java/gregtech/api/util/OverclockCalculator.java
index bd3b14bcc0..e6e775b397 100644
--- a/src/main/java/gregtech/api/util/OverclockCalculator.java
+++ b/src/main/java/gregtech/api/util/OverclockCalculator.java
@@ -444,7 +444,6 @@ public class OverclockCalculator {
currentDurationDecrease = durationDecreasePerOCSupplier.apply(overclockCount + 1);
}
calculatedConsumption = (long) Math.max(currentConsumption, 1);
- calculatedDuration = (int) Math.max(durationInDouble, 1);
} else { // general overclock
double recipePowerTier = calculateRecipePowerTier(heatDiscountMultiplier);
double machinePowerTier = calculateMachinePowerTier();
@@ -473,8 +472,8 @@ public class OverclockCalculator {
calculatedConsumption = Math.max(calculatedConsumption, 1);
}
calculatedConsumption = calculateFinalRecipeEUt(heatDiscountMultiplier);
- calculatedDuration = (int) Math.max(durationInDouble, 1);
}
+ calculatedDuration = (int) Math.max(durationInDouble, 1);
}
private double calculateRecipePower(double heatDiscountMultiplier) {
diff --git a/src/main/java/gregtech/api/util/TurbineStatCalculator.java b/src/main/java/gregtech/api/util/TurbineStatCalculator.java
index 48c00dfe09..3c17c6eace 100644
--- a/src/main/java/gregtech/api/util/TurbineStatCalculator.java
+++ b/src/main/java/gregtech/api/util/TurbineStatCalculator.java
@@ -20,8 +20,8 @@ public class TurbineStatCalculator {
public TurbineStatCalculator(MetaGeneratedTool turbineItem, ItemStack aStack) {
turbine = turbineItem;
item = aStack;
- tMaxDamage = turbine.getToolMaxDamage(aStack);
- tMaterial = turbine.getPrimaryMaterial(aStack);
+ tMaxDamage = MetaGeneratedTool.getToolMaxDamage(aStack);
+ tMaterial = MetaGeneratedTool.getPrimaryMaterial(aStack);
tStats = turbine.getToolStats(aStack);
}
@@ -32,7 +32,7 @@ public class TurbineStatCalculator {
}
public long getCurrentDurability() {
- return getMaxDurability() - turbine.getToolDamage(item);
+ return getMaxDurability() - MetaGeneratedTool.getToolDamage(item);
}
// Efficiency in percentages
diff --git a/src/main/java/gregtech/api/world/GTWorldgen.java b/src/main/java/gregtech/api/world/GTWorldgen.java
index da3a66ef7e..19c3c24245 100644
--- a/src/main/java/gregtech/api/world/GTWorldgen.java
+++ b/src/main/java/gregtech/api/world/GTWorldgen.java
@@ -96,9 +96,10 @@ public abstract class GTWorldgen {
Boolean tAllowed = mDimensionMap.get(aDimName);
if (tAllowed == null) {
boolean value = false;
- for (int i = 0; i < aAllowedDimensionTypes.length; i++) {
- if (aAllowedDimensionTypes[i].isInstance(aWorld.provider)) {
+ for (Class aAllowedDimensionType : aAllowedDimensionTypes) {
+ if (aAllowedDimensionType.isInstance(aWorld.provider)) {
value = true;
+ break;
}
}