From 3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Wed, 2 Oct 2024 07:31:08 +0200 Subject: Cleanup the codebase (#3311) Co-authored-by: boubou19 --- .../xmod/bartcrops/LoaderOfTheCrops.java | 22 +++--- .../xmod/bartcrops/abstracts/BaseCrop.java | 2 +- .../xmod/bop/blocks/base/LeavesBase.java | 7 +- .../gtPlusPlus/xmod/bop/blocks/base/LogBase.java | 10 +-- .../xmod/bop/blocks/base/SaplingBase.java | 4 -- .../features/trees/WorldGenRainForestTree_Ex.java | 9 +-- .../forestry/bees/custom/GTPPBeeDefinition.java | 5 +- .../xmod/forestry/bees/handler/GTPPDropType.java | 2 +- .../xmod/forestry/bees/handler/GTPPPollenType.java | 2 +- .../forestry/bees/handler/GTPPPropolisType.java | 2 +- .../xmod/forestry/bees/items/FRItemRegistry.java | 2 +- .../xmod/forestry/bees/items/MBItemFrame.java | 7 +- .../forestry/bees/registry/GTPP_BeeDefinition.java | 3 +- .../bees/registry/GTPP_BranchDefinition.java | 2 +- .../gregtech/api/enums/GregtechOrePrefixes.java | 16 +++-- .../gregtech/api/enums/GregtechToolDictNames.java | 2 +- .../api/gui/widget/ElectricSlotWidget.java | 2 +- .../api/interfaces/IGregtechItemContainer.java | 32 ++++----- .../api/interfaces/internal/IItemBehaviour.java | 30 ++++----- .../interfaces/internal/IOreRecipeRegistrator.java | 4 +- .../api/interfaces/internal/IToolStats.java | 68 +++++++++---------- .../xmod/gregtech/api/items/GTMetaItem.java | 2 - .../xmod/gregtech/api/items/GTMetaItemBase.java | 10 +-- .../xmod/gregtech/api/items/GTMetaItemX32.java | 2 +- .../implementations/METHatchAirIntake.java | 36 +++++----- .../MTEHatchElementalDataOrbHolder.java | 16 ++--- .../implementations/MTEHatchFluidGenerator.java | 7 +- .../implementations/MTEHatchMufflerAdvanced.java | 40 +++++------ .../implementations/MTEHatchSuperBusInput.java | 2 +- .../implementations/MTEHatchTurbine.java | 23 ++----- .../implementations/MTEHatchTurbineProvider.java | 8 +-- .../implementations/MTESuperBusOutput.java | 9 +-- .../implementations/base/GTPPMultiBlockBase.java | 78 +++++++++------------- .../base/generators/MTEBoilerBase.java | 2 +- .../generators/MTERocketFuelGeneratorBase.java | 2 +- .../nbthandlers/MTEHatchNbtConsumable.java | 2 +- .../gregtech/api/objects/GregtechItemData.java | 4 +- .../GregtechMetaCasingBlocksPipeGearbox.java | 2 +- .../blocks/textures/TexturesGrinderMultiblock.java | 72 ++++++++++---------- .../turbine/LargeTurbineTextureHandler.java | 18 ++--- .../gregtech/common/covers/CoverToggleVisual.java | 7 +- .../common/helpers/FlotationRecipeHandler.java | 2 +- .../common/helpers/tesseract/TesseractHelper.java | 17 +++-- .../gregtech/common/items/MetaCustomCoverItem.java | 20 ++---- .../items/behaviours/Behaviour_Choocher.java | 2 +- .../items/behaviours/Behaviour_Prospecting_Ex.java | 4 +- .../common/render/MachineBlockRenderer.java | 51 ++++++-------- .../automation/MTEElectricAutoWorkbench.java | 6 +- .../automation/MTETesseractGenerator.java | 31 +++------ .../automation/MTETesseractTerminal.java | 27 +++----- .../generators/MTEGeothermalGenerator.java | 2 +- .../tileentities/generators/MTERTGenerator.java | 2 +- .../generators/MTERocketFuelGenerator.java | 2 +- .../generators/MTESemiFluidGenerator.java | 2 +- .../basic/MTEAtmosphericReconditioner.java | 56 +++++----------- .../tileentities/machines/basic/MTEAutoChisel.java | 22 +++--- .../machines/basic/MTECropHarvestor.java | 4 +- .../machines/basic/MTEPollutionCreator.java | 4 +- .../machines/basic/MTEPollutionDetector.java | 4 +- .../machines/basic/MTEWirelessCharger.java | 23 +++---- .../multi/processing/MTEIndustrialChisel.java | 2 +- .../multi/processing/MTEIndustrialDehydrator.java | 2 +- .../processing/MTEIndustrialVacuumFreezer.java | 2 +- .../machines/multi/processing/MTEIsaMill.java | 4 +- .../machines/multi/production/MTECyclotron.java | 2 +- .../multi/production/MTEElementalDuplicator.java | 4 +- .../multi/production/MTEFrothFlotationCell.java | 2 +- .../multi/production/MTEIndustrialRockBreaker.java | 2 +- .../multi/production/MTELargeRocketEngine.java | 12 ++-- .../multi/production/MTENuclearReactor.java | 2 +- .../machines/multi/production/MTERefinery.java | 2 +- .../machines/multi/production/MTESolarTower.java | 6 +- .../machines/multi/production/MTETreeFarm.java | 3 +- .../multi/production/algae/MTEAlgaePondBase.java | 4 +- .../production/chemplant/MTEChemicalPlant.java | 8 +-- .../production/turbines/MTELargeTurbineGas.java | 12 ++-- .../turbines/MTELargeTurbineSHSteam.java | 1 - .../production/turbines/MTELargeTurbineSteam.java | 1 - .../production/turbines/MTELargerTurbineBase.java | 21 +++--- .../turbines/MTELargerTurbinePlasma.java | 25 +++---- ...chMetaTileEntity_PowerSubStationController.java | 22 +++--- .../common/tileentities/misc/MTESolarHeater.java | 9 +-- .../redstone/MTERedstoneCircuitBlock.java | 11 ++- .../tileentities/storage/MTETieredChest.java | 5 +- .../gregtech/common/tools/ToolAngleGrinder.java | 4 +- .../gregtech/common/tools/ToolElectricSnips.java | 2 +- .../gregtech/loaders/RecipeGenBlastSmelter.java | 3 +- .../loaders/RecipeGenBlastSmelterGTNH.java | 25 +++---- .../gregtech/loaders/RecipeGenFluidCanning.java | 2 +- .../loaders/RecipeGenMaterialProcessing.java | 18 ++--- .../xmod/gregtech/loaders/RecipeGenOre.java | 38 +++++------ .../xmod/gregtech/loaders/RecipeGenRecycling.java | 11 +-- .../gregtech/loaders/RecipeGenShapedCrafting.java | 6 +- .../loaders/recipe/RecipeLoaderAlgaeFarm.java | 2 +- .../gregtech/GregtechBufferDynamos.java | 18 ++--- .../registration/gregtech/GregtechConduits.java | 13 ++-- .../gregtech/GregtechEnergyBuffer.java | 20 +++--- .../xmod/ic2/item/CustomKineticRotor.java | 5 +- .../java/gtPlusPlus/xmod/ic2/recipe/RecipeIC2.java | 39 +++++------ .../thaumcraft/objects/ThreadAspectScanner.java | 6 +- .../thermalfoundation/block/TFBlockFluidEnder.java | 2 +- .../block/TFBlockFluidPyrotheum.java | 5 -- .../xmod/tinkers/material/BaseTinkersMaterial.java | 5 +- .../xmod/tinkers/util/TinkersDryingRecipe.java | 3 +- 104 files changed, 521 insertions(+), 726 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod') 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 mHasCropObj = new ArrayList<>(); - private CropCard mCropObj; + private static final List mHasCropObj = new ArrayList<>(); + private final CropCard mCropObj; private ItemStack mBaseSeed; - private static List mCropList = cropLoader(); + private static final List mCropList = cropLoader(); public LoaderOfTheCrops(CropCard cropObj) { this.mCropObj = cropObj; @@ -57,7 +57,7 @@ public class LoaderOfTheCrops { List 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 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 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 - * + *

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

* Mainly for preventing NullPointer Exceptions and providing Default Values. - * + *

* Unknown Material Components. Dead End Section. - * + *

* 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 { - 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 getAdditionalToolTips(E aItem, List aList, ItemStack aStack); + List getAdditionalToolTips(E aItem, List 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 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 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> tList = this.mItemBehaviors.get((short) aMetaValue); - if (tList == null) { - tList = new ArrayList<>(1); - this.mItemBehaviors.put((short) aMetaValue, tList); - } + ArrayList> 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 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 mInfo = new ArrayList<>(); if (!this.getMetaName() - .equals("")) { + .isEmpty()) { mInfo.add(this.getMetaName()); } @@ -148,11 +148,7 @@ public abstract class GTPPMultiBlockBase 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