From 3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Wed, 2 Oct 2024 07:31:08 +0200 Subject: Cleanup the codebase (#3311) Co-authored-by: boubou19 --- src/main/java/gtPlusPlus/api/objects/Logger.java | 3 +- .../gtPlusPlus/api/objects/data/TypeCounter.java | 10 +- .../api/objects/data/WeightedCollection.java | 4 +- .../api/objects/minecraft/BTF_FluidTank.java | 11 +- .../api/objects/minecraft/BTF_Inventory.java | 12 +- .../gtPlusPlus/api/objects/minecraft/BlockPos.java | 3 +- .../api/objects/minecraft/ItemPackage.java | 2 +- .../api/objects/minecraft/ItemStackData.java | 2 +- .../api/objects/minecraft/ShapedRecipe.java | 8 +- .../gtPlusPlus/core/block/base/BasicBlock.java | 2 +- .../block/general/antigrief/BlockWitherProof.java | 14 +- .../core/block/machine/BlockCircuitProgrammer.java | 3 +- .../core/block/machine/BlockFlaskSetter.java | 3 +- .../core/block/machine/BlockPooCollector.java | 12 +- .../core/block/machine/BlockSuperJukebox.java | 10 +- .../gtPlusPlus/core/client/CustomTextureSet.java | 4 +- .../core/client/model/ModelSickBlaze.java | 4 +- .../client/renderer/CustomOreBlockRenderer.java | 18 ++- .../core/client/renderer/RenderDecayChest.java | 2 +- .../core/client/renderer/RenderToxinball.java | 2 +- .../gtPlusPlus/core/common/compat/CompatIC2.java | 4 +- .../core/container/ContainerCircuitProgrammer.java | 4 +- .../core/container/ContainerFishTrap.java | 4 +- .../core/container/ContainerPestKiller.java | 11 +- .../core/container/ContainerProjectTable.java | 8 +- .../core/container/ContainerSuperJukebox.java | 4 +- .../container/ContainerVolumetricFlaskSetter.java | 8 +- .../core/entity/projectile/EntityToxinball.java | 6 +- .../gtPlusPlus/core/gui/beta/GUIIDRegistry.java | 9 +- .../java/gtPlusPlus/core/gui/beta/GUITypes.java | 2 +- .../gtPlusPlus/core/gui/machine/GUIPestKiller.java | 8 +- .../core/gui/machine/GUIVolumetricFlaskSetter.java | 46 +++--- .../core/handler/Recipes/DecayableRecipe.java | 6 +- .../handler/events/EnderDragonDeathHandler.java | 6 +- .../core/handler/events/SneakManager.java | 6 +- .../workbench/WorkbenchCraftingHandler.java | 32 ++--- .../gtPlusPlus/core/interfaces/IGuiManager.java | 10 +- .../core/interfaces/IGuiManagerMiscUtils.java | 2 +- .../gtPlusPlus/core/interfaces/IItemBlueprint.java | 22 +-- .../inventories/InventoryCircuitProgrammer.java | 2 +- .../core/inventories/InventoryDecayablesChest.java | 2 +- .../core/inventories/InventoryEggBox.java | 2 +- .../core/inventories/InventoryFishTrap.java | 2 +- .../core/inventories/InventoryPestKiller.java | 2 +- .../core/inventories/InventorySuperJukebox.java | 2 +- .../InventoryVolumetricFlaskSetter.java | 2 +- .../projecttable/InventoryProjectMain.java | 2 +- .../projecttable/InventoryProjectOutput.java | 2 +- .../inventories/tradetable/InventoryTradeMain.java | 2 +- .../tradetable/InventoryTradeOutput.java | 2 +- src/main/java/gtPlusPlus/core/item/ModItems.java | 2 +- .../core/item/base/BaseItemBurnable.java | 2 +- .../core/item/base/BaseItemComponent.java | 20 +-- .../core/item/base/BaseItemDamageable.java | 16 +-- .../core/item/base/BaseItemTickable.java | 3 +- .../gtPlusPlus/core/item/base/BasicSpawnEgg.java | 9 +- .../core/item/base/cell/BaseItemCell.java | 2 +- .../core/item/base/cell/BaseItemPlasmaCell.java | 2 +- .../core/item/base/dusts/BaseItemDust.java | 2 +- .../core/item/base/dusts/BaseItemDustUnique.java | 6 +- .../core/item/base/ingots/BaseItemIngotHot.java | 10 +- .../core/item/base/ingots/BaseItemIngotOld.java | 4 +- .../core/item/base/itemblock/ItemBlockMeta.java | 9 +- .../core/item/base/misc/BaseItemMisc.java | 4 +- .../core/item/base/ore/BaseOreComponent.java | 17 +-- .../core/item/base/plates/BaseItemPlate_OLD.java | 4 +- .../gtPlusPlus/core/item/bauble/BaseBauble.java | 4 +- .../core/item/bauble/BatteryPackBaseBauble.java | 37 +---- .../core/item/chemistry/AgriculturalChem.java | 9 +- .../core/item/chemistry/MilledOreProcessing.java | 2 +- .../chemistry/general/ItemGenericChemBase.java | 10 +- .../item/circuit/GTPPIntegratedCircuitItem.java | 11 +- .../core/item/crafting/ItemDummyResearch.java | 6 +- .../core/item/food/BaseItemMetaFood.java | 9 +- .../item/general/ItemBasicScrubberTurbine.java | 7 +- .../core/item/general/ItemBlueprint.java | 15 +- .../core/item/general/ItemGenericToken.java | 3 +- .../core/item/general/ItemHealingDevice.java | 9 +- .../core/item/general/ItemLavaFilter.java | 2 +- .../core/item/general/ItemMagicFeather.java | 2 +- .../item/general/spawn/ItemCustomSpawnEgg.java | 111 +++++++------- .../core/item/materials/DustDecayable.java | 12 +- .../core/item/tool/misc/ItemGregtechPump.java | 34 ++--- .../java/gtPlusPlus/core/lib/VanillaColours.java | 2 +- .../java/gtPlusPlus/core/material/Material.java | 63 ++++---- .../core/material/MaterialGenerator.java | 19 +-- .../gtPlusPlus/core/material/MaterialsAlloy.java | 2 +- .../core/material/MaterialsElements.java | 41 +++--- .../java/gtPlusPlus/core/material/Particle.java | 4 +- .../core/material/nuclear/MaterialsFluorides.java | 70 ++++----- .../core/material/nuclear/MaterialsNuclides.java | 110 +++++++------- .../core/material/state/MaterialState.java | 2 +- .../core/network/packet/AbstractPacket.java | 2 +- .../gtPlusPlus/core/recipe/RecipesGeneral.java | 56 ++++---- .../gtPlusPlus/core/recipe/RecipesMachines.java | 4 +- .../java/gtPlusPlus/core/recipe/common/CI.java | 14 +- .../core/slots/SlotCraftingNoCollect.java | 2 +- .../core/tileentities/base/TileEntityBase.java | 96 +++++++------ .../general/TileEntityCircuitProgrammer.java | 14 +- .../general/TileEntityDecayablesChest.java | 2 +- .../general/TileEntityInfiniteFluid.java | 23 ++- .../general/TileEntityVolumetricFlaskSetter.java | 5 +- .../machines/TileEntityAdvPooCollector.java | 2 +- .../machines/TileEntityBaseFluidCollector.java | 20 ++- .../machines/TileEntityPestKiller.java | 46 +++--- .../machines/TileEntityPooCollector.java | 2 +- src/main/java/gtPlusPlus/core/util/Utils.java | 2 +- .../java/gtPlusPlus/core/util/data/ArrayUtils.java | 14 +- .../java/gtPlusPlus/core/util/data/FileUtils.java | 5 +- .../gtPlusPlus/core/util/data/StringUtils.java | 6 +- .../java/gtPlusPlus/core/util/math/MathUtils.java | 31 ++-- .../gtPlusPlus/core/util/minecraft/FluidUtils.java | 15 +- .../core/util/minecraft/InventoryUtils.java | 3 +- .../gtPlusPlus/core/util/minecraft/ItemUtils.java | 159 +++++++-------------- .../core/util/minecraft/MaterialUtils.java | 5 +- .../gtPlusPlus/core/util/minecraft/NBTUtils.java | 11 +- .../core/util/minecraft/PlayerUtils.java | 3 +- .../core/util/minecraft/RecipeUtils.java | 42 ++---- .../core/util/recipe/RecipeHashStrat.java | 5 +- .../core/util/reflect/ReflectionUtils.java | 25 ++-- .../core/world/explosions/MiningExplosion.java | 1 - .../everglades/biome/BiomeEverglades.java | 3 +- .../everglades/biome/CustomBiomeGenerator.java | 4 +- .../everglades/block/BlockEvergladesPortal.java | 18 +-- .../everglades/chunk/ChunkProviderModded.java | 8 +- .../everglades/gen/gt/WorldGen_GT_Base.java | 12 +- .../everglades/gen/gt/WorldGen_GT_Ore_Layer.java | 4 +- .../everglades/world/TeleporterDimensionMod.java | 4 +- .../everglades/world/WorldChunkManagerCustom.java | 35 +++-- .../gtPlusPlus/nei/DecayableRecipeHandler.java | 61 +++----- .../gtPlusPlus/nei/LFTRSpargingNEIHandler.java | 35 ++--- .../gtPlusPlus/nei/handlers/NeiTextureHandler.java | 10 +- .../gtPlusPlus/plugin/agrichem/BioRecipes.java | 6 +- .../plugin/agrichem/item/algae/ItemAlgaeBase.java | 6 +- .../java/gtPlusPlus/recipes/RecipeRemovals.java | 2 +- .../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 +- 239 files changed, 1300 insertions(+), 1827 deletions(-) (limited to 'src/main/java/gtPlusPlus') 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 implements Set { - private Map> mInternalMap = new LinkedHashMap<>(); + private final Map> mInternalMap = new LinkedHashMap<>(); private String mHighestValueKey; private int mHighestValue = 0; private final Class mClass; @@ -55,7 +55,7 @@ public class TypeCounter implements Set { String aKey = aKeyName != null ? aKeyName : arg0.toString(); InternalTypeCounterObject 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 implements Set { @Override public boolean remove(Object arg0) { InternalTypeCounterObject 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 implements Map { - private NavigableMap map = new TreeMap<>(); - private Random random; + private final NavigableMap 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 { */ 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 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[] aTextureData = new CubicObject[] { new CubicObject<>(aTexData) }; - return aTextureData; + return (CubicObject[]) 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[] aTextureData = new CubicObject[] { new CubicObject<>(aTexData) }; - return aTextureData; + return (CubicObject[]) 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 idMap = new HashMap<>(); private static int nextId = 0; - static {} - private static void registerGuiHandlers(final GUITypes MU_GuiType, final List> guiHandlerClasses) { for (final Class 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, 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 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(); +