diff options
510 files changed, 2044 insertions, 2847 deletions
diff --git a/src/functionalTest/java/kubatech/test/EIGTests.java b/src/functionalTest/java/kubatech/test/EIGTests.java index 14cb713484..e573bcee60 100644 --- a/src/functionalTest/java/kubatech/test/EIGTests.java +++ b/src/functionalTest/java/kubatech/test/EIGTests.java @@ -31,7 +31,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; -import net.minecraft.world.MinecraftException; import net.minecraft.world.World; import net.minecraft.world.WorldProvider; import net.minecraft.world.WorldProviderSurface; @@ -86,7 +85,7 @@ public class EIGTests { } @Override - public void checkSessionLock() throws MinecraftException { + public void checkSessionLock() { } diff --git a/src/main/java/bartworks/API/BorosilicateGlass.java b/src/main/java/bartworks/API/BorosilicateGlass.java index b33f43689f..1c15104f63 100644 --- a/src/main/java/bartworks/API/BorosilicateGlass.java +++ b/src/main/java/bartworks/API/BorosilicateGlass.java @@ -112,9 +112,9 @@ public class BorosilicateGlass { /** * Register a new block as valid borosilicate glass with given tier (even if it doesn't contain boron at all) - * + * <p> * Does not support matching by more complex stuff like tile entity! - * + * <p> * Can only be called at INIT stage. */ public static void registerGlass(Block block, int meta, byte tier) { diff --git a/src/main/java/bartworks/common/configs/LanderType.java b/src/main/java/bartworks/common/configs/LanderType.java index a392ec3e38..a97006c390 100644 --- a/src/main/java/bartworks/common/configs/LanderType.java +++ b/src/main/java/bartworks/common/configs/LanderType.java @@ -3,5 +3,5 @@ package bartworks.common.configs; public enum LanderType { MoonLander, LandingBalloons, - AsteroidsLander; + AsteroidsLander } diff --git a/src/main/java/bartworks/common/loaders/StaticRecipeChangeLoaders.java b/src/main/java/bartworks/common/loaders/StaticRecipeChangeLoaders.java index f266c2fdc2..ae1c037589 100644 --- a/src/main/java/bartworks/common/loaders/StaticRecipeChangeLoaders.java +++ b/src/main/java/bartworks/common/loaders/StaticRecipeChangeLoaders.java @@ -17,7 +17,7 @@ import static gregtech.api.enums.Mods.TinkerConstruct; import java.lang.reflect.Field; import java.util.ArrayList; -import java.util.Arrays; +import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -59,8 +59,9 @@ public class StaticRecipeChangeLoaders { private static TObjectDoubleHashMap<Materials> gtEbfGasRecipeTimeMultipliers = null; private static TObjectDoubleHashMap<Materials> gtEbfGasRecipeConsumptionMultipliers = null; - public static final List<ItemStack> whitelistForEBFNoGasRecipeDontCheckItemData = Arrays - .asList(GTModHandler.getModItem(TinkerConstruct.ID, "materials", 1L, 12) // Raw Aluminum -> Aluminium Ingot + public static final List<ItemStack> whitelistForEBFNoGasRecipeDontCheckItemData = Collections + .singletonList(GTModHandler.getModItem(TinkerConstruct.ID, "materials", 1L, 12) // Raw Aluminum -> Aluminium + // Ingot // (coremod) ); diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java b/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java index 88c5888878..d3b2aa804b 100644 --- a/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java +++ b/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java @@ -313,7 +313,7 @@ public class MTEBioVat extends MTEEnhancedMultiBlockBase<MTEBioVat> implements I return false; } IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity == null || !(aMetaTileEntity instanceof GT_MetaTileEntity_RadioHatch)) { + if (!(aMetaTileEntity instanceof GT_MetaTileEntity_RadioHatch)) { return false; } else { ((GT_MetaTileEntity_RadioHatch) aMetaTileEntity).updateTexture(CasingIndex); @@ -332,8 +332,8 @@ public class MTEBioVat extends MTEEnhancedMultiBlockBase<MTEBioVat> implements I return this.mCasing >= 19 && this.mRadHatches.size() <= 1 && this.mOutputHatches.size() == 1 && this.mMaintenanceHatches.size() == 1 - && this.mInputHatches.size() > 0 - && this.mEnergyHatches.size() > 0; + && !this.mInputHatches.isEmpty() + && !this.mEnergyHatches.isEmpty(); } @Override diff --git a/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java b/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java index 46f5e66649..63558feb8b 100644 --- a/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java +++ b/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java @@ -416,7 +416,7 @@ public class MTECircuitAssemblyLine extends MTEEnhancedMultiBlockBase<MTECircuit return false; } IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity == null || !(aMetaTileEntity instanceof MTEHatchInput)) { + if (!(aMetaTileEntity instanceof MTEHatchInput)) { return false; } else { ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEElectricImplosionCompressor.java b/src/main/java/bartworks/common/tileentities/multis/MTEElectricImplosionCompressor.java index 76cf946f85..dcb1a7586e 100644 --- a/src/main/java/bartworks/common/tileentities/multis/MTEElectricImplosionCompressor.java +++ b/src/main/java/bartworks/common/tileentities/multis/MTEElectricImplosionCompressor.java @@ -466,7 +466,7 @@ public class MTEElectricImplosionCompressor extends MTEExtendedPowerMultiBlockBa mMaxHatchTier = Math.max(mMaxHatchTier, hatch.mTier); } - isOK = isOK && this.mMaintenanceHatches.size() == 1 && energyHatches.size() >= 1; + isOK = isOK && this.mMaintenanceHatches.size() == 1 && !energyHatches.isEmpty(); if (isOK) { this.activatePiston(); return true; diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEHighTempGasCooledReactor.java b/src/main/java/bartworks/common/tileentities/multis/MTEHighTempGasCooledReactor.java index 3250c7ce0d..22143ad543 100644 --- a/src/main/java/bartworks/common/tileentities/multis/MTEHighTempGasCooledReactor.java +++ b/src/main/java/bartworks/common/tileentities/multis/MTEHighTempGasCooledReactor.java @@ -185,11 +185,11 @@ public class MTEHighTempGasCooledReactor extends MTEEnhancedMultiBlockBase<MTEHi this.mCasing = 0; return this.checkPiece("main", 5, 11, 0) && this.mCasing >= 500 && this.mMaintenanceHatches.size() == 1 - && this.mInputHatches.size() > 0 - && this.mOutputHatches.size() > 0 - && this.mInputBusses.size() > 0 - && this.mOutputBusses.size() > 0 - && this.mEnergyHatches.size() > 0; + && !this.mInputHatches.isEmpty() + && !this.mOutputHatches.isEmpty() + && !this.mInputBusses.isEmpty() + && !this.mOutputBusses.isEmpty() + && !this.mEnergyHatches.isEmpty(); } @Override diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEManualTrafo.java b/src/main/java/bartworks/common/tileentities/multis/MTEManualTrafo.java index 2533fd5213..d6306badee 100644 --- a/src/main/java/bartworks/common/tileentities/multis/MTEManualTrafo.java +++ b/src/main/java/bartworks/common/tileentities/multis/MTEManualTrafo.java @@ -93,13 +93,13 @@ public class MTEManualTrafo extends MTEEnhancedMultiBlockBase<MTEManualTrafo> { 2)) .addElement('t', ofBlock(BW_BLOCKS[2], 1)) .addElement('f', ofBlock(BW_BLOCKS[2], 0)) - .addElement('T', new IStructureElementNoPlacement<MTEManualTrafo>() { + .addElement('T', new IStructureElementNoPlacement<>() { @Override public boolean check(MTEManualTrafo te, World world, int x, int y, int z) { if (world.isAirBlock(x, y, z)) return true; TileEntity tileEntity = world.getTileEntity(x, y, z); - if (tileEntity == null || !(tileEntity instanceof IGregTechTileEntity)) return true; + if (!(tileEntity instanceof IGregTechTileEntity)) return true; IMetaTileEntity mte = ((IGregTechTileEntity) tileEntity).getMetaTileEntity(); if (mte instanceof MTEHatchDynamo || mte instanceof MTEHatchEnergy) { int intier = te.mEnergyHatches.get(0).mTier; @@ -208,7 +208,7 @@ public class MTEManualTrafo extends MTEEnhancedMultiBlockBase<MTEManualTrafo> { @Override public long getInputTier() { - if (this.mEnergyHatches.size() > 0) return GTUtility.getTier( + if (!this.mEnergyHatches.isEmpty()) return GTUtility.getTier( this.mEnergyHatches.get(0) .getBaseMetaTileEntity() .getInputVoltage()); @@ -217,7 +217,7 @@ public class MTEManualTrafo extends MTEEnhancedMultiBlockBase<MTEManualTrafo> { @Override public long getOutputTier() { - if (this.mDynamoHatches.size() > 0) return GTUtility.getTier( + if (!this.mDynamoHatches.isEmpty()) return GTUtility.getTier( this.mDynamoHatches.get(0) .getBaseMetaTileEntity() .getOutputVoltage()); @@ -253,7 +253,7 @@ public class MTEManualTrafo extends MTEEnhancedMultiBlockBase<MTEManualTrafo> { this.upstep = this.mode % 2 == 0; boolean tapmode = this.mode > 1; - if (!this.checkPiece(STRUCTURE_PIECE_BASE, 1, 0, 0) || this.mEnergyHatches.size() == 0) return false; + if (!this.checkPiece(STRUCTURE_PIECE_BASE, 1, 0, 0) || this.mEnergyHatches.isEmpty()) return false; byte intier = this.mEnergyHatches.get(0).mTier; for (MTEHatchEnergy in : this.mEnergyHatches) if (in.mTier != intier) return false; @@ -268,7 +268,7 @@ public class MTEManualTrafo extends MTEEnhancedMultiBlockBase<MTEManualTrafo> { if (!this.checkPiece(STRUCTURE_PIECE_TOP, 1, mHeight, 0)) return false; this.mTiers = mHeight - 1; - if (this.mDynamoHatches.size() == 0 || this.mMaintenanceHatches.size() != 1 || this.mTiers == 0) return false; + if (this.mDynamoHatches.isEmpty() || this.mMaintenanceHatches.size() != 1 || this.mTiers == 0) return false; byte outtier = this.mDynamoHatches.get(0).mTier; for (MTEHatchDynamo out : this.mDynamoHatches) { diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEThoriumHighTempReactor.java b/src/main/java/bartworks/common/tileentities/multis/MTEThoriumHighTempReactor.java index ee9b8a5baf..04a0b86feb 100644 --- a/src/main/java/bartworks/common/tileentities/multis/MTEThoriumHighTempReactor.java +++ b/src/main/java/bartworks/common/tileentities/multis/MTEThoriumHighTempReactor.java @@ -171,11 +171,11 @@ public class MTEThoriumHighTempReactor extends MTEEnhancedMultiBlockBase<MTEThor this.mCasing = 0; return this.checkPiece(STRUCTURE_PIECE_MAIN, 5, 11, 0) && this.mCasing >= 500 && this.mMaintenanceHatches.size() == 1 - && this.mInputHatches.size() > 0 - && this.mOutputHatches.size() > 0 - && this.mInputBusses.size() > 0 - && this.mOutputBusses.size() > 0 - && this.mEnergyHatches.size() > 0; + && !this.mInputHatches.isEmpty() + && !this.mOutputHatches.isEmpty() + && !this.mInputBusses.isEmpty() + && !this.mOutputBusses.isEmpty() + && !this.mEnergyHatches.isEmpty(); } @Override @@ -207,8 +207,6 @@ public class MTEThoriumHighTempReactor extends MTEEnhancedMultiBlockBase<MTEThor .min(MTEThoriumHighTempReactor.HELIUM_NEEDED - this.HeliumSupply, fluidStack.amount); fluidStack.amount -= toget; this.HeliumSupply += toget; - if (MTEThoriumHighTempReactor.HELIUM_NEEDED == this.HeliumSupply && fluidStack.amount == 0) - fluidStack = null; } } } diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEWindmill.java b/src/main/java/bartworks/common/tileentities/multis/MTEWindmill.java index 7069e7533d..23b865da2b 100644 --- a/src/main/java/bartworks/common/tileentities/multis/MTEWindmill.java +++ b/src/main/java/bartworks/common/tileentities/multis/MTEWindmill.java @@ -145,7 +145,7 @@ public class MTEWindmill extends MTEEnhancedMultiBlockBase<MTEWindmill> } }))) .addElement('b', ofBlock(Blocks.brick_block, 0)) - .addElement('s', new IStructureElement<MTEWindmill>() { + .addElement('s', new IStructureElement<>() { @Override public boolean check(MTEWindmill t, World world, int x, int y, int z) { @@ -325,7 +325,7 @@ public class MTEWindmill extends MTEEnhancedMultiBlockBase<MTEWindmill> ItemStack tmp = this.mOutputItems[0].copy(); tmp.stackSize = amount; splitStacks.add(tmp); - this.mOutputItems = splitStacks.toArray(new ItemStack[splitStacks.size()]); + this.mOutputItems = splitStacks.toArray(new ItemStack[0]); } this.mMaxProgresstime = tRecipe.mDuration * 2 * 100 * this.mMulti / this.getSpeed(this.rotorBlock); this.mMulti = 16; @@ -372,11 +372,9 @@ public class MTEWindmill extends MTEEnhancedMultiBlockBase<MTEWindmill> } if (GTUtility.areStacksEqual(tHatch.getStackInSlot(i), aStack)) { - aStack = null; return true; } tHatch.setInventorySlotContents(i, null); - aStack = null; return false; } } diff --git a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java index e43da001f0..337154953a 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java @@ -60,6 +60,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; import gregtech.api.metatileentity.implementations.MTEHatchMuffler; import gregtech.api.metatileentity.implementations.MTEHatchOutput; import gregtech.api.recipe.RecipeMap; @@ -385,8 +386,7 @@ public class MTEMegaBlastFurnace extends MegaMultiBlockBase<MTEMegaBlastFurnace> || this.mMaintenanceHatches.size() != 1) return false; if (this.glassTier < 8) { - for (int i = 0; i < this.mExoticEnergyHatches.size(); ++i) { - MTEHatch hatch = this.mExoticEnergyHatches.get(i); + for (MTEHatch hatch : this.mExoticEnergyHatches) { if (hatch.getConnectionType() == MTEHatch.ConnectionType.LASER) { return false; } @@ -394,8 +394,8 @@ public class MTEMegaBlastFurnace extends MegaMultiBlockBase<MTEMegaBlastFurnace> return false; } } - for (int i = 0; i < this.mEnergyHatches.size(); ++i) { - if (this.glassTier < this.mEnergyHatches.get(i).mTier) { + for (MTEHatchEnergy mEnergyHatch : this.mEnergyHatches) { + if (this.glassTier < mEnergyHatch.mTier) { return false; } } diff --git a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaChemicalReactor.java b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaChemicalReactor.java index 3c15af0fae..f1620abebc 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaChemicalReactor.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaChemicalReactor.java @@ -47,6 +47,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; import gregtech.api.render.TextureFactory; @@ -202,8 +203,7 @@ public class MTEMegaChemicalReactor extends MegaMultiBlockBase<MTEMegaChemicalRe if (!this.checkPiece(STRUCTURE_PIECE_MAIN, 2, 2, 0) || this.mMaintenanceHatches.size() != 1) return false; if (this.glassTier < 8) { - for (int i = 0; i < this.mExoticEnergyHatches.size(); ++i) { - MTEHatch hatch = this.mExoticEnergyHatches.get(i); + for (MTEHatch hatch : this.mExoticEnergyHatches) { if (hatch.getConnectionType() == MTEHatch.ConnectionType.LASER) { return false; } @@ -211,8 +211,8 @@ public class MTEMegaChemicalReactor extends MegaMultiBlockBase<MTEMegaChemicalRe return false; } } - for (int i = 0; i < this.mEnergyHatches.size(); ++i) { - if (this.glassTier < this.mEnergyHatches.get(i).mTier) { + for (MTEHatchEnergy mEnergyHatch : this.mEnergyHatches) { + if (this.glassTier < mEnergyHatch.mTier) { return false; } } diff --git a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaDistillTower.java b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaDistillTower.java index ac6a0ae6b4..112205efe7 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaDistillTower.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaDistillTower.java @@ -206,10 +206,9 @@ public class MTEMegaDistillTower extends MegaMultiBlockBase<MTEMegaDistillTower> } protected boolean addLayerOutputHatch(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { - if (aTileEntity == null || aTileEntity.isDead() || !(aTileEntity.getMetaTileEntity() instanceof MTEHatchOutput)) - return false; + if (aTileEntity == null || aTileEntity.isDead() + || !(aTileEntity.getMetaTileEntity() instanceof MTEHatchOutput tHatch)) return false; while (this.mOutputHatchesByLayer.size() < this.mHeight) this.mOutputHatchesByLayer.add(new ArrayList<>()); - MTEHatchOutput tHatch = (MTEHatchOutput) aTileEntity.getMetaTileEntity(); tHatch.updateTexture(aBaseCasingIndex); return this.mOutputHatchesByLayer.get(this.mHeight - 1) .add(tHatch); diff --git a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaOilCracker.java b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaOilCracker.java index 4424bc62cc..9686425bed 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaOilCracker.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaOilCracker.java @@ -58,6 +58,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; import gregtech.api.metatileentity.implementations.MTEHatchInput; import gregtech.api.metatileentity.implementations.MTEHatchMultiInput; import gregtech.api.metatileentity.implementations.MTEHatchOutput; @@ -255,8 +256,7 @@ public class MTEMegaOilCracker extends MegaMultiBlockBase<MTEMegaOilCracker> imp if (!this.checkPiece(STRUCTURE_PIECE_MAIN, 6, 6, 0) || this.mMaintenanceHatches.size() != 1) return false; if (this.glassTier < 8) { - for (int i = 0; i < this.mExoticEnergyHatches.size(); ++i) { - MTEHatch hatch = this.mExoticEnergyHatches.get(i); + for (MTEHatch hatch : this.mExoticEnergyHatches) { if (hatch.getConnectionType() == MTEHatch.ConnectionType.LASER) { return false; } @@ -264,8 +264,8 @@ public class MTEMegaOilCracker extends MegaMultiBlockBase<MTEMegaOilCracker> imp return false; } } - for (int i = 0; i < this.mEnergyHatches.size(); ++i) { - if (this.glassTier < this.mEnergyHatches.get(i).mTier) { + for (MTEHatchEnergy mEnergyHatch : this.mEnergyHatches) { + if (this.glassTier < mEnergyHatch.mTier) { return false; } } diff --git a/src/main/java/bartworks/neiHandler/OreNEIHandler.java b/src/main/java/bartworks/neiHandler/OreNEIHandler.java index 7b5e5eee40..3732c56aff 100644 --- a/src/main/java/bartworks/neiHandler/OreNEIHandler.java +++ b/src/main/java/bartworks/neiHandler/OreNEIHandler.java @@ -94,13 +94,10 @@ public class OreNEIHandler extends TemplateRecipeHandler { @Override public void drawExtras(int recipe) { - if (recipe < this.arecipes.size() && this.arecipes.get(recipe) instanceof CachedOreRecipe) { - CachedOreRecipe cachedOreRecipe = (CachedOreRecipe) this.arecipes.get(recipe); + if (recipe < this.arecipes.size() && this.arecipes.get(recipe) instanceof CachedOreRecipe cachedOreRecipe) { - if (cachedOreRecipe == null || cachedOreRecipe.getOtherStacks() == null - || cachedOreRecipe.getOtherStacks() - .size() == 0) - return; + if (cachedOreRecipe.getOtherStacks() == null || cachedOreRecipe.getOtherStacks() + .isEmpty()) return; if (!cachedOreRecipe.small) { if (cachedOreRecipe.getOtherStacks() diff --git a/src/main/java/bartworks/system/material/BWMetaGeneratedBlocks.java b/src/main/java/bartworks/system/material/BWMetaGeneratedBlocks.java index db838d059a..533f16089f 100644 --- a/src/main/java/bartworks/system/material/BWMetaGeneratedBlocks.java +++ b/src/main/java/bartworks/system/material/BWMetaGeneratedBlocks.java @@ -86,7 +86,7 @@ public abstract class BWMetaGeneratedBlocks extends BWTileEntityContainer { @Override public int getRenderType() { if (BWBlockOreRenderer.INSTANCE == null) return super.getRenderType(); - return BWBlockOreRenderer.INSTANCE.renderID; + return BWBlockOreRenderer.renderID; } @Override diff --git a/src/main/java/bartworks/system/material/BWMetaGeneratedItems.java b/src/main/java/bartworks/system/material/BWMetaGeneratedItems.java index bdeab62cfd..cd8e360da6 100644 --- a/src/main/java/bartworks/system/material/BWMetaGeneratedItems.java +++ b/src/main/java/bartworks/system/material/BWMetaGeneratedItems.java @@ -100,17 +100,15 @@ public class BWMetaGeneratedItems extends MetaGeneratedItem implements IRadMater OrePrefixes.dust, aMaterial, aItemEntity.getEntityItem().stackSize)); - aItemEntity.worldObj.setBlockMetadataWithNotify(tX, tY, tZ, tMetaData - 1, 3); - return true; } else { aItemEntity.setEntityItemStack( WerkstoffLoader.getCorrespondingItemStack( OrePrefixes.crushedPurified, aMaterial, aItemEntity.getEntityItem().stackSize)); - aItemEntity.worldObj.setBlockMetadataWithNotify(tX, tY, tZ, tMetaData - 1, 3); - return true; } + aItemEntity.worldObj.setBlockMetadataWithNotify(tX, tY, tZ, tMetaData - 1, 3); + return true; } } } diff --git a/src/main/java/bartworks/system/material/BWTileEntityMetaGeneratedSmallOre.java b/src/main/java/bartworks/system/material/BWTileEntityMetaGeneratedSmallOre.java index 8764c7891e..737b486cf9 100644 --- a/src/main/java/bartworks/system/material/BWTileEntityMetaGeneratedSmallOre.java +++ b/src/main/java/bartworks/system/material/BWTileEntityMetaGeneratedSmallOre.java @@ -90,7 +90,7 @@ public class BWTileEntityMetaGeneratedSmallOre extends BWTileEntityMetaGenerated tSelector.add(tStack); } } - if (tSelector.size() > 0) { + if (!tSelector.isEmpty()) { int i = 0; for (int j = Math.max(1, aFortune > 0 ? tRandom.nextInt(1 + aFortune) : 0); i < j; ++i) { diff --git a/src/main/java/bartworks/system/material/Werkstoff.java b/src/main/java/bartworks/system/material/Werkstoff.java index d9b6b4503c..5ae7136934 100644 --- a/src/main/java/bartworks/system/material/Werkstoff.java +++ b/src/main/java/bartworks/system/material/Werkstoff.java @@ -278,7 +278,7 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { this.mID = (short) mID; this.defaultName = defaultName; // Ensure that localization key are written to the lang file - GregTechAPI.sAfterGTPreload.add(() -> { this.getLocalizedName(); }); + GregTechAPI.sAfterGTPreload.add(() -> this.getLocalizedName()); this.stats = stats; this.type = type; this.generationFeatures = generationFeatures; @@ -316,7 +316,7 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { // this.toolTip = "The formula is to long..."; // Ensure that localization key are written to the lang file - GregTechAPI.sAfterGTPreload.add(() -> { this.getLocalizedToolTip(); }); + GregTechAPI.sAfterGTPreload.add(() -> this.getLocalizedToolTip()); if (this.stats.protons == 0) { long tmpprotons = 0; @@ -427,13 +427,12 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { public List<TCAspects.TC_AspectStack> getGTWrappedTCAspects() { final List<TCAspects.TC_AspectStack> ret = new ArrayList<>(); Arrays.stream(this.getTCAspects()) - .forEach(objectIntegerPair -> { - new TCAspects.TC_AspectStack( + .forEach( + objectIntegerPair -> new TCAspects.TC_AspectStack( TCAspects.valueOf( ((Aspect) objectIntegerPair.getKey()).getName() .toUpperCase(Locale.US)), - objectIntegerPair.getValue()).addToAspectList(ret); - }); + objectIntegerPair.getValue()).addToAspectList(ret)); return ret; } @@ -476,7 +475,7 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { } public ISubTagContainer getOreByProductRaw(int aNumber) { - if (this.mOreByProducts.size() == 0) return null; + if (this.mOreByProducts.isEmpty()) return null; if (aNumber < 0) aNumber = this.mOreByProducts.size() + aNumber; while (aNumber >= this.mOreByProducts.size()) aNumber--; ISubTagContainer o = this.mOreByProducts.get(aNumber); @@ -485,7 +484,7 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { } public ItemStack getOreByProduct(int aNumber, OrePrefixes prefixes) { - if (this.mOreByProducts.size() == 0) return null; + if (this.mOreByProducts.isEmpty()) return null; if (aNumber < 0) aNumber = this.mOreByProducts.size() + aNumber; while (aNumber >= this.mOreByProducts.size()) aNumber--; Object o = this.mOreByProducts.get(aNumber); diff --git a/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java b/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java index e3504a4e9c..1d0c6fa140 100644 --- a/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java +++ b/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java @@ -1030,7 +1030,6 @@ public class PlatinumSludgeOverHaul { PlatinumSludgeOverHaul.runHelperrecipes(); } - @SuppressWarnings("deprecation") private static void replaceHVCircuitMaterials() { GTValues.RA.stdBuilder() .itemInputs(Materials.Redstone.getDust(1), Materials.Electrum.getDust(1), GTUtility.getIntegratedCircuit(1)) diff --git a/src/main/java/bartworks/system/material/processingLoaders/AdditionalRecipes.java b/src/main/java/bartworks/system/material/processingLoaders/AdditionalRecipes.java index ab331d2ba6..d103312e55 100644 --- a/src/main/java/bartworks/system/material/processingLoaders/AdditionalRecipes.java +++ b/src/main/java/bartworks/system/material/processingLoaders/AdditionalRecipes.java @@ -274,7 +274,6 @@ public class AdditionalRecipes { .addTo(BartWorksRecipeMaps.acidGenFuels); } - @SuppressWarnings("deprecation") public static void run() { runBWRecipes(); diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java index 32aa00bd41..5b24b1e6ee 100644 --- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java +++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java @@ -166,7 +166,7 @@ public class CellLoader implements IWerkstoffRunnable { null, null, new FluidStack[] { null }, - new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null }, + new FluidStack[] { !flOutputs.isEmpty() ? flOutputs.get(0) : null }, (int) Math.max( 1L, Math.abs( @@ -192,7 +192,7 @@ public class CellLoader implements IWerkstoffRunnable { null, null, new FluidStack[] { null }, - new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null }, + new FluidStack[] { !flOutputs.isEmpty() ? flOutputs.get(0) : null }, (int) Math.max( 1L, Math.abs( diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java index bcc5d422b0..04db75e0d3 100644 --- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java +++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java @@ -190,7 +190,7 @@ public class DustLoader implements IWerkstoffRunnable { null, null, new FluidStack[] { null }, - new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null }, + new FluidStack[] { !flOutputs.isEmpty() ? flOutputs.get(0) : null }, (int) Math.max( 1L, Math.abs( @@ -215,7 +215,7 @@ public class DustLoader implements IWerkstoffRunnable { null, null, new FluidStack[] { null }, - new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null }, + new FluidStack[] { !flOutputs.isEmpty() ? flOutputs.get(0) : null }, (int) Math.max( 1L, Math.abs( @@ -266,7 +266,7 @@ public class DustLoader implements IWerkstoffRunnable { new ItemStack[] { input }, null, null, - new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null }, + new FluidStack[] { !flOutputs.isEmpty() ? flOutputs.get(0) : null }, null, (int) Math.max( 1L, diff --git a/src/main/java/bartworks/system/oregen/BWOreLayer.java b/src/main/java/bartworks/system/oregen/BWOreLayer.java index 5f9688e68c..80cca68d3a 100644 --- a/src/main/java/bartworks/system/oregen/BWOreLayer.java +++ b/src/main/java/bartworks/system/oregen/BWOreLayer.java @@ -173,12 +173,10 @@ public abstract class BWOreLayer extends GTWorldgen { } private boolean shouldPlace(Random aRandom, int cX, int eX, int tX, int cZ, int eZ, int tZ) { - if (aRandom.nextInt( + return aRandom.nextInt( Math.max(1, Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) / this.mDensity)) == 0 || aRandom.nextInt( - Math.max(1, Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) / this.mDensity)) == 0) - return true; - return false; + Math.max(1, Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) / this.mDensity)) == 0; } public boolean setOreBlock(World aWorld, int aX, int aY, int aZ, int aMetaData, boolean isSmallOre) { diff --git a/src/main/java/bartworks/system/oregen/BWWordGenerator.java b/src/main/java/bartworks/system/oregen/BWWordGenerator.java index 10a3c862af..909bb0cd94 100644 --- a/src/main/java/bartworks/system/oregen/BWWordGenerator.java +++ b/src/main/java/bartworks/system/oregen/BWWordGenerator.java @@ -97,7 +97,7 @@ public class BWWordGenerator implements IWorldGenerator { if (!BWWordGenerator.WorldGenContainer.mGenerated.contains(centerChunk) && this.surroundingChunksLoaded(xCenter, zCenter)) { BWWordGenerator.WorldGenContainer.mGenerated.add(centerChunk); - if (BWOreLayer.sWeight > 0 && BWOreLayer.sList.size() > 0) { + if (BWOreLayer.sWeight > 0 && !BWOreLayer.sList.isEmpty()) { boolean temp = true; int tRandomWeight; for (int i = 0; i < 256 && temp; i++) { diff --git a/src/main/java/bartworks/system/worldgen/MapGenRuins.java b/src/main/java/bartworks/system/worldgen/MapGenRuins.java index a192575743..7c3e4046ca 100644 --- a/src/main/java/bartworks/system/worldgen/MapGenRuins.java +++ b/src/main/java/bartworks/system/worldgen/MapGenRuins.java @@ -250,7 +250,7 @@ public abstract class MapGenRuins extends WorldGenerator { this.ToBuildWith[3][0]); } else if (dx == 0 && dz == -5 && (dy == 1 || dy == 2)) { if (dy == 1) { - this.setBlock(worldObj, x + dx, y + 1, z + -5, Blocks.iron_door, 1); + this.setBlock(worldObj, x + dx, y + 1, z - 5, Blocks.iron_door, 1); } if (dy == 2) { this.setBlock(worldObj, x + dx, y + 2, z + dz, Blocks.iron_door, 8); @@ -303,7 +303,7 @@ public abstract class MapGenRuins extends WorldGenerator { this.setBlock(worldObj, x + 3, y + 1, z + dz, Blocks.crafting_table, 0); } if (dx == -3 && (dz == -3 || dz == -2)) { - this.setBlock(worldObj, x + -3, y + dy, z + dz, Blocks.chest, 5); + this.setBlock(worldObj, x - 3, y + dy, z + dz, Blocks.chest, 5); IInventory chest = (IInventory) worldObj.getTileEntity(x + dx, y + dy, z + dz); if (chest != null) { WeightedRandomChestContent.generateChestContents( diff --git a/src/main/java/bartworks/util/MurmurHash3.java b/src/main/java/bartworks/util/MurmurHash3.java index 825c83cca2..e32356bae1 100644 --- a/src/main/java/bartworks/util/MurmurHash3.java +++ b/src/main/java/bartworks/util/MurmurHash3.java @@ -128,11 +128,11 @@ public final class MurmurHash3 { /*** * // optimized ascii implementation (currently slower!!! code size?) if (shift == 24) { k1 = k1 | (code * << 24); - * + * <p> * k1 *= c1; k1 = (k1 << 15) | (k1 >>> 17); // ROTL32(k1,15); k1 *= c2; - * + * <p> * h1 ^= k1; h1 = (h1 << 13) | (h1 >>> 19); // ROTL32(h1,13); h1 = h1*5+0xe6546b64; - * + * <p> * shift = 0; nBytes += 4; k1 = 0; } else { k1 |= code << shift; shift += 8; } continue; ***/ } else if (code < 0x800) { diff --git a/src/main/java/bartworks/util/NoiseUtil/SimplexNoise.java b/src/main/java/bartworks/util/NoiseUtil/SimplexNoise.java index ea2e571910..c6418d2213 100644 --- a/src/main/java/bartworks/util/NoiseUtil/SimplexNoise.java +++ b/src/main/java/bartworks/util/NoiseUtil/SimplexNoise.java @@ -11,11 +11,11 @@ import bartworks.util.MathUtils; public class SimplexNoise { // Simplex noise in 2D, 3D and 4D - private static Grad[] grad3 = { new Grad(1, 1, 0), new Grad(-1, 1, 0), new Grad(1, -1, 0), new Grad(-1, -1, 0), - new Grad(1, 0, 1), new Grad(-1, 0, 1), new Grad(1, 0, -1), new Grad(-1, 0, -1), new Grad(0, 1, 1), - new Grad(0, -1, 1), new Grad(0, 1, -1), new Grad(0, -1, -1) }; + private static final Grad[] grad3 = { new Grad(1, 1, 0), new Grad(-1, 1, 0), new Grad(1, -1, 0), + new Grad(-1, -1, 0), new Grad(1, 0, 1), new Grad(-1, 0, 1), new Grad(1, 0, -1), new Grad(-1, 0, -1), + new Grad(0, 1, 1), new Grad(0, -1, 1), new Grad(0, 1, -1), new Grad(0, -1, -1) }; - private static Grad[] grad4 = { new Grad(0, 1, 1, 1), new Grad(0, 1, 1, -1), new Grad(0, 1, -1, 1), + private static final Grad[] grad4 = { new Grad(0, 1, 1, 1), new Grad(0, 1, 1, -1), new Grad(0, 1, -1, 1), new Grad(0, 1, -1, -1), new Grad(0, -1, 1, 1), new Grad(0, -1, 1, -1), new Grad(0, -1, -1, 1), new Grad(0, -1, -1, -1), new Grad(1, 0, 1, 1), new Grad(1, 0, 1, -1), new Grad(1, 0, -1, 1), new Grad(1, 0, -1, -1), new Grad(-1, 0, 1, 1), new Grad(-1, 0, 1, -1), new Grad(-1, 0, -1, 1), @@ -25,20 +25,20 @@ public class SimplexNoise { // Simplex noise in 2D, 3D and 4D new Grad(1, -1, -1, 0), new Grad(-1, 1, 1, 0), new Grad(-1, 1, -1, 0), new Grad(-1, -1, 1, 0), new Grad(-1, -1, -1, 0) }; - private static short[] p = { 151, 160, 137, 91, 90, 15, 131, 13, 201, 95, 96, 53, 194, 233, 7, 225, 140, 36, 103, - 30, 69, 142, 8, 99, 37, 240, 21, 10, 23, 190, 6, 148, 247, 120, 234, 75, 0, 26, 197, 62, 94, 252, 219, 203, 117, - 35, 11, 32, 57, 177, 33, 88, 237, 149, 56, 87, 174, 20, 125, 136, 171, 168, 68, 175, 74, 165, 71, 134, 139, 48, - 27, 166, 77, 146, 158, 231, 83, 111, 229, 122, 60, 211, 133, 230, 220, 105, 92, 41, 55, 46, 245, 40, 244, 102, - 143, 54, 65, 25, 63, 161, 1, 216, 80, 73, 209, 76, 132, 187, 208, 89, 18, 169, 200, 196, 135, 130, 116, 188, - 159, 86, 164, 100, 109, 198, 173, 186, 3, 64, 52, 217, 226, 250, 124, 123, 5, 202, 38, 147, 118, 126, 255, 82, - 85, 212, 207, 206, 59, 227, 47, 16, 58, 17, 182, 189, 28, 42, 223, 183, 170, 213, 119, 248, 152, 2, 44, 154, + private static final short[] p = { 151, 160, 137, 91, 90, 15, 131, 13, 201, 95, 96, 53, 194, 233, 7, 225, 140, 36, + 103, 30, 69, 142, 8, 99, 37, 240, 21, 10, 23, 190, 6, 148, 247, 120, 234, 75, 0, 26, 197, 62, 94, 252, 219, 203, + 117, 35, 11, 32, 57, 177, 33, 88, 237, 149, 56, 87, 174, 20, 125, 136, 171, 168, 68, 175, 74, 165, 71, 134, 139, + 48, 27, 166, 77, 146, 158, 231, 83, 111, 229, 122, 60, 211, 133, 230, 220, 105, 92, 41, 55, 46, 245, 40, 244, + 102, 143, 54, 65, 25, 63, 161, 1, 216, 80, 73, 209, 76, 132, 187, 208, 89, 18, 169, 200, 196, 135, 130, 116, + 188, 159, 86, 164, 100, 109, 198, 173, 186, 3, 64, 52, 217, 226, 250, 124, 123, 5, 202, 38, 147, 118, 126, 255, + 82, 85, 212, 207, 206, 59, 227, 47, 16, 58, 17, 182, 189, 28, 42, 223, 183, 170, 213, 119, 248, 152, 2, 44, 154, 163, 70, 221, 153, 101, 155, 167, 43, 172, 9, 129, 22, 39, 253, 19, 98, 108, 110, 79, 113, 224, 232, 178, 185, 112, 104, 218, 246, 97, 228, 251, 34, 242, 193, 238, 210, 144, 12, 191, 179, 162, 241, 81, 51, 145, 235, 249, 14, 239, 107, 49, 192, 214, 31, 181, 199, 106, 157, 184, 84, 204, 176, 115, 121, 50, 45, 127, 4, 150, 254, 138, 236, 205, 93, 222, 114, 67, 29, 24, 72, 243, 141, 128, 195, 78, 66, 215, 61, 156, 180 }; // To remove the need for index wrapping, double the permutation table length - private static short[] perm = new short[512]; - private static short[] permMod12 = new short[512]; + private static final short[] perm = new short[512]; + private static final short[] permMod12 = new short[512]; static { for (int i = 0; i < 512; i++) { diff --git a/src/main/java/bartworks/util/NonNullWrappedHashMap.java b/src/main/java/bartworks/util/NonNullWrappedHashMap.java index a11cb6a6af..650c4e5c18 100644 --- a/src/main/java/bartworks/util/NonNullWrappedHashMap.java +++ b/src/main/java/bartworks/util/NonNullWrappedHashMap.java @@ -21,7 +21,7 @@ import java.util.Optional; public class NonNullWrappedHashMap<K, V> extends HashMap<K, V> { private static final long serialVersionUID = 46345163103910175L; - private V defaultValue; + private final V defaultValue; public NonNullWrappedHashMap(int initialCapacity, float loadFactor, V defaultValue) { super(initialCapacity, loadFactor); diff --git a/src/main/java/bartworks/util/Pair.java b/src/main/java/bartworks/util/Pair.java index 1361460e31..32c55da91c 100644 --- a/src/main/java/bartworks/util/Pair.java +++ b/src/main/java/bartworks/util/Pair.java @@ -34,9 +34,7 @@ public class Pair<A, B> implements Map.Entry<A, B> { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof Pair)) return false; - - Pair<?, ?> pair1 = (Pair<?, ?>) o; + if (!(o instanceof Pair<?, ?>pair1)) return false; // Probably incorrect - comparing Object[] arrays with Arrays.equals return Arrays.equals(this.pair, pair1.pair); diff --git a/src/main/java/bartworks/util/accessprioritylist/AccessPriorityList.java b/src/main/java/bartworks/util/accessprioritylist/AccessPriorityList.java index 7a41b712b5..fa5df08d56 100644 --- a/src/main/java/bartworks/util/accessprioritylist/AccessPriorityList.java +++ b/src/main/java/bartworks/util/accessprioritylist/AccessPriorityList.java @@ -72,7 +72,6 @@ public class AccessPriorityList<E> implements List<E>, Deque<E>, Set<E> { this.head = node.getNext(); this.head.setBefore(null); node.destroy(); - node = null; this.size--; return first; } @@ -84,7 +83,6 @@ public class AccessPriorityList<E> implements List<E>, Deque<E>, Set<E> { this.tail = node.getBefore(); this.tail.setNext(null); node.destroy(); - node = null; this.size--; return last; } diff --git a/src/main/java/bwcrossmod/openComputers/TileEntityGTDataServer.java b/src/main/java/bwcrossmod/openComputers/TileEntityGTDataServer.java index c59ba39c12..fc7be762d2 100644 --- a/src/main/java/bwcrossmod/openComputers/TileEntityGTDataServer.java +++ b/src/main/java/bwcrossmod/openComputers/TileEntityGTDataServer.java @@ -45,7 +45,7 @@ public class TileEntityGTDataServer extends TileEntity private final BiMap<Long, GTNBTDataBase> OrbDataBase = HashBiMap.create(); - private ItemStack[] mItems = new ItemStack[2]; + private final ItemStack[] mItems = new ItemStack[2]; private byte TickTimer; @Optional.Method(modid = Mods.Names.OPEN_COMPUTERS) diff --git a/src/main/java/detrav/commands/DetravScannerCommand.java b/src/main/java/detrav/commands/DetravScannerCommand.java index 783a522aa4..774900b265 100644 --- a/src/main/java/detrav/commands/DetravScannerCommand.java +++ b/src/main/java/detrav/commands/DetravScannerCommand.java @@ -22,7 +22,7 @@ import gregtech.common.blocks.TileEntityOres; */ public class DetravScannerCommand implements ICommand { - private List aliases; + private final List aliases; public DetravScannerCommand() { this.aliases = new ArrayList<String>(); @@ -57,7 +57,7 @@ public class DetravScannerCommand implements ICommand { } for (i++; i < args.length; i++) { - String temp = (String) strs.get(strs.size() - 1); + String temp = strs.get(strs.size() - 1); temp = temp + " " + args[i]; temp = temp.replace("\"", ""); strs.set(strs.size() - 1, temp); diff --git a/src/main/java/detrav/enums/IDDetraveMetaGeneratedTool01.java b/src/main/java/detrav/enums/IDDetraveMetaGeneratedTool01.java index 2149252ff3..7ff72f05fb 100644 --- a/src/main/java/detrav/enums/IDDetraveMetaGeneratedTool01.java +++ b/src/main/java/detrav/enums/IDDetraveMetaGeneratedTool01.java @@ -19,7 +19,7 @@ public enum IDDetraveMetaGeneratedTool01 { public final int ID; - private IDDetraveMetaGeneratedTool01(int ID) { + IDDetraveMetaGeneratedTool01(int ID) { this.ID = ID; } } diff --git a/src/main/java/detrav/events/DetravLoginEventHandler.java b/src/main/java/detrav/events/DetravLoginEventHandler.java deleted file mode 100644 index 9a28c1ab93..0000000000 --- a/src/main/java/detrav/events/DetravLoginEventHandler.java +++ /dev/null @@ -1,24 +0,0 @@ -package detrav.events; - -import net.minecraftforge.common.MinecraftForge; - -import cpw.mods.fml.common.FMLCommonHandler; - -/** - * Created by wital_000 on 18.04.2016. - */ -public class DetravLoginEventHandler { - - static boolean inited = false; - - public static void register() { - if (!inited) { - inited = true; - DetravLoginEventHandler handler = new DetravLoginEventHandler(); - MinecraftForge.EVENT_BUS.register(handler); - FMLCommonHandler.instance() - .bus() - .register(handler); - } - } -} diff --git a/src/main/java/detrav/gui/textures/DetravMapTexture.java b/src/main/java/detrav/gui/textures/DetravMapTexture.java index e8e35dc82d..4a316e4523 100644 --- a/src/main/java/detrav/gui/textures/DetravMapTexture.java +++ b/src/main/java/detrav/gui/textures/DetravMapTexture.java @@ -119,26 +119,10 @@ public class DetravMapTexture extends AbstractTexture { int u = 0, v = 0; Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); - tessellator.addVertexWithUV( - (double) (x), - (double) (y + height), - 0, - (double) ((float) (u) * f), - (double) ((float) (v + height) * f1)); - tessellator.addVertexWithUV( - (double) (x + width), - (double) (y + height), - 0, - (double) ((float) (u + width) * f), - (double) ((float) (v + height) * f1)); - tessellator.addVertexWithUV( - (double) (x + width), - (double) (y), - 0, - (double) ((float) (u + width) * f), - (double) ((float) (v) * f1)); - tessellator - .addVertexWithUV((double) (x), (double) (y), 0, (double) ((float) (u) * f), (double) ((float) (v) * f1)); + tessellator.addVertexWithUV(x, y + height, 0, (float) (u) * f, (float) (v + height) * f1); + tessellator.addVertexWithUV(x + width, y + height, 0, (float) (u + width) * f, (float) (v + height) * f1); + tessellator.addVertexWithUV(x + width, y, 0, (float) (u + width) * f, (float) (v) * f1); + tessellator.addVertexWithUV(x, y, 0, (float) (u) * f, (float) (v) * f1); tessellator.draw(); } diff --git a/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java b/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java index 7038d42817..a21896e8ee 100644 --- a/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java +++ b/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java @@ -99,7 +99,7 @@ public class BehaviourDetravToolProspector extends BehaviourNone { .getMaterial() == Material.ground || aWorld.getBlock(aX, aY, aZ) == GregTechAPI.sBlockOres1) { if (!aWorld.isRemote) { - prospectChunks((DetravMetaGeneratedTool01) aItem, aStack, aPlayer, aWorld, aX, aY, aZ, aRandom, chance); + prospectChunks(aItem, aStack, aPlayer, aWorld, aX, aY, aZ, aRandom, chance); } return true; } @@ -114,7 +114,7 @@ public class BehaviourDetravToolProspector extends BehaviourNone { badluck = 0; ores = new HashMap<>(); - int range = ((DetravMetaGeneratedTool01) aItem).getHarvestLevel(aStack, "") / 2 + (aStack.getItemDamage() / 4); + int range = aItem.getHarvestLevel(aStack, "") / 2 + (aStack.getItemDamage() / 4); if ((range % 2) == 0) { range += 1; // kinda not needed here, divide takes it out, but we put it back in with the range+1 in the // loop @@ -163,7 +163,7 @@ public class BehaviourDetravToolProspector extends BehaviourNone { } // List to hold unsorted scanner messages - List<ChatComponentText> oreMessages = new ArrayList<ChatComponentText>(); + List<ChatComponentText> oreMessages = new ArrayList<>(); for (String key : ores.keySet()) { int value = ores.get(key); @@ -178,7 +178,7 @@ public class BehaviourDetravToolProspector extends BehaviourNone { StatCollector.translateToLocal("detrav.scanner.distance.texts.1"), StatCollector.translateToLocal("detrav.scanner.distance.texts.0")); - List<ChatComponentText> oreMessagesSorted = new ArrayList<ChatComponentText>(); + List<ChatComponentText> oreMessagesSorted = new ArrayList<>(); oreMessagesSorted.add(new ChatComponentText(CHAT_MSG_SEPARATOR)); // Sort ore messages by distance, separated by ----- @@ -298,7 +298,7 @@ public class BehaviourDetravToolProspector extends BehaviourNone { if (tBlock instanceof BlockOresAbstract) { TileEntity tTileEntity = aChunk.getTileEntityUnsafe(x, y, z); if ((tTileEntity instanceof TileEntityOres) && ((TileEntityOres) tTileEntity).mNatural) { - tMetaID = (short) ((TileEntityOres) tTileEntity).getMetaData(); + tMetaID = ((TileEntityOres) tTileEntity).getMetaData(); try { String format = LanguageRegistry.instance() .getStringLocalization(tBlock.getUnlocalizedName() + "." + tMetaID + ".name"); diff --git a/src/main/java/detrav/proxies/CommonProxy.java b/src/main/java/detrav/proxies/CommonProxy.java index 9df2179b71..712960ffd1 100644 --- a/src/main/java/detrav/proxies/CommonProxy.java +++ b/src/main/java/detrav/proxies/CommonProxy.java @@ -4,7 +4,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import cpw.mods.fml.common.network.IGuiHandler; -import detrav.events.DetravLoginEventHandler; import detrav.gui.DetravScannerGUI; /** @@ -12,13 +11,9 @@ import detrav.gui.DetravScannerGUI; */ public class CommonProxy implements IGuiHandler { - public void onLoad() { + public void onLoad() {} - } - - public void onPostLoad() { - DetravLoginEventHandler.register(); - } + public void onPostLoad() {} @Override public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { diff --git a/src/main/java/galacticgreg/WorldGeneratorSpace.java b/src/main/java/galacticgreg/WorldGeneratorSpace.java index 336900326c..4f76049480 100644 --- a/src/main/java/galacticgreg/WorldGeneratorSpace.java +++ b/src/main/java/galacticgreg/WorldGeneratorSpace.java @@ -38,7 +38,7 @@ public class WorldGeneratorSpace implements IWorldGenerator { private int chunkX; private int chunkZ; - private int mSize = 100; + private final int mSize = 100; private long mProfilingStart; private long mProfilingEnd; @@ -502,7 +502,7 @@ public class WorldGeneratorSpace implements IWorldGenerator { GalacticGreg.Logger.trace("Running orevein-gen in Dim %s", pDimensionDef.getDimIdentifier()); if (GTWorldgenerator.isOreChunk(pX / 16, pZ / 16)) { - if ((WorldgenOreLayerSpace.sWeight > 0) && (GalacticGreg.oreVeinWorldgenList.size() > 0)) { + if ((WorldgenOreLayerSpace.sWeight > 0) && (!GalacticGreg.oreVeinWorldgenList.isEmpty())) { boolean temp = true; int tRandomWeight; diff --git a/src/main/java/galacticgreg/WorldgenOreLayerSpace.java b/src/main/java/galacticgreg/WorldgenOreLayerSpace.java index 3cd0a8baa4..10591cb32d 100644 --- a/src/main/java/galacticgreg/WorldgenOreLayerSpace.java +++ b/src/main/java/galacticgreg/WorldgenOreLayerSpace.java @@ -36,7 +36,7 @@ public class WorldgenOreLayerSpace extends GTWorldgen { private long mProfilingStart; private long mProfilingEnd; - private Map<String, Boolean> allowedDims; + private final Map<String, Boolean> allowedDims; public WorldgenOreLayerSpace(OreMixBuilder mix) { super(mix.oreMixName, GalacticGreg.oreVeinWorldgenList, mix.enabledByDefault); @@ -82,7 +82,7 @@ public class WorldgenOreLayerSpace extends GTWorldgen { return allowedDims.getOrDefault(pDimensionDef.getDimIdentifier(), false); } - private static Map<String, List<String>> _mBufferedVeinList = new HashMap<>(); + private static final Map<String, List<String>> _mBufferedVeinList = new HashMap<>(); /** * Get a List of all Veins which are enabled for given Dim. Query is buffered @@ -126,8 +126,9 @@ public class WorldgenOreLayerSpace extends GTWorldgen { String tVeinName = tEnabledVeins.get(tRnd); GTWorldgen tGen = null; - for (GTWorldgen tWorldGen : GalacticGreg.oreVeinWorldgenList) if (tWorldGen instanceof WorldgenOreLayerSpace - && ((WorldgenOreLayerSpace) tWorldGen).mWorldGenName.equals(tVeinName)) tGen = tWorldGen; + for (GTWorldgen tWorldGen : GalacticGreg.oreVeinWorldgenList) + if (tWorldGen instanceof WorldgenOreLayerSpace && tWorldGen.mWorldGenName.equals(tVeinName)) + tGen = tWorldGen; if (tGen != null) { // GT_Worldgen_GT_Ore_Layer_Space tGen = GalacticGreg.oreVeinWorldgenList.get(tRndMix); @@ -138,7 +139,7 @@ public class WorldgenOreLayerSpace extends GTWorldgen { sporadicMeta = ((WorldgenOreLayerSpace) tGen).mSporadicMeta; } } else { - if ((WorldgenOreLayerSpace.sWeight > 0) && (GalacticGreg.oreVeinWorldgenList.size() > 0)) { + if ((WorldgenOreLayerSpace.sWeight > 0) && (!GalacticGreg.oreVeinWorldgenList.isEmpty())) { GalacticGreg.Logger.trace("About to select oremix"); boolean temp = true; int tRandomWeight; diff --git a/src/main/java/galacticgreg/WorldgenOreSmallSpace.java b/src/main/java/galacticgreg/WorldgenOreSmallSpace.java index 95b40c69eb..40fede19b0 100644 --- a/src/main/java/galacticgreg/WorldgenOreSmallSpace.java +++ b/src/main/java/galacticgreg/WorldgenOreSmallSpace.java @@ -22,7 +22,7 @@ public class WorldgenOreSmallSpace extends GTWorldgen { private long mProfilingStart; private long mProfilingEnd; - private Map<String, Boolean> allowedDims; + private final Map<String, Boolean> allowedDims; public WorldgenOreSmallSpace(SmallOreBuilder ore) { super(ore.smallOreName, GalacticGreg.smallOreWorldgenList, ore.enabledByDefault); diff --git a/src/main/java/galacticgreg/api/AsteroidBlockComb.java b/src/main/java/galacticgreg/api/AsteroidBlockComb.java index 208d8faed3..d9961cf8ec 100644 --- a/src/main/java/galacticgreg/api/AsteroidBlockComb.java +++ b/src/main/java/galacticgreg/api/AsteroidBlockComb.java @@ -58,8 +58,7 @@ public class AsteroidBlockComb extends BlockMetaComb { public boolean equals(Object other) { if (other == null) return false; if (other == this) return true; - if (!(other instanceof AsteroidBlockComb)) return false; - AsteroidBlockComb otherObj = (AsteroidBlockComb) other; + if (!(other instanceof AsteroidBlockComb otherObj)) return false; boolean tFlag = true; String otherName = Block.blockRegistry.getNameForObject(otherObj.getBlock()); diff --git a/src/main/java/galacticgreg/api/BlockMetaComb.java b/src/main/java/galacticgreg/api/BlockMetaComb.java index f4dc416c6b..47a1ced4f3 100644 --- a/src/main/java/galacticgreg/api/BlockMetaComb.java +++ b/src/main/java/galacticgreg/api/BlockMetaComb.java @@ -7,8 +7,8 @@ import net.minecraft.block.Block; */ public class BlockMetaComb { - private int mMeta; - private Block mBlock; + private final int mMeta; + private final Block mBlock; /** * Creates a simple instance for a block that has no meta value diff --git a/src/main/java/galacticgreg/api/GTOreTypes.java b/src/main/java/galacticgreg/api/GTOreTypes.java index fdc4ea61ff..7c0245419a 100644 --- a/src/main/java/galacticgreg/api/GTOreTypes.java +++ b/src/main/java/galacticgreg/api/GTOreTypes.java @@ -36,10 +36,10 @@ public enum GTOreTypes { */ NormalOres(0, Blocks.stone, 0, 0); // Unsure about blockupdate value! - private int _mOffset; - private Block _mStoneBlock; - private int _mBlockMeta; - private int _mUpdateMode; + private final int _mOffset; + private final Block _mStoneBlock; + private final int _mBlockMeta; + private final int _mUpdateMode; GTOreTypes(int pOffset, Block pBlock, int pMeta, int pUpdateMode) { _mOffset = pOffset; diff --git a/src/main/java/galacticgreg/api/ModDBMDef.java b/src/main/java/galacticgreg/api/ModDBMDef.java index 11d6bc630e..e405dfdd1f 100644 --- a/src/main/java/galacticgreg/api/ModDBMDef.java +++ b/src/main/java/galacticgreg/api/ModDBMDef.java @@ -10,8 +10,8 @@ import net.minecraft.block.Block; public class ModDBMDef { private String _targetBlockName; - private int _targetMeta; - private boolean _canAlwaysReplace; + private final int _targetMeta; + private final boolean _canAlwaysReplace; public String getBlockName() { return _targetBlockName; @@ -27,7 +27,7 @@ public class ModDBMDef { /** * Internal function - * + * <p> * Check if the given Block is equal to the block in this instance * * @param pBlock the Block in question @@ -43,7 +43,7 @@ public class ModDBMDef { /** * Internal function - * + * <p> * Check if the given Block is equal to the block in this instance and matches the metadata * * @param pBlock the block in question @@ -64,8 +64,7 @@ public class ModDBMDef { public boolean equals(Object other) { if (other == null) return false; if (other == this) return true; - if (!(other instanceof ModDBMDef)) return false; - ModDBMDef otherModDBMDef = (ModDBMDef) other; + if (!(other instanceof ModDBMDef otherModDBMDef)) return false; return (otherModDBMDef._targetBlockName.equals(_targetBlockName) && otherModDBMDef._targetMeta == _targetMeta); } diff --git a/src/main/java/galacticgreg/api/ModDimensionDef.java b/src/main/java/galacticgreg/api/ModDimensionDef.java index b456aa031e..fbfbd674f3 100644 --- a/src/main/java/galacticgreg/api/ModDimensionDef.java +++ b/src/main/java/galacticgreg/api/ModDimensionDef.java @@ -15,15 +15,15 @@ import net.minecraft.world.chunk.IChunkProvider; public class ModDimensionDef { private static final String STR_NOTDEFINED = "iiznotdefined"; - private String _mDimensionName; + private final String _mDimensionName; private String _mInternalDimIdentifier; - private String _mChunkProvider; + private final String _mChunkProvider; private Enums.AirReplaceRule _mDimAirSetting; - private ArrayList<ModDBMDef> _mReplaceableBlocks; + private final ArrayList<ModDBMDef> _mReplaceableBlocks; private Enums.DimensionType _mDimensionType; - private List<ISpaceObjectGenerator> _mSpaceObjectsGenerators; - private List<ISpaceObjectGenerator> _mSpaceStructureGenerators; + private final List<ISpaceObjectGenerator> _mSpaceObjectsGenerators; + private final List<ISpaceObjectGenerator> _mSpaceStructureGenerators; // Special Planets config settings private int _mGroundOreMaxY = 64; @@ -34,10 +34,10 @@ public class ModDimensionDef { private GTOreTypes _mStoneType; // Asteroid stuff - private List<AsteroidBlockComb> _mValidAsteroidMaterials; - private List<SpecialBlockComb> _mSpecialBlocksForAsteroids; + private final List<AsteroidBlockComb> _mValidAsteroidMaterials; + private final List<SpecialBlockComb> _mSpecialBlocksForAsteroids; - private Random _mRandom = new Random(System.currentTimeMillis()); + private final Random _mRandom = new Random(System.currentTimeMillis()); /** * Internal function @@ -184,7 +184,7 @@ public class ModDimensionDef { * NeverReplaceAir: No matter what, if there is an Air-Block found, it will not replace it. AllowReplaceAir: This * will generate Ores in Stones (defined by addBlockDefinition()) and air if found OnlyReplaceAir : This will not * generate Ores in solid blocks, but only in air - * + * <p> * Note that "OnlyReplaceAir" is a special setting if you have a dimension that is not defined as "Asteroids" but * you still need/want to generate ores in midair. * @@ -206,7 +206,7 @@ public class ModDimensionDef { /** * Set a manual override for ores that shall be generated. This setting is ignored if getIsAsteroidDimension() * returns true - * + * <p> * For example, on GalactiCraft Mars, this value is set to GTOreTypes.RedGranite, because it matches the color * better. If you don't set anything here, it will generate regular stone-ores. * @@ -336,7 +336,7 @@ public class ModDimensionDef { /** * Internal function - * + * <p> * Do not call this function by yourself. Ever. It will cause explosions, water to blood, death of firstborn,... * Seriously, don't do it. */ @@ -351,7 +351,7 @@ public class ModDimensionDef { /** * Internal function - * + * <p> * Check if pBlock can be replaced by an ore * * @param pBlock @@ -380,13 +380,13 @@ public class ModDimensionDef { /** * Internal function - * + * <p> * Randomly select one material out of all defined materials * * @return */ public AsteroidBlockComb getRandomAsteroidMaterial() { - if (_mValidAsteroidMaterials.size() == 0) return null; + if (_mValidAsteroidMaterials.isEmpty()) return null; if (_mValidAsteroidMaterials.size() == 1) return _mValidAsteroidMaterials.get(0); else { @@ -396,13 +396,13 @@ public class ModDimensionDef { /** * Internal function - * + * <p> * Randomly select one special block to be placed in the asteroids * * @return */ public SpecialBlockComb getRandomSpecialAsteroidBlock() { - if (_mSpecialBlocksForAsteroids.size() == 0) return null; + if (_mSpecialBlocksForAsteroids.isEmpty()) return null; if (_mSpecialBlocksForAsteroids.size() == 1) return _mSpecialBlocksForAsteroids.get(0); else { diff --git a/src/main/java/galacticgreg/api/SpecialBlockComb.java b/src/main/java/galacticgreg/api/SpecialBlockComb.java index 2cf812169a..bc3d884d3d 100644 --- a/src/main/java/galacticgreg/api/SpecialBlockComb.java +++ b/src/main/java/galacticgreg/api/SpecialBlockComb.java @@ -4,7 +4,7 @@ import net.minecraft.block.Block; public class SpecialBlockComb extends BlockMetaComb { - private Enums.AllowedBlockPosition _mBlockPosition; + private final Enums.AllowedBlockPosition _mBlockPosition; /** * Creates a simple instance for a block that has a meta value and a block position it is allowed to spawn @@ -52,8 +52,7 @@ public class SpecialBlockComb extends BlockMetaComb { public boolean equals(Object other) { if (other == null) return false; if (other == this) return true; - if (!(other instanceof SpecialBlockComb)) return false; - SpecialBlockComb otherObj = (SpecialBlockComb) other; + if (!(other instanceof SpecialBlockComb otherObj)) return false; boolean tFlag = true; String otherName = Block.blockRegistry.getNameForObject(otherObj.getBlock()); diff --git a/src/main/java/galacticgreg/api/StructureInformation.java b/src/main/java/galacticgreg/api/StructureInformation.java index 4c33f88c20..83c47603f5 100644 --- a/src/main/java/galacticgreg/api/StructureInformation.java +++ b/src/main/java/galacticgreg/api/StructureInformation.java @@ -9,9 +9,9 @@ import galacticgreg.api.Enums.TargetBlockPosition; */ public class StructureInformation { - private Vec3 _mCoordinates; - private TargetBlockPosition _mBlockPosition; - private BlockMetaComb _mBlockMetaComb; + private final Vec3 _mCoordinates; + private final TargetBlockPosition _mBlockPosition; + private final BlockMetaComb _mBlockMetaComb; public TargetBlockPosition getBlockPosition() { return _mBlockPosition; diff --git a/src/main/java/galacticgreg/api/enums/DimensionBlockMetaDefinitionList.java b/src/main/java/galacticgreg/api/enums/DimensionBlockMetaDefinitionList.java index a9cf4a4e79..72dfd9f512 100644 --- a/src/main/java/galacticgreg/api/enums/DimensionBlockMetaDefinitionList.java +++ b/src/main/java/galacticgreg/api/enums/DimensionBlockMetaDefinitionList.java @@ -51,7 +51,7 @@ public enum DimensionBlockMetaDefinitionList { public final List<ModDBMDef> DBMDefList; - private DimensionBlockMetaDefinitionList(ModDBMDef... DBMDefArray) { + DimensionBlockMetaDefinitionList(ModDBMDef... DBMDefArray) { DBMDefList = Arrays.asList(DBMDefArray); } } diff --git a/src/main/java/galacticgreg/api/enums/DimensionDef.java b/src/main/java/galacticgreg/api/enums/DimensionDef.java index 96626ee7f3..6684777bba 100644 --- a/src/main/java/galacticgreg/api/enums/DimensionDef.java +++ b/src/main/java/galacticgreg/api/enums/DimensionDef.java @@ -222,7 +222,7 @@ public enum DimensionDef { public final ModDimensionDef modDimensionDef; - private DimensionDef(ModDimensionDef modDimDef) { + DimensionDef(ModDimensionDef modDimDef) { this.modDimensionDef = modDimDef; } } diff --git a/src/main/java/galacticgreg/api/enums/ModContainers.java b/src/main/java/galacticgreg/api/enums/ModContainers.java index ddac1e14d5..e49d8aca39 100644 --- a/src/main/java/galacticgreg/api/enums/ModContainers.java +++ b/src/main/java/galacticgreg/api/enums/ModContainers.java @@ -13,7 +13,7 @@ public enum ModContainers { public final ModContainer modContainer; - private ModContainers(ModContainer modContainer) { + ModContainers(ModContainer modContainer) { this.modContainer = modContainer; } } diff --git a/src/main/java/galacticgreg/api/enums/properties/Asteroids.java b/src/main/java/galacticgreg/api/enums/properties/Asteroids.java index 2916031aaf..32020506ce 100644 --- a/src/main/java/galacticgreg/api/enums/properties/Asteroids.java +++ b/src/main/java/galacticgreg/api/enums/properties/Asteroids.java @@ -69,8 +69,7 @@ public enum Asteroids { public DimensionDef dimensionDef; public AsteroidPropertyBuilder asteroidPropertyBuilder; - private Asteroids(ModContainers modContainers, DimensionDef dimensionDef, - AsteroidPropertyBuilder asteroidPropertyBuilder) { + Asteroids(ModContainers modContainers, DimensionDef dimensionDef, AsteroidPropertyBuilder asteroidPropertyBuilder) { this.modContainers = modContainers; this.dimensionDef = dimensionDef; this.asteroidPropertyBuilder = asteroidPropertyBuilder; diff --git a/src/main/java/galacticgreg/auxiliary/ConfigManager.java b/src/main/java/galacticgreg/auxiliary/ConfigManager.java index b460757609..6a972f2447 100644 --- a/src/main/java/galacticgreg/auxiliary/ConfigManager.java +++ b/src/main/java/galacticgreg/auxiliary/ConfigManager.java @@ -14,7 +14,7 @@ import galacticgreg.GalacticGreg; public abstract class ConfigManager { private File _mainconfigDir = null; - private File _blocksconfigDir = null; + private final File _blocksconfigDir = null; private String _mModCollection = ""; private String _mModID = ""; diff --git a/src/main/java/galacticgreg/auxiliary/GalacticGregConfig.java b/src/main/java/galacticgreg/auxiliary/GalacticGregConfig.java index 39980925a1..72b6bb8708 100644 --- a/src/main/java/galacticgreg/auxiliary/GalacticGregConfig.java +++ b/src/main/java/galacticgreg/auxiliary/GalacticGregConfig.java @@ -108,7 +108,7 @@ public class GalacticGregConfig extends ConfigManager { public boolean serverPostInit() { CustomLootChest = new BlockMetaComb(Blocks.chest); try { - if (LootChestItemOverride != "") { + if (LootChestItemOverride != null && !LootChestItemOverride.isEmpty()) { String[] args = LootChestItemOverride.split(":"); String tMod; String tName; diff --git a/src/main/java/galacticgreg/auxiliary/ProfilingStorage.java b/src/main/java/galacticgreg/auxiliary/ProfilingStorage.java index b429b7f76a..94ffb8da88 100644 --- a/src/main/java/galacticgreg/auxiliary/ProfilingStorage.java +++ b/src/main/java/galacticgreg/auxiliary/ProfilingStorage.java @@ -13,7 +13,7 @@ import galacticgreg.api.ModDimensionDef; */ public class ProfilingStorage { - private Map<String, List<Long>> mProfilingMap; + private final Map<String, List<Long>> mProfilingMap; public ProfilingStorage() { mProfilingMap = new HashMap<>(); diff --git a/src/main/java/galacticgreg/command/AEStorageCommand.java b/src/main/java/galacticgreg/command/AEStorageCommand.java index 7aff0ff107..f00ecfbe6c 100644 --- a/src/main/java/galacticgreg/command/AEStorageCommand.java +++ b/src/main/java/galacticgreg/command/AEStorageCommand.java @@ -27,7 +27,7 @@ import galacticgreg.schematics.SpaceSchematicFactory; */ public class AEStorageCommand implements ICommand { - private List<String> aliases; + private final List<String> aliases; public AEStorageCommand() { this.aliases = new ArrayList<>(); @@ -52,16 +52,14 @@ public class AEStorageCommand implements ICommand { @Override public void processCommand(ICommandSender pCommandSender, String[] pArgs) { try { - if (pCommandSender instanceof EntityPlayer) { + if (pCommandSender instanceof EntityPlayer tEP) { if (pArgs.length < 1) return; String tName = pArgs[0]; - EntityPlayer tEP = (EntityPlayer) pCommandSender; // Check if item in hand is a spatial storage cell ItemStack tIS = tEP.inventory.getCurrentItem(); - if (tIS.getItem() instanceof ItemSpatialStorageCell) { - ItemSpatialStorageCell tCell = (ItemSpatialStorageCell) tIS.getItem(); + if (tIS.getItem() instanceof ItemSpatialStorageCell tCell) { World tSpatialWorld = tCell.getWorld(tIS); WorldCoord storedSize = tCell.getStoredSize(tIS); @@ -104,7 +102,6 @@ public class AEStorageCommand implements ICommand { // If block is a TileEntity if (bTE != null) { // Print a warning on the console - tMsg += " TE"; GalacticGreg.Logger.warn( "Warning: Found TileEntity at X[%d] Y[%d] Z[%d]. NBT States are not exported!", lX, @@ -154,8 +151,7 @@ public class AEStorageCommand implements ICommand { @Override public boolean canCommandSenderUseCommand(ICommandSender pCommandSender) { // Command is only enabled for actual players and only if they are OP-ed - if (pCommandSender instanceof EntityPlayerMP) { - EntityPlayerMP tEP = (EntityPlayerMP) pCommandSender; + if (pCommandSender instanceof EntityPlayerMP tEP) { return MinecraftServer.getServer() .getConfigurationManager() .func_152596_g(tEP.getGameProfile()); diff --git a/src/main/java/galacticgreg/command/ProfilingCommand.java b/src/main/java/galacticgreg/command/ProfilingCommand.java index 91805265dc..402006d1ca 100644 --- a/src/main/java/galacticgreg/command/ProfilingCommand.java +++ b/src/main/java/galacticgreg/command/ProfilingCommand.java @@ -23,7 +23,7 @@ import galacticgreg.registry.GalacticGregRegistry; */ public class ProfilingCommand implements ICommand { - private List<String> aliases; + private final List<String> aliases; public ProfilingCommand() { this.aliases = new ArrayList<>(); @@ -72,8 +72,7 @@ public class ProfilingCommand implements ICommand { .isDedicatedServer()) return true; - if (pCommandSender instanceof EntityPlayerMP) { - EntityPlayerMP tEP = (EntityPlayerMP) pCommandSender; + if (pCommandSender instanceof EntityPlayerMP tEP) { return MinecraftServer.getServer() .getConfigurationManager() .func_152596_g(tEP.getGameProfile()); diff --git a/src/main/java/galacticgreg/dynconfig/DynamicDimensionConfig.java b/src/main/java/galacticgreg/dynconfig/DynamicDimensionConfig.java index 8e6a7ef6e2..d63d403971 100644 --- a/src/main/java/galacticgreg/dynconfig/DynamicDimensionConfig.java +++ b/src/main/java/galacticgreg/dynconfig/DynamicDimensionConfig.java @@ -31,7 +31,7 @@ public class DynamicDimensionConfig { public boolean RandomizeNumLootItems; } - private static Map<String, AsteroidConfig> _mDynamicAsteroidMap = new HashMap<>(); + private static final Map<String, AsteroidConfig> _mDynamicAsteroidMap = new HashMap<>(); public static AsteroidConfig getAsteroidConfig(ModDimensionDef pDimDef) { return _mDynamicAsteroidMap.getOrDefault(pDimDef.getDimIdentifier(), null); diff --git a/src/main/java/galacticgreg/generators/GenEllipsoid.java b/src/main/java/galacticgreg/generators/GenEllipsoid.java index 432260a696..1ffc479a5b 100644 --- a/src/main/java/galacticgreg/generators/GenEllipsoid.java +++ b/src/main/java/galacticgreg/generators/GenEllipsoid.java @@ -14,7 +14,7 @@ import galacticgreg.api.StructureInformation; /** * Simple ellipsoid-generator. Based on the formular created by Chrysator. Thanks for the help! - * + * <p> * Generates a simple ellipsoid with dynamic rotation, random size-values, random noise for the surface, etc. Can * probably be tweaked even more, but works for now... */ @@ -24,8 +24,8 @@ public class GenEllipsoid implements ISpaceObjectGenerator { private Random _mRandom; private List<StructureInformation> _mStructure; - private double _mCoreDensity = 0.7D; - private double _mSineFactor = 0.05D; + private final double _mCoreDensity = 0.7D; + private final double _mSineFactor = 0.05D; private float _mRandomInfluence; private float _mRandomAngleX; private float _mRandomAngleY; diff --git a/src/main/java/galacticgreg/schematics/SpaceSchematicHandler.java b/src/main/java/galacticgreg/schematics/SpaceSchematicHandler.java index 9282ebca06..575befaf0a 100644 --- a/src/main/java/galacticgreg/schematics/SpaceSchematicHandler.java +++ b/src/main/java/galacticgreg/schematics/SpaceSchematicHandler.java @@ -47,7 +47,7 @@ public class SpaceSchematicHandler { if (_mSpaceSchematics == null) return null; - if (_mSpaceSchematics.size() == 0) return null; + if (_mSpaceSchematics.isEmpty()) return null; if (_mSpaceSchematics.size() == 1) { tChoosenSchematic = _mSpaceSchematics.get(0); @@ -59,7 +59,7 @@ public class SpaceSchematicHandler { } } - if (tRandomIDs.size() > 0) { + if (!tRandomIDs.isEmpty()) { int tRnd = GalacticGreg.GalacticRandom.nextInt(tRandomIDs.size()); tChoosenSchematic = _mSpaceSchematics.get(tRandomIDs.get(tRnd)); } @@ -128,7 +128,7 @@ public class SpaceSchematicHandler { public boolean SaveSpaceStructure(SpaceSchematic pSchematic) { try { if (pSchematic.getName() - .length() < 1) return false; + .isEmpty()) return false; JAXBContext tJaxbCtx = JAXBContext.newInstance(SpaceSchematic.class); Marshaller jaxMarsh = tJaxbCtx.createMarshaller(); diff --git a/src/main/java/galacticgreg/schematics/SpaceSchematicWrapper.java b/src/main/java/galacticgreg/schematics/SpaceSchematicWrapper.java index 4addc5107d..06ffd079d2 100644 --- a/src/main/java/galacticgreg/schematics/SpaceSchematicWrapper.java +++ b/src/main/java/galacticgreg/schematics/SpaceSchematicWrapper.java @@ -22,7 +22,7 @@ import galacticgreg.schematics.SpaceSchematic.BaseStructureInfo; */ public class SpaceSchematicWrapper implements ISpaceObjectGenerator { - private SpaceSchematic _mSchematic; + private final SpaceSchematic _mSchematic; private Vec3 _mCenter = Vec3.createVectorHelper(0, 0, 0); private List<StructureInformation> _mFinalizedStructure; @@ -31,7 +31,7 @@ public class SpaceSchematicWrapper implements ISpaceObjectGenerator { } public boolean isCalculated() { - return _mFinalizedStructure != null && _mFinalizedStructure.size() > 0; + return _mFinalizedStructure != null && !_mFinalizedStructure.isEmpty(); } /** diff --git a/src/main/java/ggfab/mte/MTEAdvAssLine.java b/src/main/java/ggfab/mte/MTEAdvAssLine.java index 04d9a9118f..dd579021a2 100644 --- a/src/main/java/ggfab/mte/MTEAdvAssLine.java +++ b/src/main/java/ggfab/mte/MTEAdvAssLine.java @@ -463,7 +463,7 @@ public class MTEAdvAssLine extends MTEExtendedPowerMultiBlockBase<MTEAdvAssLine> @Override public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { - if (checkMachine() && (mEnergyHatches.size() > 0 || mExoticEnergyHatches.size() > 0)) { + if (checkMachine() && (!mEnergyHatches.isEmpty() || !mExoticEnergyHatches.isEmpty())) { long oV = inputVoltage, oEut = inputEUt; inputVoltage = Integer.MAX_VALUE; inputEUt = 0; @@ -776,14 +776,12 @@ public class MTEAdvAssLine extends MTEExtendedPowerMultiBlockBase<MTEAdvAssLine> .calculate(); int normalOverclockCount = normalOCCalculator.getPerformedOverclocks(); - OverclockCalculator laserOCCalculator = new OverclockCalculator().setRecipeEUt(recipe.mEUt) + calculator = new OverclockCalculator().setRecipeEUt(recipe.mEUt) .setDurationUnderOneTickSupplier(() -> ((double) (recipe.mDuration) / recipe.mInputs.length)) .setEutIncreasePerOCSupplier( overclock -> 4 + LASER_OVERCLOCK_PENALTY_FACTOR * Math.max(overclock - normalOverclockCount, 0)) .setParallel(originalMaxParallel) .setEUt(inputEUt / recipe.mInputs.length); - - calculator = laserOCCalculator; } else { calculator = normalOCCalculator; } 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<AntimatterFo private static final float coefficientBaseExp = 0.5f; private static final float baseSkew = 0.2f; - private float[] modifiers = { 0.0f, 0.0f, 0.0f, 0.0f }; - private FluidStack[] upgradeFluids = { null, null, null, null }; - private int[] fluidConsumptions = { 0, 0, 0, 0 }; + private final float[] modifiers = { 0.0f, 0.0f, 0.0f, 0.0f }; + private final FluidStack[] upgradeFluids = { null, null, null, null }; + private final int[] fluidConsumptions = { 0, 0, 0, 0 }; public static final String MAIN_NAME = "antimatterForge"; - private int speed = 100; + private final int speed = 100; private long rollingCost = 0L; private boolean isLoadedChunk; public GTRecipe mLastRecipe; public int para; - private Random r = new Random(); + private final Random r = new Random(); // Values for displaying cycle data private long guiAntimatterAmount = 0; private long guiAntimatterChange = 0; private long guiPassiveEnergy = 0; private long guiActiveEnergy = 0; - private boolean canRender = false; + private final boolean canRender = false; - private List<AntimatterOutputHatch> amOutputHatches = new ArrayList<>(16); - private static final ClassValue<IStructureDefinition<AntimatterForge>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<AntimatterForge>>() { + private final List<AntimatterOutputHatch> amOutputHatches = new ArrayList<>(16); + private static final ClassValue<IStructureDefinition<AntimatterForge>> STRUCTURE_DEFINITION = new ClassValue<>() { @Override protected IStructureDefinition<AntimatterForge> computeValue(Class<?> type) { @@ -189,10 +189,10 @@ public class AntimatterForge extends MTEExtendedPowerMultiBlockBase<AntimatterFo + "Antimatter" + EnumChatFormatting.GRAY + " * " - + String.valueOf(this.passiveBaseMult) + + passiveBaseMult + ")^" + EnumChatFormatting.GREEN - + String.valueOf(this.passiveBaseExp) + + passiveBaseExp + EnumChatFormatting.GRAY + " EU/t passively. The consumption decays by 0.5% every tick when empty") .addInfo( @@ -200,10 +200,10 @@ public class AntimatterForge extends MTEExtendedPowerMultiBlockBase<AntimatterFo + "Antimatter" + EnumChatFormatting.GRAY + " * " - + String.valueOf(this.activeBaseMult) + + activeBaseMult + ")^" + EnumChatFormatting.DARK_PURPLE - + String.valueOf(this.activeBaseExp) + + activeBaseExp + EnumChatFormatting.GRAY + " EU per operation to produce antimatter") .addSeparator() @@ -223,19 +223,19 @@ public class AntimatterForge extends MTEExtendedPowerMultiBlockBase<AntimatterFo + EnumChatFormatting.GRAY + "^" + EnumChatFormatting.GOLD - + String.valueOf(this.coefficientBaseExp) + + coefficientBaseExp + EnumChatFormatting.GRAY + ") * N(" + EnumChatFormatting.AQUA - + String.valueOf(this.baseSkew) + + baseSkew + EnumChatFormatting.GRAY + ", 0.25) of antimatter per cycle, consuming equal amounts of Protomatter") .addInfo( "The change is split between the 16 Antimatter Hatches, sampled from N(" + EnumChatFormatting.AQUA - + String.valueOf(this.baseSkew) + + baseSkew + EnumChatFormatting.GRAY + ", 1) (Gaussian distribution with mean of " - + String.valueOf(this.baseSkew) + + baseSkew + ")") .addInfo("The total change can be negative!") .addSeparator() @@ -461,14 +461,10 @@ public class AntimatterForge extends MTEExtendedPowerMultiBlockBase<AntimatterFo private long calculateContainedAntimatter() { long antimatterStored = 0; - for (int i = 0; i < amOutputHatches.size(); i++) { - if (amOutputHatches.get(i) == null || !amOutputHatches.get(i) - .isValid() - || amOutputHatches.get(i) - .getFluid() == null) - continue; - antimatterStored += amOutputHatches.get(i) - .getFluid().amount; + for (AntimatterOutputHatch amOutputHatch : amOutputHatches) { + if (amOutputHatch != null && amOutputHatch.isValid() && amOutputHatch.getFluid() != null) { + antimatterStored += amOutputHatch.getFluid().amount; + } } return antimatterStored; } @@ -507,17 +503,12 @@ public class AntimatterForge extends MTEExtendedPowerMultiBlockBase<AntimatterFo int ratioLosses = 0; // Reduce the amount of antimatter in each hatch by half of the difference between the lowest amount and current // hatch contents - for (int i = 0; i < amOutputHatches.size(); i++) { - if (amOutputHatches.get(i) == null || !amOutputHatches.get(i) - .isValid() - || amOutputHatches.get(i) - .getFluid() == null) - continue; - FluidStack fluid = amOutputHatches.get(i) - .getFluid() - .copy(); - ratioLosses -= amOutputHatches.get(i) - .drain((int) ((fluid.amount - minAntimatterAmount) * 0.5), true).amount; + for (AntimatterOutputHatch amOutputHatch : amOutputHatches) { + if (amOutputHatch != null && amOutputHatch.isValid() && amOutputHatch.getFluid() != null) { + FluidStack fluid = amOutputHatch.getFluid() + .copy(); + ratioLosses -= amOutputHatch.drain((int) ((fluid.amount - minAntimatterAmount) * 0.5), true).amount; + } } // Check for upgrade fluids @@ -534,8 +525,7 @@ public class AntimatterForge extends MTEExtendedPowerMultiBlockBase<AntimatterFo } List<FluidStack> 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<AntimatterFo containedProtomatter); // We didn't have enough protomatter, reduce antimatter by 10% and stop the machine. - if (!this.depleteInput(MaterialsUEVplus.Protomatter.getFluid((long) Math.abs(antimatterChange)))) { + if (!this.depleteInput(MaterialsUEVplus.Protomatter.getFluid(Math.abs(antimatterChange)))) { decimateAntimatter(); stopMachine(ShutDownReasonRegistry.outOfFluid(MaterialsUEVplus.Protomatter.getFluid(1L))); endRecipeProcessing(); @@ -623,17 +613,12 @@ public class AntimatterForge extends MTEExtendedPowerMultiBlockBase<AntimatterFo } private void decimateAntimatter() { - for (int i = 0; i < amOutputHatches.size(); i++) { - if (amOutputHatches.get(i) == null || !amOutputHatches.get(i) - .isValid() - || amOutputHatches.get(i) - .getFluid() == null) - continue; - FluidStack fluid = amOutputHatches.get(i) - .getFluid() - .copy(); - amOutputHatches.get(i) - .drain((int) Math.floor(fluid.amount * 0.1), true); + for (AntimatterOutputHatch amOutputHatch : amOutputHatches) { + if (amOutputHatch != null && amOutputHatch.isValid() && amOutputHatch.getFluid() != null) { + FluidStack fluid = amOutputHatch.getFluid() + .copy(); + amOutputHatch.drain((int) Math.floor(fluid.amount * 0.1), true); + } } } @@ -648,7 +633,7 @@ public class AntimatterForge extends MTEExtendedPowerMultiBlockBase<AntimatterFo int change = (int) (Math.ceil((r.nextGaussian() + baseSkew + modifiers[ACTIVATION_ID]) * (coeff / 16))); difference += change; if (change >= 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<IStructureDefinition<AntimatterGenerator>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<AntimatterGenerator>>() { + private static final ClassValue<IStructureDefinition<AntimatterGenerator>> STRUCTURE_DEFINITION = new ClassValue<>() { @Override protected IStructureDefinition<AntimatterGenerator> 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<Boolean> ret = new ArrayList<Boolean>(); + ArrayList<Boolean> 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<MTEFuelRefineFactory> 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 <T> IStructureElement<T> ofFieldCoil(int aIndex) { - return new IStructureElement<T>() { + 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<MTELargeEssentiaSmeltery> multiDefinition = null; - private ArrayList<MTEEssentiaOutputHatch> mEssentiaOutputHatches = new ArrayList<>(); + private final ArrayList<MTEEssentiaOutputHatch> 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<IStructureDefinition<MTELargeFusionComputer>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<MTELargeFusionComputer>>() { + private static final ClassValue<IStructureDefinition<MTELargeFusionComputer>> STRUCTURE_DEFINITION = new ClassValue<>() { @Override protected IStructureDefinition<MTELargeFusionComputer> 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<MTEL implements ISurvivalConstructable { private static final String STRUCTURE_PIECE_MAIN = "main"; - private static final ClassValue<IStructureDefinition<MTELargeTurbineBase>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<MTELargeTurbineBase>>() { + private static final ClassValue<IStructureDefinition<MTELargeTurbineBase>> STRUCTURE_DEFINITION = new ClassValue<>() { @Override protected IStructureDefinition<MTELargeTurbineBase> computeValue(Class<?> type) { @@ -270,7 +270,7 @@ public abstract class MTELargeTurbineBase extends MTEEnhancedMultiBlockBase<MTEL maxEnergy += tHatch.getBaseMetaTileEntity() .getEUCapacity(); } - String[] ret = new String[] { + return new String[] { // 8 Lines available for information panels tRunning + ": " + EnumChatFormatting.RED @@ -315,7 +315,6 @@ public abstract class MTELargeTurbineBase extends MTEEnhancedMultiBlockBase<MTEL + EnumChatFormatting.RESET + " %" /* 8 */ }; - return ret; } public boolean hasTurbine() { diff --git a/src/main/java/goodgenerator/client/render/AntimatterRenderer.java b/src/main/java/goodgenerator/client/render/AntimatterRenderer.java index c6d4f689c6..109b362999 100644 --- a/src/main/java/goodgenerator/client/render/AntimatterRenderer.java +++ b/src/main/java/goodgenerator/client/render/AntimatterRenderer.java @@ -75,13 +75,13 @@ public class AntimatterRenderer extends TileEntitySpecialRenderer { ResourceLocation antimatterLocation = new ResourceLocation( GoodGenerator.resourceDomain, "models/Antimatter.obj"); - antimatterModel = (IModelCustom) new WavefrontObject(antimatterLocation); + antimatterModel = new WavefrontObject(antimatterLocation); ResourceLocation location = new ResourceLocation(GoodGenerator.resourceDomain, "models/SmoothSphere.obj"); - containerModel = (IModelCustom) new WavefrontObject(location); + containerModel = new WavefrontObject(location); ResourceLocation ringLocation = new ResourceLocation(GoodGenerator.resourceDomain, "models/GlowRing.obj"); - ringModel = (IModelCustom) new WavefrontObject(ringLocation); + ringModel = new WavefrontObject(ringLocation); } private void init() { diff --git a/src/main/java/goodgenerator/client/render/BlockRenderHandler.java b/src/main/java/goodgenerator/client/render/BlockRenderHandler.java index c8e8bfacb8..c23d9a26bb 100644 --- a/src/main/java/goodgenerator/client/render/BlockRenderHandler.java +++ b/src/main/java/goodgenerator/client/render/BlockRenderHandler.java @@ -37,8 +37,7 @@ public class BlockRenderHandler implements ISimpleBlockRenderingHandler { GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - if (aBlock instanceof ITextureBlock) { - ITextureBlock tc = (ITextureBlock) aBlock; + if (aBlock instanceof ITextureBlock tc) { aBlock.setBlockBoundsForItemRender(); aRenderer.setRenderBoundsFromBlock(aBlock); renderNegativeYFacing(null, aRenderer, aBlock, 0, 0, 0, tc.getTexture(aBlock, metadata, DOWN), true); @@ -61,10 +60,9 @@ public class BlockRenderHandler implements ISimpleBlockRenderingHandler { RenderBlocks aRenderer) { aRenderer.enableAO = Minecraft.isAmbientOcclusionEnabled() && GTMod.gregtechproxy.mRenderTileAmbientOcclusion; aRenderer.useInventoryTint = false; - if (aBlock instanceof ITextureBlock) { + if (aBlock instanceof ITextureBlock tc) { aBlock.setBlockBounds(blockMin, blockMin, blockMin, blockMax, blockMax, blockMax); aRenderer.setRenderBoundsFromBlock(aBlock); - ITextureBlock tc = (ITextureBlock) aBlock; renderNegativeYFacing( aWorld, aRenderer, diff --git a/src/main/java/goodgenerator/crossmod/nei/NEIConfig.java b/src/main/java/goodgenerator/crossmod/nei/NEIConfig.java index 20c492fc7d..81a10e2002 100644 --- a/src/main/java/goodgenerator/crossmod/nei/NEIConfig.java +++ b/src/main/java/goodgenerator/crossmod/nei/NEIConfig.java @@ -14,7 +14,6 @@ public class NEIConfig implements IConfigureNEI { @Override public void loadConfig() { - NEIConfig.isAdded = false; NEIConfig.isAdded = true; } diff --git a/src/main/java/goodgenerator/items/GGItem.java b/src/main/java/goodgenerator/items/GGItem.java index 627cf1c59b..85a3c9e9c3 100644 --- a/src/main/java/goodgenerator/items/GGItem.java +++ b/src/main/java/goodgenerator/items/GGItem.java @@ -115,10 +115,10 @@ public class GGItem extends Item { @SideOnly(Side.CLIENT) @SuppressWarnings({ "unchecked" }) public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { - if (tooltips.size() > 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 <T> IStructureElement<T> addFrame(Materials aMaterials) { - return new IStructureElement<T>() { + 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 <T> IStructureElement<T> addTieredBlock(Block aBlock, BiPredicate<T, Integer> aSetTheFuckingMeta, Function<T, Integer> aGetTheFuckingMeta, int maxMeta) { - return new IStructureElement<T>() { + return new IStructureElement<>() { @Override public boolean check(T t, World world, int x, int y, int z) { 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) { diff --git a/src/main/java/gtPlusPlus/api/objects/Logger.java b/src/main/java/gtPlusPlus/api/objects/Logger.java index 6650668894..3ec36aeec1 100644 --- a/src/main/java/gtPlusPlus/api/objects/Logger.java +++ b/src/main/java/gtPlusPlus/api/objects/Logger.java @@ -17,8 +17,7 @@ public class Logger { // Generate GT++ Logger public static org.apache.logging.log4j.Logger makeLogger() { - final org.apache.logging.log4j.Logger gtPlusPlusLogger = LogManager.getLogger("GT++"); - return gtPlusPlusLogger; + return LogManager.getLogger("GT++"); } private static final boolean enabled = !ASMConfiguration.debug.disableAllLogging; diff --git a/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java b/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java index ea12972af4..eb4b3cfd59 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java +++ b/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java @@ -10,7 +10,7 @@ import gtPlusPlus.api.objects.Logger; public class TypeCounter<V> implements Set<V> { - private Map<String, InternalTypeCounterObject<V>> mInternalMap = new LinkedHashMap<>(); + private final Map<String, InternalTypeCounterObject<V>> mInternalMap = new LinkedHashMap<>(); private String mHighestValueKey; private int mHighestValue = 0; private final Class mClass; @@ -55,7 +55,7 @@ public class TypeCounter<V> implements Set<V> { String aKey = aKeyName != null ? aKeyName : arg0.toString(); InternalTypeCounterObject<V> aValue = mInternalMap.get(aKey); if (aValue == null) { - aValue = new InternalTypeCounterObject<>((V) arg0); + aValue = new InternalTypeCounterObject<>(arg0); Logger.WARNING("Adding new key to map: " + aKey); } aValue.add(); @@ -115,11 +115,7 @@ public class TypeCounter<V> implements Set<V> { @Override public boolean remove(Object arg0) { InternalTypeCounterObject<V> aValue = mInternalMap.remove(arg0.toString()); - if (aValue != null) { - return true; - } else { - return false; - } + return aValue != null; } @Override diff --git a/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java b/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java index 5d99097169..6a14b97e0b 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java +++ b/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java @@ -11,8 +11,8 @@ import gregtech.api.objects.XSTR; public class WeightedCollection<E> implements Map<Integer, E> { - private NavigableMap<Integer, E> map = new TreeMap<>(); - private Random random; + private final NavigableMap<Integer, E> map = new TreeMap<>(); + private final Random random; private int total = 0; public WeightedCollection() { diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java index 13f12503f0..2c93631b4d 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java @@ -15,7 +15,7 @@ public class BTF_FluidTank extends FluidTank { /** * Let's replace the Default handling with GT's own handling code, because it's probably better, right? - * + * * @author Alkalus/GregoriusT */ @Override @@ -132,13 +132,10 @@ public class BTF_FluidTank extends FluidTank { public FluidStack drain(int maxDrain, boolean doDrain) { if (this.getDrainableStack() != null && this.canTankBeEmptied()) { if (this.getDrainableStack().amount <= 0 && this.isFluidChangingAllowed()) { - this.setDrainableStack((FluidStack) null); + this.setDrainableStack(null); return null; } else { - int used = maxDrain; - if (this.getDrainableStack().amount < maxDrain) { - used = this.getDrainableStack().amount; - } + int used = Math.min(this.getDrainableStack().amount, maxDrain); if (doDrain) { FluidStack arg9999 = this.getDrainableStack(); @@ -149,7 +146,7 @@ public class BTF_FluidTank extends FluidTank { .copy(); drained.amount = used; if (this.getDrainableStack().amount <= 0 && this.isFluidChangingAllowed()) { - this.setDrainableStack((FluidStack) null); + this.setDrainableStack(null); } return drained; diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java index cdbf2c43e2..97ebaeb9ba 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java @@ -75,12 +75,12 @@ public class BTF_Inventory implements ISidedInventory { if (this.setStackToZeroInsteadOfNull(aIndex)) { tStack.stackSize = 0; } else { - this.setInventorySlotContents(aIndex, (ItemStack) null); + this.setInventorySlotContents(aIndex, null); } } else { rStack = tStack.splitStack(aAmount); if (tStack.stackSize == 0 && !this.setStackToZeroInsteadOfNull(aIndex)) { - this.setInventorySlotContents(aIndex, (ItemStack) null); + this.setInventorySlotContents(aIndex, null); } } } @@ -143,7 +143,7 @@ public class BTF_Inventory implements ISidedInventory { @Override public final boolean hasCustomInventoryName() { - return mTile != null ? mTile.hasCustomInventoryName() : false; + return mTile != null && mTile.hasCustomInventoryName(); } @Override @@ -183,11 +183,7 @@ public class BTF_Inventory implements ISidedInventory { public boolean isEmpty() { for (int s = 0; s < this.getSizeInventory(); s++) { ItemStack slot = mInventory[s]; - if (slot == null) { - continue; - } else { - return false; - } + if (slot != null) return false; } return true; } diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java index 047b5dbeaf..8145a2d3e9 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java @@ -65,8 +65,7 @@ public class BlockPos implements Serializable { } public String getUniqueIdentifier() { - String S = "" + this.dim + "@" + this.xPos + "@" + this.yPos + "@" + this.zPos; - return S; + return this.dim + "@" + this.xPos + "@" + this.yPos + "@" + this.zPos; } @Override diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java index a858f5a295..a65edc052b 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java @@ -53,5 +53,5 @@ public abstract class ItemPackage implements RunnableWithInfo<String> { */ public boolean onLoadComplete(FMLLoadCompleteEvent event) { return false; - }; + } } diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ItemStackData.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemStackData.java index f5e483b91c..b3824c77da 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/ItemStackData.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemStackData.java @@ -19,7 +19,7 @@ public class ItemStackData { mDamage = aStack.getItemDamage(); mStackSize = aStack.stackSize; mNBT = (aStack.getTagCompound() != null ? aStack.getTagCompound() : new NBTTagCompound()); - mUniqueDataTag = "" + Item.getIdFromItem(mItem) + "" + mDamage + "" + mStackSize + "" + mNBT.getId(); + mUniqueDataTag = String.valueOf(Item.getIdFromItem(mItem)) + mDamage + mStackSize + mNBT.getId(); } public String getUniqueDataIdentifier() { diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java index 867f247b6e..4f61996e08 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java @@ -101,7 +101,7 @@ public class ShapedRecipe implements IRecipeMutableAccess { aCharSlot++; aLoggingInfo[aInfoSlot++] = mInfo; } else { - aRecipePairs.add(new Pair<>(' ', (ItemStack) null)); + aRecipePairs.add(new Pair<>(' ', null)); Logger.RECIPE("Storing ' ' with an object of type null"); aChar[aMemSlot++] = ' '; aLoggingInfo[aInfoSlot++] = "Empty"; @@ -115,8 +115,8 @@ public class ShapedRecipe implements IRecipeMutableAccess { for (Pair<Character, Object> h : aRecipePairs) { if (h.getKey() != null) { - aGridWhole.append(String.valueOf(h.getKey())); - Logger.RECIPE("Adding '" + String.valueOf(h.getKey()) + "' to aGridWhole."); + aGridWhole.append(h.getKey()); + Logger.RECIPE("Adding '" + h.getKey() + "' to aGridWhole."); } } @@ -194,7 +194,7 @@ public class ShapedRecipe implements IRecipeMutableAccess { o = ((ItemStack) o).copy(); } - mVarags2[counter2] = (char) c; + mVarags2[counter2] = c; mVarags2[counter2 + 1] = o; counter2 += 2; } diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java index d39c194dfd..7747deb5da 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java +++ b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java @@ -31,7 +31,7 @@ public class BasicBlock extends BlockContainer { this.setStepSound(soundTypeMetal); } - public static enum BlockTypes { + public enum BlockTypes { STANDARD("blockBlock", "pickaxe", soundTypeMetal), FRAME("blockFrameGt", "wrench", soundTypeMetal), diff --git a/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java b/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java index 7e64f19bf3..a85e700db2 100644 --- a/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java +++ b/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java @@ -7,8 +7,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EnumCreatureType; -import net.minecraft.entity.boss.EntityDragon; -import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.boss.IBossDisplayData; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -73,8 +71,7 @@ public class BlockWitherProof extends Block { if ((entity == null) || !entity.isEntityAlive()) { return false; } - if ((entity instanceof EntityWither) || (entity instanceof EntityDragon) - || (entity instanceof IBossDisplayData)) { + if (entity instanceof IBossDisplayData) { return false; } else { return super.canEntityDestroy(world, x, y, z, entity); @@ -109,7 +106,7 @@ public class BlockWitherProof extends Block { @Override public float getPlayerRelativeBlockHardness(EntityPlayer aPlayer, World p_149737_2_, int p_149737_3_, int p_149737_4_, int p_149737_5_) { - if (aPlayer != null && aPlayer instanceof EntityPlayerMP) { + if (aPlayer instanceof EntityPlayerMP) { return 1f; } return -1f; @@ -131,10 +128,7 @@ public class BlockWitherProof extends Block { if ((entity == null) || !entity.isEntityAlive()) { return; } - if ((entity instanceof EntityWither) || (entity instanceof EntityDragon) - || (entity instanceof IBossDisplayData)) { - return; - } else { + if (!(entity instanceof IBossDisplayData)) { super.onEntityCollidedWithBlock(world, x, y, z, entity); } } @@ -147,7 +141,7 @@ public class BlockWitherProof extends Block { @Override public boolean canHarvestBlock(EntityPlayer player, int meta) { - if (player != null && player instanceof EntityPlayerMP) { + if (player instanceof EntityPlayerMP) { return true; } return super.canHarvestBlock(player, meta); diff --git a/src/main/java/gtPlusPlus/core/block/machine/BlockCircuitProgrammer.java b/src/main/java/gtPlusPlus/core/block/machine/BlockCircuitProgrammer.java index dcbe41f150..568df08922 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/BlockCircuitProgrammer.java +++ b/src/main/java/gtPlusPlus/core/block/machine/BlockCircuitProgrammer.java @@ -147,7 +147,6 @@ public class BlockCircuitProgrammer extends BasicTileBlockWithTooltip { GTPlusPlus.ID + ":metro/TEXTURE_TECH_PANEL_B", GTPlusPlus.ID + ":metro/TEXTURE_METAL_PANEL_I", GTPlusPlus.ID + ":metro/TEXTURE_METAL_PANEL_I", GTPlusPlus.ID + ":metro/TEXTURE_METAL_PANEL_I", GTPlusPlus.ID + ":metro/TEXTURE_METAL_PANEL_I" }; - CubicObject<String>[] aTextureData = new CubicObject[] { new CubicObject<>(aTexData) }; - return aTextureData; + return (CubicObject<String>[]) new CubicObject[] { new CubicObject<>(aTexData) }; } } diff --git a/src/main/java/gtPlusPlus/core/block/machine/BlockFlaskSetter.java b/src/main/java/gtPlusPlus/core/block/machine/BlockFlaskSetter.java index 5ec07bb9e3..134bbafd6b 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/BlockFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/block/machine/BlockFlaskSetter.java @@ -151,7 +151,6 @@ public class BlockFlaskSetter extends BasicTileBlockWithTooltip { GTPlusPlus.ID + ":metro/TEXTURE_TECH_PANEL_C", GTPlusPlus.ID + ":metro/TEXTURE_METAL_PANEL_H", GTPlusPlus.ID + ":metro/TEXTURE_METAL_PANEL_H", GTPlusPlus.ID + ":metro/TEXTURE_METAL_PANEL_H", GTPlusPlus.ID + ":metro/TEXTURE_METAL_PANEL_H" }; - CubicObject<String>[] aTextureData = new CubicObject[] { new CubicObject<>(aTexData) }; - return aTextureData; + return (CubicObject<String>[]) new CubicObject[] { new CubicObject<>(aTexData) }; } } diff --git a/src/main/java/gtPlusPlus/core/block/machine/BlockPooCollector.java b/src/main/java/gtPlusPlus/core/block/machine/BlockPooCollector.java index 6a371a3284..b7c84ddc8c 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/BlockPooCollector.java +++ b/src/main/java/gtPlusPlus/core/block/machine/BlockPooCollector.java @@ -85,13 +85,11 @@ public class BlockPooCollector extends BlockContainer { } else { TileEntityBaseFluidCollector tank = (TileEntityBaseFluidCollector) world.getTileEntity(x, y, z); if (tank != null) { - Item handItem; - try { - handItem = player.getHeldItem() - .getItem(); - } catch (Throwable t) { - handItem = null; - } + // Item handItem; + // try { + // handItem = player.getHeldItem() + // .getItem(); + // } catch (Throwable t) {} // Fluid container code /* diff --git a/src/main/java/gtPlusPlus/core/block/machine/BlockSuperJukebox.java b/src/main/java/gtPlusPlus/core/block/machine/BlockSuperJukebox.java index be55db80a0..9d6f76ca2c 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/BlockSuperJukebox.java +++ b/src/main/java/gtPlusPlus/core/block/machine/BlockSuperJukebox.java @@ -77,7 +77,7 @@ public class BlockSuperJukebox extends BlockJukebox { } final TileEntity te = world.getTileEntity(x, y, z); - if ((te != null) && (te instanceof TileEntitySuperJukebox)) { + if (te instanceof TileEntitySuperJukebox) { player.openGui(GTplusplus.instance, GuiHandler.GUI14, world, x, y, z); return true; } @@ -328,7 +328,7 @@ public class BlockSuperJukebox extends BlockJukebox { Logger.INFO("b1"); // Select First Record ItemStack aRecordToPlay; - if (mValidRecords.size() == 0) { + if (mValidRecords.isEmpty()) { Logger.INFO("bX"); return false; } else { @@ -399,8 +399,8 @@ public class BlockSuperJukebox extends BlockJukebox { ItemStack aRecordToPlay = tileentityjukebox.func_145856_a(); if (aRecordToPlay != null) { aWorld.playAuxSFX(1005, aX, aY, aZ, 0); - aWorld.playRecord((String) null, aX, aY, aZ); - tileentityjukebox.func_145857_a((ItemStack) null); + aWorld.playRecord(null, aX, aY, aZ); + tileentityjukebox.func_145857_a(null); this.markDirty(); } } @@ -568,7 +568,7 @@ public class BlockSuperJukebox extends BlockJukebox { @Override public boolean hasCustomInventoryName() { - return (this.customName != null) && !this.customName.equals(""); + return (this.customName != null) && !this.customName.isEmpty(); } } } diff --git a/src/main/java/gtPlusPlus/core/client/CustomTextureSet.java b/src/main/java/gtPlusPlus/core/client/CustomTextureSet.java index ce4d9a0320..ca9328dba0 100644 --- a/src/main/java/gtPlusPlus/core/client/CustomTextureSet.java +++ b/src/main/java/gtPlusPlus/core/client/CustomTextureSet.java @@ -4,7 +4,7 @@ import gregtech.api.enums.TextureSet; public class CustomTextureSet extends TextureSet { - public static enum TextureSets { + public enum TextureSets { REFINED(), GEM_A(), @@ -13,7 +13,7 @@ public class CustomTextureSet extends TextureSet { private final CustomTextureSet A; - private TextureSets() { + TextureSets() { A = new CustomTextureSet( this.name() .toUpperCase()); diff --git a/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java b/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java index 3b5922444d..877fe3886c 100644 --- a/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java +++ b/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java @@ -12,9 +12,9 @@ import cpw.mods.fml.relauncher.SideOnly; public class ModelSickBlaze extends ModelBlaze { /** The sticks that fly around the Blaze. */ - private ModelRenderer[] blazeSticks = new ModelRenderer[24]; + private final ModelRenderer[] blazeSticks = new ModelRenderer[24]; - private ModelRenderer blazeHead; + private final ModelRenderer blazeHead; public ModelSickBlaze() { for (int i = 0; i < this.blazeSticks.length; ++i) { diff --git a/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java b/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java index 689f075703..a32dd2da8f 100644 --- a/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java @@ -31,8 +31,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { public boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, RenderBlocks aRenderer) { - Block tTileEntity = aBlock; - if ((tTileEntity instanceof ITexturedBlock)) { + if ((aBlock instanceof ITexturedBlock)) { return renderStandardBlock( aWorld, aX, @@ -40,12 +39,12 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { aZ, aBlock, aRenderer, - new ITexture[][] { ((ITexturedBlock) tTileEntity).getTexture(ForgeDirection.DOWN), - ((ITexturedBlock) tTileEntity).getTexture(ForgeDirection.UP), - ((ITexturedBlock) tTileEntity).getTexture(ForgeDirection.NORTH), - ((ITexturedBlock) tTileEntity).getTexture(ForgeDirection.SOUTH), - ((ITexturedBlock) tTileEntity).getTexture(ForgeDirection.WEST), - ((ITexturedBlock) tTileEntity).getTexture(ForgeDirection.EAST) }); + new ITexture[][] { ((ITexturedBlock) aBlock).getTexture(ForgeDirection.DOWN), + ((ITexturedBlock) aBlock).getTexture(ForgeDirection.UP), + ((ITexturedBlock) aBlock).getTexture(ForgeDirection.NORTH), + ((ITexturedBlock) aBlock).getTexture(ForgeDirection.SOUTH), + ((ITexturedBlock) aBlock).getTexture(ForgeDirection.WEST), + ((ITexturedBlock) aBlock).getTexture(ForgeDirection.EAST) }); } return false; } @@ -556,8 +555,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { .getTextureManager() .getTexture(TextureMap.locationBlocksTexture)).getAtlasSprite("missingno"); } - - return (IIcon) iicon; + return iicon; } IBlockAccess blockAccess = RenderBlocks.getInstance().blockAccess; diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java index 78d4f367eb..a5ab58ef59 100644 --- a/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java @@ -23,7 +23,7 @@ public class RenderDecayChest extends TileEntitySpecialRenderer { private static final ResourceLocation mChestTexture = new ResourceLocation( GTPlusPlus.ID, "textures/blocks/TileEntities/DecayablesChest_full.png"); - private ModelDecayChest mChestModel = new ModelDecayChest(); + private final ModelDecayChest mChestModel = new ModelDecayChest(); public static RenderDecayChest INSTANCE; public final int mRenderID; diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderToxinball.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderToxinball.java index 2c0ed7f562..bc8c3b7bbc 100644 --- a/src/main/java/gtPlusPlus/core/client/renderer/RenderToxinball.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderToxinball.java @@ -18,7 +18,7 @@ import gtPlusPlus.core.entity.projectile.EntityToxinball; @SideOnly(Side.CLIENT) public class RenderToxinball extends Render { - private float mSize; + private final float mSize; public RenderToxinball(float scale) { this.mSize = scale; diff --git a/src/main/java/gtPlusPlus/core/common/compat/CompatIC2.java b/src/main/java/gtPlusPlus/core/common/compat/CompatIC2.java index 7e60f95d37..905c1a870b 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/CompatIC2.java +++ b/src/main/java/gtPlusPlus/core/common/compat/CompatIC2.java @@ -10,8 +10,8 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class CompatIC2 { - private static ItemStack itemCropnalyzer = ItemUtils.simpleMetaStack("IC2:itemCropnalyzer", 0, 1); - private static ItemStack itemSolarHelmet = ItemUtils.simpleMetaStack("IC2:itemSolarHelmet", 0, 1); + private static final ItemStack itemCropnalyzer = ItemUtils.simpleMetaStack("IC2:itemCropnalyzer", 0, 1); + private static final ItemStack itemSolarHelmet = ItemUtils.simpleMetaStack("IC2:itemSolarHelmet", 0, 1); public static ShapedRecipeObject Cropnalyzer = new ShapedRecipeObject( "ore:cableGt02Copper", diff --git a/src/main/java/gtPlusPlus/core/container/ContainerCircuitProgrammer.java b/src/main/java/gtPlusPlus/core/container/ContainerCircuitProgrammer.java index 9afccfb0f4..6e1da7bc61 100644 --- a/src/main/java/gtPlusPlus/core/container/ContainerCircuitProgrammer.java +++ b/src/main/java/gtPlusPlus/core/container/ContainerCircuitProgrammer.java @@ -137,7 +137,7 @@ public class ContainerCircuitProgrammer extends Container { @Override public ItemStack transferStackInSlot(final EntityPlayer par1EntityPlayer, final int par2) { ItemStack var3 = null; - final Slot var4 = (Slot) this.inventorySlots.get(par2); + final Slot var4 = this.inventorySlots.get(par2); if ((var4 != null) && var4.getHasStack()) { final ItemStack var5 = var4.getStack(); @@ -153,7 +153,7 @@ public class ContainerCircuitProgrammer extends Container { */ if (var5.stackSize == 0) { - var4.putStack((ItemStack) null); + var4.putStack(null); } else { var4.onSlotChanged(); } diff --git a/src/main/java/gtPlusPlus/core/container/ContainerFishTrap.java b/src/main/java/gtPlusPlus/core/container/ContainerFishTrap.java index 1a9344c08c..08b6ee2ebb 100644 --- a/src/main/java/gtPlusPlus/core/container/ContainerFishTrap.java +++ b/src/main/java/gtPlusPlus/core/container/ContainerFishTrap.java @@ -95,7 +95,7 @@ public class ContainerFishTrap extends Container { @Override public ItemStack transferStackInSlot(final EntityPlayer par1EntityPlayer, final int par2) { ItemStack var3 = null; - final Slot var4 = (Slot) this.inventorySlots.get(par2); + final Slot var4 = this.inventorySlots.get(par2); if ((var4 != null) && var4.getHasStack()) { final ItemStack var5 = var4.getStack(); @@ -111,7 +111,7 @@ public class ContainerFishTrap extends Container { */ if (var5.stackSize == 0) { - var4.putStack((ItemStack) null); + var4.putStack(null); } else { var4.onSlotChanged(); } diff --git a/src/main/java/gtPlusPlus/core/container/ContainerPestKiller.java b/src/main/java/gtPlusPlus/core/container/ContainerPestKiller.java index 6f63a1d04e..546c367401 100644 --- a/src/main/java/gtPlusPlus/core/container/ContainerPestKiller.java +++ b/src/main/java/gtPlusPlus/core/container/ContainerPestKiller.java @@ -83,10 +83,7 @@ public class ContainerPestKiller extends Container { @Override public ItemStack slotClick(final int aSlotIndex, final int aMouseclick, final int aShifthold, final EntityPlayer aPlayer) { - boolean fluid = false; - if (aSlotIndex == 2) { - fluid = true; - } + boolean fluid = aSlotIndex == 2; if (!fluid) { return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer); } else { @@ -111,7 +108,7 @@ public class ContainerPestKiller extends Container { @Override public ItemStack transferStackInSlot(final EntityPlayer par1EntityPlayer, final int par2) { ItemStack var3 = null; - final Slot var4 = (Slot) this.inventorySlots.get(par2); + final Slot var4 = this.inventorySlots.get(par2); if ((var4 != null) && var4.getHasStack()) { final ItemStack var5 = var4.getStack(); @@ -127,7 +124,7 @@ public class ContainerPestKiller extends Container { */ if (var5.stackSize == 0) { - var4.putStack((ItemStack) null); + var4.putStack(null); } else { var4.onSlotChanged(); } @@ -148,7 +145,7 @@ public class ContainerPestKiller extends Container { return super.func_94530_a(p_94530_1_, p_94530_2_); } - private class GT_Slot_Render extends Slot { + private static class GT_Slot_Render extends Slot { public final int mSlotIndex; public boolean mEnabled = true; diff --git a/src/main/java/gtPlusPlus/core/container/ContainerProjectTable.java b/src/main/java/gtPlusPlus/core/container/ContainerProjectTable.java index 306c6f0026..05f4182833 100644 --- a/src/main/java/gtPlusPlus/core/container/ContainerProjectTable.java +++ b/src/main/java/gtPlusPlus/core/container/ContainerProjectTable.java @@ -178,15 +178,11 @@ public class ContainerProjectTable extends Container { } public ItemStack getOutputContent() { - ItemStack output = this.craftResult.getStackInSlot(0); - if (output != null) { - return output; - } - return null; + return this.craftResult.getStackInSlot(0); } public ItemStack[] getInputComponents() { - ItemStack inputs[] = new ItemStack[9]; + ItemStack[] inputs = new ItemStack[9]; for (int r = 0; r < this.craftMatrix.getSizeInventory(); r++) { ItemStack temp = this.craftMatrix.getStackInSlot(r); inputs[r] = temp; diff --git a/src/main/java/gtPlusPlus/core/container/ContainerSuperJukebox.java b/src/main/java/gtPlusPlus/core/container/ContainerSuperJukebox.java index 45782f1384..04ea296e35 100644 --- a/src/main/java/gtPlusPlus/core/container/ContainerSuperJukebox.java +++ b/src/main/java/gtPlusPlus/core/container/ContainerSuperJukebox.java @@ -134,7 +134,7 @@ public class ContainerSuperJukebox extends Container { @Override public ItemStack transferStackInSlot(final EntityPlayer par1EntityPlayer, final int par2) { ItemStack var3 = null; - final Slot var4 = (Slot) this.inventorySlots.get(par2); + final Slot var4 = this.inventorySlots.get(par2); if ((var4 != null) && var4.getHasStack()) { final ItemStack var5 = var4.getStack(); @@ -150,7 +150,7 @@ public class ContainerSuperJukebox extends Container { */ if (var5.stackSize == 0) { - var4.putStack((ItemStack) null); + var4.putStack(null); } else { var4.onSlotChanged(); } diff --git a/src/main/java/gtPlusPlus/core/container/ContainerVolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/container/ContainerVolumetricFlaskSetter.java index bf1f8c4133..1a517e6761 100644 --- a/src/main/java/gtPlusPlus/core/container/ContainerVolumetricFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/container/ContainerVolumetricFlaskSetter.java @@ -104,7 +104,7 @@ public class ContainerVolumetricFlaskSetter extends Container { @Override public ItemStack transferStackInSlot(final EntityPlayer par1EntityPlayer, final int par2) { ItemStack var3 = null; - final Slot var4 = (Slot) this.inventorySlots.get(par2); + final Slot var4 = this.inventorySlots.get(par2); if ((var4 != null) && var4.getHasStack()) { final ItemStack var5 = var4.getStack(); @@ -120,7 +120,7 @@ public class ContainerVolumetricFlaskSetter extends Container { */ if (var5.stackSize == 0) { - var4.putStack((ItemStack) null); + var4.putStack(null); } else { var4.onSlotChanged(); } @@ -159,8 +159,8 @@ public class ContainerVolumetricFlaskSetter extends Container { @Override public void updateProgressBar(int par1, int par2) { super.updateProgressBar(par1, par2); - switch (par1) { - case 0 -> mCustomValue = (short) par2; + if (par1 == 0) { + mCustomValue = (short) par2; } } diff --git a/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java b/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java index a3b2f6f28b..65e2385003 100644 --- a/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java +++ b/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java @@ -170,9 +170,7 @@ public abstract class EntityToxinball extends EntityFireball { this.rotationYaw = (float) (Math.atan2(this.motionZ, this.motionX) * 180.0D / Math.PI) + 90.0F; for (this.rotationPitch = (float) (Math.atan2(f1, this.motionY) * 180.0D / Math.PI) - - 90.0F; this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) { - ; - } + - 90.0F; this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) {} while (this.rotationPitch - this.prevRotationPitch >= 180.0F) { this.prevRotationPitch += 360.0F; @@ -241,7 +239,7 @@ public abstract class EntityToxinball extends EntityFireball { aTag.setShort("zTile", (short) this.entityZ); aTag.setByte("inTile", (byte) Block.getIdFromBlock(this.block)); aTag.setByte("inGround", (byte) (this.inGround ? 1 : 0)); - aTag.setTag("direction", this.newDoubleNBTList(new double[] { this.motionX, this.motionY, this.motionZ })); + aTag.setTag("direction", this.newDoubleNBTList(this.motionX, this.motionY, this.motionZ)); } /** diff --git a/src/main/java/gtPlusPlus/core/gui/beta/GUIIDRegistry.java b/src/main/java/gtPlusPlus/core/gui/beta/GUIIDRegistry.java index f6d899d247..fbb34ee5b7 100644 --- a/src/main/java/gtPlusPlus/core/gui/beta/GUIIDRegistry.java +++ b/src/main/java/gtPlusPlus/core/gui/beta/GUIIDRegistry.java @@ -12,14 +12,12 @@ public class GUIIDRegistry { private static final Map<Integer, MUGuild> idMap = new HashMap<>(); private static int nextId = 0; - static {} - private static void registerGuiHandlers(final GUITypes MU_GuiType, final List<Class<? extends IGuiManagerMiscUtils>> guiHandlerClasses) { for (final Class<? extends IGuiManagerMiscUtils> tileGuiHandlerClass : guiHandlerClasses) { final MUGuild guiId = new MUGuild(nextId++, MU_GuiType, tileGuiHandlerClass); classMap.put(tileGuiHandlerClass, guiId); - idMap.put(Integer.valueOf(guiId.getId()), guiId); + idMap.put(guiId.getId(), guiId); } } @@ -29,7 +27,8 @@ public class GUIIDRegistry { if (guiId == null) { for (final Map.Entry<Class<? extends IGuiManagerMiscUtils>, MUGuild> classGuiIdEntry : classMap .entrySet()) { - if (((Class<?>) classGuiIdEntry.getKey()).isAssignableFrom(guiHandlerClass)) { + if (classGuiIdEntry.getKey() + .isAssignableFrom(guiHandlerClass)) { guiId = classGuiIdEntry.getValue(); break; } @@ -42,6 +41,6 @@ public class GUIIDRegistry { } public static MUGuild getGuiId(final int id) { - return idMap.get(Integer.valueOf(id)); + return idMap.get(id); } } diff --git a/src/main/java/gtPlusPlus/core/gui/beta/GUITypes.java b/src/main/java/gtPlusPlus/core/gui/beta/GUITypes.java index 124e2fc276..40d0442b59 100644 --- a/src/main/java/gtPlusPlus/core/gui/beta/GUITypes.java +++ b/src/main/java/gtPlusPlus/core/gui/beta/GUITypes.java @@ -6,5 +6,5 @@ public enum GUITypes { Tile, Entity; - private GUITypes() {} + GUITypes() {} } diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUIPestKiller.java b/src/main/java/gtPlusPlus/core/gui/machine/GUIPestKiller.java index 0f3e1fc832..e42f6a9da9 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUIPestKiller.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUIPestKiller.java @@ -37,7 +37,7 @@ public class GUIPestKiller extends GuiContainer { @Override protected void drawGuiContainerForegroundLayer(final int i, final int j) { if (mTileKiller != null) { - this.fontRendererObj.drawString(I18n.format(mTileKiller.getInventoryName(), new Object[0]), 4, 6, 4210752); + this.fontRendererObj.drawString(I18n.format(mTileKiller.getInventoryName()), 4, 6, 4210752); drawFluidTank(mTileKiller.getTank(), 134, 35); } } @@ -77,7 +77,7 @@ public class GUIPestKiller extends GuiContainer { if (aTank != null && aTank.getFluidAmount() > 0) { aPercentage = MathUtils.findPercentage(aTank.getFluidAmount(), aTank.getCapacity()); // Logger.INFO("Percent = "+aPercentage); - aFrameHeight = (int) (aPercentage / aDivisor); + // aFrameHeight = (int) (aPercentage / aDivisor); // Logger.INFO("Frame Height = "+aFrameHeight); } this.fontRendererObj.drawString("Tier: 0", 4, 18, 4210752); @@ -99,7 +99,7 @@ public class GUIPestKiller extends GuiContainer { this.fontRendererObj.drawString("Range: 5x5", 4, 30, 4210752); this.fontRendererObj.drawString("Poison: ", 4, 42, 4210752); this.fontRendererObj.drawString( - "" + aTile.getTank() + aTile.getTank() .getFluid() .getLocalizedName(), 4, @@ -127,7 +127,7 @@ public class GUIPestKiller extends GuiContainer { this.fontRendererObj.drawString("Range: 9x9", 4, 30, 4210752); this.fontRendererObj.drawString("Poison: ", 4, 42, 4210752); this.fontRendererObj.drawString( - "" + aTile.getTank() + aTile.getTank() .getFluid() .getLocalizedName(), 4, diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUIVolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/gui/machine/GUIVolumetricFlaskSetter.java index 3e1a735f7e..8a57b3987f 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUIVolumetricFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUIVolumetricFlaskSetter.java @@ -24,10 +24,10 @@ public class GUIVolumetricFlaskSetter extends GuiContainer { private static final ResourceLocation mGuiTextures = new ResourceLocation( GTPlusPlus.ID, "textures/gui/VolumetricFlaskSetter.png"); - private ContainerVolumetricFlaskSetter mContainer; + private final ContainerVolumetricFlaskSetter mContainer; private boolean mIsOpen = false; private GuiValueField mText; - private TileEntityVolumetricFlaskSetter mTile; + private final TileEntityVolumetricFlaskSetter mTile; public GUIVolumetricFlaskSetter(ContainerVolumetricFlaskSetter aContainer) { super(aContainer); @@ -48,16 +48,16 @@ public class GUIVolumetricFlaskSetter extends GuiContainer { protected void drawGuiContainerForegroundLayer(final int i, final int j) { super.drawGuiContainerForegroundLayer(i, j); this.mText.drawTextBox(); - this.fontRendererObj.drawString(I18n.format("container.VolumetricFlaskSetter", new Object[0]), 4, 3, 4210752); + this.fontRendererObj.drawString(I18n.format("container.VolumetricFlaskSetter"), 4, 3, 4210752); int aYVal = 49; - this.fontRendererObj.drawString(I18n.format("0 = 16l", new Object[0]), 8, aYVal, 4210752); - this.fontRendererObj.drawString(I18n.format("4 = 576l", new Object[0]), 64, aYVal, 4210752); - this.fontRendererObj.drawString(I18n.format("1 = 36l", new Object[0]), 8, aYVal += 8, 4210752); - this.fontRendererObj.drawString(I18n.format("5 = 720l", new Object[0]), 64, aYVal, 4210752); - this.fontRendererObj.drawString(I18n.format("2 = 144l", new Object[0]), 8, aYVal += 8, 4210752); - this.fontRendererObj.drawString(I18n.format("6 = 864l", new Object[0]), 64, aYVal, 4210752); - this.fontRendererObj.drawString(I18n.format("3 = 432l", new Object[0]), 8, aYVal += 8, 4210752); - this.fontRendererObj.drawString(I18n.format("-> = Custom", new Object[0]), 59, aYVal, 4210752); + this.fontRendererObj.drawString(I18n.format("0 = 16l"), 8, aYVal, 4210752); + this.fontRendererObj.drawString(I18n.format("4 = 576l"), 64, aYVal, 4210752); + this.fontRendererObj.drawString(I18n.format("1 = 36l"), 8, aYVal += 8, 4210752); + this.fontRendererObj.drawString(I18n.format("5 = 720l"), 64, aYVal, 4210752); + this.fontRendererObj.drawString(I18n.format("2 = 144l"), 8, aYVal += 8, 4210752); + this.fontRendererObj.drawString(I18n.format("6 = 864l"), 64, aYVal, 4210752); + this.fontRendererObj.drawString(I18n.format("3 = 432l"), 8, aYVal += 8, 4210752); + this.fontRendererObj.drawString(I18n.format("-> = Custom"), 59, aYVal, 4210752); } @Override @@ -127,7 +127,7 @@ public class GUIVolumetricFlaskSetter extends GuiContainer { } else if (par2 == Keyboard.KEY_BACK) { log("Pressed Backspace."); String aCurrentText = getText(); - if (aCurrentText.length() > 0) { + if (!aCurrentText.isEmpty()) { this.mText.setText(aCurrentText.substring(0, aCurrentText.length() - 1)); if (getText().length() <= 0) { setText(0); @@ -137,14 +137,8 @@ public class GUIVolumetricFlaskSetter extends GuiContainer { } else { if (isNumber(par2) || isNumber(par1)) { log("Pressed number."); - if (this.mText.getText() - .equals("0")) { - this.mText.textboxKeyTyped(par1, par2); - sendUpdateToServer(); - } else { - this.mText.textboxKeyTyped(par1, par2); - sendUpdateToServer(); - } + this.mText.textboxKeyTyped(par1, par2); + sendUpdateToServer(); } else { log("Pressed unused key."); super.keyTyped(par1, par2); @@ -191,7 +185,7 @@ public class GUIVolumetricFlaskSetter extends GuiContainer { } public void sendUpdateToServer() { - if (getText().length() > 0) { + if (!getText().isEmpty()) { PacketHandler.sendToServer(new PacketVolumetricFlaskGui(mTile, parse(getText()))); } } @@ -211,13 +205,11 @@ public class GUIVolumetricFlaskSetter extends GuiContainer { this.mText.updateCursorCounter(); // Check TextBox Value is correct - if (getText().length() > 0) { + if (!getText().isEmpty()) { int aCustomValue = parse(getText()); - int aTileValue = ((ContainerVolumetricFlaskSetter) mContainer).mCustomValue; - if (mContainer != null) { - if (aTileValue != aCustomValue) { - setText(aTileValue); - } + int aTileValue = mContainer.mCustomValue; + if (aTileValue != aCustomValue) { + setText(aTileValue); } } } diff --git a/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java b/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java index 36e3b6edd8..7004b3517c 100644 --- a/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java +++ b/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java @@ -25,10 +25,8 @@ public class DecayableRecipe { @Override public boolean equals(Object o) { if (o instanceof DecayableRecipe i) { - if (i.mTime == this.mTime && GTUtility.areStacksEqual(mInput, i.mInput) - && GTUtility.areStacksEqual(mOutput, i.mOutput)) { - return true; - } + return i.mTime == this.mTime && GTUtility.areStacksEqual(mInput, i.mInput) + && GTUtility.areStacksEqual(mOutput, i.mOutput); } return false; } diff --git a/src/main/java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java b/src/main/java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java index 51780fd030..e6133e22db 100644 --- a/src/main/java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java @@ -35,7 +35,7 @@ public class EnderDragonDeathHandler implements IMobExtraInfoProvider { event.entityLiving.entityDropItem( MaterialsElements.STANDALONE.DRAGON_METAL.getNugget(aAmount), MathUtils.randFloat(0, 1)); - aCountTotal = +aAmount; + aCountTotal = aAmount; } } else if (mChaoseDragonClass != null && mChaoseDragonClass.isInstance(event.entityLiving)) { for (int y = 0; y < MathUtils.randInt(100, 200); y++) { @@ -43,7 +43,7 @@ public class EnderDragonDeathHandler implements IMobExtraInfoProvider { event.entityLiving.entityDropItem( MaterialsElements.STANDALONE.DRAGON_METAL.getIngot(aAmount), MathUtils.randFloat(0, 1)); - aCountTotal = +aAmount; + aCountTotal = aAmount; } } else if (event.entityLiving instanceof EntityDragon) { for (int y = 0; y < MathUtils.randInt(25, 50); y++) { @@ -51,7 +51,7 @@ public class EnderDragonDeathHandler implements IMobExtraInfoProvider { event.entityLiving.entityDropItem( MaterialsElements.STANDALONE.DRAGON_METAL.getNugget(aAmount), MathUtils.randFloat(0, 1)); - aCountTotal = +aAmount; + aCountTotal = aAmount; } } if (aCountTotal > 0) { diff --git a/src/main/java/gtPlusPlus/core/handler/events/SneakManager.java b/src/main/java/gtPlusPlus/core/handler/events/SneakManager.java index 7af831c675..258bca3bff 100644 --- a/src/main/java/gtPlusPlus/core/handler/events/SneakManager.java +++ b/src/main/java/gtPlusPlus/core/handler/events/SneakManager.java @@ -29,7 +29,7 @@ public class SneakManager { } private static String getKey(EntityPlayer aPlayer) { - return "" + aPlayer.getGameProfile() + return aPlayer.getGameProfile() .getId() .toString(); } @@ -113,14 +113,14 @@ public class SneakManager { return mIsWearingRing; } - public static enum State { + public enum State { ON(true), OFF(false); private final boolean STATE; - private State(final boolean State) { + State(final boolean State) { this.STATE = State; } diff --git a/src/main/java/gtPlusPlus/core/handler/workbench/WorkbenchCraftingHandler.java b/src/main/java/gtPlusPlus/core/handler/workbench/WorkbenchCraftingHandler.java index 1d8b2ed68d..4f0023ccb3 100644 --- a/src/main/java/gtPlusPlus/core/handler/workbench/WorkbenchCraftingHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/workbench/WorkbenchCraftingHandler.java @@ -20,45 +20,39 @@ public class WorkbenchCraftingHandler { private static final WorkbenchCraftingHandler instance = new WorkbenchCraftingHandler(); private final List<IRecipe> recipes = new ArrayList<>(); - public static final WorkbenchCraftingHandler getInstance() { + public static WorkbenchCraftingHandler getInstance() { return instance; } public WorkbenchCraftingHandler() { // just a example recipe so you know how to add them - this.addRecipe( - new ItemStack(Blocks.iron_block), - new Object[] { "###", "###", "###", Character.valueOf('#'), Items.iron_ingot }); + this.addRecipe(new ItemStack(Blocks.iron_block), new Object[] { "###", "###", "###", '#', Items.iron_ingot }); // another example Recipe, but shapeless this.addShapelessRecipe(new ItemStack(Items.cake), new Object[] { Items.stick }); } - void addRecipe(final ItemStack par1ItemStack, final Object par2ArrayOfObj[]) { - String s = ""; + void addRecipe(final ItemStack par1ItemStack, final Object[] par2ArrayOfObj) { + StringBuilder s = new StringBuilder(); int i = 0; int j = 0; int k = 0; if (par2ArrayOfObj[i] instanceof String[]) { - final String as[] = (String[]) par2ArrayOfObj[i++]; + final String[] as = (String[]) par2ArrayOfObj[i++]; for (final String s2 : as) { k++; j = s2.length(); - s = (new StringBuilder()).append(s) - .append(s2) - .toString(); + s.append(s2); } } else { while (par2ArrayOfObj[i] instanceof String) { final String s1 = (String) par2ArrayOfObj[i++]; k++; j = s1.length(); - s = (new StringBuilder()).append(s) - .append(s1) - .toString(); + s.append(s1); } } @@ -79,13 +73,13 @@ public class WorkbenchCraftingHandler { hashmap.put(character, itemstack); } - final ItemStack aitemstack[] = new ItemStack[j * k]; + final ItemStack[] aitemstack = new ItemStack[j * k]; for (int i1 = 0; i1 < (j * k); i1++) { final char c = s.charAt(i1); - if (hashmap.containsKey(Character.valueOf(c))) { - aitemstack[i1] = hashmap.get(Character.valueOf(c)) + if (hashmap.containsKey(c)) { + aitemstack[i1] = hashmap.get(c) .copy(); } else { aitemstack[i1] = null; @@ -95,12 +89,10 @@ public class WorkbenchCraftingHandler { this.recipes.add(new ShapedRecipes(j, k, aitemstack, par1ItemStack)); } - public void addShapelessRecipe(final ItemStack par1ItemStack, final Object par2ArrayOfObj[]) { + public void addShapelessRecipe(final ItemStack par1ItemStack, final Object[] par2ArrayOfObj) { final ArrayList<ItemStack> arraylist = new ArrayList<>(); - final Object aobj[] = par2ArrayOfObj; - final int i = aobj.length; - for (final Object obj : aobj) { + for (final Object obj : par2ArrayOfObj) { if (obj instanceof ItemStack) { arraylist.add(((ItemStack) obj).copy()); continue; diff --git a/src/main/java/gtPlusPlus/core/interfaces/IGuiManager.java b/src/main/java/gtPlusPlus/core/interfaces/IGuiManager.java index 599ed6b59b..7ac453fc49 100644 --- a/src/main/java/gtPlusPlus/core/interfaces/IGuiManager.java +++ b/src/main/java/gtPlusPlus/core/interfaces/IGuiManager.java @@ -4,13 +4,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; -public abstract interface IGuiManager extends IGuiManagerMiscUtils { +public interface IGuiManager extends IGuiManagerMiscUtils { - public abstract ChunkCoordinates getCoordinates(); + ChunkCoordinates getCoordinates(); - public abstract World getWorld(); + World getWorld(); - public abstract Object getGui(EntityPlayer paramEntityPlayer, int paramInt); + Object getGui(EntityPlayer paramEntityPlayer, int paramInt); - public abstract Object getContainer(EntityPlayer paramEntityPlayer, int paramInt); + Object getContainer(EntityPlayer paramEntityPlayer, int paramInt); } diff --git a/src/main/java/gtPlusPlus/core/interfaces/IGuiManagerMiscUtils.java b/src/main/java/gtPlusPlus/core/interfaces/IGuiManagerMiscUtils.java index f7f1194b9a..634a71388b 100644 --- a/src/main/java/gtPlusPlus/core/interfaces/IGuiManagerMiscUtils.java +++ b/src/main/java/gtPlusPlus/core/interfaces/IGuiManagerMiscUtils.java @@ -1,4 +1,4 @@ package gtPlusPlus.core.interfaces; -public abstract interface IGuiManagerMiscUtils { +public interface IGuiManagerMiscUtils { } diff --git a/src/main/java/gtPlusPlus/core/interfaces/IItemBlueprint.java b/src/main/java/gtPlusPlus/core/interfaces/IItemBlueprint.java index b0fa752f3f..df205891ac 100644 --- a/src/main/java/gtPlusPlus/core/interfaces/IItemBlueprint.java +++ b/src/main/java/gtPlusPlus/core/interfaces/IItemBlueprint.java @@ -8,45 +8,45 @@ public interface IItemBlueprint { /** * The inventory size for the blueprint~ */ - public int INV_SIZE = 9; + int INV_SIZE = 9; /** * Meta Compatible function to allow meta items to be blueprints - * + * * @param stack yourMetaItem * @return true if it is a Blueprint */ - public boolean isBlueprint(ItemStack stack); + boolean isBlueprint(ItemStack stack); /** * Sets the blueprint for this itemstack. - * + * * @param stack yourMetaItem * @return true if blueprint is set successfully */ - public boolean setBlueprint(ItemStack stack, IInventory craftingTable, ItemStack output); + boolean setBlueprint(ItemStack stack, IInventory craftingTable, ItemStack output); /** * Sets the name of the recipe/blueprint - * + * * @param String Blueprint Name * @return N/A */ - public void setBlueprintName(ItemStack stack, String name); + void setBlueprintName(ItemStack stack, String name); /** * Does this itemstack hold a blueprint? - * + * * @param stack yourMetaItem * @return true if is holding a Blueprint */ - public boolean hasBlueprint(ItemStack stack); + boolean hasBlueprint(ItemStack stack); /** * Gets the recipe held by the item - * + * * @param stack yourMetaItem * @return the blueprints contents */ - public ItemStack[] getBlueprint(ItemStack stack); + ItemStack[] getBlueprint(ItemStack stack); } diff --git a/src/main/java/gtPlusPlus/core/inventories/InventoryCircuitProgrammer.java b/src/main/java/gtPlusPlus/core/inventories/InventoryCircuitProgrammer.java index 180df60e81..ea65338559 100644 --- a/src/main/java/gtPlusPlus/core/inventories/InventoryCircuitProgrammer.java +++ b/src/main/java/gtPlusPlus/core/inventories/InventoryCircuitProgrammer.java @@ -104,7 +104,7 @@ public class InventoryCircuitProgrammer implements IInventory { // 1.7.2+ renamed to hasCustomInventoryName @Override public boolean hasCustomInventoryName() { - return this.name.length() > 0; + return !this.name.isEmpty(); } @Override diff --git a/src/main/java/gtPlusPlus/core/inventories/InventoryDecayablesChest.java b/src/main/java/gtPlusPlus/core/inventories/InventoryDecayablesChest.java index 6466996cc9..6f6859c536 100644 --- a/src/main/java/gtPlusPlus/core/inventories/InventoryDecayablesChest.java +++ b/src/main/java/gtPlusPlus/core/inventories/InventoryDecayablesChest.java @@ -102,7 +102,7 @@ public class InventoryDecayablesChest implements IInventory { // 1.7.2+ renamed to hasCustomInventoryName @Override public boolean hasCustomInventoryName() { - return this.name.length() > 0; + return !this.name.isEmpty(); } @Override diff --git a/src/main/java/gtPlusPlus/core/inventories/InventoryEggBox.java b/src/main/java/gtPlusPlus/core/inventories/InventoryEggBox.java index 545988347e..7407115614 100644 --- a/src/main/java/gtPlusPlus/core/inventories/InventoryEggBox.java +++ b/src/main/java/gtPlusPlus/core/inventories/InventoryEggBox.java @@ -102,7 +102,7 @@ public class InventoryEggBox implements IInventory { // 1.7.2+ renamed to hasCustomInventoryName @Override public boolean hasCustomInventoryName() { - return this.name.length() > 0; + return !this.name.isEmpty(); } @Override diff --git a/src/main/java/gtPlusPlus/core/inventories/InventoryFishTrap.java b/src/main/java/gtPlusPlus/core/inventories/InventoryFishTrap.java index e4797d67bc..5d059f1883 100644 --- a/src/main/java/gtPlusPlus/core/inventories/InventoryFishTrap.java +++ b/src/main/java/gtPlusPlus/core/inventories/InventoryFishTrap.java @@ -102,7 +102,7 @@ public class InventoryFishTrap implements IInventory { // 1.7.2+ renamed to hasCustomInventoryName @Override public boolean hasCustomInventoryName() { - return this.name.length() > 0; + return !this.name.isEmpty(); } @Override diff --git a/src/main/java/gtPlusPlus/core/inventories/InventoryPestKiller.java b/src/main/java/gtPlusPlus/core/inventories/InventoryPestKiller.java index b508de1d6d..87d6dd8f49 100644 --- a/src/main/java/gtPlusPlus/core/inventories/InventoryPestKiller.java +++ b/src/main/java/gtPlusPlus/core/inventories/InventoryPestKiller.java @@ -102,7 +102,7 @@ public class InventoryPestKiller implements IInventory { // 1.7.2+ renamed to hasCustomInventoryName @Override public boolean hasCustomInventoryName() { - return this.name.length() > 0; + return !this.name.isEmpty(); } @Override diff --git a/src/main/java/gtPlusPlus/core/inventories/InventorySuperJukebox.java b/src/main/java/gtPlusPlus/core/inventories/InventorySuperJukebox.java index 89f733f5ac..d76323fea8 100644 --- a/src/main/java/gtPlusPlus/core/inventories/InventorySuperJukebox.java +++ b/src/main/java/gtPlusPlus/core/inventories/InventorySuperJukebox.java @@ -102,7 +102,7 @@ public class InventorySuperJukebox implements IInventory { // 1.7.2+ renamed to hasCustomInventoryName @Override public boolean hasCustomInventoryName() { - return this.name.length() > 0; + return !this.name.isEmpty(); } @Override diff --git a/src/main/java/gtPlusPlus/core/inventories/InventoryVolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/inventories/InventoryVolumetricFlaskSetter.java index 0b16011181..fc5cdd1b92 100644 --- a/src/main/java/gtPlusPlus/core/inventories/InventoryVolumetricFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/inventories/InventoryVolumetricFlaskSetter.java @@ -104,7 +104,7 @@ public class InventoryVolumetricFlaskSetter implements IInventory { // 1.7.2+ renamed to hasCustomInventoryName @Override public boolean hasCustomInventoryName() { - return this.name.length() > 0; + return !this.name.isEmpty(); } @Override diff --git a/src/main/java/gtPlusPlus/core/inventories/projecttable/InventoryProjectMain.java b/src/main/java/gtPlusPlus/core/inventories/projecttable/InventoryProjectMain.java index 40e848dc3c..56e14d309f 100644 --- a/src/main/java/gtPlusPlus/core/inventories/projecttable/InventoryProjectMain.java +++ b/src/main/java/gtPlusPlus/core/inventories/projecttable/InventoryProjectMain.java @@ -118,7 +118,7 @@ public class InventoryProjectMain implements IInventory { // 1.7.2+ renamed to hasCustomInventoryName @Override public boolean hasCustomInventoryName() { - return this.name.length() > 0; + return !this.name.isEmpty(); } @Override diff --git a/src/main/java/gtPlusPlus/core/inventories/projecttable/InventoryProjectOutput.java b/src/main/java/gtPlusPlus/core/inventories/projecttable/InventoryProjectOutput.java index 77bcbd1e35..955ff4d30f 100644 --- a/src/main/java/gtPlusPlus/core/inventories/projecttable/InventoryProjectOutput.java +++ b/src/main/java/gtPlusPlus/core/inventories/projecttable/InventoryProjectOutput.java @@ -105,7 +105,7 @@ public class InventoryProjectOutput implements IInventory { // 1.7.2+ renamed to hasCustomInventoryName @Override public boolean hasCustomInventoryName() { - return this.name.length() > 0; + return !this.name.isEmpty(); } @Override diff --git a/src/main/java/gtPlusPlus/core/inventories/tradetable/InventoryTradeMain.java b/src/main/java/gtPlusPlus/core/inventories/tradetable/InventoryTradeMain.java index 24dd053e31..d8dc073d9c 100644 --- a/src/main/java/gtPlusPlus/core/inventories/tradetable/InventoryTradeMain.java +++ b/src/main/java/gtPlusPlus/core/inventories/tradetable/InventoryTradeMain.java @@ -118,7 +118,7 @@ public class InventoryTradeMain implements IInventory { // 1.7.2+ renamed to hasCustomInventoryName @Override public boolean hasCustomInventoryName() { - return this.name.length() > 0; + return !this.name.isEmpty(); } @Override diff --git a/src/main/java/gtPlusPlus/core/inventories/tradetable/InventoryTradeOutput.java b/src/main/java/gtPlusPlus/core/inventories/tradetable/InventoryTradeOutput.java index edfbe7602e..767d4ccb1f 100644 --- a/src/main/java/gtPlusPlus/core/inventories/tradetable/InventoryTradeOutput.java +++ b/src/main/java/gtPlusPlus/core/inventories/tradetable/InventoryTradeOutput.java @@ -105,7 +105,7 @@ public class InventoryTradeOutput implements IInventory { // 1.7.2+ renamed to hasCustomInventoryName @Override public boolean hasCustomInventoryName() { - return this.name.length() > 0; + return !this.name.isEmpty(); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index a7fe8ced30..49a22bc8a8 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -582,7 +582,7 @@ public final class ModItems { // LFTR Control Circuit itemCircuitLFTR = new CoreItem( "itemCircuitLFTR", - "" + EnumChatFormatting.GREEN + "Control Circuit", + EnumChatFormatting.GREEN + "Control Circuit", AddToCreativeTab.tabMisc, 1, 0, diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java index 3ce461ffab..f79b20ccb9 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java @@ -16,7 +16,7 @@ public class BaseItemBurnable extends CoreItem { super(unlocalizedName, creativeTab, stackSize, maxDmg, description); this.itemName = displayName; this.meta = meta; - if (oredictName != null && !oredictName.equals("")) { + if (oredictName != null && !oredictName.isEmpty()) { registerOrdictionary(oredictName); } registerFuel(burnTime); diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java index 07744c5c2e..ba98bb25b7 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java @@ -231,9 +231,7 @@ public class BaseItemComponent extends Item { } } - if ((this.materialName != null) && (this.materialName != "") - && !this.materialName.equals("") - && (this.componentMaterial != null)) { + if (this.materialName != null && !this.materialName.isEmpty() && (this.componentMaterial != null)) { if (this.componentMaterial != null) { if (!this.componentMaterial.vChemicalFormula.contains("?")) { @@ -255,10 +253,8 @@ public class BaseItemComponent extends Item { } if (this.componentType == ComponentTypes.INGOT || this.componentType == ComponentTypes.HOTINGOT) { - if ((this.materialName != null) && (this.materialName != "") - && !this.materialName.equals("") - && this.unlocalName.toLowerCase() - .contains("hot")) { + if (this.unlocalName.toLowerCase() + .contains("hot")) { list.add( EnumChatFormatting.GRAY + "Warning: " + EnumChatFormatting.RED @@ -269,7 +265,7 @@ public class BaseItemComponent extends Item { } } else { String aChemicalFormula = Material.sChemicalFormula.get(materialName.toLowerCase()); - if (aChemicalFormula != null && aChemicalFormula.length() > 0) { + if (aChemicalFormula != null && !aChemicalFormula.isEmpty()) { list.add(Utils.sanitizeStringKeepBrackets(aChemicalFormula)); } } @@ -300,7 +296,6 @@ public class BaseItemComponent extends Item { super.addInformation(stack, aPlayer, list, bool); } - @SuppressWarnings("unchecked") @Override public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) { @@ -325,10 +320,9 @@ public class BaseItemComponent extends Item { @Override @SideOnly(Side.CLIENT) public boolean requiresMultipleRenderPasses() { - return (Configuration.visual.useGregtechTextures ? true : false); + return Configuration.visual.useGregtechTextures; } - @SuppressWarnings("unchecked") @Override public int getColorFromItemStack(final ItemStack stack, final int renderPass) { @@ -402,7 +396,7 @@ public class BaseItemComponent extends Item { } } - public static enum ComponentTypes { + public enum ComponentTypes { DUST("Dust", "@ Dust", "dust", OrePrefixes.dust), DUSTSMALL("DustSmall", "Small Pile of @ Dust", "dustSmall", OrePrefixes.dustSmall), @@ -434,7 +428,7 @@ public class BaseItemComponent extends Item { private final String OREDICT_NAME; private final OrePrefixes a_GT_EQUAL; - private ComponentTypes(final String LocalName, final String DisplayName, final String OreDictName, + ComponentTypes(final String LocalName, final String DisplayName, final String OreDictName, final OrePrefixes aPrefix) { this.COMPONENT_NAME = LocalName; this.DISPLAY_NAME = DisplayName; diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java index 9a4109a1de..fb24fbf2f1 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemDamageable.java @@ -86,7 +86,7 @@ public class BaseItemDamageable extends Item { @Override public String getItemStackDisplayName(final ItemStack tItem) { - if ((this.itemName == null) || this.itemName.equals("")) { + if ((this.itemName == null) || this.itemName.isEmpty()) { return super.getItemStackDisplayName(tItem); } return this.itemName; @@ -101,7 +101,7 @@ public class BaseItemDamageable extends Item { return true; } - public static final long getItemDamage(final ItemStack aStack) { + public static long getItemDamage(final ItemStack aStack) { NBTTagCompound aNBT = aStack.getTagCompound(); if (aNBT != null) { aNBT = aNBT.getCompoundTag("Damage"); @@ -114,7 +114,7 @@ public class BaseItemDamageable extends Item { return 0L; } - public static final boolean setItemDamage(final ItemStack aStack, final long aDamage) { + public static boolean setItemDamage(final ItemStack aStack, final long aDamage) { NBTTagCompound aNBT = aStack.getTagCompound(); if (aNBT != null) { aNBT = aNBT.getCompoundTag("Damage"); @@ -142,11 +142,7 @@ public class BaseItemDamageable extends Item { @Override public boolean showDurabilityBar(ItemStack stack) { int dmg = (int) getItemDamage(stack); - if (dmg <= 20) { - return false; - } else { - return true; - } + return dmg > 20; } public static ItemStack damageItem(ItemStack item) { @@ -154,10 +150,8 @@ public class BaseItemDamageable extends Item { long currentUse = BaseItemDamageable.getItemDamage(item); if (currentUse >= 0 && currentUse <= 250) { BaseItemDamageable.setItemDamage(item, currentUse + 1); - return item; - } else { - return item; } + return item; } return null; } diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java index 8417eba3d1..8c2473aafe 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemTickable.java @@ -285,8 +285,7 @@ public class BaseItemTickable extends CoreItem { return 0; } double currentDamage = getTicks(null, stack); - double durabilitypercent = currentDamage / getMaxTicks(stack); - return durabilitypercent; + return currentDamage / getMaxTicks(stack); } @SuppressWarnings("unchecked") diff --git a/src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java b/src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java index b564d60424..0d7710e651 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java +++ b/src/main/java/gtPlusPlus/core/item/base/BasicSpawnEgg.java @@ -10,7 +10,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.IEntityLivingData; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemMonsterPlacer; @@ -58,7 +57,7 @@ public class BasicSpawnEgg extends ItemMonsterPlacer { /** * Callback for item usage. If the item does something special on right clicking, - * + * <p> * he will have one of those. Return True if something happen and false if it don't. This is for ITEMS, not BLOCKS */ @Override @@ -94,7 +93,7 @@ public class BasicSpawnEgg extends ItemMonsterPlacer { /** * Called whenever this item is equipped and the right mouse button is pressed. - * + * <p> * Args: itemStack, world, entityPlayer */ @Override @@ -143,7 +142,7 @@ public class BasicSpawnEgg extends ItemMonsterPlacer { /** * Spawns the creature specified by the egg's type in the location specified by - * + * <p> * the last three parameters. Parameters: world, entityID, x, y, z. */ public Entity spawnEntity(final World parWorld, final double parX, final double parY, final double parZ) { @@ -162,7 +161,7 @@ public class BasicSpawnEgg extends ItemMonsterPlacer { 0.0F); parWorld.spawnEntityInWorld(this.entityToSpawn); - this.entityToSpawn.onSpawnWithEgg((IEntityLivingData) null); + this.entityToSpawn.onSpawnWithEgg(null); this.entityToSpawn.playLivingSound(); } else { // DEBUG diff --git a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java index 451a5b1290..e9f1d87ede 100644 --- a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java +++ b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java @@ -23,7 +23,7 @@ public class BaseItemCell extends BaseItemComponent { public BaseItemCell(final Material material) { super(material, BaseItemComponent.ComponentTypes.CELL); - this.fluidColour = (short[]) material.getRGBA(); + this.fluidColour = material.getRGBA(); } public BaseItemCell(final String unlocalName, final String localName, final short[] RGBa) { diff --git a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java index 151f3f3860..5d61f36ce3 100644 --- a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java +++ b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemPlasmaCell.java @@ -26,7 +26,7 @@ public class BaseItemPlasmaCell extends BaseItemComponent { public BaseItemPlasmaCell(final Material material) { super(material, ComponentTypes.PLASMACELL); - this.fluidColour = (short[]) material.getRGBA(); + this.fluidColour = material.getRGBA(); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java index fd52fe78c4..d230115129 100644 --- a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java +++ b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java @@ -5,7 +5,7 @@ import gtPlusPlus.core.material.Material; public class BaseItemDust extends BaseItemComponent { - private BaseItemComponent[] mSizedDusts = new BaseItemComponent[2]; + private final BaseItemComponent[] mSizedDusts = new BaseItemComponent[2]; public BaseItemDust(Material aMat) { this(aMat, true); diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java index bcb56795bc..7b3c8cbd28 100644 --- a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java +++ b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java @@ -44,7 +44,7 @@ public class BaseItemDustUnique extends Item { this.setCreativeTab(tabMisc); this.colour = colour; this.materialName = materialName; - if (mChemicalFormula == null || mChemicalFormula.equals("") || mChemicalFormula.equals("NullFormula")) { + if (mChemicalFormula == null || mChemicalFormula.isEmpty() || mChemicalFormula.equals("NullFormula")) { this.chemicalNotation = StringUtils.subscript(materialName); } else { this.chemicalNotation = StringUtils.subscript(mChemicalFormula); @@ -84,7 +84,7 @@ public class BaseItemDustUnique extends Item { temp = temp.replace("itemD", "d"); Logger.WARNING("Generating OreDict Name: " + temp); } - if ((temp != null) && !temp.equals("")) { + if ((temp != null) && !temp.isEmpty()) { GTOreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this)); } registerComponent(); @@ -144,7 +144,7 @@ public class BaseItemDustUnique extends Item { if (this.sRadiation > 0) { list.add(GTPPCore.GT_Tooltip_Radioactive.get()); } - if (this.chemicalNotation.length() > 0 && !chemicalNotation.equals("") + if (!this.chemicalNotation.isEmpty() && !chemicalNotation.isEmpty() && !chemicalNotation.equals("NullFormula")) { list.add(this.chemicalNotation); } diff --git a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java index cb227a9423..c9377cba27 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java +++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java @@ -26,7 +26,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class BaseItemIngotHot extends BaseItemIngot { private final ItemStack outputIngot; - private int tickCounter = 0; + private final int tickCounter = 0; private final int tickCounterMax = 200; private final int mTier; @@ -66,7 +66,7 @@ public class BaseItemIngotHot extends BaseItemIngot { public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) { if (this.componentMaterial != null) { - if (entityHolding != null && entityHolding instanceof EntityPlayer) { + if (entityHolding instanceof EntityPlayer) { if (!((EntityPlayer) entityHolding).capabilities.isCreativeMode) { EntityUtils.applyHeatDamageToEntity(1, world, entityHolding); } @@ -78,11 +78,7 @@ public class BaseItemIngotHot extends BaseItemIngot { @Override @SideOnly(Side.CLIENT) public boolean requiresMultipleRenderPasses() { - if (Configuration.visual.useGregtechTextures) { - return true; - } else { - return false; - } + return Configuration.visual.useGregtechTextures; } @Override diff --git a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotOld.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotOld.java index 28407a4557..827adb9bc3 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotOld.java +++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotOld.java @@ -41,7 +41,7 @@ public class BaseItemIngotOld extends Item { } else if (this.unlocalName.contains("itemHotIngot")) { temp = this.unlocalName.replace("itemHotIngot", "ingotHot"); } - if ((temp != null) && !temp.equals("")) { + if ((temp != null) && !temp.isEmpty()) { GTOreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this)); } // this.generateCompressorRecipe(); @@ -80,7 +80,7 @@ public class BaseItemIngotOld extends Item { } temp = temp.replace("itemIngot", "block"); Logger.WARNING("Generating OreDict Name: " + temp); - if ((temp != null) && !temp.equals("")) { + if ((temp != null) && !temp.isEmpty()) { tempOutput = ItemUtils.getItemStackOfAmountFromOreDict(temp, 1); if (tempOutput != null) { GTValues.RA.stdBuilder() diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java index 240c0851e1..41f3a2bf73 100644 --- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java @@ -13,21 +13,20 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.api.interfaces.ITileTooltip; public class ItemBlockMeta extends ItemBlockWithMetadata { private final Block mBlock; - private HashMap<Integer, ArrayList<String>> aTooltips = new LinkedHashMap<>(); + private final HashMap<Integer, ArrayList<String>> aTooltips = new LinkedHashMap<>(); public ItemBlockMeta(final Block aBlock) { super(aBlock, aBlock); this.mBlock = aBlock; this.setMaxDamage(0); this.setHasSubtypes(true); - if (aBlock instanceof ITileTooltip aTooltip) { - // aTooltips.put(aTooltip.getTooltipID(), aTooltip.getTooltipMap()); - } + // if (aBlock instanceof ITileTooltip aTooltip) { + // aTooltips.put(aTooltip.getTooltipID(), aTooltip.getTooltipMap()); + // } } @SuppressWarnings({ "unchecked", "rawtypes" }) diff --git a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java index 6c8e0ce81a..7f6f57223d 100644 --- a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java +++ b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java @@ -119,7 +119,7 @@ public class BaseItemMisc extends Item { // Nothing Fancy here yet. } - public static enum MiscTypes { + public enum MiscTypes { POTION("Potion", " Potion", "potion"), KEY("Key", " Key", "key"), @@ -133,7 +133,7 @@ public class BaseItemMisc extends Item { private final String DISPLAY_NAME_SUFFIX; private final String OREDICT_PREFIX; - private MiscTypes(final String LocalName, final String DisplayNameSuffix, final String OreDictPrefix) { + MiscTypes(final String LocalName, final String DisplayNameSuffix, final String OreDictPrefix) { this.TYPE = LocalName; this.DISPLAY_NAME_SUFFIX = DisplayNameSuffix; this.OREDICT_PREFIX = OreDictPrefix; diff --git a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java index 45ba089f15..01294556f7 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java +++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java @@ -112,7 +112,7 @@ public class BaseOreComponent extends Item { @Override public final void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { - if (this.materialName != null && !this.materialName.equals("")) { + if (this.materialName != null && !this.materialName.isEmpty()) { if (this.componentMaterial != null) { if (!this.componentMaterial.vChemicalFormula.contains("?")) { list.add(Utils.sanitizeStringKeepBrackets(this.componentMaterial.vChemicalFormula)); @@ -133,7 +133,7 @@ public class BaseOreComponent extends Item { } } else { String aChemicalFormula = Material.sChemicalFormula.get(materialName.toLowerCase()); - if (aChemicalFormula != null && aChemicalFormula.length() > 0) { + if (aChemicalFormula != null && !aChemicalFormula.isEmpty()) { list.add(Utils.sanitizeStringKeepBrackets(aChemicalFormula)); } } @@ -166,10 +166,7 @@ public class BaseOreComponent extends Item { @Override @SideOnly(Side.CLIENT) public boolean requiresMultipleRenderPasses() { - if (this.componentType.hasOverlay()) { - return true; - } - return false; + return this.componentType.hasOverlay(); } @Override @@ -209,7 +206,6 @@ public class BaseOreComponent extends Item { if (renderPass == 1) { return Utils.rgbtoHexValue(230, 230, 230); } - return this.componentColour; } else { if (renderPass == 0 && !Configuration.visual.useGregtechTextures) { return this.componentColour; @@ -217,8 +213,8 @@ public class BaseOreComponent extends Item { if (renderPass == 1 && Configuration.visual.useGregtechTextures) { return Utils.rgbtoHexValue(230, 230, 230); } - return this.componentColour; } + return this.componentColour; } @Override @@ -229,7 +225,7 @@ public class BaseOreComponent extends Item { return this.overlay; } - public static enum ComponentTypes { + public enum ComponentTypes { DUST("dust", "", " Dust", true), DUSTIMPURE("dustImpure", "Impure ", " Dust", true), @@ -245,8 +241,7 @@ public class BaseOreComponent extends Item { private final String DISPLAY_NAME; private final boolean HAS_OVERLAY; - private ComponentTypes(final String LocalName, final String prefix, final String DisplayName, - final boolean overlay) { + ComponentTypes(final String LocalName, final String prefix, final String DisplayName, final boolean overlay) { this.COMPONENT_NAME = LocalName; this.PREFIX = prefix; this.DISPLAY_NAME = DisplayName; diff --git a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java index 0279a396de..d36207c1d1 100644 --- a/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java +++ b/src/main/java/gtPlusPlus/core/item/base/plates/BaseItemPlate_OLD.java @@ -42,7 +42,7 @@ public class BaseItemPlate_OLD extends Item { this.setMaxStackSize(64); this.colour = colour; this.materialName = materialName; - if (mChemicalFormula.equals("") || mChemicalFormula.equals("NullFormula")) { + if (mChemicalFormula.isEmpty() || mChemicalFormula.equals("NullFormula")) { this.chemicalNotation = StringUtils.subscript(materialName); } else { this.chemicalNotation = StringUtils.subscript(mChemicalFormula); @@ -53,7 +53,7 @@ public class BaseItemPlate_OLD extends Item { if (this.unlocalName.toLowerCase() .contains("itemplate")) { temp = this.unlocalName.replace("itemP", "p"); - if ((temp != null) && !temp.equals("")) { + if ((temp != null) && !temp.isEmpty()) { GTOreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this)); } } diff --git a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java index f1184fb5bb..658ce1a535 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java @@ -29,9 +29,9 @@ public class BaseBauble extends Item implements IBauble { /** * Implementation suggestions taken from Botania. */ - private BaubleType mThisBauble; + private final BaubleType mThisBauble; - private List<String> damageNegations = new ArrayList<>(); + private final List<String> damageNegations = new ArrayList<>(); Multimap<String, AttributeModifier> attributes = HashMultimap.create(); public BaseBauble(BaubleType type) { diff --git a/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java index 01cd0ec0c1..efe18ed70c 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java @@ -135,7 +135,7 @@ public class BatteryPackBaseBauble extends ElectricBaseBauble { try { if (this.getCharge(aBaubleStack) >= getTransferLimit(aBaubleStack)) { - // Try Iterate Armour Slots of Player + // Try To Iterate Armour Slots of Player if (aPlayer instanceof EntityPlayer) { // amour @@ -145,7 +145,7 @@ public class BatteryPackBaseBauble extends ElectricBaseBauble { continue; } if (ChargingHelper.isItemValid(aInvStack)) { - double aTransferRate = 0; + double aTransferRate; final IElectricItem electricItem = (IElectricItem) aInvStack.getItem(); if (electricItem != null) { aTransferRate = electricItem.getTransferLimit(aInvStack); @@ -166,28 +166,17 @@ public class BatteryPackBaseBauble extends ElectricBaseBauble { false); ElectricItem.manager .discharge(aBaubleStack, d, mTier, false, true, false); - // Logger.INFO("Charging " + aInvStack.getDisplayName() + " - // | " + d + " | "+electricItem.getMaxCharge(aInvStack)); } - } else { - // Logger.INFO("5"); } - } else { - // Logger.INFO("4"); } - } else { - // Logger.INFO("3"); } - } else { - // Logger.INFO("1"); } + } } } - if (this.getCharge(aBaubleStack) > 0) { - continue; - } else { + if (!(this.getCharge(aBaubleStack) > 0)) { break; } } @@ -221,36 +210,22 @@ public class BatteryPackBaseBauble extends ElectricBaseBauble { .charge(aInvStack, aTransferRate, mTier, false, false); ElectricItem.manager .discharge(aBaubleStack, d, mTier, false, true, false); - // Logger.INFO("Charging " + aInvStack.getDisplayName() + " - // | " + d + " | "+electricItem.getMaxCharge(aInvStack)); } - } else { - // Logger.INFO("5"); } - } else { - // Logger.INFO("4"); } - } else { - // Logger.INFO("3"); } - } else { - // Logger.INFO("1"); } } } } - if (this.getCharge(aBaubleStack) > 0) { - continue; - } else { + if (!(this.getCharge(aBaubleStack) > 0)) { break; } } } } - } catch (Throwable t) { - - } + } catch (Throwable ignored) {} } } diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java index c1a4ae845a..5c587bc4c5 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java @@ -46,10 +46,7 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class AgriculturalChem extends ItemPackage { - private static boolean aBOP; - private static boolean aTiCon; - - private static ArrayList<FluidStack> mBloodFluids = new ArrayList<>(); + private static final ArrayList<FluidStack> mBloodFluids = new ArrayList<>(); /** * Fluids @@ -294,8 +291,8 @@ public class AgriculturalChem extends ItemPackage { public AgriculturalChem() { super(); - aBOP = BiomesOPlenty.isModLoaded(); - aTiCon = TinkerConstruct.isModLoaded(); + boolean aBOP = BiomesOPlenty.isModLoaded(); + boolean aTiCon = TinkerConstruct.isModLoaded(); Logger.INFO("Adding Agrochemical content"); diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java index 2fc6a2ab88..f89b69ec8b 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java @@ -668,7 +668,7 @@ public class MilledOreProcessing extends ItemPackage { public boolean addRecipe(ItemStack aInput, ItemStack aOutput1, int[] aChances, int aTime, int aEU) { aOutput1 = GTOreDictUnificator.get(true, aOutput1); - ItemStack aOutputs[] = new ItemStack[4]; + ItemStack[] aOutputs = new ItemStack[4]; for (int i = 0; i < aChances.length; i++) { aOutputs[i] = aOutput1; } diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java index 038a1ea8ce..b548192f47 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java @@ -23,7 +23,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class ItemGenericChemBase extends Item { - protected final IIcon base[]; + protected final IIcon[] base; private final int aMetaSize = 34; @@ -221,14 +221,10 @@ public class ItemGenericChemBase extends Item { public boolean showDurabilityBar(ItemStack aStack) { if (ItemUtils.isMillingBall(aStack)) { int aDam = getMillingBallDamage(aStack); - if (aDam > 0) { - return true; - } + return aDam > 0; } else if (ItemUtils.isCatalyst(aStack)) { int aDam = getCatalystDamage(aStack); - if (aDam > 0) { - return true; - } + return aDam > 0; } return false; } diff --git a/src/main/java/gtPlusPlus/core/item/circuit/GTPPIntegratedCircuitItem.java b/src/main/java/gtPlusPlus/core/item/circuit/GTPPIntegratedCircuitItem.java index e616004ec1..ec5548a9a3 100644 --- a/src/main/java/gtPlusPlus/core/item/circuit/GTPPIntegratedCircuitItem.java +++ b/src/main/java/gtPlusPlus/core/item/circuit/GTPPIntegratedCircuitItem.java @@ -72,16 +72,11 @@ public class GTPPIntegratedCircuitItem extends Item implements INetworkUpdatable try { aList.add("Configuration == " + aStack.getItemDamage()); aList.add( - GTLanguageManager.addStringLocalization( - new StringBuilder().append(getUnlocalizedName()) - .append(".tooltip.0") - .toString(), - "Right click to reconfigure")); + GTLanguageManager + .addStringLocalization(getUnlocalizedName() + ".tooltip.0", "Right click to reconfigure")); aList.add( GTLanguageManager.addStringLocalization( - new StringBuilder().append(getUnlocalizedName()) - .append(".tooltip.1") - .toString(), + getUnlocalizedName() + ".tooltip.1", "Needs a screwdriver or circuit programming tool")); } catch (Throwable t) { t.printStackTrace(); diff --git a/src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java b/src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java index 51bff6f12b..1b95cb7af9 100644 --- a/src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java +++ b/src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java @@ -19,7 +19,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class ItemDummyResearch extends ItemGenericToken { - public static enum ASSEMBLY_LINE_RESEARCH { + public enum ASSEMBLY_LINE_RESEARCH { RESEARCH_1_CONTAINMENT("Containment Fields", "Advanced scientific study"), RESEARCH_2_BASIC_CHEM("Basic Chemistry", "Time to start at the beginning"), @@ -36,14 +36,14 @@ public class ItemDummyResearch extends ItemGenericToken { private final String mName; private final String mDesc; - private ASSEMBLY_LINE_RESEARCH(String aName, String aDesc) { + ASSEMBLY_LINE_RESEARCH(String aName, String aDesc) { mName = aName; mDesc = aDesc; ModItems.itemDummyResearch.register(mName, mDesc); } } - private static Map<String, Integer> mInternalNameToIdMap = new LinkedHashMap<>(); + private static final Map<String, Integer> mInternalNameToIdMap = new LinkedHashMap<>(); public static ItemStack getResearchStack(ASSEMBLY_LINE_RESEARCH aResearchName, int aStacksize) { Integer aMeta = mInternalNameToIdMap.get(Utils.sanitizeString(aResearchName.mName)); diff --git a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java index 5c38dde63b..72e74b2d2b 100644 --- a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java +++ b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java @@ -3,6 +3,7 @@ package gtPlusPlus.core.item.food; import static gregtech.api.enums.Mods.GTPlusPlus; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -304,7 +305,7 @@ public class BaseItemMetaFood extends ItemFood { public void addInformation(ItemStack aStack, EntityPlayer p_77624_2_, List aList, boolean p_77624_4_) { try { String aTooltip = mTooltipMap.get(getMetaKey(aStack)); - if (aTooltip != null && aTooltip.length() > 0) { + if (aTooltip != null && !aTooltip.isEmpty()) { aList.add(aTooltip); } } catch (Throwable t) { @@ -422,10 +423,8 @@ public class BaseItemMetaFood extends ItemFood { private static ArrayList<String> getOreDictNamesAsArrayList(String... aOreDictNames) { ArrayList<String> aPackage = new ArrayList<>(); - if (aOreDictNames != null && aOreDictNames.length > 0) { - for (String aEffect : aOreDictNames) { - aPackage.add(aEffect); - } + if (aOreDictNames != null) { + aPackage.addAll(Arrays.asList(aOreDictNames)); } return aPackage; } diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java b/src/main/java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java index ee1afdb6bf..2fb6e67cd7 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemBasicScrubberTurbine.java @@ -85,7 +85,7 @@ public class ItemBasicScrubberTurbine extends Item { return true; } - public static final long getFilterDamage(final ItemStack aStack) { + public static long getFilterDamage(final ItemStack aStack) { NBTTagCompound aNBT = aStack.getTagCompound(); if (aNBT != null) { aNBT = aNBT.getCompoundTag("BasicTurbine"); @@ -98,7 +98,7 @@ public class ItemBasicScrubberTurbine extends Item { return 0L; } - public static final boolean setFilterDamage(final ItemStack aStack, final long aDamage) { + public static boolean setFilterDamage(final ItemStack aStack, final long aDamage) { NBTTagCompound aNBT = aStack.getTagCompound(); if (aNBT != null) { aNBT = aNBT.getCompoundTag("BasicTurbine"); @@ -133,8 +133,7 @@ public class ItemBasicScrubberTurbine extends Item { } double currentDamage = getFilterDamage(stack); double meta = getMaxDurability(stack); - double durabilitypercent = currentDamage / meta; - return durabilitypercent; + return currentDamage / meta; } @Override diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java b/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java index c6e0743268..1f1848a90c 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java @@ -124,12 +124,11 @@ public class ItemBlueprint extends Item implements IItemBlueprint { } public ItemStack writeItemsToNBT(final ItemStack itemStack, final ItemStack[] craftingGrid) { - final ItemStack[] blueprint = craftingGrid; if (itemStack.hasTagCompound()) { final NBTTagCompound nbt = itemStack.getTagCompound(); final NBTTagList list = new NBTTagList(); for (int i = 0; i < INV_SIZE; i++) { - final ItemStack stack = blueprint[i]; + final ItemStack stack = craftingGrid[i]; if (stack != null) { final NBTTagCompound data = new NBTTagCompound(); stack.writeToNBT(data); @@ -180,7 +179,6 @@ public class ItemBlueprint extends Item implements IItemBlueprint { if (output != null) { this.setBlueprintName(stack, output.getDisplayName()); - hasBP = true; return true; } return false; @@ -227,20 +225,20 @@ public class ItemBlueprint extends Item implements IItemBlueprint { public boolean createNBT(final ItemStack itemStack) { if (itemStack.hasTagCompound()) { if (!itemStack.stackTagCompound.getBoolean("mBlueprint") && !itemStack.stackTagCompound.getString("mName") - .equals("")) { + .isEmpty()) { // No Blueprint and no name Set Logger.WARNING("No Blueprint and no name Set"); return false; } else if (itemStack.stackTagCompound.getBoolean("mBlueprint") && !itemStack.stackTagCompound.getString("mName") - .equals("")) { + .isEmpty()) { // Has Blueprint but invalid name set Logger.WARNING("Has Blueprint but invalid name set"); return false; } else if (!itemStack.stackTagCompound.getBoolean("mBlueprint") && itemStack.stackTagCompound.getString("mName") - .equals("")) { + .isEmpty()) { // Has no Blueprint, but strangely has a name Logger.WARNING("Has no Blueprint, but strangely has a name"); return false; @@ -289,9 +287,6 @@ public class ItemBlueprint extends Item implements IItemBlueprint { // o = itemStack.stackTagCompound.getInteger(tagNBT); break; } - if (o != null) { - return o; - } - return null; + return o; } } diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java index 7a0cbe3312..5325f33299 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java @@ -91,11 +91,10 @@ public class ItemGenericToken extends CoreItem { sizes[1][3] = mRarities.size(); sizes[1][4] = mCustomNameColours.size(); // sizes[1][5] = mIcons.size(); - boolean b = sizes[0][0] > sizes[1][0] && sizes[0][1] > sizes[1][1] + return sizes[0][0] > sizes[1][0] && sizes[0][1] > sizes[1][1] && sizes[0][2] > sizes[1][2] && sizes[0][3] > sizes[1][3] && sizes[0][4] > sizes[1][4]; - return b; } // Handle Sub items diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java b/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java index ed9bddfd18..42bdd05aa8 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java @@ -288,9 +288,8 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI } } } - if (this.getCharge(baubleStack) <= (this.getMaxCharge(baubleStack) - getTransferLimit(baubleStack))) { - continue; - } else { + if (!(this.getCharge(baubleStack) + <= (this.getMaxCharge(baubleStack) - getTransferLimit(baubleStack)))) { break; } } @@ -357,7 +356,7 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI return true; } - public static final boolean getShowMessages(final ItemStack aStack) { + public static boolean getShowMessages(final ItemStack aStack) { NBTTagCompound aNBT = aStack.getTagCompound(); if (aNBT == null) { if (!createNBT(aStack)) { @@ -369,7 +368,7 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI return aNBT.getBoolean("ShowMSG"); } - public static final boolean setShowMessages(final ItemStack aStack, final boolean aShow) { + public static boolean setShowMessages(final ItemStack aStack, final boolean aShow) { NBTTagCompound aNBT = aStack.getTagCompound(); if (aNBT == null) { if (!createNBT(aStack)) { diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java b/src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java index 2b5dd8883f..ac3255251e 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java @@ -36,7 +36,7 @@ public class ItemLavaFilter extends CoreItem { private boolean setGregtechItemList() { ItemList.Component_LavaFilter.set(this); - return ItemList.Component_LavaFilter.get(1) != null ? true : false; + return ItemList.Component_LavaFilter.get(1) != null; } @Override diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemMagicFeather.java b/src/main/java/gtPlusPlus/core/item/general/ItemMagicFeather.java index 9b4dd86525..2972acd719 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemMagicFeather.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemMagicFeather.java @@ -91,7 +91,7 @@ public class ItemMagicFeather extends CoreItem { aBeaconData); } } - return aBeaconData.size() > 0; + return !aBeaconData.isEmpty(); } private static void findSuitableBeacon(EntityPlayer player, Collection<TileEntity> tileEntities, diff --git a/src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java b/src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java index c186fccd4b..bb2b98de47 100644 --- a/src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java +++ b/src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java @@ -14,7 +14,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.IEntityLivingData; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; @@ -58,7 +57,7 @@ public class ItemCustomSpawnEgg extends ItemMonsterPlacer { aPrimaryColor, aSecondaryColor, EnumRarity.common, - new ArrayList<String>()); + new ArrayList<>()); } public static void registerEntityForSpawnEgg(final int aMetaID, String parEntityToSpawnName, int aPrimaryColor, @@ -84,7 +83,7 @@ public class ItemCustomSpawnEgg extends ItemMonsterPlacer { /** * Callback for item usage. If the item does something special on right clicking, - * + * <p> * he will have one of those. Return True if something happen and false if it don't. This is for ITEMS, not BLOCKS */ @Override @@ -92,91 +91,87 @@ public class ItemCustomSpawnEgg extends ItemMonsterPlacer { int par5, int par6, int par7, float par8, float par9, float par10) { if (par3World.isRemote) { return true; - } else { - Block block = par3World.getBlock(par4, par5, par6); - par4 += Facing.offsetsXForSide[par7]; - par5 += Facing.offsetsYForSide[par7]; - par6 += Facing.offsetsZForSide[par7]; - double d0 = 0.0D; - - if (par7 == 1 && block.getRenderType() == 11) { - d0 = 0.5D; - } - - Entity entity = spawnEntity(par1ItemStack, par3World, par4 + 0.5D, par5 + d0, par6 + 0.5D); + } + Block block = par3World.getBlock(par4, par5, par6); + par4 += Facing.offsetsXForSide[par7]; + par5 += Facing.offsetsYForSide[par7]; + par6 += Facing.offsetsZForSide[par7]; + double d0 = 0.0D; + + if (par7 == 1 && block.getRenderType() == 11) { + d0 = 0.5D; + } - if (entity != null) { - if (entity instanceof EntityLivingBase && par1ItemStack.hasDisplayName()) { - ((EntityLiving) entity).setCustomNameTag(par1ItemStack.getDisplayName()); - } + Entity entity = spawnEntity(par1ItemStack, par3World, par4 + 0.5D, par5 + d0, par6 + 0.5D); - if (!par2EntityPlayer.capabilities.isCreativeMode) { - --par1ItemStack.stackSize; - } + if (entity != null) { + if (entity instanceof EntityLivingBase && par1ItemStack.hasDisplayName()) { + ((EntityLiving) entity).setCustomNameTag(par1ItemStack.getDisplayName()); } - return true; + if (!par2EntityPlayer.capabilities.isCreativeMode) { + --par1ItemStack.stackSize; + } } + + return true; } /** * Called whenever this item is equipped and the right mouse button is pressed. - * + * <p> * Args: itemStack, world, entityPlayer */ @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { if (par2World.isRemote) { return par1ItemStack; - } else { - MovingObjectPosition movingobjectposition = getMovingObjectPositionFromPlayer( - par2World, - par3EntityPlayer, - true); - - if (movingobjectposition == null) { - return par1ItemStack; - } else { - if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { - int i = movingobjectposition.blockX; - int j = movingobjectposition.blockY; - int k = movingobjectposition.blockZ; - - if (!par2World.canMineBlock(par3EntityPlayer, i, j, k)) { - return par1ItemStack; - } + } + MovingObjectPosition movingobjectposition = getMovingObjectPositionFromPlayer( + par2World, + par3EntityPlayer, + true); + + if (movingobjectposition != null) { + if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { + int i = movingobjectposition.blockX; + int j = movingobjectposition.blockY; + int k = movingobjectposition.blockZ; + + if (!par2World.canMineBlock(par3EntityPlayer, i, j, k)) { + return par1ItemStack; + } - if (!par3EntityPlayer.canPlayerEdit(i, j, k, movingobjectposition.sideHit, par1ItemStack)) { + if (!par3EntityPlayer.canPlayerEdit(i, j, k, movingobjectposition.sideHit, par1ItemStack)) { - return par1ItemStack; - } + return par1ItemStack; + } - if (par2World.getBlock(i, j, k) instanceof BlockLiquid) { - Entity entity = spawnEntity(par1ItemStack, par2World, i, j, k); + if (par2World.getBlock(i, j, k) instanceof BlockLiquid) { + Entity entity = spawnEntity(par1ItemStack, par2World, i, j, k); - if (entity != null) { - if (entity instanceof EntityLivingBase && par1ItemStack.hasDisplayName()) { + if (entity != null) { + if (entity instanceof EntityLivingBase && par1ItemStack.hasDisplayName()) { - ((EntityLiving) entity).setCustomNameTag(par1ItemStack.getDisplayName()); - } + ((EntityLiving) entity).setCustomNameTag(par1ItemStack.getDisplayName()); + } - if (!par3EntityPlayer.capabilities.isCreativeMode) { - --par1ItemStack.stackSize; - } + if (!par3EntityPlayer.capabilities.isCreativeMode) { + --par1ItemStack.stackSize; } } } - - return par1ItemStack; } + } + return par1ItemStack; } /** * Spawns the creature specified by the egg's type in the location specified by - * + * <p> * the last three parameters. Parameters: world, entityID, x, y, z. - * + * * @param par1ItemStack */ public Entity spawnEntity(ItemStack par1ItemStack, World parWorld, double parX, double parY, double parZ) { @@ -196,7 +191,7 @@ public class ItemCustomSpawnEgg extends ItemMonsterPlacer { MathHelper.wrapAngleTo180_float(parWorld.rand.nextFloat() * 360.0F), 0.0F); parWorld.spawnEntityInWorld(entityToSpawn); - entityToSpawn.onSpawnWithEgg((IEntityLivingData) null); + entityToSpawn.onSpawnWithEgg(null); entityToSpawn.playLivingSound(); } else { // DEBUG diff --git a/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java b/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java index 1524418038..5aa0072122 100644 --- a/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java +++ b/src/main/java/gtPlusPlus/core/item/materials/DustDecayable.java @@ -71,20 +71,20 @@ public class DustDecayable extends BaseItemTickable { if (!a1 && !a2) { if (entityHolding instanceof EntityPlayer) { - ItemStack replacement = ItemUtils.getSimpleStack(getDecayResult()); // Logger.INFO("Replacing "+iStack.getDisplayName()+" with "+replacement.getDisplayName()+"."); - final ItemStack tempTransform = replacement; if (iStack.stackSize > 1) { int u = iStack.stackSize; - tempTransform.stackSize = u; - ((EntityPlayer) entityHolding).inventory.addItemStackToInventory((tempTransform)); + ItemUtils.getSimpleStack(getDecayResult()).stackSize = u; + ((EntityPlayer) entityHolding).inventory + .addItemStackToInventory((ItemUtils.getSimpleStack(getDecayResult()))); for (int l = 0; l < u; l++) { ((EntityPlayer) entityHolding).inventory.consumeInventoryItem(this); } } else { - tempTransform.stackSize = 1; - ((EntityPlayer) entityHolding).inventory.addItemStackToInventory((tempTransform)); + ItemUtils.getSimpleStack(getDecayResult()).stackSize = 1; + ((EntityPlayer) entityHolding).inventory + .addItemStackToInventory((ItemUtils.getSimpleStack(getDecayResult()))); ((EntityPlayer) entityHolding).inventory.consumeInventoryItem(this); } } diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/ItemGregtechPump.java b/src/main/java/gtPlusPlus/core/item/tool/misc/ItemGregtechPump.java index a8173571dc..f6533dad8e 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/misc/ItemGregtechPump.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/ItemGregtechPump.java @@ -72,12 +72,7 @@ public class ItemGregtechPump extends Item implements ISpecialElectricItem, IEle if (aStack == null || aPlayer == null || aWorld == null || aWorld.isRemote) { return false; } - if (!aWorld.isRemote && tryDrainTile(aStack, aWorld, aPlayer, aX, aY, aZ)) { - return true; - } else { - // return super.onItemUse(aStack, aPlayer, aWorld, aX, aY, aZ, a4, p_77648_8_, p_77648_9_, p_77648_10_); - return false; - } + return tryDrainTile(aStack, aWorld, aPlayer, aX, aY, aZ); } @Override @@ -604,11 +599,8 @@ public class ItemGregtechPump extends Item implements ISpecialElectricItem, IEle if ((aMetaValue < 0) || (aMetaValue >= 32766) || (aBehavior == null)) { return this; } - ArrayList<IItemBehaviour<ItemGregtechPump>> tList = this.mItemBehaviors.get((short) aMetaValue); - if (tList == null) { - tList = new ArrayList<>(1); - this.mItemBehaviors.put((short) aMetaValue, tList); - } + ArrayList<IItemBehaviour<ItemGregtechPump>> tList = this.mItemBehaviors + .computeIfAbsent((short) aMetaValue, k -> new ArrayList<>(1)); tList.add(aBehavior); return this; } @@ -648,7 +640,6 @@ public class ItemGregtechPump extends Item implements ISpecialElectricItem, IEle } if (tRandomData == SubTag.NO_UNIFICATION) { GTOreDictUnificator.addToBlacklist(rStack); - continue; } } } @@ -681,7 +672,6 @@ public class ItemGregtechPump extends Item implements ISpecialElectricItem, IEle } if (tUseOreDict) { GTOreDictUnificator.registerOre(tRandomData, rStack); - continue; } } } @@ -733,7 +723,7 @@ public class ItemGregtechPump extends Item implements ISpecialElectricItem, IEle String fluidname = aFluid.getFluid() .getName(); int amount = aFluid.amount; - if (fluidname != null && fluidname.length() > 0 && amount > 0) { + if (fluidname != null && !fluidname.isEmpty() && amount > 0) { NBTUtils.setString(aStack, "mFluid", fluidname); NBTUtils.setInteger(aStack, "mFluidAmount", amount); } @@ -777,8 +767,7 @@ public class ItemGregtechPump extends Item implements ISpecialElectricItem, IEle .getInteger("mCapacity"); } int aMeta = this.getCorrectMetaForItemstack(container); - int aCapacity = (aMeta == 0 ? 2000 : (aMeta == 1 ? 8000 : (aMeta == 2 ? 32000 : 128000))); - return aCapacity; + return aMeta == 0 ? 2000 : aMeta == 1 ? 8000 : aMeta == 2 ? 32000 : 128000; } public int fill(ItemStack container, FluidStack resource) { @@ -815,12 +804,7 @@ public class ItemGregtechPump extends Item implements ISpecialElectricItem, IEle if (aStoredFluid == null) { Logger.INFO("Pump is empty, filling with tank fluids."); FluidStack toConsume; - int amountToConsume = 0; - if (resource.amount >= aCapacity) { - amountToConsume = aCapacity; - } else { - amountToConsume = resource.amount; - } + int amountToConsume = Math.min(resource.amount, aCapacity); toConsume = FluidUtils.getFluidStack(resource, amountToConsume); if (toConsume != null && amountToConsume > 0) { storeFluid(container, toConsume); @@ -982,10 +966,8 @@ public class ItemGregtechPump extends Item implements ISpecialElectricItem, IEle if (discharge(aStack, removal, aTier, true, true, false) > 0) { didDrain = true; } - } else if (aTier == 0) { - didDrain = true; } else { - didDrain = false; + didDrain = aTier == 0; } if (didDrain) { @@ -1181,7 +1163,7 @@ public class ItemGregtechPump extends Item implements ISpecialElectricItem, IEle } else { // Rewrite Fluid handling for Vanilla type tanks - if (!IFluidHandler.class.isInstance(aTileEntity)) { + if (!(aTileEntity instanceof IFluidHandler)) { Logger.INFO("Tile Was not an instance of IFluidHandler."); return false; } diff --git a/src/main/java/gtPlusPlus/core/lib/VanillaColours.java b/src/main/java/gtPlusPlus/core/lib/VanillaColours.java index 70e7902fbf..b6ba98d424 100644 --- a/src/main/java/gtPlusPlus/core/lib/VanillaColours.java +++ b/src/main/java/gtPlusPlus/core/lib/VanillaColours.java @@ -27,7 +27,7 @@ public enum VanillaColours { private final int r, g, b; - private VanillaColours(int aR, int aG, int aB) { + VanillaColours(int aR, int aG, int aB) { r = aR; g = aG; b = aB; diff --git a/src/main/java/gtPlusPlus/core/material/Material.java b/src/main/java/gtPlusPlus/core/material/Material.java index 3dab9bde39..0e69ba88d5 100644 --- a/src/main/java/gtPlusPlus/core/material/Material.java +++ b/src/main/java/gtPlusPlus/core/material/Material.java @@ -457,11 +457,13 @@ public class Material { if (hashSize2 + hashSize >= 9) { b = String.valueOf(aValueForGen); } else { - String c = b; + StringBuilder c = new StringBuilder(b); while (MathUtils.howManyPlaces(hashSize + c.length()) < 9) { - c = c + c.hashCode(); + c.append( + c.toString() + .hashCode()); } - b = c; + b = c.toString(); } } @@ -471,7 +473,7 @@ public class Material { } else { valueR = a; } - short fc[] = new short[3]; + short[] fc = new short[3]; int aIndex = 0; for (char gg : valueR.toCharArray()) { short ui = Short.parseShort("" + gg); @@ -570,7 +572,7 @@ public class Material { this.isRadioactive = true; this.vRadiationLevel = (byte) radiationLevel; } else { - if (vMaterialInput.size() > 0) { + if (!vMaterialInput.isEmpty()) { ArrayList<Byte> aDataSet = new ArrayList<>(); for (MaterialStack m : this.vMaterialInput) { aDataSet.add(m.getStackMaterial().vRadiationLevel); @@ -1183,11 +1185,8 @@ public class Material { } public final boolean hasSolidForm() { - if (ItemUtils - .checkForInvalidItems(new ItemStack[] { getDust(1), getBlock(1), getTinyDust(1), getSmallDust(1) })) { - return true; - } - return false; + return ItemUtils + .checkForInvalidItems(new ItemStack[] { getDust(1), getBlock(1), getTinyDust(1), getSmallDust(1) }); } public final ItemStack[] getMaterialComposites() { @@ -1273,16 +1272,18 @@ public class Material { final long[] smallestRatio = MathUtils.simplifyNumbersToSmallestForm(tempRatio); if (smallestRatio.length > 0) { - String tempRatioStringThing1 = ""; + StringBuilder tempRatioStringThing1 = new StringBuilder(); for (long value : tempRatio) { - tempRatioStringThing1 = tempRatioStringThing1 + value + " : "; + tempRatioStringThing1.append(value) + .append(" : "); } Logger.MATERIALS("Default Ratio: " + tempRatioStringThing1); - String tempRatioStringThing = ""; + StringBuilder tempRatioStringThing = new StringBuilder(); int tempSmallestCraftingUseSize = 0; for (long l : smallestRatio) { - tempRatioStringThing = tempRatioStringThing + l + " : "; + tempRatioStringThing.append(l) + .append(" : "); tempSmallestCraftingUseSize = (int) (tempSmallestCraftingUseSize + l); } // this.smallestStackSizeWhenProcessing = tempSmallestCraftingUseSize; @@ -1299,13 +1300,13 @@ public class Material { return ""; } Logger.MATERIALS("===============| Calculating Atomic Formula for " + this.localizedName + " |==============="); - if (!chemSymbol.equals("")) { + if (!chemSymbol.isEmpty()) { return chemSymbol; } final ArrayList<MaterialStack> tempInput = this.vMaterialInput; if (tempInput != null) { if (!tempInput.isEmpty()) { - String dummyFormula = ""; + StringBuilder dummyFormula = new StringBuilder(); final long[] dummyFormulaArray = this.getSmallestRatio(tempInput); if (dummyFormulaArray != null) { if (dummyFormulaArray.length >= 1) { @@ -1329,32 +1330,35 @@ public class Material { if (aChemFormula.length() > 3 || StringUtils.uppercaseCount(aChemFormula) > 1) { - dummyFormula = dummyFormula + "(" - + aChemFormula - + ")" - + dummyFormulaArray[e]; + dummyFormula.append("(") + .append(aChemFormula) + .append(")") + .append(dummyFormulaArray[e]); } else { - dummyFormula = dummyFormula + aChemFormula + dummyFormulaArray[e]; + dummyFormula.append(aChemFormula) + .append(dummyFormulaArray[e]); } } else if (dummyFormulaArray[e] == 1) { if (aChemFormula.length() > 3 || StringUtils.uppercaseCount(aChemFormula) > 1) { - dummyFormula = dummyFormula + "(" + aChemFormula + ")"; + dummyFormula.append("(") + .append(aChemFormula) + .append(")"); } else { - dummyFormula = dummyFormula + aChemFormula; + dummyFormula.append(aChemFormula); } } else { - dummyFormula = dummyFormula + "??"; + dummyFormula.append("??"); } } else { - dummyFormula = dummyFormula + "??"; + dummyFormula.append("??"); } } else { - dummyFormula = dummyFormula + "??"; + dummyFormula.append("??"); } } } - return StringUtils.subscript(dummyFormula); + return StringUtils.subscript(dummyFormula.toString()); // return dummyFormula; } Logger.MATERIALS("dummyFormulaArray <= 0"); @@ -1371,7 +1375,7 @@ public class Material { return isFluidQueued = true; } - public static final void generateQueuedFluids() { + public static void generateQueuedFluids() { for (Material m : mMaterialMap) { if (m.isFluidQueued) {} } @@ -1520,8 +1524,7 @@ public class Material { if (this.mFluid == null) { return null; } - final FluidStack moltenFluid = new FluidStack(this.mFluid, fluidAmount); - return moltenFluid; + return new FluidStack(this.mFluid, fluidAmount); } public final boolean setFluid(Fluid aFluid) { diff --git a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java index 48f52a9f7a..f21c40411f 100644 --- a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java +++ b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java @@ -82,10 +82,7 @@ public class MaterialGenerator { FluidStack rFluidOut, Integer aTime, Integer aEu) { RecipeGenFluidCanning g = new RecipeGenFluidCanning(false, aEmpty, aFullContainer, aFluidIn, null, null, 0); - if (g != null && g.valid()) { - return true; - } - return false; + return g != null && g.valid(); } public static void generate(final Material matInfo) { @@ -116,7 +113,7 @@ public class MaterialGenerator { } if (matInfo.getState() == MaterialState.SOLID) { - if (generateEverything == true) { + if (generateEverything) { if (sRadiation >= 1) { tempBlock = new BlockBaseModular(matInfo, BlockTypes.STANDARD); temp = new BaseItemIngot(matInfo); @@ -156,7 +153,7 @@ public class MaterialGenerator { temp = new BaseItemPlateDouble(matInfo); } } else if (matInfo.getState() == MaterialState.LIQUID) { - if (generateEverything == true) { + if (generateEverything) { tempBlock = new BlockBaseModular(matInfo, BlockTypes.STANDARD); } temp = new BaseItemIngot(matInfo); @@ -197,8 +194,7 @@ public class MaterialGenerator { return true; } catch (final Throwable t) { - - Logger.MATERIALS("" + matInfo.getLocalizedName() + " failed to generate."); + Logger.MATERIALS(matInfo.getLocalizedName() + " failed to generate."); return false; } } @@ -304,7 +300,7 @@ public class MaterialGenerator { new RecipeGenPlasma(matInfo); } catch (final Throwable t) { - Logger.MATERIALS("" + matInfo.getLocalizedName() + " failed to generate."); + Logger.MATERIALS(matInfo.getLocalizedName() + " failed to generate."); } } @@ -324,8 +320,7 @@ public class MaterialGenerator { final String unlocalizedName = matInfo.getUnlocalizedName(); final String materialName = matInfo.getLocalizedName(); - final short[] C = customRGB; - final Integer Colour = Utils.rgbtoHexValue(C[0], C[1], C[2]); + final Integer Colour = Utils.rgbtoHexValue(customRGB[0], customRGB[1], customRGB[2]); if (Colour == null) { Logger.DEBUG_MATERIALS("Invalid Material while constructing " + materialName + "."); @@ -421,7 +416,7 @@ public class MaterialGenerator { new RecipeGenPlasma(matInfo); return true; } catch (final Throwable t) { - Logger.MATERIALS("" + matInfo.getLocalizedName() + " failed to generate."); + Logger.MATERIALS(matInfo.getLocalizedName() + " failed to generate."); t.printStackTrace(); return false; } diff --git a/src/main/java/gtPlusPlus/core/material/MaterialsAlloy.java b/src/main/java/gtPlusPlus/core/material/MaterialsAlloy.java index 53017a4d29..6c54c3b545 100644 --- a/src/main/java/gtPlusPlus/core/material/MaterialsAlloy.java +++ b/src/main/java/gtPlusPlus/core/material/MaterialsAlloy.java @@ -303,7 +303,7 @@ public final class MaterialsAlloy { -1, true, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack(MaterialsElements.getInstance().IRON, 06), + new MaterialStack(MaterialsElements.getInstance().IRON, 6), new MaterialStack(MaterialsElements.getInstance().COBALT, 2), new MaterialStack(MaterialsElements.getInstance().MOLYBDENUM, 24), new MaterialStack(MaterialsElements.getInstance().CHROMIUM, 6), diff --git a/src/main/java/gtPlusPlus/core/material/MaterialsElements.java b/src/main/java/gtPlusPlus/core/material/MaterialsElements.java index e8cc6ee8f7..c92deae057 100644 --- a/src/main/java/gtPlusPlus/core/material/MaterialsElements.java +++ b/src/main/java/gtPlusPlus/core/material/MaterialsElements.java @@ -576,12 +576,13 @@ public final class MaterialsElements { false, "҈", 0, - new MaterialStack[] { new MaterialStack(getInstance().LEAD, 15), - new MaterialStack(getInstance().MANGANESE, 25), new MaterialStack(getInstance().CARBON, 60) }); // Not - // a - // GT - // Inherited - // Material + new MaterialStack(getInstance().LEAD, 15), + new MaterialStack(getInstance().MANGANESE, 25), + new MaterialStack(getInstance().CARBON, 60)); // Not + // a + // GT + // Inherited + // Material public static final Material WHITE_METAL = new Material( "White Metal", MaterialState.SOLID, @@ -594,9 +595,10 @@ public final class MaterialsElements { false, "҉", 0, - new MaterialStack[] { new MaterialStack(getInstance().COPPER, 5), - new MaterialStack(getInstance().ANTIMONY, 10), new MaterialStack(getInstance().PLATINUM, 10), - new MaterialStack(getInstance().TIN, 75) }); // Not a GT Inherited Material + new MaterialStack(getInstance().COPPER, 5), + new MaterialStack(getInstance().ANTIMONY, 10), + new MaterialStack(getInstance().PLATINUM, 10), + new MaterialStack(getInstance().TIN, 75)); // Not a GT Inherited Material public static final Material GRANITE = new Material( "Ancient Granite", @@ -611,15 +613,18 @@ public final class MaterialsElements { "«»", 0, false, - new MaterialStack[] { new MaterialStack(getInstance().OXYGEN, 16), - new MaterialStack(getInstance().IRON, 10), new MaterialStack(getInstance().SILICONDIOXIDE, 10), - new MaterialStack(getInstance().ALUMINIUMOXIDE, 6), new MaterialStack(getInstance().POTASSIUM, 6), - new MaterialStack(getInstance().CALCIUM, 4), new MaterialStack(getInstance().SODIUM, 4), - new MaterialStack(getInstance().YTTERBIUM, 2) }); // Not - // a - // GT - // Inherited - // Material + new MaterialStack(getInstance().OXYGEN, 16), + new MaterialStack(getInstance().IRON, 10), + new MaterialStack(getInstance().SILICONDIOXIDE, 10), + new MaterialStack(getInstance().ALUMINIUMOXIDE, 6), + new MaterialStack(getInstance().POTASSIUM, 6), + new MaterialStack(getInstance().CALCIUM, 4), + new MaterialStack(getInstance().SODIUM, 4), + new MaterialStack(getInstance().YTTERBIUM, 2)); // Not + // a + // GT + // Inherited + // Material public static final Material RUNITE = new Material( "Runite", diff --git a/src/main/java/gtPlusPlus/core/material/Particle.java b/src/main/java/gtPlusPlus/core/material/Particle.java index fefb3f4497..f33a795a07 100644 --- a/src/main/java/gtPlusPlus/core/material/Particle.java +++ b/src/main/java/gtPlusPlus/core/material/Particle.java @@ -95,13 +95,13 @@ public class Particle { UNKNOWN = new Particle(ElementaryGroup.UNKNOWN, "Unknown"); } - public static enum ElementaryGroup { + public enum ElementaryGroup { QUARK, LEPTON, BOSON, BARYON, MESON, - UNKNOWN; + UNKNOWN } public final ElementaryGroup mParticleType; diff --git a/src/main/java/gtPlusPlus/core/material/nuclear/MaterialsFluorides.java b/src/main/java/gtPlusPlus/core/material/nuclear/MaterialsFluorides.java index f3ae16c644..120e42584b 100644 --- a/src/main/java/gtPlusPlus/core/material/nuclear/MaterialsFluorides.java +++ b/src/main/java/gtPlusPlus/core/material/nuclear/MaterialsFluorides.java @@ -20,10 +20,10 @@ public class MaterialsFluorides { false, // Uses Blast furnace? false, // Generate cells // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().CALCIUM, 16), - new MaterialStack(MaterialsElements.getInstance().FLUORINE, 32), - new MaterialStack(MaterialsElements.getInstance().IRON, 4), - new MaterialStack(MaterialsElements.getInstance().CARBON, 2) }); + new MaterialStack(MaterialsElements.getInstance().CALCIUM, 16), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 32), + new MaterialStack(MaterialsElements.getInstance().IRON, 4), + new MaterialStack(MaterialsElements.getInstance().CARBON, 2)); // ThF4 public static final Material THORIUM_TETRAFLUORIDE = new Material( @@ -36,8 +36,8 @@ public class MaterialsFluorides { -1, // Neutrons false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().THORIUM232, 1), - new MaterialStack(MaterialsElements.getInstance().FLUORINE, 4) }); + new MaterialStack(MaterialsElements.getInstance().THORIUM232, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 4)); // ThF6 public static final Material THORIUM_HEXAFLUORIDE = new Material( @@ -50,9 +50,9 @@ public class MaterialsFluorides { -1, // Neutrons false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().THORIUM232, 1), - new MaterialStack(MaterialsElements.getInstance().THORIUM, 1), - new MaterialStack(MaterialsElements.getInstance().FLUORINE, 12) }); + new MaterialStack(MaterialsElements.getInstance().THORIUM232, 1), + new MaterialStack(MaterialsElements.getInstance().THORIUM, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 12)); // UF4 public static final Material URANIUM_TETRAFLUORIDE = new Material( @@ -65,8 +65,8 @@ public class MaterialsFluorides { -1, // Neutrons false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().URANIUM233, 1), - new MaterialStack(MaterialsElements.getInstance().FLUORINE, 4) }); + new MaterialStack(MaterialsElements.getInstance().URANIUM233, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 4)); // UF6 public static final Material URANIUM_HEXAFLUORIDE = new Material( @@ -79,8 +79,8 @@ public class MaterialsFluorides { -1, // Neutrons false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1), - new MaterialStack(MaterialsElements.getInstance().FLUORINE, 2) }); + new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 2)); // ZrF4 @@ -99,8 +99,8 @@ public class MaterialsFluorides { -1, true, false, - new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().ZIRCONIUM, 1), - new MaterialStack(MaterialsElements.getInstance().FLUORINE, 4) }); + new MaterialStack(MaterialsElements.getInstance().ZIRCONIUM, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 4)); /* * public static final Material ZIRCONIUM_TETRAFLUORIDE = new Material( "Zirconium Tetrafluoride", //Material Name @@ -121,8 +121,8 @@ public class MaterialsFluorides { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().BERYLLIUM, 1), - new MaterialStack(MaterialsElements.getInstance().FLUORINE, 2) }); + new MaterialStack(MaterialsElements.getInstance().BERYLLIUM, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 2)); // LiF public static final Material LITHIUM_FLUORIDE = new Material( @@ -135,8 +135,8 @@ public class MaterialsFluorides { -1, // Neutrons false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().LITHIUM7, 1), - new MaterialStack(MaterialsElements.getInstance().FLUORINE, 1) }); + new MaterialStack(MaterialsElements.getInstance().LITHIUM7, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 1)); // LFTR sub components @@ -151,9 +151,9 @@ public class MaterialsFluorides { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialMisc.AMMONIUM, 1), - new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 1), - new MaterialStack(MaterialsElements.getInstance().FLUORINE, 2) }); + new MaterialStack(MaterialMisc.AMMONIUM, 1), + new MaterialStack(MaterialsElements.getInstance().HYDROGEN, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 2)); // Be(OH)2 public static final Material BERYLLIUM_HYDROXIDE = new Material( @@ -166,8 +166,8 @@ public class MaterialsFluorides { -1, // Neutrons false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().BERYLLIUM, 1), - new MaterialStack(MaterialMisc.HYDROXIDE, 2) }); + new MaterialStack(MaterialsElements.getInstance().BERYLLIUM, 1), + new MaterialStack(MaterialMisc.HYDROXIDE, 2)); // (NH4)2BeF4 public static final Material AMMONIUM_TETRAFLUOROBERYLLATE = new Material( @@ -180,9 +180,9 @@ public class MaterialsFluorides { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialMisc.AMMONIUM, 2), - new MaterialStack(MaterialsElements.getInstance().BERYLLIUM, 1), - new MaterialStack(MaterialsElements.getInstance().FLUORINE, 4) }); + new MaterialStack(MaterialMisc.AMMONIUM, 2), + new MaterialStack(MaterialsElements.getInstance().BERYLLIUM, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 4)); // LFTR Output public static final Material NEPTUNIUM_HEXAFLUORIDE = new Material( @@ -195,8 +195,8 @@ public class MaterialsFluorides { -1, // Neutrons false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().NEPTUNIUM, 1), - new MaterialStack(MaterialsElements.getInstance().FLUORINE, 6) }); + new MaterialStack(MaterialsElements.getInstance().NEPTUNIUM, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 6)); public static final Material TECHNETIUM_HEXAFLUORIDE = new Material( "Technetium Hexafluoride", // Material Name @@ -208,8 +208,8 @@ public class MaterialsFluorides { -1, // Neutrons false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().TECHNETIUM, 1), - new MaterialStack(MaterialsElements.getInstance().FLUORINE, 6) }); + new MaterialStack(MaterialsElements.getInstance().TECHNETIUM, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 6)); public static final Material SELENIUM_HEXAFLUORIDE = new Material( "Selenium Hexafluoride", // Material Name @@ -221,8 +221,8 @@ public class MaterialsFluorides { -1, // Neutrons false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().SELENIUM, 1), - new MaterialStack(MaterialsElements.getInstance().FLUORINE, 6) }); + new MaterialStack(MaterialsElements.getInstance().SELENIUM, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 6)); public static final Material SODIUM_FLUORIDE = new Material( "Sodium Fluoride", // Material Name @@ -234,8 +234,8 @@ public class MaterialsFluorides { -1, // Neutrons false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().SODIUM, 1), - new MaterialStack(MaterialsElements.getInstance().FLUORINE, 1) }); + new MaterialStack(MaterialsElements.getInstance().SODIUM, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 1)); private static final MaterialsFluorides INSTANCE = new MaterialsFluorides(); diff --git a/src/main/java/gtPlusPlus/core/material/nuclear/MaterialsNuclides.java b/src/main/java/gtPlusPlus/core/material/nuclear/MaterialsNuclides.java index 8d74ef9ab8..0e5c1592df 100644 --- a/src/main/java/gtPlusPlus/core/material/nuclear/MaterialsNuclides.java +++ b/src/main/java/gtPlusPlus/core/material/nuclear/MaterialsNuclides.java @@ -22,8 +22,8 @@ public final class MaterialsNuclides { StringUtils.subscript(StringUtils.superscript("7") + "Li2BeF4"), // Chemical Formula 4, // Radioactivity Level // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 2), - new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1) }); + new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 2), + new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1)); public static final Material LiFBeF2ThF4UF4 = new Material( "LFTR Fuel 3", // Material Name @@ -38,10 +38,10 @@ public final class MaterialsNuclides { StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2ThF4UF4"), // Chemical Formula 5, // Radioactivity Level // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 65), - new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 28), - new MaterialStack(MaterialsFluorides.THORIUM_TETRAFLUORIDE, 1), - new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1) }); + new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 65), + new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 28), + new MaterialStack(MaterialsFluorides.THORIUM_TETRAFLUORIDE, 1), + new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1)); public static final Material LiFBeF2ZrF4UF4 = new Material( "LFTR Fuel 2", // Material Name @@ -56,10 +56,10 @@ public final class MaterialsNuclides { StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2ZrF4UF4"), // Chemical Formula 5, // Radioactivity Level // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 65), - new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 28), - new MaterialStack(MaterialsFluorides.ZIRCONIUM_TETRAFLUORIDE, 5), - new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 2) }); + new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 65), + new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 28), + new MaterialStack(MaterialsFluorides.ZIRCONIUM_TETRAFLUORIDE, 5), + new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 2)); public static final Material LiFBeF2ZrF4U235 = new Material( "LFTR Fuel 1", // Material Name @@ -75,10 +75,10 @@ public final class MaterialsNuclides { // Formula 5, // Radioactivity Level // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 55), - new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 25), - new MaterialStack(MaterialsFluorides.ZIRCONIUM_TETRAFLUORIDE, 6), - new MaterialStack(MaterialsElements.getInstance().URANIUM235, 14) }); + new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 55), + new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 25), + new MaterialStack(MaterialsFluorides.ZIRCONIUM_TETRAFLUORIDE, 6), + new MaterialStack(MaterialsElements.getInstance().URANIUM235, 14)); // Misc public static final Material BurntLftrFuel_MK1 = new Material( @@ -92,10 +92,10 @@ public final class MaterialsNuclides { false, // Uses Blast furnace? StringUtils.subscript(StringUtils.superscript("7") + "LiBeF2UF4FP"), // Chemical Formula // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().LITHIUM, 1), - new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1), - new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1), - new MaterialStack(MaterialsElements.getInstance().PROTACTINIUM, 1) }); + new MaterialStack(MaterialsElements.getInstance().LITHIUM, 1), + new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1), + new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1), + new MaterialStack(MaterialsElements.getInstance().PROTACTINIUM, 1)); public static final Material BurntLftrFuel_MK2 = new Material( "Burnt Reactor Fuel II", // Material Name @@ -108,10 +108,10 @@ public final class MaterialsNuclides { false, // Uses Blast furnace? StringUtils.subscript(StringUtils.superscript("7") + "LiBeF2UF4FP"), // Chemical Formula // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().LITHIUM, 1), - new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1), - new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1), - new MaterialStack(MaterialsElements.getInstance().PROTACTINIUM, 1) }); + new MaterialStack(MaterialsElements.getInstance().LITHIUM, 1), + new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1), + new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1), + new MaterialStack(MaterialsElements.getInstance().PROTACTINIUM, 1)); // LFTR Core Fluids public static final Material LiFBeF2UF4FP = new Material( @@ -125,10 +125,10 @@ public final class MaterialsNuclides { false, // Uses Blast furnace? StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2UF4FP"), // Chemical Formula // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1), - new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1), - new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1), - new MaterialStack(MaterialsElements.getInstance().PROTACTINIUM, 1) }); + new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1), + new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1), + new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1), + new MaterialStack(MaterialsElements.getInstance().PROTACTINIUM, 1)); public static final Material Sparged_LiFBeF2UF4FP = new Material( "Helium Sparged U Salt", // Material Name @@ -141,10 +141,10 @@ public final class MaterialsNuclides { false, // Uses Blast furnace? StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2UF4FP"), // Chemical Formula // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1), - new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1), - new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1), - new MaterialStack(MaterialsElements.getInstance().PROTACTINIUM, 1) }); + new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1), + new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1), + new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1), + new MaterialStack(MaterialsElements.getInstance().PROTACTINIUM, 1)); public static final Material UF6F2FP = new Material( "Phosphorous Uranium Hexafluoride (P-UF6)", // Material Name @@ -157,9 +157,9 @@ public final class MaterialsNuclides { false, // Uses Blast furnace? StringUtils.subscript("UF6F2FP"), // Chemical Formula // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsFluorides.URANIUM_HEXAFLUORIDE, 1), - new MaterialStack(MaterialsElements.getInstance().FLUORINE, 3), - new MaterialStack(MaterialsElements.getInstance().PHOSPHORUS, 1) }); + new MaterialStack(MaterialsFluorides.URANIUM_HEXAFLUORIDE, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 3), + new MaterialStack(MaterialsElements.getInstance().PHOSPHORUS, 1)); public static final Material LiFBeF2 = new Material( "Stable Molten Salt Base", // Material Name @@ -172,8 +172,8 @@ public final class MaterialsNuclides { false, // Uses Blast furnace? StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2"), // Chemical Formula // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1), - new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1) }); + new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1), + new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1)); public static final Material LiFBeF2UF4 = new Material( "LFTR Fuel Base", // Material Name @@ -186,8 +186,8 @@ public final class MaterialsNuclides { false, // Uses Blast furnace? StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2UF4"), // Chemical Formula // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(LiFBeF2, 1), - new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1) }); + new MaterialStack(LiFBeF2, 1), + new MaterialStack(MaterialsFluorides.URANIUM_TETRAFLUORIDE, 1)); // LFTR Blanket Fluids @@ -203,8 +203,8 @@ public final class MaterialsNuclides { false, // Uses Blast furnace? StringUtils.subscript(StringUtils.superscript("7") + "LiFThF4"), // Chemical Formula // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1), - new MaterialStack(MaterialsFluorides.THORIUM_TETRAFLUORIDE, 1) }); + new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1), + new MaterialStack(MaterialsFluorides.THORIUM_TETRAFLUORIDE, 1)); // Tier 2 Fuel blanket output public static final Material LiFBeF2ThF4 = new Material( @@ -218,9 +218,9 @@ public final class MaterialsNuclides { false, // Uses Blast furnace? StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2ThF4"), // Chemical Formula // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1), - new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1), - new MaterialStack(MaterialsFluorides.THORIUM_TETRAFLUORIDE, 1) }); + new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1), + new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1), + new MaterialStack(MaterialsFluorides.THORIUM_TETRAFLUORIDE, 1)); // Tier 1 Fuel blanket output public static final Material Sparged_LiFThF4 = new Material( @@ -234,8 +234,8 @@ public final class MaterialsNuclides { false, // Uses Blast furnace? StringUtils.subscript(StringUtils.superscript("7") + "LiFThF4"), // Chemical Formula // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1), - new MaterialStack(MaterialsFluorides.THORIUM_TETRAFLUORIDE, 1) }); + new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1), + new MaterialStack(MaterialsFluorides.THORIUM_TETRAFLUORIDE, 1)); // Tier 2 Fuel blanket output public static final Material Sparged_LiFBeF2ThF4 = new Material( @@ -249,9 +249,9 @@ public final class MaterialsNuclides { false, // Uses Blast furnace? StringUtils.subscript(StringUtils.superscript("7") + "LiFBeF2ThF4"), // Chemical Formula // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1), - new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1), - new MaterialStack(MaterialsFluorides.THORIUM_TETRAFLUORIDE, 1) }); + new MaterialStack(MaterialsFluorides.LITHIUM_FLUORIDE, 1), + new MaterialStack(MaterialsFluorides.BERYLLIUM_FLUORIDE, 1), + new MaterialStack(MaterialsFluorides.THORIUM_TETRAFLUORIDE, 1)); public static final Material UF6F2 = new Material( "Fluorinated Uranium Hexafluoride (F-UF6)", // Material Name @@ -264,8 +264,8 @@ public final class MaterialsNuclides { false, // Uses Blast furnace? StringUtils.subscript("UF6F2"), // Chemical Formula // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsFluorides.URANIUM_HEXAFLUORIDE, 1), - new MaterialStack(MaterialsElements.getInstance().FLUORINE, 2) }); + new MaterialStack(MaterialsFluorides.URANIUM_HEXAFLUORIDE, 1), + new MaterialStack(MaterialsElements.getInstance().FLUORINE, 2)); // Secondary material is molten metal public static final Material NAQ_FUEL_T1 = new Material( @@ -278,8 +278,8 @@ public final class MaterialsNuclides { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().NAQUADAH, 2), - new MaterialStack(MaterialsElements.getInstance().TANTALUM, 3) }); + new MaterialStack(MaterialsElements.getInstance().NAQUADAH, 2), + new MaterialStack(MaterialsElements.getInstance().TANTALUM, 3)); // Secondary material is a plasma public static final Material NAQ_FUEL_T2 = new Material( @@ -292,8 +292,8 @@ public final class MaterialsNuclides { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().NAQUADAH_ENRICHED, 2), - new MaterialStack(MaterialsElements.getInstance().TITANIUM, 3) }); + new MaterialStack(MaterialsElements.getInstance().NAQUADAH_ENRICHED, 2), + new MaterialStack(MaterialsElements.getInstance().TITANIUM, 3)); // Secondary material is a plasma public static final Material NAQ_FUEL_T3 = new Material( @@ -306,8 +306,8 @@ public final class MaterialsNuclides { -1, false, // Uses Blast furnace? // Material Stacks with Percentage of required elements. - new MaterialStack[] { new MaterialStack(MaterialsElements.getInstance().NAQUADRIA, 2), - new MaterialStack(MaterialsElements.getInstance().AMERICIUM, 3) }); + new MaterialStack(MaterialsElements.getInstance().NAQUADRIA, 2), + new MaterialStack(MaterialsElements.getInstance().AMERICIUM, 3)); private static final MaterialsNuclides INSTANCE = new MaterialsNuclides(); diff --git a/src/main/java/gtPlusPlus/core/material/state/MaterialState.java b/src/main/java/gtPlusPlus/core/material/state/MaterialState.java index 9fb5cde101..174b40be86 100644 --- a/src/main/java/gtPlusPlus/core/material/state/MaterialState.java +++ b/src/main/java/gtPlusPlus/core/material/state/MaterialState.java @@ -12,7 +12,7 @@ public enum MaterialState { private final int STATE; - private MaterialState(final int State) { + MaterialState(final int State) { this.STATE = State; } diff --git a/src/main/java/gtPlusPlus/core/network/packet/AbstractPacket.java b/src/main/java/gtPlusPlus/core/network/packet/AbstractPacket.java index ef43795206..0a2ed84079 100644 --- a/src/main/java/gtPlusPlus/core/network/packet/AbstractPacket.java +++ b/src/main/java/gtPlusPlus/core/network/packet/AbstractPacket.java @@ -4,5 +4,5 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; public interface AbstractPacket extends IMessage { - public abstract String getPacketName(); + String getPacketName(); } diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java b/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java index d110124086..a481772961 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesGeneral.java @@ -474,54 +474,54 @@ public class RecipesGeneral { CI.component_Plate[9], ItemList.Hatch_Input_ZPM.get(1), CI.component_Plate[8], - GregtechItemList.Hatch_Input_Naquadah.get(1L, new Object[0])); + GregtechItemList.Hatch_Input_Naquadah.get(1L)); if (GTMod.gregtechproxy.mPollution) { GTModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Muffler_Adv_LV.get(1L, new Object[0]), + GregtechItemList.Hatch_Muffler_Adv_LV.get(1L), bitsd, - new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_LV.get(1), - Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_LV.get(1) }); + new Object[] { "M", "P", 'M', ItemList.Hatch_Muffler_LV.get(1), 'P', + GregtechItemList.Pollution_Cleaner_LV.get(1) }); GTModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Muffler_Adv_MV.get(1L, new Object[0]), + GregtechItemList.Hatch_Muffler_Adv_MV.get(1L), bitsd, - new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_MV.get(1), - Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_MV.get(1) }); + new Object[] { "M", "P", 'M', ItemList.Hatch_Muffler_MV.get(1), 'P', + GregtechItemList.Pollution_Cleaner_MV.get(1) }); GTModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Muffler_Adv_HV.get(1L, new Object[0]), + GregtechItemList.Hatch_Muffler_Adv_HV.get(1L), bitsd, - new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_HV.get(1), - Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_HV.get(1) }); + new Object[] { "M", "P", 'M', ItemList.Hatch_Muffler_HV.get(1), 'P', + GregtechItemList.Pollution_Cleaner_HV.get(1) }); GTModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Muffler_Adv_EV.get(1L, new Object[0]), + GregtechItemList.Hatch_Muffler_Adv_EV.get(1L), bitsd, - new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_EV.get(1), - Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_EV.get(1) }); + new Object[] { "M", "P", 'M', ItemList.Hatch_Muffler_EV.get(1), 'P', + GregtechItemList.Pollution_Cleaner_EV.get(1) }); GTModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Muffler_Adv_IV.get(1L, new Object[0]), + GregtechItemList.Hatch_Muffler_Adv_IV.get(1L), bitsd, - new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_IV.get(1), - Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_IV.get(1) }); + new Object[] { "M", "P", 'M', ItemList.Hatch_Muffler_IV.get(1), 'P', + GregtechItemList.Pollution_Cleaner_IV.get(1) }); GTModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Muffler_Adv_LuV.get(1L, new Object[0]), + GregtechItemList.Hatch_Muffler_Adv_LuV.get(1L), bitsd, - new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_LuV.get(1), - Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_LuV.get(1) }); + new Object[] { "M", "P", 'M', ItemList.Hatch_Muffler_LuV.get(1), 'P', + GregtechItemList.Pollution_Cleaner_LuV.get(1) }); GTModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Muffler_Adv_ZPM.get(1L, new Object[0]), + GregtechItemList.Hatch_Muffler_Adv_ZPM.get(1L), bitsd, - new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_ZPM.get(1), - Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_ZPM.get(1) }); + new Object[] { "M", "P", 'M', ItemList.Hatch_Muffler_ZPM.get(1), 'P', + GregtechItemList.Pollution_Cleaner_ZPM.get(1) }); GTModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Muffler_Adv_UV.get(1L, new Object[0]), + GregtechItemList.Hatch_Muffler_Adv_UV.get(1L), bitsd, - new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_UV.get(1), - Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_UV.get(1) }); + new Object[] { "M", "P", 'M', ItemList.Hatch_Muffler_UV.get(1), 'P', + GregtechItemList.Pollution_Cleaner_UV.get(1) }); GTModHandler.addCraftingRecipe( - GregtechItemList.Hatch_Muffler_Adv_MAX.get(1L, new Object[0]), + GregtechItemList.Hatch_Muffler_Adv_MAX.get(1L), bitsd, - new Object[] { "M", "P", Character.valueOf('M'), ItemList.Hatch_Muffler_MAX.get(1), - Character.valueOf('P'), GregtechItemList.Pollution_Cleaner_MAX.get(1) }); + new Object[] { "M", "P", 'M', ItemList.Hatch_Muffler_MAX.get(1), 'P', + GregtechItemList.Pollution_Cleaner_MAX.get(1) }); } } } diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java index f6091cda68..265cd60f97 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java @@ -172,7 +172,7 @@ public class RecipesMachines { // Misc public static ItemStack INPUT_RCCokeOvenBlock; - public static final void loadRecipes() { + public static void loadRecipes() { run(); Logger.INFO("Loading Recipes for the Various machine blocks."); } @@ -3299,7 +3299,7 @@ public class RecipesMachines { private static void fakeMachineCasingCovers() { int aMaxTier = GTValues.VOLTAGE_NAMES.length; - ItemStack aTier[] = new ItemStack[aMaxTier]; + ItemStack[] aTier = new ItemStack[aMaxTier]; for (int i = 0; i < aMaxTier; i++) { aTier[i] = ItemUtils.simpleMetaStack(CoverManager.Cover_Gt_Machine_Casing, i, 7); } diff --git a/src/main/java/gtPlusPlus/core/recipe/common/CI.java b/src/main/java/gtPlusPlus/core/recipe/common/CI.java index addc3df7e4..525c43883c 100644 --- a/src/main/java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/main/java/gtPlusPlus/core/recipe/common/CI.java @@ -287,18 +287,17 @@ public class CI { public static String getTieredComponent(OrePrefixes type, int tier) { Object material = getMaterialFromTier(tier); if (material != null) { + String materialName; if (material instanceof Materials) { // return (ItemStack) type.get(material); - String materialName = ((Materials) material).mDefaultLocalName; - Logger.INFO("Searching for a component named " + type.name() + materialName); + materialName = ((Materials) material).mDefaultLocalName; // return ItemUtils.getItemStackOfAmountFromOreDict(type.name()+materialName, 1); - return (type.name() + materialName); } else { - String materialName = (Utils.sanitizeString(((Material) material).getLocalizedName())); - Logger.INFO("Searching for a component named " + type.name() + materialName); + materialName = (Utils.sanitizeString(((Material) material).getLocalizedName())); // return ItemUtils.getItemStackOfAmountFromOreDict(type.name()+materialName, 1); - return (type.name() + materialName); } + Logger.INFO("Searching for a component named " + type.name() + materialName); + return (type.name() + materialName); } Logger.INFO("[Components] Failed getting a tiered component. " + type.name() + " | " + tier); return null; @@ -517,8 +516,7 @@ public class CI { if (aPrefix == OrePrefixes.liquid) { int aMatID = (aTier == 0 || aTier == 2 || aTier == 5 || aTier == 8 ? 0 : (aTier == 1 || aTier == 3 || aTier == 6 || aTier == 9 ? 1 : 2)); - ItemStack aCell = aMaster[aMatID][aTier].getCell(aAmount); - return aCell; + return aMaster[aMatID][aTier].getCell(aAmount); } if (aPrefix == OrePrefixes.circuit) { diff --git a/src/main/java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java b/src/main/java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java index 03581ef705..eaf8b1b239 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java @@ -18,7 +18,7 @@ public class SlotCraftingNoCollect extends SlotCrafting { /** The craft matrix inventory linked to this result slot. */ private final IInventory craftMatrix; /** The player that is using the GUI where this slot resides. */ - private EntityPlayer thePlayer; + private final EntityPlayer thePlayer; /** * The number of items that have been crafted so far. Gets passed to ItemStack.onCrafting before being reset. */ diff --git a/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java b/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java index d5d348e0d8..35a569578f 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java +++ b/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java @@ -1,5 +1,6 @@ package gtPlusPlus.core.tileentities.base; +import java.util.Arrays; import java.util.UUID; import net.minecraft.block.Block; @@ -170,9 +171,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT @Override public boolean isServerSide() { if (this.hasWorldObj()) { - if (!this.getWorldObj().isRemote) { - return true; - } + return !this.getWorldObj().isRemote; } return false; } @@ -197,7 +196,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT @Override public boolean hasCustomInventoryName() { - return this.customName != null && !this.customName.equals(""); + return this.customName != null && !this.customName.isEmpty(); } @Override @@ -294,7 +293,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT @Override public boolean isValidSlot(int aIndex) { - return this.canAccessData() ? this.mInventory.isValidSlot(aIndex) : false; + return this.canAccessData() && this.mInventory.isValidSlot(aIndex); } private final CoverBehavior[] mCoverBehaviors = new CoverBehavior[] { GregTechAPI.sNoBehavior, @@ -305,35 +304,52 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT protected int mAverageEUInputIndex = 0, mAverageEUOutputIndex = 0; protected boolean mReleaseEnergy = false; protected int[] mAverageEUInput = new int[11], mAverageEUOutput = new int[11]; - private boolean[] mActiveEUInputs = new boolean[] { false, false, false, false, false, false }, - mActiveEUOutputs = new boolean[] { false, false, false, false, false, false }; - private byte[] mSidedRedstone = new byte[] { 15, 15, 15, 15, 15, 15 }; - private int[] mCoverSides = new int[] { 0, 0, 0, 0, 0, 0 }, mCoverData = new int[] { 0, 0, 0, 0, 0, 0 }, - mTimeStatistics = new int[GregTechAPI.TICKS_FOR_LAG_AVERAGING]; + private final boolean[] mActiveEUInputs = new boolean[] { false, false, false, false, false, false }; + private final boolean[] mActiveEUOutputs = new boolean[] { false, false, false, false, false, false }; + private final byte[] mSidedRedstone = new byte[] { 15, 15, 15, 15, 15, 15 }; + private final int[] mCoverSides = new int[] { 0, 0, 0, 0, 0, 0 }; + private final int[] mCoverData = new int[] { 0, 0, 0, 0, 0, 0 }; + private final int[] mTimeStatistics = new int[GregTechAPI.TICKS_FOR_LAG_AVERAGING]; private boolean mHasEnoughEnergy = true; protected boolean mRunningThroughTick = false; protected boolean mInputDisabled = false; protected boolean mOutputDisabled = false; - private boolean mMuffler = false; - private boolean mLockUpgrade = false; - private boolean mActive = false; + private final boolean mMuffler = false; + private final boolean mLockUpgrade = false; + private final boolean mActive = false; private boolean mRedstone = false; - private boolean mWorkUpdate = false; - private boolean mSteamConverter = false; + private final boolean mWorkUpdate = false; + private final boolean mSteamConverter = false; private boolean mInventoryChanged = false; - private boolean mWorks = true; - private boolean mNeedsUpdate = true; - private boolean mNeedsBlockUpdate = true; + private final boolean mWorks = true; + private final boolean mNeedsUpdate = true; + private final boolean mNeedsBlockUpdate = true; private boolean mSendClientData = false; - private boolean oRedstone = false; - private boolean mEnergyStateReady = false; - private byte mColor = 0, oColor = 0, mStrongRedstone = 0, oRedstoneData = 63, oTextureData = 0, oUpdateData = 0, - oTexturePage = 0, oLightValueClient = -1, oLightValue = -1, mLightValue = 0, mOtherUpgrades = 0, mFacing = 0, - oFacing = 0, mWorkData = 0; - private int mDisplayErrorCode = 0, oX = 0, oY = 0, oZ = 0, mTimeStatisticsIndex = 0, mLagWarningCount = 0; - private short mID = 0; + private final boolean oRedstone = false; + private final boolean mEnergyStateReady = false; + private final byte mColor = 0; + private final byte oColor = 0; + private byte mStrongRedstone = 0; + private final byte oRedstoneData = 63; + private final byte oTextureData = 0; + private final byte oUpdateData = 0; + private final byte oTexturePage = 0; + private final byte oLightValueClient = -1; + private final byte oLightValue = -1; + private byte mLightValue = 0; + private final byte mOtherUpgrades = 0; + private final byte mFacing = 0; + private final byte oFacing = 0; + private final byte mWorkData = 0; + private final int mDisplayErrorCode = 0; + private final int oX = 0; + private final int oY = 0; + private final int oZ = 0; + private final int mTimeStatisticsIndex = 0; + private final int mLagWarningCount = 0; + private final short mID = 0; protected long mTickTimer = 0; - private long oOutput = 0; + private final long oOutput = 0; private long mAcceptedAmperes = Long.MAX_VALUE; /** @@ -393,8 +409,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT @Override public boolean decreaseStoredEnergyUnits(long aEnergy, boolean aIgnoreTooLessEnergy) { - return !this.canAccessData() ? false - : (this.mHasEnoughEnergy = this.decreaseStoredEU(aEnergy, aIgnoreTooLessEnergy)); + return this.canAccessData() && (this.mHasEnoughEnergy = this.decreaseStoredEU(aEnergy, aIgnoreTooLessEnergy)); } @Override @@ -411,16 +426,14 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT @Override public boolean inputEnergyFrom(ForgeDirection side) { - return side == ForgeDirection.UNKNOWN ? true - : (!this.isServerSide() ? this.isEnergyInputSide(side) - : side != ForgeDirection.UNKNOWN && this.mActiveEUInputs[side.ordinal()] && !this.mReleaseEnergy); + return side == ForgeDirection.UNKNOWN || (!this.isServerSide() ? this.isEnergyInputSide(side) + : side != ForgeDirection.UNKNOWN && this.mActiveEUInputs[side.ordinal()] && !this.mReleaseEnergy); } @Override public boolean outputsEnergyTo(ForgeDirection side) { - return side == ForgeDirection.UNKNOWN ? true - : (!this.isServerSide() ? this.isEnergyOutputSide(side) - : side != ForgeDirection.UNKNOWN && this.mActiveEUOutputs[side.ordinal()] || this.mReleaseEnergy); + return side == ForgeDirection.UNKNOWN || (!this.isServerSide() ? this.isEnergyOutputSide(side) + : side != ForgeDirection.UNKNOWN && this.mActiveEUOutputs[side.ordinal()] || this.mReleaseEnergy); } private boolean isEnergyInputSide(ForgeDirection side) { @@ -482,9 +495,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT } protected final void clearTileEntityBuffer() { - for (int i = 0; i < this.mBufferedTileEntities.length; ++i) { - this.mBufferedTileEntities[i] = null; - } + Arrays.fill(this.mBufferedTileEntities, null); } @Override @@ -755,22 +766,19 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT @Override public final boolean getSky(int aX, int aY, int aZ) { return this.ignoreUnloadedChunks && this.crossedChunkBorder(aX, aZ) && !this.worldObj.blockExists(aX, aY, aZ) - ? true - : this.worldObj.canBlockSeeTheSky(aX, aY, aZ); + || this.worldObj.canBlockSeeTheSky(aX, aY, aZ); } @Override public final boolean getOpacity(int aX, int aY, int aZ) { - return this.ignoreUnloadedChunks && this.crossedChunkBorder(aX, aZ) && !this.worldObj.blockExists(aX, aY, aZ) - ? false - : GTUtility.isOpaqueBlock(this.worldObj, aX, aY, aZ); + return (!this.ignoreUnloadedChunks || !this.crossedChunkBorder(aX, aZ) || this.worldObj.blockExists(aX, aY, aZ)) + && GTUtility.isOpaqueBlock(this.worldObj, aX, aY, aZ); } @Override public final boolean getAir(int aX, int aY, int aZ) { return this.ignoreUnloadedChunks && this.crossedChunkBorder(aX, aZ) && !this.worldObj.blockExists(aX, aY, aZ) - ? true - : GTUtility.isBlockAir(this.worldObj, aX, aY, aZ); + || GTUtility.isBlockAir(this.worldObj, aX, aY, aZ); } @Override diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java index 4b687f63af..8a85234447 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java +++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java @@ -48,9 +48,7 @@ public class TileEntityCircuitProgrammer extends TileEntity implements ISidedInv public final boolean hasCircuitToConfigure() { for (ItemStack i : this.getInventory() .getInventory()) { - if (i == null) { - continue; - } else { + if (i != null) { return true; } } @@ -66,10 +64,7 @@ public class TileEntityCircuitProgrammer extends TileEntity implements ISidedInv .getInventory() .clone(); // Check if there is output in slot. - Boolean hasOutput = false; - if (aInputs[25] != null) { - hasOutput = true; - } + boolean hasOutput = aInputs[25] != null; ArrayList<Integer> aValidSlots = new ArrayList<>(); int aSlotCount = 0; for (ItemStack i : aInputs) { @@ -127,7 +122,6 @@ public class TileEntityCircuitProgrammer extends TileEntity implements ISidedInv } } } - continue; } return false; } @@ -144,7 +138,7 @@ public class TileEntityCircuitProgrammer extends TileEntity implements ISidedInv } this.tickCount++; } - } catch (final Throwable t) {} + } catch (final Throwable ignored) {} } public boolean anyPlayerInRange() { @@ -283,7 +277,7 @@ public class TileEntityCircuitProgrammer extends TileEntity implements ISidedInv @Override public boolean hasCustomInventoryName() { - return (this.customName != null) && !this.customName.equals(""); + return (this.customName != null) && !this.customName.isEmpty(); } @Override diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java index a6754b00b0..dd1ea934f8 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java +++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java @@ -284,7 +284,7 @@ public class TileEntityDecayablesChest extends TileEntity implements ISidedInven @Override public boolean hasCustomInventoryName() { - return (this.customName != null) && !this.customName.equals(""); + return (this.customName != null) && !this.customName.isEmpty(); } /** diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityInfiniteFluid.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityInfiniteFluid.java index fd528c589d..b0d4fb9296 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityInfiniteFluid.java +++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityInfiniteFluid.java @@ -54,17 +54,15 @@ public class TileEntityInfiniteFluid extends TileEntity implements IFluidHandler fluid = null; } - if (this != null) { - FluidEvent.fireEvent( - new FluidEvent.FluidDrainingEvent( - fluid, - this.getWorldObj(), - this.xCoord, - this.yCoord, - this.zCoord, - this.tank, - 0)); - } + FluidEvent.fireEvent( + new FluidEvent.FluidDrainingEvent( + fluid, + this.getWorldObj(), + this.xCoord, + this.yCoord, + this.zCoord, + this.tank, + 0)); } return stack; } @@ -88,8 +86,7 @@ public class TileEntityInfiniteFluid extends TileEntity implements IFluidHandler needsUpdate = true; float amount = tank.getFluidAmount(); float capacity = tank.getCapacity(); - float volume = (amount / capacity) * 0.8F; - return volume; + return (amount / capacity) * 0.8F; } @Override diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java index 14c337c088..1c5a34e2ca 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java @@ -124,7 +124,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide .clone(); // Check if there is output in slot. - Boolean hasOutput = false; + boolean hasOutput = false; if (aInputs[ContainerVolumetricFlaskSetter.SLOT_OUTPUT] != null) { hasOutput = true; if (aInputs[ContainerVolumetricFlaskSetter.SLOT_OUTPUT].stackSize >= 16) { @@ -220,7 +220,6 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide } } } - continue; } return false; } @@ -378,7 +377,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide @Override public boolean hasCustomInventoryName() { - return (this.customName != null) && !this.customName.equals(""); + return (this.customName != null) && !this.customName.isEmpty(); } @Override diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java index 6f0d5fcea2..83a56ff287 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java +++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java @@ -93,7 +93,7 @@ public class TileEntityAdvPooCollector extends TileEntityBaseFluidCollector { } else if (aPooMaker instanceof EntitySheep) { aPooAmount = MathUtils.randInt(8, 30); } else { - if (aPooMaker instanceof EntityAnimal || aPooMaker instanceof IAnimals) { + if (aPooMaker instanceof IAnimals) { aPooAmount = MathUtils.randInt(5, 35); } else if (aPooMaker instanceof EntityVillager) { aPooAmount = MathUtils.randInt(25, 30); diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java index 988268f6e9..cf6ad5b663 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java +++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java @@ -73,17 +73,15 @@ public abstract class TileEntityBaseFluidCollector extends TileEntityBase implem fluid = null; } - if (this != null) { - FluidEvent.fireEvent( - new FluidEvent.FluidDrainingEvent( - fluid, - this.getWorldObj(), - this.xCoord, - this.yCoord, - this.zCoord, - this.tank, - 0)); - } + FluidEvent.fireEvent( + new FluidEvent.FluidDrainingEvent( + fluid, + this.getWorldObj(), + this.xCoord, + this.yCoord, + this.zCoord, + this.tank, + 0)); } return stack; } diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java index 08ceed597d..71a4db157a 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java +++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java @@ -336,9 +336,7 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory, .getInventory()[0].stackSize < 64) { int diff = 64 - this.getInventory() .getInventory()[0].stackSize; - if (aStack.stackSize <= diff) { - return true; - } + return aStack.stackSize <= diff; } } return false; @@ -346,12 +344,8 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory, @Override public boolean canExtractItem(final int aSlot, final ItemStack aStack, final int p_102008_3_) { - if (this.getInventory() - .getInventory()[1] == null) { - return false; - } else { - return true; - } + return this.getInventory() + .getInventory()[1] != null; } public String getCustomName() { @@ -369,7 +363,7 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory, @Override public boolean hasCustomInventoryName() { - return (this.mCustomName != null) && !this.mCustomName.equals(""); + return (this.mCustomName != null) && !this.mCustomName.isEmpty(); } @Override @@ -404,17 +398,15 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory, fluid = null; } - if (this != null) { - FluidEvent.fireEvent( - new FluidEvent.FluidDrainingEvent( - fluid, - this.getWorldObj(), - this.xCoord, - this.yCoord, - this.zCoord, - this.mTank, - 0)); - } + FluidEvent.fireEvent( + new FluidEvent.FluidDrainingEvent( + fluid, + this.getWorldObj(), + this.xCoord, + this.yCoord, + this.zCoord, + this.mTank, + 0)); } updateTileEntity(); return stack; @@ -451,10 +443,7 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory, } public boolean hasFluidSpace() { - if (this.mTank.getFluidAmount() <= 1000) { - return true; - } - return false; + return this.mTank.getFluidAmount() <= 1000; } public boolean drainCell() { @@ -464,7 +453,7 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory, return false; } aInput = aInput.copy(); - if (aInput != null && (this.getStackInSlot(1) == null || this.getStackInSlot(1).stackSize < 64)) { + if (this.getStackInSlot(1) == null || this.getStackInSlot(1).stackSize < 64) { ArrayList<ItemStack> t1Cells = OreDictionary.getOres("cellFormaldehyde"); ArrayList<ItemStack> t2Cells = OreDictionary.getOres("cellHydrogenCyanide"); didFill = addFluid(t1Cells, aInput, FluidUtils.getWildcardFluidStack("formaldehyde", 1000)); @@ -496,11 +485,8 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory, if (GTUtility.areStacksEqual(a, aInput)) { if (mTank.getFluid() == null || mTank.getFluid() .isFluidEqual(aFluidForInput)) { - boolean didFill = fill(ForgeDirection.UNKNOWN, aFluidForInput, true) > 0; - return didFill; + return fill(ForgeDirection.UNKNOWN, aFluidForInput, true) > 0; } - } else { - continue; } } return false; diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java index 90864d1878..ba7433bfd2 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java +++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java @@ -95,7 +95,7 @@ public class TileEntityPooCollector extends TileEntityBaseFluidCollector { } else if (aPooMaker instanceof EntitySheep) { aPooAmount = MathUtils.randInt(8, 30); } else { - if (aPooMaker instanceof EntityAnimal || aPooMaker instanceof IAnimals) { + if (aPooMaker instanceof IAnimals) { aPooAmount = MathUtils.randInt(5, 35); } else { aPooAmount = MathUtils.randInt(1, 10); diff --git a/src/main/java/gtPlusPlus/core/util/Utils.java b/src/main/java/gtPlusPlus/core/util/Utils.java index fb05c6aa10..ee8ff5817a 100644 --- a/src/main/java/gtPlusPlus/core/util/Utils.java +++ b/src/main/java/gtPlusPlus/core/util/Utils.java @@ -193,7 +193,7 @@ public class Utils { .substring(1) .toUpperCase()); Logger.WARNING( - "" + Integer.toHexString(0x1000000 | i) + Integer.toHexString(0x1000000 | i) .substring(1) .toUpperCase()); } diff --git a/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java b/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java index d5ab990917..f0df1cb2b9 100644 --- a/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java +++ b/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java @@ -11,26 +11,26 @@ public class ArrayUtils { public static <V> V[] insertElementAtIndex(V[] aArray, int aIndex, V aObjectToInsert) { V[] newArray = Arrays.copyOf(aArray, aArray.length + 1); - for (int i = 0; i < aIndex; i++) { - newArray[i] = aArray[i]; + if (aIndex >= 0) { + System.arraycopy(aArray, 0, newArray, 0, aIndex); } newArray[aIndex] = aObjectToInsert; - for (int i = (aIndex + 1); i < newArray.length; i++) { - newArray[i] = aArray[i - 1]; + if (newArray.length - (aIndex + 1) >= 0) { + System.arraycopy(aArray, aIndex + 1 - 1, newArray, aIndex + 1, newArray.length - (aIndex + 1)); } return newArray; } public static Object[] removeNulls(final Object[] v) { List<Object> list = new ArrayList<>(Arrays.asList(v)); - list.removeAll(Collections.singleton((Object) null)); - return list.toArray(new Object[list.size()]); + list.removeAll(Collections.singleton(null)); + return list.toArray(new Object[0]); } public static ItemStack[] removeNulls(final ItemStack[] v) { List<ItemStack> list = new ArrayList<>(Arrays.asList(v)); list.removeAll(Collections.singleton((ItemStack) null)); - return list.toArray(new ItemStack[list.size()]); + return list.toArray(new ItemStack[0]); } public static String toString(Object[] aArray, String string) { diff --git a/src/main/java/gtPlusPlus/core/util/data/FileUtils.java b/src/main/java/gtPlusPlus/core/util/data/FileUtils.java index b2e5d04375..7b720e1145 100644 --- a/src/main/java/gtPlusPlus/core/util/data/FileUtils.java +++ b/src/main/java/gtPlusPlus/core/util/data/FileUtils.java @@ -19,10 +19,7 @@ public class FileUtils { private static final Charset utf8 = StandardCharsets.UTF_8; public static boolean doesFileExist(File f) { - if (f != null && f.exists() && !f.isDirectory()) { - return true; - } - return false; + return f != null && f.exists() && !f.isDirectory(); } public static File createFile(String path, String filename, String extension) { diff --git a/src/main/java/gtPlusPlus/core/util/data/StringUtils.java b/src/main/java/gtPlusPlus/core/util/data/StringUtils.java index c2a923bb75..b19f6c45fe 100644 --- a/src/main/java/gtPlusPlus/core/util/data/StringUtils.java +++ b/src/main/java/gtPlusPlus/core/util/data/StringUtils.java @@ -75,10 +75,9 @@ public class StringUtils { return true; } else if (s.contains(StringUtils.subscript("8"))) { return true; - } else if (s.contains(StringUtils.subscript("9"))) { - return true; + } else { + return s.contains(StringUtils.subscript("9")); } - return false; } public static String firstLetterCaps(String data) { @@ -138,6 +137,7 @@ public class StringUtils { for (int o = 0; o < aInput.length(); o++) { if (isSpecialCharacter(aInput.charAt(o))) { isSpecial = true; + break; } } if (isSpecial) { diff --git a/src/main/java/gtPlusPlus/core/util/math/MathUtils.java b/src/main/java/gtPlusPlus/core/util/math/MathUtils.java index 05e238b098..ba2ad0ca41 100644 --- a/src/main/java/gtPlusPlus/core/util/math/MathUtils.java +++ b/src/main/java/gtPlusPlus/core/util/math/MathUtils.java @@ -184,10 +184,7 @@ public class MathUtils { * @return boolean Whether or not it divides evenly. */ public static boolean isNumberEven(final long x) { - if ((x % 2) == 0) { - return true; - } - return false; + return x % 2 == 0; } /** @@ -211,7 +208,7 @@ public class MathUtils { final int randomInt = randInt(1, 5); final Map<Integer, String> colours = Utils.hexColourGeneratorRandom(5); - if ((colours.get(randomInt) != null) && (colours.size() > 0)) { + if ((colours.get(randomInt) != null) && (!colours.isEmpty())) { temp = colours.get(randomInt); } else { temp = "0F0F0F"; @@ -256,8 +253,7 @@ public class MathUtils { } public static int getRgbAsHex(final short[] RGBA) { - final int returnValue = Utils.rgbtoHexValue(RGBA[0], RGBA[1], RGBA[2]); - return (returnValue == 0) ? 0 : returnValue; + return Utils.rgbtoHexValue(RGBA[0], RGBA[1], RGBA[2]); } public static byte safeByte(long number) { @@ -336,8 +332,7 @@ public class MathUtils { for (byte i : aDataSet) { total += i; } - byte result = safeByte(total / divisor); - return result; + return safeByte(total / divisor); } public static short getShortAverage(short[] aDataSet) { @@ -365,8 +360,7 @@ public class MathUtils { for (int i : aDataSet) { total += i; } - int result = safeInt(total / divisor); - return result; + return safeInt(total / divisor); } public static long getLongAverage(long[] aDataSet) { @@ -454,31 +448,26 @@ public class MathUtils { } public static byte getSafeByte(Byte b) { - Byte a = safeCast(b); - return a; + return safeCast(b); } public static short getSafeShort(Short b) { - Short a = safeCast(b); - return a; + return safeCast(b); } public static int getSafeInt(Integer b) { - Integer a = safeCast(b); - return a; + return safeCast(b); } public static long getSafeLong(Long b) { - Long a = safeCast(b); - return a; + return safeCast(b); } public static int safeCast_LongToInt(long o) { if (o > Integer.MAX_VALUE) { return Integer.MAX_VALUE; } else { - int i = (int) o; - return i; + return (int) o; } } diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java index 95ba020887..8897682942 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java @@ -31,7 +31,7 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; public class FluidUtils { - private static HashMap<String, Fluid> sFluidCache = new HashMap<>(); + private static final HashMap<String, Fluid> sFluidCache = new HashMap<>(); public static FluidStack getWater(final int amount) { return FluidUtils.getFluidStack("water", amount); @@ -506,7 +506,7 @@ public class FluidUtils { aGenerateCell); } - public static final Fluid generateFluidNonMolten(final String unlocalizedName, final String localizedName, + public static Fluid generateFluidNonMolten(final String unlocalizedName, final String localizedName, final int MeltingPoint, final short[] RGBA, ItemStack dustStack, final ItemStack dustStack2, final int amountPerItem, final boolean aGenerateCell) { if (dustStack == null) { @@ -637,10 +637,7 @@ public class FluidUtils { if (aFStack5 != null) { return aFStack5; } - if (aFStack6 != null) { - return aFStack6; - } - return null; + return aFStack6; } public static FluidStack getWildcardFluidStack(Materials aMaterial, int amount) { @@ -654,11 +651,7 @@ public class FluidUtils { return aFStack2; } else if (aFStack3 != null) { return aFStack3; - } else if (aFStack4 != null) { - return aFStack4; - } else { - return null; - } + } else return aFStack4; } public static FluidStack getAir(int aAmount) { diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/InventoryUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/InventoryUtils.java index c8a7ed26da..b690c35199 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/InventoryUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/InventoryUtils.java @@ -17,8 +17,7 @@ public class InventoryUtils { public static void dropInventoryItems(World world, int x, int y, int z, Block block) { TileEntity tileentity = world.getTileEntity(x, y, z); - if (tileentity != null && tileentity instanceof IInventory aTileInv - && ((IInventory) tileentity).getSizeInventory() > 0) { + if (tileentity instanceof IInventory aTileInv && ((IInventory) tileentity).getSizeInventory() > 0) { int aMinSlot = 0; int aMaxSlot = aTileInv.getSizeInventory() - 1; diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java index 7b66ffefa1..5b2065558d 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java @@ -103,25 +103,16 @@ public class ItemUtils { if (ItemList.Cell_Empty.hasBeenSet()) { return ItemList.Cell_Empty.get(i); } - final ItemStack temp = GTModHandler.getModItem(IndustrialCraft2.ID, "itemCellEmpty", i, 0); - return temp != null ? temp : null; + return GTModHandler.getModItem(IndustrialCraft2.ID, "itemCellEmpty", i, 0); } public static void getItemForOreDict(final String FQRN, final String oreDictName, final String itemName, final int meta) { try { - Item em = null; final Item em1 = getItemFromFQRN(FQRN); - if (em1 != null) { - em = em1; - } - - if (em != null) { - - final ItemStack metaStack = new ItemStack(em, 1, meta); + final ItemStack metaStack = new ItemStack(em1, 1, meta); GTOreDictUnificator.registerOre(oreDictName, metaStack); - } } catch (final NullPointerException e) { Logger.ERROR(itemName + " not found. [NULL]"); @@ -147,17 +138,9 @@ public class ItemUtils { final int meta, final int itemstackSize) { if (MOD) { try { - Item em = null; final Item em1 = getItemFromFQRN(FQRN); - if (em1 != null) { - if (null == em) { - em = em1; - } - if (em != null) { - final ItemStack metaStack = new ItemStack(em, itemstackSize, meta); - return metaStack; - } + return new ItemStack(em1, itemstackSize, meta); } return null; } catch (final NullPointerException e) { @@ -170,17 +153,9 @@ public class ItemUtils { public static ItemStack simpleMetaStack(final String FQRN, final int meta, final int itemstackSize) { try { - Item em = null; final Item em1 = getItemFromFQRN(FQRN); - // Utils.LOG_WARNING("Found: "+em1.getUnlocalizedName()+":"+meta); if (em1 != null) { - if (null == em) { - em = em1; - } - if (em != null) { - final ItemStack metaStack = new ItemStack(em, itemstackSize, meta); - return metaStack; - } + return new ItemStack(em1, itemstackSize, meta); } return null; } catch (final NullPointerException e) { @@ -249,7 +224,7 @@ public class ItemUtils { if (fqrnSplit.length == 2) { Logger.INFO("Mod: " + fqrnSplit[0] + ", Item: " + fqrnSplit[1]); return GameRegistry.findItemStack(fqrnSplit[0], fqrnSplit[1], Size); - } else if (fqrnSplit.length == 3 && fqrnSplit[2] != null && fqrnSplit[2].length() > 0) { + } else if (fqrnSplit.length == 3 && fqrnSplit[2] != null && !fqrnSplit[2].isEmpty()) { Logger.INFO("Mod: " + fqrnSplit[0] + ", Item: " + fqrnSplit[1] + ", Meta: " + fqrnSplit[2]); ItemStack aStack = GameRegistry.findItemStack(fqrnSplit[0], fqrnSplit[1], Size); int aMeta = Integer.parseInt(fqrnSplit[2]); @@ -282,8 +257,7 @@ public class ItemUtils { } if (oredictName.contains("rod")) { - String s = "stick" + oredictName.substring(3); - oredictName = s; + oredictName = "stick" + oredictName.substring(3); } // Banned Materials and replacements for GT5.8 compat. @@ -471,9 +445,9 @@ public class ItemUtils { final String unlocalizedName = Utils.sanitizeString(materialName); final int Colour = material.getRgbAsHex(); final String aChemForm = material.vChemicalFormula; - final boolean isChemFormvalid = (aChemForm != null && aChemForm.length() > 0); + final boolean isChemFormvalid = (aChemForm != null && !aChemForm.isEmpty()); Item[] output = null; - if (onlyLargeDust == false) { + if (!onlyLargeDust) { output = new Item[] { new BaseItemDustUnique( "itemDust" + unlocalizedName, @@ -514,10 +488,7 @@ public class ItemUtils { .contains("thorium")) { sRadiation = 1; } - if (sRadiation >= 1) { - return true; - } - return false; + return sRadiation >= 1; } public static int getRadioactivityLevel(final String materialName) { @@ -576,14 +547,14 @@ public class ItemUtils { final GameRegistry.UniqueIdentifier id = GameRegistry.findUniqueIdentifierFor(item); if (id != null) { final String modname = (id.modId == null ? id.name : id.modId); - value = ((id == null) || id.modId.equals("")) ? Minecraft.ID : modname; + value = ((id == null) || id.modId.isEmpty()) ? Minecraft.ID : modname; } } catch (final Throwable t) { try { final UniqueIdentifier t2 = GameRegistry.findUniqueIdentifierFor(Block.getBlockFromItem(item)); if (t2 != null) { final String modname = (t2.modId == null ? t2.name : t2.modId); - value = ((t2 == null) || t2.modId.equals("")) ? Minecraft.ID : modname; + value = ((t2 == null) || t2.modId.isEmpty()) ? Minecraft.ID : modname; } } catch (final Throwable t3) { t3.printStackTrace(); @@ -640,11 +611,7 @@ public class ItemUtils { String mName = Utils.sanitizeString(mMat.getLocalizedName()); String mItemName = mPrefix.name() + mName; - ItemStack gregstack = ItemUtils.getItemStackOfAmountFromOreDictNoBroken(mItemName, mAmount); - if (gregstack == null) { - return null; - } - return (gregstack); + return ItemUtils.getItemStackOfAmountFromOreDictNoBroken(mItemName, mAmount); } public static ItemStack getOrePrefixStack(OrePrefixes mPrefix, Materials mMat, int mAmount) { @@ -710,46 +677,34 @@ public class ItemUtils { return false; } - if (mInputs.length > 0) { - for (ItemStack stack : mInputs) { - if (stack != null) { - if (stack.getItem() != null) { - if (stack.getItem() == ModItems.AAA_Broken || stack.getItem() - .getClass() == ModItems.AAA_Broken.getClass()) { + for (ItemStack stack : mInputs) { + if (stack != null) { + if (stack.getItem() != null) { + if (stack.getItem() == ModItems.AAA_Broken || stack.getItem() + .getClass() == ModItems.AAA_Broken.getClass()) { + return false; + } else if (stack.getItem() == ModItems.ZZZ_Empty || stack.getItem() + .getClass() == ModItems.ZZZ_Empty.getClass()) { return false; - } else if (stack.getItem() == ModItems.ZZZ_Empty || stack.getItem() - .getClass() == ModItems.ZZZ_Empty.getClass()) { - return false; - } else { - continue; - } - } else { - continue; - } - } else { - return false; + } } + } else { + return false; } } - if (mOutputs.length > 0) { - for (ItemStack stack : mOutputs) { - if (stack != null) { - if (stack.getItem() != null) { - if (stack.getItem() == ModItems.AAA_Broken || stack.getItem() - .getClass() == ModItems.AAA_Broken.getClass()) { + for (ItemStack stack : mOutputs) { + if (stack != null) { + if (stack.getItem() != null) { + if (stack.getItem() == ModItems.AAA_Broken || stack.getItem() + .getClass() == ModItems.AAA_Broken.getClass()) { + return false; + } else if (stack.getItem() == ModItems.ZZZ_Empty || stack.getItem() + .getClass() == ModItems.ZZZ_Empty.getClass()) { return false; - } else if (stack.getItem() == ModItems.ZZZ_Empty || stack.getItem() - .getClass() == ModItems.ZZZ_Empty.getClass()) { - return false; - } else { - continue; - } - } else { - continue; - } - } else { - return false; + } } + } else { + return false; } } @@ -763,16 +718,23 @@ public class ItemUtils { } // ItemStack[] g = organiseInventory(p); - IInventory aTemp = aInputInventory; for (int i = 0; i < p.length; ++i) { for (int j = i + 1; j < p.length; ++j) { if (p[j] != null && (p[i] == null || GTUtility.areStacksEqual(p[i], p[j]))) { - GTUtility.moveStackFromSlotAToSlotB(aTemp, aTemp, j, i, (byte) 64, (byte) 1, (byte) 64, (byte) 1); + GTUtility.moveStackFromSlotAToSlotB( + aInputInventory, + aInputInventory, + j, + i, + (byte) 64, + (byte) 1, + (byte) 64, + (byte) 1); } } } - return aTemp; + return aInputInventory; } public static String getFluidName(FluidStack aFluid) { @@ -786,7 +748,7 @@ public class ItemUtils { } String aDisplay = null; try { - aDisplay = ("" + StatCollector.translateToLocal( + aDisplay = (StatCollector.translateToLocal( aStack.getItem() .getUnlocalizedNameInefficiently(aStack) + ".name")).trim(); if (aStack.hasTagCompound()) { @@ -834,21 +796,15 @@ public class ItemUtils { final Item mItem = aStack.getItem(); final Item aSkookum = ItemUtils.getItemFromFQRN("miscutils:gt.plusplus.metatool.01"); final Class aSkookClass = aSkookum.getClass(); - if (aSkookClass.isInstance(mItem) || mItem instanceof MetaGeneratedTool01 + return aSkookClass.isInstance(mItem) || mItem instanceof MetaGeneratedTool01 || mItem instanceof MetaGeneratedGregtechTools || mItem instanceof GTMetaTool - || mItem == aSkookum) { - return true; - } - return false; + || mItem == aSkookum; } public static boolean isToolScrewdriver(ItemStack aScrewdriver) { - if (isItemGregtechTool(aScrewdriver) - && (aScrewdriver.getItemDamage() == 22 || aScrewdriver.getItemDamage() == 150)) { - return true; - } - return false; + return isItemGregtechTool(aScrewdriver) + && (aScrewdriver.getItemDamage() == 22 || aScrewdriver.getItemDamage() == 150); } public static ItemStack[] cleanItemStackArray(ItemStack[] input) { @@ -900,14 +856,12 @@ public class ItemUtils { public static boolean isControlCircuit(ItemStack aStack) { if (aStack != null) { Item aItem = aStack.getItem(); - if (aItem == CI.getNumberedBioCircuit(0) + return aItem == CI.getNumberedBioCircuit(0) .getItem() || aItem == GTUtility.getIntegratedCircuit(0) .getItem() || aItem == CI.getNumberedAdvancedCircuit(0) - .getItem()) { - return true; - } + .getItem(); } return false; } @@ -997,20 +951,13 @@ public class ItemUtils { if (GTUtility.areStacksEqual(aStack, GenericChem.mSynchrotronCapableCatalyst, true)) { return true; } - if (GTUtility.areStacksEqual(aStack, GenericChem.mAlgagenicGrowthPromoterCatalyst, true)) { - return true; - } - - return false; + return GTUtility.areStacksEqual(aStack, GenericChem.mAlgagenicGrowthPromoterCatalyst, true); } public static boolean isMillingBall(ItemStack aStack) { if (GTUtility.areStacksEqual(aStack, GenericChem.mMillingBallAlumina, true)) { return true; } - if (GTUtility.areStacksEqual(aStack, GenericChem.mMillingBallSoapstone, true)) { - return true; - } - return false; + return GTUtility.areStacksEqual(aStack, GenericChem.mMillingBallSoapstone, true); } } diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java index 5e75cc2050..33d68711a2 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java @@ -196,10 +196,7 @@ public class MaterialUtils { } public static boolean hasValidRGBA(final short[] rgba) { - if (rgba == null || rgba.length < 3 || rgba.length > 4) { - return false; - } - return true; + return rgba != null && rgba.length >= 3 && rgba.length <= 4; } public static int getTierOfMaterial(final double aMeltingPoint) { diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java index bff2a25386..51be886acd 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java @@ -24,7 +24,7 @@ public class NBTUtils { public static ItemStack[] readItemsFromNBT(ItemStack itemstack) { NBTTagCompound tNBT = getNBT(itemstack); final NBTTagList list = tNBT.getTagList("Items", 10); - ItemStack inventory[] = new ItemStack[list.tagCount()]; + ItemStack[] inventory = new ItemStack[list.tagCount()]; for (int i = 0; i < list.tagCount(); i++) { final NBTTagCompound data = list.getCompoundTagAt(i); final int slot = data.getInteger("Slot"); @@ -125,10 +125,7 @@ public class NBTUtils { public static boolean hasKey(ItemStack stack, String key) { final NBTTagCompound itemData = getNBT(stack); - if (itemData.hasKey(key)) { - return true; - } - return false; + return itemData.hasKey(key); } public static boolean createIntegerTagCompound(ItemStack rStack, String tagName, String keyName, int keyValue) { @@ -144,9 +141,7 @@ public class NBTUtils { NBTTagCompound aNBT = getNBT(aStack); if (aNBT != null && hasKey(aStack, tagName)) { aNBT = aNBT.getCompoundTag(tagName); - if (aNBT != null) { - return aNBT; - } + return aNBT; } return null; } diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java index 6f50da5eb2..5f639f3739 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java @@ -29,9 +29,8 @@ public class PlayerUtils { .getClass("thaumcraft.common.lib.FakeThaumcraftPlayer"); public static List<EntityPlayerMP> getOnlinePlayers() { - final List<EntityPlayerMP> onlinePlayers = MinecraftServer.getServer() + return MinecraftServer.getServer() .getConfigurationManager().playerEntityList; - return onlinePlayers; } public static void messagePlayer(final EntityPlayer P, final String S) { diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java index 792119d1bc..7f70230070 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java @@ -134,7 +134,6 @@ public class RecipeUtils { if ((is != null) && (is.getItem() == I)) { items.remove(); Logger.RECIPE("Remove a recipe with " + I.getUnlocalizedName() + " as output."); - continue; } } Logger.RECIPE("All recipes should be gone?"); @@ -195,10 +194,7 @@ public class RecipeUtils { return false; } // let gregtech handle shapeless recipes. - if (GTModHandler.addShapelessCraftingRecipe(OutputItem, inputItems)) { - return true; - } - return false; + return GTModHandler.addShapelessCraftingRecipe(OutputItem, inputItems); } public static boolean generateMortarRecipe(ItemStack aStack, ItemStack aOutput) { @@ -254,12 +250,8 @@ public class RecipeUtils { Logger.RECIPE("Using " + validCounter + " valid inputs and " + invalidCounter + " invalid inputs."); ShapedRecipe r = new ShapedRecipe(aFiltered, mOutput); - if (r != null && r.mRecipe != null) { - isValid = true; - } else { - isValid = false; - } - mRecipe = r != null ? r.mRecipe : null; + isValid = r.mRecipe != null; + mRecipe = r.mRecipe; } @Override @@ -298,7 +290,7 @@ public class RecipeUtils { int tList_sS = tList.size(); for (int i = 0; i < tList_sS; ++i) { - IRecipe tRecipe = (IRecipe) tList.get(i); + IRecipe tRecipe = tList.get(i); if (!aNotRemoveShapelessRecipes || !(tRecipe instanceof ShapelessRecipes) && !(tRecipe instanceof ShapelessOreRecipe)) { if (aOnlyRemoveNativeHandlers) { @@ -341,7 +333,7 @@ public class RecipeUtils { private static boolean addShapedRecipe(Object[] Inputs, ItemStack aOutputStack) { Object[] Slots = new Object[9]; - String aFullString = ""; + StringBuilder aFullString = new StringBuilder(); String aFullStringExpanded = "abcdefghi"; for (int i = 0; i < 9; i++) { @@ -349,23 +341,23 @@ public class RecipeUtils { if (o instanceof ItemStack) { Slots[i] = ItemUtils.getSimpleStack((ItemStack) o, 1); - aFullString += aFullStringExpanded.charAt(i); + aFullString.append(aFullStringExpanded.charAt(i)); } else if (o instanceof Item) { Slots[i] = ItemUtils.getSimpleStack((Item) o, 1); - aFullString += aFullStringExpanded.charAt(i); + aFullString.append(aFullStringExpanded.charAt(i)); } else if (o instanceof Block) { Slots[i] = ItemUtils.getSimpleStack((Block) o, 1); - aFullString += aFullStringExpanded.charAt(i); + aFullString.append(aFullStringExpanded.charAt(i)); } else if (o instanceof String) { Slots[i] = o; - aFullString += aFullStringExpanded.charAt(i); + aFullString.append(aFullStringExpanded.charAt(i)); } else if (o instanceof ItemData aData) { ItemStack aStackFromGT = ItemUtils.getOrePrefixStack(aData.mPrefix, aData.mMaterial.mMaterial, 1); Slots[i] = aStackFromGT; - aFullString += aFullStringExpanded.charAt(i); + aFullString.append(aFullStringExpanded.charAt(i)); } else if (o == null) { Slots[i] = null; - aFullString += " "; + aFullString.append(" "); } else { Slots[i] = null; Logger.INFO( @@ -380,9 +372,9 @@ public class RecipeUtils { String aRow1 = aFullString.substring(0, 3); String aRow2 = aFullString.substring(3, 6); String aRow3 = aFullString.substring(6, 9); - Logger.RECIPE("" + aRow1); - Logger.RECIPE("" + aRow2); - Logger.RECIPE("" + aRow3); + Logger.RECIPE(aRow1); + Logger.RECIPE(aRow2); + Logger.RECIPE(aRow3); String[] aStringData = new String[] { aRow1, aRow2, aRow3 }; Object[] aDataObject = new Object[19]; @@ -436,11 +428,7 @@ public class RecipeUtils { public InternalRecipeObject2(ShapedOreRecipe aRecipe) { mRecipe = aRecipe; mOutput = aRecipe.getRecipeOutput(); - if (mOutput != null) { - this.isValid = true; - } else { - this.isValid = false; - } + this.isValid = mOutput != null; } @Override diff --git a/src/main/java/gtPlusPlus/core/util/recipe/RecipeHashStrat.java b/src/main/java/gtPlusPlus/core/util/recipe/RecipeHashStrat.java index 1a730c9cbf..80dd932983 100644 --- a/src/main/java/gtPlusPlus/core/util/recipe/RecipeHashStrat.java +++ b/src/main/java/gtPlusPlus/core/util/recipe/RecipeHashStrat.java @@ -58,10 +58,7 @@ public class RecipeHashStrat { if (!areFluidStackArraysEqual(recipe1.mFluidInputs, recipe2.mFluidInputs)) { return false; } - if (!areFluidStackArraysEqual(recipe1.mFluidOutputs, recipe2.mFluidOutputs)) { - return false; - } - return true; + return areFluidStackArraysEqual(recipe1.mFluidOutputs, recipe2.mFluidOutputs); } diff --git a/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java index 5dd9f9f426..6bd0ad638d 100644 --- a/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java +++ b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java @@ -107,26 +107,21 @@ public class ReflectionUtils { public static boolean setField(final Object object, final Field field, final Object fieldValue) { if (field == null) return false; - Class<?> clazz; + final Class<?> clazz; if (object instanceof Class) { clazz = (Class<?>) object; } else { clazz = object.getClass(); } - while (clazz != null) { - try { - final Field field2 = getField(clazz, field.getName()); - if (field2 != null) { - setFieldValue_Internal(object, field, fieldValue); - return true; - } - } catch (final NoSuchFieldException e) { - Logger.REFLECTION("setField(" + object + ", " + field.getName() + ") failed."); - clazz = clazz.getSuperclass(); - } catch (final Exception e) { - Logger.REFLECTION("setField(" + object + ", " + field.getName() + ") failed."); - throw new IllegalStateException(e); + try { + final Field field2 = getField(clazz, field.getName()); + if (field2 != null) { + setFieldValue_Internal(object, field, fieldValue); + return true; } + } catch (final Exception e) { + Logger.REFLECTION("setField(" + object + ", " + field.getName() + ") failed."); + throw new IllegalStateException(e); } return false; } @@ -161,7 +156,7 @@ public class ReflectionUtils { * * Set the value of a field reflectively. */ - private static void setFieldValue_Internal(Object owner, Field field, Object value) throws Exception { + private static void setFieldValue_Internal(Object owner, Field field, Object value) { cacheAccessor(field).setValue(owner, value); } diff --git a/src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java b/src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java index 016dfc8c58..38ada55c2e 100644 --- a/src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java +++ b/src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java @@ -48,7 +48,6 @@ public class MiningExplosion extends Explosion { /** * Does the first part of the explosion (destroy blocks) */ - @SuppressWarnings("unchecked") @Override public void doExplosionA() { final float f = this.explosionSize; diff --git a/src/main/java/gtPlusPlus/everglades/biome/BiomeEverglades.java b/src/main/java/gtPlusPlus/everglades/biome/BiomeEverglades.java index 74fb6c8d54..72732249b0 100644 --- a/src/main/java/gtPlusPlus/everglades/biome/BiomeEverglades.java +++ b/src/main/java/gtPlusPlus/everglades/biome/BiomeEverglades.java @@ -36,7 +36,6 @@ public class BiomeEverglades { static class BiomeGenEverglades extends BiomeGenBase { - @SuppressWarnings("unchecked") public BiomeGenEverglades() { super(Configuration.worldgen.EVERGLADESBIOME_ID); this.theBiomeDecorator = new CustomBiomeGenerator(); @@ -73,7 +72,7 @@ public class BiomeEverglades { return 0xF67A14; } - @SuppressWarnings({ "unchecked", "unused" }) + @SuppressWarnings({ "unused" }) private boolean addToMonsterSpawnLists(Class<? extends EntityLiving> EntityClass, int a, int b, int c) { this.spawnableCaveCreatureList.add(new SpawnListEntry(EntityClass, a, b, c)); return true; diff --git a/src/main/java/gtPlusPlus/everglades/biome/CustomBiomeGenerator.java b/src/main/java/gtPlusPlus/everglades/biome/CustomBiomeGenerator.java index 4df290b560..18d7151324 100644 --- a/src/main/java/gtPlusPlus/everglades/biome/CustomBiomeGenerator.java +++ b/src/main/java/gtPlusPlus/everglades/biome/CustomBiomeGenerator.java @@ -212,9 +212,7 @@ public class CustomBiomeGenerator extends BiomeDecorator { l = this.chunk_Z + this.randomGenerator.nextInt(16) + 8; for (i1 = nextInt(this.currentWorld.getHeightValue(k, l) * 2); i1 > 0 - && this.currentWorld.isAirBlock(k, i1 - 1, l); --i1) { - ; - } + && this.currentWorld.isAirBlock(k, i1 - 1, l); --i1) {} this.waterlilyGen.generate(this.currentWorld, this.randomGenerator, k, i1, l); } diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java b/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java index 16ad852e75..5afc3dc569 100644 --- a/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java @@ -185,9 +185,8 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti int x = pos.xPos, y = pos.yPos, z = pos.zPos; Logger.INFO("Trigger"); int blockCount = 0; - BlockPos portal = pos; - World par1World = portal.world; - for (BlockPos side : portal.getSurroundingBlocks()) { + World par1World = pos.world; + for (BlockPos side : pos.getSurroundingBlocks()) { Block b = side.getBlockAtPos(); if (b == DimensionEverglades.blockPortalFrame || b == DimensionEverglades.portalBlock) { blockCount++; @@ -195,7 +194,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti } if (blockCount < 4) { par1World.setBlockToAir(x, y, z); - par1World.scheduleBlockUpdate(x, y, z, portal.getBlockAtPos(), 0); + par1World.scheduleBlockUpdate(x, y, z, pos.getBlockAtPos(), 0); } byte b0 = 0; @@ -205,16 +204,12 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti b1 = 0; } int i1; - for (i1 = y; par1World.getBlock(x, i1 - 1, z) == this; --i1) { - ; - } + for (i1 = y; par1World.getBlock(x, i1 - 1, z) == this; --i1) {} if (par1World.getBlock(x, i1 - 1, z) != DimensionEverglades.blockPortalFrame) { par1World.setBlockToAir(x, y, z); } else { int j1; - for (j1 = 1; j1 < 4 && par1World.getBlock(x, i1 + j1, z) == this; ++j1) { - ; - } + for (j1 = 1; j1 < 4 && par1World.getBlock(x, i1 + j1, z) == this; ++j1) {} if (j1 == 3 && par1World.getBlock(x, i1 + j1, z) == DimensionEverglades.blockPortalFrame) { boolean flag = par1World.getBlock(x - 1, y, z) == this || par1World.getBlock(x + 1, y, z) == this; boolean flag1 = par1World.getBlock(x, y, z - 1) == this || par1World.getBlock(x, y, z + 1) == this; @@ -266,8 +261,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti && par1IBlockAccess.getBlock(par2, par3, par4 + 2) != this; boolean flag4 = flag || flag1; boolean flag5 = flag2 || flag3; - return flag4 && par5 == 4 ? true - : (flag4 && par5 == 5 ? true : (flag5 && par5 == 2 ? true : flag5 && par5 == 3)); + return flag4 && par5 == 4 || (flag4 && par5 == 5 || (flag5 && par5 == 2 || flag5 && par5 == 3)); } } diff --git a/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java b/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java index f49046cd2b..409e3f150a 100644 --- a/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java +++ b/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java @@ -36,7 +36,7 @@ import gtPlusPlus.everglades.dimension.DimensionEverglades; public class ChunkProviderModded implements IChunkProvider { - private Random rand; + private final Random rand; private NoiseGeneratorOctaves field_147431_j; private NoiseGeneratorOctaves field_147432_k; private NoiseGeneratorOctaves field_147429_l; @@ -53,8 +53,8 @@ public class ChunkProviderModded implements IChunkProvider { /** * Reference to the World object. */ - private World worldObj; - private WorldType field_147435_p; + private final World worldObj; + private final WorldType field_147435_p; private final double[] field_147434_q; private final float[] parabolicField; private double[] stoneNoise = new double[256]; @@ -477,8 +477,6 @@ public class ChunkProviderModded implements IChunkProvider { } biomegenbase.decorate(this.worldObj, this.rand, k, l); SpawnerAnimals.performWorldGenSpawning(this.worldObj, biomegenbase, k + 8, l + 8, 16, 16, this.rand); - k += 8; - l += 8; MinecraftForge.EVENT_BUS .post(new PopulateChunkEvent.Post(par1IChunkProvider, worldObj, rand, par2, par3, flag)); diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java index 50a7cd547a..bb1916adea 100644 --- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java @@ -99,12 +99,10 @@ public class WorldGen_GT_Base implements IWorldGenerator { // generateEnd(world, random, chunkX * 16, chunkZ * 16); break; default: // Any other dimension - if (world.provider.dimensionId != xDim) { - break; - } else { + if (world.provider.dimensionId == xDim) { generateEverglades(random, chunkX, chunkZ, world, chunkGenerator, chunkProvider); - break; } + break; } } @@ -197,7 +195,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { // Local class to track which orevein seeds must be checked when doing // chunkified worldgen - class NearbySeeds { + static class NearbySeeds { public int mX; public int mZ; @@ -206,7 +204,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { this.mX = x; this.mZ = z; } - }; + } public static ArrayList<NearbySeeds> seedList = new ArrayList<>(); @@ -530,7 +528,7 @@ public class WorldGen_GT_Base 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); diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java index 46fef6b58c..9153264185 100644 --- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java @@ -487,9 +487,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, DimensionEverglades.blockSecondaryFiller) || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.sandstone)) { - if (aWorld.setBlock(aX, aY, aZ, aMetaData, 0, 3)) { - return true; - } + return aWorld.setBlock(aX, aY, aZ, aMetaData, 0, 3); } return false; } diff --git a/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java b/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java index 7e463e194c..e9d021d6fe 100644 --- a/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java +++ b/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java @@ -135,7 +135,7 @@ public class TeleporterDimensionMod extends Teleporter { if (flag) { this.destinationCoordinateCache .add(j1, new Teleporter.PortalPosition(i, j, k, this.worldServerInstance.getTotalWorldTime())); - this.destinationCoordinateKeys.add(Long.valueOf(j1)); + this.destinationCoordinateKeys.add(j1); } double d11 = i + 0.5D; @@ -457,7 +457,7 @@ public class TeleporterDimensionMod extends Teleporter { } } - public class PortalPosition extends ChunkCoordinates { + public static class PortalPosition extends ChunkCoordinates { /** * The worldtime at which this PortalPosition was last verified diff --git a/src/main/java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java b/src/main/java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java index d1a621addf..4e1db08533 100644 --- a/src/main/java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java +++ b/src/main/java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java @@ -25,9 +25,9 @@ public class WorldChunkManagerCustom extends WorldChunkManager { /** A GenLayer containing the indices into BiomeGenBase.biomeList[] */ private GenLayer biomeIndexLayer; /** The BiomeCache object for this world. */ - private BiomeCache biomeCache; + private final BiomeCache biomeCache; /** A list of biomes that the player can spawn in. */ - private List<BiomeGenBase> biomesToSpawnIn; + private final List<BiomeGenBase> biomesToSpawnIn; @SuppressWarnings({ "rawtypes" }) public WorldChunkManagerCustom() { @@ -80,12 +80,12 @@ public class WorldChunkManagerCustom extends WorldChunkManager { } catch (Throwable throwable) { CrashReport crashreport = CrashReport.makeCrashReport(throwable, "Invalid Biome id"); CrashReportCategory crashreportcategory = crashreport.makeCategory("DownfallBlock"); - crashreportcategory.addCrashSection("biome id", Integer.valueOf(i1)); - crashreportcategory.addCrashSection("downfalls[] size", Integer.valueOf(listToReuse.length)); - crashreportcategory.addCrashSection("x", Integer.valueOf(x)); - crashreportcategory.addCrashSection("z", Integer.valueOf(z)); - crashreportcategory.addCrashSection("w", Integer.valueOf(width)); - crashreportcategory.addCrashSection("h", Integer.valueOf(length)); + crashreportcategory.addCrashSection("biome id", i1); + crashreportcategory.addCrashSection("downfalls[] size", listToReuse.length); + crashreportcategory.addCrashSection("x", x); + crashreportcategory.addCrashSection("z", z); + crashreportcategory.addCrashSection("w", width); + crashreportcategory.addCrashSection("h", length); throw new ReportedException(crashreport); } } @@ -125,11 +125,11 @@ public class WorldChunkManagerCustom extends WorldChunkManager { } catch (Throwable throwable) { CrashReport crashreport = CrashReport.makeCrashReport(throwable, "Invalid Biome id"); CrashReportCategory crashreportcategory = crashreport.makeCategory("RawBiomeBlock"); - crashreportcategory.addCrashSection("biomes[] size", Integer.valueOf(par1ArrayOfBiomeGenBase.length)); - crashreportcategory.addCrashSection("x", Integer.valueOf(par2)); - crashreportcategory.addCrashSection("z", Integer.valueOf(par3)); - crashreportcategory.addCrashSection("w", Integer.valueOf(par4)); - crashreportcategory.addCrashSection("h", Integer.valueOf(par5)); + crashreportcategory.addCrashSection("biomes[] size", par1ArrayOfBiomeGenBase.length); + crashreportcategory.addCrashSection("x", par2); + crashreportcategory.addCrashSection("z", par3); + crashreportcategory.addCrashSection("w", par4); + crashreportcategory.addCrashSection("h", par5); throw new ReportedException(crashreport); } } @@ -159,15 +159,14 @@ public class WorldChunkManagerCustom extends WorldChunkManager { if (cacheFlag && width == 16 && length == 16 && (x & 15) == 0 && (y & 15) == 0) { BiomeGenBase[] abiomegenbase1 = this.biomeCache.getCachedBiomes(x, y); System.arraycopy(abiomegenbase1, 0, listToReuse, 0, width * length); - return listToReuse; } else { int[] aint = this.biomeIndexLayer.getInts(x, y, width, length); for (int i = 0; i < width * length; ++i) { listToReuse[i] = BiomeGenBase.getBiome(aint[i]); } - return listToReuse; } + return listToReuse; } /** @@ -199,9 +198,9 @@ public class WorldChunkManagerCustom extends WorldChunkManager { CrashReport crashreport = CrashReport.makeCrashReport(throwable, "Invalid Biome id"); CrashReportCategory crashreportcategory = crashreport.makeCategory("Layer"); crashreportcategory.addCrashSection("Layer", this.genBiomes.toString()); - crashreportcategory.addCrashSection("x", Integer.valueOf(x)); - crashreportcategory.addCrashSection("z", Integer.valueOf(y)); - crashreportcategory.addCrashSection("radius", Integer.valueOf(z)); + crashreportcategory.addCrashSection("x", x); + crashreportcategory.addCrashSection("z", y); + crashreportcategory.addCrashSection("radius", z); crashreportcategory.addCrashSection("allowed", par4List); throw new ReportedException(crashreport); } diff --git a/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java b/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java index 3563c7a040..5928fe212a 100644 --- a/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java +++ b/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java @@ -47,19 +47,15 @@ public class DecayableRecipeHandler extends TemplateRecipeHandler { @Override public void loadTransferRects() { - this.transferRects - .add(new RecipeTransferRect(new Rectangle(6, 3, 16, 16), getOverlayIdentifier(), new Object[0])); + this.transferRects.add(new RecipeTransferRect(new Rectangle(6, 3, 16, 16), getOverlayIdentifier())); } @Override public void loadCraftingRecipes(ItemStack result) { - if (result == null || (!DustDecayable.class.isInstance(result.getItem()) - && !BaseItemDustUnique.class.isInstance(result.getItem()))) { + if (result == null + || (!(result.getItem() instanceof DustDecayable) && !(result.getItem() instanceof BaseItemDustUnique))) { return; } - if (result != null) { - // Logger.INFO("Looking up crafting recipes for "+ItemUtils.getItemName(result)); - } final List<DecayableRecipe> recipes = DecayableRecipe.mRecipes; for (final DecayableRecipe recipe : recipes) { if (recipe.isValid()) { @@ -136,16 +132,16 @@ public class DecayableRecipeHandler extends TemplateRecipeHandler { if (cost > 0) { // NEI Strings - String s = I18n.format("GTPP.nei.info", new Object[] { cost }); - String s0 = I18n.format("GTPP.nei.timetaken", new Object[] { cost }); + String s = I18n.format("GTPP.nei.info", cost); + String s0 = I18n.format("GTPP.nei.timetaken", cost); // Time Strings - String s1 = I18n.format("GTPP.time.ticks", new Object[] { cost }); - String s2 = I18n.format("GTPP.time.seconds", new Object[] { cost }); - String s3 = I18n.format("GTPP.time.minutes", new Object[] { cost }); - String s4 = I18n.format("GTPP.time.hours", new Object[] { cost }); - String s5 = I18n.format("GTPP.time.days", new Object[] { cost }); - String s6 = I18n.format("GTPP.time.months", new Object[] { cost }); + String s1 = I18n.format("GTPP.time.ticks", cost); + String s2 = I18n.format("GTPP.time.seconds", cost); + String s3 = I18n.format("GTPP.time.minutes", cost); + String s4 = I18n.format("GTPP.time.hours", cost); + String s5 = I18n.format("GTPP.time.days", cost); + String s6 = I18n.format("GTPP.time.months", cost); int y = 20; int secs = cost / 20; @@ -204,8 +200,8 @@ public class DecayableRecipeHandler extends TemplateRecipeHandler { public class DecayableRecipeNEI extends TemplateRecipeHandler.CachedRecipe implements Comparable<CachedRecipe> { - private PositionedStack input; - private PositionedStack output; + private final PositionedStack input; + private final PositionedStack output; public int time; @Override @@ -227,16 +223,8 @@ public class DecayableRecipeHandler extends TemplateRecipeHandler { @Override public int compareTo(CachedRecipe o) { - boolean b = DecayableRecipeNEI.class.isInstance(o); - if (b) { - DecayableRecipeNEI p = (DecayableRecipeNEI) o; - if (p.time > this.time) { - return 1; - } else if (p.time == this.time) { - return 0; - } else { - return -1; - } + if (o instanceof DecayableRecipeNEI p) { + return Integer.compare(p.time, this.time); } return 0; } @@ -244,18 +232,13 @@ public class DecayableRecipeHandler extends TemplateRecipeHandler { @Override public boolean equals(Object obj) { if (obj != null) { - if (DecayableRecipeNEI.class.isInstance(obj)) { - DecayableRecipeNEI p = (DecayableRecipeNEI) obj; - if (p != null) { - // Time check first to keep it simple and not unbox the Recipes. - if (p.time == this.time) { - ItemStack aInput = p.input.item; - ItemStack aOutput = p.output.item; - if (GTUtility.areStacksEqual(aInput, this.input.item, true)) { - if (GTUtility.areStacksEqual(aOutput, this.output.item, true)) { - return true; - } - } + if (obj instanceof DecayableRecipeNEI p) { + // Time check first to keep it simple and not unbox the Recipes. + if (p.time == this.time) { + ItemStack aInput = p.input.item; + ItemStack aOutput = p.output.item; + if (GTUtility.areStacksEqual(aInput, this.input.item, true)) { + return GTUtility.areStacksEqual(aOutput, this.output.item, true); } } } diff --git a/src/main/java/gtPlusPlus/nei/LFTRSpargingNEIHandler.java b/src/main/java/gtPlusPlus/nei/LFTRSpargingNEIHandler.java index 2cb6ac62b8..33018f2ce2 100644 --- a/src/main/java/gtPlusPlus/nei/LFTRSpargingNEIHandler.java +++ b/src/main/java/gtPlusPlus/nei/LFTRSpargingNEIHandler.java @@ -39,10 +39,7 @@ public class LFTRSpargingNEIHandler extends TemplateRecipeHandler { public LFTRSpargingNEIHandler() { this.transferRects.add( - new TemplateRecipeHandler.RecipeTransferRect( - new Rectangle(65, 13, 36, 18), - this.getOverlayIdentifier(), - new Object[0])); + new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getOverlayIdentifier())); if (!NEIGTPPConfig.sIsAdded) { FMLInterModComms.sendRuntimeMessage( GTValues.GT, @@ -83,8 +80,7 @@ public class LFTRSpargingNEIHandler extends TemplateRecipeHandler { @Override public void loadTransferRects() { - this.transferRects - .add(new RecipeTransferRect(new Rectangle(72, 14, 22, 16), getOverlayIdentifier(), new Object[0])); + this.transferRects.add(new RecipeTransferRect(new Rectangle(72, 14, 22, 16), getOverlayIdentifier())); } public List<GasSpargingRecipeNEI> getCache() { @@ -178,7 +174,7 @@ public class LFTRSpargingNEIHandler extends TemplateRecipeHandler { public void drawExtras(int aRecipeIndex) { final long tEUt = ((GasSpargingRecipeNEI) this.arecipes.get(aRecipeIndex)).mRecipe.mEUt; final long tDuration = ((GasSpargingRecipeNEI) this.arecipes.get(aRecipeIndex)).mRecipe.mDuration; - drawText(10, 73, "Total: " + MathUtils.formatNumbers((long) (tDuration * tEUt)) + " EU", -16777216); + drawText(10, 73, "Total: " + MathUtils.formatNumbers(tDuration * tEUt) + " EU", -16777216); drawText(10, 83, "Usage: " + MathUtils.formatNumbers(tEUt) + " EU/t", -16777216); drawText( 10, @@ -233,7 +229,7 @@ public class LFTRSpargingNEIHandler extends TemplateRecipeHandler { return currenttip; } - public class FixedPositionedStack extends PositionedStack { + public static class FixedPositionedStack extends PositionedStack { public final int mChance; public boolean permutated = false; @@ -444,16 +440,8 @@ public class LFTRSpargingNEIHandler extends TemplateRecipeHandler { @Override public int compareTo(CachedRecipe o) { - boolean b = GasSpargingRecipeNEI.class.isInstance(o); - if (b) { - GasSpargingRecipeNEI p = (GasSpargingRecipeNEI) o; - if (p.mOutputs.size() > this.mOutputs.size()) { - return 1; - } else if (p.mOutputs.size() == this.mOutputs.size()) { - return 0; - } else { - return -1; - } + if (o instanceof GasSpargingRecipeNEI p) { + return Integer.compare(p.mOutputs.size(), this.mOutputs.size()); } return 0; } @@ -461,14 +449,9 @@ public class LFTRSpargingNEIHandler extends TemplateRecipeHandler { @Override public boolean equals(Object obj) { if (obj != null) { - if (GasSpargingRecipeNEI.class.isInstance(obj)) { - GasSpargingRecipeNEI p = (GasSpargingRecipeNEI) obj; - if (p != null) { - if (GTUtility.areStacksEqual(p.mInputs.get(0).item, this.mInputs.get(0).item, true)) { - if (p.mOutputs.size() == this.mOutputs.size()) { - return true; - } - } + if (obj instanceof GasSpargingRecipeNEI p) { + if (GTUtility.areStacksEqual(p.mInputs.get(0).item, this.mInputs.get(0).item, true)) { + return p.mOutputs.size() == this.mOutputs.size(); } } } diff --git a/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java b/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java index 2644ffb4ff..3084a67bf5 100644 --- a/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java +++ b/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java @@ -14,23 +14,23 @@ import org.lwjgl.opengl.GL11; * Based on crazypants.enderio.gui.IconEIO * * @author Original EIO Author - * + * <p> * This is free and unencumbered software released into the public domain. - * + * <p> * Anyone is free to copy, modify, publish, use, compile, sell, or distribute this software, either in source * code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means. - * + * <p> * In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all * copyright interest in the software to the public domain. We make this dedication for the benefit of the * public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt * act of relinquishment in perpetuity of all present and future rights to this software under copyright law. - * + * <p> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED * TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. - * + * <p> * For more information, please refer to <http://unlicense.org/> * * https://github.com/SleepyTrousers/EnderIO/blob/release/1.7.10/2.2/src/main/java/crazypants/render/RenderUtil.java diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java index 622ae92281..d871d3bc0c 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java @@ -577,10 +577,8 @@ public class BioRecipes { private static void recipeFermentationBase() { processFermentationOreDict(); - ArrayList<ItemStack> aFruitVege = mList_Master_FruitVege; - ArrayList<ItemStack> aSeeds = mList_Master_Seeds; ArrayList<ItemStack> aMap = OreDictionary.getOres("cropSugarbeet"); - for (ItemStack a : aFruitVege) { + for (ItemStack a : mList_Master_FruitVege) { if (aMap.contains(a)) { continue; } @@ -596,7 +594,7 @@ public class BioRecipes { } } - for (ItemStack a : aSeeds) { + for (ItemStack a : mList_Master_Seeds) { if (ItemUtils.checkForInvalidItems(a)) { GTValues.RA.stdBuilder() .itemInputs(getBioChip(3), ItemUtils.getSimpleStack(a, 20)) diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java index 29c88ca5f4..ff34483d2f 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java @@ -166,8 +166,6 @@ public class ItemAlgaeBase extends Item implements IAlgalItem { AlgaeGeneticData y = aItem.getSpeciesData(aFreshAlgae); aNewTag = y.writeToNBT(); aFreshAlgae.setTagCompound(aNewTag); - } else { - aNewTag = aFreshAlgae.getTagCompound(); } } return aFreshAlgae; @@ -193,8 +191,8 @@ public class ItemAlgaeBase extends Item implements IAlgalItem { int aDam = aStack.getItemDamage(); aTemp = (byte) (aDam == 3 ? 0 : aDam == 4 ? 2 : 1); aLifespan = (byte) (aDam == 3 ? 1 : aDam == 4 ? 3f : 2f); - aFert = (float) (aDam == 3 ? 2f : aDam == 4 ? 1f : 1.75f); - aSpeed = (float) (aDam == 3 ? 1f : aDam == 4 ? 1.5f : 2f); + aFert = aDam == 3 ? 2f : aDam == 4 ? 1f : 1.75f; + aSpeed = aDam == 3 ? 1f : aDam == 4 ? 1.5f : 2f; aGenes = new AlgaeGeneticData( true, diff --git a/src/main/java/gtPlusPlus/recipes/RecipeRemovals.java b/src/main/java/gtPlusPlus/recipes/RecipeRemovals.java index e6b7740599..1a5ea35070 100644 --- a/src/main/java/gtPlusPlus/recipes/RecipeRemovals.java +++ b/src/main/java/gtPlusPlus/recipes/RecipeRemovals.java @@ -40,7 +40,7 @@ public class RecipeRemovals { Item aU; Collection<GTRecipe> aAssRecipes = RecipeMaps.assemblerRecipes.getAllRecipes(); // 170, 172, 174, 176 - if (aAssRecipes.size() > 0) { + if (!aAssRecipes.isEmpty()) { for (GTRecipe aG : aAssRecipes) { if (ArrayUtils.isNotEmpty(aG.mOutputs)) { for (ItemStack aI : aG.mOutputs) { diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java b/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java index c3c2f0b6cc..0ee9270c20 100644 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java @@ -14,15 +14,15 @@ import ic2.api.crops.Crops; /** * Mostly borrowed from the Crops++ Crop Loader. - * + * * @author Alkalus */ public class LoaderOfTheCrops { - private static List<Boolean> mHasCropObj = new ArrayList<>(); - private CropCard mCropObj; + private static final List<Boolean> mHasCropObj = new ArrayList<>(); + private final CropCard mCropObj; private ItemStack mBaseSeed; - private static List<LoaderOfTheCrops> mCropList = cropLoader(); + private static final List<LoaderOfTheCrops> mCropList = cropLoader(); public LoaderOfTheCrops(CropCard cropObj) { this.mCropObj = cropObj; @@ -57,7 +57,7 @@ public class LoaderOfTheCrops { List<CropCard> p = new ArrayList<>(); for (LoaderOfTheCrops loaderOfTheCrops : mCropList) { - p.add(cropUnpackerCC((LoaderOfTheCrops) loaderOfTheCrops)); + p.add(cropUnpackerCC(loaderOfTheCrops)); } return p; @@ -67,7 +67,7 @@ public class LoaderOfTheCrops { List<ItemStack> p = new ArrayList<>(); for (LoaderOfTheCrops loaderOfTheCrops : mCropList) { - p.add(cropUnpackerCG((LoaderOfTheCrops) loaderOfTheCrops)); + p.add(cropUnpackerCG(loaderOfTheCrops)); } return p; @@ -77,7 +77,9 @@ public class LoaderOfTheCrops { List<String> s = new ArrayList<>(); for (int i = 0; i < mCropList.size(); ++i) { - s.add(((CropCard) cropObjs().get(i)).name()); + s.add( + cropObjs().get(i) + .name()); } return s; @@ -91,8 +93,8 @@ public class LoaderOfTheCrops { public static void register() { for (int i = 0; i < mCropList.size(); ++i) { - if ((Boolean) mHasCropObj.get(i) && cropObjs().get(i) != null) { - Crops.instance.registerCrop((CropCard) cropObjs().get(i)); + if (mHasCropObj.get(i) && cropObjs().get(i) != null) { + Crops.instance.registerCrop(cropObjs().get(i)); } } } @@ -102,7 +104,7 @@ public class LoaderOfTheCrops { for (int i = 0; i < mCropList.size(); ++i) { if (baseseed.get(i) != null && cropObjs().get(i) != null) { - Crops.instance.registerBaseSeed((ItemStack) baseseed.get(i), (CropCard) cropObjs().get(i), 1, 1, 1, 1); + Crops.instance.registerBaseSeed(baseseed.get(i), cropObjs().get(i), 1, 1, 1, 1); } } } diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java index 405c1ef1e1..477684a863 100644 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java @@ -31,7 +31,7 @@ public abstract class BaseCrop extends CropCard implements ICropCardInfo { @Override public float dropGainChance() { - return (float) (Math.pow(0.95D, (double) ((float) this.tier())) * (double) 1f); + return (float) Math.pow(0.95D, (float) this.tier()); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java index 171bb9a58c..d73462da60 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java @@ -40,10 +40,6 @@ public class LeavesBase extends BlockLeaves { Blocks.fire.setFireInfo(this, 80, 150); } - private void setVanillaVariable(Object toSet, Object value) { - toSet = value; - } - @Override public int quantityDropped(Random p_149745_1_) { return p_149745_1_.nextInt(20) == 0 ? 1 : 0; @@ -96,7 +92,8 @@ public class LeavesBase extends BlockLeaves { .registerIcon(GTPlusPlus.ID + ":" + "trees/" + "leaves/" + "leaves_" + leafType[i][j]); } } - setVanillaVariable(this.field_150129_M, this.leafTextures); + // TODO uncomment the line below, I don't want to do it now in case it causes a crash + // this.field_150129_M = this.leafTextures; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java index 2cf8ba1fbc..317c61ee63 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java @@ -40,10 +40,6 @@ public abstract class LogBase extends BlockLog { Blocks.fire.setFireInfo(this, 20, 100); } - private void setVanillaVariable(Object toSet, Object value) { - toSet = value; - } - /** * returns a list of blocks with the same ID, but different meta (eg: wood returns 4 blocks) */ @@ -78,8 +74,8 @@ public abstract class LogBase extends BlockLog { this.textureTop[i] = iIcon .registerIcon(GTPlusPlus.ID + ":" + "trees/" + "logs/" + "log_" + treeType[i] + "_top"); } - - setVanillaVariable(this.field_150167_a, this.textureSide); - setVanillaVariable(this.field_150166_b, this.textureTop); + // TODO uncomment the line below, I don't want to do it now in case it causes a crash + // this.field_150167_a = this.textureSide; + // this.field_150166_b = this.textureTop; } } diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java index ff5c8770d4..d0728304c4 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java @@ -48,10 +48,6 @@ public class SaplingBase extends BlockSapling { this.setCreativeTab(AddToCreativeTab.tabBOP); } - private void setVanillaVariable(Object toSet, Object value) { - toSet = value; - } - /** * Gets the block's texture. Args: side, meta */ diff --git a/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java b/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java index d3ad2efaea..c7207a3b5d 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java +++ b/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java @@ -297,14 +297,11 @@ public class WorldGenRainForestTree_Ex extends WorldGenAbstractTree { return false; } else if (xDir == xDirMax - 1 && zDir == zDirMin + 1) { return false; - } else if (xDir == xDirMax - 1 && zDir == zDirMax - 1) { - return false; + } else { + return xDir != xDirMax - 1 || zDir != zDirMax - 1; } - return true; } - return false; - } else { - return false; } + return false; } } diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBeeDefinition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBeeDefinition.java index 6b9c5ae8f2..0154597d09 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBeeDefinition.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBeeDefinition.java @@ -515,10 +515,7 @@ public enum GTPPBeeDefinition implements IBeeDefinition { } private static IAlleleBeeSpecies getSpecies(String name) { - return (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele( - (new StringBuilder()).append("forestry.species") - .append(name) - .toString()); + return (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele("forestry.species" + name); } protected abstract void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies); diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPDropType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPDropType.java index 0ae34d599c..3a4bdc0a3d 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPDropType.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPDropType.java @@ -29,7 +29,7 @@ public enum GTPPDropType { return GTPP_Bees.sDropMappings.get(aID); } - private GTPPDropType(int aID, String aName, boolean aShow, int... aColour) { + GTPPDropType(int aID, String aName, boolean aShow, int... aColour) { this.mID = aID; this.mName = aName; this.mNameUnlocal = aName.toLowerCase() diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPPollenType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPPollenType.java index 08b8f84dca..2775f26438 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPPollenType.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPPollenType.java @@ -28,7 +28,7 @@ public enum GTPPPollenType { return GTPP_Bees.sPollenMappings.get(aID); } - private GTPPPollenType(int aID, String aName, boolean aShow, int... aColour) { + GTPPPollenType(int aID, String aName, boolean aShow, int... aColour) { this.mID = aID; this.mName = aName; this.mNameUnlocal = aName.toLowerCase() diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPPropolisType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPPropolisType.java index f97da9f4df..f68810f3f4 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPPropolisType.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPPPropolisType.java @@ -29,7 +29,7 @@ public enum GTPPPropolisType { return GTPP_Bees.sPropolisMappings.get(aID); } - private GTPPPropolisType(int aID, String aName, boolean aShow, int aColour) { + GTPPPropolisType(int aID, String aName, boolean aShow, int aColour) { this.mID = aID; this.mName = aName; this.mNameUnlocal = aName.toLowerCase() diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FRItemRegistry.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FRItemRegistry.java index ab2353cc37..7ded5cc171 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FRItemRegistry.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FRItemRegistry.java @@ -2,7 +2,7 @@ * Copyright (c) 2011-2014 SirSengir. All rights reserved. This program and the accompanying materials are made * available under the terms of the GNU Lesser Public License v3 which accompanies this distribution, and is available * at http://www.gnu.org/licenses/lgpl-3.0.txt - * + * <p> * Various Contributors including, but not limited to: SirSengir (original work), CovertJaguar, Player, Binnie, * MysteriousAges ******************************************************************************/ diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MBItemFrame.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MBItemFrame.java index b196598f43..54b003386e 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MBItemFrame.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MBItemFrame.java @@ -45,7 +45,7 @@ public class MBItemFrame extends Item implements IHiveFrame { @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { - if ((this.toolTip != "") || !this.toolTip.equals("")) { + if (!this.toolTip.isEmpty()) { list.add(EnumChatFormatting.GRAY + this.toolTip); } super.addInformation(stack, aPlayer, list, bool); @@ -79,10 +79,7 @@ public class MBItemFrame extends Item implements IHiveFrame { @Override public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { - if ((this.rarity_value == EnumRarity.uncommon) || (this.rarity_value == EnumRarity.common)) { - return false; - } - return true; + return this.rarity_value != EnumRarity.uncommon && this.rarity_value != EnumRarity.common; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java index 95813e45bd..d1206d5296 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java @@ -184,8 +184,7 @@ public enum GTPP_BeeDefinition implements IBeeDefinition { case GTPP_Bees.GREGTECH -> "gregtech.species" + name; default -> "forestry.species" + name; }; - IAlleleBeeSpecies ret = (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele(s); - return ret; + return (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele(s); } private void setSpeciesProperties(GTPPAlleleBeeSpecies species2) { diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BranchDefinition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BranchDefinition.java index 39af813dec..34d87cb943 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BranchDefinition.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BranchDefinition.java @@ -73,7 +73,7 @@ public enum GTPP_BranchDefinition { return Arrays.copyOf(defaultTemplate, defaultTemplate.length); } - private final void setBranchProperties(IAllele[] template) { + private void setBranchProperties(IAllele[] template) { this.mBranchProperties.accept(template); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java index 9f82936035..5dc2c4c7da 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java @@ -8,6 +8,7 @@ import static gtPlusPlus.core.util.Utils.getTcAspectStack; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -410,9 +411,9 @@ public enum GregtechOrePrefixes { * at a location where it shouldn't happen. * <p/> * Mainly for preventing NullPointer Exceptions and providing Default Values. - * + * <p> * Unknown Material Components. Dead End Section. - * + * <p> * Alkalus Range 730-799 & 970-998 (aMetaItemSubID, TextureSet, aToolSpeed, aToolDurability, aToolQuality, * aTypes, R, G, B, Alpha, aLocalName, aFuelType, aFuelPower, aMeltingPoint, aBlastFurnaceTemp, * aBlastFurnaceRequired, aTransparent, aOreValue, aDensityMultiplier, aDensityDivider, aColor @@ -420,7 +421,7 @@ public enum GregtechOrePrefixes { * */ _NULL(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "NULL", 0, 0, 0, 0, false, false, 1, 1, 1, - Dyes._NULL, Element._NULL, Arrays.asList(getTcAspectStack(TCAspects.VACUOS.name(), 1))), + Dyes._NULL, Element._NULL, Collections.singletonList(getTcAspectStack(TCAspects.VACUOS.name(), 1))), // Lapis(526, TextureSet.SET_LAPIS, 1.0F, 0, 1, 1 | 4 | 8, 70, 70, 220, 0, "Lapis", 0, 0, -1, 0, false, false, // 3, 1, 1, Dyes.dyeBlue, 2, Arrays.asList(new MaterialStack(Materials.Lazurite, 12), new @@ -459,7 +460,7 @@ public enum GregtechOrePrefixes { Arrays.asList(getTcAspectStack(TCAspects.ELECTRUM, 8), getTcAspectStack(TCAspects.MACHINA, 8))), Superconductor(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 190, 240, 190, 0, "Superconductor", 0, 0, -1, 0, false, - false, 1, 1, 1, Dyes.dyeGreen, Arrays.asList(getTcAspectStack(TCAspects.ELECTRUM, 8))), + false, 1, 1, 1, Dyes.dyeGreen, Collections.singletonList(getTcAspectStack(TCAspects.ELECTRUM, 8))), Staballoy(30, TextureSet.SET_ROUGH, 10.0F, 5120, 4, 1 | 2 | 16 | 32 | 64 | 128, 68, 75, 66, 0, "Staballoy", 0, 0, 1500, 2800, true, false, 1, 3, 1, Dyes.dyeGreen, 2, @@ -924,11 +925,12 @@ public enum GregtechOrePrefixes { aColor); this.mExtraData = aExtraData; this.mMaterialList.addAll(aMaterialList); - this.mChemicalFormula = ""; + final StringBuilder sb = new StringBuilder(); for (final MaterialStack tMaterial : this.mMaterialList) { - this.mChemicalFormula += tMaterial.toString(); + sb.append(tMaterial.toString()); } - this.mChemicalFormula = this.mChemicalFormula.replaceAll("_", "-"); + this.mChemicalFormula = sb.toString() + .replaceAll("_", "-"); int tAmountOfComponents = 0, tMeltingPoint = 0; for (final MaterialStack tMaterial : this.mMaterialList) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechToolDictNames.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechToolDictNames.java index 0a116b1b9f..7dd8b429d4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechToolDictNames.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechToolDictNames.java @@ -5,5 +5,5 @@ public enum GregtechToolDictNames { craftingToolAngleGrinder, craftingToolElectricSnips, craftingToolElectricLighter, - craftingToolElectricButcherKnife; + craftingToolElectricButcherKnife } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/ElectricSlotWidget.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/ElectricSlotWidget.java index 1bc2050eee..743f10aae6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/ElectricSlotWidget.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/widget/ElectricSlotWidget.java @@ -35,6 +35,6 @@ public class ElectricSlotWidget extends SlotWidget { return false; } return (Info.itemEnergy.getEnergyValue(stack) > 0.0D) - || (ElectricItem.manager.discharge(stack, (1.0D / 0.0D), 4, true, true, true) > 0.0D); + || (ElectricItem.manager.discharge(stack, Double.NaN, 4, true, true, true) > 0.0D); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IGregtechItemContainer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IGregtechItemContainer.java index ea9ab3602a..f8537b1125 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IGregtechItemContainer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/IGregtechItemContainer.java @@ -6,35 +6,35 @@ import net.minecraft.item.ItemStack; public interface IGregtechItemContainer { - public Item getItem(); + Item getItem(); - public Block getBlock(); + Block getBlock(); - public boolean isStackEqual(Object aStack); + boolean isStackEqual(Object aStack); - public boolean isStackEqual(Object aStack, boolean aWildcard, boolean aIgnoreNBT); + boolean isStackEqual(Object aStack, boolean aWildcard, boolean aIgnoreNBT); - public ItemStack get(long aAmount, Object... aReplacements); + ItemStack get(long aAmount, Object... aReplacements); - public ItemStack getWildcard(long aAmount, Object... aReplacements); + ItemStack getWildcard(long aAmount, Object... aReplacements); - public ItemStack getUndamaged(long aAmount, Object... aReplacements); + ItemStack getUndamaged(long aAmount, Object... aReplacements); - public ItemStack getAlmostBroken(long aAmount, Object... aReplacements); + ItemStack getAlmostBroken(long aAmount, Object... aReplacements); - public ItemStack getWithDamage(long aAmount, long aMetaValue, Object... aReplacements); + ItemStack getWithDamage(long aAmount, long aMetaValue, Object... aReplacements); - public IGregtechItemContainer set(Item aItem); + IGregtechItemContainer set(Item aItem); - public IGregtechItemContainer set(ItemStack aStack); + IGregtechItemContainer set(ItemStack aStack); - public IGregtechItemContainer registerOre(Object... aOreNames); + IGregtechItemContainer registerOre(Object... aOreNames); - public IGregtechItemContainer registerWildcardAsOre(Object... aOreNames); + IGregtechItemContainer registerWildcardAsOre(Object... aOreNames); - public ItemStack getWithCharge(long aAmount, int aEnergy, Object... aReplacements); + ItemStack getWithCharge(long aAmount, int aEnergy, Object... aReplacements); - public ItemStack getWithName(long aAmount, String aDisplayName, Object... aReplacements); + ItemStack getWithName(long aAmount, String aDisplayName, Object... aReplacements); - public boolean hasBeenSet(); + boolean hasBeenSet(); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IItemBehaviour.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IItemBehaviour.java index a68efc4fb8..5f7e4527cd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IItemBehaviour.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IItemBehaviour.java @@ -16,31 +16,31 @@ import gtPlusPlus.xmod.gregtech.api.items.GTMetaItemBase; public interface IItemBehaviour<E extends Item> { - public boolean onLeftClickEntity(E aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity); + boolean onLeftClickEntity(E aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity); - public boolean onItemUse(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, - int aSide, float hitX, float hitY, float hitZ); + boolean onItemUse(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, + float hitX, float hitY, float hitZ); - public boolean onItemUseFirst(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, + boolean onItemUseFirst(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ); - public ItemStack onItemRightClick(E aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer); + ItemStack onItemRightClick(E aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer); - public List<String> getAdditionalToolTips(E aItem, List<String> aList, ItemStack aStack); + List<String> getAdditionalToolTips(E aItem, List<String> aList, ItemStack aStack); - public void onUpdate(E aItem, ItemStack aStack, World aWorld, Entity aPlayer, int aTimer, boolean aIsInHand); + void onUpdate(E aItem, ItemStack aStack, World aWorld, Entity aPlayer, int aTimer, boolean aIsInHand); - public boolean isItemStackUsable(E aItem, ItemStack aStack); + boolean isItemStackUsable(E aItem, ItemStack aStack); - public boolean canDispense(E aItem, IBlockSource aSource, ItemStack aStack); + boolean canDispense(E aItem, IBlockSource aSource, ItemStack aStack); - public ItemStack onDispense(E aItem, IBlockSource aSource, ItemStack aStack); + ItemStack onDispense(E aItem, IBlockSource aSource, ItemStack aStack); - public boolean hasProjectile(GTMetaItemBase aItem, SubTag aProjectileType, ItemStack aStack); + boolean hasProjectile(GTMetaItemBase aItem, SubTag aProjectileType, ItemStack aStack); - public EntityArrow getProjectile(E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, double aX, - double aY, double aZ); + EntityArrow getProjectile(E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, double aX, double aY, + double aZ); - public EntityArrow getProjectile(E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, - EntityLivingBase aEntity, float aSpeed); + EntityArrow getProjectile(E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, EntityLivingBase aEntity, + float aSpeed); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IOreRecipeRegistrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IOreRecipeRegistrator.java index 4c8b1c2391..93b61dc7f0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IOreRecipeRegistrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IOreRecipeRegistrator.java @@ -16,9 +16,9 @@ public interface IOreRecipeRegistrator { * @param aMaterial always != null, and can be == _NULL if the Prefix is Self Referencing or not Material based! * @param aStack always != null */ - public void registerOre(GregtechOrePrefixes aPrefix, GT_Materials aMaterial, String aOreDictName, String aModName, + void registerOre(GregtechOrePrefixes aPrefix, GT_Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack); - public void registerOre(GregtechOrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + void registerOre(GregtechOrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack copyAmount); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IToolStats.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IToolStats.java index 98b446869c..1a61814f55 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IToolStats.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IToolStats.java @@ -26,126 +26,126 @@ public interface IToolStats extends gregtech.api.interfaces.IToolStats { * Called when aPlayer crafts this Tool */ @Override - public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer); + void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer); /** * Called when this gets added to a Tool Item */ - public void onStatsAddedToTool(GTMetaTool gregtech_MetaTool, int aID); + void onStatsAddedToTool(GTMetaTool gregtech_MetaTool, int aID); /** * @return Damage the Tool receives when breaking a Block. 100 is one Damage Point (or 100 EU). */ @Override - public int getToolDamagePerBlockBreak(); + int getToolDamagePerBlockBreak(); /** * @return Damage the Tool receives when converting the drops of a Block. 100 is one Damage Point (or 100 EU). */ @Override - public int getToolDamagePerDropConversion(); + int getToolDamagePerDropConversion(); /** * @return Damage the Tool receives when being used as Container Item. 100 is one use, however it is usually 8 times * more than normal. */ @Override - public int getToolDamagePerContainerCraft(); + int getToolDamagePerContainerCraft(); /** * @return Damage the Tool receives when being used as Weapon, 200 is the normal Value, 100 for actual Weapons. */ @Override - public int getToolDamagePerEntityAttack(); + int getToolDamagePerEntityAttack(); /** * @return Basic Quality of the Tool, 0 is normal. If increased, it will increase the general quality of all Tools * of this Type. Decreasing is also possible. */ @Override - public int getBaseQuality(); + int getBaseQuality(); /** * @return The Damage Bonus for this Type of Tool against Mobs. 1.0F is normal punch. */ @Override - public float getBaseDamage(); + float getBaseDamage(); /** * @return This gets the Hurt Resistance time for Entities getting hit. (always does 1 as minimum) */ @Override - public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity); + int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity); /** * @return This is a multiplier for the Tool Speed. 1.0F = no special Speed. */ @Override - public float getSpeedMultiplier(); + float getSpeedMultiplier(); /** * @return This is a multiplier for the Tool Speed. 1.0F = no special Durability. */ @Override - public float getMaxDurabilityMultiplier(); + float getMaxDurabilityMultiplier(); @Override - public DamageSource getDamageSource(EntityLivingBase aPlayer, Entity aEntity); + DamageSource getDamageSource(EntityLivingBase aPlayer, Entity aEntity); @Override - public String getMiningSound(); + String getMiningSound(); @Override - public String getCraftingSound(); + String getCraftingSound(); @Override - public String getEntityHitSound(); + String getEntityHitSound(); @Override - public String getBreakingSound(); + String getBreakingSound(); @Override - public Enchantment[] getEnchantments(ItemStack aStack); + Enchantment[] getEnchantments(ItemStack aStack); @Override - public int[] getEnchantmentLevels(ItemStack aStack); + int[] getEnchantmentLevels(ItemStack aStack); /** * @return If this Tool can be used for blocking Damage like a Sword. */ @Override - public boolean canBlock(); + boolean canBlock(); /** * @return If this Tool can be used as an RC Crowbar. */ @Override - public boolean isCrowbar(); + boolean isCrowbar(); /** * @return If this Tool can be used as an BC Wrench. */ @Override - public boolean isWrench(); + boolean isWrench(); /** * @return If this Tool can be used as Weapon i.e. if that is the main purpose. */ @Override - public boolean isWeapon(); + boolean isWeapon(); /** * @return If this Tool is a Ranged Weapon. Return false at isWeapon unless you have a Blade attached to your * Bow/Gun or something */ @Override - public boolean isRangedWeapon(); + boolean isRangedWeapon(); /** * @return If this Tool can be used as Weapon i.e. if that is the main purpose. */ @Override - public boolean isMiningTool(); + boolean isMiningTool(); /** * aBlock.getHarvestTool(aMetaData) can return the following Values for example. "axe", "pickaxe", "sword", @@ -156,7 +156,7 @@ public interface IToolStats extends gregtech.api.interfaces.IToolStats { * check. */ @Override - public boolean isMinableBlock(Block aBlock, byte aMetaData); + boolean isMinableBlock(Block aBlock, byte aMetaData); /** * This lets you modify the Drop List, when this type of Tool has been used. @@ -164,38 +164,36 @@ public interface IToolStats extends gregtech.api.interfaces.IToolStats { * @return the Amount of modified Items. */ @Override - public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, - int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent); + int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, + int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent); /** * @return Returns a broken Version of the Item. */ @Override - public ItemStack getBrokenItem(ItemStack aStack); + ItemStack getBrokenItem(ItemStack aStack); /** * @return the Damage actually done to the Mob. */ @Override - public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, - EntityPlayer aPlayer); + float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer); /** * @return the Damage actually done to the Mob. */ @Override - public float getMagicDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, - EntityPlayer aPlayer); + float getMagicDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer); @Override - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack); + IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack); @Override - public short[] getRGBa(boolean aIsToolHead, ItemStack aStack); + short[] getRGBa(boolean aIsToolHead, ItemStack aStack); /** * Called when this gets added to a Tool Item */ @Override - public void onStatsAddedToTool(MetaGeneratedTool aItem, int aID); + void onStatsAddedToTool(MetaGeneratedTool aItem, int aID); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItem.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItem.java index c98023bad7..befca0975f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItem.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItem.java @@ -106,7 +106,6 @@ public abstract class GTMetaItem extends GTMetaItemBase { } if (tRandomData == SubTag.NO_UNIFICATION) { GTOreDictUnificator.addToBlacklist(rStack); - continue; } } } @@ -140,7 +139,6 @@ public abstract class GTMetaItem extends GTMetaItemBase { } if (tUseOreDict) { GTOreDictUnificator.registerOre(tRandomData, rStack); - continue; } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemBase.java index 3e7fcf1486..09c6d4467a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemBase.java @@ -64,11 +64,8 @@ public abstract class GTMetaItemBase extends GTGenericItem if ((aMetaValue < 0) || (aMetaValue >= 32766) || (aBehavior == null)) { return this; } - ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors.get((short) aMetaValue); - if (tList == null) { - tList = new ArrayList<>(1); - this.mItemBehaviors.put((short) aMetaValue, tList); - } + ArrayList<IItemBehaviour<GTMetaItemBase>> tList = this.mItemBehaviors + .computeIfAbsent((short) aMetaValue, k -> new ArrayList<>(1)); tList.add(aBehavior); return this; } @@ -278,8 +275,7 @@ public abstract class GTMetaItemBase extends GTGenericItem EnumChatFormatting.AQUA + "Empty. You should recycle it properly." + EnumChatFormatting.GRAY); } else { aList.add( - EnumChatFormatting.AQUA + "" - + GTUtility.formatNumbers(tCharge) + EnumChatFormatting.AQUA + GTUtility.formatNumbers(tCharge) + " / " + GTUtility.formatNumbers(Math.abs(tStats[0])) + " EU - Voltage: " diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemX32.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemX32.java index 31cdac4770..102a3cc0b7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemX32.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/GTMetaItemX32.java @@ -101,7 +101,7 @@ public abstract class GTMetaItemX32 extends GTMetaItem { // You have to check for at least these Conditions in every Case! So add a super Call like the following for // this before executing your Code: // if (!super.doesMaterialAllowGeneration(aPrefix, aMaterial)) return false; - return (aPrefix != null) && (aMaterial != null) && aPrefix.doGenerateItem(aMaterial); + return aPrefix != null && aPrefix.doGenerateItem(aMaterial); } /* ---------- OVERRIDEABLE FUNCTIONS ---------- */ diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/METHatchAirIntake.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/METHatchAirIntake.java index e475037c63..6786fabc31 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/METHatchAirIntake.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/METHatchAirIntake.java @@ -101,27 +101,27 @@ public class METHatchAirIntake extends MTEHatchFluidGenerator { aWorld.spawnParticle( name, - (double) (xPos + ran1 * 0.5f), - (double) (yPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f), - (double) (zPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f), - (double) xSpd, - (double) -ySpd, - (double) zSpd); + xPos + ran1 * 0.5f, + yPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f, + zPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f, + xSpd, + -ySpd, + zSpd); aWorld.spawnParticle( name, - (double) (xPos + ran2 * 0.5f), - (double) (yPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f), - (double) (zPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f), - (double) xSpd, - (double) -ySpd, - (double) zSpd); + xPos + ran2 * 0.5f, + yPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f, + zPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f, + xSpd, + -ySpd, + zSpd); aWorld.spawnParticle( name, - (double) (xPos + ran3 * 0.5f), - (double) (yPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f), - (double) (zPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f), - (double) xSpd, - (double) -ySpd, - (double) zSpd); + xPos + ran3 * 0.5f, + yPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f, + zPos + METHatchAirIntake.floatGen.nextFloat() * 0.5f, + xSpd, + -ySpd, + zSpd); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchElementalDataOrbHolder.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchElementalDataOrbHolder.java index 0043819b23..68396fee78 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchElementalDataOrbHolder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchElementalDataOrbHolder.java @@ -125,22 +125,16 @@ public class MTEHatchElementalDataOrbHolder extends MTEHatch implements IConfigu public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, ItemStack aStack) { Logger.INFO("Checking if we can pull " + aStack.getDisplayName() + " from slot " + aIndex); - if (aIndex == mInventory.length - 1 && ItemUtils.isControlCircuit(aStack) - && side == getBaseMetaTileEntity().getFrontFacing()) { - return true; - } - return false; + return aIndex == mInventory.length - 1 && ItemUtils.isControlCircuit(aStack) + && side == getBaseMetaTileEntity().getFrontFacing(); } @Override public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, ItemStack aStack) { Logger.INFO("Checking if we can put " + aStack.getDisplayName() + " into slot " + aIndex); - if (aIndex == mInventory.length - 1 && ItemUtils.isControlCircuit(aStack) - && side == getBaseMetaTileEntity().getFrontFacing()) { - return true; - } - return false; + return aIndex == mInventory.length - 1 && ItemUtils.isControlCircuit(aStack) + && side == getBaseMetaTileEntity().getFrontFacing(); } public ArrayList<ItemStack> getInventory() { @@ -154,7 +148,7 @@ public class MTEHatchElementalDataOrbHolder extends MTEHatch implements IConfigu public ItemStack getOrbByCircuit() { ItemStack aCirc = getBaseMetaTileEntity().getStackInSlot(getCircuitSlot()); - if (aCirc != null && ItemUtils.isControlCircuit(aCirc)) { + if (ItemUtils.isControlCircuit(aCirc)) { int slot = aCirc.getItemDamage() - 1; // slots are 0 indexed but there's no 0 circuit if (slot < getBaseMetaTileEntity().getSizeInventory() - 1) { return getBaseMetaTileEntity().getStackInSlot(slot); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchFluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchFluidGenerator.java index 3a5640cd88..9eafd09a10 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchFluidGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchFluidGenerator.java @@ -9,7 +9,6 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import gregtech.api.enums.Textures; -import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; @@ -58,14 +57,12 @@ public abstract class MTEHatchFluidGenerator extends MTEHatchInput { @Override public ITexture[] getTexturesActive(final ITexture aBaseTexture) { - return new ITexture[] { aBaseTexture, - new GTRenderedTexture((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER) }; + return new ITexture[] { aBaseTexture, new GTRenderedTexture(Textures.BlockIcons.OVERLAY_MUFFLER) }; } @Override public ITexture[] getTexturesInactive(final ITexture aBaseTexture) { - return new ITexture[] { aBaseTexture, - new GTRenderedTexture((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER) }; + return new ITexture[] { aBaseTexture, new GTRenderedTexture(Textures.BlockIcons.OVERLAY_MUFFLER) }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchMufflerAdvanced.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchMufflerAdvanced.java index 2cf1ed3efe..dd38f1ab26 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchMufflerAdvanced.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchMufflerAdvanced.java @@ -299,8 +299,8 @@ public class MTEHatchMufflerAdvanced extends MTEHatchMuffler implements IAddGreg float zSpd; if (aDir.offsetY == -1) { float temp = GTPPCore.RANDOM.nextFloat() * 2.0F * GTPPCore.PI; - xSpd = (float) Math.sin((double) temp) * 0.1F; - zSpd = (float) Math.cos((double) temp) * 0.1F; + xSpd = (float) Math.sin(temp) * 0.1F; + zSpd = (float) Math.cos(temp) * 0.1F; } else { xSpd = (float) aDir.offsetX * (0.1F + 0.2F * GTPPCore.RANDOM.nextFloat()); zSpd = (float) aDir.offsetZ * (0.1F + 0.2F * GTPPCore.RANDOM.nextFloat()); @@ -309,34 +309,34 @@ public class MTEHatchMufflerAdvanced extends MTEHatchMuffler implements IAddGreg if (chk1) { aWorld.spawnParticle( name, - (double) (xPos + ran1 * 0.5F), - (double) (yPos + GTPPCore.RANDOM.nextFloat() * 0.5F), - (double) (zPos + GTPPCore.RANDOM.nextFloat() * 0.5F), - (double) xSpd, - (double) ySpd, - (double) zSpd); + xPos + ran1 * 0.5F, + yPos + GTPPCore.RANDOM.nextFloat() * 0.5F, + zPos + GTPPCore.RANDOM.nextFloat() * 0.5F, + xSpd, + ySpd, + zSpd); } if (chk2) { aWorld.spawnParticle( name, - (double) (xPos + ran2 * 0.5F), - (double) (yPos + GTPPCore.RANDOM.nextFloat() * 0.5F), - (double) (zPos + GTPPCore.RANDOM.nextFloat() * 0.5F), - (double) xSpd, - (double) ySpd, - (double) zSpd); + xPos + ran2 * 0.5F, + yPos + GTPPCore.RANDOM.nextFloat() * 0.5F, + zPos + GTPPCore.RANDOM.nextFloat() * 0.5F, + xSpd, + ySpd, + zSpd); } if (chk3) { aWorld.spawnParticle( name, - (double) (xPos + ran3 * 0.5F), - (double) (yPos + GTPPCore.RANDOM.nextFloat() * 0.5F), - (double) (zPos + GTPPCore.RANDOM.nextFloat() * 0.5F), - (double) xSpd, - (double) ySpd, - (double) zSpd); + xPos + ran3 * 0.5F, + yPos + GTPPCore.RANDOM.nextFloat() * 0.5F, + zPos + GTPPCore.RANDOM.nextFloat() * 0.5F, + xSpd, + ySpd, + zSpd); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSuperBusInput.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSuperBusInput.java index e95cea2762..a87d992139 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSuperBusInput.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSuperBusInput.java @@ -38,7 +38,7 @@ public class MTEHatchSuperBusInput extends MTEHatchInputBus { @Override public String[] getDescription() { - return new String[] { "Item Input for Multiblocks", "" + getSlots(this.mTier) + " Slots", + return new String[] { "Item Input for Multiblocks", getSlots(this.mTier) + " Slots", GTPPCore.GT_Tooltip.get() }; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchTurbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchTurbine.java index 09c3dd6efb..ee40ffdbe8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchTurbine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchTurbine.java @@ -106,8 +106,7 @@ public class MTEHatchTurbine extends MTEHatch { public boolean hasTurbine() { ItemStack aStack = this.mInventory[0]; - boolean aIsValid = MTELargerTurbineBase.isValidTurbine(aStack); - return aIsValid; + return MTELargerTurbineBase.isValidTurbine(aStack); } public ItemStack getTurbine() { @@ -194,15 +193,10 @@ public class MTEHatchTurbine extends MTEHatch { super.onPostTick(aBaseMetaTileEntity, aTick); if (this.mHasController) { if (aTick % 20 == 0) { - if (isControllerActive()) { - this.getBaseMetaTileEntity() - .setActive(true); - } else { - this.getBaseMetaTileEntity() - .setActive(false); - } + this.getBaseMetaTileEntity() + .setActive(isControllerActive()); } - } else if (!this.mHasController && this.mControllerLocation != null) { + } else if (this.mControllerLocation != null) { // Weird Invalid State if (setController(BlockPos.generateBlockPos(mControllerLocation))) { // Valid @@ -224,7 +218,7 @@ public class MTEHatchTurbine extends MTEHatch { } public MTELargerTurbineBase getController() { - if (this.mHasController && this.mControllerLocation != null && this.mControllerLocation.length() > 0) { + if (this.mHasController && this.mControllerLocation != null && !this.mControllerLocation.isEmpty()) { BlockPos p = BlockPos.generateBlockPos(mControllerLocation); if (p != null) { // Logger.INFO(p.getLocationString()); @@ -246,10 +240,7 @@ public class MTEHatchTurbine extends MTEHatch { } public boolean canSetNewController() { - if ((mControllerLocation != null && mControllerLocation.length() > 0) || this.mHasController) { - return false; - } - return true; + return (mControllerLocation == null || mControllerLocation.isEmpty()) && !this.mHasController; } public boolean setController(BlockPos aPos) { @@ -395,7 +386,7 @@ public class MTEHatchTurbine extends MTEHatch { aHasTurbine ? "Cannot remove turbine, no free inventory space." : "No turbine to remove."); } } else if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sSolderingToolList)) { - if (mControllerLocation != null && mControllerLocation.length() > 0) { + if (mControllerLocation != null && !mControllerLocation.isEmpty()) { if (setController(BlockPos.generateBlockPos(mControllerLocation))) { if (PlayerUtils.isCreative(aPlayer) || GTModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchTurbineProvider.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchTurbineProvider.java index 6a501a2531..5d0bc5c554 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchTurbineProvider.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchTurbineProvider.java @@ -110,18 +110,14 @@ public class MTEHatchTurbineProvider extends MTEHatchInputBus { public boolean isItemStackTurbine(ItemStack aStack) { if (aStack.getItem() instanceof MetaGeneratedTool) { - if (aStack.getItemDamage() >= 170 && aStack.getItemDamage() <= 176) { - return true; - } + return aStack.getItemDamage() >= 170 && aStack.getItemDamage() <= 176; } return false; } public boolean isItemStackScrewdriver(ItemStack aStack) { if (aStack.getItem() instanceof MetaGeneratedTool) { - if (aStack.getItemDamage() == 22 || aStack.getItemDamage() == 150) { - return true; - } + return aStack.getItemDamage() == 22 || aStack.getItemDamage() == 150; } return false; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTESuperBusOutput.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTESuperBusOutput.java index 686589b38a..0ea35495fa 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTESuperBusOutput.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTESuperBusOutput.java @@ -1,7 +1,5 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations; -import net.minecraft.inventory.IInventory; - import com.gtnewhorizons.modularui.api.screen.ModularWindow.Builder; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import com.gtnewhorizons.modularui.common.widget.Scrollable; @@ -68,8 +66,8 @@ public class MTESuperBusOutput extends MTEHatchOutputBus { if (this.mInventory[j] != null && (this.mInventory[i] == null || GTUtility.areStacksEqual(this.mInventory[i], this.mInventory[j]))) { GTUtility.moveStackFromSlotAToSlotB( - (IInventory) this.getBaseMetaTileEntity(), - (IInventory) this.getBaseMetaTileEntity(), + this.getBaseMetaTileEntity(), + this.getBaseMetaTileEntity(), j, i, (byte) 64, @@ -83,10 +81,9 @@ public class MTESuperBusOutput extends MTEHatchOutputBus { @Override public String[] getDescription() { - String[] aDesc = new String[] { "Item Output for Multiblocks", "" + getSlots(this.mTier) + " Slots", + return new String[] { "Item Output for Multiblocks", getSlots(this.mTier) + " Slots", "Left click with data stick to save filter config", "Right click with data stick to load filter config", GTPPCore.GT_Tooltip.get() }; - return aDesc; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java index b969227977..df55649bb5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java @@ -139,7 +139,7 @@ public abstract class GTPPMultiBlockBase<T extends MTEExtendedPowerMultiBlockBas public String[] getInfoData() { ArrayList<String> mInfo = new ArrayList<>(); if (!this.getMetaName() - .equals("")) { + .isEmpty()) { mInfo.add(this.getMetaName()); } @@ -148,11 +148,7 @@ public abstract class GTPPMultiBlockBase<T extends MTEExtendedPowerMultiBlockBas if (extra == null) { extra = new String[0]; } - if (extra.length > 0) { - for (String s : extra) { - mInfo.add(s); - } - } + mInfo.addAll(Arrays.asList(extra)); long seconds = (this.mTotalRunTime / 20); int weeks = (int) (TimeUnit.SECONDS.toDays(seconds) / 7); @@ -183,20 +179,18 @@ public abstract class GTPPMultiBlockBase<T extends MTEExtendedPowerMultiBlockBas mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.energy") + ":"); mInfo.add( StatCollector.translateToLocal( - "" + EnumChatFormatting.GREEN - + Long.toString(storedEnergy) + EnumChatFormatting.GREEN.toString() + storedEnergy + EnumChatFormatting.RESET + " EU / " + EnumChatFormatting.YELLOW - + Long.toString(maxEnergy) + + maxEnergy + EnumChatFormatting.RESET + " EU")); mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.mei") + ":"); mInfo.add( StatCollector.translateToLocal( - "" + EnumChatFormatting.YELLOW - + Long.toString(getMaxInputVoltage()) + EnumChatFormatting.YELLOW.toString() + getMaxInputVoltage() + EnumChatFormatting.RESET + " EU/t(*2A) " + StatCollector.translateToLocal("GTPP.machines.tier") @@ -211,12 +205,11 @@ public abstract class GTPPMultiBlockBase<T extends MTEExtendedPowerMultiBlockBas mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.energy") + " In Dynamos:"); mInfo.add( StatCollector.translateToLocal( - "" + EnumChatFormatting.GREEN - + Long.toString(storedEnergy) + EnumChatFormatting.GREEN.toString() + storedEnergy + EnumChatFormatting.RESET + " EU / " + EnumChatFormatting.YELLOW - + Long.toString(maxEnergy) + + maxEnergy + EnumChatFormatting.RESET + " EU")); } @@ -242,7 +235,7 @@ public abstract class GTPPMultiBlockBase<T extends MTEExtendedPowerMultiBlockBas + StatCollector.translateToLocal("GTPP.multiblock.efficiency") + ": " + EnumChatFormatting.YELLOW - + Float.toString(mEfficiency / 100.0F) + + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %"); @@ -270,11 +263,11 @@ public abstract class GTPPMultiBlockBase<T extends MTEExtendedPowerMultiBlockBas mInfo.add( "Total Time Since Built: " + EnumChatFormatting.DARK_GREEN - + Integer.toString(weeks) + + weeks + EnumChatFormatting.RESET + " Weeks, " + EnumChatFormatting.DARK_GREEN - + Integer.toString(days) + + days + EnumChatFormatting.RESET + " Days, "); mInfo.add( @@ -282,17 +275,16 @@ public abstract class GTPPMultiBlockBase<T extends MTEExtendedPowerMultiBlockBas + EnumChatFormatting.RESET + " Hours, " + EnumChatFormatting.DARK_GREEN - + Long.toString(minutes) + + minutes + EnumChatFormatting.RESET + " Minutes, " + EnumChatFormatting.DARK_GREEN - + Long.toString(second) + + second + EnumChatFormatting.RESET + " Seconds."); - mInfo.add("Total Time in ticks: " + EnumChatFormatting.DARK_GREEN + Long.toString(this.mTotalRunTime)); + mInfo.add("Total Time in ticks: " + EnumChatFormatting.DARK_GREEN + this.mTotalRunTime); - String[] mInfo2 = mInfo.toArray(new String[mInfo.size()]); - return mInfo2; + return mInfo.toArray(new String[0]); } public int getPollutionReductionForAllMufflers() { @@ -409,10 +401,8 @@ public abstract class GTPPMultiBlockBase<T extends MTEExtendedPowerMultiBlockBas } public boolean isMachineRunning() { - boolean aRunning = this.getBaseMetaTileEntity() + return this.getBaseMetaTileEntity() .isActive(); - // log("Queried Multiblock is currently running: "+aRunning); - return aRunning; } @Override @@ -423,19 +413,16 @@ public abstract class GTPPMultiBlockBase<T extends MTEExtendedPowerMultiBlockBas .doExplosion(GTValues.V[8])) { tTileEntity = localIterator.next(); } - tTileEntity = null; for (final Iterator<MTEHatchOutputBattery> localIterator = this.mDischargeHatches.iterator(); localIterator .hasNext(); tTileEntity.getBaseMetaTileEntity() .doExplosion(GTValues.V[8])) { tTileEntity = localIterator.next(); } - tTileEntity = null; for (final Iterator<MTEHatch> localIterator = this.mTecTechDynamoHatches.iterator(); localIterator .hasNext(); tTileEntity.getBaseMetaTileEntity() .doExplosion(GTValues.V[8])) { tTileEntity = localIterator.next(); } - tTileEntity = null; for (final Iterator<MTEHatch> localIterator = this.mTecTechEnergyHatches.iterator(); localIterator .hasNext(); tTileEntity.getBaseMetaTileEntity() .doExplosion(GTValues.V[8])) { @@ -465,7 +452,7 @@ public abstract class GTPPMultiBlockBase<T extends MTEExtendedPowerMultiBlockBas } public ItemStack findItemInInventory(ItemStack aSearchStack) { - if (aSearchStack != null && this.mInputBusses.size() > 0) { + if (aSearchStack != null && !this.mInputBusses.isEmpty()) { for (MTEHatchInputBus bus : this.mInputBusses) { if (bus != null) { for (ItemStack uStack : bus.mInventory) { @@ -513,8 +500,7 @@ public abstract class GTPPMultiBlockBase<T extends MTEExtendedPowerMultiBlockBas } public boolean checkHatch() { - return mMaintenanceHatches.size() <= 1 - && (this.getPollutionPerSecond(null) > 0 ? !mMufflerHatches.isEmpty() : true); + return mMaintenanceHatches.size() <= 1 && (this.getPollutionPerSecond(null) <= 0 || !mMufflerHatches.isEmpty()); } @Override @@ -610,8 +596,7 @@ public abstract class GTPPMultiBlockBase<T extends MTEExtendedPowerMultiBlockBas if (aTileEntity == null) { return null; } - final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - return aMetaTileEntity; + return aTileEntity.getMetaTileEntity(); } @Override @@ -782,28 +767,27 @@ public abstract class GTPPMultiBlockBase<T extends MTEExtendedPowerMultiBlockBas if (aTileEntity == null) { return false; } - final IMetaTileEntity aMetaTileEntity = aTileEntity; - if (aMetaTileEntity instanceof MTEHatchInput || aMetaTileEntity instanceof MTEHatchInputBus - || aMetaTileEntity instanceof MteHatchSteamBusInput) { - if (aMetaTileEntity instanceof MTEHatchInput) { - ((MTEHatchInput) aMetaTileEntity).mRecipeMap = null; - ((MTEHatchInput) aMetaTileEntity).mRecipeMap = aMap; + if (aTileEntity instanceof MTEHatchInput || aTileEntity instanceof MTEHatchInputBus + || aTileEntity instanceof MteHatchSteamBusInput) { + if (aTileEntity instanceof MTEHatchInput) { + ((MTEHatchInput) aTileEntity).mRecipeMap = null; + ((MTEHatchInput) aTileEntity).mRecipeMap = aMap; if (aMap != null) { log("Remapped Input Hatch to " + aMap.unlocalizedName + "."); } else { log("Cleared Input Hatch."); } - } else if (aMetaTileEntity instanceof MTEHatchInputBus) { - ((MTEHatchInputBus) aMetaTileEntity).mRecipeMap = null; - ((MTEHatchInputBus) aMetaTileEntity).mRecipeMap = aMap; + } else if (aTileEntity instanceof MTEHatchInputBus) { + ((MTEHatchInputBus) aTileEntity).mRecipeMap = null; + ((MTEHatchInputBus) aTileEntity).mRecipeMap = aMap; if (aMap != null) { log("Remapped Input Bus to " + aMap.unlocalizedName + "."); } else { log("Cleared Input Bus."); } } else { - ((MteHatchSteamBusInput) aMetaTileEntity).mRecipeMap = null; - ((MteHatchSteamBusInput) aMetaTileEntity).mRecipeMap = aMap; + ((MteHatchSteamBusInput) aTileEntity).mRecipeMap = null; + ((MteHatchSteamBusInput) aTileEntity).mRecipeMap = aMap; if (aMap != null) { log("Remapped Input Bus to " + aMap.unlocalizedName + "."); } else { @@ -997,8 +981,7 @@ public abstract class GTPPMultiBlockBase<T extends MTEExtendedPowerMultiBlockBas } } // Do Super - boolean aSuper = super.onRightclick(aBaseMetaTileEntity, aPlayer, side, aX, aY, aZ); - return aSuper; + return super.onRightclick(aBaseMetaTileEntity, aPlayer, side, aX, aY, aZ); } public boolean onPlungerRightClick(EntityPlayer aPlayer, ForgeDirection side, float aX, float aY, float aZ) { @@ -1371,8 +1354,7 @@ public abstract class GTPPMultiBlockBase<T extends MTEExtendedPowerMultiBlockBas () -> StatCollector.translateToLocal("GTPP.multiblock.specialvalue") + ": " + EnumChatFormatting.RED + getLastRecipeEU() - + EnumChatFormatting.RESET - + "") + + EnumChatFormatting.RESET) .setDefaultColor(COLOR_TEXT_WHITE.get()) .setEnabled( widget -> mMachine && getLastRecipeEU() != 0 diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTEBoilerBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTEBoilerBase.java index 6387624a1c..ed6432a58f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTEBoilerBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTEBoilerBase.java @@ -225,7 +225,7 @@ public abstract class MTEBoilerBase extends MTEBasicTank { } if ((aTick % 10L) == 0L) { if (this.mTemperature > 100) { - if ((this.mFluid == null) || (!GTModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0)) { + if ((!GTModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0)) { this.mHadNoWater = true; } else { if (this.mHadNoWater) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTERocketFuelGeneratorBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTERocketFuelGeneratorBase.java index ae5e653de0..40678f203f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTERocketFuelGeneratorBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/MTERocketFuelGeneratorBase.java @@ -232,7 +232,7 @@ public abstract class MTERocketFuelGeneratorBase extends MTEBasicTank implements if ((tFluidAmountToUse > 0) && aBaseMetaTileEntity.increaseStoredEnergyUnits(tFluidAmountToUse * tFuelValue, true)) { int aSafeFloor = (int) Math.max(((tFluidAmountToUse * tConsumed) / 3), 1); - this.mFluid.amount -= (int) aSafeFloor; + this.mFluid.amount -= aSafeFloor; PollutionUtils.addPollution(getBaseMetaTileEntity(), 10 * getPollution()); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchNbtConsumable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchNbtConsumable.java index b626bcc8ba..8cf42533c7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchNbtConsumable.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchNbtConsumable.java @@ -211,7 +211,7 @@ public abstract class MTEHatchNbtConsumable extends MTEHatch implements IAddGreg // Then Move stack to Usage slots for (int i = getSlotID_FirstUsage(); i <= getSlotID_LastUsage(); i++) { if (mInventory[i] == null) { - if ((aFoundMatching && aAllowMultiOfSameTypeInUsageSlots) || !aFoundMatching) { + if (!aFoundMatching || aAllowMultiOfSameTypeInUsageSlots) { mInventory[i] = aStackToMove; aDidSet = true; Logger.INFO("Moving new stack to usage slots."); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java index 2cafd18a39..ea5e46a534 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java @@ -51,9 +51,7 @@ public class GregtechItemData { } } this.mByProducts = j > 0 ? new GregtechMaterialStack[j] : EMPTY_GT_MaterialStack_ARRAY; - for (int i = 0; i < this.mByProducts.length; i++) { - this.mByProducts[i] = tByProducts[i]; - } + System.arraycopy(tByProducts, 0, this.mByProducts, 0, this.mByProducts.length); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java index 32f1f127d0..087e4fb056 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java @@ -15,7 +15,7 @@ import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; public class GregtechMetaCasingBlocksPipeGearbox extends GregtechMetaCasingBlocksAbstract { - private static HashMap<Integer, Integer> sMaterialMapping = new HashMap<>(); + private static final HashMap<Integer, Integer> sMaterialMapping = new HashMap<>(); public GregtechMetaCasingBlocksPipeGearbox() { super(GregtechMetaCasingItems.class, "gtplusplus.blockcasings.pipesgears", MaterialCasings.INSTANCE); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java index 128e9c95d7..8208147236 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java @@ -13,43 +13,43 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MT public class TexturesGrinderMultiblock { - private static CustomIcon GT8_1_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE1"); - private static CustomIcon GT8_1 = new CustomIcon("iconsets/Grinder/GRINDER1"); - private static CustomIcon GT8_2_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE2"); - private static CustomIcon GT8_2 = new CustomIcon("iconsets/Grinder/GRINDER2"); - private static CustomIcon GT8_3_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE3"); - private static CustomIcon GT8_3 = new CustomIcon("iconsets/Grinder/GRINDER3"); - private static CustomIcon GT8_4_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE4"); - private static CustomIcon GT8_4 = new CustomIcon("iconsets/Grinder/GRINDER4"); - private static CustomIcon GT8_5_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE5"); - private static CustomIcon GT8_5 = new CustomIcon("iconsets/Grinder/GRINDER5"); - private static CustomIcon GT8_6_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE6"); - private static CustomIcon GT8_6 = new CustomIcon("iconsets/Grinder/GRINDER6"); - private static CustomIcon GT8_7_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE7"); - private static CustomIcon GT8_7 = new CustomIcon("iconsets/Grinder/GRINDER7"); - private static CustomIcon GT8_8_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE8"); - private static CustomIcon GT8_8 = new CustomIcon("iconsets/Grinder/GRINDER8"); - private static CustomIcon GT8_9_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE9"); - private static CustomIcon GT8_9 = new CustomIcon("iconsets/Grinder/GRINDER9"); + private static final CustomIcon GT8_1_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE1"); + private static final CustomIcon GT8_1 = new CustomIcon("iconsets/Grinder/GRINDER1"); + private static final CustomIcon GT8_2_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE2"); + private static final CustomIcon GT8_2 = new CustomIcon("iconsets/Grinder/GRINDER2"); + private static final CustomIcon GT8_3_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE3"); + private static final CustomIcon GT8_3 = new CustomIcon("iconsets/Grinder/GRINDER3"); + private static final CustomIcon GT8_4_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE4"); + private static final CustomIcon GT8_4 = new CustomIcon("iconsets/Grinder/GRINDER4"); + private static final CustomIcon GT8_5_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE5"); + private static final CustomIcon GT8_5 = new CustomIcon("iconsets/Grinder/GRINDER5"); + private static final CustomIcon GT8_6_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE6"); + private static final CustomIcon GT8_6 = new CustomIcon("iconsets/Grinder/GRINDER6"); + private static final CustomIcon GT8_7_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE7"); + private static final CustomIcon GT8_7 = new CustomIcon("iconsets/Grinder/GRINDER7"); + private static final CustomIcon GT8_8_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE8"); + private static final CustomIcon GT8_8 = new CustomIcon("iconsets/Grinder/GRINDER8"); + private static final CustomIcon GT8_9_Active = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE9"); + private static final CustomIcon GT8_9 = new CustomIcon("iconsets/Grinder/GRINDER9"); - private static CustomIcon frontFace_0 = (GT8_1); - private static CustomIcon frontFaceActive_0 = (GT8_1_Active); - private static CustomIcon frontFace_1 = (GT8_2); - private static CustomIcon frontFaceActive_1 = (GT8_2_Active); - private static CustomIcon frontFace_2 = (GT8_3); - private static CustomIcon frontFaceActive_2 = (GT8_3_Active); - private static CustomIcon frontFace_3 = (GT8_4); - private static CustomIcon frontFaceActive_3 = (GT8_4_Active); - private static CustomIcon frontFace_4 = (GT8_5); - private static CustomIcon frontFaceActive_4 = (GT8_5_Active); - private static CustomIcon frontFace_5 = (GT8_6); - private static CustomIcon frontFaceActive_5 = (GT8_6_Active); - private static CustomIcon frontFace_6 = (GT8_7); - private static CustomIcon frontFaceActive_6 = (GT8_7_Active); - private static CustomIcon frontFace_7 = (GT8_8); - private static CustomIcon frontFaceActive_7 = (GT8_8_Active); - private static CustomIcon frontFace_8 = (GT8_9); - private static CustomIcon frontFaceActive_8 = (GT8_9_Active); + private static final CustomIcon frontFace_0 = (GT8_1); + private static final CustomIcon frontFaceActive_0 = (GT8_1_Active); + private static final CustomIcon frontFace_1 = (GT8_2); + private static final CustomIcon frontFaceActive_1 = (GT8_2_Active); + private static final CustomIcon frontFace_2 = (GT8_3); + private static final CustomIcon frontFaceActive_2 = (GT8_3_Active); + private static final CustomIcon frontFace_3 = (GT8_4); + private static final CustomIcon frontFaceActive_3 = (GT8_4_Active); + private static final CustomIcon frontFace_4 = (GT8_5); + private static final CustomIcon frontFaceActive_4 = (GT8_5_Active); + private static final CustomIcon frontFace_5 = (GT8_6); + private static final CustomIcon frontFaceActive_5 = (GT8_6_Active); + private static final CustomIcon frontFace_6 = (GT8_7); + private static final CustomIcon frontFaceActive_6 = (GT8_7_Active); + private static final CustomIcon frontFace_7 = (GT8_8); + private static final CustomIcon frontFaceActive_7 = (GT8_8_Active); + private static final CustomIcon frontFace_8 = (GT8_9); + private static final CustomIcon frontFaceActive_8 = (GT8_9_Active); CustomIcon[] GRINDER = new CustomIcon[] { frontFace_0, frontFace_1, frontFace_2, frontFace_3, frontFace_4, frontFace_5, frontFace_6, frontFace_7, frontFace_8 }; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java index dea287fde6..e0acc6666d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/turbine/LargeTurbineTextureHandler.java @@ -383,16 +383,12 @@ public class LargeTurbineTextureHandler { public static boolean isUsingAnimatedTexture(TileEntity tTileEntity) { boolean aVal = true; - IGregTechTileEntity aTile; - if (tTileEntity instanceof IGregTechTileEntity) { - aTile = (IGregTechTileEntity) tTileEntity; - if (aTile != null) { - final IMetaTileEntity aMetaTileEntity = aTile.getMetaTileEntity(); - if (aMetaTileEntity != null && aMetaTileEntity instanceof MTEHatchTurbine) { - aVal = ((MTEHatchTurbine) aMetaTileEntity).getBaseMetaTileEntity() - .isActive(); - // Logger.INFO("Returning "+aVal+" as Rotor Assembly controller status"); - } + if (tTileEntity instanceof IGregTechTileEntity aTile) { + final IMetaTileEntity aMetaTileEntity = aTile.getMetaTileEntity(); + if (aMetaTileEntity instanceof MTEHatchTurbine) { + aVal = aMetaTileEntity.getBaseMetaTileEntity() + .isActive(); + // Logger.INFO("Returning "+aVal+" as Rotor Assembly controller status"); } } return aVal; @@ -401,7 +397,7 @@ public class LargeTurbineTextureHandler { public static MTEHatchTurbine isTurbineHatch(final IGregTechTileEntity aTileEntity) { if (aTileEntity != null) { final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity != null && aMetaTileEntity instanceof MTEHatchTurbine) { + if (aMetaTileEntity instanceof MTEHatchTurbine) { return (MTEHatchTurbine) aMetaTileEntity; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverToggleVisual.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverToggleVisual.java index 2ba532d11f..891035f7ac 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverToggleVisual.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverToggleVisual.java @@ -31,8 +31,7 @@ public class CoverToggleVisual extends CoverBehavior { BlockPos aPos = new BlockPos( aEntity.getIGregTechTileEntity(aEntity.getXCoord(), aEntity.getYCoord(), aEntity.getZCoord())); - String s = aEntity.getInventoryName() + "." + aPos.getUniqueIdentifier() + side.name(); - return s; + return aEntity.getInventoryName() + "." + aPos.getUniqueIdentifier() + side.name(); } catch (Throwable t) {} XSTR x = new XSTR(); return "ERROR." + x.getSeed() + x.hashCode() + x.nextDouble() + ".ID"; @@ -168,10 +167,10 @@ public class CoverToggleVisual extends CoverBehavior { public static boolean getConnectionState(String aKey) { Integer b = sConnectionStateForEntityMap.get(aKey); // Logger.INFO("Get State: "+b+" | "+aKey); - return b != null ? b == VALUE_ON : false; + return b != null && b == VALUE_ON; } - public static final boolean getCoverConnections(final ItemStack aStack) { + public static boolean getCoverConnections(final ItemStack aStack) { NBTTagCompound aNBT = aStack.getTagCompound(); if (aNBT != null) { aNBT = aNBT.getCompoundTag("CustomCoverMeta"); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java index 773bf0127e..4ef2838542 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java @@ -46,7 +46,7 @@ public class FlotationRecipeHandler { } public static ItemStack findMilledStack(ItemStack[] aInputs) { - if (aInputs == null || aInputs.length <= 0) { + if (aInputs == null) { return null; } for (ItemStack aStack : aInputs) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java index 03a4ace32f..35de0d8cea 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java @@ -25,7 +25,7 @@ public class TesseractHelper { */ // Checks if a Generator is owned by a player. - public static final boolean isGeneratorOwnedByPlayer(EntityPlayer player, MTETesseractGenerator generator) { + public static boolean isGeneratorOwnedByPlayer(EntityPlayer player, MTETesseractGenerator generator) { if (player == null) { Logger.WARNING("Failed. [isGeneratorOwnedByPlayer]"); return false; @@ -50,7 +50,7 @@ public class TesseractHelper { } // Saves A Generator to the Players UUID map along with the Freq. - public static final boolean setGeneratorOwnershipByPlayer(EntityPlayer player, int freq, + public static boolean setGeneratorOwnershipByPlayer(EntityPlayer player, int freq, MTETesseractGenerator generator) { if (player == null) { return false; @@ -82,7 +82,7 @@ public class TesseractHelper { } // Gets Generator based on Frequency. - public static final MTETesseractGenerator getGeneratorByFrequency(EntityPlayer player, int freq) { + public static MTETesseractGenerator getGeneratorByFrequency(EntityPlayer player, int freq) { if (player == null) { return null; } @@ -107,7 +107,7 @@ public class TesseractHelper { } // Remove Tesseract Generator - public static final boolean removeGenerator(EntityPlayer player, int frequency) { + public static boolean removeGenerator(EntityPlayer player, int frequency) { if (player == null) { return false; } @@ -129,7 +129,7 @@ public class TesseractHelper { */ // Checks if a Terminal is owned by a player. - public static final boolean isTerminalOwnedByPlayer(EntityPlayer player, MTETesseractTerminal generator) { + public static boolean isTerminalOwnedByPlayer(EntityPlayer player, MTETesseractTerminal generator) { if (player == null) { return false; } @@ -148,8 +148,7 @@ public class TesseractHelper { } // Saves A Terminal to the Players UUID map along with the Freq. - public static final boolean setTerminalOwnershipByPlayer(EntityPlayer player, int freq, - MTETesseractTerminal generator) { + public static boolean setTerminalOwnershipByPlayer(EntityPlayer player, int freq, MTETesseractTerminal generator) { if (player == null) { return false; } @@ -178,7 +177,7 @@ public class TesseractHelper { } // Gets Terminal based on Frequency. - public static final MTETesseractTerminal getTerminalByFrequency(EntityPlayer player, int freq) { + public static MTETesseractTerminal getTerminalByFrequency(EntityPlayer player, int freq) { if (player == null) { return null; } @@ -200,7 +199,7 @@ public class TesseractHelper { } // Remove Tesseract Terminal - public static final boolean removeTerminal(EntityPlayer player, int frequency) { + public static boolean removeTerminal(EntityPlayer player, int frequency) { if (player == null) { return false; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java index a6cd63ca19..76b0ca91ea 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java @@ -18,7 +18,6 @@ import org.apache.commons.lang3.StringUtils; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.GregTechAPI; import gregtech.api.interfaces.IIconContainer; -import gregtech.api.interfaces.ITexture; import gregtech.api.objects.GTMultiTexture; import gregtech.api.objects.GTRenderedTexture; import gtPlusPlus.api.objects.Logger; @@ -74,7 +73,7 @@ public class MetaCustomCoverItem extends Item { } GregTechAPI.registerCover( thisStack, - new GTMultiTexture(new ITexture[] { new GTRenderedTexture(mTextures[i]) }), + new GTMultiTexture(new GTRenderedTexture(mTextures[i])), new CoverToggleVisual()); } } @@ -112,7 +111,7 @@ public class MetaCustomCoverItem extends Item { return true; } - public static final long getCoverDamage(final ItemStack aStack) { + public static long getCoverDamage(final ItemStack aStack) { NBTTagCompound aNBT = aStack.getTagCompound(); if (aNBT != null) { aNBT = aNBT.getCompoundTag("CustomCoverMeta"); @@ -125,7 +124,7 @@ public class MetaCustomCoverItem extends Item { return 0L; } - public static final boolean setCoverDamage(final ItemStack aStack, final long aDamage) { + public static boolean setCoverDamage(final ItemStack aStack, final long aDamage) { NBTTagCompound aNBT = aStack.getTagCompound(); if (aNBT != null) { aNBT = aNBT.getCompoundTag("CustomCoverMeta"); @@ -137,7 +136,7 @@ public class MetaCustomCoverItem extends Item { return false; } - public static final boolean getCoverConnections(final ItemStack aStack) { + public static boolean getCoverConnections(final ItemStack aStack) { NBTTagCompound aNBT = aStack.getTagCompound(); if (aNBT != null) { aNBT = aNBT.getCompoundTag("CustomCoverMeta"); @@ -150,7 +149,7 @@ public class MetaCustomCoverItem extends Item { return false; } - public static final boolean setCoverConnections(final ItemStack aStack, final boolean aConnections) { + public static boolean setCoverConnections(final ItemStack aStack, final boolean aConnections) { NBTTagCompound aNBT = aStack.getTagCompound(); if (aNBT != null) { aNBT = aNBT.getCompoundTag("CustomCoverMeta"); @@ -169,19 +168,14 @@ public class MetaCustomCoverItem extends Item { } double currentDamage = getCoverDamage(stack); double meta = stack.getItemDamage() == 0 ? 50 : 2500; - double durabilitypercent = currentDamage / meta; - return durabilitypercent; + return currentDamage / meta; } @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { if (KeyboardUtils.isShiftKeyDown()) { boolean con = getCoverConnections(stack); - if (con) { - setCoverConnections(stack, false); - } else { - setCoverConnections(stack, true); - } + setCoverConnections(stack, !con); } return stack; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java index be7a0f1c99..5a1bb0eba5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java @@ -16,7 +16,7 @@ import gtPlusPlus.core.util.minecraft.PlayerUtils; public class Behaviour_Choocher extends BehaviourNone { - private boolean isWrench = true; + private final boolean isWrench = true; private final BehaviourWrench wrench = new BehaviourWrench(150); private final Behaviour_Prospecting_Ex prospecting = new Behaviour_Prospecting_Ex(10, 1250); private final String mTooltip1 = GTLanguageManager diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java index f63da57f1c..4196d399a1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java @@ -68,9 +68,7 @@ public class Behaviour_Prospecting_Ex extends BehaviourProspecting { int tY = aY; int tZ = aZ; int tMetaID = 0; - final int tQuality = ((aItem instanceof MetaGeneratedTool) - ? ((MetaGeneratedTool) aItem).getHarvestLevel(aStack, "") - : 0) * 3; + final int tQuality = ((aItem instanceof MetaGeneratedTool) ? aItem.getHarvestLevel(aStack, "") : 0) * 3; int i = 0; for (final int j = 6 + tQuality; i < j; i++) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/MachineBlockRenderer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/MachineBlockRenderer.java index 7ce7002738..e39a6fcbba 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/MachineBlockRenderer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/MachineBlockRenderer.java @@ -232,21 +232,19 @@ public class MachineBlockRenderer extends GTRendererBlock { RenderBlocks aRenderer) { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); - return tTileEntity instanceof ITexturedTileEntity - ? renderStandardBlock( - aWorld, - aX, - aY, - aZ, - aBlock, - aRenderer, - new ITexture[][] { GTMethodHelper.getTexture(tTileEntity, aBlock, DOWN), - GTMethodHelper.getTexture(tTileEntity, aBlock, UP), - GTMethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.NORTH), - GTMethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.SOUTH), - GTMethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.WEST), - GTMethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.EAST) }) - : false; + return tTileEntity instanceof ITexturedTileEntity && renderStandardBlock( + aWorld, + aX, + aY, + aZ, + aBlock, + aRenderer, + new ITexture[][] { GTMethodHelper.getTexture(tTileEntity, aBlock, DOWN), + GTMethodHelper.getTexture(tTileEntity, aBlock, UP), + GTMethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.NORTH), + GTMethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.SOUTH), + GTMethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.WEST), + GTMethodHelper.getTexture(tTileEntity, aBlock, ForgeDirection.EAST) }); } public boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, @@ -1220,22 +1218,13 @@ public class MachineBlockRenderer extends GTRendererBlock { public boolean renderWorldBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, int aModelID, RenderBlocks aRenderer) { TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ); - return aTileEntity == null ? false - : (aTileEntity instanceof IGregTechTileEntity - && ((IGregTechTileEntity) aTileEntity).getMetaTileEntity() != null - && ((IGregTechTileEntity) aTileEntity).getMetaTileEntity() - .renderInWorld(aWorld, aX, aY, aZ, aBlock, aRenderer) - ? true - : (aTileEntity instanceof IPipeRenderedTileEntity - ? renderPipeBlock( - aWorld, - aX, - aY, - aZ, - aBlock, - (IPipeRenderedTileEntity) aTileEntity, - aRenderer) - : renderStandardBlock(aWorld, aX, aY, aZ, aBlock, aRenderer))); + return aTileEntity != null && (aTileEntity instanceof IGregTechTileEntity + && ((IGregTechTileEntity) aTileEntity).getMetaTileEntity() != null + && ((IGregTechTileEntity) aTileEntity).getMetaTileEntity() + .renderInWorld(aWorld, aX, aY, aZ, aBlock, aRenderer) + || (aTileEntity instanceof IPipeRenderedTileEntity + ? renderPipeBlock(aWorld, aX, aY, aZ, aBlock, (IPipeRenderedTileEntity) aTileEntity, aRenderer) + : renderStandardBlock(aWorld, aX, aY, aZ, aBlock, aRenderer))); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTEElectricAutoWorkbench.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTEElectricAutoWorkbench.java index 05150c8478..73233b7938 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTEElectricAutoWorkbench.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTEElectricAutoWorkbench.java @@ -391,7 +391,9 @@ public class MTEElectricAutoWorkbench extends MTEBasicTank implements IAddGregte tTempStack.stackSize = 1; tRecipe[0] = tTempStack; tOutput = GTOreDictUnificator.get(true, tTempStack); - if (tOutput != null && GTUtility.areStacksEqual(tOutput, tTempStack)) tOutput = null; + if (GTUtility.areStacksEqual(tOutput, tTempStack)) { + tOutput = null; + } if (tOutput == null) { tRecipe[0] = null; if (mInventory[18] == null) { @@ -552,7 +554,7 @@ public class MTEElectricAutoWorkbench extends MTEBasicTank implements IAddGregte mInventory[28] = GTUtility.copy(tOutput); ArrayList<ItemStack> tList = recipeContent(tRecipe), tContent = benchContent(); - if (tList.size() > 0 && tContent.size() > 0) { + if (!tList.isEmpty() && !tContent.isEmpty()) { boolean success = (mMode == 6 || mMode == 7 || mInventory[17] == null); for (byte i = 0; i < tList.size() && success; i++) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTETesseractGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTETesseractGenerator.java index 08db4e19be..a48bcdace4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTETesseractGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTETesseractGenerator.java @@ -196,13 +196,10 @@ public class MTETesseractGenerator extends MTEBasicTank { .getOwnerName() != null && !this.getBaseMetaTileEntity() .getOwnerName() - .equals("")) { + .isEmpty()) { if (this.getBaseMetaTileEntity() .getOwnerName() - .toLowerCase() - .equals( - aPlayer.getDisplayName() - .toLowerCase())) { + .equalsIgnoreCase(aPlayer.getDisplayName())) { this.mOwner = PlayerUtils.getPlayersUUIDByName( this.getBaseMetaTileEntity() .getOwnerName()); @@ -684,8 +681,8 @@ public class MTETesseractGenerator extends MTEBasicTank { && (this.getBaseMetaTileEntity() .decreaseStoredEnergyUnits(this.mNeededEnergy, false))) { // Utils.LOG_WARNING("Can Work & Has Energy"); - if ((getGeneratorEntity(Integer.valueOf(this.mFrequency)) == null) - || (!getGeneratorEntity(Integer.valueOf(this.mFrequency)).isValidTesseractGenerator(null, true))) { + if ((getGeneratorEntity(this.mFrequency) == null) + || (!getGeneratorEntity(this.mFrequency).isValidTesseractGenerator(null, true))) { // Utils.LOG_WARNING("storing TE I think to mFreq map?"); TesseractHelper.setGeneratorOwnershipByPlayer( PlayerUtils.getPlayerOnServerFromUUID(mOwner), @@ -693,7 +690,7 @@ public class MTETesseractGenerator extends MTEBasicTank { this); } } else { - if (getGeneratorEntity(Integer.valueOf(this.mFrequency)) == this) { + if (getGeneratorEntity(this.mFrequency) == this) { Logger.WARNING("this gen == mFreq on map - do block update"); TesseractHelper.removeGenerator(PlayerUtils.getPlayerOnServerFromUUID(mOwner), this.mFrequency); this.getBaseMetaTileEntity() @@ -701,7 +698,7 @@ public class MTETesseractGenerator extends MTEBasicTank { } this.isWorking = 0; } - if (getGeneratorEntity(Integer.valueOf(this.mFrequency)) == this) { + if (getGeneratorEntity(this.mFrequency) == this) { // Utils.LOG_WARNING("mFreq == this - do work related things"); if (this.isWorking < 20) { this.isWorking = ((byte) (this.isWorking + 1)); @@ -789,21 +786,11 @@ public class MTETesseractGenerator extends MTEBasicTank { } private MTETesseractGenerator getGeneratorEntity() { - MTETesseractGenerator thisGenerator = TesseractHelper - .getGeneratorByFrequency(PlayerUtils.getPlayerOnServerFromUUID(mOwner), this.mFrequency); - if (thisGenerator != null) { - return thisGenerator; - } - return null; + return TesseractHelper.getGeneratorByFrequency(PlayerUtils.getPlayerOnServerFromUUID(mOwner), this.mFrequency); } private MTETesseractGenerator getGeneratorEntity(int frequency) { - MTETesseractGenerator thisGenerator = TesseractHelper - .getGeneratorByFrequency(PlayerUtils.getPlayerOnServerFromUUID(mOwner), frequency); - if (thisGenerator != null) { - return thisGenerator; - } - return null; + return TesseractHelper.getGeneratorByFrequency(PlayerUtils.getPlayerOnServerFromUUID(mOwner), frequency); } @Override @@ -812,7 +799,7 @@ public class MTETesseractGenerator extends MTEBasicTank { .getOwnerName() != null && !this.getBaseMetaTileEntity() .getOwnerName() - .equals("")) { + .isEmpty()) { this.mOwner = PlayerUtils.getPlayersUUIDByName( this.getBaseMetaTileEntity() .getOwnerName()); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTETesseractTerminal.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTETesseractTerminal.java index c34a2ca41b..1935129e32 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTETesseractTerminal.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/MTETesseractTerminal.java @@ -149,13 +149,10 @@ public class MTETesseractTerminal extends MTEBasicTank { .getOwnerName() != null && !this.getBaseMetaTileEntity() .getOwnerName() - .equals("")) { + .isEmpty()) { if (this.getBaseMetaTileEntity() .getOwnerName() - .toLowerCase() - .equals( - aPlayer.getDisplayName() - .toLowerCase())) { + .equalsIgnoreCase(aPlayer.getDisplayName())) { this.mOwner = PlayerUtils.getPlayersUUIDByName( this.getBaseMetaTileEntity() .getOwnerName()); @@ -194,11 +191,7 @@ public class MTETesseractTerminal extends MTEBasicTank { } PlayerUtils.messagePlayer(aPlayer, "Frequency: " + this.mFrequency); if (this.getTesseract(this.mFrequency, false) != null) { - PlayerUtils.messagePlayer( - aPlayer, - new StringBuilder().append(EnumChatFormatting.GREEN) - .append(" (Connected)") - .toString()); + PlayerUtils.messagePlayer(aPlayer, EnumChatFormatting.GREEN + " (Connected)"); } } } else if (aPlayer.getUniqueID() @@ -250,9 +243,7 @@ public class MTETesseractTerminal extends MTEBasicTank { aPlayer, "Frequency: " + this.mFrequency + (this.getTesseract(this.mFrequency, false) == null ? "" - : new StringBuilder().append(EnumChatFormatting.GREEN) - .append(" (Connected)") - .toString())); + : EnumChatFormatting.GREEN + " (Connected)")); } } else if (aPlayer.getUniqueID() .compareTo(this.mOwner) != 0) { @@ -275,10 +266,8 @@ public class MTETesseractTerminal extends MTEBasicTank { return null; } if (rTesseract.mFrequency != aFrequency) { - TesseractHelper.setTerminalOwnershipByPlayer( - PlayerUtils.getPlayerOnServerFromUUID(mOwner), - Integer.valueOf(aFrequency), - null); + TesseractHelper + .setTerminalOwnershipByPlayer(PlayerUtils.getPlayerOnServerFromUUID(mOwner), aFrequency, null); return null; } if (!rTesseract.isValidTesseractGenerator( @@ -539,7 +528,7 @@ public class MTETesseractTerminal extends MTEBasicTank { this.getBaseMetaTileEntity() .decreaseStoredEnergyUnits(128, false); } - } else if (this.mDidWork == true) { + } else if (this.mDidWork) { this.mDidWork = false; this.getBaseMetaTileEntity() .issueBlockUpdate(); @@ -623,7 +612,7 @@ public class MTETesseractTerminal extends MTEBasicTank { .getOwnerName() != null && !this.getBaseMetaTileEntity() .getOwnerName() - .equals("")) { + .isEmpty()) { this.mOwner = PlayerUtils.getPlayersUUIDByName( this.getBaseMetaTileEntity() .getOwnerName()); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEGeothermalGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEGeothermalGenerator.java index e84f4763cf..e1fc5c57f0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEGeothermalGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTEGeothermalGenerator.java @@ -27,7 +27,7 @@ public class MTEGeothermalGenerator extends MTEBasicGenerator { public int mEfficiency; public MTEGeothermalGenerator(final int aID, final String aName, final String aNameRegional, final int aTier) { - super(aID, aName, aNameRegional, aTier, "Requires Pahoehoe Lava or Normal Lava as Fuel", new ITexture[0]); + super(aID, aName, aNameRegional, aTier, "Requires Pahoehoe Lava or Normal Lava as Fuel"); this.setEfficiency(); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERTGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERTGenerator.java index 9b51724b35..9f70912cad 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERTGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERTGenerator.java @@ -169,7 +169,7 @@ public class MTERTGenerator extends MTEBasicGenerator { } public MTERTGenerator(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, "Requires RTG Pellets", new ITexture[0]); + super(aID, aName, aNameRegional, aTier, "Requires RTG Pellets"); } private byte getTier() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERocketFuelGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERocketFuelGenerator.java index 48c3a63007..3565ac831b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERocketFuelGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERocketFuelGenerator.java @@ -21,7 +21,7 @@ public class MTERocketFuelGenerator extends MTERocketFuelGeneratorBase { public int mEfficiency; public MTERocketFuelGenerator(final int aID, final String aName, final String aNameRegional, final int aTier) { - super(aID, aName, aNameRegional, aTier, "Requires GT++ Rocket Fuels", new ITexture[0]); + super(aID, aName, aNameRegional, aTier, "Requires GT++ Rocket Fuels"); } public MTERocketFuelGenerator(final String aName, final int aTier, final String[] aDescription, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTESemiFluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTESemiFluidGenerator.java index 49c9523612..d499093247 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTESemiFluidGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTESemiFluidGenerator.java @@ -27,7 +27,7 @@ public class MTESemiFluidGenerator extends MTEBasicGenerator { public int mEfficiency; public MTESemiFluidGenerator(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, "Requires semifluid Fuel", new ITexture[0]); + super(aID, aName, aNameRegional, aTier, "Requires semifluid Fuel"); this.mEfficiency = 100 - (this.mTier * 5); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java index 6988d2f43b..438fe6a536 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java @@ -68,14 +68,14 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine { "Making sure you don't live in Gwalior - Uses 2A", 3, 0, - new ITexture[] { new GTRenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE), - new GTRenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB), - new GTRenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active), - new GTRenderedTexture(TexturesGtBlock.Overlay_MatterFab), - new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast), - new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Vent), - new GTRenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE), - new GTRenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB) }); + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE), + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB), + new GTRenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active), + new GTRenderedTexture(TexturesGtBlock.Overlay_MatterFab), + new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast), + new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Vent), + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE), + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB)); mPollutionEnabled = GTMod.gregtechproxy.mPollution; } @@ -264,8 +264,7 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine { Logger.INFO("mOptimalAirFlow[1]:" + mOptimalAirFlow); // Calculate The Voltage we are running - long tVoltage = drainEU; - byte tTier = (byte) Math.max(1, GTUtility.getTier(tVoltage)); + byte tTier = (byte) Math.max(1, GTUtility.getTier(drainEU)); // Check Sides for Air, // More air means more pollution processing. @@ -295,15 +294,8 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine { Logger.INFO("mCurrentPollution[4]:" + mCurrentPollution); Logger.INFO("mCurrentPollution[5]:" + reduction); - if (reduction <= mCurrentPollution) { - // Clean some Air. - toRemove = reduction; - } else { - // Makes sure we don't get negative pollution. - toRemove = mCurrentPollution; - } - - toRemove = toRemove / 2; + + toRemove = Math.min(reduction, mCurrentPollution) / 2; Logger.INFO("mCurrentPollution[6]:" + toRemove); // We are good to clean @@ -391,21 +383,13 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine { mCurrentChunkPollution += getPollutionInChunk(r); } } - if (mCurrentChunkPollution > 0) { - mHasPollution = true; - } else { - mHasPollution = false; - } + mHasPollution = mCurrentChunkPollution > 0; return mCurrentChunkPollution; } public int getPollutionInChunk(Chunk aChunk) { int mCurrentChunkPollution = PollutionUtils.getPollution(aChunk); - if (mCurrentChunkPollution > 0) { - mHasPollution = true; - } else { - mHasPollution = false; - } + mHasPollution = mCurrentChunkPollution > 0; return mCurrentChunkPollution; } @@ -573,9 +557,8 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine { public boolean removePollution(int toRemove) { - if (this == null || this.getBaseMetaTileEntity() == null - || this.getBaseMetaTileEntity() - .getWorld() == null) { + if (this.getBaseMetaTileEntity() == null || this.getBaseMetaTileEntity() + .getWorld() == null) { return false; } @@ -740,10 +723,8 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine { if (aStack.getItem() instanceof ItemBasicScrubberTurbine) { return true; } - if (aStack.getItem() instanceof MetaGeneratedTool && aStack.getItemDamage() >= 170 - && aStack.getItemDamage() <= 179) { - return true; - } + return aStack.getItem() instanceof MetaGeneratedTool && aStack.getItemDamage() >= 170 + && aStack.getItemDamage() <= 179; } } return false; @@ -765,8 +746,7 @@ public class MTEAtmosphericReconditioner extends MTEBasicMachine { @Override public String[] getInfoData() { - ArrayList<String> aTooltipSuper = new ArrayList<>(); - aTooltipSuper.addAll(Arrays.asList(super.getInfoData())); + ArrayList<String> aTooltipSuper = new ArrayList<>(Arrays.asList(super.getInfoData())); int mAirSides = getFreeSpaces(); int reduction = 0; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAutoChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAutoChisel.java index 6cdc97130b..b4f69323f4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAutoChisel.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAutoChisel.java @@ -40,14 +40,14 @@ public class MTEAutoChisel extends MTEBasicMachine { "Chisels things, Gregtech style", 1, 1, - new ITexture[] { new GTRenderedTexture(BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE), - new GTRenderedTexture(BlockIcons.OVERLAY_SIDE_MASSFAB), - new GTRenderedTexture(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER_ACTIVE), - new GTRenderedTexture(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER), - new GTRenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active), - new GTRenderedTexture(TexturesGtBlock.Overlay_MatterFab), - new GTRenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE), - new GTRenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB) }); + new GTRenderedTexture(BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE), + new GTRenderedTexture(BlockIcons.OVERLAY_SIDE_MASSFAB), + new GTRenderedTexture(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER_ACTIVE), + new GTRenderedTexture(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER), + new GTRenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active), + new GTRenderedTexture(TexturesGtBlock.Overlay_MatterFab), + new GTRenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE), + new GTRenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB)); } public MTEAutoChisel(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { @@ -90,8 +90,8 @@ public class MTEAutoChisel extends MTEBasicMachine { @Override protected boolean allowPutStackValidated(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, ItemStack aStack) { - return hasValidCache(aStack, this.getSpecialSlot(), false) ? true - : super.allowPutStackValidated(aBaseMetaTileEntity, aIndex, side, aStack) && hasChiselResults(aStack); + return hasValidCache(aStack, this.getSpecialSlot(), false) + || super.allowPutStackValidated(aBaseMetaTileEntity, aIndex, side, aStack) && hasChiselResults(aStack); } // lets make sure the user isn't trying to make something from a block that doesn't have this as a valid target @@ -108,7 +108,7 @@ public class MTEAutoChisel extends MTEBasicMachine { // lets make sure the user isn't trying to make something from a block that doesn't have this as a valid target private static boolean hasChiselResults(ItemStack from) { List<ItemStack> results = getItemsForChiseling(from); - return results.size() > 0; + return !results.isEmpty(); } private static List<ItemStack> getItemsForChiseling(ItemStack aStack) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTECropHarvestor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTECropHarvestor.java index 9788abcf0c..f1f129606f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTECropHarvestor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTECropHarvestor.java @@ -164,7 +164,7 @@ public class MTECropHarvestor extends MTEBasicTank { }; } - private HashSet<ICropTile> mCropCache = new HashSet<>(); + private final HashSet<ICropTile> mCropCache = new HashSet<>(); private boolean mInvalidCache = false; public boolean doesInventoryHaveSpace() { @@ -213,7 +213,7 @@ public class MTECropHarvestor extends MTEBasicTank { for (int x = (-aSide); x <= aSide; x++) { for (int z = (-aSide); z <= aSide; z++) { TileEntity tTileEntity = getBaseMetaTileEntity().getTileEntityOffset(x, y, z); - if (tTileEntity != null && tTileEntity instanceof ICropTile tCrop) { + if (tTileEntity instanceof ICropTile tCrop) { this.mCropCache.add(tCrop); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionCreator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionCreator.java index 2521fb703f..0226214c44 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionCreator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionCreator.java @@ -22,10 +22,10 @@ public class MTEPollutionCreator extends GTPPMetaTileEntity { int mCurrentPollution; int mAveragePollution; - int mAveragePollutionArray[] = new int[10]; + int[] mAveragePollutionArray = new int[10]; private int mArrayPos = 0; private int mTickTimer = 0; - private int mSecondTimer = 0; + private final int mSecondTimer = 0; public MTEPollutionCreator(final int aID, final String aName, final String aNameRegional, final int aTier, final String aDescription, final int aSlotCount) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionDetector.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionDetector.java index 747663f4cb..87e18931b5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionDetector.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEPollutionDetector.java @@ -24,10 +24,10 @@ public class MTEPollutionDetector extends GTPPMetaTileEntity { int mCurrentPollution; int mAveragePollution; - int mAveragePollutionArray[] = new int[10]; + int[] mAveragePollutionArray = new int[10]; private int mArrayPos = 0; private int mTickTimer = 0; - private int mSecondTimer = 0; + private final int mSecondTimer = 0; private long mRedstoneLevel = 0; public MTEPollutionDetector(final int aID, final String aName, final String aNameRegional, final int aTier, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEWirelessCharger.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEWirelessCharger.java index 1535140115..739a098331 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEWirelessCharger.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEWirelessCharger.java @@ -323,9 +323,7 @@ public class MTEWirelessCharger extends GTPPMetaTileEntity { @Override public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) { - if (aBaseMetaTileEntity.isClientSide()) { - return true; - } + aBaseMetaTileEntity.isClientSide(); return true; } @@ -449,18 +447,14 @@ public class MTEWirelessCharger extends GTPPMetaTileEntity { super.onFirstTick(aBaseMetaTileEntity); } - private Map<String, UUID> mWirelessChargingMap = new HashMap<>(); - private Map<String, UUID> mLocalChargingMap = new HashMap<>(); + private final Map<String, UUID> mWirelessChargingMap = new HashMap<>(); + private final Map<String, UUID> mLocalChargingMap = new HashMap<>(); private boolean isValidPlayer(EntityPlayer aPlayer) { BaseMetaTileEntity aTile = (BaseMetaTileEntity) this.getBaseMetaTileEntity(); if (mLocked || (aTile != null && aTile.privateAccess())) { - if (aPlayer.getUniqueID() - .equals(getBaseMetaTileEntity().getOwnerUuid())) { - return true; - } else { - return false; - } + return aPlayer.getUniqueID() + .equals(getBaseMetaTileEntity().getOwnerUuid()); } return true; } @@ -579,11 +573,10 @@ public class MTEWirelessCharger extends GTPPMetaTileEntity { int[] objectArray1 = new int[] { objectA.xPos, objectA.yPos, objectA.zPos }; int[] objectArray2 = new int[] { objectB.xPos, objectB.yPos, objectB.zPos }; - final double distance = Math.sqrt( + return Math.sqrt( (objectArray2[0] - objectArray1[0]) * (objectArray2[0] - objectArray1[0]) + (objectArray2[1] - objectArray1[1]) * (objectArray2[1] - objectArray1[1]) + (objectArray2[2] - objectArray1[2]) * (objectArray2[2] - objectArray1[2])); - return distance; } @Override @@ -636,7 +629,7 @@ public class MTEWirelessCharger extends GTPPMetaTileEntity { PlayerUtils.messagePlayer(aPlayer, "Players with access:"); for (String name : this.getLocalMap() .keySet()) { - PlayerUtils.messagePlayer(aPlayer, "" + name); + PlayerUtils.messagePlayer(aPlayer, name); } } else { @@ -644,7 +637,7 @@ public class MTEWirelessCharger extends GTPPMetaTileEntity { PlayerUtils.messagePlayer(aPlayer, "Players with access:"); for (String name : this.getLongRangeMap() .keySet()) { - PlayerUtils.messagePlayer(aPlayer, "" + name); + PlayerUtils.messagePlayer(aPlayer, name); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java index 40a497fa06..d68fe3f8c7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java @@ -195,7 +195,7 @@ public class MTEIndustrialChisel extends GTPPMultiBlockBase<MTEIndustrialChisel> // lets make sure the user isn't trying to make something from a block that doesn't have this as a valid target private static boolean hasChiselResults(ItemStack from) { List<ItemStack> results = getItemsForChiseling(from); - return results.size() > 0; + return !results.isEmpty(); } private static List<ItemStack> getItemsForChiseling(ItemStack aStack) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java index eb7e6baa9c..8b63f34edb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java @@ -62,7 +62,7 @@ public class MTEIndustrialDehydrator extends GTPPMultiBlockBase<MTEIndustrialDeh implements ISurvivalConstructable { private static int CASING_TEXTURE_ID; - private static String mCasingName = "Vacuum Casing"; + private static final String mCasingName = "Vacuum Casing"; private HeatingCoilLevel mHeatingCapacity; private boolean mDehydratorMode = false; private int mCasing; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java index 8d543b7bcc..563b844574 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java @@ -72,7 +72,7 @@ public class MTEIndustrialVacuumFreezer extends GTPPMultiBlockBase<MTEIndustrial @Override public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return (IMetaTileEntity) new MTEIndustrialVacuumFreezer(this.mName); + return new MTEIndustrialVacuumFreezer(this.mName); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java index 0df9417f32..5634b5f1d6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java @@ -256,9 +256,7 @@ public class MTEIsaMill extends GTPPMultiBlockBase<MTEIsaMill> implements ISurvi if (!aEntities.isEmpty()) { for (EntityLivingBase aFoundEntity : aEntities) { if (aFoundEntity instanceof EntityPlayer aPlayer) { - if (PlayerUtils.isCreative(aPlayer) || !PlayerUtils.canTakeDamage(aPlayer)) { - continue; - } else { + if (!PlayerUtils.isCreative(aPlayer) && PlayerUtils.canTakeDamage(aPlayer)) { if (aFoundEntity.getHealth() > 0) { EntityUtils.doDamage(aFoundEntity, mIsaMillDamageSource, getPlayerDamageValue(aPlayer, 10)); if ((aBaseMetaTileEntity.isClientSide()) && (aBaseMetaTileEntity.isActive())) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java index 4c313a3be3..6952dd5c24 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java @@ -264,7 +264,7 @@ public class MTECyclotron extends GTPPMultiBlockBase<MTECyclotron> implements IS @Override public boolean onRunningTick(ItemStack aStack) { - if (this.mOutputBusses.size() > 0) { + if (!this.mOutputBusses.isEmpty()) { for (MTEHatchOutputBus g : this.mOutputBusses) { if (g != null) { for (ItemStack s : g.mInventory) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java index a241238e42..32ea79cc55 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java @@ -152,7 +152,7 @@ public class MTEElementalDuplicator extends GTPPMultiBlockBase<MTEElementalDupli .build(), buildHatchAdder(MTEElementalDuplicator.class) .hatchClass(MTEHatchElementalDataOrbHolder.class) - .shouldReject(x -> x.mReplicatorDataOrbHatches.size() >= 1) + .shouldReject(x -> !x.mReplicatorDataOrbHatches.isEmpty()) .adder(MTEElementalDuplicator::addDataOrbHatch) .casingIndex(getCasingTextureIndex()) .dot(1) @@ -172,7 +172,7 @@ public class MTEElementalDuplicator extends GTPPMultiBlockBase<MTEElementalDupli public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { mCasing = 0; boolean aDidBuild = checkPiece(STRUCTURE_PIECE_MAIN, 4, 4, 0); - if (this.mInputHatches.size() != 1 || (this.mOutputBusses.size() != 1 && this.mOutputHatches.size() != 0) + if (this.mInputHatches.size() != 1 || (this.mOutputBusses.size() != 1 && !this.mOutputHatches.isEmpty()) || this.mEnergyHatches.size() != 1 || this.mReplicatorDataOrbHatches.size() != 1) { return false; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java index f4e9bac434..bbcbfc1322 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java @@ -276,7 +276,7 @@ public class MTEFrothFlotationCell extends GTPPMultiBlockBase<MTEFrothFlotationC @Override public boolean isRecipeLockingEnabled() { - return lockedMaterialName != null && !lockedMaterialName.equals(""); + return lockedMaterialName != null && !lockedMaterialName.isEmpty(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java index c3bf843fd3..ee62f45ef8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java @@ -144,7 +144,7 @@ public class MTEIndustrialRockBreaker extends GTPPMultiBlockBase<MTEIndustrialRo boolean aCheckPiece = checkPiece(mName, 1, 3, 0); boolean aCasingCount = mCasing >= 9; boolean aCheckHatch = checkHatch(); - log("" + aCheckPiece + ", " + aCasingCount + ", " + aCheckHatch); + log(aCheckPiece + ", " + aCasingCount + ", " + aCheckHatch); return aCheckPiece && aCasingCount && aCheckHatch; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeRocketEngine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeRocketEngine.java index f2ddecb687..b9e1d7858c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeRocketEngine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeRocketEngine.java @@ -132,8 +132,8 @@ public class MTELargeRocketEngine extends GTPPMultiBlockBase<MTELargeRocketEngin @Override public IStructureDefinition<MTELargeRocketEngine> getStructureDefinition() { - if (this.STRUCTURE_DEFINITION == null) { - this.STRUCTURE_DEFINITION = StructureDefinition.<MTELargeRocketEngine>builder() + if (STRUCTURE_DEFINITION == null) { + STRUCTURE_DEFINITION = StructureDefinition.<MTELargeRocketEngine>builder() .addShape( this.mName, transpose( @@ -161,7 +161,7 @@ public class MTELargeRocketEngine extends GTPPMultiBlockBase<MTELargeRocketEngin .addElement('M', Muffler.newAny(getCasingTextureIndex(), 3)) .build(); } - return this.STRUCTURE_DEFINITION; + return STRUCTURE_DEFINITION; } @Override @@ -182,7 +182,7 @@ public class MTELargeRocketEngine extends GTPPMultiBlockBase<MTELargeRocketEngin this.mAllDynamoHatches.clear(); this.mAirIntakes.clear(); return checkPiece(this.mName, 1, 1, 0) && this.mCasing >= 64 - 48 - && this.mAirIntakes.size() >= 1 + && !this.mAirIntakes.isEmpty() && checkHatch(); } @@ -270,7 +270,7 @@ public class MTELargeRocketEngine extends GTPPMultiBlockBase<MTELargeRocketEngin // reset fuel ticks in case it does not reset when it stops if (this.freeFuelTicks != 0 && this.mProgresstime == 0 && this.mEfficiency == 0) this.freeFuelTicks = 0; - if (tFluids.size() > 0 && getRecipeMap() != null) { + if (!tFluids.isEmpty() && getRecipeMap() != null) { if (this.mRuntime % 72 == 0) { if (!consumeCO2()) { this.freeFuelTicks = 0; @@ -375,7 +375,7 @@ public class MTELargeRocketEngine extends GTPPMultiBlockBase<MTELargeRocketEngin if (aEU <= 0) { return true; } - if (this.mAllDynamoHatches.size() > 0) { + if (!this.mAllDynamoHatches.isEmpty()) { return addEnergyOutputMultipleDynamos(aEU, true); } return false; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTENuclearReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTENuclearReactor.java index 3da77cf783..31caefe8f2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTENuclearReactor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTENuclearReactor.java @@ -261,7 +261,7 @@ public class MTENuclearReactor extends GTPPMultiBlockBase<MTENuclearReactor> imp public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { mCasing = 0; if (checkPiece(mName, 3, 3, 0) && mCasing >= 27) { - if ((mOutputHatches.size() >= 3 || canDumpFluidToME()) && mInputHatches.size() >= 1 + if ((mOutputHatches.size() >= 3 || canDumpFluidToME()) && !mInputHatches.isEmpty() && mDynamoHatches.size() == 4 && mMufflerHatches.size() == 4) { this.turnCasingActive(false); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTERefinery.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTERefinery.java index f7f992e191..9b28387849 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTERefinery.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTERefinery.java @@ -175,7 +175,7 @@ public class MTERefinery extends GTPPMultiBlockBase<MTERefinery> implements ISur mCasing = 0; if (checkPiece(mName, 1, 7, 0) && mCasing >= 7) { if (this.mInputHatches.size() >= 2 && this.mInputHatches.size() <= 4 - && this.mOutputHatches.size() >= 1 + && !this.mOutputHatches.isEmpty() && this.mOutputHatches.size() <= 2 && this.mMufflerHatches.size() == 1 && this.mMaintenanceHatches.size() == 1 diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTESolarTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTESolarTower.java index 085cb1b784..31ed44d5a3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTESolarTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTESolarTower.java @@ -281,8 +281,8 @@ public class MTESolarTower extends GTPPMultiBlockBase<MTESolarTower> implements boolean aAllCasings = aCasingCount1 && aCasingCount2 && aCasingCount3 && aCasingCount4; if (!aAllCasings || !aAllStructure || mMaintenanceHatches.size() != 1 - || mInputHatches.size() < 1 - || mOutputHatches.size() < 1) { + || mInputHatches.isEmpty() + || mOutputHatches.isEmpty()) { log( "Bad Hatches - Solar Heaters: " + mSolarHeaters.size() + ", Maint: " @@ -486,7 +486,7 @@ public class MTESolarTower extends GTPPMultiBlockBase<MTESolarTower> implements // log("Found Ring: "+(aRing++)+", Total: "+this.mSolarHeaters.size()); } } - return mSolarHeaters.size() > 0; + return !mSolarHeaters.isEmpty(); } private boolean addSolarHeater(IGregTechTileEntity aTileEntity, int a) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java index bb5754bef7..5478014c62 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java @@ -266,8 +266,7 @@ public class MTETreeFarm extends GTPPMultiBlockBase<MTETreeFarm> implements ISur * In previous versions, a saw used to go in the controller slot. We do not want an update to stop processing of * a machine set up like this. Instead, a sapling is placed in this slot at the start of the next operation. */ - if (aStack.getItem() instanceof MetaGeneratedTool01) return true; - return false; + return aStack.getItem() instanceof MetaGeneratedTool01; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/MTEAlgaePondBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/MTEAlgaePondBase.java index 49e9878bec..6b266908ce 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/MTEAlgaePondBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/MTEAlgaePondBase.java @@ -183,8 +183,8 @@ public class MTEAlgaePondBase extends GTPPMultiBlockBase<MTEAlgaePondBase> imple if (checkPiece(mName, 4, 2, 0) && mCasing >= 64 && checkMeta > 0 - && mInputHatches.size() >= 1 - && mOutputBusses.size() >= 1) { + && !mInputHatches.isEmpty() + && !mOutputBusses.isEmpty()) { mLevel = checkMeta - 1; for (MTEHatchInput inputHatch : mInputHatches) { if (inputHatch.mTier < mLevel) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java index a6794809ef..1e5d1bb9ea 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java @@ -80,7 +80,7 @@ public class MTEChemicalPlant extends GTPPMultiBlockBase<MTEChemicalPlant> imple private int mPipeCasingTier = 0; private int mCoilTier = 0; private HeatingCoilLevel checkCoil; - private int[] checkCasing = new int[8]; + private final int[] checkCasing = new int[8]; private int checkMachine; private int checkPipe; private int maxTierOfHatch; @@ -114,10 +114,8 @@ public class MTEChemicalPlant extends GTPPMultiBlockBase<MTEChemicalPlant> imple if (!mTieredBlockRegistry.containsKey(aTier)) { return 10; } - int aCasingID = mTieredBlockRegistry.get(aTier) + return mTieredBlockRegistry.get(aTier) .getValue_3(); - // Logger.INFO("Found casing texture ID "+aCasingID+" for tier "+aTier); - return aCasingID; } @Override @@ -216,7 +214,7 @@ public class MTEChemicalPlant extends GTPPMultiBlockBase<MTEChemicalPlant> imple .dot(1) .build(), buildHatchAdder(MTEChemicalPlant.class).hatchClass(MTEHatchCatalysts.class) - .shouldReject(t -> t.mCatalystBuses.size() >= 1) + .shouldReject(t -> !t.mCatalystBuses.isEmpty()) .adder(MTEChemicalPlant::addChemicalPlantList) .casingIndex(getCasingTextureID()) .dot(1) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineGas.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineGas.java index 93ec17e6ea..1e44eb95c3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineGas.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineGas.java @@ -25,7 +25,6 @@ import gregtech.api.util.GTRecipe; import gregtech.api.util.GTUtility; import gregtech.api.util.TurbineStatCalculator; -@SuppressWarnings("deprecation") public class MTELargeTurbineGas extends MTELargerTurbineBase { private static final HashSet<Fluid> BLACKLIST = new HashSet<>(); @@ -110,7 +109,7 @@ public class MTELargeTurbineGas extends MTELargerTurbineBase { @Override long fluidIntoPower(ArrayList<FluidStack> aFluids, TurbineStatCalculator turbine) { - if (aFluids.size() >= 1) { + if (!aFluids.isEmpty()) { int tEU = 0; int actualOptimalFlow = 0; FluidStack firstFuelType = new FluidStack(aFluids.get(0), 0); // Identify a SINGLE type of fluid to process. @@ -153,15 +152,12 @@ public class MTELargeTurbineGas extends MTELargerTurbineBase { if (totalFlow <= 0) return 0; tEU = GTUtility.safeInt((long) totalFlow * fuelValue); - if (totalFlow == actualOptimalFlow) { - tEU = GTUtility.safeInt( - (long) (tEU * (isLooseMode() ? turbine.getLooseGasEfficiency() : turbine.getGasEfficiency()))); - } else { + if (totalFlow != actualOptimalFlow) { float efficiency = 1.0f - Math.abs((totalFlow - actualOptimalFlow) / (float) actualOptimalFlow); tEU *= efficiency; - tEU = GTUtility.safeInt( - (long) (tEU * (isLooseMode() ? turbine.getLooseGasEfficiency() : turbine.getGasEfficiency()))); } + tEU = GTUtility + .safeInt((long) (tEU * (isLooseMode() ? turbine.getLooseGasEfficiency() : turbine.getGasEfficiency()))); return tEU; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSHSteam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSHSteam.java index 25650fad08..5fbcb237fd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSHSteam.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSHSteam.java @@ -14,7 +14,6 @@ import gregtech.api.util.TurbineStatCalculator; import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.math.MathUtils; -@SuppressWarnings("deprecation") public class MTELargeTurbineSHSteam extends MTELargerTurbineBase { public boolean achievement = false; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java index 0de134950c..beeaa2726b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java @@ -14,7 +14,6 @@ import gregtech.api.util.GTModHandler; import gregtech.api.util.TurbineStatCalculator; import gtPlusPlus.core.util.math.MathUtils; -@SuppressWarnings("deprecation") public class MTELargeTurbineSteam extends MTELargerTurbineBase { private float water; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java index dc2f105bbb..fa9d60fb11 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java @@ -214,11 +214,11 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT boolean aStructure = checkPiece(STRUCTURE_PIECE_MAIN, 3, 3, 0); log("Structure Check: " + aStructure); if (mTurbineRotorHatches.size() != 12 || mMaintenanceHatches.size() != 1 - || (mDynamoHatches.size() < 1 && mTecTechDynamoHatches.size() < 1) + || (mDynamoHatches.isEmpty() && mTecTechDynamoHatches.isEmpty()) || (requiresMufflers() && mMufflerHatches.size() != 4) - || mInputBusses.size() < 1 - || mInputHatches.size() < 1 - || (requiresOutputHatch() && mOutputHatches.size() < 1)) { + || mInputBusses.isEmpty() + || mInputHatches.isEmpty() + || (requiresOutputHatch() && mOutputHatches.isEmpty())) { log( "Bad Hatches - Turbine Housings: " + mTurbineRotorHatches.size() + ", Maint: " @@ -406,7 +406,7 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT for (MTEHatchInputBus aInputBus : this.mInputBusses) { for (int slot = aInputBus.getSizeInventory() - 1; slot >= 0; slot--) { ItemStack aStack = aInputBus.getStackInSlot(slot); - if (aStack != null && GTUtility.areStacksEqual(aStack, aTurbine)) { + if (GTUtility.areStacksEqual(aStack, aTurbine)) { aStack.stackSize -= aTurbine.stackSize; updateSlots(); endRecipeProcessing(); @@ -421,7 +421,7 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT public @NotNull CheckRecipeResult checkProcessing() { try { ArrayList<MTEHatchTurbine> aEmptyTurbineRotorHatches = getEmptyTurbineAssemblies(); - if (aEmptyTurbineRotorHatches.size() > 0) { + if (!aEmptyTurbineRotorHatches.isEmpty()) { hatch: for (MTEHatchTurbine aHatch : aEmptyTurbineRotorHatches) { ArrayList<ItemStack> aTurbines = getAllBufferedTurbines(); for (ItemStack aTurbineItem : aTurbines) { @@ -436,7 +436,7 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT } } - if (getEmptyTurbineAssemblies().size() > 0 || !areAllTurbinesTheSame()) { + if (!getEmptyTurbineAssemblies().isEmpty() || !areAllTurbinesTheSame()) { stopMachine(ShutDownReasonRegistry.NO_TURBINE); return CheckRecipeResultRegistry.NO_TURBINE_FOUND; } @@ -448,7 +448,7 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT TurbineStatCalculator turbine = new TurbineStatCalculator((MetaGeneratedTool) aStack.getItem(), aStack); - if (tFluids.size() > 0) { + if (!tFluids.isEmpty()) { if (baseEff == 0 || optFlow == 0 || counter >= 512 || this.getBaseMetaTileEntity() @@ -606,7 +606,7 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT .toLowerCase() .contains("steam"); - String[] ret = new String[] { + return new String[] { // 8 Lines available for information panels tRunning + ": " + EnumChatFormatting.RED @@ -649,7 +649,6 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT + GTUtility.formatNumbers(mPollutionReduction) + EnumChatFormatting.RESET + " %" }; - return ret; } @Override @@ -794,7 +793,7 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT if (aEU <= 0) { return true; } - if (this.mAllDynamoHatches.size() > 0) { + if (!this.mAllDynamoHatches.isEmpty()) { return addEnergyOutputMultipleDynamos(aEU, true); } return false; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbinePlasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbinePlasma.java index 3385125bb7..4f3626e7cd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbinePlasma.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbinePlasma.java @@ -23,7 +23,6 @@ import gregtech.api.util.shutdown.ShutDownReasonRegistry; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchTurbine; -@SuppressWarnings("deprecation") public class MTELargerTurbinePlasma extends MTELargerTurbineBase { public MTELargerTurbinePlasma(int aID, String aName, String aNameRegional) { @@ -92,7 +91,7 @@ public class MTELargerTurbinePlasma extends MTELargerTurbineBase { try { ArrayList<MTEHatchTurbine> aEmptyTurbineRotorHatches = getEmptyTurbineAssemblies(); - if (aEmptyTurbineRotorHatches.size() > 0) { + if (!aEmptyTurbineRotorHatches.isEmpty()) { hatch: for (MTEHatchTurbine aHatch : aEmptyTurbineRotorHatches) { ArrayList<ItemStack> aTurbines = getAllBufferedTurbines(); for (ItemStack aTurbineItem : aTurbines) { @@ -107,7 +106,7 @@ public class MTELargerTurbinePlasma extends MTELargerTurbineBase { } } - if (getEmptyTurbineAssemblies().size() > 0 || !areAllTurbinesTheSame()) { + if (!getEmptyTurbineAssemblies().isEmpty() || !areAllTurbinesTheSame()) { stopMachine(ShutDownReasonRegistry.NO_TURBINE); return CheckRecipeResultRegistry.NO_TURBINE_FOUND; } @@ -122,7 +121,7 @@ public class MTELargerTurbinePlasma extends MTELargerTurbineBase { ArrayList<FluidStack> tFluids = getStoredFluids(); - if (tFluids.size() > 0) { + if (!tFluids.isEmpty()) { if (baseEff == 0 || optFlow == 0 || counter >= 512 || this.getBaseMetaTileEntity() @@ -169,7 +168,7 @@ public class MTELargerTurbinePlasma extends MTELargerTurbineBase { // formula: // EU/t = EU/t * MIN(1, ( ( (FuelValue / 200) ^ 2 ) / EUPerTurbine)) int fuelValue = 0; - if (tFluids.size() > 0) { + if (!tFluids.isEmpty()) { fuelValue = getFuelValue(new FluidStack(tFluids.get(0), 0)); } float magicValue = (fuelValue * 0.005f) * (fuelValue * 0.005f); @@ -181,7 +180,7 @@ public class MTELargerTurbinePlasma extends MTELargerTurbineBase { // Magic numbers: can always change by at least 200 eu/s, but otherwise by at most 20 percent of the // difference in power level (per second) // This is how much the turbine can actually change during this tick - int maxChangeAllowed = Math.max(200, GTUtility.safeInt((long) Math.abs(difference) / 5)); + int maxChangeAllowed = Math.max(200, GTUtility.safeInt(Math.abs(difference) / 5)); if (Math.abs(difference) > maxChangeAllowed) { // If this difference is too big, use the maximum allowed // change @@ -209,7 +208,7 @@ public class MTELargerTurbinePlasma extends MTELargerTurbineBase { } long fluidIntoPower(ArrayList<FluidStack> aFluids, TurbineStatCalculator turbine) { - if (aFluids.size() >= 1) { + if (!aFluids.isEmpty()) { int tEU = 0; int actualOptimalFlow = 0; @@ -255,18 +254,12 @@ public class MTELargerTurbinePlasma extends MTELargerTurbineBase { if (totalFlow <= 0) return 0; tEU = GTUtility.safeInt((long) ((fuelValue / 20D) * (double) totalFlow)); - if (totalFlow == actualOptimalFlow) { - tEU = GTUtility.safeInt( - (long) ((isLooseMode() ? turbine.getLoosePlasmaEfficiency() : turbine.getPlasmaEfficiency()) - * tEU)); - } else { + if (totalFlow != actualOptimalFlow) { double efficiency = 1.0D - Math.abs((totalFlow - actualOptimalFlow) / (float) actualOptimalFlow); - tEU = (int) (tEU * efficiency); - tEU = GTUtility.safeInt( - (long) ((isLooseMode() ? turbine.getLoosePlasmaEfficiency() : turbine.getPlasmaEfficiency()) - * tEU)); } + tEU = GTUtility.safeInt( + (long) ((isLooseMode() ? turbine.getLoosePlasmaEfficiency() : turbine.getPlasmaEfficiency()) * tEU)); return tEU; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java index f392bff171..241b970ae8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java @@ -81,7 +81,7 @@ import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMult public class GregtechMetaTileEntity_PowerSubStationController extends GTPPMultiBlockBase<GregtechMetaTileEntity_PowerSubStationController> implements ISurvivalConstructable { - private static enum TopState { + private enum TopState { MayBeTop, Top, NotTop @@ -99,7 +99,7 @@ public class GregtechMetaTileEntity_PowerSubStationController private final int ENERGY_TAX = 5; private int mCasing; - private int[] cellCount = new int[6]; + private final int[] cellCount = new int[6]; private TopState topState = TopState.MayBeTop; private static IStructureDefinition<GregtechMetaTileEntity_PowerSubStationController> STRUCTURE_DEFINITION = null; @@ -212,17 +212,13 @@ public class GregtechMetaTileEntity_PowerSubStationController } public static int getMaxHatchTier(int aCellTier) { - switch (aCellTier) { - case 9 -> { - return GTValues.VOLTAGE_NAMES[9].equals("Ultimate High Voltage") ? 15 : 9; - } - default -> { - if (aCellTier < 4) { - return 0; - } else { - return aCellTier; - } - } + if (aCellTier == 9) { + return GTValues.VOLTAGE_NAMES[9].equals("Ultimate High Voltage") ? 15 : 9; + } + if (aCellTier < 4) { + return 0; + } else { + return aCellTier; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/MTESolarHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/MTESolarHeater.java index 64925c9bb1..45721139bb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/MTESolarHeater.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/MTESolarHeater.java @@ -266,7 +266,7 @@ public class MTESolarHeater extends MTETieredMachineBlock { } public boolean canSeeSky() { - if (this.getBaseMetaTileEntity() + return this.getBaseMetaTileEntity() .getWorld() .canBlockSeeTheSky( this.getBaseMetaTileEntity() @@ -274,17 +274,14 @@ public class MTESolarHeater extends MTETieredMachineBlock { this.getBaseMetaTileEntity() .getYCoord() + 1, this.getBaseMetaTileEntity() - .getZCoord())) { - return true; - } - return false; + .getZCoord()); } public boolean setSolarTower(MTESolarTower aTowerTile) { if (!hasSolarTower()) { this.mTX = aTowerTile.getBaseMetaTileEntity() .getXCoord(); - this.mTY = (int) aTowerTile.getBaseMetaTileEntity() + this.mTY = aTowerTile.getBaseMetaTileEntity() .getYCoord(); this.mTZ = aTowerTile.getBaseMetaTileEntity() .getZCoord(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneCircuitBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneCircuitBlock.java index 20cd569e24..fceebe62d3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneCircuitBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/MTERedstoneCircuitBlock.java @@ -46,7 +46,8 @@ import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; public class MTERedstoneCircuitBlock extends MTERedstoneBase implements IRedstoneCircuitBlock, IAddUIWidgets { - public int mGate = 0, mGateData[] = new int[] { 0, 0, 0, 0, 0, 0, 0, 0 }; + public int mGate = 0; + public int[] mGateData = new int[] { 0, 0, 0, 0, 0, 0, 0, 0 }; public boolean bOutput = true; public MTERedstoneCircuitBlock(int aID) { @@ -159,8 +160,7 @@ public class MTERedstoneCircuitBlock extends MTERedstoneBase implements IRedston public void switchGateForward(boolean aShift) { try { Set<Integer> tKeys = GregTechAPI.sCircuitryBehaviors.keySet(); - ArrayList<Integer> tList = new ArrayList<>(); - tList.addAll(tKeys); + ArrayList<Integer> tList = new ArrayList<>(tKeys); if (tList.size() <= 0) return; Collections.sort(tList); if (!GregTechAPI.sCircuitryBehaviors.containsKey(mGate)) mGate = tList.get(0); @@ -177,8 +177,7 @@ public class MTERedstoneCircuitBlock extends MTERedstoneBase implements IRedston public void switchGateBackward(boolean aShift) { try { Set<Integer> tKeys = GregTechAPI.sCircuitryBehaviors.keySet(); - ArrayList<Integer> tList = new ArrayList<>(); - tList.addAll(tKeys); + ArrayList<Integer> tList = new ArrayList<>(tKeys); if (tList.size() <= 0) return; Collections.sort(tList); if (!GregTechAPI.sCircuitryBehaviors.containsKey(mGate)) mGate = tList.get(0); @@ -324,7 +323,7 @@ public class MTERedstoneCircuitBlock extends MTERedstoneBase implements IRedston if (sCoversItems.isEmpty()) { initCovers(); } - return sCoversItems.get(Integer.valueOf(aStack)); + return sCoversItems.get(aStack); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/MTETieredChest.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/MTETieredChest.java index 423a71c3e1..51e5431da0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/MTETieredChest.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/MTETieredChest.java @@ -39,8 +39,7 @@ public class MTETieredChest extends MTETieredMachineBlock implements IAddUIWidge aNameRegional, aTier, 3, - "This Chest stores " + (int) (Math.pow(6.0D, (double) aTier) * mStorageFactor) + " Items", - new ITexture[0]); + "This Chest stores " + (int) (Math.pow(6.0D, aTier) * mStorageFactor) + " Items"); } public MTETieredChest(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { @@ -151,7 +150,7 @@ public class MTETieredChest extends MTETieredMachineBlock implements IAddUIWidge @Override public int getMaxItemCount() { - return (int) (Math.pow(6.0D, (double) this.mTier) * mStorageFactor - 128.0D); + return (int) (Math.pow(6.0D, this.mTier) * mStorageFactor - 128.0D); } public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/ToolAngleGrinder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/ToolAngleGrinder.java index 196bc2a5bb..f65b3162f8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/ToolAngleGrinder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/ToolAngleGrinder.java @@ -28,7 +28,7 @@ import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools; public class ToolAngleGrinder extends GTTool { public static final List<String> mEffectiveList = Arrays - .asList(new String[] { EntityIronGolem.class.getName(), "EntityTowerGuardian" }); + .asList(EntityIronGolem.class.getName(), "EntityTowerGuardian"); @Override public float getNormalDamageAgainstEntity(final float aOriginalDamage, final Entity aEntity, final ItemStack aStack, @@ -134,7 +134,7 @@ public class ToolAngleGrinder extends GTTool { @Override public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { - return (IIconContainer) (aIsToolHead ? TexturesGtTools.ANGLE_GRINDER : ItemIcons.POWER_UNIT_HV); + return aIsToolHead ? TexturesGtTools.ANGLE_GRINDER : ItemIcons.POWER_UNIT_HV; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/ToolElectricSnips.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/ToolElectricSnips.java index 78675f70d5..08b691f3e8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/ToolElectricSnips.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/ToolElectricSnips.java @@ -65,7 +65,7 @@ public class ToolElectricSnips extends ToolWireCutter { @Override public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { - return (IIconContainer) (aIsToolHead ? TexturesGtTools.ELECTRIC_SNIPS : ItemIcons.POWER_UNIT_MV); + return aIsToolHead ? TexturesGtTools.ELECTRIC_SNIPS : ItemIcons.POWER_UNIT_MV; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java index c64c846541..37ef0edc66 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java @@ -223,8 +223,7 @@ public class RecipeGenBlastSmelter extends RecipeGenBase { M.getComposites() .get(irc) .getDustStack(r))) { - final int xr = r; - if ((xr > 0) && (xr <= 100)) { + if (r > 0 && r <= 100) { final int mathmatics = (r * 1000); componentsFluid = FluidUtils.getFluidStack( M.getComposites() diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelterGTNH.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelterGTNH.java index a78b517268..8e92843e18 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelterGTNH.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelterGTNH.java @@ -24,8 +24,8 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeGenBlastSmelterGTNH { - private static Map<String, FluidStack> mCachedIngotToFluidRegistry = new HashMap<>(); - private static Map<String, String> mCachedHotToColdRegistry = new HashMap<>(); + private static final Map<String, FluidStack> mCachedIngotToFluidRegistry = new HashMap<>(); + private static final Map<String, String> mCachedHotToColdRegistry = new HashMap<>(); private static synchronized void setIngotToFluid(final ItemStackData stack, final FluidStack fluid) { if (stack != null && fluid != null) { @@ -40,29 +40,25 @@ public class RecipeGenBlastSmelterGTNH { } private static synchronized FluidStack getFluidFromIngot(final ItemStackData ingot) { - ItemStackData h = ingot; - if (mCachedIngotToFluidRegistry.containsKey(h.getUniqueDataIdentifier())) { + if (mCachedIngotToFluidRegistry.containsKey(ingot.getUniqueDataIdentifier())) { Logger.MACHINE_INFO("[ABS] mCachedIngotToFluidRegistry contains Output Ingot."); - return mCachedIngotToFluidRegistry.get(h.getUniqueDataIdentifier()); + return mCachedIngotToFluidRegistry.get(ingot.getUniqueDataIdentifier()); } - if (mCachedHotToColdRegistry.containsKey(h.getUniqueDataIdentifier())) { + if (mCachedHotToColdRegistry.containsKey(ingot.getUniqueDataIdentifier())) { Logger.MACHINE_INFO("[ABS] mCachedHotToColdRegistry contains Output Ingot."); - return mCachedIngotToFluidRegistry.get(mCachedHotToColdRegistry.get(h.getUniqueDataIdentifier())); + return mCachedIngotToFluidRegistry.get(mCachedHotToColdRegistry.get(ingot.getUniqueDataIdentifier())); } Logger.MACHINE_INFO("[ABS] Neither Cache contains Output Ingot."); return null; } - private static boolean isValid(final ItemStack[] inputs, final ItemStack outputs[], final FluidStack[] fluidIn, + private static boolean isValid(final ItemStack[] inputs, final ItemStack[] outputs, final FluidStack[] fluidIn, final FluidStack fluidOut) { - if (inputs != null && outputs != null + return inputs != null && outputs != null && fluidIn != null && fluidOut != null && inputs.length > 0 - && outputs.length > 0) { - return true; - } - return false; + && outputs.length > 0; } public static synchronized boolean generateGTNHBlastSmelterRecipesFromEBFList() { @@ -152,7 +148,6 @@ public class RecipeGenBlastSmelterGTNH { // continue to next recipe if the Temp is too high. if (special > 3600) { Logger.MACHINE_INFO("[ABS] Skipping ABS addition for GTNH due to temp."); - continue; } else { FluidStack mMoltenStack = null; int mMoltenCount = 0; @@ -188,7 +183,7 @@ public class RecipeGenBlastSmelterGTNH { aTempList.add(recipeItem); } - inputs = aTempList.toArray(new ItemStack[aTempList.size()]); + inputs = aTempList.toArray(new ItemStack[0]); int inputLength = inputs.length; // If no circuit was found, increase array length by 1 to add circuit at newInput[0] if (!circuitFound) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluidCanning.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluidCanning.java index a334fd7de4..58aeed46d7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluidCanning.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluidCanning.java @@ -39,7 +39,7 @@ public class RecipeGenFluidCanning implements Runnable { private static boolean mHasRun = false; - private static HashSet<RecipeGenFluidCanning> mCache = new HashSet<>(); + private static final HashSet<RecipeGenFluidCanning> mCache = new HashSet<>(); private static void addRunnableToRecipeCache(RecipeGenFluidCanning r) { if (mHasRun) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMaterialProcessing.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMaterialProcessing.java index 352217ff95..31d097ab71 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMaterialProcessing.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMaterialProcessing.java @@ -76,9 +76,9 @@ public class RecipeGenMaterialProcessing extends RecipeGenBase { */ // Process Dust - if (componentMap.size() > 0 && componentMap.size() <= 6) { - ItemStack mInternalOutputs[] = new ItemStack[6]; - int mChances[] = new int[6]; + if (!componentMap.isEmpty() && componentMap.size() <= 6) { + ItemStack[] mInternalOutputs = new ItemStack[6]; + int[] mChances = new int[6]; int mCellCount = 0; int mTotalCount = 0; @@ -168,9 +168,7 @@ public class RecipeGenMaterialProcessing extends RecipeGenBase { internalOutputs.removeIf(Objects::isNull); int[] chances = new int[internalOutputs.size()]; - for (int i = 0; i < internalOutputs.size(); i++) { - chances[i] = mChances[i]; - } + System.arraycopy(mChances, 0, chances, 0, internalOutputs.size()); ItemStack[] inputs; if (emptyCell == null) { @@ -195,8 +193,8 @@ public class RecipeGenMaterialProcessing extends RecipeGenBase { "[Issue][Electrolyzer] " + material.getLocalizedName() + " is composed of over 6 materials, so an electrolyzer recipe for processing cannot be generated. Trying to create one for the Dehydrator instead."); - ItemStack mInternalOutputs[] = new ItemStack[9]; - int mChances[] = new int[9]; + ItemStack[] mInternalOutputs = new ItemStack[9]; + int[] mChances = new int[9]; int mCellCount = 0; int mTotalCount = 0; @@ -284,9 +282,7 @@ public class RecipeGenMaterialProcessing extends RecipeGenBase { List<ItemStack> internalOutputs = new ArrayList<>(Arrays.asList(mInternalOutputs)); internalOutputs.removeIf(Objects::isNull); int[] chances = new int[internalOutputs.size()]; - for (int i = 0; i < internalOutputs.size(); i++) { - chances[i] = mChances[i]; - } + System.arraycopy(mChances, 0, chances, 0, internalOutputs.size()); ItemStack[] inputs; if (emptyCell == null) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java index c8c1d28547..eb3d27e009 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java @@ -74,8 +74,8 @@ public class RecipeGenOre extends RecipeGenBase { Material bonusA = null; // Ni Material bonusB = null; // Tin - if (material.getComposites() - .size() >= 1 + if (!material.getComposites() + .isEmpty() && material.getComposites() .get(0) != null) { bonusA = material.getComposites() @@ -89,9 +89,7 @@ public class RecipeGenOre extends RecipeGenBase { // Setup Bonuses ArrayList<Material> aMatComp = new ArrayList<>(); - for (Material j : MaterialUtils.getCompoundMaterialsRecursively(material)) { - aMatComp.add(j); - } + aMatComp.addAll(MaterialUtils.getCompoundMaterialsRecursively(material)); if (aMatComp.size() < 3) { while (aMatComp.size() < 3) { @@ -374,10 +372,10 @@ public class RecipeGenOre extends RecipeGenBase { if (!disableOptional) { // Process Dust - if (componentMap.size() > 0 && componentMap.size() <= 6) { + if (!componentMap.isEmpty() && componentMap.size() <= 6) { - ItemStack mInternalOutputs[] = new ItemStack[6]; - int mChances[] = new int[6]; + ItemStack[] mInternalOutputs = new ItemStack[6]; + int[] mChances = new int[6]; int mCellCount = 0; int mTotalCount = 0; @@ -466,9 +464,7 @@ public class RecipeGenOre extends RecipeGenBase { List<ItemStack> internalOutputs = new ArrayList<>(Arrays.asList(mInternalOutputs)); internalOutputs.removeIf(Objects::isNull); int[] chances = new int[internalOutputs.size()]; - for (int i = 0; i < internalOutputs.size(); i++) { - chances[i] = mChances[i]; - } + System.arraycopy(mChances, 0, chances, 0, internalOutputs.size()); ItemStack[] inputs; if (emptyCell == null) { inputs = new ItemStack[] { mainDust }; @@ -490,8 +486,8 @@ public class RecipeGenOre extends RecipeGenBase { "[Issue][Electrolyzer] " + material.getLocalizedName() + " is composed of over 6 materials, so an electrolyzer recipe for processing cannot be generated. Trying to create one for the Dehydrator instead."); - ItemStack mInternalOutputs[] = new ItemStack[9]; - int mChances[] = new int[9]; + ItemStack[] mInternalOutputs = new ItemStack[9]; + int[] mChances = new int[9]; int mCellCount = 0; int mTotalCount = 0; @@ -582,9 +578,7 @@ public class RecipeGenOre extends RecipeGenBase { List<ItemStack> internalOutputs = new ArrayList<>(Arrays.asList(mInternalOutputs)); internalOutputs.removeIf(Objects::isNull); int[] chances = new int[internalOutputs.size()]; - for (int i = 0; i < internalOutputs.size(); i++) { - chances[i] = mChances[i]; - } + System.arraycopy(mChances, 0, chances, 0, internalOutputs.size()); ItemStack[] inputs; if (emptyCell == null) { @@ -607,8 +601,7 @@ public class RecipeGenOre extends RecipeGenBase { + " x" + mainDust.stackSize + ", " - + (emptyCell == null ? "No Cells" - : "" + emptyCell.getDisplayName() + " x" + emptyCell.stackSize)); + + (emptyCell == null ? "No Cells" : emptyCell.getDisplayName() + " x" + emptyCell.stackSize)); Logger.MATERIALS("Outputs " + ItemUtils.getArrayStackNames(mInternalOutputs)); Logger.MATERIALS("Time: " + ((int) Math.max(material.getMass() * 4L * 1, 1))); Logger.MATERIALS("EU: " + tVoltageMultiplier); @@ -654,7 +647,6 @@ public class RecipeGenOre extends RecipeGenBase { null, matDust); - final ItemStack normalDust = matDust; final ItemStack smallDust = material.getSmallDust(1); final ItemStack tinyDust = material.getTinyDust(1); @@ -668,28 +660,28 @@ public class RecipeGenOre extends RecipeGenBase { tinyDust, tinyDust, tinyDust, - normalDust)) { + matDust)) { Logger.WARNING("9 Tiny dust to 1 Dust Recipe: " + material.getLocalizedName() + " - Success"); } else { Logger.WARNING("9 Tiny dust to 1 Dust Recipe: " + material.getLocalizedName() + " - Failed"); } if (RecipeUtils - .addShapedRecipe(normalDust, null, null, null, null, null, null, null, null, material.getTinyDust(9))) { + .addShapedRecipe(matDust, null, null, null, null, null, null, null, null, material.getTinyDust(9))) { Logger.WARNING("9 Tiny dust from 1 Recipe: " + material.getLocalizedName() + " - Success"); } else { Logger.WARNING("9 Tiny dust from 1 Recipe: " + material.getLocalizedName() + " - Failed"); } if (RecipeUtils - .addShapedRecipe(smallDust, smallDust, null, smallDust, smallDust, null, null, null, null, normalDust)) { + .addShapedRecipe(smallDust, smallDust, null, smallDust, smallDust, null, null, null, null, matDust)) { Logger.WARNING("4 Small dust to 1 Dust Recipe: " + material.getLocalizedName() + " - Success"); } else { Logger.WARNING("4 Small dust to 1 Dust Recipe: " + material.getLocalizedName() + " - Failed"); } if (RecipeUtils - .addShapedRecipe(null, normalDust, null, null, null, null, null, null, null, material.getSmallDust(4))) { + .addShapedRecipe(null, matDust, null, null, null, null, null, null, null, material.getSmallDust(4))) { Logger.WARNING("4 Small dust from 1 Dust Recipe: " + material.getLocalizedName() + " - Success"); } else { Logger.WARNING("4 Small dust from 1 Dust Recipe: " + material.getLocalizedName() + " - Failed"); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java index 63812e2e6e..68011ace71 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java @@ -86,7 +86,7 @@ public class RecipeGenRecycling implements Runnable { .getDisplayName()); validCounter++; } - Pair<OrePrefixes, ItemStack> temp3[] = new Pair[validCounter]; + Pair<OrePrefixes, ItemStack>[] temp3 = new Pair[validCounter]; int temp4 = 0; for (Pair<OrePrefixes, ItemStack> r : mValidPairs) { if (r == null) { @@ -250,8 +250,10 @@ public class RecipeGenRecycling implements Runnable { } return GTUtility.copyAmount( aAmount, - new Object[] { GTOreDictUnificator.getName2StackMap() - .get(aName.toString()), getFirstOre(aName, aAmount), aReplacement }); + GTOreDictUnificator.getName2StackMap() + .get(aName.toString()), + getFirstOre(aName, aAmount), + aReplacement); } public static ItemStack getFirstOre(final Object aName, final long aAmount) { @@ -320,7 +322,6 @@ public class RecipeGenRecycling implements Runnable { } public static ItemStack getItemStackOfAmountFromOreDict(String oredictName, final int amount) { - String mTemp = oredictName; // Banned Materials and replacements for GT5.8 compat. @@ -329,7 +330,7 @@ public class RecipeGenRecycling implements Runnable { return ItemUtils.getSimpleStack(Items.clay_ball, amount); } - final ArrayList<ItemStack> oreDictList = OreDictionary.getOres(mTemp); + final ArrayList<ItemStack> oreDictList = OreDictionary.getOres(oredictName); if (!oreDictList.isEmpty()) { final ItemStack returnValue = oreDictList.get(0) .copy(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenShapedCrafting.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenShapedCrafting.java index 97445915f2..3fd856e801 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenShapedCrafting.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenShapedCrafting.java @@ -37,8 +37,7 @@ public class RecipeGenShapedCrafting extends RecipeGenBase { if (material.getPlate(1) != null && material.getIngot(1) != null) GTModHandler.addCraftingRecipe( material.getPlate(1), GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, - new Object[] { "h", "B", "I", Character.valueOf('I'), material.getIngot(1), Character.valueOf('B'), - material.getIngot(1) }); + new Object[] { "h", "B", "I", 'I', material.getIngot(1), 'B', material.getIngot(1) }); if (ItemUtils.checkForInvalidItems(material.getPlate(1)) && ItemUtils.checkForInvalidItems(material.getIngot(1))) @@ -53,8 +52,7 @@ public class RecipeGenShapedCrafting extends RecipeGenBase { GTModHandler.addCraftingRecipe( material.getPlateDouble(1), GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, - new Object[] { "I", "B", "h", Character.valueOf('I'), material.getPlate(1), Character.valueOf('B'), - material.getPlate(1) }); + new Object[] { "I", "B", "h", 'I', material.getPlate(1), 'B', material.getPlate(1) }); if (ItemUtils.checkForInvalidItems(material.getPlateDouble(1)) && ItemUtils.checkForInvalidItems(material.getPlate(1))) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderAlgaeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderAlgaeFarm.java index 4689bb5042..0ec27e6cee 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderAlgaeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderAlgaeFarm.java @@ -95,7 +95,7 @@ public class RecipeLoaderAlgaeFarm { false, aInputs, aOutputs, - (Object) null, + null, new int[] {}, new FluidStack[] { GTValues.NF }, new FluidStack[] { GTValues.NF }, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java index 9e2e29a7fc..948a918071 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java @@ -91,47 +91,47 @@ public class GregtechBufferDynamos { GregtechItemList.Hatch_Buffer_Dynamo_ULV.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_ULV, 'T', CI.getTieredCircuit(0), 'C', - OrePrefixes.cableGt04.get((Object) Materials.Lead) }); + OrePrefixes.cableGt04.get(Materials.Lead) }); GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_LV.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_LV, 'T', CI.getTieredCircuit(1), 'C', - OrePrefixes.cableGt04.get((Object) Materials.Tin) }); + OrePrefixes.cableGt04.get(Materials.Tin) }); GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_MV.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_MV, 'T', CI.getTieredCircuit(2), 'C', - OrePrefixes.cableGt04.get((Object) Materials.AnyCopper) }); + OrePrefixes.cableGt04.get(Materials.AnyCopper) }); GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_HV.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_HV, 'T', CI.getTieredCircuit(3), 'C', - OrePrefixes.cableGt04.get((Object) Materials.Gold) }); + OrePrefixes.cableGt04.get(Materials.Gold) }); GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_EV.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_EV, 'T', CI.getTieredCircuit(4), 'C', - OrePrefixes.cableGt04.get((Object) Materials.Aluminium) }); + OrePrefixes.cableGt04.get(Materials.Aluminium) }); GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_IV.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_IV, 'T', CI.getTieredCircuit(5), 'C', - OrePrefixes.cableGt04.get((Object) Materials.Tungsten) }); + OrePrefixes.cableGt04.get(Materials.Tungsten) }); GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_LuV.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_LuV, 'T', CI.getTieredCircuit(6), 'C', - OrePrefixes.cableGt04.get((Object) Materials.VanadiumGallium) }); + OrePrefixes.cableGt04.get(Materials.VanadiumGallium) }); GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_ZPM.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_ZPM, 'T', CI.getTieredCircuit(7), 'C', - OrePrefixes.cableGt04.get((Object) Materials.Naquadah) }); + OrePrefixes.cableGt04.get(Materials.Naquadah) }); GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_UV.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_UV, 'T', CI.getTieredCircuit(8), 'C', - OrePrefixes.wireGt12.get((Object) Materials.NaquadahAlloy) }); + OrePrefixes.wireGt12.get(Materials.NaquadahAlloy) }); GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_MAX.get(1L), bitsd, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java index b331479028..c65d4109ee 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java @@ -743,23 +743,23 @@ public class GregtechConduits { Logger.WARNING( "Generated pipeTiny from " + materialName + "? " - + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Tiny" + output, 1) != null) ? true : false)); + + (ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Tiny" + output, 1) != null)); Logger.WARNING( "Generated pipeSmall from " + materialName + "? " - + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Small" + output, 1) != null) ? true : false)); + + (ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Small" + output, 1) != null)); Logger.WARNING( "Generated pipeNormal from " + materialName + "? " - + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Medium" + output, 1) != null) ? true : false)); + + (ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Medium" + output, 1) != null)); Logger.WARNING( "Generated pipeLarge from " + materialName + "? " - + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Large" + output, 1) != null) ? true : false)); + + (ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Large" + output, 1) != null)); Logger.WARNING( "Generated pipeHuge from " + materialName + "? " - + ((ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Huge" + output, 1) != null) ? true : false)); + + (ItemUtils.getItemStackOfAmountFromOreDict("pipe" + "Huge" + output, 1) != null)); int eut = (int) (8 * vMulti); @@ -877,8 +877,7 @@ public class GregtechConduits { String tName = aName.toString(); if (GTUtility.isStringInvalid(tName)) return false; ArrayList<ItemStack> tList = GTOreDictUnificator.getOres(tName); - for (ItemStack itemStack : tList) - if (GTUtility.areStacksEqual((ItemStack) itemStack, aStack, true)) return false; + for (ItemStack itemStack : tList) if (GTUtility.areStacksEqual(itemStack, aStack, true)) return false; OreDictionary.registerOre(tName, GTUtility.copyAmount(1L, new Object[] { aStack })); return true; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java index 6dd9c7170c..a6c3b51673 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java @@ -110,70 +110,70 @@ public class GregtechEnergyBuffer { 1).getStackForm(1L)); GTModHandler.addCraftingRecipe( - GregtechItemList.Energy_Buffer_1by1_ULV.get(1L, new Object[0]), + GregtechItemList.Energy_Buffer_1by1_ULV.get(1L), GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", 'M', ItemList.Hull_ULV, 'W', OrePrefixes.wireGt08.get(Materials.Lead), 'T', GregtechOreDictNames.buffer_core }); GTModHandler.addCraftingRecipe( - GregtechItemList.Energy_Buffer_1by1_LV.get(1L, new Object[0]), + GregtechItemList.Energy_Buffer_1by1_LV.get(1L), GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", 'M', ItemList.Hull_LV, 'W', OrePrefixes.wireGt08.get(Materials.Tin), 'T', GregtechOreDictNames.buffer_core }); GTModHandler.addCraftingRecipe( - GregtechItemList.Energy_Buffer_1by1_MV.get(1L, new Object[0]), + GregtechItemList.Energy_Buffer_1by1_MV.get(1L), GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", 'M', ItemList.Hull_MV, 'W', OrePrefixes.wireGt08.get(Materials.AnyCopper), 'T', GregtechOreDictNames.buffer_core }); GTModHandler.addCraftingRecipe( - GregtechItemList.Energy_Buffer_1by1_HV.get(1L, new Object[0]), + GregtechItemList.Energy_Buffer_1by1_HV.get(1L), GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", 'M', ItemList.Hull_HV, 'W', OrePrefixes.wireGt08.get(Materials.Gold), 'T', GregtechOreDictNames.buffer_core }); GTModHandler.addCraftingRecipe( - GregtechItemList.Energy_Buffer_1by1_EV.get(1L, new Object[0]), + GregtechItemList.Energy_Buffer_1by1_EV.get(1L), GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", 'M', ItemList.Hull_EV, 'W', OrePrefixes.wireGt08.get(Materials.Aluminium), 'T', GregtechOreDictNames.buffer_core }); GTModHandler.addCraftingRecipe( - GregtechItemList.Energy_Buffer_1by1_IV.get(1L, new Object[0]), + GregtechItemList.Energy_Buffer_1by1_IV.get(1L), GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", 'M', ItemList.Hull_IV, 'W', OrePrefixes.wireGt08.get(Materials.Tungsten), 'T', GregtechOreDictNames.buffer_core }); GTModHandler.addCraftingRecipe( - GregtechItemList.Energy_Buffer_1by1_LuV.get(1L, new Object[0]), + GregtechItemList.Energy_Buffer_1by1_LuV.get(1L), GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", 'M', ItemList.Hull_LuV, 'W', OrePrefixes.wireGt08.get(Materials.Osmium), 'T', GregtechOreDictNames.buffer_core }); GTModHandler.addCraftingRecipe( - GregtechItemList.Energy_Buffer_1by1_ZPM.get(1L, new Object[0]), + GregtechItemList.Energy_Buffer_1by1_ZPM.get(1L), GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", 'M', ItemList.Hull_ZPM, 'W', OrePrefixes.wireGt08.get(Materials.Osmium), 'T', GregtechOreDictNames.buffer_core }); GTModHandler.addCraftingRecipe( - GregtechItemList.Energy_Buffer_1by1_UV.get(1L, new Object[0]), + GregtechItemList.Energy_Buffer_1by1_UV.get(1L), GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", 'M', ItemList.Hull_UV, 'W', OrePrefixes.wireGt08.get(Materials.Osmium), 'T', GregtechOreDictNames.buffer_core }); GTModHandler.addCraftingRecipe( - GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]), + GregtechItemList.Energy_Buffer_1by1_MAX.get(1L), GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE | GTModHandler.RecipeBits.BUFFERED, diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java b/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java index 82daf41c90..27e43f5a43 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java @@ -85,9 +85,8 @@ public class CustomKineticRotor extends Item implements IKineticRotor { public void addInformation(final ItemStack itemStack, final EntityPlayer player, final List info, final boolean b) { info.add( - StatCollector.translateToLocalFormatted( - "ic2.itemrotor.wind.info", - new Object[] { this.minWindStrength, this.maxWindStrength })); + StatCollector + .translateToLocalFormatted("ic2.itemrotor.wind.info", this.minWindStrength, this.maxWindStrength)); GearboxType type = null; if (Minecraft.getMinecraft().currentScreen != null diff --git a/src/main/java/gtPlusPlus/xmod/ic2/recipe/RecipeIC2.java b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RecipeIC2.java index dc7a87d4dd..0329950577 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/recipe/RecipeIC2.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RecipeIC2.java @@ -57,20 +57,20 @@ public class RecipeIC2 { public static String ring_T3 = "ringChrome"; public static String ring_T4 = "ringOsmiridium"; - private static ItemStack rotor_blade_T1 = ItemUtils.getSimpleStack(IC2Items.rotor_Blade_Material_1.getItem()); - private static ItemStack rotor_blade_T2 = ItemUtils.getSimpleStack(IC2Items.rotor_Blade_Material_2.getItem()); - private static ItemStack rotor_blade_T3 = ItemUtils.getSimpleStack(IC2Items.rotor_Blade_Material_3.getItem()); - private static ItemStack rotor_blade_T4 = ItemUtils.getSimpleStack(IC2Items.rotor_Blade_Material_4.getItem()); + private static final ItemStack rotor_blade_T1 = ItemUtils.getSimpleStack(IC2Items.rotor_Blade_Material_1.getItem()); + private static final ItemStack rotor_blade_T2 = ItemUtils.getSimpleStack(IC2Items.rotor_Blade_Material_2.getItem()); + private static final ItemStack rotor_blade_T3 = ItemUtils.getSimpleStack(IC2Items.rotor_Blade_Material_3.getItem()); + private static final ItemStack rotor_blade_T4 = ItemUtils.getSimpleStack(IC2Items.rotor_Blade_Material_4.getItem()); - private static ItemStack shaft_T1 = ItemUtils.getSimpleStack(IC2Items.shaft_Material_1.getItem()); - private static ItemStack shaft_T2 = ItemUtils.getSimpleStack(IC2Items.shaft_Material_2.getItem()); - private static ItemStack shaft_T3 = ItemUtils.getSimpleStack(IC2Items.shaft_Material_3.getItem()); - private static ItemStack shaft_T4 = ItemUtils.getSimpleStack(IC2Items.shaft_Material_4.getItem()); + private static final ItemStack shaft_T1 = ItemUtils.getSimpleStack(IC2Items.shaft_Material_1.getItem()); + private static final ItemStack shaft_T2 = ItemUtils.getSimpleStack(IC2Items.shaft_Material_2.getItem()); + private static final ItemStack shaft_T3 = ItemUtils.getSimpleStack(IC2Items.shaft_Material_3.getItem()); + private static final ItemStack shaft_T4 = ItemUtils.getSimpleStack(IC2Items.shaft_Material_4.getItem()); - private static ItemStack rotor_T1 = ItemUtils.getSimpleStack(IC2Items.rotor_Material_1.getItem()); - private static ItemStack rotor_T2 = ItemUtils.getSimpleStack(IC2Items.rotor_Material_2.getItem()); - private static ItemStack rotor_T3 = ItemUtils.getSimpleStack(IC2Items.rotor_Material_3.getItem()); - private static ItemStack rotor_T4 = ItemUtils.getSimpleStack(IC2Items.rotor_Material_4.getItem()); + private static final ItemStack rotor_T1 = ItemUtils.getSimpleStack(IC2Items.rotor_Material_1.getItem()); + private static final ItemStack rotor_T2 = ItemUtils.getSimpleStack(IC2Items.rotor_Material_2.getItem()); + private static final ItemStack rotor_T3 = ItemUtils.getSimpleStack(IC2Items.rotor_Material_3.getItem()); + private static final ItemStack rotor_T4 = ItemUtils.getSimpleStack(IC2Items.rotor_Material_4.getItem()); private static boolean checkForEnderIO() { if (!EnderIO.isModLoaded()) { @@ -151,23 +151,20 @@ public class RecipeIC2 { GregtechItemList.Shape_Extruder_WindmillShaft.get(1L), GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE, - new Object[] { "hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Rod, - Character.valueOf('X'), OrePrefixes.plate.get(Materials.DarkSteel), Character.valueOf('S'), - OrePrefixes.screw.get(Materials.DarkSteel) }); + new Object[] { "hXS", "XPX", "fXd", 'P', ItemList.Shape_Extruder_Rod, 'X', + OrePrefixes.plate.get(Materials.DarkSteel), 'S', OrePrefixes.screw.get(Materials.DarkSteel) }); GTModHandler.addCraftingRecipe( GregtechItemList.Shape_Extruder_WindmillShaft.get(1L), GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE, - new Object[] { "hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Rod, - Character.valueOf('X'), OrePrefixes.plate.get(Materials.TungstenSteel), Character.valueOf('S'), - OrePrefixes.screw.get(Materials.TungstenSteel) }); + new Object[] { "hXS", "XPX", "fXd", 'P', ItemList.Shape_Extruder_Rod, 'X', + OrePrefixes.plate.get(Materials.TungstenSteel), 'S', OrePrefixes.screw.get(Materials.TungstenSteel) }); GTModHandler.addCraftingRecipe( GregtechItemList.Shape_Extruder_WindmillShaft.get(1L), GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.REVERSIBLE, - new Object[] { "hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Rod, - Character.valueOf('X'), OrePrefixes.plate.get(Materials.Molybdenum), Character.valueOf('S'), - OrePrefixes.screw.get(Materials.Molybdenum) }); + new Object[] { "hXS", "XPX", "fXd", 'P', ItemList.Shape_Extruder_Rod, 'X', + OrePrefixes.plate.get(Materials.Molybdenum), 'S', OrePrefixes.screw.get(Materials.Molybdenum) }); Logger.INFO("Added recipe item for GT5 Extruder: Shaft Shape"); // Shaft Recipes diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java index 2d6a4ab3dd..782eda60c6 100644 --- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java @@ -91,7 +91,7 @@ public class ThreadAspectScanner extends Thread { if (item.getHasSubtypes()) { List q1 = new ArrayList(); item.getSubItems(item, item.getCreativeTab(), q1); - if (q1 != null && q1.size() > 0) { + if (q1 != null && !q1.isEmpty()) { for (int e = 0; e < q1.size(); e++) { ItemStack check = ItemUtils.simpleMetaStack(item, e, 1); if (check != null) { @@ -124,9 +124,7 @@ public class ThreadAspectScanner extends Thread { for (ItemStack stack : group) { thaumcraft.api.aspects.AspectList a = thaumcraft.common.lib.crafting.ThaumcraftCraftingManager .getObjectTags(stack); - if (a == null) { - continue; - } else { + if (a != null) { ArrayList<Pair<String, Integer>> aspectPairs = new ArrayList<>(); for (thaumcraft.api.aspects.Aspect c : a.getAspectsSortedAmount()) { if (c != null) { diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TFBlockFluidEnder.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TFBlockFluidEnder.java index 1f7c1fec93..98b0912497 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TFBlockFluidEnder.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TFBlockFluidEnder.java @@ -17,7 +17,7 @@ import gtPlusPlus.xmod.thermalfoundation.fluid.TFFluids; public class TFBlockFluidEnder extends BlockFluidCoFHBase { public static final Material materialFluidEnder = new MaterialLiquid(MapColor.greenColor); - private static boolean effect = true; + private static final boolean effect = true; public TFBlockFluidEnder() { super(GTPlusPlus.ID, TFFluids.fluidEnder, materialFluidEnder, "ender"); diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TFBlockFluidPyrotheum.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TFBlockFluidPyrotheum.java index 1014667355..ebefa49ecd 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TFBlockFluidPyrotheum.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TFBlockFluidPyrotheum.java @@ -52,13 +52,8 @@ public class TFBlockFluidPyrotheum extends BlockFluidInteractive { for (int i = 0; i < 8; i++) { this.addInteraction(Blocks.stone_stairs, i, Blocks.stone_brick_stairs, i); } - final String str1 = "Fluid.Pyrotheum"; - String str2 = "Enable this for Fluid Pyrotheum to be worse than lava."; effect = true; - - str2 = "Enable this for Fluid Pyrotheum Source blocks to gradually fall downwards."; enableSourceFall = true; - return true; } diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java b/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java index 103a44e665..4933039264 100644 --- a/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java @@ -20,7 +20,7 @@ import gtPlusPlus.xmod.tinkers.util.TinkersUtils; public class BaseTinkersMaterial { - private static HashMap<String, Integer> aInternalMaterialIdMap = new HashMap<>(); + private static final HashMap<String, Integer> aInternalMaterialIdMap = new HashMap<>(); private static int aNextFreeID; public final String mLocalName; @@ -179,8 +179,7 @@ public class BaseTinkersMaterial { TinkersUtils.addMelting(aMaterial.getIngot(1), aMatBlock, 0, aMelt, aMaterial.getFluidStack(144)); if (aMelt <= 3600) { ItemStack ingotcast = TinkersUtils.getPattern(1); - TinkersUtils - .addBasinRecipe(aMaterial.getBlock(1), aMaterial.getFluidStack(144 * 9), (ItemStack) null, true, 100); + TinkersUtils.addBasinRecipe(aMaterial.getBlock(1), aMaterial.getFluidStack(144 * 9), null, true, 100); TinkersUtils .addCastingTableRecipe(aMaterial.getIngot(1), aMaterial.getFluidStack(144), ingotcast, false, 50); } diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java index 7c48f1bd74..ff182aa641 100644 --- a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java @@ -6,7 +6,6 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import gregtech.api.enums.GTValues; import gregtech.api.enums.TierEU; @@ -77,7 +76,7 @@ public class TinkersDryingRecipe { .removeTag("frypanKill"); if (input.getTagCompound() .hasNoTags()) { - input.setTagCompound((NBTTagCompound) null); + input.setTagCompound(null); } } return ItemStack.areItemStacksEqual(this.input, input); diff --git a/src/main/java/gtneioreplugin/Config.java b/src/main/java/gtneioreplugin/Config.java index 17ac9af423..decbc85131 100644 --- a/src/main/java/gtneioreplugin/Config.java +++ b/src/main/java/gtneioreplugin/Config.java @@ -1,9 +1,6 @@ package gtneioreplugin; -@com.gtnewhorizon.gtnhlib.config.Config( - modid = GTNEIOrePlugin.MODID, - category = "general", - filename = GTNEIOrePlugin.MODID) +@com.gtnewhorizon.gtnhlib.config.Config(modid = GTNEIOrePlugin.MODID, filename = GTNEIOrePlugin.MODID) public class Config { @com.gtnewhorizon.gtnhlib.config.Config.Comment("if true, generate both csv files.") diff --git a/src/main/java/gtneioreplugin/util/GT5OreSmallHelper.java b/src/main/java/gtneioreplugin/util/GT5OreSmallHelper.java index 58ae605d8c..f00e110020 100644 --- a/src/main/java/gtneioreplugin/util/GT5OreSmallHelper.java +++ b/src/main/java/gtneioreplugin/util/GT5OreSmallHelper.java @@ -56,11 +56,11 @@ public class GT5OreSmallHelper { } for (GTWorldgen worldGen : GregTechAPI.sWorldgenList) { - if (!worldGen.mWorldGenName.startsWith("ore.small.") || !(worldGen instanceof WorldgenGTOreSmallPieces)) { + if (!worldGen.mWorldGenName.startsWith("ore.small.") + || !(worldGen instanceof WorldgenGTOreSmallPieces worldGenSmallPieces)) { continue; } - WorldgenGTOreSmallPieces worldGenSmallPieces = (WorldgenGTOreSmallPieces) worldGen; meta = worldGenSmallPieces.mMeta; if (meta < 0) break; material = GregTechAPI.sGeneratedMaterials[meta]; diff --git a/src/main/java/gtneioreplugin/util/Oremix.java b/src/main/java/gtneioreplugin/util/Oremix.java index f4ab1abb8d..be6826110e 100644 --- a/src/main/java/gtneioreplugin/util/Oremix.java +++ b/src/main/java/gtneioreplugin/util/Oremix.java @@ -78,7 +78,7 @@ public class Oremix implements Comparable<Oremix> { @Override public int compareTo(Oremix ore) { - return ore.oreMixName.compareTo(ore.oreMixName); + return this.oreMixName.compareTo(ore.oreMixName); } public static String getCsvHeader() { diff --git a/src/main/java/gtnhlanth/common/beamline/BeamInformation.java b/src/main/java/gtnhlanth/common/beamline/BeamInformation.java index 3d2ff841c4..ff4ac33333 100644 --- a/src/main/java/gtnhlanth/common/beamline/BeamInformation.java +++ b/src/main/java/gtnhlanth/common/beamline/BeamInformation.java @@ -2,13 +2,13 @@ package gtnhlanth.common.beamline; public class BeamInformation { - private float energy; // in keV - private int rate; + private final float energy; // in keV + private final int rate; - private Particle particle; - private int particleId; + private final Particle particle; + private final int particleId; - private float focus; + private final float focus; public BeamInformation(float energy, int rate, int particleId, float focus) { this.energy = energy; diff --git a/src/main/java/gtnhlanth/common/beamline/Particle.java b/src/main/java/gtnhlanth/common/beamline/Particle.java index 856bb383db..22881fe026 100644 --- a/src/main/java/gtnhlanth/common/beamline/Particle.java +++ b/src/main/java/gtnhlanth/common/beamline/Particle.java @@ -10,21 +10,21 @@ public enum Particle { PROTON(true, 3, 938.27f, 15000, "proton", "p\u207A", 1, null), ALPHA(true, 4, 3727.38f, 8000, "alpha", "\u03B1", 2, null); - private boolean canAcc; + private final boolean canAcc; - private float restMass; // in MeV + private final float restMass; // in MeV - private float maxSourceEnergy; // in keV + private final float maxSourceEnergy; // in keV - private String name; - private String shortName; + private final String name; + private final String shortName; - private float charge; // in multiples of elemental charge + private final float charge; // in multiples of elemental charge - private String chargeSpecial; + private final String chargeSpecial; - private Particle(boolean canAcc, int id, float restMass, float maxSourceEnergy, String name, String shortName, - float charge, String chargeSpecial) { // ID + Particle(boolean canAcc, int id, float restMass, float maxSourceEnergy, String name, String shortName, float charge, + String chargeSpecial) { // ID // is // symbolic // only diff --git a/src/main/java/gtnhlanth/common/block/BlockAntennaCasing.java b/src/main/java/gtnhlanth/common/block/BlockAntennaCasing.java index d93d6a3494..a99a1c7556 100644 --- a/src/main/java/gtnhlanth/common/block/BlockAntennaCasing.java +++ b/src/main/java/gtnhlanth/common/block/BlockAntennaCasing.java @@ -2,7 +2,7 @@ package gtnhlanth.common.block; public class BlockAntennaCasing extends BlockCasing { - private int antennaTier; + private final int antennaTier; public BlockAntennaCasing(int tier) { super("antenna_t" + tier); diff --git a/src/main/java/gtnhlanth/common/block/BlockCasing.java b/src/main/java/gtnhlanth/common/block/BlockCasing.java index d51a4e79f5..6d45a6c352 100644 --- a/src/main/java/gtnhlanth/common/block/BlockCasing.java +++ b/src/main/java/gtnhlanth/common/block/BlockCasing.java @@ -18,7 +18,7 @@ public class BlockCasing extends Block { @SideOnly(Side.CLIENT) protected IIcon[] texture; - private String name; + private final String name; public BlockCasing(String name) { super(Material.iron); diff --git a/src/main/java/gtnhlanth/common/hatch/MTEHatchOutputBeamline.java b/src/main/java/gtnhlanth/common/hatch/MTEHatchOutputBeamline.java index 00772fb5e8..a5db1c2176 100644 --- a/src/main/java/gtnhlanth/common/hatch/MTEHatchOutputBeamline.java +++ b/src/main/java/gtnhlanth/common/hatch/MTEHatchOutputBeamline.java @@ -98,15 +98,15 @@ public class MTEHatchOutputBeamline extends MTEHatchBeamlineConnector<BeamLinePa IMetaTileEntity nextMeta = nextTE.getMetaTileEntity(); - if (nextMeta == null || !(nextMeta instanceof IConnectsToBeamline)) { // Non-beamliney block + if (!(nextMeta instanceof IConnectsToBeamline)) { // Non-beamliney block return; } - if (((IConnectsToBeamline) nextMeta) instanceof MTEHatchInputBeamline) { + if (nextMeta instanceof MTEHatchInputBeamline) { ((MTEHatchInputBeamline) nextMeta).setContents(q); // Reached another multi break; - } else if (((IConnectsToBeamline) nextMeta) instanceof MTEBeamlinePipe) { // Another pipe follows + } else if (nextMeta instanceof MTEBeamlinePipe) { // Another pipe follows if (((MTEBeamlinePipe) nextMeta).isDataInputFacing(front.getOpposite())) { // Connected to previous pipe ((MTEBeamlinePipe) nextMeta).markUsed(); diff --git a/src/main/java/gtnhlanth/common/item/ItemPhotolithographicMask.java b/src/main/java/gtnhlanth/common/item/ItemPhotolithographicMask.java index d39c74b602..30cbac875b 100644 --- a/src/main/java/gtnhlanth/common/item/ItemPhotolithographicMask.java +++ b/src/main/java/gtnhlanth/common/item/ItemPhotolithographicMask.java @@ -10,8 +10,8 @@ import gtnhlanth.Tags; public class ItemPhotolithographicMask extends Item implements ICanFocus { - private String name; - private String descSpectrum; + private final String name; + private final String descSpectrum; public ItemPhotolithographicMask(String name, int maxDamage, String descSpectrum) { super(); diff --git a/src/main/java/gtnhlanth/common/register/BotWerkstoffMaterialPool.java b/src/main/java/gtnhlanth/common/register/BotWerkstoffMaterialPool.java index 0172b90655..e1b27c9ae2 100644 --- a/src/main/java/gtnhlanth/common/register/BotWerkstoffMaterialPool.java +++ b/src/main/java/gtnhlanth/common/register/BotWerkstoffMaterialPool.java @@ -11,7 +11,6 @@ import bartworks.util.Pair; /* * Originally authored by botn365 under the MIT License. See BotdustriesLICENSE */ -@SuppressWarnings("unchecked") public class BotWerkstoffMaterialPool implements Runnable { public static final Werkstoff TungsticAcid = new Werkstoff( diff --git a/src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java index 41902bebc6..98d6cb01e4 100644 --- a/src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java +++ b/src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java @@ -11,7 +11,6 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TextureSet; -@SuppressWarnings({ "unchecked" }) public class WerkstoffMaterialPool implements Runnable { // Current highest ID = 11_499 diff --git a/src/main/java/gtnhlanth/common/tileentity/MTELINAC.java b/src/main/java/gtnhlanth/common/tileentity/MTELINAC.java index b7902c5d24..652529c303 100644 --- a/src/main/java/gtnhlanth/common/tileentity/MTELINAC.java +++ b/src/main/java/gtnhlanth/common/tileentity/MTELINAC.java @@ -69,8 +69,8 @@ public class MTELINAC extends MTEEnhancedMultiBlockBase<MTELINAC> implements ISu private int machineTemp = 0; // Coolant temperature - private ArrayList<MTEHatchInputBeamline> mInputBeamline = new ArrayList<>(); - private ArrayList<MTEHatchOutputBeamline> mOutputBeamline = new ArrayList<>(); + private final ArrayList<MTEHatchInputBeamline> mInputBeamline = new ArrayList<>(); + private final ArrayList<MTEHatchOutputBeamline> mOutputBeamline = new ArrayList<>(); private static final int CASING_INDEX = GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings5, 14); @@ -276,7 +276,7 @@ public class MTELINAC extends MTEEnhancedMultiBlockBase<MTELINAC> implements ISu outputRate = 0; ArrayList<FluidStack> tFluidInputs = this.getStoredFluids(); - if (tFluidInputs.size() == 0) { + if (tFluidInputs.isEmpty()) { this.doRandomMaintenanceDamage(); // Penalise letting coolant run dry this.stopMachine(SimpleShutDownReason.ofCritical("gtnhlanth.nocoolant")); return false; @@ -490,7 +490,7 @@ public class MTELINAC extends MTEEnhancedMultiBlockBase<MTELINAC> implements ISu + StatCollector.translateToLocal("GT5U.multiblock.efficiency") + ": " + EnumChatFormatting.YELLOW - + Float.toString(mEfficiency / 100.0F) + + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %", @@ -569,9 +569,7 @@ public class MTELINAC extends MTEEnhancedMultiBlockBase<MTELINAC> implements ISu } private static float calculateTemperatureFactor(int fluidTemp) { - - float factor = (float) Math.pow(1.1, 0.2 * fluidTemp); - return factor; + return (float) Math.pow(1.1, 0.2 * fluidTemp); } /* @@ -612,7 +610,7 @@ public class MTELINAC extends MTEEnhancedMultiBlockBase<MTELINAC> implements ISu return false; } break; - } ; + } length += 2; } @@ -678,7 +676,7 @@ public class MTELINAC extends MTEEnhancedMultiBlockBase<MTELINAC> implements ISu } - int finalOutput = survivialBuildPiece( + return survivialBuildPiece( STRUCTURE_PIECE_END, stackSize, 3, @@ -688,8 +686,6 @@ public class MTELINAC extends MTEEnhancedMultiBlockBase<MTELINAC> implements ISu env, false, true); - - return finalOutput; } @Override diff --git a/src/main/java/gtnhlanth/common/tileentity/MTESourceChamber.java b/src/main/java/gtnhlanth/common/tileentity/MTESourceChamber.java index cec44a111a..3c1984171f 100644 --- a/src/main/java/gtnhlanth/common/tileentity/MTESourceChamber.java +++ b/src/main/java/gtnhlanth/common/tileentity/MTESourceChamber.java @@ -53,7 +53,7 @@ public class MTESourceChamber extends MTEEnhancedMultiBlockBase<MTESourceChamber private static final IStructureDefinition<MTESourceChamber> STRUCTURE_DEFINITION; - private ArrayList<MTEHatchOutputBeamline> mOutputBeamline = new ArrayList<>(); + private final ArrayList<MTEHatchOutputBeamline> mOutputBeamline = new ArrayList<>(); private static final int CASING_INDEX = GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings5, 14); @@ -316,7 +316,7 @@ public class MTESourceChamber extends MTEEnhancedMultiBlockBase<MTESourceChamber + StatCollector.translateToLocal("GT5U.multiblock.efficiency") + ": " + EnumChatFormatting.YELLOW - + Float.toString(mEfficiency / 100.0F) + + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %", EnumChatFormatting.BOLD + StatCollector.translateToLocal("beamline.out_pre") diff --git a/src/main/java/gtnhlanth/common/tileentity/MTESynchrotron.java b/src/main/java/gtnhlanth/common/tileentity/MTESynchrotron.java index e5778f0efc..0aae0f0f7b 100644 --- a/src/main/java/gtnhlanth/common/tileentity/MTESynchrotron.java +++ b/src/main/java/gtnhlanth/common/tileentity/MTESynchrotron.java @@ -68,8 +68,8 @@ public class MTESynchrotron extends MTEEnhancedMultiBlockBase<MTESynchrotron> im public static final int CONSUMED_FLUID = 32_000; // Fluid consumed per processed recipe, maybe increase with EU public static final int MIN_INPUT_FOCUS = 25; // Inclusive - private ArrayList<MTEHatchInputBeamline> mInputBeamline = new ArrayList<>(); - private ArrayList<MTEHatchOutputBeamline> mOutputBeamline = new ArrayList<>(); + private final ArrayList<MTEHatchInputBeamline> mInputBeamline = new ArrayList<>(); + private final ArrayList<MTEHatchOutputBeamline> mOutputBeamline = new ArrayList<>(); public ArrayList<BlockAntennaCasing> mAntennaCasings = new ArrayList<>(); @@ -624,12 +624,10 @@ public class MTESynchrotron extends MTEEnhancedMultiBlockBase<MTESynchrotron> im } IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (aMetaTileEntity instanceof MTEHatchEnergy) { - - MTEHatchEnergy hatch = (MTEHatchEnergy) aMetaTileEntity; + if (aMetaTileEntity instanceof MTEHatchEnergy hatch) { // First energy hatch added - if (this.mEnergyHatches.size() == 0) this.energyHatchTier = hatch.mTier; + if (this.mEnergyHatches.isEmpty()) this.energyHatchTier = hatch.mTier; // Disallow any hatches that don't match the tier of the first hatch added if (hatch.mTier != this.energyHatchTier) return false; @@ -645,14 +643,12 @@ public class MTESynchrotron extends MTEEnhancedMultiBlockBase<MTESynchrotron> im if (block == null) return false; - if (!(block instanceof BlockAntennaCasing)) return false; - - BlockAntennaCasing antennaBlock = (BlockAntennaCasing) block; + if (!(block instanceof BlockAntennaCasing antennaBlock)) return false; int antennaTier = antennaBlock.getTier(); // First antenna casing added - if (this.mAntennaCasings.size() == 0) this.antennaeTier = antennaTier; + if (this.mAntennaCasings.isEmpty()) this.antennaeTier = antennaTier; if (antennaTier != this.antennaeTier) return false; @@ -687,7 +683,7 @@ public class MTESynchrotron extends MTEEnhancedMultiBlockBase<MTESynchrotron> im ArrayList<FluidStack> fluidList = this.getStoredFluids(); - if (fluidList.size() == 0) { + if (fluidList.isEmpty()) { this.stopMachine(SimpleShutDownReason.ofCritical("gtnhlanth.nocoolant")); @@ -857,16 +853,12 @@ public class MTESynchrotron extends MTEEnhancedMultiBlockBase<MTESynchrotron> im } private static float getVoltageFactor(long mEU, int antennaTier) { - // float factor = (float) Math.pow(1.00004, -mEU * Math.pow(antennaTier, 1.0/3.0) + 80000); // float factor = (float) -Math.pow(1.1, -mEU / 2000 * Math.pow(antennaTier, 2.0 / 3.0)) + 1; // Strictly // improves // with higher tier // antenna - float factor = (float) (Math.sqrt(mEU) / 1500); - - return factor; - + return (float) (Math.sqrt(mEU) / 1500); } /* @@ -886,11 +878,10 @@ public class MTESynchrotron extends MTEEnhancedMultiBlockBase<MTESynchrotron> im * \ +\ \frac{l^{1.11t^{\frac{1}{3}}}}{40000000} */ - double energy = (Math.pow(inputParticleEnergy, 1.13 * Math.pow(antennaTier, 4.0 / 9.0)) / 40_000_000) - * (-Math.pow(Math.pow(0.15, 2.0 / (Math.pow(antennaTier, 5.0 / 2.0))), voltage / 60768.0) + 1); // In - // keV + // keV - return energy; + return (Math.pow(inputParticleEnergy, 1.13 * Math.pow(antennaTier, 4.0 / 9.0)) / 40_000_000) + * (-Math.pow(Math.pow(0.15, 2.0 / (Math.pow(antennaTier, 5.0 / 2.0))), voltage / 60768.0) + 1); } @@ -971,7 +962,7 @@ public class MTESynchrotron extends MTEEnhancedMultiBlockBase<MTESynchrotron> im + StatCollector.translateToLocal("GT5U.multiblock.efficiency") + ": " + EnumChatFormatting.YELLOW - + Float.toString(mEfficiency / 100.0F) + + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %", diff --git a/src/main/java/gtnhlanth/common/tileentity/MTETargetChamber.java b/src/main/java/gtnhlanth/common/tileentity/MTETargetChamber.java index cd598f1bd0..12be87754b 100644 --- a/src/main/java/gtnhlanth/common/tileentity/MTETargetChamber.java +++ b/src/main/java/gtnhlanth/common/tileentity/MTETargetChamber.java @@ -56,9 +56,9 @@ public class MTETargetChamber extends MTEEnhancedMultiBlockBase<MTETargetChamber private static final IStructureDefinition<MTETargetChamber> STRUCTURE_DEFINITION; - private ArrayList<MTEHatchInputBeamline> mInputBeamline = new ArrayList<>(); + private final ArrayList<MTEHatchInputBeamline> mInputBeamline = new ArrayList<>(); - private ArrayList<MTEBusInputFocus> mInputFocus = new ArrayList<>(); + private final ArrayList<MTEBusInputFocus> mInputFocus = new ArrayList<>(); private static final int CASING_INDEX_FRONT = GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings3, 10); // Grate private static final int CASING_INDEX_CENTRE = GTUtility.getCasingTextureIndex(GregTechAPI.sBlockCasings5, 14); // Shielded @@ -447,7 +447,7 @@ public class MTETargetChamber extends MTEEnhancedMultiBlockBase<MTETargetChamber + StatCollector.translateToLocal("GT5U.multiblock.efficiency") + ": " + EnumChatFormatting.YELLOW - + Float.toString(mEfficiency / 100.0F) + + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %", diff --git a/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/RecipeSC.java b/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/RecipeSC.java index 979cb6a8bb..162b94b75e 100644 --- a/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/RecipeSC.java +++ b/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/RecipeSC.java @@ -35,13 +35,11 @@ public class RecipeSC extends GTRecipe { @Override public ItemStack getRepresentativeOutput(int aIndex) { - ArrayList<ItemStack> mOutputsWithParticle = new ArrayList<>(); - ItemStack particleStack = new ItemStack(LanthItemList.PARTICLE_ITEM); Items.ender_pearl.setDamage(particleStack, this.particleId); - mOutputsWithParticle.addAll(Arrays.asList(mOutputs)); + ArrayList<ItemStack> mOutputsWithParticle = new ArrayList<>(Arrays.asList(mOutputs)); mOutputsWithParticle.add(particleStack); ItemStack[] mOutputsWithParticleArray = mOutputsWithParticle.toArray(new ItemStack[0]); diff --git a/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/TargetChamberFrontend.java b/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/TargetChamberFrontend.java index 87852381e6..a61084204b 100644 --- a/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/TargetChamberFrontend.java +++ b/src/main/java/gtnhlanth/common/tileentity/recipe/beamline/TargetChamberFrontend.java @@ -81,8 +81,7 @@ public class TargetChamberFrontend extends RecipeMapFrontend { * posList.add(posParticle); posList.addAll(UIHelper.getGridPositions(itemInputCount - 1, 36, 28, 3)); */ - List<Pos2d> posList = Util.getGridPositions(itemInputCount, 8, 20, 3, 1, 20); - return posList; + return Util.getGridPositions(itemInputCount, 8, 20, 3, 1, 20); } private String getEUtDisplay(OverclockCalculator calculator) { diff --git a/src/main/java/gtnhlanth/loader/RecipeLoader.java b/src/main/java/gtnhlanth/loader/RecipeLoader.java index 71d8eaa06c..bea4d231d8 100644 --- a/src/main/java/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/gtnhlanth/loader/RecipeLoader.java @@ -377,15 +377,30 @@ public class RecipeLoader { // Target Holder GameRegistry.addShapedRecipe( new ItemStack(LanthItemList.TARGET_HOLDER), - new Object[] { "MCM", "MHM", "MCM", 'M', WerkstoffMaterialPool.MuMetal.get(OrePrefixes.plateDense, 1), 'H', - ItemList.Hull_LuV.get(1), 'C', ItemList.Conveyor_Module_LuV.get(1) }); + "MCM", + "MHM", + "MCM", + 'M', + WerkstoffMaterialPool.MuMetal.get(OrePrefixes.plateDense, 1), + 'H', + ItemList.Hull_LuV.get(1), + 'C', + ItemList.Conveyor_Module_LuV.get(1)); GameRegistry.addShapedRecipe( new ItemStack(LanthItemList.FOCUS_HOLDER), - new Object[] { "MCM", "R R", "MHM", 'M', WerkstoffMaterialPool.MuMetal.get(OrePrefixes.plateDense, 1), 'C', - ItemList.Conveyor_Module_LuV.get(1), 'R', ItemList.Robot_Arm_LuV.get(1), 'H', - ItemList.Hull_LuV.get(1) }); + "MCM", + "R R", + "MHM", + 'M', + WerkstoffMaterialPool.MuMetal.get(OrePrefixes.plateDense, 1), + 'C', + ItemList.Conveyor_Module_LuV.get(1), + 'R', + ItemList.Robot_Arm_LuV.get(1), + 'H', + ItemList.Hull_LuV.get(1)); // Focus Input Bus GameRegistry.addShapedRecipe( @@ -3376,7 +3391,7 @@ public class RecipeLoader { /** * 1/9 Ce + 3 Lu + 5 Sapphire = 8 LuAG Blend 1/9 Ce + 3 Lu + 10 Green Sapphire = 8 LuAG Blend 2/9 Ce + 6 Lu + 25 * Alumina + 9 Oxygen = 12 LuAG Blend - * + * <p> * 1 Ce + 60 Lu + 100 Sapphire = 160 LuAG Blend 1 Ce + 60 Lu +200 Green Sapphire = 160 LuAG Blend * */ @@ -4094,7 +4109,6 @@ public class RecipeLoader { public static void removeCeriumChemicalBath() { HashSet<GTRecipe> remove = new HashSet<>(5000); - HashSet<GTRecipe> reAdd = new HashSet<>(5000); GTLog.out.println(Tags.MODID + ": marking recipes in chem bath for removal!"); for (GTRecipe recipe : chemicalBathRecipes.getAllRecipes()) { @@ -4122,13 +4136,9 @@ public class RecipeLoader { GTLog.out.println(Tags.MODID + ": regenerating chem bath recipes"); chemicalBathRecipes.getBackend() .removeRecipes(remove); - reAdd.forEach(chemicalBathRecipes::add); chemicalBathRecipes.getBackend() .reInit(); - remove.clear(); - reAdd.clear(); - GTLog.out.println("Chemical Bath done!"); } diff --git a/src/main/java/gtnhlanth/loader/ZPMRubberChanges.java b/src/main/java/gtnhlanth/loader/ZPMRubberChanges.java index a00b28ae9b..5d172421f9 100644 --- a/src/main/java/gtnhlanth/loader/ZPMRubberChanges.java +++ b/src/main/java/gtnhlanth/loader/ZPMRubberChanges.java @@ -40,7 +40,6 @@ import gtnhlanth.common.register.WerkstoffMaterialPool; public class ZPMRubberChanges implements Runnable { - @SuppressWarnings("unchecked") public void run() { HashSet<ItemStack> ZPMPlusComponents = new HashSet<>(); @@ -115,7 +114,7 @@ public class ZPMRubberChanges implements Runnable { || customItemList.toString() .contains("UEV")) && (boolean) hasnotBeenSet.invoke(customItemList)) - ZPMPlusComponents.add((ItemStack) get.invoke(customItemList, 1, new Object[0])); + ZPMPlusComponents.add(get.invoke(customItemList, 1, new Object[0])); } } catch (IllegalAccessException | ClassNotFoundException | InvocationTargetException e) { e.printStackTrace(); @@ -373,7 +372,7 @@ public class ZPMRubberChanges implements Runnable { boolean replaced = false; for (int i = 0; i < stacks.length; i++) { if (!GTUtility.isStackValid(stacks[i])) { - if (stacks[i] instanceof ArrayList && ((ArrayList) stacks[i]).size() > 0) { + if (stacks[i] instanceof ArrayList && !((ArrayList) stacks[i]).isEmpty()) { if (GTUtility.areStacksEqual(stack, (ItemStack) ((ArrayList) stacks[i]).get(0), true)) if (!replace) return true; else { @@ -385,7 +384,7 @@ public class ZPMRubberChanges implements Runnable { GTLog.out.print("Replaced recipe!: " + stack.getDisplayName() + " "); } - } else continue; + } } else if (GTUtility.areStacksEqual(stack, (ItemStack) stacks[i], true)) if (!replace) return true; else { int amount = ((ItemStack) stacks[i]).stackSize; diff --git a/src/main/java/gtnhlanth/xmod/nei/NEIConfig.java b/src/main/java/gtnhlanth/xmod/nei/NEIConfig.java index 839fa4fab2..137e7c7458 100644 --- a/src/main/java/gtnhlanth/xmod/nei/NEIConfig.java +++ b/src/main/java/gtnhlanth/xmod/nei/NEIConfig.java @@ -19,8 +19,6 @@ public class NEIConfig implements IConfigureNEI { @Override public void loadConfig() { - isAdded = false; - isAdded = true; } } diff --git a/src/main/java/kekztech/common/tileentities/MTELapotronicSuperCapacitor.java b/src/main/java/kekztech/common/tileentities/MTELapotronicSuperCapacitor.java index e6260bc7af..eed5b32820 100644 --- a/src/main/java/kekztech/common/tileentities/MTELapotronicSuperCapacitor.java +++ b/src/main/java/kekztech/common/tileentities/MTELapotronicSuperCapacitor.java @@ -577,7 +577,7 @@ public class MTELapotronicSuperCapacitor extends MTEEnhancedMultiBlockBase<MTELa // Glass has to be at least UV-tier to allow TT Laser hatches if (glassTier < 8) { - if (mEnergyTunnelsTT.size() > 0 || mDynamoTunnelsTT.size() > 0) return false; + if (!mEnergyTunnelsTT.isEmpty() || !mDynamoTunnelsTT.isEmpty()) return false; } // Check if enough (more than 50%) non-empty caps @@ -854,11 +854,9 @@ public class MTELapotronicSuperCapacitor extends MTEEnhancedMultiBlockBase<MTELa } // Passive loss is multiplied by number of maintenance issues. - long total_passive_loss = temp_capacity_divided * (getIdealStatus() - repairStatus + 1); - // Maximum of 100,000 EU/t drained per UHV cell. The logic is 1% of EU capacity should be drained every 86400 // seconds (1 day). - return total_passive_loss; + return temp_capacity_divided * (getIdealStatus() - repairStatus + 1); } /** diff --git a/src/main/java/kekztech/util/Util.java b/src/main/java/kekztech/util/Util.java index d571150d0b..7b9d2e3f7b 100644 --- a/src/main/java/kekztech/util/Util.java +++ b/src/main/java/kekztech/util/Util.java @@ -42,7 +42,7 @@ public class Util { } public static ItemStack[] toItemStackArray(List<ItemStack> stacksList) { - if (stacksList.size() == 0) { + if (stacksList.isEmpty()) { return null; } @@ -55,7 +55,7 @@ public class Util { } public static FluidStack[] toFluidStackArray(List<FluidStack> stacksList) { - if (stacksList.size() == 0) { + if (stacksList.isEmpty()) { return null; } diff --git a/src/main/java/kubatech/api/DynamicInventory.java b/src/main/java/kubatech/api/DynamicInventory.java index f718101384..20d9ef23b9 100644 --- a/src/main/java/kubatech/api/DynamicInventory.java +++ b/src/main/java/kubatech/api/DynamicInventory.java @@ -266,20 +266,15 @@ public class DynamicInventory<T> { ItemStack leftover = inventoryInjector.inject(copy); if (leftover == null) return; input.stackSize--; - if (input.stackSize > 0) { - ((EntityPlayerMP) player).isChangingQuantityOnly = true; - ((EntityPlayerMP) player).updateHeldItem(); - return; - } else player.inventory.setItemStack(null); } else { ItemStack leftover = inventoryInjector.inject(input); if (leftover == null) return; - if (input.stackSize > 0) { - ((EntityPlayerMP) player).isChangingQuantityOnly = true; - ((EntityPlayerMP) player).updateHeldItem(); - return; - } else player.inventory.setItemStack(null); } + if (input.stackSize > 0) { + ((EntityPlayerMP) player).isChangingQuantityOnly = true; + ((EntityPlayerMP) player).updateHeldItem(); + return; + } else player.inventory.setItemStack(null); } ((EntityPlayerMP) player).isChangingQuantityOnly = false; ((EntityPlayerMP) player).updateHeldItem(); @@ -367,20 +362,15 @@ public class DynamicInventory<T> { ItemStack leftover = inventoryInjector.inject(copy); if (leftover == null) return; input.stackSize--; - if (input.stackSize > 0) { - ((EntityPlayerMP) player).isChangingQuantityOnly = true; - ((EntityPlayerMP) player).updateHeldItem(); - return; - } else player.inventory.setItemStack(null); } else { ItemStack leftover = inventoryInjector.inject(input); if (leftover == null) return; - if (input.stackSize > 0) { - ((EntityPlayerMP) player).isChangingQuantityOnly = true; - ((EntityPlayerMP) player).updateHeldItem(); - return; - } else player.inventory.setItemStack(null); } + if (input.stackSize > 0) { + ((EntityPlayerMP) player).isChangingQuantityOnly = true; + ((EntityPlayerMP) player).updateHeldItem(); + return; + } else player.inventory.setItemStack(null); ((EntityPlayerMP) player).isChangingQuantityOnly = false; ((EntityPlayerMP) player).updateHeldItem(); return; @@ -407,8 +397,7 @@ public class DynamicInventory<T> { DynamicPositionedRow row = new DynamicPositionedRow().setSynced(false); for (int j = 0, jmax = (i == imax ? (buttons.size() - 1) % perRow : (perRow - 1)); j <= jmax; j++) { final int finalI = i * perRow; - final int finalJ = j; - final int ID = finalI + finalJ; + final int ID = finalI + j; row.widget(buttons.get(ID)); } dynamicInventoryWidget.widget(row.setPos(0, i * 18)); diff --git a/src/main/java/kubatech/api/EIGDynamicInventory.java b/src/main/java/kubatech/api/EIGDynamicInventory.java index 1b709a2654..0d4c7d2ec6 100644 --- a/src/main/java/kubatech/api/EIGDynamicInventory.java +++ b/src/main/java/kubatech/api/EIGDynamicInventory.java @@ -281,27 +281,18 @@ public class EIGDynamicInventory<T> { inventoryInjector.inject(copy); if (copy.stackSize == 1) return; input.stackSize--; - if (input.stackSize > 0) { - // clearing and updating the held item value like this is the only - // way i found to be able to reliably update the item count in the UI. - player.inventory.setItemStack(null); - ((EntityPlayerMP) player).updateHeldItem(); - player.inventory.setItemStack(input); - ((EntityPlayerMP) player).updateHeldItem(); - return; - } else player.inventory.setItemStack(null); } else { inventoryInjector.inject(input); - if (input.stackSize > 0) { - // clearing and updating the held item value like this is the only - // way i found to be able to reliably update the item count in the UI. - player.inventory.setItemStack(null); - ((EntityPlayerMP) player).updateHeldItem(); - player.inventory.setItemStack(input); - ((EntityPlayerMP) player).updateHeldItem(); - return; - } else player.inventory.setItemStack(null); } + if (input.stackSize > 0) { + // clearing and updating the held item value like this is the only + // way I found to be able to reliably update the item count in the UI. + player.inventory.setItemStack(null); + ((EntityPlayerMP) player).updateHeldItem(); + player.inventory.setItemStack(input); + ((EntityPlayerMP) player).updateHeldItem(); + return; + } else player.inventory.setItemStack(null); ((EntityPlayerMP) player).isChangingQuantityOnly = false; ((EntityPlayerMP) player).updateHeldItem(); return; @@ -338,7 +329,7 @@ public class EIGDynamicInventory<T> { for (Object o : stack.getTooltip(player, false)) { tip.add(o.toString()); } - if (tip.size() >= 1 && tip.get(0) != null) { + if (!tip.isEmpty() && tip.get(0) != null) { tip.set(0, stack.stackSize + " x " + tip.get(0)); } return tip; @@ -387,27 +378,18 @@ public class EIGDynamicInventory<T> { if (copy.stackSize == 1) return; input.stackSize--; - if (input.stackSize > 0) { - // clearing and updating the held item value like this is the only - // way i found to be able to reliably update the item count in the UI. - player.inventory.setItemStack(null); - ((EntityPlayerMP) player).updateHeldItem(); - player.inventory.setItemStack(input); - ((EntityPlayerMP) player).updateHeldItem(); - return; - } else player.inventory.setItemStack(null); } else { inventoryInjector.inject(input); - if (input.stackSize > 0) { - // clearing and updating the held item value like this is the only - // way i found to be able to reliably update the item count in the UI. - player.inventory.setItemStack(null); - ((EntityPlayerMP) player).updateHeldItem(); - player.inventory.setItemStack(input); - ((EntityPlayerMP) player).updateHeldItem(); - return; - } else player.inventory.setItemStack(null); } + if (input.stackSize > 0) { + // clearing and updating the held item value like this is the only + // way i found to be able to reliably update the item count in the UI. + player.inventory.setItemStack(null); + ((EntityPlayerMP) player).updateHeldItem(); + player.inventory.setItemStack(input); + ((EntityPlayerMP) player).updateHeldItem(); + return; + } else player.inventory.setItemStack(null); ((EntityPlayerMP) player).isChangingQuantityOnly = false; ((EntityPlayerMP) player).updateHeldItem(); return; @@ -443,8 +425,7 @@ public class EIGDynamicInventory<T> { DynamicPositionedRow row = new DynamicPositionedRow().setSynced(false); for (int j = 0, jmax = (i == imax ? (buttons.size() - 1) % perRow : (perRow - 1)); j <= jmax; j++) { final int finalI = i * perRow; - final int finalJ = j; - final int ID = finalI + finalJ; + final int ID = finalI + j; row.widget(buttons.get(ID)); } dynamicInventoryWidget.widget(row.setPos(0, i * 18)); diff --git a/src/main/java/kubatech/api/Variables.java b/src/main/java/kubatech/api/Variables.java index a5821325e2..ee17a1a1b1 100644 --- a/src/main/java/kubatech/api/Variables.java +++ b/src/main/java/kubatech/api/Variables.java @@ -51,7 +51,6 @@ public class Variables { + EnumChatFormatting.DARK_BLUE + "Lib" + EnumChatFormatting.RESET - + "" + EnumChatFormatting.GRAY + " Hologram Projector on the Controller!"; diff --git a/src/main/java/kubatech/api/enums/EIGSetupPhase.java b/src/main/java/kubatech/api/enums/EIGSetupPhase.java index 95e8854347..9545bc45dc 100644 --- a/src/main/java/kubatech/api/enums/EIGSetupPhase.java +++ b/src/main/java/kubatech/api/enums/EIGSetupPhase.java @@ -9,7 +9,7 @@ public enum EIGSetupPhase { public final int id; public final String name; - private EIGSetupPhase(int id, String name) { + EIGSetupPhase(int id, String name) { this.id = id; this.name = name; } diff --git a/src/main/java/kubatech/api/enums/ItemList.java b/src/main/java/kubatech/api/enums/ItemList.java index 92a5fca22b..97b42bc2ab 100644 --- a/src/main/java/kubatech/api/enums/ItemList.java +++ b/src/main/java/kubatech/api/enums/ItemList.java @@ -171,7 +171,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/kubatech/api/implementations/KubaTechGTMultiBlockBase.java b/src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java index a6305b2f5f..a1afd3561a 100644 --- a/src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java +++ b/src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java @@ -206,7 +206,7 @@ public abstract class KubaTechGTMultiBlockBase<T extends MTEExtendedPowerMultiBl } protected boolean tryOutputAll(List<ItemStack> list) { - return tryOutputAll(list, l -> Collections.singletonList((ItemStack) l)); + return tryOutputAll(list, l -> Collections.singletonList(l)); } protected <Y> boolean tryOutputAll(List<Y> list, Function<Y, List<ItemStack>> mappingFunction) { @@ -311,7 +311,7 @@ public abstract class KubaTechGTMultiBlockBase<T extends MTEExtendedPowerMultiBl .setPos(173, 167 - 1)); final DynamicPositionedColumn screenElements = new DynamicPositionedColumn(); - drawTexts(screenElements, slotWidgets.size() > 0 ? slotWidgets.get(0) : null); + drawTexts(screenElements, !slotWidgets.isEmpty() ? slotWidgets.get(0) : null); builder.widget( new Scrollable().setVerticalScroll() .widget(screenElements.setPos(10, 0)) diff --git a/src/main/java/kubatech/api/tea/TeaNetwork.java b/src/main/java/kubatech/api/tea/TeaNetwork.java index 68c8275bfd..e91e3e88a7 100644 --- a/src/main/java/kubatech/api/tea/TeaNetwork.java +++ b/src/main/java/kubatech/api/tea/TeaNetwork.java @@ -16,7 +16,7 @@ public class TeaNetwork { public BigInteger teaAmount = BigInteger.ZERO; public BigInteger teaLimit = BigInteger.valueOf(Long.MAX_VALUE); PlayerData owner; - private HashSet<TeaStorageTile> teaStorageExtenders = new HashSet<>(); + private final HashSet<TeaStorageTile> teaStorageExtenders = new HashSet<>(); public static TeaNetwork getNetwork(UUID player) { PlayerData p = PlayerDataManager.getPlayer(player); diff --git a/src/main/java/kubatech/client/effect/CropRenderer.java b/src/main/java/kubatech/client/effect/CropRenderer.java index 5dbf229d6f..96f923538f 100644 --- a/src/main/java/kubatech/client/effect/CropRenderer.java +++ b/src/main/java/kubatech/client/effect/CropRenderer.java @@ -39,7 +39,7 @@ public class CropRenderer extends EntityFX { int[] meta = new int[8]; public CropRenderer(World world, int x, int y, int z, int age) { - super(world, (double) x, ((double) y - 0.0625d), (double) z); + super(world, x, ((double) y - 0.0625d), z); this.prevPosX = this.posX; this.prevPosY = this.posY; this.prevPosZ = this.posZ; diff --git a/src/main/java/kubatech/loaders/MobHandlerLoader.java b/src/main/java/kubatech/loaders/MobHandlerLoader.java index d54edfa260..11f9965139 100644 --- a/src/main/java/kubatech/loaders/MobHandlerLoader.java +++ b/src/main/java/kubatech/loaders/MobHandlerLoader.java @@ -183,7 +183,6 @@ public class MobHandlerLoader { if (infernalstacks != null) { ItemStack infernalstack = infernalstacks.get(rnd.nextInt(infernalstacks.size())) .copy(); - // noinspection ConstantConditions EnchantmentHelper.addRandomEnchantment( rnd, infernalstack, diff --git a/src/main/java/kubatech/loaders/item/items/ItemTeaCollection.java b/src/main/java/kubatech/loaders/item/items/ItemTeaCollection.java index 6b18342462..7da2101e84 100644 --- a/src/main/java/kubatech/loaders/item/items/ItemTeaCollection.java +++ b/src/main/java/kubatech/loaders/item/items/ItemTeaCollection.java @@ -114,20 +114,15 @@ public class ItemTeaCollection extends ItemProxy { public void addInformation(ItemStack stack, EntityPlayer entity, List<String> tooltipList, boolean showDebugInfo) { if (!checkTeaOwner(stack, entity.getCommandSenderName())) { tooltipList.add( - EnumChatFormatting.GRAY + "" - + EnumChatFormatting.BOLD - + "" + EnumChatFormatting.GRAY.toString() + EnumChatFormatting.BOLD + EnumChatFormatting.ITALIC + StatCollector.translateToLocal("kubaitem.notyours")); return; } tooltipList.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("kubaitem.fromcollection")); tooltipList.add( - EnumChatFormatting.GRAY + "" - + EnumChatFormatting.BOLD - + "" + EnumChatFormatting.GRAY.toString() + EnumChatFormatting.BOLD + EnumChatFormatting.ITALIC - + "" + EnumChatFormatting.UNDERLINE + StatCollector.translateToLocal("kubaitem.teacollection")); } @@ -169,7 +164,7 @@ public class ItemTeaCollection extends ItemProxy { if (checkTeaOwner(stack, Minecraft.getMinecraft().thePlayer.getCommandSenderName())) { return super.getDisplayName(stack); } - return EnumChatFormatting.GOLD + "" + EnumChatFormatting.BOLD + "" + EnumChatFormatting.ITALIC + "???????"; + return EnumChatFormatting.GOLD.toString() + EnumChatFormatting.BOLD + EnumChatFormatting.ITALIC + "???????"; } @Override diff --git a/src/main/java/kubatech/loaders/item/items/ItemTeaUltimate.java b/src/main/java/kubatech/loaders/item/items/ItemTeaUltimate.java index d6df893cd6..3c65f4fefd 100644 --- a/src/main/java/kubatech/loaders/item/items/ItemTeaUltimate.java +++ b/src/main/java/kubatech/loaders/item/items/ItemTeaUltimate.java @@ -87,7 +87,7 @@ public class ItemTeaUltimate extends ItemTeaCollection implements IItemProxyGUI if (checkTeaOwner(stack, Minecraft.getMinecraft().thePlayer.getCommandSenderName())) { return getUltimateTeaDisplayName(super.getDisplayName(stack)); } - return EnumChatFormatting.GOLD + "" + EnumChatFormatting.BOLD + "" + EnumChatFormatting.ITALIC + "???????"; + return EnumChatFormatting.GOLD.toString() + EnumChatFormatting.BOLD + EnumChatFormatting.ITALIC + "???????"; } @Override diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java index 4e90c2634c..eb5b80176a 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java @@ -54,7 +54,6 @@ import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EnumCreatureAttribute; import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; @@ -75,7 +74,6 @@ import net.minecraftforge.fluids.FluidStack; import org.jetbrains.annotations.NotNull; -import com.google.common.collect.Multimap; import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; @@ -497,8 +495,7 @@ public class MTEExtremeEntityCrusher extends KubaTechGTMultiBlockBase<MTEExtreme isValid = false; return; } - // noinspection unchecked - attackDamage = ((Multimap<String, AttributeModifier>) stack.getAttributeModifiers()) + attackDamage = stack.getAttributeModifiers() .get(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName()) .stream() .mapToDouble( @@ -559,7 +556,7 @@ public class MTEExtremeEntityCrusher extends KubaTechGTMultiBlockBase<MTEExtreme double attackDamage = DIAMOND_SPIKES_DAMAGE; // damage from spikes weaponCheck: { - MTEHatchInputBus inputbus = this.mInputBusses.size() == 0 ? null : this.mInputBusses.get(0); + MTEHatchInputBus inputbus = this.mInputBusses.isEmpty() ? null : this.mInputBusses.get(0); if (inputbus != null && !inputbus.isValid()) inputbus = null; ItemStack lootingHolder = inputbus == null ? null : inputbus.getStackInSlot(0); if (lootingHolder == null) break weaponCheck; @@ -592,7 +589,6 @@ public class MTEExtremeEntityCrusher extends KubaTechGTMultiBlockBase<MTEExtreme EECPlayer.currentWeapon = weapon; Item lootingHolderItem = weapon.getItem(); for (int i = 0; i < times + 1; i++) { - // noinspection ConstantConditions if (!lootingHolderItem.hitEntity(weapon, recipe.recipe.entity, EECPlayer)) break; if (weapon.stackSize == 0) { weaponCache.setStackInSlot(0, null); @@ -656,9 +652,8 @@ public class MTEExtremeEntityCrusher extends KubaTechGTMultiBlockBase<MTEExtreme mCasing = 0; if (!checkPiece(STRUCTURE_PIECE_MAIN, 2, 6, 0)) return false; if (mCasing < 35 || mMaintenanceHatches.size() != 1 - || mEnergyHatches.size() == 0 - || !(mInputBusses.size() == 0 || (mInputBusses.size() == 1 && mInputBusses.get(0).mTier == 0))) - return false; + || mEnergyHatches.isEmpty() + || !(mInputBusses.isEmpty() || (mInputBusses.size() == 1 && mInputBusses.get(0).mTier == 0))) return false; if (mGlassTier < 8) for (MTEHatchEnergy hatch : mEnergyHatches) if (hatch.mTier > mGlassTier) return false; if (isInRitualMode) connectToRitual(); return true; diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeIndustrialGreenhouse.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeIndustrialGreenhouse.java index d0831a17ee..0f0c03484d 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeIndustrialGreenhouse.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeIndustrialGreenhouse.java @@ -142,7 +142,7 @@ public class MTEExtremeIndustrialGreenhouse extends KubaTechGTMultiBlockBase<MTE * Summary: * Accelerators in EIG are a bit cheaper than on the crop field (4 amps instead of 6 amps) * There are 4 crops touching the accelerator (1 AMP for 1 accelerated crop) - * + * <p> * Changing T one number down will buff the EIG twice, as well as changing it up will nerf the EIG twice * (That is because accelerators are imperfectly scaled in game LV = 2x, MV = 4x, ...) */ @@ -986,7 +986,7 @@ public class MTEExtremeIndustrialGreenhouse extends KubaTechGTMultiBlockBase<MTE ItemStack suppertItem = outputs[i]; if (!player.inventory.addItemStackToInventory(suppertItem)) { player.entityDropItem(suppertItem, 0.f); - } ; + } } if (bucket.getSeedCount() <= 0) this.buckets.remove(bucket); return ret; diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEMegaIndustrialApiary.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEMegaIndustrialApiary.java index 2d3eb590d9..0de075f497 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEMegaIndustrialApiary.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEMegaIndustrialApiary.java @@ -219,7 +219,7 @@ public class MTEMegaIndustrialApiary extends KubaTechGTMultiBlockBase<MTEMegaInd .addElement( 'W', ofChain(ofBlock(Blocks.water, 0), ofBlock(BlocksItems.getFluidBlock(InternalName.fluidDistilledWater), 0))) - .addElement('F', new IStructureElementNoPlacement<MTEMegaIndustrialApiary>() { + .addElement('F', new IStructureElementNoPlacement<>() { @Override public boolean check(MTEMegaIndustrialApiary mte, World world, int x, int y, int z) { @@ -248,7 +248,7 @@ public class MTEMegaIndustrialApiary extends KubaTechGTMultiBlockBase<MTEMegaInd public void onRemoval() { super.onRemoval(); if (getBaseMetaTileEntity().isServerSide()) - tryOutputAll(mStorage, s -> Collections.singletonList(((BeeSimulator) s).queenStack)); + tryOutputAll(mStorage, s -> Collections.singletonList(s.queenStack)); } private boolean isCacheDirty = true; @@ -467,9 +467,8 @@ public class MTEMegaIndustrialApiary extends KubaTechGTMultiBlockBase<MTEMegaInd if (mStorage.size() >= mMaxSlots) break; } updateSlots(); - } else if (mPrimaryMode == 1 && mStorage.size() > 0) { - if (tryOutputAll(mStorage, s -> Collections.singletonList(((BeeSimulator) s).queenStack))) - isCacheDirty = true; + } else if (mPrimaryMode == 1 && !mStorage.isEmpty()) { + if (tryOutputAll(mStorage, s -> Collections.singletonList(s.queenStack))) isCacheDirty = true; } else return CheckRecipeResultRegistry.NO_RECIPE; mMaxProgresstime = 10; mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); @@ -594,7 +593,7 @@ public class MTEMegaIndustrialApiary extends KubaTechGTMultiBlockBase<MTEMegaInd if (this.mGlassTier < 10 && !this.mEnergyHatches.isEmpty()) for (MTEHatchEnergy hatchEnergy : this.mEnergyHatches) if (this.mGlassTier < hatchEnergy.mTier) return false; - boolean valid = this.mMaintenanceHatches.size() == 1 && this.mEnergyHatches.size() >= 1 && this.mCasing >= 190; + boolean valid = this.mMaintenanceHatches.size() == 1 && !this.mEnergyHatches.isEmpty() && this.mCasing >= 190; flowersError = valid && !this.flowersCheck.isEmpty(); if (valid) updateMaxSlots(); return valid; diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGIC2Bucket.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGIC2Bucket.java index 8c58f911c5..3314e89356 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGIC2Bucket.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGIC2Bucket.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedList; import java.util.Set; import net.minecraft.block.Block; @@ -316,7 +315,6 @@ public class EIGIC2Bucket extends EIGBucket { ItemStack newSupport = potentialBlockStack.copy(); newSupport.stackSize = 1; this.supportItems = new ItemStack[] { newSupport }; - keepLooking = false; crop.updateNutrientsForBlockUnder(); break blockLoop; } @@ -602,7 +600,6 @@ public class EIGIC2Bucket extends EIGBucket { // Create kernel out of our growth speeds double[] kernel = tabulate(speeds, 1.0d / speeds.length); double[] convolutionTarget = new double[signal.length]; - LinkedList<Double> P = new LinkedList<Double>(); // Perform convolutions on the signal until it's too weak to be recognised. double p, avgRolls = 1; @@ -620,7 +617,7 @@ public class EIGIC2Bucket extends EIGBucket { /** * Creates an array that corresponds to the amount of times a number appears in a list. - * + * <p> * Ex: {1,2,3,4} -> {0,1,1,1,1}, {0,2,2,4} -> {1,0,2,0,1} * * @param bin The number list to tabulate diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGSeedBucket.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGSeedBucket.java index 831569a4ae..6563bb68da 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGSeedBucket.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/eigbuckets/EIGSeedBucket.java @@ -203,7 +203,7 @@ public class EIGSeedBucket extends EIGBucket { return false; } - class EIGCraftingSeedFinder extends InventoryCrafting { + static class EIGCraftingSeedFinder extends InventoryCrafting { public ItemStack recipeInput; diff --git a/src/main/java/tectech/mechanics/dataTransport/InventoryDataPacket.java b/src/main/java/tectech/mechanics/dataTransport/InventoryDataPacket.java index b779a2c897..8e918fad7e 100644 --- a/src/main/java/tectech/mechanics/dataTransport/InventoryDataPacket.java +++ b/src/main/java/tectech/mechanics/dataTransport/InventoryDataPacket.java @@ -28,7 +28,7 @@ public class InventoryDataPacket extends DataPacket<ItemStack[]> { stacks.add(stack); } } - return stacks.size() > 0 ? stacks.toArray(TTRecipeAdder.nullItem) : null; + return !stacks.isEmpty() ? stacks.toArray(TTRecipeAdder.nullItem) : null; } return null; } diff --git a/src/main/java/tectech/mechanics/enderStorage/EnderWorldSavedData.java b/src/main/java/tectech/mechanics/enderStorage/EnderWorldSavedData.java index d6182794b7..515812548e 100644 --- a/src/main/java/tectech/mechanics/enderStorage/EnderWorldSavedData.java +++ b/src/main/java/tectech/mechanics/enderStorage/EnderWorldSavedData.java @@ -48,9 +48,9 @@ public class EnderWorldSavedData extends WorldSavedData { ObjectInputStream ois = new ObjectInputStream(is); Object data = ois.readObject(); EnderLiquidTagLink = (Map<EnderLinkTag, EnderFluidContainer>) data; - } catch (IOException | ClassNotFoundException ignored) { + } catch (IOException | ClassNotFoundException e) { System.out.println("ENDER_LIQUID_TAG_LINK LOAD FAILED"); - System.out.println(ignored); + e.printStackTrace(); } try { @@ -59,9 +59,9 @@ public class EnderWorldSavedData extends WorldSavedData { ObjectInputStream ois = new ObjectInputStream(is); Object data = ois.readObject(); EnderLiquidTankLink = (Map<EnderLinkTank, EnderLinkTag>) data; - } catch (IOException | ClassNotFoundException ignored) { + } catch (IOException | ClassNotFoundException e) { System.out.println("ENDER_LIQUID_TANK_LINK LOAD FAILED"); - System.out.println(ignored); + e.printStackTrace(); } } @@ -74,9 +74,9 @@ public class EnderWorldSavedData extends WorldSavedData { oos.flush(); byte[] data = bos.toByteArray(); nbtTagCompound.setByteArray(ENDER_LIQUID_TAG_LINK, data); - } catch (IOException ignored) { + } catch (IOException e) { System.out.println("ENDER_LIQUID_TAG_LINK SAVE FAILED"); - System.out.println(ignored); + e.printStackTrace(); } try { @@ -86,9 +86,9 @@ public class EnderWorldSavedData extends WorldSavedData { oos.flush(); byte[] data = bos.toByteArray(); nbtTagCompound.setByteArray(ENDER_LIQUID_TANK_LINK, data); - } catch (IOException ignored) { + } catch (IOException e) { System.out.println("ENDER_LIQUID_TANK_LINK SAVE FAILED"); - System.out.println(ignored); + e.printStackTrace(); } } diff --git a/src/main/java/tectech/recipe/EyeOfHarmonyRecipeStorage.java b/src/main/java/tectech/recipe/EyeOfHarmonyRecipeStorage.java index 30671dc919..9d891fd3ad 100644 --- a/src/main/java/tectech/recipe/EyeOfHarmonyRecipeStorage.java +++ b/src/main/java/tectech/recipe/EyeOfHarmonyRecipeStorage.java @@ -40,11 +40,11 @@ public class EyeOfHarmonyRecipeStorage { private static final long serialVersionUID = -1634011860327553337L; { - ModBlocks.blocks.forEach((dimString, dimBlock) -> { put(dimBlock, dimString); }); + ModBlocks.blocks.forEach((dimString, dimBlock) -> put(dimBlock, dimString)); } }; - private final HashMap<String, EyeOfHarmonyRecipe> recipeHashMap = new HashMap<String, EyeOfHarmonyRecipe>() { + private final HashMap<String, EyeOfHarmonyRecipe> recipeHashMap = new HashMap<>() { private static final long serialVersionUID = -3501819612517400500L; @@ -175,7 +175,7 @@ public class EyeOfHarmonyRecipeStorage { double mainMultiplier = (timeCalculator(10) * (6 * 64)); double probability = 1.0 / validMaterialList.size(); - validMaterialList.forEach((material) -> { processHelper(outputMap, material, mainMultiplier, probability); }); + validMaterialList.forEach((material) -> processHelper(outputMap, material, mainMultiplier, probability)); ArrayList<Pair<Materials, Long>> outputList = new ArrayList<>(); diff --git a/src/main/java/tectech/rendering/EOH/EOHTileEntitySR.java b/src/main/java/tectech/rendering/EOH/EOHTileEntitySR.java index 5c8b4f6d94..c3b401fb74 100644 --- a/src/main/java/tectech/rendering/EOH/EOHTileEntitySR.java +++ b/src/main/java/tectech/rendering/EOH/EOHTileEntitySR.java @@ -60,7 +60,7 @@ public class EOHTileEntitySR extends TileEntitySpecialRenderer { if (EOHRenderTile.getOrbitingObjects() != null) { if (EOHRenderTile.getOrbitingObjects() - .size() == 0) { + .isEmpty()) { EOHRenderTile.generateImportantInfo(); } diff --git a/src/main/java/tectech/thing/block/RenderForgeOfGods.java b/src/main/java/tectech/thing/block/RenderForgeOfGods.java index 7a38b253ef..a911ab378f 100644 --- a/src/main/java/tectech/thing/block/RenderForgeOfGods.java +++ b/src/main/java/tectech/thing/block/RenderForgeOfGods.java @@ -37,12 +37,12 @@ public class RenderForgeOfGods extends TileEntitySpecialRenderer { private static ShaderProgram starProgram; private static IModelCustom starModel; - private static float modelNormalize = .0067f * 2; + private static final float modelNormalize = .0067f * 2; private static boolean initialized = false; private static boolean failedInit = false; private static int u_Color = -1, u_ModelMatrix = -1, u_Gamma = -1; - private Matrix4fStack starModelMatrix = new Matrix4fStack(3); + private final Matrix4fStack starModelMatrix = new Matrix4fStack(3); private static ShaderProgram beamProgram; private static int a_VertexID = -1; @@ -52,7 +52,7 @@ public class RenderForgeOfGods extends TileEntitySpecialRenderer { private static int beam_vboID = -1; private static int maxSegments = -1; private static final int beamSegmentQuads = 16; - private static Matrix4fStack beamModelMatrix = new Matrix4fStack(2); + private static final Matrix4fStack beamModelMatrix = new Matrix4fStack(2); private VertexBuffer ringOne, ringTwo, ringThree; // These are nudges/translations for each ring to align with the structure diff --git a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchCapacitor.java b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchCapacitor.java index e226162312..30af3d838b 100644 --- a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchCapacitor.java +++ b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchCapacitor.java @@ -133,13 +133,12 @@ public class MTEHatchCapacitor extends MTEHatch implements IAddUIWidgets { long tier = -1; long tCurrent = 0; long tEnergyMax = 0; - for (int i = 0; i < mInventory.length; i++) { - if (mInventory[i] == null || mInventory[i].stackSize != 1) { - continue; - } - CapacitorComponent cap = componentBinds.get(TTUtility.getUniqueIdentifier(mInventory[i])); - if (cap != null && cap.tier > tier) { - tier = cap.tier; + for (ItemStack stack : mInventory) { + if (stack != null && stack.stackSize == 1) { + CapacitorComponent cap = componentBinds.get(TTUtility.getUniqueIdentifier(stack)); + if (cap != null && cap.tier > tier) { + tier = cap.tier; + } } } if (tier >= 0) { diff --git a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchDataItemsInput.java b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchDataItemsInput.java index 4db38300d4..2532070421 100644 --- a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchDataItemsInput.java +++ b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchDataItemsInput.java @@ -179,7 +179,7 @@ public class MTEHatchDataItemsInput extends MTEHatchDataAccess implements IConne stacks.add(stack); } } - if (stacks.size() > 0) { + if (!stacks.isEmpty()) { this.stacks = stacks.toArray(TTRecipeAdder.nullItem); } } diff --git a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchParamText.java b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchParamText.java index a9c2ef40cd..bb9be3aa03 100644 --- a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchParamText.java +++ b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchParamText.java @@ -258,8 +258,8 @@ public class MTEHatchParamText extends MTEHatchParam { parse(str); return str; } catch (Exception e) { - return widget.getLastText() - .size() > 0 ? widget.getLastText() + return !widget.getLastText() + .isEmpty() ? widget.getLastText() .get(0) : ""; } }) diff --git a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchRack.java b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchRack.java index bf77847d50..4decc0a4a8 100644 --- a/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchRack.java +++ b/src/main/java/tectech/thing/metaTileEntity/hatch/MTEHatchRack.java @@ -190,7 +190,6 @@ public class MTEHatchRack extends MTEHatch implements IAddGregtechLogo, IAddUIWi if (tickingComponents) { if (this.heat > comp.maxHeat) { mInventory[i] = null; - continue; } else if (comp.subZero || this.heat >= 0) { heat += (1f + comp.coolConstant * this.heat / 100000f) * (comp.heatConstant > 0 ? comp.heatConstant * overclock * overvolt * overvolt : -10f); diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEDataBank.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEDataBank.java index 0118127670..9bec05fa27 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEDataBank.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEDataBank.java @@ -156,7 +156,7 @@ public class MTEDataBank extends TTMultiblockBase implements ISurvivalConstructa @Override @NotNull protected CheckRecipeResult checkProcessing_EM() { - if (eDataAccessHatches.size() > 0 && (eStacksDataOutputs.size() > 0 || eWirelessStacksDataOutputs.size() > 0)) { + if (!eDataAccessHatches.isEmpty() && (!eStacksDataOutputs.isEmpty() || !eWirelessStacksDataOutputs.isEmpty())) { mEUt = -(int) V[slave ? 6 : 4]; eAmpereFlow = 1 + (long) (eStacksDataOutputs.size() + eWirelessStacksDataOutputs.size()) * eDataAccessHatches.size(); @@ -179,7 +179,7 @@ public class MTEDataBank extends TTMultiblockBase implements ISurvivalConstructa } } } - if (stacks.size() > 0) { + if (!stacks.isEmpty()) { ItemStack[] arr = stacks.toArray(TTRecipeAdder.nullItem); for (MTEHatchDataItemsOutput hatch : eStacksDataOutputs) { hatch.q = new InventoryDataPacket(arr); diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEEyeOfHarmony.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEEyeOfHarmony.java index 238116cdc6..21d175c837 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEEyeOfHarmony.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEEyeOfHarmony.java @@ -913,21 +913,17 @@ public class MTEEyeOfHarmony extends TTMultiblockBase implements IConstructable, // Make sure there are no energy hatches. { - if (mEnergyHatches.size() > 0) { + if (!mEnergyHatches.isEmpty()) { return false; } - if (mExoticEnergyHatches.size() > 0) { + if (!mExoticEnergyHatches.isEmpty()) { return false; } } // Make sure there are 2 input hatches. - if (mInputHatches.size() != 2) { - return false; - } - - return true; + return mInputHatches.size() == 2; } private boolean animationsEnabled = true; diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEForgeOfGods.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEForgeOfGods.java index d3ac393927..c26322d11f 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEForgeOfGods.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEForgeOfGods.java @@ -343,11 +343,11 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, } // Make sure there are no energy hatches { - if (mEnergyHatches.size() > 0) { + if (!mEnergyHatches.isEmpty()) { return false; } - if (mExoticEnergyHatches.size() > 0) { + if (!mExoticEnergyHatches.isEmpty()) { return false; } } @@ -410,7 +410,7 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, startRecipeProcessing(); FluidStack[] fluidInHatch = null; boolean fuelDrained = false; - if (mInputHatches != null && mInputHatches.size() != 0) { + if (mInputHatches != null && !mInputHatches.isEmpty()) { fluidInHatch = this.getStoredFluids() .toArray(new FluidStack[0]); } @@ -422,7 +422,7 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, if (upgrades[29]) { maxModuleCount += 4; } - if (mInputBusses.size() != 0) { + if (!mInputBusses.isEmpty()) { if (internalBattery == 0) { MTEHatchInputBus inputBus = mInputBusses.get(0); ItemStack[] inputBusInventory = inputBus.getRealInventory(); @@ -496,7 +496,7 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, } // Do module calculations and checks - if (moduleHatches.size() > 0 && internalBattery > 0 && moduleHatches.size() <= maxModuleCount) { + if (!moduleHatches.isEmpty() && internalBattery > 0 && moduleHatches.size() <= maxModuleCount) { for (MTEBaseModule module : moduleHatches) { if (allowModuleConnection(module, this)) { module.connect(); @@ -734,7 +734,7 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, @Override public void onRemoval() { - if (moduleHatches != null && moduleHatches.size() > 0) { + if (moduleHatches != null && !moduleHatches.isEmpty()) { for (MTEBaseModule module : moduleHatches) { module.disconnect(); } @@ -1404,11 +1404,11 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, private int currentColorCode = 0; private int currentMilestoneBG = 0; private int gravitonShardCost = 0; - private int[][] prereqUpgrades = new int[31][]; + private final int[][] prereqUpgrades = new int[31][]; private int[] followupUpgrades = new int[] {}; private boolean isUpradeSplitStart = false; private boolean doesCurrentUpgradeRequireExtraMats = false; - private boolean[] allPrereqRequired = new boolean[31]; + private final boolean[] allPrereqRequired = new boolean[31]; private boolean[] upgrades = new boolean[31]; private boolean[] materialPaidUpgrades = new boolean[7]; @@ -2347,22 +2347,21 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, IItemHandlerModifiable upgradeMatsHandler = new ItemStackHandler(12); int uniqueItems = inputs.length; for (int i = 0; i < 12; i++) { - int index = i; - int cleanDiv4 = index / 4; + int cleanDiv4 = i / 4; if (i < uniqueItems) { - ItemStack stack = inputs[index]; + ItemStack stack = inputs[i]; if (stack != null) { stack = stack.copy(); stack.stackSize = 1; - upgradeMatsHandler.setStackInSlot(index, stack); + upgradeMatsHandler.setStackInSlot(i, stack); } builder.widget( new DrawableWidget().setDrawable(GTUITextures.BUTTON_STANDARD_PRESSED) - .setPos(5 + cleanDiv4 * 36, 6 + index % 4 * 18) + .setPos(5 + cleanDiv4 * 36, 6 + i % 4 * 18) .setSize(18, 18)); columnList.get(cleanDiv4) .addChild( - new SlotWidget(upgradeMatsHandler, index).setAccess(false, false) + new SlotWidget(upgradeMatsHandler, i).setAccess(false, false) .disableInteraction()); columnList.get(cleanDiv4 + 3) .addChild( @@ -2372,7 +2371,7 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, } else { builder.widget( new DrawableWidget().setDrawable(GTUITextures.BUTTON_STANDARD_DISABLED) - .setPos(5 + cleanDiv4 * 36, 6 + index % 4 * 18) + .setPos(5 + cleanDiv4 * 36, 6 + i % 4 * 18) .setSize(18, 18)); } } @@ -3275,7 +3274,7 @@ public class MTEForgeOfGods extends TTMultiblockBase implements IConstructable, public void reduceBattery(int amount) { if (internalBattery - amount <= 0) { internalBattery = 0; - if (moduleHatches.size() > 0) { + if (!moduleHatches.isEmpty()) { for (MTEBaseModule module : moduleHatches) { module.disconnect(); } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/MTEResearchStation.java b/src/main/java/tectech/thing/metaTileEntity/multi/MTEResearchStation.java index 6d7b9d6f0d..f797304fa6 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/MTEResearchStation.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/MTEResearchStation.java @@ -77,7 +77,6 @@ import tectech.util.CommonValues; /** * Created by danie_000 on 17.12.2016. */ -@SuppressWarnings("unchecked") public class MTEResearchStation extends TTMultiblockBase implements ISurvivalConstructable { public static final String machine = "EM Machinery"; diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/base/LedStatus.java b/src/main/java/tectech/thing/metaTileEntity/multi/base/LedStatus.java index 022408f688..0f7f42ee2e 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/base/LedStatus.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/base/LedStatus.java @@ -1,5 +1,6 @@ package tectech.thing.metaTileEntity.multi.base; +import java.util.Arrays; import java.util.function.Supplier; import net.minecraft.util.EnumChatFormatting; @@ -41,9 +42,7 @@ public enum LedStatus { public static LedStatus[] makeArray(int count, LedStatus defaultValue) { LedStatus[] statuses = new LedStatus[count]; - for (int i = 0; i < count; i++) { - statuses[i] = defaultValue; - } + Arrays.fill(statuses, defaultValue); return statuses; } diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/base/SoundLoopAnyBlock.java b/src/main/java/tectech/thing/metaTileEntity/multi/base/SoundLoopAnyBlock.java index 15b08afb5c..d5a3642bf0 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/base/SoundLoopAnyBlock.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/base/SoundLoopAnyBlock.java @@ -18,9 +18,9 @@ public class SoundLoopAnyBlock extends MovingSound { private final boolean stopWhenBlockInactive; private final int worldID; private boolean fadeOut = false; - private int tileX; - private int tileY; - private int tileZ; + private final int tileX; + private final int tileY; + private final int tileZ; private Block blockToTriggerEnd = null; /** diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java b/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java index 8ee6eb3863..6251dcf1e8 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java @@ -1700,9 +1700,7 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT @Override public List<MTEHatch> getExoticEnergyHatches() { - List<MTEHatch> list = new ArrayList<>(); - list.addAll(eEnergyMulti); - return list; + return new ArrayList<>(eEnergyMulti); } @Override @@ -1858,10 +1856,6 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT return false; } IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity == null) { - return false; - } - return false; } @@ -2006,10 +2000,6 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT return false; } IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity == null) { - return false; - } - return false; } @@ -2019,10 +2009,6 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT return false; } IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity == null) { - return false; - } - return false; } @@ -2611,7 +2597,6 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT break; } setBackground(texture); - super.draw(partialTicks); GL11.glColor4f(1f, 1f, 1f, 1f); } }.setOnClick((clickData, widget) -> { diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEBaseModule.java b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEBaseModule.java index c5d546d448..24e570f9b5 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEBaseModule.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEBaseModule.java @@ -270,12 +270,10 @@ public class MTEBaseModule extends TTMultiblockBase { } if (this instanceof MTEExoticModule) { - if (mOutputHatches.size() < 1) { - return false; - } - if (mOutputBusses.size() < 1) { + if (mOutputHatches.isEmpty()) { return false; } + return !mOutputBusses.isEmpty(); } return true; diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEExoticModule.java b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEExoticModule.java index ee8b5396ad..94c4c1b8fa 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEExoticModule.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/godforge_modules/MTEExoticModule.java @@ -91,7 +91,7 @@ public class MTEExoticModule extends MTEBaseModule { List<FluidStack> inputPlasmas = new ArrayList<>(); private GTRecipe plasmaRecipe = null; private BigInteger powerForRecipe = BigInteger.ZERO; - private static RecipeMap<RecipeMapBackend> tempRecipeMap = RecipeMapBuilder.of("godforgeExoticTempRecipeMap") + private static final RecipeMap<RecipeMapBackend> tempRecipeMap = RecipeMapBuilder.of("godforgeExoticTempRecipeMap") .maxIO(0, 0, 7, 2) .disableRegisterNEI() .build(); diff --git a/src/main/java/tectech/thing/metaTileEntity/pipe/MTEPipeEnergyMirror.java b/src/main/java/tectech/thing/metaTileEntity/pipe/MTEPipeEnergyMirror.java index 419c240096..91fdc3e3a1 100644 --- a/src/main/java/tectech/thing/metaTileEntity/pipe/MTEPipeEnergyMirror.java +++ b/src/main/java/tectech/thing/metaTileEntity/pipe/MTEPipeEnergyMirror.java @@ -31,7 +31,7 @@ import tectech.util.CommonValues; public class MTEPipeEnergyMirror extends MTEPipeEnergy { private static Textures.BlockIcons.CustomIcon EMpipe; - private ForgeDirection[] connectedSides = { null, null }; + private final ForgeDirection[] connectedSides = { null, null }; private ForgeDirection chainedFrontFacing = null; private boolean active; diff --git a/src/main/java/tectech/thing/metaTileEntity/single/MTEBuckConverter.java b/src/main/java/tectech/thing/metaTileEntity/single/MTEBuckConverter.java index 0a2a8d756e..eaa0b3cb17 100644 --- a/src/main/java/tectech/thing/metaTileEntity/single/MTEBuckConverter.java +++ b/src/main/java/tectech/thing/metaTileEntity/single/MTEBuckConverter.java @@ -41,7 +41,7 @@ public class MTEBuckConverter extends MTETieredMachineBlock implements IAddUIWid private static GTRenderedTexture BUCK, BUCK_ACTIVE; public int EUT = 0, AMP = 0; - private static NumberFormatMUI numberFormat = new NumberFormatMUI(); + private static final NumberFormatMUI numberFormat = new NumberFormatMUI(); public MTEBuckConverter(int aID, String aName, String aNameRegional, int aTier) { super( diff --git a/src/main/java/tectech/thing/metaTileEntity/single/MTEDebugStructureWriter.java b/src/main/java/tectech/thing/metaTileEntity/single/MTEDebugStructureWriter.java index a03266ac89..5248cf1b80 100644 --- a/src/main/java/tectech/thing/metaTileEntity/single/MTEDebugStructureWriter.java +++ b/src/main/java/tectech/thing/metaTileEntity/single/MTEDebugStructureWriter.java @@ -273,7 +273,7 @@ public class MTEDebugStructureWriter extends MTETieredMachineBlock implements IA xPos, 40); builder.widget( - new ButtonWidget().setOnClick((clickData, widget) -> { size = !size; }) + new ButtonWidget().setOnClick((clickData, widget) -> size = !size) .setBackground(GTUITextures.BUTTON_STANDARD, overlay) .setSize(18, 18) .setPos(xPos, 58)); @@ -283,8 +283,7 @@ public class MTEDebugStructureWriter extends MTETieredMachineBlock implements IA int changeNumberShift, int changeNumber, int xPos, int yPos) { builder.widget( new ButtonWidget() - .setOnClick( - (clickData, widget) -> { setter.accept(clickData.shift ? changeNumberShift : changeNumber); }) + .setOnClick((clickData, widget) -> setter.accept(clickData.shift ? changeNumberShift : changeNumber)) .setBackground(GTUITextures.BUTTON_STANDARD, overlay) .setSize(18, 18) .setPos(xPos, yPos)); diff --git a/src/main/java/tectech/thing/metaTileEntity/single/MTEOwnerDetector.java b/src/main/java/tectech/thing/metaTileEntity/single/MTEOwnerDetector.java index 72547cc613..bdf3e249b9 100644 --- a/src/main/java/tectech/thing/metaTileEntity/single/MTEOwnerDetector.java +++ b/src/main/java/tectech/thing/metaTileEntity/single/MTEOwnerDetector.java @@ -109,7 +109,7 @@ public class MTEOwnerDetector extends MTETieredMachineBlock { @Override public void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) { if (aBaseMetaTileEntity.isServerSide()) { - if (uuid == null || uuid.length() == 0) { + if (uuid == null || uuid.isEmpty()) { String name = aBaseMetaTileEntity.getOwnerName(); if (!("Player".equals(name))) { uuid = TecTech.proxy.getUUID(name); diff --git a/src/main/java/tectech/util/StructureVBO.java b/src/main/java/tectech/util/StructureVBO.java index 1e1206d4c9..2b07d06643 100644 --- a/src/main/java/tectech/util/StructureVBO.java +++ b/src/main/java/tectech/util/StructureVBO.java @@ -18,8 +18,8 @@ public class StructureVBO { private String[][] structure; - private HashSet<Character> values = new HashSet<>(); - private HashMap<Character, Pair<Block, Integer>> mapper = new HashMap<>(); + private final HashSet<Character> values = new HashSet<>(); + private final HashMap<Character, Pair<Block, Integer>> mapper = new HashMap<>(); public StructureVBO assignStructure(String[][] structure) { this.structure = structure; diff --git a/src/mixin/java/gregtech/mixin/mixins/early/minecraft/WorldMixin.java b/src/mixin/java/gregtech/mixin/mixins/early/minecraft/WorldMixin.java index 7a21b8b577..e97a7b9f94 100644 --- a/src/mixin/java/gregtech/mixin/mixins/early/minecraft/WorldMixin.java +++ b/src/mixin/java/gregtech/mixin/mixins/early/minecraft/WorldMixin.java @@ -13,7 +13,6 @@ import kubatech.loaders.BlockLoader; @Mixin(value = World.class) public class WorldMixin { - @SuppressWarnings("ConstantConditions") @ModifyReturnValue(method = "getBlock", at = @At("RETURN"), require = 1) private Block gt5u$getBlockDetector(Block block, int x, int y, int z) { if (block == BlockLoader.kubaBlock) BlockLoader.kubaBlock.setLastBlockAccess((World) (Object) this, x, y, z); |