From 3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Wed, 2 Oct 2024 07:31:08 +0200 Subject: Cleanup the codebase (#3311) Co-authored-by: boubou19 --- .../blocks/regularBlock/BlockTurbineCasing.java | 5 +- .../blocks/tileEntity/AntimatterForge.java | 85 +++++++++------------- .../blocks/tileEntity/AntimatterGenerator.java | 6 +- .../blocks/tileEntity/MTEEssentiaHatch.java | 2 +- .../tileEntity/MTEEssentiaOutputHatchME.java | 2 +- .../blocks/tileEntity/MTEFuelRefineFactory.java | 4 +- .../tileEntity/MTELargeEssentiaSmeltery.java | 10 +-- .../blocks/tileEntity/MTEMultiNqGenerator.java | 4 +- .../tileEntity/base/MTELargeFusionComputer.java | 2 +- .../tileEntity/base/MTELargeTurbineBase.java | 5 +- .../client/render/AntimatterRenderer.java | 6 +- .../client/render/BlockRenderHandler.java | 6 +- .../java/goodgenerator/crossmod/nei/NEIConfig.java | 1 - src/main/java/goodgenerator/items/GGItem.java | 4 +- .../java/goodgenerator/items/GGItemBlocks.java | 3 +- src/main/java/goodgenerator/items/GGMaterial.java | 1 - src/main/java/goodgenerator/items/ItemFuelRod.java | 2 +- .../java/goodgenerator/loader/RecipeLoader2.java | 4 +- .../java/goodgenerator/util/CrackRecipeAdder.java | 2 +- .../java/goodgenerator/util/StructureHelper.java | 10 +-- 20 files changed, 70 insertions(+), 94 deletions(-) (limited to 'src/main/java/goodgenerator') diff --git a/src/main/java/goodgenerator/blocks/regularBlock/BlockTurbineCasing.java b/src/main/java/goodgenerator/blocks/regularBlock/BlockTurbineCasing.java index 6b6de38161..38aeae89cd 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/BlockTurbineCasing.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/BlockTurbineCasing.java @@ -21,7 +21,7 @@ public class BlockTurbineCasing extends BlockCasing implements ITextureBlock { static { for (int i = 0; i < 3; i++) for (int j = 1; j <= 9; j++) - turbineShape[i][j - 1] = new Textures.BlockIcons.CustomIcon("icons/turbines/TURBINE_" + i + "" + j); + turbineShape[i][j - 1] = new Textures.BlockIcons.CustomIcon("icons/turbines/TURBINE_" + i + j); } public BlockTurbineCasing(String name, String texture) { @@ -31,8 +31,7 @@ public class BlockTurbineCasing extends BlockCasing implements ITextureBlock { private static int isTurbineControllerWithSide(IBlockAccess aWorld, int aX, int aY, int aZ, ForgeDirection side) { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); - if (!(tTileEntity instanceof IGregTechTileEntity)) return 0; - IGregTechTileEntity tTile = (IGregTechTileEntity) tTileEntity; + if (!(tTileEntity instanceof IGregTechTileEntity tTile)) return 0; if (tTile.getMetaTileEntity() instanceof MTELargeTurbineBase && tTile.getFrontFacing() == side) { if (tTile.isActive()) return 1; return ((MTELargeTurbineBase) tTile.getMetaTileEntity()).hasTurbine() ? 2 : 3; diff --git a/src/main/java/goodgenerator/blocks/tileEntity/AntimatterForge.java b/src/main/java/goodgenerator/blocks/tileEntity/AntimatterForge.java index 1749b07df8..c60f4e56ac 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/AntimatterForge.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/AntimatterForge.java @@ -90,27 +90,27 @@ public class AntimatterForge extends MTEExtendedPowerMultiBlockBase amOutputHatches = new ArrayList<>(16); - private static final ClassValue> STRUCTURE_DEFINITION = new ClassValue>() { + private final List amOutputHatches = new ArrayList<>(16); + private static final ClassValue> STRUCTURE_DEFINITION = new ClassValue<>() { @Override protected IStructureDefinition computeValue(Class type) { @@ -189,10 +189,10 @@ public class AntimatterForge extends MTEExtendedPowerMultiBlockBase inputFluids = getStoredFluids(); - for (int i = 0; i < inputFluids.size(); i++) { - FluidStack inputFluid = inputFluids.get(i); + for (FluidStack inputFluid : inputFluids) { setModifiers(inputFluid, -0.15f, magneticUpgrades, MAGNETIC_ID); setModifiers(inputFluid, -0.05f, gravityUpgrades, GRAVITY_ID); setModifiers(inputFluid, 0.05f, containmentUpgrades, CONTAINMENT_ID); @@ -571,7 +561,7 @@ public class AntimatterForge extends MTEExtendedPowerMultiBlockBase= 0) { - hatch.fill(MaterialsUEVplus.Antimatter.getFluid((long) (change)), true); + hatch.fill(MaterialsUEVplus.Antimatter.getFluid(change), true); } else { hatch.drain(-change, true); } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/AntimatterGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/AntimatterGenerator.java index 8cb3fed65b..b299c0d502 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/AntimatterGenerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/AntimatterGenerator.java @@ -79,7 +79,7 @@ public class AntimatterGenerator extends MTEExtendedPowerMultiBlockBase private float annihilationEfficiency = 0f; public static final long ANTIMATTER_FUEL_VALUE = 1_000_000_000_000L; - private static final ClassValue> STRUCTURE_DEFINITION = new ClassValue>() { + private static final ClassValue> STRUCTURE_DEFINITION = new ClassValue<>() { @Override protected IStructureDefinition computeValue(Class type) { @@ -125,7 +125,7 @@ public class AntimatterGenerator extends MTEExtendedPowerMultiBlockBase .extFacing() .glow() .build())); - }; + } private boolean addLaserSource(IGregTechTileEntity aBaseMetaTileEntity, int aBaseCasingIndex) { IMetaTileEntity aMetaTileEntity = aBaseMetaTileEntity.getMetaTileEntity(); @@ -278,7 +278,7 @@ public class AntimatterGenerator extends MTEExtendedPowerMultiBlockBase @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new AntimatterGenerator(this.MAIN_NAME); + return new AntimatterGenerator(MAIN_NAME); } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTEEssentiaHatch.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEEssentiaHatch.java index d8680f5efd..fdc2445aee 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTEEssentiaHatch.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEEssentiaHatch.java @@ -169,7 +169,7 @@ public class MTEEssentiaHatch extends TileEntity implements IAspectContainer, IE @Override public boolean doesContainerContain(AspectList aspectList) { - ArrayList ret = new ArrayList(); + ArrayList ret = new ArrayList<>(); for (Aspect a : aspectList.aspects.keySet()) ret.add(current.aspects.containsKey(a)); return !ret.contains(false); } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTEEssentiaOutputHatchME.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEEssentiaOutputHatchME.java index 4e8bba61ec..a832cf72cc 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTEEssentiaOutputHatchME.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEEssentiaOutputHatchME.java @@ -25,7 +25,7 @@ public class MTEEssentiaOutputHatchME extends MTEEssentiaOutputHatch implements private AENetworkProxy gridProxy = null; private IMEEssentiaMonitor monitor = null; - private MachineSource asMachineSource = new MachineSource(this); + private final MachineSource asMachineSource = new MachineSource(this); @Override public void updateEntity() { diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTEFuelRefineFactory.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEFuelRefineFactory.java index f2b83bb663..f855a864a6 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTEFuelRefineFactory.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEFuelRefineFactory.java @@ -54,7 +54,7 @@ public class MTEFuelRefineFactory extends MTETooltipMultiBlockBaseEM implements private IStructureDefinition multiDefinition = null; private int Tier = -1; - private int[] cnt = new int[] { 0, 0, 0, 0 }; + private final int[] cnt = new int[] { 0, 0, 0, 0 }; private static final Block[] coils = new Block[] { Loaders.FRF_Coil_1, Loaders.FRF_Coil_2, Loaders.FRF_Coil_3, Loaders.FRF_Coil_4 }; @@ -128,7 +128,7 @@ public class MTEFuelRefineFactory extends MTETooltipMultiBlockBaseEM implements } public static IStructureElement ofFieldCoil(int aIndex) { - return new IStructureElement() { + return new IStructureElement<>() { @Override public boolean check(T t, World world, int x, int y, int z) { diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaSmeltery.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaSmeltery.java index 43d066d5b5..8b69ee5e0a 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaSmeltery.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaSmeltery.java @@ -81,9 +81,9 @@ public class MTELargeEssentiaSmeltery extends MTETooltipMultiBlockBaseEM protected int nodeIncrease = 0; private IStructureDefinition multiDefinition = null; - private ArrayList mEssentiaOutputHatches = new ArrayList<>(); + private final ArrayList mEssentiaOutputHatches = new ArrayList<>(); private int pTier = 0; - private XSTR xstr = new XSTR(); + private final XSTR xstr = new XSTR(); public MTELargeEssentiaSmeltery(String name) { super(name); @@ -131,8 +131,8 @@ public class MTELargeEssentiaSmeltery extends MTETooltipMultiBlockBaseEM if (len > MAX_STRUCTURE_LENGTH - 1 || len < DEFAULT_STRUCTURE_LENGTH) return false; if (!structureCheck_EM(STRUCTURE_PIECE_LAST, 2, 2, -len - 1)) return false; if (this.mCasing >= 24 && this.mMaintenanceHatches.size() == 1 - && this.mInputBusses.size() >= 1 - && this.mEssentiaOutputHatches.size() >= 1) { + && !this.mInputBusses.isEmpty() + && !this.mEssentiaOutputHatches.isEmpty()) { this.mParallel = Math.floor(this.mParallel += 1 << this.pTier); return true; } @@ -288,7 +288,7 @@ public class MTELargeEssentiaSmeltery extends MTETooltipMultiBlockBaseEM private boolean addEssentiaOutputHatchToMachineList(MTEEssentiaOutputHatch aTileEntity) { if (aTileEntity instanceof MTEEssentiaOutputHatch) { - return this.mEssentiaOutputHatches.add((MTEEssentiaOutputHatch) aTileEntity); + return this.mEssentiaOutputHatches.add(aTileEntity); } return false; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTEMultiNqGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEMultiNqGenerator.java index c83ef8c4fe..6ba3c48148 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTEMultiNqGenerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEMultiNqGenerator.java @@ -338,7 +338,7 @@ public class MTEMultiNqGenerator extends MTETooltipMultiBlockBaseEM implements I } public void addAutoEnergy(long outputPower) { - if (this.eDynamoMulti.size() > 0) for (MTEHatch tHatch : this.eDynamoMulti) { + if (!this.eDynamoMulti.isEmpty()) for (MTEHatch tHatch : this.eDynamoMulti) { long voltage = tHatch.maxEUOutput(); long power = voltage * tHatch.maxAmperesOut(); long outputAmperes; @@ -352,7 +352,7 @@ public class MTEMultiNqGenerator extends MTETooltipMultiBlockBaseEM implements I addEnergyOutput_EM(outputPower, 1); } } - if (this.mDynamoHatches.size() > 0) for (MTEHatch tHatch : this.mDynamoHatches) { + if (!this.mDynamoHatches.isEmpty()) for (MTEHatch tHatch : this.mDynamoHatches) { long voltage = tHatch.maxEUOutput(); long power = voltage * tHatch.maxAmperesOut(); long outputAmperes; diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeFusionComputer.java b/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeFusionComputer.java index 72ced183c3..f2302511fb 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeFusionComputer.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeFusionComputer.java @@ -76,7 +76,7 @@ public abstract class MTELargeFusionComputer extends MTETooltipMultiBlockBaseEM public GTRecipe mLastRecipe; public int para; protected OverclockDescriber overclockDescriber; - private static final ClassValue> STRUCTURE_DEFINITION = new ClassValue>() { + private static final ClassValue> STRUCTURE_DEFINITION = new ClassValue<>() { @Override protected IStructureDefinition computeValue(Class type) { diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeTurbineBase.java b/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeTurbineBase.java index 7b06dbb96d..076d8f54fd 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeTurbineBase.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeTurbineBase.java @@ -45,7 +45,7 @@ public abstract class MTELargeTurbineBase extends MTEEnhancedMultiBlockBase> STRUCTURE_DEFINITION = new ClassValue>() { + private static final ClassValue> STRUCTURE_DEFINITION = new ClassValue<>() { @Override protected IStructureDefinition computeValue(Class type) { @@ -270,7 +270,7 @@ public abstract class MTELargeTurbineBase extends MTEEnhancedMultiBlockBase 0) { + if (!tooltips.isEmpty()) { p_77624_3_.addAll(tooltips); } - if (tooltipses.size() > 0) { + if (!tooltipses.isEmpty()) { int meta = p_77624_1_.getItemDamage(); if (tooltipses.size() - 1 < meta) meta = tooltipses.size() - 1; p_77624_3_.add(tooltipses.get(meta)); diff --git a/src/main/java/goodgenerator/items/GGItemBlocks.java b/src/main/java/goodgenerator/items/GGItemBlocks.java index 2d13d7a7af..2c22a2e369 100644 --- a/src/main/java/goodgenerator/items/GGItemBlocks.java +++ b/src/main/java/goodgenerator/items/GGItemBlocks.java @@ -71,8 +71,7 @@ public class GGItemBlocks extends ItemBlock { public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { if (stack == null) return; tooltip.add(mNoMobsToolTip); - if (Block.getBlockFromItem(stack.getItem()) instanceof BlockTEContainer) { - BlockTEContainer tile = (BlockTEContainer) Block.getBlockFromItem(stack.getItem()); + if (Block.getBlockFromItem(stack.getItem()) instanceof BlockTEContainer tile) { if (tile.getIndex() == 1) tooltip.addAll(Arrays.asList(DescTextLocalization.addText("EssentiaHatch.tooltip", 2))); if (tile.getIndex() == 2) { diff --git a/src/main/java/goodgenerator/items/GGMaterial.java b/src/main/java/goodgenerator/items/GGMaterial.java index ca26cfe986..cc02666fd0 100644 --- a/src/main/java/goodgenerator/items/GGMaterial.java +++ b/src/main/java/goodgenerator/items/GGMaterial.java @@ -9,7 +9,6 @@ import bartworks.util.Pair; import goodgenerator.util.CharExchanger; import gregtech.api.enums.TextureSet; -@SuppressWarnings({ "unchecked" }) public class GGMaterial implements Runnable { protected static final int OffsetID = 10001; diff --git a/src/main/java/goodgenerator/items/ItemFuelRod.java b/src/main/java/goodgenerator/items/ItemFuelRod.java index 89acdf6933..3f55e0b2e5 100644 --- a/src/main/java/goodgenerator/items/ItemFuelRod.java +++ b/src/main/java/goodgenerator/items/ItemFuelRod.java @@ -80,7 +80,7 @@ public class ItemFuelRod extends RadioactiveItem implements IReactorComponent, I this.checkHeatAcceptor(reactor, x, y - 1, heatAcceptors); this.checkHeatAcceptor(reactor, x, y + 1, heatAcceptors); - while (heatAcceptors.size() > 0 && heat > 0) { + while (!heatAcceptors.isEmpty() && heat > 0) { int dheat = heat / heatAcceptors.size(); heat -= dheat; dheat = ((IReactorComponent) heatAcceptors.get(0).stack.getItem()).alterHeat( diff --git a/src/main/java/goodgenerator/loader/RecipeLoader2.java b/src/main/java/goodgenerator/loader/RecipeLoader2.java index 1301ac97f5..f58f771629 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader2.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader2.java @@ -853,8 +853,8 @@ public class RecipeLoader2 { .eut(TierEU.RECIPE_MV) .addTo(fluidExtractionRecipes); - if (OreDictionary.getOres("fuelCoke") - .size() > 0) { + if (!OreDictionary.getOres("fuelCoke") + .isEmpty()) { GTValues.RA.stdBuilder() .itemInputs( OreDictionary.getOres("fuelCoke") diff --git a/src/main/java/goodgenerator/util/CrackRecipeAdder.java b/src/main/java/goodgenerator/util/CrackRecipeAdder.java index 14ebd378d6..057447746d 100644 --- a/src/main/java/goodgenerator/util/CrackRecipeAdder.java +++ b/src/main/java/goodgenerator/util/CrackRecipeAdder.java @@ -55,7 +55,7 @@ public class CrackRecipeAdder { .itemInputs(GTUtility.getIntegratedCircuit(2)) .fluidInputs(inputFluid, cracker) .fluidOutputs(FluidRegistry.getFluidStack("moderatelycracked" + name, 1000)) - .duration(Math.max((long) (Duration), 1L) * TICKS) + .duration(Math.max(Duration, 1L) * TICKS) .eut(EUt) .addTo(crackingRecipes); diff --git a/src/main/java/goodgenerator/util/StructureHelper.java b/src/main/java/goodgenerator/util/StructureHelper.java index 0d2c101ee9..215f6fc1ca 100644 --- a/src/main/java/goodgenerator/util/StructureHelper.java +++ b/src/main/java/goodgenerator/util/StructureHelper.java @@ -25,15 +25,14 @@ import gregtech.api.util.GTOreDictUnificator; public class StructureHelper { public static IStructureElement addFrame(Materials aMaterials) { - return new IStructureElement() { + return new IStructureElement<>() { private IIcon[] mIcons; @Override public boolean check(T t, World world, int x, int y, int z) { TileEntity tBlock = world.getTileEntity(x, y, z); - if (tBlock instanceof BaseMetaPipeEntity) { - BaseMetaPipeEntity tFrame = (BaseMetaPipeEntity) tBlock; + if (tBlock instanceof BaseMetaPipeEntity tFrame) { if (tFrame.isInvalidTileEntity()) return false; if (tFrame.getMetaTileEntity() instanceof MTEFrame) { return ((MTEFrame) tFrame.getMetaTileEntity()).mMaterial == aMaterials; @@ -55,8 +54,7 @@ public class StructureHelper { @Override public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) { ItemStack tFrame = GTOreDictUnificator.get(OrePrefixes.frameGt, aMaterials, 1); - if (tFrame.getItem() instanceof ItemBlock) { - ItemBlock tFrameStackItem = (ItemBlock) tFrame.getItem(); + if (tFrame.getItem() instanceof ItemBlock tFrameStackItem) { return tFrameStackItem .placeBlockAt(tFrame, null, world, x, y, z, 6, 0, 0, 0, Items.feather.getDamage(tFrame)); } @@ -77,7 +75,7 @@ public class StructureHelper { public static IStructureElement addTieredBlock(Block aBlock, BiPredicate aSetTheFuckingMeta, Function aGetTheFuckingMeta, int maxMeta) { - return new IStructureElement() { + return new IStructureElement<>() { @Override public boolean check(T t, World world, int x, int y, int z) { -- cgit