diff options
Diffstat (limited to 'src/main/java/gregtech')
126 files changed, 312 insertions, 400 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; } } diff --git a/src/main/java/gregtech/client/SeekingOggCodec.java b/src/main/java/gregtech/client/SeekingOggCodec.java index 7949578f4f..620104f214 100644 --- a/src/main/java/gregtech/client/SeekingOggCodec.java +++ b/src/main/java/gregtech/client/SeekingOggCodec.java @@ -20,7 +20,7 @@ public class SeekingOggCodec extends CodecJOrbis { public static final String EXTENSION = "gt5oggseek"; private volatile boolean fullyInitialized = false; - private volatile SoundBuffer nextBuffer = null; + private final SoundBuffer nextBuffer = null; /** * Encodes the given millisecond seek amount into a URL/resource name suffix that can be appended to the sound path diff --git a/src/main/java/gregtech/common/GTProxy.java b/src/main/java/gregtech/common/GTProxy.java index 659c626e2f..01d6315ebf 100644 --- a/src/main/java/gregtech/common/GTProxy.java +++ b/src/main/java/gregtech/common/GTProxy.java @@ -1816,7 +1816,7 @@ public abstract class GTProxy implements IGTMod, IFuelHandler { return; } String tName = aEvent.Name.replaceFirst(aPrefix.toString(), ""); - if (tName.length() > 0) { + if (!tName.isEmpty()) { char firstChar = tName.charAt(0); if (Character.isUpperCase(firstChar) || Character.isLowerCase(firstChar) || firstChar == '_' @@ -2197,7 +2197,7 @@ public abstract class GTProxy implements IGTMod, IFuelHandler { && ((this.mItemDespawnTime != 6000) || (this.mMaxEqualEntitiesAtOneSpot > 0))) { long startTime = System.nanoTime(); double oldX = 0, oldY = 0, oldZ = 0; - if (debugEntityCramming && (aEvent.world.loadedEntityList.size() != 0)) { + if (debugEntityCramming && (!aEvent.world.loadedEntityList.isEmpty())) { GTLog.out.println("CRAM: Entity list size " + aEvent.world.loadedEntityList.size()); } for (int i = 0; i < aEvent.world.loadedEntityList.size(); i++) { @@ -2247,7 +2247,7 @@ public abstract class GTProxy implements IGTMod, IFuelHandler { } } } - if (debugEntityCramming && (aEvent.world.loadedEntityList.size() != 0)) { + if (debugEntityCramming && (!aEvent.world.loadedEntityList.isEmpty())) { GTLog.out.println( "CRAM: Time spent checking " + (System.nanoTime() - startTime) / 1000 + " microseconds"); } diff --git a/src/main/java/gregtech/common/GTWorldgenerator.java b/src/main/java/gregtech/common/GTWorldgenerator.java index 14073d3325..17cba34369 100644 --- a/src/main/java/gregtech/common/GTWorldgenerator.java +++ b/src/main/java/gregtech/common/GTWorldgenerator.java @@ -204,7 +204,7 @@ public class GTWorldgenerator implements IWorldGenerator { public enum OregenPattern { // The last value is used when creating a new world AXISSYMMETRICAL, - EQUAL_SPACING; + EQUAL_SPACING } public static class WorldGenContainer implements Runnable { @@ -326,7 +326,7 @@ public class GTWorldgenerator implements IWorldGenerator { // Search for a valid orevein for this dimension if (!validOreveins.containsKey(oreveinSeed)) { if ((oreveinPercentageRoll < oreveinPercentage) && (WorldgenGTOreLayer.sWeight > 0) - && (WorldgenGTOreLayer.sList.size() > 0)) { + && (!WorldgenGTOreLayer.sList.isEmpty())) { int placementAttempts = 0; boolean oreveinFound = false; int i; @@ -549,7 +549,7 @@ public class GTWorldgenerator implements IWorldGenerator { } // Now process each oreseed vs this requested chunk - for (; seedList.size() != 0; seedList.remove(0)) { + for (; !seedList.isEmpty(); seedList.remove(0)) { if (debugWorldGen) GTLog.out.println("Processing seed x=" + seedList.get(0).mX + " z=" + seedList.get(0).mZ); worldGenFindVein(seedList.get(0).mX, seedList.get(0).mZ); @@ -593,7 +593,7 @@ public class GTWorldgenerator implements IWorldGenerator { short secondaryMeta = 0; short betweenMeta = 0; short sporadicMeta = 0; - if ((WorldgenGTOreLayer.sWeight > 0) && (WorldgenGTOreLayer.sList.size() > 0)) { + if ((WorldgenGTOreLayer.sWeight > 0) && (!WorldgenGTOreLayer.sList.isEmpty())) { boolean temp = true; int tRandomWeight; for (int i = 0; (i < oreveinAttempts) && (temp); i++) { diff --git a/src/main/java/gregtech/common/Pollution.java b/src/main/java/gregtech/common/Pollution.java index 928b944142..4245a0ef12 100644 --- a/src/main/java/gregtech/common/Pollution.java +++ b/src/main/java/gregtech/common/Pollution.java @@ -107,13 +107,13 @@ public class Pollution { // make a snapshot of what to work on pollutionList = new ArrayList<>(pollutedChunks); // set operations per tick - if (pollutionList.size() > 0) operationsPerTick = Math.max(1, pollutionList.size() / cycleLen); + if (!pollutionList.isEmpty()) operationsPerTick = Math.max(1, pollutionList.size() / cycleLen); else operationsPerTick = 0; // SANity blank = false; } for (int chunksProcessed = 0; chunksProcessed < operationsPerTick; chunksProcessed++) { - if (pollutionList.size() == 0) break; // no more stuff to do + if (pollutionList.isEmpty()) break; // no more stuff to do ChunkCoordIntPair actualPos = pollutionList.remove(pollutionList.size() - 1); // faster // get pollution ChunkData currentData = STORAGE.get(world, actualPos); diff --git a/src/main/java/gregtech/common/WorldgenGTOreLayer.java b/src/main/java/gregtech/common/WorldgenGTOreLayer.java index a8f57ef1de..2a31395a69 100644 --- a/src/main/java/gregtech/common/WorldgenGTOreLayer.java +++ b/src/main/java/gregtech/common/WorldgenGTOreLayer.java @@ -92,7 +92,7 @@ public class WorldgenGTOreLayer extends GTWorldgen { if (this.mEnd) { allowedProviders.add(WorldProviderEnd.class); } - mAllowedProviders = allowedProviders.toArray(new Class[allowedProviders.size()]); + mAllowedProviders = allowedProviders.toArray(new Class[0]); } @Override diff --git a/src/main/java/gregtech/common/WorldgenGTOreSmallPieces.java b/src/main/java/gregtech/common/WorldgenGTOreSmallPieces.java index 86d9c84e5f..4eb4eb4cce 100644 --- a/src/main/java/gregtech/common/WorldgenGTOreSmallPieces.java +++ b/src/main/java/gregtech/common/WorldgenGTOreSmallPieces.java @@ -59,7 +59,7 @@ public class WorldgenGTOreSmallPieces extends GTWorldgen { if (this.mEnd) { allowedProviders.add(WorldProviderEnd.class); } - mAllowedProviders = allowedProviders.toArray(new Class[allowedProviders.size()]); + mAllowedProviders = allowedProviders.toArray(new Class[0]); } @Override diff --git a/src/main/java/gregtech/common/WorldgenStone.java b/src/main/java/gregtech/common/WorldgenStone.java index 9533fd46e8..dd42146ea7 100644 --- a/src/main/java/gregtech/common/WorldgenStone.java +++ b/src/main/java/gregtech/common/WorldgenStone.java @@ -129,9 +129,9 @@ public class WorldgenStone extends GTWorldgen { } } - boolean result = stones.size() != 0; + boolean result = !stones.isEmpty(); // Now process each oreseed vs this requested chunk - for (; stones.size() != 0; stones.remove(0)) { + for (; !stones.isEmpty(); stones.remove(0)) { int x = stones.get(0).mX * 16; int z = stones.get(0).mZ * 16; diff --git a/src/main/java/gregtech/common/blocks/BlockGlass1.java b/src/main/java/gregtech/common/blocks/BlockGlass1.java index a8a287248b..6081b79d64 100644 --- a/src/main/java/gregtech/common/blocks/BlockGlass1.java +++ b/src/main/java/gregtech/common/blocks/BlockGlass1.java @@ -16,7 +16,7 @@ import gregtech.api.util.GTLanguageManager; /** * The glass is split into separate files because they are registered as regular blocks, and a regular block can have * 16 subtypes at most. - * + * <p> * This class hosts various special types of tiered glass with not many tiers. */ public class BlockGlass1 extends BlockCasingsAbstract { diff --git a/src/main/java/gregtech/common/blocks/BlockMachines.java b/src/main/java/gregtech/common/blocks/BlockMachines.java index 4c392f8cf5..f19a986529 100644 --- a/src/main/java/gregtech/common/blocks/BlockMachines.java +++ b/src/main/java/gregtech/common/blocks/BlockMachines.java @@ -140,7 +140,7 @@ public class BlockMachines extends GTGenericBlock implements IDebugableBlock, IT if (GTRendererBlock.INSTANCE == null) { return super.getRenderType(); } - return GTRendererBlock.INSTANCE.mRenderID; + return GTRendererBlock.mRenderID; } @Override diff --git a/src/main/java/gregtech/common/blocks/BlockOresAbstract.java b/src/main/java/gregtech/common/blocks/BlockOresAbstract.java index 358ae50e7f..ef17deb6c8 100644 --- a/src/main/java/gregtech/common/blocks/BlockOresAbstract.java +++ b/src/main/java/gregtech/common/blocks/BlockOresAbstract.java @@ -215,7 +215,7 @@ public abstract class BlockOresAbstract extends GTGenericBlock implements ITileE if (GTRendererBlock.INSTANCE == null) { return super.getRenderType(); } - return GTRendererBlock.INSTANCE.mRenderID; + return GTRendererBlock.mRenderID; } @Override diff --git a/src/main/java/gregtech/common/blocks/ItemMachines.java b/src/main/java/gregtech/common/blocks/ItemMachines.java index f6816f468a..92f1675a44 100644 --- a/src/main/java/gregtech/common/blocks/ItemMachines.java +++ b/src/main/java/gregtech/common/blocks/ItemMachines.java @@ -179,7 +179,7 @@ public class ItemMachines extends ItemBlock implements IFluidContainerItem { if (aList != null) aList.add(tTranslated); } else { String tTranslated = GTLanguageManager.addStringLocalization(tKey, tDescLine); - if (aList != null) aList.add(tTranslated.equals("") ? tDescLine : tTranslated); + if (aList != null) aList.add(tTranslated.isEmpty() ? tDescLine : tTranslated); } } } diff --git a/src/main/java/gregtech/common/covers/CoverConveyor.java b/src/main/java/gregtech/common/covers/CoverConveyor.java index cb2690d95b..582e0b4e0c 100644 --- a/src/main/java/gregtech/common/covers/CoverConveyor.java +++ b/src/main/java/gregtech/common/covers/CoverConveyor.java @@ -2,7 +2,7 @@ package gregtech.common.covers; import static gregtech.api.util.GTUtility.moveMultipleItemStacks; -import java.util.Arrays; +import java.util.Collections; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; @@ -226,7 +226,7 @@ public class CoverConveyor extends CoverBehavior { }) .dynamicTooltip(() -> { ISerializableObject.LegacyCoverData coverData = getCoverData(); - return Arrays.asList( + return Collections.singletonList( coverData == null || coverData.get() % 2 == 0 ? GTUtility.trans("314", "Allow Input") : GTUtility.trans("312", "Allow Output")); @@ -243,7 +243,7 @@ public class CoverConveyor extends CoverBehavior { }) .dynamicTooltip(() -> { ISerializableObject.LegacyCoverData coverData = getCoverData(); - return Arrays.asList( + return Collections.singletonList( coverData == null || coverData.get() % 2 == 0 ? GTUtility.trans("313", "Block Input") : GTUtility.trans("311", "Block Output")); diff --git a/src/main/java/gregtech/common/covers/CoverDoesWork.java b/src/main/java/gregtech/common/covers/CoverDoesWork.java index 1575f243ab..4998373a64 100644 --- a/src/main/java/gregtech/common/covers/CoverDoesWork.java +++ b/src/main/java/gregtech/common/covers/CoverDoesWork.java @@ -20,9 +20,9 @@ import gregtech.common.gui.modularui.widget.CoverDataFollowerToggleButtonWidget; public class CoverDoesWork extends CoverBehavior { - private static int FLAG_INVERTED = 0x1; - private static int FLAG_PROGRESS = 0x2; - private static int FLAG_ENABLED = 0x4; + private static final int FLAG_INVERTED = 0x1; + private static final int FLAG_PROGRESS = 0x2; + private static final int FLAG_ENABLED = 0x4; public CoverDoesWork(ITexture coverTexture) { super(coverTexture); @@ -37,8 +37,7 @@ public class CoverDoesWork extends CoverBehavior { @Override public int doCoverThings(ForgeDirection side, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) { - if ((aTileEntity instanceof IMachineProgress)) { - IMachineProgress mProgress = (IMachineProgress) aTileEntity; + if ((aTileEntity instanceof IMachineProgress mProgress)) { boolean inverted = isFlagSet(aCoverVariable, FLAG_INVERTED); int signal = 0; diff --git a/src/main/java/gregtech/common/covers/CoverFluidRegulator.java b/src/main/java/gregtech/common/covers/CoverFluidRegulator.java index 1895df509d..98e881753a 100644 --- a/src/main/java/gregtech/common/covers/CoverFluidRegulator.java +++ b/src/main/java/gregtech/common/covers/CoverFluidRegulator.java @@ -91,17 +91,14 @@ public class CoverFluidRegulator extends CoverBehaviorBase<CoverFluidRegulator.F final IFluidHandler tTank1; final IFluidHandler tTank2; final ForgeDirection directionFrom; - final ForgeDirection directionTo; if (aCoverVariable.speed > 0) { tTank2 = aTileEntity.getITankContainerAtSide(side); tTank1 = (IFluidHandler) aTileEntity; directionFrom = side; - directionTo = side.getOpposite(); } else { tTank1 = aTileEntity.getITankContainerAtSide(side); tTank2 = (IFluidHandler) aTileEntity; directionFrom = side.getOpposite(); - directionTo = side; } if (tTank1 != null && tTank2 != null) { allowFluid = true; diff --git a/src/main/java/gregtech/common/covers/CoverPump.java b/src/main/java/gregtech/common/covers/CoverPump.java index 99d39dccad..15dd1fccfc 100644 --- a/src/main/java/gregtech/common/covers/CoverPump.java +++ b/src/main/java/gregtech/common/covers/CoverPump.java @@ -1,6 +1,6 @@ package gregtech.common.covers; -import java.util.Arrays; +import java.util.Collections; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.common.util.ForgeDirection; @@ -232,7 +232,7 @@ public class CoverPump extends CoverBehavior { }) .dynamicTooltip(() -> { ISerializableObject.LegacyCoverData coverData = getCoverData(); - return Arrays.asList( + return Collections.singletonList( coverData == null || coverData.get() % 2 == 0 ? GTUtility.trans("314", "Allow Input") : GTUtility.trans("312", "Allow Output")); @@ -249,7 +249,7 @@ public class CoverPump extends CoverBehavior { }) .dynamicTooltip(() -> { ISerializableObject.LegacyCoverData coverData = getCoverData(); - return Arrays.asList( + return Collections.singletonList( coverData == null || coverData.get() % 2 == 0 ? GTUtility.trans("313", "Block Input") : GTUtility.trans("311", "Block Output")); diff --git a/src/main/java/gregtech/common/covers/redstone/CoverWirelessDoesWorkDetector.java b/src/main/java/gregtech/common/covers/redstone/CoverWirelessDoesWorkDetector.java index ed55280b7f..54d71d2c8b 100644 --- a/src/main/java/gregtech/common/covers/redstone/CoverWirelessDoesWorkDetector.java +++ b/src/main/java/gregtech/common/covers/redstone/CoverWirelessDoesWorkDetector.java @@ -43,8 +43,7 @@ public class CoverWirelessDoesWorkDetector private static byte computeSignalBasedOnActivity(ActivityTransmitterData coverVariable, ICoverable tileEntity) { - if (tileEntity instanceof IMachineProgress) { - IMachineProgress mProgress = (IMachineProgress) tileEntity; + if (tileEntity instanceof IMachineProgress mProgress) { boolean inverted = coverVariable.invert; int signal = 0; diff --git a/src/main/java/gregtech/common/gui/modularui/widget/TextButtonWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/TextButtonWidget.java index 492eef0a0a..a8aab5097e 100644 --- a/src/main/java/gregtech/common/gui/modularui/widget/TextButtonWidget.java +++ b/src/main/java/gregtech/common/gui/modularui/widget/TextButtonWidget.java @@ -8,8 +8,8 @@ import com.gtnewhorizons.modularui.common.widget.TextWidget; public class TextButtonWidget extends MultiChildWidget { - private ButtonWidget mButton; - private TextWidget mText; + private final ButtonWidget mButton; + private final TextWidget mText; private int leftMargin; diff --git a/src/main/java/gregtech/common/items/behaviors/BehaviourDataOrb.java b/src/main/java/gregtech/common/items/behaviors/BehaviourDataOrb.java index c5d045ecd0..12fcd41e3c 100644 --- a/src/main/java/gregtech/common/items/behaviors/BehaviourDataOrb.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourDataOrb.java @@ -96,7 +96,7 @@ public class BehaviourDataOrb extends BehaviourNone { @Override public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) { - if (!(getDataTitle(aStack).length() == 0)) { + if (!(getDataTitle(aStack).isEmpty())) { aList.add(getDataTitle(aStack)); aList.add(getDataName(aStack)); } diff --git a/src/main/java/gregtech/common/items/behaviors/BehaviourSwitchMode.java b/src/main/java/gregtech/common/items/behaviors/BehaviourSwitchMode.java index ba1730f805..af4fe13003 100644 --- a/src/main/java/gregtech/common/items/behaviors/BehaviourSwitchMode.java +++ b/src/main/java/gregtech/common/items/behaviors/BehaviourSwitchMode.java @@ -39,8 +39,7 @@ public class BehaviourSwitchMode extends BehaviourNone { @Override public List<String> getAdditionalToolTips(MetaBaseItem aItem, List<String> aList, ItemStack aStack) { super.getAdditionalToolTips(aItem, aList, aStack); - if ((aItem instanceof MetaGeneratedTool)) { - MetaGeneratedTool itemTool = (MetaGeneratedTool) aItem; + if ((aItem instanceof MetaGeneratedTool itemTool)) { final int maxMode = itemTool.getToolMaxMode(aStack); if (maxMode > 1) { aList.add("Shift+Rclick to change mode"); diff --git a/src/main/java/gregtech/common/render/BlackholeRenderer.java b/src/main/java/gregtech/common/render/BlackholeRenderer.java index 733bd3aa9e..2693844708 100644 --- a/src/main/java/gregtech/common/render/BlackholeRenderer.java +++ b/src/main/java/gregtech/common/render/BlackholeRenderer.java @@ -36,7 +36,7 @@ public class BlackholeRenderer extends TileEntitySpecialRenderer { private static IModelCustomExt blackholeModel; private static ResourceLocation blackholeTexture; - private static float modelScale = .5f; + private static final float modelScale = .5f; private ShaderProgram laserProgram; private static int u_LaserCameraPosition = -1, u_LaserColor = -1, u_LaserModelMatrix = -1; diff --git a/src/main/java/gregtech/common/render/FluidDisplayStackRenderer.java b/src/main/java/gregtech/common/render/FluidDisplayStackRenderer.java index 80e2cbe6a6..38d89b2da9 100644 --- a/src/main/java/gregtech/common/render/FluidDisplayStackRenderer.java +++ b/src/main/java/gregtech/common/render/FluidDisplayStackRenderer.java @@ -78,7 +78,7 @@ public class FluidDisplayStackRenderer implements IItemRenderer { String amountString; if (fluidAmount < 10_000) { - amountString = "" + fluidAmount + "L"; + amountString = fluidAmount + "L"; } else { amountString = ReadableNumberConverter.INSTANCE.toWideReadableForm(fluidAmount) + "L"; } diff --git a/src/main/java/gregtech/common/render/GTRendererBlock.java b/src/main/java/gregtech/common/render/GTRendererBlock.java index 1c8e2da29d..b4caab35b8 100644 --- a/src/main/java/gregtech/common/render/GTRendererBlock.java +++ b/src/main/java/gregtech/common/render/GTRendererBlock.java @@ -774,6 +774,6 @@ public class GTRendererBlock implements ISimpleBlockRenderingHandler { @Override public int getRenderId() { - return this.mRenderID; + return mRenderID; } } diff --git a/src/main/java/gregtech/common/tileentities/casings/upgrade/Inventory.java b/src/main/java/gregtech/common/tileentities/casings/upgrade/Inventory.java index 43cc20f983..26f26604bf 100644 --- a/src/main/java/gregtech/common/tileentities/casings/upgrade/Inventory.java +++ b/src/main/java/gregtech/common/tileentities/casings/upgrade/Inventory.java @@ -22,7 +22,7 @@ public class Inventory extends UpgradeCasing { private String inventoryName = "inventory"; private int inventorySize; - private InventoryType type = InventoryType.Both; + private final InventoryType type = InventoryType.Both; public String getCustomInventoryName() { return inventoryName; diff --git a/src/main/java/gregtech/common/tileentities/casings/upgrade/Tank.java b/src/main/java/gregtech/common/tileentities/casings/upgrade/Tank.java index a7ace14de5..b373d79ab5 100644 --- a/src/main/java/gregtech/common/tileentities/casings/upgrade/Tank.java +++ b/src/main/java/gregtech/common/tileentities/casings/upgrade/Tank.java @@ -19,8 +19,8 @@ public class Tank extends UpgradeCasing { public static final int INPUT = 0; public static final int OUTPUT = 1; public static final int BOTH = 2; - private String tankName = "tank"; - private int type = BOTH; + private final String tankName = "tank"; + private final int type = BOTH; @Override protected void customWork(IMultiBlockController aTarget) { diff --git a/src/main/java/gregtech/common/tileentities/generators/MTEMagicalEnergyAbsorber.java b/src/main/java/gregtech/common/tileentities/generators/MTEMagicalEnergyAbsorber.java index 01d2e1ee07..242d8eaaea 100644 --- a/src/main/java/gregtech/common/tileentities/generators/MTEMagicalEnergyAbsorber.java +++ b/src/main/java/gregtech/common/tileentities/generators/MTEMagicalEnergyAbsorber.java @@ -85,11 +85,11 @@ public class MTEMagicalEnergyAbsorber extends MTEBasicGenerator implements Magic private static final Map<Aspect, Integer> sAspectsEnergy = new HashMap<>(); private static boolean sAllowMultipleEggs = false; private static MTEMagicalEnergyAbsorber sActiveSiphon = null; - private static int sEnergyPerEndercrystal = 512; - private static int sEnergyFromVis = 20; - private static int sEnergyPerEssentia = 320; - private static int sDragonEggEnergyPerTick = 2048; - private static int sCreeperEggEnergyPerTick = 512; + private static final int sEnergyPerEndercrystal = 512; + private static final int sEnergyFromVis = 20; + private static final int sEnergyPerEssentia = 320; + private static final int sDragonEggEnergyPerTick = 2048; + private static final int sCreeperEggEnergyPerTick = 512; private final MagicalEnergyBB mMagicalEnergyBB = new MagicalEnergyBB(this, mTier, mTier + 2); private int mEfficiency; private int mMaxVisPerDrain; diff --git a/src/main/java/gregtech/common/tileentities/generators/MTENaquadahReactor.java b/src/main/java/gregtech/common/tileentities/generators/MTENaquadahReactor.java index 276fdff07c..0bbe3bb7e7 100644 --- a/src/main/java/gregtech/common/tileentities/generators/MTENaquadahReactor.java +++ b/src/main/java/gregtech/common/tileentities/generators/MTENaquadahReactor.java @@ -33,7 +33,7 @@ import gregtech.api.render.TextureFactory; public class MTENaquadahReactor extends MTEBasicGenerator { - private int mEfficiency; + private final int mEfficiency; public MTENaquadahReactor(int aID, String aName, String[] aDescription, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier, aDescription); diff --git a/src/main/java/gregtech/common/tileentities/generators/MTESteamTurbine.java b/src/main/java/gregtech/common/tileentities/generators/MTESteamTurbine.java index bb6138d35a..6564ecfe8f 100644 --- a/src/main/java/gregtech/common/tileentities/generators/MTESteamTurbine.java +++ b/src/main/java/gregtech/common/tileentities/generators/MTESteamTurbine.java @@ -230,7 +230,6 @@ public class MTESteamTurbine extends MTEBasicGenerator { public boolean isFluidInputAllowed(FluidStack aFluid) { if (GTModHandler.isSuperHeatedSteam(aFluid)) { aFluid.amount = 0; - aFluid = null; return false; } return super.isFluidInputAllowed(aFluid); diff --git a/src/main/java/gregtech/common/tileentities/machines/IDualInputHatch.java b/src/main/java/gregtech/common/tileentities/machines/IDualInputHatch.java index c89aaaff40..0660f6b1a1 100644 --- a/src/main/java/gregtech/common/tileentities/machines/IDualInputHatch.java +++ b/src/main/java/gregtech/common/tileentities/machines/IDualInputHatch.java @@ -17,5 +17,5 @@ public interface IDualInputHatch { Optional<IDualInputInventory> getFirstNonEmptyInventory(); - public boolean supportsFluids(); + boolean supportsFluids(); } diff --git a/src/main/java/gregtech/common/tileentities/machines/ISmartInputHatch.java b/src/main/java/gregtech/common/tileentities/machines/ISmartInputHatch.java index dc5cac45f8..bbf6c5b631 100644 --- a/src/main/java/gregtech/common/tileentities/machines/ISmartInputHatch.java +++ b/src/main/java/gregtech/common/tileentities/machines/ISmartInputHatch.java @@ -10,6 +10,6 @@ public interface ISmartInputHatch { // Have the contents of the hatch changed since the last check? boolean justUpdated(); - public boolean doFastRecipeCheck(); + boolean doFastRecipeCheck(); } diff --git a/src/main/java/gregtech/common/tileentities/machines/MTEHatchCraftingInputME.java b/src/main/java/gregtech/common/tileentities/machines/MTEHatchCraftingInputME.java index b6adf65440..d1bc27310a 100644 --- a/src/main/java/gregtech/common/tileentities/machines/MTEHatchCraftingInputME.java +++ b/src/main/java/gregtech/common/tileentities/machines/MTEHatchCraftingInputME.java @@ -323,16 +323,17 @@ public class MTEHatchCraftingInputME extends MTEHatchInputBus private @Nullable AENetworkProxy gridProxy = null; // holds all internal inventories - private PatternSlot[] internalInventory = new PatternSlot[MAX_PATTERN_COUNT]; + private final PatternSlot[] internalInventory = new PatternSlot[MAX_PATTERN_COUNT]; // a hash map for faster lookup of pattern slots, not necessarily all valid. - private Map<ICraftingPatternDetails, PatternSlot> patternDetailsPatternSlotMap = new HashMap<>(MAX_PATTERN_COUNT); + private final Map<ICraftingPatternDetails, PatternSlot> patternDetailsPatternSlotMap = new HashMap<>( + MAX_PATTERN_COUNT); private boolean needPatternSync = true; private boolean justHadNewItems = false; private String customName = null; - private boolean supportFluids; + private final boolean supportFluids; private boolean additionalConnection = false; private boolean disablePatternOptimization = false; @@ -571,15 +572,14 @@ public class MTEHatchCraftingInputME extends MTEHatchInputBus // Migrate from 4x8 to 4x9 pattern inventory int oldPatternCount = 4 * 8; int oldSlotManual = oldPatternCount + 1; - int oldSlotCircuit = oldPatternCount; if (internalInventory[oldSlotManual] == null && mInventory[oldSlotManual] != null) { mInventory[SLOT_MANUAL_START] = mInventory[oldSlotManual]; mInventory[oldSlotManual] = null; } - if (internalInventory[oldSlotCircuit] == null && mInventory[oldSlotCircuit] != null) { - mInventory[SLOT_CIRCUIT] = mInventory[oldSlotCircuit]; - mInventory[oldSlotCircuit] = null; + if (internalInventory[oldPatternCount] == null && mInventory[oldPatternCount] != null) { + mInventory[SLOT_CIRCUIT] = mInventory[oldPatternCount]; + mInventory[oldPatternCount] = null; } // reconstruct patternDetailsPatternSlotMap diff --git a/src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputBusME.java b/src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputBusME.java index 969d9c6c05..9e396b8b27 100644 --- a/src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputBusME.java +++ b/src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputBusME.java @@ -125,10 +125,7 @@ public class MTEHatchOutputBusME extends MTEHatchOutputBus implements IPowerChan * Check if the internal cache can still fit more items in it */ public boolean canAcceptItem() { - if (getCachedAmount() < getCacheCapacity()) { - return true; - } - return false; + return getCachedAmount() < getCacheCapacity(); } /** diff --git a/src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputME.java b/src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputME.java index 5983a2d32a..7ebe9929c3 100644 --- a/src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputME.java +++ b/src/main/java/gregtech/common/tileentities/machines/MTEHatchOutputME.java @@ -147,10 +147,7 @@ public class MTEHatchOutputME extends MTEHatchOutput implements IPowerChannelSta * Check if the internal cache can still fit more fluids in it */ public boolean canAcceptFluid() { - if (getCachedAmount() < getCacheCapacity()) { - return true; - } - return false; + return getCachedAmount() < getCacheCapacity(); } /** diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/MTEPump.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEPump.java index a6a99a58fa..b8d9803951 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/MTEPump.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEPump.java @@ -500,7 +500,7 @@ public class MTEPump extends MTEBasicMachine { for (int i = 0; i < mInputSlotCount; i++) { ItemStack stack = getInputAt(i); - if (stack != null && GTUtility.areStacksEqual(stack, MINING_PIPE) && stack.stackSize > 0) { + if (GTUtility.areStacksEqual(stack, MINING_PIPE) && stack.stackSize > 0) { foundPipe = true; break; } @@ -562,7 +562,7 @@ public class MTEPump extends MTEBasicMachine { for (int i = 0; i < mInputSlotCount; i++) { ItemStack stack = getInputAt(i); - if (stack != null && GTUtility.areStacksEqual(stack, MINING_PIPE) && stack.stackSize > 0) { + if (GTUtility.areStacksEqual(stack, MINING_PIPE) && stack.stackSize > 0) { foundPipe = true; stack.stackSize -= 1; if (stack.stackSize == 0) { diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/MTETurboCharger.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTETurboCharger.java index 3e1ebd298e..c377600528 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/MTETurboCharger.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTETurboCharger.java @@ -87,10 +87,8 @@ public class MTETurboCharger extends MTECharger { } } - if (getBaseMetaTileEntity() instanceof BaseMetaTileEntity) { - BaseMetaTileEntity mBaseMetaTileEntity = (BaseMetaTileEntity) getBaseMetaTileEntity(); - if (mBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity) { - MetaTileEntity mMetaTileEntity = (MetaTileEntity) mBaseMetaTileEntity.getMetaTileEntity(); + if (getBaseMetaTileEntity() instanceof BaseMetaTileEntity mBaseMetaTileEntity) { + if (mBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity mMetaTileEntity) { if (mMetaTileEntity.dechargerSlotCount() > 0 && mBaseMetaTileEntity.getStoredEU() < mBaseMetaTileEntity.getEUCapacity()) { for (int i = mMetaTileEntity.dechargerSlotStartIndex(), diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/MTEWorldAccelerator.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEWorldAccelerator.java index bb086dc654..5046ecd8b1 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/MTEWorldAccelerator.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEWorldAccelerator.java @@ -33,7 +33,7 @@ public class MTEWorldAccelerator extends MTETieredMachineBlock { // simple name is rather expensive to compute and it's not cached // see https://stackoverflow.com/q/17369304 - private static final ClassValue<String> simpleNameCache = new ClassValue<String>() { + private static final ClassValue<String> simpleNameCache = new ClassValue<>() { @Override protected String computeValue(Class<?> type) { @@ -87,7 +87,8 @@ public class MTEWorldAccelerator extends MTETieredMachineBlock { private static Textures.BlockIcons.CustomIcon _mGTIco_Norm_Active; private static Textures.BlockIcons.CustomIcon _mGTIco_TE_Idle; private static Textures.BlockIcons.CustomIcon _mGTIco_TE_Active; - private static int[] mAccelerateStatic = { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 512, 512, 512, 512, 512, 512 }; + private static final int[] mAccelerateStatic = { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 512, 512, 512, 512, 512, + 512 }; private static final int AMPERAGE_NORMAL = 3; private static final int AMPERAGE_TE = 6; @@ -272,7 +273,7 @@ public class MTEWorldAccelerator extends MTETieredMachineBlock { return 8; } - private static String[] mModeStr = { "Blocks", "TileEntities" }; + private static final String[] mModeStr = { "Blocks", "TileEntities" }; // This uses the Wrench as second tool to cycle speeds @Override @@ -297,8 +298,7 @@ public class MTEWorldAccelerator extends MTETieredMachineBlock { markDirty(); PlayerChatHelper .SendInfo(pPlayer, String.format("Machine radius changed to %d Blocks", getRadiusTierOverride())); - } else PlayerChatHelper - .SendError(pPlayer, String.format("Can't change radius; Machine is in TileEntity Mode!")); + } else PlayerChatHelper.SendError(pPlayer, "Can't change radius; Machine is in TileEntity Mode!"); } else { mMode = (byte) (mMode == 0x00 ? 0x01 : 0x00); markDirty(); diff --git a/src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineBase.java b/src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineBase.java index 6f6f01f3ba..259988c16a 100644 --- a/src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineBase.java @@ -1,19 +1,19 @@ /** * * Inspired/ported from GregTech 6 under the LGPL license - * + * <p> * Copyright (c) 2020 GregTech-6 Team - * + * <p> * This file is part of GregTech. - * + * <p> * GregTech is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later * version. - * + * <p> * GregTech is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more * details. - * + * <p> * You should have received a copy of the GNU Lesser General Public License along with GregTech. If not, see * <http://www.gnu.org/licenses/>. */ diff --git a/src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineFluid.java b/src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineFluid.java index e3886360c6..7cac54c4c6 100644 --- a/src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineFluid.java +++ b/src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineFluid.java @@ -1,19 +1,19 @@ /** * * Inspired/ported from GregTech 6 under the LGPL license - * + * <p> * Copyright (c) 2020 GregTech-6 Team - * + * <p> * This file is part of GregTech. - * + * <p> * GregTech is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later * version. - * + * <p> * GregTech is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more * details. - * + * <p> * You should have received a copy of the GNU Lesser General Public License along with GregTech. If not, see * <http://www.gnu.org/licenses/>. */ diff --git a/src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineItem.java b/src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineItem.java index f619d40329..e6d1ee0612 100644 --- a/src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineItem.java +++ b/src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineItem.java @@ -1,19 +1,19 @@ /** * * Inspired/ported from GregTech 6 under the LGPL license - * + * <p> * Copyright (c) 2020 GregTech-6 Team - * + * <p> * This file is part of GregTech. - * + * <p> * GregTech is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later * version. - * + * <p> * GregTech is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more * details. - * + * <p> * You should have received a copy of the GNU Lesser General Public License along with GregTech. If not, see * <http://www.gnu.org/licenses/>. */ diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialElectromagneticSeparator.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialElectromagneticSeparator.java index 20b3ce4b32..43c383a102 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialElectromagneticSeparator.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialElectromagneticSeparator.java @@ -270,8 +270,8 @@ public class MTEIndustrialElectromagneticSeparator if (!mExoticEnergyHatches.isEmpty()) { if (!mEnergyHatches.isEmpty()) return false; if (mExoticEnergyHatches.size() > 1) return false; - if (mExoticEnergyHatches.get(0) - .maxWorkingAmperesIn() > 64) return false; + return mExoticEnergyHatches.get(0) + .maxWorkingAmperesIn() <= 64; } // All checks passed! diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialLaserEngraver.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialLaserEngraver.java index 79af9a2e6b..8efb36a5ed 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialLaserEngraver.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEIndustrialLaserEngraver.java @@ -310,9 +310,7 @@ public class MTEIndustrialLaserEngraver extends MTEExtendedPowerMultiBlockBase<M if (mCasingAmount < 35) return false; if (laserSource == null) return false; if (!findLaserRenderer(base.getWorld(), base.getXCoord(), base.getYCoord(), base.getZCoord())) return false; - if (glassTier < VoltageIndex.UMV && laserSource.mTier > glassTier) return false; - - return true; + return glassTier >= VoltageIndex.UMV || laserSource.mTier <= glassTier; } private static String getUniqueIdentifier(ItemStack is) { @@ -594,7 +592,6 @@ public class MTEIndustrialLaserEngraver extends MTEExtendedPowerMultiBlockBase<M lensColors.put("gt.bwMetaGeneratedlens11499", Colors.Green); lensColors.put("gt.bwMetaGeneratedlens11358", Colors.Red); lensColors.put("MU-metaitem.0132140", Colors.Purple); - lensColors.put("MU-metaitem.0132140", Colors.Purple); // } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeFluidExtractor.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeFluidExtractor.java index fe7994f8a1..16a89bcb93 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeFluidExtractor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeFluidExtractor.java @@ -176,6 +176,7 @@ public class MTELargeFluidExtractor extends MTEExtendedPowerMultiBlockBase<MTELa if (mGlassTier < 10 && energyHatch.getTierForStructure() > mGlassTier) { mStructureBadGlassTier = true; + break; } } @@ -203,10 +204,9 @@ public class MTELargeFluidExtractor extends MTEExtendedPowerMultiBlockBase<MTELa logic.setAmperageOC(true); logic.setAvailableVoltage(this.getMaxInputEu()); logic.setAvailableAmperage(1); - - logic.setEuModifier((float) (getEUMultiplier())); + logic.setEuModifier(getEUMultiplier()); logic.setMaxParallel(getParallels()); - logic.setSpeedBonus(1.0f / (float) (getSpeedBonus())); + logic.setSpeedBonus(1.0f / getSpeedBonus()); } @Override @@ -390,16 +390,15 @@ public class MTELargeFluidExtractor extends MTEExtendedPowerMultiBlockBase<MTELa @Override public String[] getInfoData() { - var data = new ArrayList<String>(); - data.addAll(Arrays.asList(super.getInfoData())); + ArrayList<String> data = new ArrayList<>(Arrays.asList(super.getInfoData())); data.add(String.format("Max Parallels: %s%d%s", YELLOW, getParallels(), RESET)); data.add(String.format("Heating Coil Speed Bonus: +%s%.0f%s %%", YELLOW, getCoilSpeedBonus() * 100, RESET)); data.add(String.format("Total Speed Multiplier: %s%.0f%s %%", YELLOW, getSpeedBonus() * 100, RESET)); data.add(String.format("Total EU/t Multiplier: %s%.0f%s %%", YELLOW, getEUMultiplier() * 100, RESET)); - return data.toArray(new String[data.size()]); + return data.toArray(new String[0]); } public int getParallels() { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbine.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbine.java index a411621eaa..de35a7d3bc 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbine.java @@ -396,7 +396,7 @@ public abstract class MTELargeTurbine extends MTEEnhancedMultiBlockBase<MTELarge maxEnergy += tHatch.getBaseMetaTileEntity() .getEUCapacity(); } - String[] ret = new String[] { + return new String[] { // 8 Lines available for information panels tRunning + ": " + EnumChatFormatting.RED @@ -441,7 +441,6 @@ public abstract class MTELargeTurbine extends MTEEnhancedMultiBlockBase<MTELarge + EnumChatFormatting.RESET + " %" /* 8 */ }; - return ret; } public boolean hasTurbine() { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineGas.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineGas.java index ff78aec1f1..50bb13d003 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineGas.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineGas.java @@ -130,7 +130,7 @@ public class MTELargeTurbineGas extends MTELargeTurbine { @Override int fluidIntoPower(ArrayList<FluidStack> aFluids, TurbineStatCalculator turbine) { - if (aFluids.size() >= 1) { + if (!aFluids.isEmpty()) { int tEU = 0; int actualOptimalFlow = 0; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineGasAdvanced.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineGasAdvanced.java index c1893f50c1..0eceb2cf8a 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineGasAdvanced.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineGasAdvanced.java @@ -129,7 +129,7 @@ public class MTELargeTurbineGasAdvanced extends MTELargeTurbine { @Override int fluidIntoPower(ArrayList<FluidStack> aFluids, TurbineStatCalculator turbine) { - if (aFluids.size() >= 1) { + if (!aFluids.isEmpty()) { int tEU = 0; int actualOptimalFlow = 0; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbinePlasma.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbinePlasma.java index b8f34c2a52..1a8b6c173c 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbinePlasma.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbinePlasma.java @@ -124,7 +124,7 @@ public class MTELargeTurbinePlasma extends MTELargeTurbine { @Override int fluidIntoPower(ArrayList<FluidStack> aFluids, TurbineStatCalculator turbine) { - if (aFluids.size() >= 1) { + if (!aFluids.isEmpty()) { int tEU = 0; int actualOptimalFlow = 0; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineSteam.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineSteam.java index 8c6f00d52f..37b6f281e2 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineSteam.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTELargeTurbineSteam.java @@ -208,7 +208,6 @@ public class MTELargeTurbineSteam extends MTELargeTurbine { @Override public String[] getInfoData() { - super.looseFit = looseFit; return super.getInfoData(); } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiAutoclave.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiAutoclave.java index c07089a3aa..1d82114ad8 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiAutoclave.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiAutoclave.java @@ -243,7 +243,7 @@ public class MTEMultiAutoclave extends MTEExtendedPowerMultiBlockBase<MTEMultiAu return this.mMaintenanceHatches.size() == 1 && fluidPipeTier >= 0 && mCasingAmount >= 128 && itemPipeTier >= 0 - && mEnergyHatches.size() >= 1 + && !mEnergyHatches.isEmpty() && mMufflerHatches.size() == 1; } @@ -294,8 +294,7 @@ public class MTEMultiAutoclave extends MTEExtendedPowerMultiBlockBase<MTEMultiAu @Override public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBuildEnvironment env) { if (mMachine) return -1; - int build = survivialBuildPiece(STRUCTURE_PIECE_MAIN, stackSize, 3, 6, 0, elementBudget, env, false, true); - return build; + return survivialBuildPiece(STRUCTURE_PIECE_MAIN, stackSize, 3, 6, 0, elementBudget, env, false, true); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiCanner.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiCanner.java index 3af4b17e29..7d26a18a81 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiCanner.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiCanner.java @@ -184,10 +184,9 @@ public class MTEMultiCanner extends MTEExtendedPowerMultiBlockBase<MTEMultiCanne mEnergyHatches.clear(); if (!checkPiece(STRUCTURE_PIECE_MAIN, 3, 2, 2)) return false; - if (mCasingAmount < 85) return false; + return mCasingAmount >= 85; // All checks passed! - return true; } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiLathe.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiLathe.java index 784d12c12c..c10736c587 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiLathe.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiLathe.java @@ -306,7 +306,7 @@ public class MTEMultiLathe extends MTEExtendedPowerMultiBlockBase<MTEMultiLathe> if (!checkPiece(STRUCTURE_PIECE_BODY, 3, 4, -1) && !checkPiece(STRUCTURE_PIECE_BODY_ALT, 3, 4, -1)) return false; return this.mMaintenanceHatches.size() == 1 && pipeTier > 0 - && mEnergyHatches.size() >= 1 + && !mEnergyHatches.isEmpty() && mCasingAmount >= 42 && mMufflerHatches.size() == 1; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiSolidifier.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiSolidifier.java index 5597023871..ebd939536c 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiSolidifier.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiSolidifier.java @@ -44,6 +44,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; import gregtech.api.metatileentity.implementations.MTEHatchInput; import gregtech.api.metatileentity.implementations.MTEHatchInputBus; import gregtech.api.recipe.RecipeMap; @@ -310,8 +311,11 @@ public class MTEMultiSolidifier extends MTEExtendedPowerMultiBlockBase<MTEMultiS return false; } if (glassTier >= VoltageIndex.UMV) return true; - for (int i = 0; i < this.mEnergyHatches.size(); ++i) - if (this.mEnergyHatches.get(i).mTier > glassTier) return false; + for (MTEHatchEnergy mEnergyHatch : this.mEnergyHatches) { + if (mEnergyHatch.mTier > glassTier) { + return false; + } + } return mCasingAmount >= (100 + mWidth * 23); } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java index 5618232442..21c913e486 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java @@ -105,7 +105,11 @@ public class MTEPCBFactory extends MTEExtendedPowerMultiBlockBase<MTEPCBFactory> private static final String ocTier1Upgrade = "ocTier1Upgrade"; private static final String ocTier2Upgrade = "ocTier2Upgrade"; private float mRoughnessMultiplier = 1; - private int mTier = 1, mSetTier = 1, mUpgradesInstalled = 0, mCurrentParallel = 0, mMaxParallel = 0; + private int mTier = 1; + private int mSetTier = 1; + private int mUpgradesInstalled = 0; + private final int mCurrentParallel = 0; + private int mMaxParallel = 0; private boolean mBioUpgrade = false, mBioRotate = false, mOCTier1 = false, mOCTier2 = false; private final int[] mBioOffsets = new int[] { -5, -1 }; private final int[] mOCTier1Offsets = new int[] { 2, -11 }; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEPlasmaForge.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPlasmaForge.java index 0eb43414e4..5f45139e1e 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEPlasmaForge.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPlasmaForge.java @@ -849,13 +849,13 @@ public class MTEPlasmaForge extends MTEExtendedPowerMultiBlockBase<MTEPlasmaForg // If there is more than 1 TT energy hatch, the structure check will fail. // If there is a TT hatch and a normal hatch, the structure check will fail. - if (mExoticEnergyHatches.size() > 0) { - if (mEnergyHatches.size() > 0) return false; + if (!mExoticEnergyHatches.isEmpty()) { + if (!mEnergyHatches.isEmpty()) return false; if (mExoticEnergyHatches.size() > 1) return false; } // If there is 0 or more than 2 energy hatches structure check will fail. - if (mEnergyHatches.size() > 0) { + if (!mEnergyHatches.isEmpty()) { if (mEnergyHatches.size() > 2) return false; // Check will also fail if energy hatches are not of the same tier. @@ -868,7 +868,7 @@ public class MTEPlasmaForge extends MTEExtendedPowerMultiBlockBase<MTEPlasmaForg } // If there are no energy hatches or TT energy hatches, structure will fail to form. - if ((mEnergyHatches.size() == 0) && (mExoticEnergyHatches.size() == 0)) return false; + if ((mEnergyHatches.isEmpty()) && (mExoticEnergyHatches.isEmpty())) return false; // Maintenance hatch not required but left for compatibility. // Don't allow more than 1, no free casing spam! diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEWormholeGenerator.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEWormholeGenerator.java index 74f7d4c655..5438f3daa5 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEWormholeGenerator.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEWormholeGenerator.java @@ -322,6 +322,7 @@ public class MTEWormholeGenerator extends MTEEnhancedMultiBlockBase<MTEWormholeG if (energyHatch.getTierForStructure() > mGlassTier) { mStructureBadGlassTier = true; + break; } } @@ -426,12 +427,7 @@ public class MTEWormholeGenerator extends MTEEnhancedMultiBlockBase<MTEWormholeG world.setBlock(xTarget, yTarget, zTarget, Blocks.air); world.setBlock(xTarget, yTarget, zTarget, GregTechAPI.sWormholeRender); - TileEntityWormhole wormhole = (TileEntityWormhole) world.getTileEntity(xTarget, yTarget, zTarget); - - if (wormhole == null) { - return null; - } - return wormhole; + return (TileEntityWormhole) world.getTileEntity(xTarget, yTarget, zTarget); } @Nullable @@ -968,18 +964,17 @@ public class MTEWormholeGenerator extends MTEEnhancedMultiBlockBase<MTEWormholeG @Override public String[] getInfoData() { - List<String> data = new ArrayList<>(); - data.addAll(Arrays.asList(super.getInfoData())); + List<String> data = new ArrayList<>(Arrays.asList(super.getInfoData())); data.add("-----------------------"); data.add("Wormhole Generator Info"); if (mStructureBadGlassTier) { - data.add(String.format("§cStructure errors:§r")); + data.add("§cStructure errors:§r"); if (mStructureBadGlassTier) { - data.add(String.format("§cGlass tier must be greater than or equal to the energy hatch tiers.§r")); + data.add("§cGlass tier must be greater than or equal to the energy hatch tiers.§r"); } } @@ -1056,7 +1051,7 @@ public class MTEWormholeGenerator extends MTEEnhancedMultiBlockBase<MTEWormholeG data.add("-----------------------"); - return data.toArray(new String[data.size()]); + return data.toArray(new String[0]); } @Override @@ -1065,22 +1060,22 @@ public class MTEWormholeGenerator extends MTEEnhancedMultiBlockBase<MTEWormholeG screenElements.widgets(TextWidget.dynamicString(() -> { if (mLink == null) { - return String.format("§7Missing Entangled Singularity§f"); + return "§7Missing Entangled Singularity§f"; } if (!mLink.isFormed()) { - return String.format("§7Wormhole status: §cNo destination§f"); + return "§7Wormhole status: §cNo destination§f"; } if (mLink.mWormholeEnergy > 0 && !mLink.isActive()) { - return String.format("§7Wormhole status: §6Decaying§f"); + return "§7Wormhole status: §6Decaying§f"; } if (mLink.mWormholeEnergy > 0) { - return String.format("§7Wormhole status: §bActive§f"); + return "§7Wormhole status: §bActive§f"; } - return String.format("§7Wormhole status: Inactive§f"); + return "§7Wormhole status: Inactive§f"; }), TextWidget.dynamicString(() -> { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEBlackHoleCompressor.java b/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEBlackHoleCompressor.java index edfa676b53..35080a329c 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEBlackHoleCompressor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEBlackHoleCompressor.java @@ -424,9 +424,7 @@ public class MTEBlackHoleCompressor extends MTEExtendedPowerMultiBlockBase<MTEBl spacetimeHatches.clear(); if (!checkPiece(STRUCTURE_PIECE_MAIN, 17, 27, 10)) return false; - if (mCasingAmount < 950) return false; - - return true; + return mCasingAmount >= 950; } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/drone/MTEDroneCentre.java b/src/main/java/gregtech/common/tileentities/machines/multi/drone/MTEDroneCentre.java index cf52680d71..f84e2a7af0 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/drone/MTEDroneCentre.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/drone/MTEDroneCentre.java @@ -787,8 +787,7 @@ public class MTEDroneCentre extends MTEExtendedPowerMultiBlockBase<MTEDroneCentr } }) .addTooltip(StatCollector.translateToLocal("GT5U.gui.button.drone_highlight")) - .setBackground( - new IDrawable[] { GTUITextures.BUTTON_STANDARD, GTUITextures.OVERLAY_BUTTON_INVERT_REDSTONE }) + .setBackground(GTUITextures.BUTTON_STANDARD, GTUITextures.OVERLAY_BUTTON_INVERT_REDSTONE) .setSize(16, 16)); // Show the reason why the machine shutdown row.widget( diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationPlant.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationPlant.java index 2c575528ab..7b93e4ce07 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationPlant.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationPlant.java @@ -338,11 +338,7 @@ public class MTEPurificationPlant extends MTEExtendedPowerMultiBlockBase<MTEPuri } // using nano forge method of detecting hatches. - if (!checkExoticAndNormalEnergyHatches()) { - return false; - } - - return true; + return checkExoticAndNormalEnergyHatches(); } private boolean checkHatches() { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitDegasser.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitDegasser.java index b139a0f6d4..05e8c9282d 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitDegasser.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitDegasser.java @@ -305,11 +305,9 @@ public class MTEPurificationUnitDegasser extends MTEPurificationUnitBase<MTEPuri .addInfo("Denote the lowest bit as bit 1, and the highest as bit 4.") .addSeparator() .addInfo( - EnumChatFormatting.WHITE + "" - + EnumChatFormatting.BOLD + EnumChatFormatting.WHITE.toString() + EnumChatFormatting.BOLD + "Bit 1: " + EnumChatFormatting.BLUE - + "" + EnumChatFormatting.BOLD + "Ozone Sparging by Inert Gas") .addInfo( @@ -351,11 +349,9 @@ public class MTEPurificationUnitDegasser extends MTEPurificationUnitBase<MTEPuri + "Xenon") .addSeparator() .addInfo( - EnumChatFormatting.WHITE + "" - + EnumChatFormatting.BOLD + EnumChatFormatting.WHITE.toString() + EnumChatFormatting.BOLD + "Bit 2: " + EnumChatFormatting.BLUE - + "" + EnumChatFormatting.BOLD + "Superconductive Deionization") .addInfo( @@ -390,7 +386,6 @@ public class MTEPurificationUnitDegasser extends MTEPurificationUnitBase<MTEPuri + EnumChatFormatting.GRAY + " / " + EnumChatFormatting.DARK_BLUE - + "" + EnumChatFormatting.BOLD + "UIV" + EnumChatFormatting.GRAY @@ -400,7 +395,6 @@ public class MTEPurificationUnitDegasser extends MTEPurificationUnitBase<MTEPuri + EnumChatFormatting.GRAY + " / " + EnumChatFormatting.RED - + "" + EnumChatFormatting.BOLD + "UMV" + EnumChatFormatting.GRAY @@ -409,11 +403,9 @@ public class MTEPurificationUnitDegasser extends MTEPurificationUnitBase<MTEPuri + "2x") .addSeparator() .addInfo( - EnumChatFormatting.WHITE + "" - + EnumChatFormatting.BOLD + EnumChatFormatting.WHITE.toString() + EnumChatFormatting.BOLD + "Bit 3: " + EnumChatFormatting.BLUE - + "" + EnumChatFormatting.BOLD + "Gravitationally-Generated Differential Vacuum Extraction") .addInfo( @@ -423,11 +415,9 @@ public class MTEPurificationUnitDegasser extends MTEPurificationUnitBase<MTEPuri + "Molten Neutronium") .addSeparator() .addInfo( - EnumChatFormatting.WHITE + "" - + EnumChatFormatting.BOLD + EnumChatFormatting.WHITE.toString() + EnumChatFormatting.BOLD + "Bit 4: " + EnumChatFormatting.BLUE - + "" + EnumChatFormatting.BOLD + "Seldonian Settlement Process") .addInfo( @@ -437,11 +427,9 @@ public class MTEPurificationUnitDegasser extends MTEPurificationUnitBase<MTEPuri + "all other bits and do not insert anything.") .addSeparator() .addInfo( - EnumChatFormatting.WHITE + "" - + EnumChatFormatting.BOLD + EnumChatFormatting.WHITE.toString() + EnumChatFormatting.BOLD + "No bits: " + EnumChatFormatting.BLUE - + "" + EnumChatFormatting.BOLD + "Machine Overload") .addInfo("In rare cases, the machine may overload and output no control signal at all.") diff --git a/src/main/java/gregtech/common/tileentities/machines/multiblock/DistillationTower.java b/src/main/java/gregtech/common/tileentities/machines/multiblock/DistillationTower.java index d4ac6241d2..e3a97cfebc 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multiblock/DistillationTower.java +++ b/src/main/java/gregtech/common/tileentities/machines/multiblock/DistillationTower.java @@ -32,7 +32,7 @@ public class DistillationTower extends StackableController<DistillationTower, Di private static final Vec3Impl STRUCTURE_OFFSET_MEGA_STACK = new Vec3Impl(0, 3, 0); private static final String STACKABLE_MIDDLE_1 = "STACKABLE_MIDDLE_1"; private static final String STACKABLE_MIDDLE_2 = "STACKABLE_MIDDLE_2"; - private boolean isMega = true; + private final boolean isMega = true; @Override public short getCasingRegistryID() { diff --git a/src/main/java/gregtech/common/tileentities/storage/MTEDigitalChestBase.java b/src/main/java/gregtech/common/tileentities/storage/MTEDigitalChestBase.java index 96ec6c06ae..d67240919a 100644 --- a/src/main/java/gregtech/common/tileentities/storage/MTEDigitalChestBase.java +++ b/src/main/java/gregtech/common/tileentities/storage/MTEDigitalChestBase.java @@ -227,7 +227,7 @@ public abstract class MTEDigitalChestBase extends MTETieredMachineBlock final long notAdded = itemCount + toAdd - maxCapacity; if (mode == appeng.api.config.Actionable.MODULATE) { - final int newCount = (int) Math.min((long) maxCapacity, itemCount + toAdd); + final int newCount = (int) Math.min(maxCapacity, itemCount + toAdd); if (storedStack == null) { setItemStack(inputStack.copy()); diff --git a/src/main/java/gregtech/loaders/misc/bees/GTFlowers.java b/src/main/java/gregtech/loaders/misc/bees/GTFlowers.java index db96bfb454..8f0229d369 100644 --- a/src/main/java/gregtech/loaders/misc/bees/GTFlowers.java +++ b/src/main/java/gregtech/loaders/misc/bees/GTFlowers.java @@ -26,7 +26,7 @@ public enum GTFlowers implements IFlowerProvider, IAlleleFlowers, IChromosomeTyp FLAMING; - protected boolean dominant; + private final boolean dominant; GTFlowers() { dominant = true; @@ -67,9 +67,8 @@ public enum GTFlowers implements IFlowerProvider, IAlleleFlowers, IChromosomeTyp } public ItemStack[] getItemStacks() { - switch (this) { - case FLAMING: - return new ItemStack[] { new ItemStack(Blocks.fire) }; + if (this == GTFlowers.FLAMING) { + return new ItemStack[] { new ItemStack(Blocks.fire) }; } return new ItemStack[0]; } @@ -86,9 +85,8 @@ public enum GTFlowers implements IFlowerProvider, IAlleleFlowers, IChromosomeTyp return false; } - switch (this) { - case FLAMING: - return block == Blocks.fire; + if (this == GTFlowers.FLAMING) { + return block == Blocks.fire; } return false; } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java index bedbb2d41e..283a700b8e 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java @@ -179,8 +179,8 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist .addTo(compressorRecipes); } - switch (aMaterial.mName) { - case "Mercury" -> System.err.println( + if (aMaterial.mName.equals("Mercury")) { + System.err.println( "'blockQuickSilver'?, In which Ice Desert can you actually place this as a solid Block? On Pluto Greg :)"); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java index 62c1c7cc5c..bbb54d142e 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java @@ -60,7 +60,7 @@ public class ProcessingCell implements IOreRecipeRegistrator { .metadata(FUEL_TYPE, aMaterial.mFuelType) .addTo(GTRecipeConstants.Fuel); } - if (!((aMaterial.mMaterialList.size() > 0) && ((aMaterial.mExtraData & 0x3) != 0))) { + if (!((!aMaterial.mMaterialList.isEmpty()) && ((aMaterial.mExtraData & 0x3) != 0))) { break; } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java index 2407a48f70..afe898a66e 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java @@ -149,7 +149,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr } } } - if ((aMaterial.mMaterialList.size() > 0) && ((aMaterial.mExtraData & 0x3) != 0)) { + if ((!aMaterial.mMaterialList.isEmpty()) && ((aMaterial.mExtraData & 0x3) != 0)) { long tItemAmount = 0L; long tCapsuleCount = 0L; long tDensityMultiplier = aMaterial.getDensity() > 3628800L ? aMaterial.getDensity() / 3628800L @@ -188,7 +188,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr } tItemAmount = (tItemAmount * tDensityMultiplier % aMaterial.getDensity() > 0L ? 1 : 0) + tItemAmount * tDensityMultiplier / aMaterial.getDensity(); - if (tList.size() > 0) { + if (!tList.isEmpty()) { FluidStack tFluid = null; int tList_sS = tList.size(); for (int i = 0; i < tList_sS; i++) { @@ -202,7 +202,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr } } if ((aMaterial.mExtraData & 0x1) != 0) { - if (tList.size() > 0 || tFluid != null) { + if (!tList.isEmpty() || tFluid != null) { GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder(); if (tCapsuleCount > 0L) { recipeBuilder.itemInputs( @@ -211,7 +211,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr } else { recipeBuilder.itemInputs(GTUtility.copyAmount(tItemAmount, aStack)); } - if (tList.size() > 0) { + if (!tList.isEmpty()) { ItemStack[] outputsArray = tList.toArray(new ItemStack[Math.min(tList.size(), 6)]); recipeBuilder.itemOutputs(outputsArray); } @@ -225,7 +225,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr } } if ((aMaterial.mExtraData & 0x2) != 0) { - if (tList.size() > 0 || tFluid != null) { + if (!tList.isEmpty() || tFluid != null) { GTRecipeBuilder recipeBuilder = GTValues.RA.stdBuilder(); if (tCapsuleCount > 0L) { recipeBuilder.itemInputs( @@ -234,7 +234,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr } else { recipeBuilder.itemInputs(GTUtility.copyAmount(tItemAmount, aStack)); } - if (tList.size() > 0) { + if (!tList.isEmpty()) { ItemStack[] outputsArray = tList.toArray(new ItemStack[Math.min(tList.size(), 6)]); recipeBuilder.itemOutputs(outputsArray); } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRawOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRawOre.java index c930d9c304..2a642f2531 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRawOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRawOre.java @@ -80,7 +80,7 @@ public class ProcessingRawOre implements gregtech.api.interfaces.IOreRecipeRegis : tIngot; ItemStack tDust = GTOreDictUnificator.get(OrePrefixes.dust, tMaterial, tGem, 1L); ItemStack tCleaned = GTOreDictUnificator.get(OrePrefixes.crushedPurified, tMaterial, tDust, 1L); - ItemStack tCrushed = GTOreDictUnificator.get(OrePrefixes.crushed, tMaterial, (long) aMaterial.mOreMultiplier); + ItemStack tCrushed = GTOreDictUnificator.get(OrePrefixes.crushed, tMaterial, aMaterial.mOreMultiplier); ItemStack tPrimaryByProduct = null; if (tCrushed == null) { @@ -88,7 +88,7 @@ public class ProcessingRawOre implements gregtech.api.interfaces.IOreRecipeRegis OrePrefixes.dustImpure, tMaterial, GTUtility.copyAmount(aMaterial.mOreMultiplier, tCleaned, tDust, tGem), - (long) aMaterial.mOreMultiplier); + aMaterial.mOreMultiplier); } for (Materials tMat : aMaterial.mOreByProducts) { |