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/bartworks/API/BorosilicateGlass.java | 4 +- .../java/bartworks/common/configs/LanderType.java | 2 +- .../common/loaders/StaticRecipeChangeLoaders.java | 7 +- .../common/tileentities/multis/MTEBioVat.java | 6 +- .../multis/MTECircuitAssemblyLine.java | 2 +- .../multis/MTEElectricImplosionCompressor.java | 2 +- .../multis/MTEHighTempGasCooledReactor.java | 10 +- .../common/tileentities/multis/MTEManualTrafo.java | 12 +- .../multis/MTEThoriumHighTempReactor.java | 12 +- .../common/tileentities/multis/MTEWindmill.java | 6 +- .../multis/mega/MTEMegaBlastFurnace.java | 8 +- .../multis/mega/MTEMegaChemicalReactor.java | 8 +- .../multis/mega/MTEMegaDistillTower.java | 5 +- .../multis/mega/MTEMegaOilCracker.java | 8 +- .../java/bartworks/neiHandler/OreNEIHandler.java | 9 +- .../system/material/BWMetaGeneratedBlocks.java | 2 +- .../system/material/BWMetaGeneratedItems.java | 6 +- .../BWTileEntityMetaGeneratedSmallOre.java | 2 +- .../java/bartworks/system/material/Werkstoff.java | 15 +- .../gtenhancement/PlatinumSludgeOverHaul.java | 1 - .../processingLoaders/AdditionalRecipes.java | 1 - .../werkstoff_loaders/recipe/CellLoader.java | 4 +- .../werkstoff_loaders/recipe/DustLoader.java | 6 +- .../java/bartworks/system/oregen/BWOreLayer.java | 6 +- .../bartworks/system/oregen/BWWordGenerator.java | 2 +- .../bartworks/system/worldgen/MapGenRuins.java | 4 +- src/main/java/bartworks/util/MurmurHash3.java | 6 +- .../bartworks/util/NoiseUtil/SimplexNoise.java | 26 ++-- .../java/bartworks/util/NonNullWrappedHashMap.java | 2 +- src/main/java/bartworks/util/Pair.java | 4 +- .../accessprioritylist/AccessPriorityList.java | 2 - .../openComputers/TileEntityGTDataServer.java | 2 +- .../java/detrav/commands/DetravScannerCommand.java | 4 +- .../detrav/enums/IDDetraveMetaGeneratedTool01.java | 2 +- .../detrav/events/DetravLoginEventHandler.java | 24 ---- .../java/detrav/gui/textures/DetravMapTexture.java | 24 +--- .../behaviours/BehaviourDetravToolProspector.java | 10 +- src/main/java/detrav/proxies/CommonProxy.java | 9 +- .../java/galacticgreg/WorldGeneratorSpace.java | 4 +- .../java/galacticgreg/WorldgenOreLayerSpace.java | 11 +- .../java/galacticgreg/WorldgenOreSmallSpace.java | 2 +- .../java/galacticgreg/api/AsteroidBlockComb.java | 3 +- src/main/java/galacticgreg/api/BlockMetaComb.java | 4 +- src/main/java/galacticgreg/api/GTOreTypes.java | 8 +- src/main/java/galacticgreg/api/ModDBMDef.java | 11 +- .../java/galacticgreg/api/ModDimensionDef.java | 32 ++--- .../java/galacticgreg/api/SpecialBlockComb.java | 5 +- .../galacticgreg/api/StructureInformation.java | 6 +- .../enums/DimensionBlockMetaDefinitionList.java | 2 +- .../java/galacticgreg/api/enums/DimensionDef.java | 2 +- .../java/galacticgreg/api/enums/ModContainers.java | 2 +- .../api/enums/properties/Asteroids.java | 3 +- .../java/galacticgreg/auxiliary/ConfigManager.java | 2 +- .../galacticgreg/auxiliary/GalacticGregConfig.java | 2 +- .../galacticgreg/auxiliary/ProfilingStorage.java | 2 +- .../galacticgreg/command/AEStorageCommand.java | 12 +- .../galacticgreg/command/ProfilingCommand.java | 5 +- .../dynconfig/DynamicDimensionConfig.java | 2 +- .../java/galacticgreg/generators/GenEllipsoid.java | 6 +- .../schematics/SpaceSchematicHandler.java | 6 +- .../schematics/SpaceSchematicWrapper.java | 4 +- src/main/java/ggfab/mte/MTEAdvAssLine.java | 6 +- .../blocks/regularBlock/BlockTurbineCasing.java | 5 +- .../blocks/tileEntity/AntimatterForge.java | 85 +++++------ .../blocks/tileEntity/AntimatterGenerator.java | 6 +- .../blocks/tileEntity/MTEEssentiaHatch.java | 2 +- .../tileEntity/MTEEssentiaOutputHatchME.java | 2 +- .../blocks/tileEntity/MTEFuelRefineFactory.java | 4 +- .../tileEntity/MTELargeEssentiaSmeltery.java | 10 +- .../blocks/tileEntity/MTEMultiNqGenerator.java | 4 +- .../tileEntity/base/MTELargeFusionComputer.java | 2 +- .../tileEntity/base/MTELargeTurbineBase.java | 5 +- .../client/render/AntimatterRenderer.java | 6 +- .../client/render/BlockRenderHandler.java | 6 +- .../java/goodgenerator/crossmod/nei/NEIConfig.java | 1 - src/main/java/goodgenerator/items/GGItem.java | 4 +- .../java/goodgenerator/items/GGItemBlocks.java | 3 +- src/main/java/goodgenerator/items/GGMaterial.java | 1 - src/main/java/goodgenerator/items/ItemFuelRod.java | 2 +- .../java/goodgenerator/loader/RecipeLoader2.java | 4 +- .../java/goodgenerator/util/CrackRecipeAdder.java | 2 +- .../java/goodgenerator/util/StructureHelper.java | 10 +- src/main/java/gregtech/api/enums/Element.java | 1 - src/main/java/gregtech/api/enums/GTStones.java | 2 +- .../java/gregtech/api/enums/InventoryType.java | 2 +- src/main/java/gregtech/api/enums/ItemList.java | 2 +- src/main/java/gregtech/api/enums/Materials.java | 6 +- .../java/gregtech/api/enums/MetaTileEntityIDs.java | 2 +- src/main/java/gregtech/api/enums/OreMixes.java | 2 +- src/main/java/gregtech/api/enums/SmallOres.java | 2 +- .../gregtech/api/graphs/paths/PowerNodePath.java | 4 +- .../java/gregtech/api/interfaces/IToolStats.java | 2 +- .../java/gregtech/api/items/ItemBreederCell.java | 4 +- .../gregtech/api/items/ItemRadioactiveCell.java | 4 +- .../gregtech/api/items/ItemRadioactiveCellIC.java | 2 +- src/main/java/gregtech/api/items/MetaBaseItem.java | 4 +- .../java/gregtech/api/items/MetaGeneratedTool.java | 43 +++--- .../api/logic/AbstractProcessingLogic.java | 2 +- .../api/logic/ComplexParallelProcessingLogic.java | 16 +-- .../gregtech/api/logic/ControllerFluidLogic.java | 4 +- .../gregtech/api/logic/ControllerItemLogic.java | 4 +- .../gregtech/api/logic/FluidInventoryLogic.java | 13 +- .../gregtech/api/logic/ItemInventoryLogic.java | 6 +- src/main/java/gregtech/api/logic/PowerLogic.java | 2 +- .../api/logic/interfaces/ProcessingLogicHost.java | 2 +- .../api/metatileentity/BaseMetaTileEntity.java | 4 +- .../metatileentity/implementations/MTECable.java | 2 +- .../implementations/MTEEnhancedMultiBlockBase.java | 2 +- .../metatileentity/implementations/MTEFluid.java | 2 +- .../implementations/MTEHatchMaintenance.java | 1 - .../implementations/MTEHatchOutput.java | 2 +- .../implementations/MTEMultiBlockBase.java | 6 +- .../api/multitileentity/MultiTileEntityBlock.java | 1 - .../api/multitileentity/MultiTileEntityItem.java | 2 - .../api/multitileentity/base/MultiTileEntity.java | 15 +- .../interfaces/SyncedMultiTileEntity.java | 2 +- .../machine/MultiTileBasicMachine.java | 3 +- .../multiblock/base/Controller.java | 7 +- .../multiblock/base/MultiBlockPart.java | 7 +- .../base/StackableModularController.java | 2 +- .../multiblock/base/WallShareablePart.java | 4 +- .../api/net/GTPacketSendOregenPattern.java | 9 +- .../java/gregtech/api/objects/GTChunkManager.java | 2 +- src/main/java/gregtech/api/objects/ItemData.java | 2 +- .../java/gregtech/api/objects/MaterialStack.java | 2 +- .../objects/blockupdate/BlockUpdateHandler.java | 8 +- .../api/objects/blockupdate/RandomCooldown.java | 4 +- .../java/gregtech/api/util/AssemblyLineUtils.java | 2 +- .../gregtech/api/util/AveragePerTickCounter.java | 10 +- src/main/java/gregtech/api/util/GTBaseCrop.java | 5 +- src/main/java/gregtech/api/util/GTMusicSystem.java | 6 +- .../gregtech/api/util/GTOreDictUnificator.java | 2 +- .../java/gregtech/api/util/GTStructureUtility.java | 2 +- .../java/gregtech/api/util/GTTooltipDataCache.java | 2 +- src/main/java/gregtech/api/util/GTUtil.java | 4 +- src/main/java/gregtech/api/util/GTUtility.java | 42 +++--- src/main/java/gregtech/api/util/GTWaila.java | 17 +-- .../gregtech/api/util/GT_StructureUtilityMuTE.java | 5 +- .../java/gregtech/api/util/GasSpargingRecipe.java | 37 ++--- .../gregtech/api/util/HatchElementBuilder.java | 2 +- .../api/util/MultiblockTooltipBuilder.java | 5 +- .../gregtech/api/util/OverclockCalculator.java | 3 +- .../gregtech/api/util/TurbineStatCalculator.java | 6 +- src/main/java/gregtech/api/world/GTWorldgen.java | 5 +- src/main/java/gregtech/client/SeekingOggCodec.java | 2 +- src/main/java/gregtech/common/GTProxy.java | 6 +- .../java/gregtech/common/GTWorldgenerator.java | 8 +- src/main/java/gregtech/common/Pollution.java | 4 +- .../java/gregtech/common/WorldgenGTOreLayer.java | 2 +- .../gregtech/common/WorldgenGTOreSmallPieces.java | 2 +- src/main/java/gregtech/common/WorldgenStone.java | 4 +- .../java/gregtech/common/blocks/BlockGlass1.java | 2 +- .../java/gregtech/common/blocks/BlockMachines.java | 2 +- .../gregtech/common/blocks/BlockOresAbstract.java | 2 +- .../java/gregtech/common/blocks/ItemMachines.java | 2 +- .../java/gregtech/common/covers/CoverConveyor.java | 6 +- .../java/gregtech/common/covers/CoverDoesWork.java | 9 +- .../common/covers/CoverFluidRegulator.java | 3 - .../java/gregtech/common/covers/CoverPump.java | 6 +- .../redstone/CoverWirelessDoesWorkDetector.java | 3 +- .../gui/modularui/widget/TextButtonWidget.java | 4 +- .../common/items/behaviors/BehaviourDataOrb.java | 2 +- .../items/behaviors/BehaviourSwitchMode.java | 3 +- .../gregtech/common/render/BlackholeRenderer.java | 2 +- .../common/render/FluidDisplayStackRenderer.java | 2 +- .../gregtech/common/render/GTRendererBlock.java | 2 +- .../tileentities/casings/upgrade/Inventory.java | 2 +- .../common/tileentities/casings/upgrade/Tank.java | 4 +- .../generators/MTEMagicalEnergyAbsorber.java | 10 +- .../generators/MTENaquadahReactor.java | 2 +- .../tileentities/generators/MTESteamTurbine.java | 1 - .../tileentities/machines/IDualInputHatch.java | 2 +- .../tileentities/machines/ISmartInputHatch.java | 2 +- .../machines/MTEHatchCraftingInputME.java | 14 +- .../tileentities/machines/MTEHatchOutputBusME.java | 5 +- .../tileentities/machines/MTEHatchOutputME.java | 5 +- .../tileentities/machines/basic/MTEPump.java | 4 +- .../machines/basic/MTETurboCharger.java | 6 +- .../machines/basic/MTEWorldAccelerator.java | 10 +- .../long_distance/MTELongDistancePipelineBase.java | 10 +- .../MTELongDistancePipelineFluid.java | 10 +- .../long_distance/MTELongDistancePipelineItem.java | 10 +- .../MTEIndustrialElectromagneticSeparator.java | 4 +- .../machines/multi/MTEIndustrialLaserEngraver.java | 5 +- .../machines/multi/MTELargeFluidExtractor.java | 11 +- .../machines/multi/MTELargeTurbine.java | 3 +- .../machines/multi/MTELargeTurbineGas.java | 2 +- .../machines/multi/MTELargeTurbineGasAdvanced.java | 2 +- .../machines/multi/MTELargeTurbinePlasma.java | 2 +- .../machines/multi/MTELargeTurbineSteam.java | 1 - .../machines/multi/MTEMultiAutoclave.java | 5 +- .../machines/multi/MTEMultiCanner.java | 3 +- .../tileentities/machines/multi/MTEMultiLathe.java | 2 +- .../machines/multi/MTEMultiSolidifier.java | 8 +- .../tileentities/machines/multi/MTEPCBFactory.java | 6 +- .../machines/multi/MTEPlasmaForge.java | 8 +- .../machines/multi/MTEWormholeGenerator.java | 27 ++-- .../multi/compressor/MTEBlackHoleCompressor.java | 4 +- .../machines/multi/drone/MTEDroneCentre.java | 3 +- .../multi/purification/MTEPurificationPlant.java | 6 +- .../purification/MTEPurificationUnitDegasser.java | 22 +-- .../machines/multiblock/DistillationTower.java | 2 +- .../tileentities/storage/MTEDigitalChestBase.java | 2 +- .../java/gregtech/loaders/misc/bees/GTFlowers.java | 12 +- .../loaders/oreprocessing/ProcessingBlock.java | 4 +- .../loaders/oreprocessing/ProcessingCell.java | 2 +- .../loaders/oreprocessing/ProcessingDust.java | 12 +- .../loaders/oreprocessing/ProcessingRawOre.java | 4 +- 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 +- src/main/java/gtneioreplugin/Config.java | 5 +- .../gtneioreplugin/util/GT5OreSmallHelper.java | 4 +- src/main/java/gtneioreplugin/util/Oremix.java | 2 +- .../gtnhlanth/common/beamline/BeamInformation.java | 10 +- .../java/gtnhlanth/common/beamline/Particle.java | 18 +-- .../gtnhlanth/common/block/BlockAntennaCasing.java | 2 +- .../java/gtnhlanth/common/block/BlockCasing.java | 2 +- .../common/hatch/MTEHatchOutputBeamline.java | 6 +- .../common/item/ItemPhotolithographicMask.java | 4 +- .../common/register/BotWerkstoffMaterialPool.java | 1 - .../common/register/WerkstoffMaterialPool.java | 1 - .../java/gtnhlanth/common/tileentity/MTELINAC.java | 18 +-- .../common/tileentity/MTESourceChamber.java | 4 +- .../common/tileentity/MTESynchrotron.java | 33 ++--- .../common/tileentity/MTETargetChamber.java | 6 +- .../tileentity/recipe/beamline/RecipeSC.java | 4 +- .../recipe/beamline/TargetChamberFrontend.java | 3 +- src/main/java/gtnhlanth/loader/RecipeLoader.java | 32 +++-- .../java/gtnhlanth/loader/ZPMRubberChanges.java | 7 +- src/main/java/gtnhlanth/xmod/nei/NEIConfig.java | 2 - .../tileentities/MTELapotronicSuperCapacitor.java | 6 +- src/main/java/kekztech/util/Util.java | 4 +- src/main/java/kubatech/api/DynamicInventory.java | 33 ++--- .../java/kubatech/api/EIGDynamicInventory.java | 59 +++----- src/main/java/kubatech/api/Variables.java | 1 - .../java/kubatech/api/enums/EIGSetupPhase.java | 2 +- src/main/java/kubatech/api/enums/ItemList.java | 2 +- .../implementations/KubaTechGTMultiBlockBase.java | 4 +- src/main/java/kubatech/api/tea/TeaNetwork.java | 2 +- .../java/kubatech/client/effect/CropRenderer.java | 2 +- .../java/kubatech/loaders/MobHandlerLoader.java | 1 - .../loaders/item/items/ItemTeaCollection.java | 11 +- .../loaders/item/items/ItemTeaUltimate.java | 2 +- .../multiblock/MTEExtremeEntityCrusher.java | 13 +- .../multiblock/MTEExtremeIndustrialGreenhouse.java | 4 +- .../multiblock/MTEMegaIndustrialApiary.java | 11 +- .../multiblock/eigbuckets/EIGIC2Bucket.java | 5 +- .../multiblock/eigbuckets/EIGSeedBucket.java | 2 +- .../dataTransport/InventoryDataPacket.java | 2 +- .../enderStorage/EnderWorldSavedData.java | 16 +-- .../tectech/recipe/EyeOfHarmonyRecipeStorage.java | 6 +- .../tectech/rendering/EOH/EOHTileEntitySR.java | 2 +- .../tectech/thing/block/RenderForgeOfGods.java | 6 +- .../metaTileEntity/hatch/MTEHatchCapacitor.java | 13 +- .../hatch/MTEHatchDataItemsInput.java | 2 +- .../metaTileEntity/hatch/MTEHatchParamText.java | 4 +- .../thing/metaTileEntity/hatch/MTEHatchRack.java | 1 - .../thing/metaTileEntity/multi/MTEDataBank.java | 4 +- .../metaTileEntity/multi/MTEEyeOfHarmony.java | 10 +- .../thing/metaTileEntity/multi/MTEForgeOfGods.java | 31 ++-- .../metaTileEntity/multi/MTEResearchStation.java | 1 - .../thing/metaTileEntity/multi/base/LedStatus.java | 5 +- .../multi/base/SoundLoopAnyBlock.java | 6 +- .../multi/base/TTMultiblockBase.java | 17 +-- .../multi/godforge_modules/MTEBaseModule.java | 6 +- .../multi/godforge_modules/MTEExoticModule.java | 2 +- .../metaTileEntity/pipe/MTEPipeEnergyMirror.java | 2 +- .../metaTileEntity/single/MTEBuckConverter.java | 2 +- .../single/MTEDebugStructureWriter.java | 5 +- .../metaTileEntity/single/MTEOwnerDetector.java | 2 +- src/main/java/tectech/util/StructureVBO.java | 4 +- 508 files changed, 2043 insertions(+), 2844 deletions(-) delete mode 100644 src/main/java/detrav/events/DetravLoginEventHandler.java (limited to 'src/main/java') diff --git a/src/main/java/bartworks/API/BorosilicateGlass.java b/src/main/java/bartworks/API/BorosilicateGlass.java index b33f43689f..1c15104f63 100644 --- a/src/main/java/bartworks/API/BorosilicateGlass.java +++ b/src/main/java/bartworks/API/BorosilicateGlass.java @@ -112,9 +112,9 @@ public class BorosilicateGlass { /** * Register a new block as valid borosilicate glass with given tier (even if it doesn't contain boron at all) - * + *

* Does not support matching by more complex stuff like tile entity! - * + *

* Can only be called at INIT stage. */ public static void registerGlass(Block block, int meta, byte tier) { diff --git a/src/main/java/bartworks/common/configs/LanderType.java b/src/main/java/bartworks/common/configs/LanderType.java index a392ec3e38..a97006c390 100644 --- a/src/main/java/bartworks/common/configs/LanderType.java +++ b/src/main/java/bartworks/common/configs/LanderType.java @@ -3,5 +3,5 @@ package bartworks.common.configs; public enum LanderType { MoonLander, LandingBalloons, - AsteroidsLander; + AsteroidsLander } diff --git a/src/main/java/bartworks/common/loaders/StaticRecipeChangeLoaders.java b/src/main/java/bartworks/common/loaders/StaticRecipeChangeLoaders.java index f266c2fdc2..ae1c037589 100644 --- a/src/main/java/bartworks/common/loaders/StaticRecipeChangeLoaders.java +++ b/src/main/java/bartworks/common/loaders/StaticRecipeChangeLoaders.java @@ -17,7 +17,7 @@ import static gregtech.api.enums.Mods.TinkerConstruct; import java.lang.reflect.Field; import java.util.ArrayList; -import java.util.Arrays; +import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -59,8 +59,9 @@ public class StaticRecipeChangeLoaders { private static TObjectDoubleHashMap gtEbfGasRecipeTimeMultipliers = null; private static TObjectDoubleHashMap gtEbfGasRecipeConsumptionMultipliers = null; - public static final List whitelistForEBFNoGasRecipeDontCheckItemData = Arrays - .asList(GTModHandler.getModItem(TinkerConstruct.ID, "materials", 1L, 12) // Raw Aluminum -> Aluminium Ingot + public static final List whitelistForEBFNoGasRecipeDontCheckItemData = Collections + .singletonList(GTModHandler.getModItem(TinkerConstruct.ID, "materials", 1L, 12) // Raw Aluminum -> Aluminium + // Ingot // (coremod) ); diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java b/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java index 88c5888878..d3b2aa804b 100644 --- a/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java +++ b/src/main/java/bartworks/common/tileentities/multis/MTEBioVat.java @@ -313,7 +313,7 @@ public class MTEBioVat extends MTEEnhancedMultiBlockBase implements I return false; } IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity == null || !(aMetaTileEntity instanceof GT_MetaTileEntity_RadioHatch)) { + if (!(aMetaTileEntity instanceof GT_MetaTileEntity_RadioHatch)) { return false; } else { ((GT_MetaTileEntity_RadioHatch) aMetaTileEntity).updateTexture(CasingIndex); @@ -332,8 +332,8 @@ public class MTEBioVat extends MTEEnhancedMultiBlockBase implements I return this.mCasing >= 19 && this.mRadHatches.size() <= 1 && this.mOutputHatches.size() == 1 && this.mMaintenanceHatches.size() == 1 - && this.mInputHatches.size() > 0 - && this.mEnergyHatches.size() > 0; + && !this.mInputHatches.isEmpty() + && !this.mEnergyHatches.isEmpty(); } @Override diff --git a/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java b/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java index 46f5e66649..63558feb8b 100644 --- a/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java +++ b/src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java @@ -416,7 +416,7 @@ public class MTECircuitAssemblyLine extends MTEEnhancedMultiBlockBase= 1; + isOK = isOK && this.mMaintenanceHatches.size() == 1 && !energyHatches.isEmpty(); if (isOK) { this.activatePiston(); return true; diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEHighTempGasCooledReactor.java b/src/main/java/bartworks/common/tileentities/multis/MTEHighTempGasCooledReactor.java index 3250c7ce0d..22143ad543 100644 --- a/src/main/java/bartworks/common/tileentities/multis/MTEHighTempGasCooledReactor.java +++ b/src/main/java/bartworks/common/tileentities/multis/MTEHighTempGasCooledReactor.java @@ -185,11 +185,11 @@ public class MTEHighTempGasCooledReactor extends MTEEnhancedMultiBlockBase= 500 && this.mMaintenanceHatches.size() == 1 - && this.mInputHatches.size() > 0 - && this.mOutputHatches.size() > 0 - && this.mInputBusses.size() > 0 - && this.mOutputBusses.size() > 0 - && this.mEnergyHatches.size() > 0; + && !this.mInputHatches.isEmpty() + && !this.mOutputHatches.isEmpty() + && !this.mInputBusses.isEmpty() + && !this.mOutputBusses.isEmpty() + && !this.mEnergyHatches.isEmpty(); } @Override diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEManualTrafo.java b/src/main/java/bartworks/common/tileentities/multis/MTEManualTrafo.java index 2533fd5213..d6306badee 100644 --- a/src/main/java/bartworks/common/tileentities/multis/MTEManualTrafo.java +++ b/src/main/java/bartworks/common/tileentities/multis/MTEManualTrafo.java @@ -93,13 +93,13 @@ public class MTEManualTrafo extends MTEEnhancedMultiBlockBase { 2)) .addElement('t', ofBlock(BW_BLOCKS[2], 1)) .addElement('f', ofBlock(BW_BLOCKS[2], 0)) - .addElement('T', new IStructureElementNoPlacement() { + .addElement('T', new IStructureElementNoPlacement<>() { @Override public boolean check(MTEManualTrafo te, World world, int x, int y, int z) { if (world.isAirBlock(x, y, z)) return true; TileEntity tileEntity = world.getTileEntity(x, y, z); - if (tileEntity == null || !(tileEntity instanceof IGregTechTileEntity)) return true; + if (!(tileEntity instanceof IGregTechTileEntity)) return true; IMetaTileEntity mte = ((IGregTechTileEntity) tileEntity).getMetaTileEntity(); if (mte instanceof MTEHatchDynamo || mte instanceof MTEHatchEnergy) { int intier = te.mEnergyHatches.get(0).mTier; @@ -208,7 +208,7 @@ public class MTEManualTrafo extends MTEEnhancedMultiBlockBase { @Override public long getInputTier() { - if (this.mEnergyHatches.size() > 0) return GTUtility.getTier( + if (!this.mEnergyHatches.isEmpty()) return GTUtility.getTier( this.mEnergyHatches.get(0) .getBaseMetaTileEntity() .getInputVoltage()); @@ -217,7 +217,7 @@ public class MTEManualTrafo extends MTEEnhancedMultiBlockBase { @Override public long getOutputTier() { - if (this.mDynamoHatches.size() > 0) return GTUtility.getTier( + if (!this.mDynamoHatches.isEmpty()) return GTUtility.getTier( this.mDynamoHatches.get(0) .getBaseMetaTileEntity() .getOutputVoltage()); @@ -253,7 +253,7 @@ public class MTEManualTrafo extends MTEEnhancedMultiBlockBase { this.upstep = this.mode % 2 == 0; boolean tapmode = this.mode > 1; - if (!this.checkPiece(STRUCTURE_PIECE_BASE, 1, 0, 0) || this.mEnergyHatches.size() == 0) return false; + if (!this.checkPiece(STRUCTURE_PIECE_BASE, 1, 0, 0) || this.mEnergyHatches.isEmpty()) return false; byte intier = this.mEnergyHatches.get(0).mTier; for (MTEHatchEnergy in : this.mEnergyHatches) if (in.mTier != intier) return false; @@ -268,7 +268,7 @@ public class MTEManualTrafo extends MTEEnhancedMultiBlockBase { if (!this.checkPiece(STRUCTURE_PIECE_TOP, 1, mHeight, 0)) return false; this.mTiers = mHeight - 1; - if (this.mDynamoHatches.size() == 0 || this.mMaintenanceHatches.size() != 1 || this.mTiers == 0) return false; + if (this.mDynamoHatches.isEmpty() || this.mMaintenanceHatches.size() != 1 || this.mTiers == 0) return false; byte outtier = this.mDynamoHatches.get(0).mTier; for (MTEHatchDynamo out : this.mDynamoHatches) { diff --git a/src/main/java/bartworks/common/tileentities/multis/MTEThoriumHighTempReactor.java b/src/main/java/bartworks/common/tileentities/multis/MTEThoriumHighTempReactor.java index ee9b8a5baf..04a0b86feb 100644 --- a/src/main/java/bartworks/common/tileentities/multis/MTEThoriumHighTempReactor.java +++ b/src/main/java/bartworks/common/tileentities/multis/MTEThoriumHighTempReactor.java @@ -171,11 +171,11 @@ public class MTEThoriumHighTempReactor extends MTEEnhancedMultiBlockBase= 500 && this.mMaintenanceHatches.size() == 1 - && this.mInputHatches.size() > 0 - && this.mOutputHatches.size() > 0 - && this.mInputBusses.size() > 0 - && this.mOutputBusses.size() > 0 - && this.mEnergyHatches.size() > 0; + && !this.mInputHatches.isEmpty() + && !this.mOutputHatches.isEmpty() + && !this.mInputBusses.isEmpty() + && !this.mOutputBusses.isEmpty() + && !this.mEnergyHatches.isEmpty(); } @Override @@ -207,8 +207,6 @@ public class MTEThoriumHighTempReactor extends MTEEnhancedMultiBlockBase } }))) .addElement('b', ofBlock(Blocks.brick_block, 0)) - .addElement('s', new IStructureElement() { + .addElement('s', new IStructureElement<>() { @Override public boolean check(MTEWindmill t, World world, int x, int y, int z) { @@ -325,7 +325,7 @@ public class MTEWindmill extends MTEEnhancedMultiBlockBase ItemStack tmp = this.mOutputItems[0].copy(); tmp.stackSize = amount; splitStacks.add(tmp); - this.mOutputItems = splitStacks.toArray(new ItemStack[splitStacks.size()]); + this.mOutputItems = splitStacks.toArray(new ItemStack[0]); } this.mMaxProgresstime = tRecipe.mDuration * 2 * 100 * this.mMulti / this.getSpeed(this.rotorBlock); this.mMulti = 16; @@ -372,11 +372,9 @@ public class MTEWindmill extends MTEEnhancedMultiBlockBase } if (GTUtility.areStacksEqual(tHatch.getStackInSlot(i), aStack)) { - aStack = null; return true; } tHatch.setInventorySlotContents(i, null); - aStack = null; return false; } } diff --git a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java index e43da001f0..337154953a 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaBlastFurnace.java @@ -60,6 +60,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; import gregtech.api.metatileentity.implementations.MTEHatchMuffler; import gregtech.api.metatileentity.implementations.MTEHatchOutput; import gregtech.api.recipe.RecipeMap; @@ -385,8 +386,7 @@ public class MTEMegaBlastFurnace extends MegaMultiBlockBase || this.mMaintenanceHatches.size() != 1) return false; if (this.glassTier < 8) { - for (int i = 0; i < this.mExoticEnergyHatches.size(); ++i) { - MTEHatch hatch = this.mExoticEnergyHatches.get(i); + for (MTEHatch hatch : this.mExoticEnergyHatches) { if (hatch.getConnectionType() == MTEHatch.ConnectionType.LASER) { return false; } @@ -394,8 +394,8 @@ public class MTEMegaBlastFurnace extends MegaMultiBlockBase return false; } } - for (int i = 0; i < this.mEnergyHatches.size(); ++i) { - if (this.glassTier < this.mEnergyHatches.get(i).mTier) { + for (MTEHatchEnergy mEnergyHatch : this.mEnergyHatches) { + if (this.glassTier < mEnergyHatch.mTier) { return false; } } diff --git a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaChemicalReactor.java b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaChemicalReactor.java index 3c15af0fae..f1620abebc 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaChemicalReactor.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaChemicalReactor.java @@ -47,6 +47,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; import gregtech.api.render.TextureFactory; @@ -202,8 +203,7 @@ public class MTEMegaChemicalReactor extends MegaMultiBlockBase } protected boolean addLayerOutputHatch(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { - if (aTileEntity == null || aTileEntity.isDead() || !(aTileEntity.getMetaTileEntity() instanceof MTEHatchOutput)) - return false; + if (aTileEntity == null || aTileEntity.isDead() + || !(aTileEntity.getMetaTileEntity() instanceof MTEHatchOutput tHatch)) return false; while (this.mOutputHatchesByLayer.size() < this.mHeight) this.mOutputHatchesByLayer.add(new ArrayList<>()); - MTEHatchOutput tHatch = (MTEHatchOutput) aTileEntity.getMetaTileEntity(); tHatch.updateTexture(aBaseCasingIndex); return this.mOutputHatchesByLayer.get(this.mHeight - 1) .add(tHatch); diff --git a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaOilCracker.java b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaOilCracker.java index 4424bc62cc..9686425bed 100644 --- a/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaOilCracker.java +++ b/src/main/java/bartworks/common/tileentities/multis/mega/MTEMegaOilCracker.java @@ -58,6 +58,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; import gregtech.api.metatileentity.implementations.MTEHatchInput; import gregtech.api.metatileentity.implementations.MTEHatchMultiInput; import gregtech.api.metatileentity.implementations.MTEHatchOutput; @@ -255,8 +256,7 @@ public class MTEMegaOilCracker extends MegaMultiBlockBase imp if (!this.checkPiece(STRUCTURE_PIECE_MAIN, 6, 6, 0) || this.mMaintenanceHatches.size() != 1) return false; if (this.glassTier < 8) { - for (int i = 0; i < this.mExoticEnergyHatches.size(); ++i) { - MTEHatch hatch = this.mExoticEnergyHatches.get(i); + for (MTEHatch hatch : this.mExoticEnergyHatches) { if (hatch.getConnectionType() == MTEHatch.ConnectionType.LASER) { return false; } @@ -264,8 +264,8 @@ public class MTEMegaOilCracker extends MegaMultiBlockBase imp return false; } } - for (int i = 0; i < this.mEnergyHatches.size(); ++i) { - if (this.glassTier < this.mEnergyHatches.get(i).mTier) { + for (MTEHatchEnergy mEnergyHatch : this.mEnergyHatches) { + if (this.glassTier < mEnergyHatch.mTier) { return false; } } diff --git a/src/main/java/bartworks/neiHandler/OreNEIHandler.java b/src/main/java/bartworks/neiHandler/OreNEIHandler.java index 7b5e5eee40..3732c56aff 100644 --- a/src/main/java/bartworks/neiHandler/OreNEIHandler.java +++ b/src/main/java/bartworks/neiHandler/OreNEIHandler.java @@ -94,13 +94,10 @@ public class OreNEIHandler extends TemplateRecipeHandler { @Override public void drawExtras(int recipe) { - if (recipe < this.arecipes.size() && this.arecipes.get(recipe) instanceof CachedOreRecipe) { - CachedOreRecipe cachedOreRecipe = (CachedOreRecipe) this.arecipes.get(recipe); + if (recipe < this.arecipes.size() && this.arecipes.get(recipe) instanceof CachedOreRecipe cachedOreRecipe) { - if (cachedOreRecipe == null || cachedOreRecipe.getOtherStacks() == null - || cachedOreRecipe.getOtherStacks() - .size() == 0) - return; + if (cachedOreRecipe.getOtherStacks() == null || cachedOreRecipe.getOtherStacks() + .isEmpty()) return; if (!cachedOreRecipe.small) { if (cachedOreRecipe.getOtherStacks() diff --git a/src/main/java/bartworks/system/material/BWMetaGeneratedBlocks.java b/src/main/java/bartworks/system/material/BWMetaGeneratedBlocks.java index db838d059a..533f16089f 100644 --- a/src/main/java/bartworks/system/material/BWMetaGeneratedBlocks.java +++ b/src/main/java/bartworks/system/material/BWMetaGeneratedBlocks.java @@ -86,7 +86,7 @@ public abstract class BWMetaGeneratedBlocks extends BWTileEntityContainer { @Override public int getRenderType() { if (BWBlockOreRenderer.INSTANCE == null) return super.getRenderType(); - return BWBlockOreRenderer.INSTANCE.renderID; + return BWBlockOreRenderer.renderID; } @Override diff --git a/src/main/java/bartworks/system/material/BWMetaGeneratedItems.java b/src/main/java/bartworks/system/material/BWMetaGeneratedItems.java index bdeab62cfd..cd8e360da6 100644 --- a/src/main/java/bartworks/system/material/BWMetaGeneratedItems.java +++ b/src/main/java/bartworks/system/material/BWMetaGeneratedItems.java @@ -100,17 +100,15 @@ public class BWMetaGeneratedItems extends MetaGeneratedItem implements IRadMater OrePrefixes.dust, aMaterial, aItemEntity.getEntityItem().stackSize)); - aItemEntity.worldObj.setBlockMetadataWithNotify(tX, tY, tZ, tMetaData - 1, 3); - return true; } else { aItemEntity.setEntityItemStack( WerkstoffLoader.getCorrespondingItemStack( OrePrefixes.crushedPurified, aMaterial, aItemEntity.getEntityItem().stackSize)); - aItemEntity.worldObj.setBlockMetadataWithNotify(tX, tY, tZ, tMetaData - 1, 3); - return true; } + aItemEntity.worldObj.setBlockMetadataWithNotify(tX, tY, tZ, tMetaData - 1, 3); + return true; } } } diff --git a/src/main/java/bartworks/system/material/BWTileEntityMetaGeneratedSmallOre.java b/src/main/java/bartworks/system/material/BWTileEntityMetaGeneratedSmallOre.java index 8764c7891e..737b486cf9 100644 --- a/src/main/java/bartworks/system/material/BWTileEntityMetaGeneratedSmallOre.java +++ b/src/main/java/bartworks/system/material/BWTileEntityMetaGeneratedSmallOre.java @@ -90,7 +90,7 @@ public class BWTileEntityMetaGeneratedSmallOre extends BWTileEntityMetaGenerated tSelector.add(tStack); } } - if (tSelector.size() > 0) { + if (!tSelector.isEmpty()) { int i = 0; for (int j = Math.max(1, aFortune > 0 ? tRandom.nextInt(1 + aFortune) : 0); i < j; ++i) { diff --git a/src/main/java/bartworks/system/material/Werkstoff.java b/src/main/java/bartworks/system/material/Werkstoff.java index d9b6b4503c..5ae7136934 100644 --- a/src/main/java/bartworks/system/material/Werkstoff.java +++ b/src/main/java/bartworks/system/material/Werkstoff.java @@ -278,7 +278,7 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { this.mID = (short) mID; this.defaultName = defaultName; // Ensure that localization key are written to the lang file - GregTechAPI.sAfterGTPreload.add(() -> { this.getLocalizedName(); }); + GregTechAPI.sAfterGTPreload.add(() -> this.getLocalizedName()); this.stats = stats; this.type = type; this.generationFeatures = generationFeatures; @@ -316,7 +316,7 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { // this.toolTip = "The formula is to long..."; // Ensure that localization key are written to the lang file - GregTechAPI.sAfterGTPreload.add(() -> { this.getLocalizedToolTip(); }); + GregTechAPI.sAfterGTPreload.add(() -> this.getLocalizedToolTip()); if (this.stats.protons == 0) { long tmpprotons = 0; @@ -427,13 +427,12 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { public List getGTWrappedTCAspects() { final List ret = new ArrayList<>(); Arrays.stream(this.getTCAspects()) - .forEach(objectIntegerPair -> { - new TCAspects.TC_AspectStack( + .forEach( + objectIntegerPair -> new TCAspects.TC_AspectStack( TCAspects.valueOf( ((Aspect) objectIntegerPair.getKey()).getName() .toUpperCase(Locale.US)), - objectIntegerPair.getValue()).addToAspectList(ret); - }); + objectIntegerPair.getValue()).addToAspectList(ret)); return ret; } @@ -476,7 +475,7 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { } public ISubTagContainer getOreByProductRaw(int aNumber) { - if (this.mOreByProducts.size() == 0) return null; + if (this.mOreByProducts.isEmpty()) return null; if (aNumber < 0) aNumber = this.mOreByProducts.size() + aNumber; while (aNumber >= this.mOreByProducts.size()) aNumber--; ISubTagContainer o = this.mOreByProducts.get(aNumber); @@ -485,7 +484,7 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer { } public ItemStack getOreByProduct(int aNumber, OrePrefixes prefixes) { - if (this.mOreByProducts.size() == 0) return null; + if (this.mOreByProducts.isEmpty()) return null; if (aNumber < 0) aNumber = this.mOreByProducts.size() + aNumber; while (aNumber >= this.mOreByProducts.size()) aNumber--; Object o = this.mOreByProducts.get(aNumber); diff --git a/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java b/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java index e3504a4e9c..1d0c6fa140 100644 --- a/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java +++ b/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java @@ -1030,7 +1030,6 @@ public class PlatinumSludgeOverHaul { PlatinumSludgeOverHaul.runHelperrecipes(); } - @SuppressWarnings("deprecation") private static void replaceHVCircuitMaterials() { GTValues.RA.stdBuilder() .itemInputs(Materials.Redstone.getDust(1), Materials.Electrum.getDust(1), GTUtility.getIntegratedCircuit(1)) diff --git a/src/main/java/bartworks/system/material/processingLoaders/AdditionalRecipes.java b/src/main/java/bartworks/system/material/processingLoaders/AdditionalRecipes.java index ab331d2ba6..d103312e55 100644 --- a/src/main/java/bartworks/system/material/processingLoaders/AdditionalRecipes.java +++ b/src/main/java/bartworks/system/material/processingLoaders/AdditionalRecipes.java @@ -274,7 +274,6 @@ public class AdditionalRecipes { .addTo(BartWorksRecipeMaps.acidGenFuels); } - @SuppressWarnings("deprecation") public static void run() { runBWRecipes(); diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java index 32aa00bd41..5b24b1e6ee 100644 --- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java +++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java @@ -166,7 +166,7 @@ public class CellLoader implements IWerkstoffRunnable { null, null, new FluidStack[] { null }, - new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null }, + new FluidStack[] { !flOutputs.isEmpty() ? flOutputs.get(0) : null }, (int) Math.max( 1L, Math.abs( @@ -192,7 +192,7 @@ public class CellLoader implements IWerkstoffRunnable { null, null, new FluidStack[] { null }, - new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null }, + new FluidStack[] { !flOutputs.isEmpty() ? flOutputs.get(0) : null }, (int) Math.max( 1L, Math.abs( diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java index bcc5d422b0..04db75e0d3 100644 --- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java +++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java @@ -190,7 +190,7 @@ public class DustLoader implements IWerkstoffRunnable { null, null, new FluidStack[] { null }, - new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null }, + new FluidStack[] { !flOutputs.isEmpty() ? flOutputs.get(0) : null }, (int) Math.max( 1L, Math.abs( @@ -215,7 +215,7 @@ public class DustLoader implements IWerkstoffRunnable { null, null, new FluidStack[] { null }, - new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null }, + new FluidStack[] { !flOutputs.isEmpty() ? flOutputs.get(0) : null }, (int) Math.max( 1L, Math.abs( @@ -266,7 +266,7 @@ public class DustLoader implements IWerkstoffRunnable { new ItemStack[] { input }, null, null, - new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null }, + new FluidStack[] { !flOutputs.isEmpty() ? flOutputs.get(0) : null }, null, (int) Math.max( 1L, diff --git a/src/main/java/bartworks/system/oregen/BWOreLayer.java b/src/main/java/bartworks/system/oregen/BWOreLayer.java index 5f9688e68c..80cca68d3a 100644 --- a/src/main/java/bartworks/system/oregen/BWOreLayer.java +++ b/src/main/java/bartworks/system/oregen/BWOreLayer.java @@ -173,12 +173,10 @@ public abstract class BWOreLayer extends GTWorldgen { } private boolean shouldPlace(Random aRandom, int cX, int eX, int tX, int cZ, int eZ, int tZ) { - if (aRandom.nextInt( + return aRandom.nextInt( Math.max(1, Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) / this.mDensity)) == 0 || aRandom.nextInt( - Math.max(1, Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) / this.mDensity)) == 0) - return true; - return false; + Math.max(1, Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) / this.mDensity)) == 0; } public boolean setOreBlock(World aWorld,