From 3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Wed, 2 Oct 2024 07:31:08 +0200 Subject: Cleanup the codebase (#3311) Co-authored-by: boubou19 --- src/main/java/gregtech/api/enums/Element.java | 1 - src/main/java/gregtech/api/enums/GTStones.java | 2 +- .../java/gregtech/api/enums/InventoryType.java | 2 +- src/main/java/gregtech/api/enums/ItemList.java | 2 +- src/main/java/gregtech/api/enums/Materials.java | 6 +-- .../java/gregtech/api/enums/MetaTileEntityIDs.java | 2 +- src/main/java/gregtech/api/enums/OreMixes.java | 2 +- src/main/java/gregtech/api/enums/SmallOres.java | 2 +- .../gregtech/api/graphs/paths/PowerNodePath.java | 4 +- .../java/gregtech/api/interfaces/IToolStats.java | 2 +- .../java/gregtech/api/items/ItemBreederCell.java | 4 +- .../gregtech/api/items/ItemRadioactiveCell.java | 4 +- .../gregtech/api/items/ItemRadioactiveCellIC.java | 2 +- src/main/java/gregtech/api/items/MetaBaseItem.java | 4 +- .../java/gregtech/api/items/MetaGeneratedTool.java | 43 +++++++++++----------- .../api/logic/AbstractProcessingLogic.java | 2 +- .../api/logic/ComplexParallelProcessingLogic.java | 16 ++------ .../gregtech/api/logic/ControllerFluidLogic.java | 4 +- .../gregtech/api/logic/ControllerItemLogic.java | 4 +- .../gregtech/api/logic/FluidInventoryLogic.java | 13 +++---- .../gregtech/api/logic/ItemInventoryLogic.java | 6 +-- src/main/java/gregtech/api/logic/PowerLogic.java | 2 +- .../api/logic/interfaces/ProcessingLogicHost.java | 2 +- .../api/metatileentity/BaseMetaTileEntity.java | 4 +- .../metatileentity/implementations/MTECable.java | 2 +- .../implementations/MTEEnhancedMultiBlockBase.java | 2 +- .../metatileentity/implementations/MTEFluid.java | 2 +- .../implementations/MTEHatchMaintenance.java | 1 - .../implementations/MTEHatchOutput.java | 2 +- .../implementations/MTEMultiBlockBase.java | 6 +-- .../api/multitileentity/MultiTileEntityBlock.java | 1 - .../api/multitileentity/MultiTileEntityItem.java | 2 - .../api/multitileentity/base/MultiTileEntity.java | 15 +++----- .../interfaces/SyncedMultiTileEntity.java | 2 +- .../machine/MultiTileBasicMachine.java | 3 +- .../multiblock/base/Controller.java | 7 +--- .../multiblock/base/MultiBlockPart.java | 7 ++-- .../base/StackableModularController.java | 2 +- .../multiblock/base/WallShareablePart.java | 4 +- .../api/net/GTPacketSendOregenPattern.java | 9 ++--- .../java/gregtech/api/objects/GTChunkManager.java | 2 +- src/main/java/gregtech/api/objects/ItemData.java | 2 +- .../java/gregtech/api/objects/MaterialStack.java | 2 +- .../objects/blockupdate/BlockUpdateHandler.java | 8 ++-- .../api/objects/blockupdate/RandomCooldown.java | 4 +- .../java/gregtech/api/util/AssemblyLineUtils.java | 2 +- .../gregtech/api/util/AveragePerTickCounter.java | 10 ++--- src/main/java/gregtech/api/util/GTBaseCrop.java | 5 +-- src/main/java/gregtech/api/util/GTMusicSystem.java | 6 +-- .../gregtech/api/util/GTOreDictUnificator.java | 2 +- .../java/gregtech/api/util/GTStructureUtility.java | 2 +- .../java/gregtech/api/util/GTTooltipDataCache.java | 2 +- src/main/java/gregtech/api/util/GTUtil.java | 4 +- src/main/java/gregtech/api/util/GTUtility.java | 42 ++++++++++----------- src/main/java/gregtech/api/util/GTWaila.java | 17 ++++----- .../gregtech/api/util/GT_StructureUtilityMuTE.java | 5 +-- .../java/gregtech/api/util/GasSpargingRecipe.java | 37 ++++++------------- .../gregtech/api/util/HatchElementBuilder.java | 2 +- .../api/util/MultiblockTooltipBuilder.java | 5 +-- .../gregtech/api/util/OverclockCalculator.java | 3 +- .../gregtech/api/util/TurbineStatCalculator.java | 6 +-- src/main/java/gregtech/api/world/GTWorldgen.java | 5 ++- src/main/java/gregtech/client/SeekingOggCodec.java | 2 +- src/main/java/gregtech/common/GTProxy.java | 6 +-- .../java/gregtech/common/GTWorldgenerator.java | 8 ++-- src/main/java/gregtech/common/Pollution.java | 4 +- .../java/gregtech/common/WorldgenGTOreLayer.java | 2 +- .../gregtech/common/WorldgenGTOreSmallPieces.java | 2 +- src/main/java/gregtech/common/WorldgenStone.java | 4 +- .../java/gregtech/common/blocks/BlockGlass1.java | 2 +- .../java/gregtech/common/blocks/BlockMachines.java | 2 +- .../gregtech/common/blocks/BlockOresAbstract.java | 2 +- .../java/gregtech/common/blocks/ItemMachines.java | 2 +- .../java/gregtech/common/covers/CoverConveyor.java | 6 +-- .../java/gregtech/common/covers/CoverDoesWork.java | 9 ++--- .../common/covers/CoverFluidRegulator.java | 3 -- .../java/gregtech/common/covers/CoverPump.java | 6 +-- .../redstone/CoverWirelessDoesWorkDetector.java | 3 +- .../gui/modularui/widget/TextButtonWidget.java | 4 +- .../common/items/behaviors/BehaviourDataOrb.java | 2 +- .../items/behaviors/BehaviourSwitchMode.java | 3 +- .../gregtech/common/render/BlackholeRenderer.java | 2 +- .../common/render/FluidDisplayStackRenderer.java | 2 +- .../gregtech/common/render/GTRendererBlock.java | 2 +- .../tileentities/casings/upgrade/Inventory.java | 2 +- .../common/tileentities/casings/upgrade/Tank.java | 4 +- .../generators/MTEMagicalEnergyAbsorber.java | 10 ++--- .../generators/MTENaquadahReactor.java | 2 +- .../tileentities/generators/MTESteamTurbine.java | 1 - .../tileentities/machines/IDualInputHatch.java | 2 +- .../tileentities/machines/ISmartInputHatch.java | 2 +- .../machines/MTEHatchCraftingInputME.java | 14 +++---- .../tileentities/machines/MTEHatchOutputBusME.java | 5 +-- .../tileentities/machines/MTEHatchOutputME.java | 5 +-- .../tileentities/machines/basic/MTEPump.java | 4 +- .../machines/basic/MTETurboCharger.java | 6 +-- .../machines/basic/MTEWorldAccelerator.java | 10 ++--- .../long_distance/MTELongDistancePipelineBase.java | 10 ++--- .../MTELongDistancePipelineFluid.java | 10 ++--- .../long_distance/MTELongDistancePipelineItem.java | 10 ++--- .../MTEIndustrialElectromagneticSeparator.java | 4 +- .../machines/multi/MTEIndustrialLaserEngraver.java | 5 +-- .../machines/multi/MTELargeFluidExtractor.java | 11 +++--- .../machines/multi/MTELargeTurbine.java | 3 +- .../machines/multi/MTELargeTurbineGas.java | 2 +- .../machines/multi/MTELargeTurbineGasAdvanced.java | 2 +- .../machines/multi/MTELargeTurbinePlasma.java | 2 +- .../machines/multi/MTELargeTurbineSteam.java | 1 - .../machines/multi/MTEMultiAutoclave.java | 5 +-- .../machines/multi/MTEMultiCanner.java | 3 +- .../tileentities/machines/multi/MTEMultiLathe.java | 2 +- .../machines/multi/MTEMultiSolidifier.java | 8 +++- .../tileentities/machines/multi/MTEPCBFactory.java | 6 ++- .../machines/multi/MTEPlasmaForge.java | 8 ++-- .../machines/multi/MTEWormholeGenerator.java | 27 ++++++-------- .../multi/compressor/MTEBlackHoleCompressor.java | 4 +- .../machines/multi/drone/MTEDroneCentre.java | 3 +- .../multi/purification/MTEPurificationPlant.java | 6 +-- .../purification/MTEPurificationUnitDegasser.java | 22 +++-------- .../machines/multiblock/DistillationTower.java | 2 +- .../tileentities/storage/MTEDigitalChestBase.java | 2 +- .../java/gregtech/loaders/misc/bees/GTFlowers.java | 12 +++--- .../loaders/oreprocessing/ProcessingBlock.java | 4 +- .../loaders/oreprocessing/ProcessingCell.java | 2 +- .../loaders/oreprocessing/ProcessingDust.java | 12 +++--- .../loaders/oreprocessing/ProcessingRawOre.java | 4 +- 126 files changed, 312 insertions(+), 400 deletions(-) (limited to 'src/main/java/gregtech') 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 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> 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

* 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

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 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

> /** * DO NOT CALL YOURSELF!!! - * + *

* 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 * 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 machineModeIcons = new ArrayList(); + public List 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 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 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 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 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

> 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, 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, 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 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.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(); - cooldowns = new HashMap(); + blocksToUpdate = new HashMap<>(); + cooldowns = new HashMap<>(); FMLCommonHandler.instance() .bus() @@ -110,8 +110,8 @@ public class BlockUpdateHandler { return chunk.getChunkCoordIntPair(); } - private HashMap blocksToUpdate; - private HashMap cooldowns; + private final HashMap blocksToUpdate; + private final HashMap 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 values; - private int period; + private final ArrayDeque 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 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("m