From fbdbb388c369fae549cfde3eed38b536f7461d90 Mon Sep 17 00:00:00 2001 From: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Date: Wed, 18 Oct 2023 17:03:23 +0100 Subject: Cleaning up (#767) * Kill playerAPI * Gut more events and compat that is now obsolete * Remove commented out code * Remove final modifier from methods * Make more stuff final * Remove slow building ring * Protected -> private in final classes * More cleaning * More cleaning v2 * Purging * Clean DevHelper * Clean DevHelper 2 * delete DevHelper * remove useless IFMLLoadingPlugin.MCVersion annotation from @Mod files * check for obfuscation only once in the IFMLloadingPlugin.injectData * don't instantiate the static class ASMConfig * delete unused and empty implementation of IFMLCallHook * delete empty class * delete ClassesToTransform class that just holds the class names constants * delete unused methods and unsless logging in dummymod container * delete unused transformer ClassTransformer_TT_ThaumicRestorer * spotless * Clean * Clean utils * Build checkpoint * Purge * Stage 2 * Stage 3 * Stage 4 * Stage 5 * Stage 6 * Spotless * Imports * Stage idk * Stage 1 * Fix issue * Spotless * Format numbers --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Co-authored-by: Connor Colenso --- src/main/java/gregtech/api/enums/TAE.java | 6 +- .../java/gregtech/api/util/FishPondFakeRecipe.java | 14 +- .../java/gregtech/api/util/GasSpargingRecipe.java | 5 +- .../gregtech/api/util/GasSpargingRecipeMap.java | 2 +- .../gregtech/api/util/SemiFluidFuelHandler.java | 4 +- src/main/java/gtPlusPlus/GTplusplus.java | 58 +- src/main/java/gtPlusPlus/GenerateDictionaries.java | 167 - .../gtPlusPlus/api/interfaces/ITileTooltip.java | 2 +- .../api/interfaces/RunnableWithInfo.java | 5 +- src/main/java/gtPlusPlus/api/objects/Logger.java | 2 +- .../java/gtPlusPlus/api/objects/data/AutoMap.java | 24 +- .../java/gtPlusPlus/api/objects/data/Quad.java | 2 +- .../gtPlusPlus/api/objects/data/TypeCounter.java | 6 +- .../api/objects/data/WeightedCollection.java | 2 +- .../api/objects/data/weakref/WeakAutoMap.java | 2 +- .../gtPlusPlus/api/objects/minecraft/BlockPos.java | 9 +- .../api/objects/minecraft/ItemPackage.java | 2 +- .../api/objects/minecraft/SafeTexture.java | 8 +- .../api/objects/minecraft/ShapedRecipe.java | 13 +- .../java/gtPlusPlus/api/plugin/Sample_Plugin.java | 46 - src/main/java/gtPlusPlus/core/block/ModBlocks.java | 4 - .../gtPlusPlus/core/block/base/BasicBlock.java | 19 +- .../core/block/base/BasicTileBlockWithTooltip.java | 34 +- .../gtPlusPlus/core/block/base/BlockBaseFluid.java | 22 +- .../core/block/base/BlockBaseModular.java | 20 +- .../gtPlusPlus/core/block/base/BlockBaseOre.java | 2 +- .../core/block/general/BlockSuperLight.java | 38 +- .../core/block/general/MiningExplosives.java | 3 +- .../block/general/antigrief/BlockWitherProof.java | 4 - .../core/block/machine/CircuitProgrammer.java | 2 +- .../core/block/machine/Machine_RoundRobinator.java | 128 - .../core/block/machine/Machine_SuperJukebox.java | 5 +- .../core/block/machine/VolumetricFlaskSetter.java | 5 +- .../core/chunkloading/GTPP_ChunkManager.java | 110 - .../core/client/model/ModelSickBlaze.java | 4 +- .../client/renderer/CustomOreBlockRenderer.java | 36 +- .../core/commands/CommandDebugChunks.java | 141 - .../commands/CommandEnableDebugWhileRunning.java | 15 +- .../java/gtPlusPlus/core/commands/CommandMath.java | 2 - .../java/gtPlusPlus/core/common/BasePlayer.java | 211 - .../java/gtPlusPlus/core/common/CommonProxy.java | 67 +- .../core/common/compat/COMPAT_Baubles.java | 6 - .../core/common/compat/COMPAT_ExtraUtils.java | 2 +- .../core/common/compat/COMPAT_HarvestCraft.java | 2 +- .../gtPlusPlus/core/common/compat/COMPAT_IC2.java | 2 +- .../core/common/compat/COMPAT_PlayerAPI.java | 38 - .../core/common/compat/COMPAT_Thaumcraft.java | 2 +- .../core/common/compat/COMPAT_Witchery.java | 2 +- .../java/gtPlusPlus/core/config/ConfigHandler.java | 112 +- .../core/container/Container_ProjectTable.java | 2 - .../core/container/Container_RoundRobinator.java | 241 - .../core/container/Container_SuperJukebox.java | 27 +- .../container/Container_VolumetricFlaskSetter.java | 11 +- .../core/entity/InternalEntityRegistry.java | 41 - .../core/entity/monster/EntitySickBlaze.java | 9 +- .../projectile/EntityHydrofluoricAcidPotion.java | 141 - .../projectile/EntitySulfuricAcidPotion.java | 130 - .../entity/projectile/EntityThrowableBomb.java | 314 - .../core/entity/projectile/EntityToxinball.java | 4 +- .../entity/projectile/EntityToxinballSmall.java | 23 +- .../gtPlusPlus/core/gui/beta/Gui_ID_Registry.java | 14 +- .../core/gui/machine/GUI_DecayablesChest.java | 3 - .../core/gui/machine/GUI_ProjectTable.java | 3 - .../core/gui/machine/GUI_RoundRobinator.java | 125 - .../core/gui/machine/GUI_SuperJukebox.java | 2 +- .../gui/machine/GUI_VolumetricFlaskSetter.java | 34 +- .../gtPlusPlus/core/gui/widget/GuiValueField.java | 20 +- .../java/gtPlusPlus/core/handler/BookHandler.java | 553 +- .../gtPlusPlus/core/handler/COMPAT_HANDLER.java | 14 +- .../core/handler/COMPAT_IntermodStaging.java | 3 - .../java/gtPlusPlus/core/handler/GuiHandler.java | 9 +- .../java/gtPlusPlus/core/handler/MobMentality.java | 61 - .../gtPlusPlus/core/handler/PacketHandler.java | 4 +- .../core/handler/Recipes/DecayableRecipe.java | 5 +- .../handler/Recipes/LateRegistrationHandler.java | 2 +- .../core/handler/Recipes/RegistrationHandler.java | 4 +- .../core/handler/events/CustomMovementHandler.java | 2 - .../core/handler/events/EntityDeathHandler.java | 20 +- .../handler/events/GeneralTooltipEventHandler.java | 1 + .../core/handler/events/LoginEventHandler.java | 104 - .../events/PickaxeBlockBreakEventHandler.java | 20 - .../handler/events/PlayerSleepEventHandler.java | 8 +- .../core/handler/events/SneakManager.java | 2 +- .../workbench/Workbench_CraftingHandler.java | 17 +- .../core/inventories/Inventory_RoundRobinator.java | 154 - src/main/java/gtPlusPlus/core/item/ModItems.java | 62 +- .../core/item/base/BaseItemBurnable.java | 2 +- .../core/item/base/BaseItemComponent.java | 10 +- .../java/gtPlusPlus/core/item/base/CoreItem.java | 2 - .../core/item/base/cell/BaseItemCell.java | 2 - .../core/item/base/dusts/BaseItemDustUnique.java | 2 +- .../core/item/base/ingots/BaseItemIngotHot.java | 2 - .../core/item/base/itemblock/ItemBlockGtBlock.java | 10 +- .../core/item/base/itemblock/ItemBlockMeta.java | 5 +- .../core/item/base/itemblock/ItemBlockOre.java | 6 +- .../base/itemblock/ItemBlockRoundRobinator.java | 105 - .../core/item/base/misc/BaseItemMisc.java | 6 +- .../core/item/base/misc/BaseItemParticle.java | 2 +- .../core/item/base/ore/BaseOreComponent.java | 10 +- .../gtPlusPlus/core/item/bauble/BaseBauble.java | 5 +- .../core/item/bauble/ElectricBaseBauble.java | 10 +- .../core/item/bauble/FireProtectionBauble.java | 14 +- .../core/item/chemistry/AgriculturalChem.java | 33 +- .../gtPlusPlus/core/item/chemistry/CoalTar.java | 4 - .../core/item/chemistry/GenericChem.java | 18 +- .../core/item/chemistry/IonParticles.java | 4 +- .../core/item/chemistry/MilledOreProcessing.java | 28 +- .../core/item/chemistry/RocketFuels.java | 6 +- .../core/item/chemistry/StandardBaseParticles.java | 4 +- .../core/item/crafting/ItemDummyResearch.java | 6 +- .../core/item/food/BaseItemMetaFood.java | 40 +- .../core/item/general/ItemBlueprint.java | 27 +- .../core/item/general/ItemCloakingDevice.java | 31 +- .../core/item/general/ItemGenericToken.java | 12 +- .../core/item/general/ItemHealingDevice.java | 70 +- .../core/item/general/ItemLavaFilter.java | 2 +- .../core/item/general/ItemMagicFeather.java | 6 +- .../core/item/general/ItemSlowBuildingRing.java | 136 - .../item/general/spawn/ItemCustomSpawnEgg.java | 35 +- .../throwables/ItemHydrofluoricAcidPotion.java | 40 - .../general/throwables/ItemSulfuricAcidPotion.java | 40 - .../item/general/throwables/ItemThrowableBomb.java | 129 - .../core/item/tool/misc/DebugScanner.java | 9 +- .../core/item/tool/misc/GregtechPump.java | 14 +- .../core/item/tool/staballoy/StaballoySpade.java | 45 +- src/main/java/gtPlusPlus/core/lib/CORE.java | 6 +- .../java/gtPlusPlus/core/material/Material.java | 61 +- .../core/material/MaterialGenerator.java | 6 +- .../java/gtPlusPlus/core/material/Particle.java | 2 +- .../core/material/state/MaterialState.java | 2 +- .../java/gtPlusPlus/core/proxy/ClientProxy.java | 58 +- .../core/recipe/LOADER_Machine_Components.java | 31 +- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 96 +- .../gtPlusPlus/core/recipe/RECIPES_General.java | 29 - .../core/recipe/RECIPES_MachineComponents.java | 184 - .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 419 +- .../java/gtPlusPlus/core/recipe/common/CI.java | 205 +- .../core/tileentities/ModTileEntities.java | 4 - .../core/tileentities/base/TileEntityBase.java | 2 +- .../general/TileEntityCircuitProgrammer.java | 2 +- .../general/TileEntityDecayablesChest.java | 5 +- .../general/TileEntityPlayerDoorBase.java | 281 - .../general/TileEntityVolumetricFlaskSetter.java | 40 +- .../machines/TileEntityAdvPooCollector.java | 2 +- .../machines/TileEntityPestKiller.java | 20 +- .../machines/TileEntityPooCollector.java | 2 +- .../machines/TileEntityProjectTable.java | 6 - .../machines/TileEntityRoundRobinator.java | 687 -- src/main/java/gtPlusPlus/core/util/Utils.java | 541 +- src/main/java/gtPlusPlus/core/util/data/AES.java | 37 +- .../java/gtPlusPlus/core/util/data/ArrayUtils.java | 60 +- .../java/gtPlusPlus/core/util/data/FileUtils.java | 8 +- .../gtPlusPlus/core/util/data/LocaleUtils.java | 18 +- .../gtPlusPlus/core/util/data/StringUtils.java | 79 +- .../java/gtPlusPlus/core/util/math/MathUtils.java | 250 +- .../core/util/minecraft/EnchantingUtils.java | 63 +- .../core/util/minecraft/EntityUtils.java | 160 +- .../gtPlusPlus/core/util/minecraft/FluidUtils.java | 91 +- .../core/util/minecraft/InventoryUtils.java | 40 +- .../gtPlusPlus/core/util/minecraft/ItemUtils.java | 286 +- .../gtPlusPlus/core/util/minecraft/LangUtils.java | 28 +- .../core/util/minecraft/MaterialUtils.java | 142 +- .../core/util/minecraft/MiningUtils.java | 92 +- .../core/util/minecraft/ModularArmourUtils.java | 136 +- .../gtPlusPlus/core/util/minecraft/NBTUtils.java | 396 +- .../core/util/minecraft/PlayerUtils.java | 13 +- .../core/util/minecraft/RecipeUtils.java | 373 +- .../core/util/minecraft/ShapelessUtils.java | 1 - .../util/minecraft/gregtech/PollutionUtils.java | 63 +- .../particles/EntityParticleFXMysterious.java | 15 - .../gtPlusPlus/core/util/player/PlayerCache.java | 43 +- .../core/util/reflect/ReflectionUtils.java | 16 +- .../core/world/damage/BaseCustomDamageSource.java | 20 - .../core/world/explosions/MiningExplosion.java | 3 +- .../everglades/GTplusplus_Everglades.java | 2 - .../everglades/biome/BiomeGenerator_Custom.java | 1 - .../everglades/biome/Biome_Everglades.java | 45 - .../everglades/biome/GenLayerBiomes.java | 5 - .../block/BlockDarkWorldSludgeFluid.java | 4 +- .../everglades/block/BlockEvergladesPortal.java | 3 +- .../everglades/chunk/ChunkProviderModded.java | 2 - .../gtPlusPlus/everglades/gen/gt/WorldGen_GT.java | 4 +- .../everglades/gen/gt/WorldGen_GT_Base.java | 37 +- .../everglades/gen/gt/WorldGen_GT_Ore_Layer.java | 19 +- .../everglades/gen/gt/WorldGen_Ores.java | 3 +- .../everglades/world/TeleporterDimensionMod.java | 4 +- .../gtPlusPlus/nei/DecayableRecipeHandler.java | 4 +- .../java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java | 9 +- .../gtPlusPlus/nei/handlers/NeiTextureHandler.java | 45 +- .../plugin/agrichem/AlgaeDefinition.java | 28 +- .../gtPlusPlus/plugin/agrichem/BioRecipes.java | 34 +- .../gtPlusPlus/plugin/agrichem/IAlgalItem.java | 4 +- .../plugin/agrichem/item/algae/ItemAlgaeBase.java | 3 +- .../plugin/agrichem/logic/AlgaeGeneticData.java | 4 +- .../plugin/fixes/interfaces/IBugFix.java | 2 +- .../plugin/fixes/vanilla/VanillaBedHeightFix.java | 36 +- .../plugin/fixes/vanilla/music/MusicTocker.java | 4 +- .../gtPlusPlus/plugin/manager/Core_Manager.java | 20 +- .../java/gtPlusPlus/preloader/CORE_Preloader.java | 2 +- .../java/gtPlusPlus/preloader/ChunkDebugger.java | 61 - src/main/java/gtPlusPlus/preloader/DevHelper.java | 7317 -------------------- .../gtPlusPlus/preloader/Preloader_Logger.java | 10 +- .../java/gtPlusPlus/preloader/asm/AsmConfig.java | 13 +- .../preloader/asm/ClassesToTransform.java | 37 - .../preloader/asm/Preloader_DummyContainer.java | 53 +- .../preloader/asm/Preloader_FMLLoadingPlugin.java | 49 +- .../preloader/asm/Preloader_SetupClass.java | 18 - ...ClassTransformer_COFH_OreDictionaryArbiter.java | 22 +- .../ClassTransformer_Forge_ChunkLoading.java | 2106 +++--- .../ClassTransformer_LWJGL_Keyboard.java | 8 +- .../ClassTransformer_TC_ItemWispEssence.java | 10 +- .../ClassTransformer_TT_ThaumicRestorer.java | 769 -- .../transformers/Preloader_ClassTransformer2.java | 14 - .../Preloader_Transformer_Handler.java | 138 +- .../preloader/keyboard/BetterKeyboard.java | 131 - .../java/gtPlusPlus/recipes/RecipeRemovals.java | 16 +- .../xmod/bartcrops/LoaderOfTheCrops.java | 26 +- .../bartcrops/abstracts/BaseAestheticCrop.java | 22 +- .../xmod/bartcrops/abstracts/BaseCrop.java | 2 +- .../bartcrops/abstracts/BaseHarvestableCrop.java | 22 +- .../xmod/bop/blocks/base/LeavesBase.java | 8 +- .../gtPlusPlus/xmod/bop/blocks/base/LogBase.java | 2 +- .../xmod/bop/blocks/base/SaplingBase.java | 27 +- .../java/gtPlusPlus/xmod/forestry/HANDLER_FR.java | 38 - .../xmod/forestry/bees/custom/CustomCombs.java | 8 +- .../xmod/forestry/bees/handler/GTPP_CombType.java | 12 +- .../xmod/forestry/bees/handler/GTPP_DropType.java | 10 +- .../forestry/bees/handler/GTPP_PollenType.java | 10 +- .../forestry/bees/handler/GTPP_PropolisType.java | 10 +- .../xmod/forestry/bees/items/FR_ItemRegistry.java | 3 - .../xmod/forestry/bees/items/FR_StringUtil.java | 6 - .../forestry/bees/registry/GTPP_BeeDefinition.java | 114 +- .../xmod/forestry/bees/registry/GTPP_Bees.java | 10 +- .../bees/registry/GTPP_BranchDefinition.java | 2 +- .../java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java | 4 - .../xmod/gregtech/api/enums/GregtechItemList.java | 71 +- .../gregtech/api/enums/GregtechOrePrefixes.java | 27 +- .../gregtech/api/items/Gregtech_MetaItem_Base.java | 9 +- .../xmod/gregtech/api/items/Gregtech_MetaTool.java | 5 +- ...etaTileEntity_Hatch_ElementalDataOrbHolder.java | 2 +- .../GT_MetaTileEntity_Hatch_InputBattery.java | 22 +- .../GT_MetaTileEntity_Hatch_Muffler_Adv.java | 5 +- .../GT_MetaTileEntity_Hatch_OutputBattery.java | 3 +- .../GT_MetaTileEntity_Hatch_Turbine.java | 5 +- .../GT_MetaTileEntity_Hatch_TurbineProvider.java | 13 +- .../base/GregtechMetaTransformerHiAmp.java | 4 +- .../base/GregtechMeta_MultiBlockBase.java | 28 +- .../base/GregtechMeta_SteamMultiBase.java | 14 +- .../GregtechRocketFuelGeneratorBase.java | 4 - .../GT_MetaTileEntity_Hatch_Catalysts.java | 2 +- .../GT_MetaTileEntity_Hatch_MillingBalls.java | 2 +- .../GT_MetaTileEntity_Hatch_NbtConsumable.java | 31 +- .../gregtech/api/objects/GregtechItemData.java | 20 +- .../api/util/SpecialBehaviourTooltipHandler.java | 2 +- .../common/blocks/GregtechMetaCasingBlocks3.java | 2 +- .../common/blocks/GregtechMetaCasingBlocks5.java | 48 +- .../GregtechMetaCasingBlocksPipeGearbox.java | 22 +- .../blocks/GregtechMetaSpecialMachineCasings.java | 18 +- .../blocks/GregtechMetaSpecialMultiCasings.java | 54 +- .../blocks/GregtechMetaSpecialMultiCasings2.java | 30 +- .../blocks/GregtechMetaTieredCasingBlocks1.java | 26 +- .../blocks/textures/CasingTextureHandler.java | 56 +- .../blocks/textures/CasingTextureHandler2.java | 51 +- .../blocks/textures/CasingTextureHandler3.java | 68 +- .../blocks/textures/CasingTextureHandler6.java | 17 +- .../textures/TexturesCentrifugeMultiblock.java | 15 +- .../blocks/textures/TexturesGrinderMultiblock.java | 15 +- .../common/blocks/textures/TexturesGtBlock.java | 4 +- .../common/blocks/textures/TexturesGtTools.java | 4 +- .../common/covers/GTPP_Cover_Overflow.java | 6 +- .../common/covers/GTPP_Cover_ToggleVisual.java | 6 +- .../gregtech/common/helpers/ChargingHelper.java | 3 +- .../common/helpers/FlotationRecipeHandler.java | 4 +- .../gregtech/common/helpers/TreeFarmHelper.java | 13 +- .../common/helpers/tesseract/TesseractHelper.java | 34 +- .../gregtech/common/items/MetaCustomCoverItem.java | 2 +- .../common/items/MetaGeneratedGregtechItems.java | 391 +- .../common/items/MetaGeneratedGregtechTools.java | 44 +- .../items/behaviours/Behaviour_Choocher.java | 3 +- .../behaviours/Behaviour_Electric_Lighter.java | 11 +- .../gregtech/common/render/GTPP_CapeRenderer.java | 69 +- .../common/render/GTPP_Render_MachineBlock.java | 36 +- .../GT_MetaTileEntity_ElectricAutoWorkbench.java | 62 +- ...GT_MetaTileEntity_ElectricInventoryManager.java | 686 -- .../GT_MetaTileEntity_TesseractGenerator.java | 15 +- .../GT_MetaTileEntity_TesseractTerminal.java | 15 +- .../generators/GT_MetaTileEntity_Boiler_Base.java | 2 - .../generators/GregtechMetaTileEntity_RTG.java | 26 +- .../ULV/GT_MetaTileEntity_ULV_GasTurbine.java | 65 - .../basic/GT_MetaTileEntity_CropHarvestor.java | 45 +- .../GregtechMetaAtmosphericReconditioner.java | 47 +- .../machines/basic/GregtechMetaCondensor.java | 230 - .../basic/GregtechMetaPollutionCreator.java | 10 +- .../basic/GregtechMetaPollutionDetector.java | 19 +- .../basic/GregtechMetaTileEntityChunkLoader.java | 440 -- .../basic/GregtechMetaWirelessCharger.java | 4 +- ...regtechMetaTileEntity_IndustrialArcFurnace.java | 3 +- ...echMetaTileEntity_IndustrialCuttingMachine.java | 3 +- ...regtechMetaTileEntity_IndustrialDehydrator.java | 3 +- ...GregtechMetaTileEntity_IndustrialMacerator.java | 15 +- ...gtechMetaTileEntity_IndustrialMultiMachine.java | 2 +- ...regtechMetaTileEntity_IndustrialPlatePress.java | 3 +- .../processing/GregtechMetaTileEntity_IsaMill.java | 20 +- ...hMetaTileEntity_NuclearSaltProcessingPlant.java | 4 +- .../GregtechMetaTileEntity_SpargeTower.java | 4 +- ...egtechMetaTileEntity_Adv_DistillationTower.java | 16 +- .../GregtechMTE_ElementalDuplicator.java | 5 +- .../production/GregtechMetaTileEntityTreeFarm.java | 16 +- ...egtechMetaTileEntity_IndustrialFishingPond.java | 10 +- .../GregtechMetaTileEntity_LargeRocketEngine.java | 4 +- .../GregtechMetaTileEntity_SolarTower.java | 29 +- .../chemplant/GregtechMTE_ChemicalPlant.java | 10 +- .../turbines/GT_MTE_LargeTurbine_Gas.java | 5 - .../turbines/GT_MTE_LargeTurbine_Plasma.java | 2 +- .../GregtechMetaTileEntity_LargerTurbineBase.java | 112 +- ...chMetaTileEntity_PowerSubStationController.java | 41 +- .../GT_MetaTileEntity_RedstoneButtonPanel.java | 73 +- .../GT_MetaTileEntity_RedstoneCircuitBlock.java | 6 +- .../GT_MetaTileEntity_AdvancedCraftingTable.java | 693 -- .../GT_MetaTileEntity_BronzeCraftingTable.java | 117 - .../storage/GT_MetaTileEntity_TieredTank.java | 13 +- .../tools/TOOL_Gregtech_ElectricButcherKnife.java | 187 - .../tools/TOOL_Gregtech_ElectricLighter.java | 165 - .../gregtech/loaders/ProcessingAngleGrinder.java | 4 +- .../loaders/ProcessingElectricButcherKnife.java | 142 - .../loaders/ProcessingElectricLighter.java | 139 - .../gregtech/loaders/ProcessingElectricSnips.java | 4 +- .../gregtech/loaders/RecipeGen_AlloySmelter.java | 2 +- .../xmod/gregtech/loaders/RecipeGen_Assembler.java | 2 +- .../gregtech/loaders/RecipeGen_BlastSmelter.java | 2 +- .../loaders/RecipeGen_BlastSmelterGT_GTNH.java | 6 +- .../gregtech/loaders/RecipeGen_DustGeneration.java | 4 +- .../xmod/gregtech/loaders/RecipeGen_Extruder.java | 2 +- .../gregtech/loaders/RecipeGen_FluidCanning.java | 10 +- .../xmod/gregtech/loaders/RecipeGen_Fluids.java | 2 +- .../xmod/gregtech/loaders/RecipeGen_Fluorite.java | 2 +- .../loaders/RecipeGen_MaterialProcessing.java | 6 +- .../gregtech/loaders/RecipeGen_MetalRecipe.java | 2 +- .../xmod/gregtech/loaders/RecipeGen_Ore.java | 10 +- .../xmod/gregtech/loaders/RecipeGen_Plasma.java | 2 +- .../xmod/gregtech/loaders/RecipeGen_Plates.java | 2 +- .../xmod/gregtech/loaders/RecipeGen_Recycling.java | 8 +- .../gregtech/loaders/RecipeGen_ShapedCrafting.java | 2 +- .../loaders/recipe/RecipeLoader_AlgaeFarm.java | 10 +- .../gregtech/loaders/recipe/RecipeLoader_LFTR.java | 6 +- .../recipe/RecipeLoader_MolecularTransformer.java | 3 +- .../registration/gregtech/Gregtech4Content.java | 69 - .../gregtech/GregtechBufferDynamos.java | 2 +- .../registration/gregtech/GregtechConduits.java | 7 +- .../gregtech/GregtechCustomHatches.java | 24 +- .../gregtech/GregtechGeneratorsULV.java | 52 - .../gregtech/GregtechPollutionDevices.java | 6 - .../gregtech/GregtechSteamCondenser.java | 22 - .../registration/gregtech/GregtechSuperChests.java | 8 - .../gregtech/GregtechTieredChunkloaders.java | 26 - .../gregtech/GregtechWirelessChargers.java | 2 +- .../java/gtPlusPlus/xmod/ic2/item/IC2_Items.java | 3 - .../java/gtPlusPlus/xmod/ob/GliderHandler.java | 126 - .../gtPlusPlus/xmod/ob/HANDLER_OpenBlocks.java | 20 - .../thaumcraft/commands/CommandDumpAspects.java | 5 +- .../thaumcraft/objects/ThreadAspectScanner.java | 11 +- .../gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java | 8 +- .../xmod/tinkers/material/BaseTinkersMaterial.java | 45 +- .../xmod/tinkers/util/TinkersDryingRecipe.java | 2 +- .../gtPlusPlus/xmod/tinkers/util/TinkersUtils.java | 220 +- 365 files changed, 3454 insertions(+), 23218 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/GenerateDictionaries.java delete mode 100644 src/main/java/gtPlusPlus/api/plugin/Sample_Plugin.java delete mode 100644 src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java delete mode 100644 src/main/java/gtPlusPlus/core/chunkloading/GTPP_ChunkManager.java delete mode 100644 src/main/java/gtPlusPlus/core/commands/CommandDebugChunks.java delete mode 100644 src/main/java/gtPlusPlus/core/common/BasePlayer.java delete mode 100644 src/main/java/gtPlusPlus/core/common/compat/COMPAT_PlayerAPI.java delete mode 100644 src/main/java/gtPlusPlus/core/container/Container_RoundRobinator.java delete mode 100644 src/main/java/gtPlusPlus/core/entity/projectile/EntityHydrofluoricAcidPotion.java delete mode 100644 src/main/java/gtPlusPlus/core/entity/projectile/EntitySulfuricAcidPotion.java delete mode 100644 src/main/java/gtPlusPlus/core/entity/projectile/EntityThrowableBomb.java delete mode 100644 src/main/java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java delete mode 100644 src/main/java/gtPlusPlus/core/handler/MobMentality.java delete mode 100644 src/main/java/gtPlusPlus/core/handler/events/LoginEventHandler.java delete mode 100644 src/main/java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java delete mode 100644 src/main/java/gtPlusPlus/core/inventories/Inventory_RoundRobinator.java delete mode 100644 src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java delete mode 100644 src/main/java/gtPlusPlus/core/tileentities/general/TileEntityPlayerDoorBase.java delete mode 100644 src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityRoundRobinator.java delete mode 100644 src/main/java/gtPlusPlus/core/util/minecraft/particles/EntityParticleFXMysterious.java delete mode 100644 src/main/java/gtPlusPlus/core/world/damage/BaseCustomDamageSource.java delete mode 100644 src/main/java/gtPlusPlus/preloader/ChunkDebugger.java delete mode 100644 src/main/java/gtPlusPlus/preloader/DevHelper.java delete mode 100644 src/main/java/gtPlusPlus/preloader/asm/ClassesToTransform.java delete mode 100644 src/main/java/gtPlusPlus/preloader/asm/Preloader_SetupClass.java delete mode 100644 src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java delete mode 100644 src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java delete mode 100644 src/main/java/gtPlusPlus/preloader/keyboard/BetterKeyboard.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_BronzeCraftingTable.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ob/GliderHandler.java delete mode 100644 src/main/java/gtPlusPlus/xmod/ob/HANDLER_OpenBlocks.java (limited to 'src/main/java') diff --git a/src/main/java/gregtech/api/enums/TAE.java b/src/main/java/gregtech/api/enums/TAE.java index de4f9d6d77..73a18dc771 100644 --- a/src/main/java/gregtech/api/enums/TAE.java +++ b/src/main/java/gregtech/api/enums/TAE.java @@ -19,8 +19,8 @@ public class TAE { public static int gtPPLastUsedIndex = 64; public static int secondaryIndex = 0; - public static HashMap mTAE = new HashMap(); - private static final HashSet mFreeSlots = new HashSet(64); + public static HashMap mTAE = new HashMap<>(); + private static final HashSet mFreeSlots = new HashSet<>(64); static { for (int i = 64; i < 128; i++) { @@ -55,7 +55,7 @@ public class TAE { public static void finalizeTAE() { String aFreeSpaces = ""; String aPageAndSlotFree = ""; - AutoMap aTemp = new AutoMap(mFreeSlots); + AutoMap aTemp = new AutoMap<>(mFreeSlots); for (int i = 0; i < mFreeSlots.size(); i++) { int j = aTemp.get(i); aFreeSpaces += j; diff --git a/src/main/java/gregtech/api/util/FishPondFakeRecipe.java b/src/main/java/gregtech/api/util/FishPondFakeRecipe.java index 57e210a8f2..e6b754deb7 100644 --- a/src/main/java/gregtech/api/util/FishPondFakeRecipe.java +++ b/src/main/java/gregtech/api/util/FishPondFakeRecipe.java @@ -15,9 +15,9 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils; public class FishPondFakeRecipe { - public static ArrayList fish = new ArrayList(); - public static ArrayList junk = new ArrayList(); - public static ArrayList treasure = new ArrayList(); + public static ArrayList fish = new ArrayList<>(); + public static ArrayList junk = new ArrayList<>(); + public static ArrayList treasure = new ArrayList<>(); @SuppressWarnings("unchecked") public static boolean generateFishPondRecipes() { @@ -32,16 +32,16 @@ public class FishPondFakeRecipe { e.printStackTrace(); } - AutoMap> mega = new AutoMap>(); + AutoMap> mega = new AutoMap<>(); mega.put(fish); mega.put(junk); mega.put(treasure); int mType = 14; for (ArrayList f : mega.values()) { - for (int e = 0; e < f.size(); e++) { - if (f.get(e) != null) { - WeightedRandomFishable u = f.get(e); + for (WeightedRandomFishable weightedRandomFishable : f) { + if (weightedRandomFishable != null) { + WeightedRandomFishable u = weightedRandomFishable; try { ItemStack t = (ItemStack) ReflectionUtils .getField(WeightedRandomFishable.class, "field_150711_b").get(u); diff --git a/src/main/java/gregtech/api/util/GasSpargingRecipe.java b/src/main/java/gregtech/api/util/GasSpargingRecipe.java index 55eb828e3e..9853b392be 100644 --- a/src/main/java/gregtech/api/util/GasSpargingRecipe.java +++ b/src/main/java/gregtech/api/util/GasSpargingRecipe.java @@ -34,8 +34,7 @@ public class GasSpargingRecipe implements Comparable { @Override public boolean equals(Object o) { - if (o instanceof GasSpargingRecipe) { - GasSpargingRecipe i = (GasSpargingRecipe) o; + if (o instanceof GasSpargingRecipe i) { if (this.mInputGas.equals(i.mInputGas) && this.mInputSpentFuel.equals(i.mInputSpentFuel)) { return true; } @@ -91,7 +90,7 @@ public class GasSpargingRecipe implements Comparable { } public String[] getRecipeInfo() { - AutoMap result = new AutoMap(); + AutoMap result = new AutoMap<>(); result.put("Input " + ItemUtils.getArrayStackNames(mFluidInputs)); result.put("Output " + ItemUtils.getArrayStackNames(mFluidOutputs)); result.put("Duration: " + mDuration); diff --git a/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java b/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java index 094ef5a08c..b078394f92 100644 --- a/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java +++ b/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java @@ -8,7 +8,7 @@ import gtPlusPlus.api.objects.data.AutoMap; public class GasSpargingRecipeMap extends AutoMap { - public static final AutoMap mRecipes = new AutoMap(); + public static final AutoMap mRecipes = new AutoMap<>(); public static final String mUnlocalizedName = "gtpp.recipe.lftr.sparging"; public static final String mNEIName = mUnlocalizedName; public static final String mNEIDisplayName = "LFTR Gas Sparging"; diff --git a/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java b/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java index 2a40cad100..c808a892dc 100644 --- a/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java +++ b/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java @@ -57,7 +57,7 @@ public class SemiFluidFuelHandler { final FluidStack aCreosote = FluidUtils.getFluidStack("creosote", 1000); final FluidStack aHeavyFuel = FluidUtils.getFluidStack("liquid_heavy_fuel", 1000); final FluidStack aHeavyOil = FluidUtils.getFluidStack("liquid_heavy_oil", 1000); - final HashMap> aFoundFluidsFromItems = new HashMap>(); + final HashMap> aFoundFluidsFromItems = new HashMap<>(); // Find Fluids From items for (final GT_Recipe r : gregtech.api.util.GT_Recipe.GT_Recipe_Map.sDenseLiquidFuels.mRecipeList) { @@ -67,7 +67,7 @@ public class SemiFluidFuelHandler { for (ItemStack i : g.mInputs) { FluidStack f = FluidContainerRegistry.getFluidForFilledItem(i); if (f != null) { - Pair aData = new Pair(f, g.mSpecialValue); + Pair aData = new Pair<>(f, g.mSpecialValue); aFoundFluidsFromItems.put(aData.hashCode(), aData); } } diff --git a/src/main/java/gtPlusPlus/GTplusplus.java b/src/main/java/gtPlusPlus/GTplusplus.java index d5d8f9b6ab..b9a1ce86b8 100644 --- a/src/main/java/gtPlusPlus/GTplusplus.java +++ b/src/main/java/gtPlusPlus/GTplusplus.java @@ -7,7 +7,6 @@ import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCapes; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.util.Collection; import java.util.HashMap; import net.minecraft.block.Block; @@ -26,32 +25,25 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.event.FMLServerStoppingEvent; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Materials; import gregtech.api.util.FishPondFakeRecipe; import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.api.util.SemiFluidFuelHandler; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.chunkloading.GTPP_ChunkManager; -import gtPlusPlus.core.commands.CommandDebugChunks; import gtPlusPlus.core.commands.CommandEnableDebugWhileRunning; import gtPlusPlus.core.commands.CommandMath; import gtPlusPlus.core.common.CommonProxy; import gtPlusPlus.core.config.ConfigHandler; import gtPlusPlus.core.handler.BookHandler; -import gtPlusPlus.core.handler.MobMentality; import gtPlusPlus.core.handler.PacketHandler; import gtPlusPlus.core.handler.Recipes.RegistrationHandler; -import gtPlusPlus.core.handler.events.LoginEventHandler; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.data.LocaleUtils; -import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.nei.NEI_IMC_Sender; import gtPlusPlus.plugin.manager.Core_Manager; import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; @@ -61,13 +53,11 @@ import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_BlastSmelterGT_GTNH; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_MultisUsingFluidInsteadOfCells; import gtPlusPlus.xmod.thaumcraft.commands.CommandDumpAspects; -@MCVersion(value = "1.7.10") @Mod( modid = Names.G_T_PLUS_PLUS, name = CORE.name, version = CORE.VERSION, dependencies = "required-after:Forge;" + " after:TConstruct;" - + " after:PlayerAPI;" + " after:dreamcraft;" + " after:IC2;" + " required-after:gregtech;" @@ -88,7 +78,7 @@ import gtPlusPlus.xmod.thaumcraft.commands.CommandDumpAspects; + " required-after:gtnhlib@[0.0.10,);") public class GTplusplus implements ActionListener { - public static enum INIT_PHASE { + public enum INIT_PHASE { SUPER(null), PRE_INIT(SUPER), @@ -97,10 +87,10 @@ public class GTplusplus implements ActionListener { SERVER_START(POST_INIT), STARTED(SERVER_START); - protected boolean mIsPhaseActive = false; + private boolean mIsPhaseActive = false; private final INIT_PHASE mPrev; - private INIT_PHASE(INIT_PHASE aPreviousPhase) { + INIT_PHASE(INIT_PHASE aPreviousPhase) { mPrev = aPreviousPhase; } @@ -163,7 +153,6 @@ public class GTplusplus implements ActionListener { } // Give this a go mate. - // initAnalytics(); setupMaterialBlacklist(); // Handle GT++ Config @@ -171,17 +160,11 @@ public class GTplusplus implements ActionListener { // Check for Dev CORE.DEVENV = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); - // Utils.LOG_INFO("User's Country: " + CORE.USER_COUNTRY); - - Utils.registerEvent(new LoginEventHandler()); - Utils.registerEvent(new MobMentality()); - Logger.INFO("Login Handler Initialized"); proxy.preInit(event); Logger.INFO("Setting up our own GT_Proxy."); Meta_GT_Proxy.preInit(); Core_Manager.preInit(); - GTPP_ChunkManager.init(); } // Init @@ -239,7 +222,6 @@ public class GTplusplus implements ActionListener { INIT_PHASE.SERVER_START.setPhaseActive(true); event.registerServerCommand(new CommandMath()); event.registerServerCommand(new CommandEnableDebugWhileRunning()); - event.registerServerCommand(new CommandDebugChunks()); if (Thaumcraft.isModLoaded()) { event.registerServerCommand(new CommandDumpAspects()); } @@ -271,13 +253,10 @@ public class GTplusplus implements ActionListener { protected void generateGregtechRecipeMaps() { - int[] mValidCount = new int[] { 0, 0, 0 }; int[] mInvalidCount = new int[] { 0, 0, 0, 0, 0, 0, 0 }; - int[] mOriginalCount = new int[] { 0, 0, 0 }; RecipeGen_BlastSmelterGT_GTNH.generateGTNHBlastSmelterRecipesFromEBFList(); FishPondFakeRecipe.generateFishPondRecipes(); - // GregtechMiniRaFusion.generateSlowFusionrecipes(); SemiFluidFuelHandler.generateFuels(); mInvalidCount[0] = RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells( @@ -303,22 +282,7 @@ public class GTplusplus implements ActionListener { GTPP_Recipe.GTPP_Recipe_Map.sNuclearSaltProcessingPlantRecipes); } - protected void dumpGtRecipeMap(final GT_Recipe_Map r) { - final Collection x = r.mRecipeList; - Logger.INFO("Dumping " + r.mUnlocalizedName + " Recipes for Debug."); - for (final GT_Recipe newBo : x) { - Logger.INFO("========================"); - Logger.INFO("Dumping Input: " + ItemUtils.getArrayStackNames(newBo.mInputs)); - Logger.INFO("Dumping Inputs " + ItemUtils.getFluidArrayStackNames(newBo.mFluidInputs)); - Logger.INFO("Dumping Duration: " + newBo.mDuration); - Logger.INFO("Dumping EU/t: " + newBo.mEUt); - Logger.INFO("Dumping Output: " + ItemUtils.getArrayStackNames(newBo.mOutputs)); - Logger.INFO("Dumping Output: " + ItemUtils.getFluidArrayStackNames(newBo.mFluidOutputs)); - Logger.INFO("========================"); - } - } - - private static final boolean setupMaterialBlacklist() { + private static void setupMaterialBlacklist() { Material.invalidMaterials.put(Materials._NULL); Material.invalidMaterials.put(Materials.Clay); Material.invalidMaterials.put(Materials.Phosphorus); @@ -339,14 +303,10 @@ public class GTplusplus implements ActionListener { Material.invalidMaterials.put(Materials.Soularium); Material.invalidMaterials.put(Materials.PhasedIron); - if (Material.invalidMaterials.size() > 0) { - return true; - } - return false; } - private static final HashMap sMissingItemMappings = new HashMap(); - private static final HashMap sMissingBlockMappings = new HashMap(); + private static final HashMap sMissingItemMappings = new HashMap<>(); + private static final HashMap sMissingBlockMappings = new HashMap<>(); private static void processMissingMappings() { sMissingItemMappings.put("miscutils:Ammonium", GameRegistry.findItem(GTPlusPlus.ID, "itemCellAmmonium")); @@ -417,16 +377,14 @@ public class GTplusplus implements ActionListener { Item aReplacement = sMissingItemMappings.get(mapping.name); if (aReplacement != null) { remap(aReplacement, mapping); - } else { - // Logger.INFO("Unable to remap: "+mapping.name+", item has no replacement mapping."); } + } else if (mapping.type == GameRegistry.Type.BLOCK) { Block aReplacement = sMissingBlockMappings.get(mapping.name); if (aReplacement != null) { remap(aReplacement, mapping); - } else { - // Logger.INFO("Unable to remap: "+mapping.name+", block has no replacement mapping."); } + } } } diff --git a/src/main/java/gtPlusPlus/GenerateDictionaries.java b/src/main/java/gtPlusPlus/GenerateDictionaries.java deleted file mode 100644 index 6313a07c87..0000000000 --- a/src/main/java/gtPlusPlus/GenerateDictionaries.java +++ /dev/null @@ -1,167 +0,0 @@ -package gtPlusPlus; - -import java.io.File; -import java.io.IOException; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.file.StandardOpenOption; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; - -import gregtech.api.objects.XSTR; - -public class GenerateDictionaries { - - public static void main(String[] args) { - - File aMainDictionary = new File("proguard/DictionaryMain.txt"); - File aMethodDict = new File("proguard/method-dict.txt"); - File aClassDict = new File("proguard/class-dict.txt"); - - if (Utils.doesFileExist(aMainDictionary)) { - Utils.log("Found Main Dictionary"); - List aLines = Utils.readLines(aMainDictionary); - - ArrayList aLinesToWriteMethods = new ArrayList(); - ArrayList aLinesToWriteClasses = new ArrayList(); - - if (aLines != null && aLines.size() > 0) { - Utils.log("Main Dictionary has > 0 keywords (" + aLines.size() + ")"); - HashSet aUsedIndicies = new HashSet(); - int aCount = aLines.size() / 5; - - Utils.log("Mapping " + aCount + " to each dict."); - // Map New Method Names - for (int i = 0; aLinesToWriteMethods.size() < aCount; i++) { - Integer aIndex = Utils.randInt(0, aLines.size() - 1); - if (!aUsedIndicies.contains(aIndex)) { - String aLineAtIndex = aLines.get(aIndex); - if (aLineAtIndex != null && aLineAtIndex.length() > 0) { - aLinesToWriteMethods.add(aLineAtIndex); - aUsedIndicies.add(aIndex); - } - } - if (i >= aCount * 5) { - break; - } - } - - // Map New Class Names - for (int i = 0; aLinesToWriteClasses.size() < aCount; i++) { - Integer aIndex = Utils.randInt(0, aLines.size() - 1); - if (!aUsedIndicies.contains(aIndex)) { - String aLineAtIndex = aLines.get(aIndex); - if (aLineAtIndex != null && aLineAtIndex.length() > 0) { - aLinesToWriteClasses.add(aLineAtIndex); - aUsedIndicies.add(aIndex); - } - } - if (i >= aCount * 5) { - break; - } - } - } - - // Remove old generated Dicts - if (Utils.doesFileExist(aMethodDict)) { - aMethodDict.delete(); - Utils.log("Removed old Method-Dict"); - } - if (Utils.doesFileExist(aClassDict)) { - aClassDict.delete(); - Utils.log("Removed old Class-Dict"); - } - - // Create new empty dict files - if (!Utils.doesFileExist(aMethodDict)) { - Utils.createFile(aMethodDict); - } - if (!Utils.doesFileExist(aClassDict)) { - Utils.createFile(aClassDict); - } - - Utils.log("Writing new Dictionaries."); - // Write - Utils.appendListToFile(aMethodDict, aLinesToWriteMethods); - Utils.appendListToFile(aClassDict, aLinesToWriteClasses); - - Utils.log("Finished all generation of new Dictionaries."); - } - } - - private static final class Utils { - - private static final Charset utf8 = StandardCharsets.UTF_8; - - private static final void log(String s) { - System.out.println("[GTPP-Proguard] " + s); - } - - public static int randInt(final int min, final int max) { - return XSTR.XSTR_INSTANCE.nextInt((max - min) + 1) + min; - } - - public static boolean doesFileExist(File f) { - if (f != null && f.exists() && !f.isDirectory()) { - return true; - } - return false; - } - - public static File createFile(File aFile) { - boolean blnCreated = false; - log("Trying to use relative path " + aFile.getPath()); - try { - // log("Trying to use path "+aFile.getCanonicalPath()); - // log("Trying to use absolute path "+aFile.getAbsolutePath()); - blnCreated = aFile.createNewFile(); - } catch (IOException ioe) { - log("Error while creating a new empty file :" + ioe); - return null; - } - return blnCreated ? aFile : null; - } - - public static boolean appendListToFile(File file, List content) { - try { - long oldSize; - long newSize; - if (doesFileExist(file)) { - Path p = Paths.get(file.getPath()); - if (p != null && Files.isWritable(p)) { - oldSize = Files.size(p); - try { - Files.write(p, content, utf8, StandardOpenOption.APPEND); - } catch (IOException e) { - e.printStackTrace(); - } - newSize = Files.size(p); - return newSize > oldSize; - } - } - } catch (IOException e) {} - return false; - } - - /** - * Reads the contents of a file line by line to a List of Strings using the default encoding for the VM. The - * file is always closed. - * - * @param file the file to read, must not be {@code null} - * @return the list of Strings representing each line in the file, never {@code null} - * @throws IOException in case of an I/O error - * @since 1.3 - */ - public static List readLines(File file) { - try { - return org.apache.commons.io.FileUtils.readLines(file, utf8); - } catch (IOException e) { - return new ArrayList(); - } - } - } -} diff --git a/src/main/java/gtPlusPlus/api/interfaces/ITileTooltip.java b/src/main/java/gtPlusPlus/api/interfaces/ITileTooltip.java index 97c734659d..f059ef8a5f 100644 --- a/src/main/java/gtPlusPlus/api/interfaces/ITileTooltip.java +++ b/src/main/java/gtPlusPlus/api/interfaces/ITileTooltip.java @@ -2,5 +2,5 @@ package gtPlusPlus.api.interfaces; public interface ITileTooltip { - public abstract int getTooltipID(); + int getTooltipID(); } diff --git a/src/main/java/gtPlusPlus/api/interfaces/RunnableWithInfo.java b/src/main/java/gtPlusPlus/api/interfaces/RunnableWithInfo.java index c9415f6155..f00287404b 100644 --- a/src/main/java/gtPlusPlus/api/interfaces/RunnableWithInfo.java +++ b/src/main/java/gtPlusPlus/api/interfaces/RunnableWithInfo.java @@ -2,9 +2,6 @@ package gtPlusPlus.api.interfaces; public interface RunnableWithInfo extends Runnable { - public V getInfoData(); + V getInfoData(); - public default Class getInfoDataType() { - return getInfoData().getClass(); - } } diff --git a/src/main/java/gtPlusPlus/api/objects/Logger.java b/src/main/java/gtPlusPlus/api/objects/Logger.java index 9b6591abd2..0178bb141a 100644 --- a/src/main/java/gtPlusPlus/api/objects/Logger.java +++ b/src/main/java/gtPlusPlus/api/objects/Logger.java @@ -10,7 +10,7 @@ import gtPlusPlus.preloader.asm.AsmConfig; public class Logger { - public Logger(String string) {} + public Logger() {} // Logging Functions public static final org.apache.logging.log4j.Logger modLogger = Logger.makeLogger(); diff --git a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java index f4b2550b5a..aedd6c6073 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java +++ b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java @@ -27,7 +27,7 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect private static final long serialVersionUID = 3771412318075131790L; public AutoMap() { - this(new LinkedHashMap()); + this(new LinkedHashMap<>()); } public Map getMap() { @@ -36,7 +36,7 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect public AutoMap(Map defaultMapType) { mInternalMap = defaultMapType; - mInternalNameMap = new LinkedHashMap(); + mInternalNameMap = new LinkedHashMap<>(); } /** @@ -45,8 +45,8 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect * @param aList - Data to be inserted into the AutoMap. */ public AutoMap(List aList) { - mInternalMap = new LinkedHashMap(); - mInternalNameMap = new LinkedHashMap(); + mInternalMap = new LinkedHashMap<>(); + mInternalNameMap = new LinkedHashMap<>(); if (aList != null && aList.size() > 0) { for (V obj : aList) { add(obj); @@ -60,8 +60,8 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect * @param aList - Data to be inserted into the AutoMap. */ public AutoMap(Set aList) { - mInternalMap = new LinkedHashMap(); - mInternalNameMap = new LinkedHashMap(); + mInternalMap = new LinkedHashMap<>(); + mInternalNameMap = new LinkedHashMap<>(); if (aList != null && aList.size() > 0) { for (V obj : aList) { add(obj); @@ -75,8 +75,8 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect * @param aList - Data to be inserted into the AutoMap. */ public AutoMap(Collection aList) { - mInternalMap = new LinkedHashMap(); - mInternalNameMap = new LinkedHashMap(); + mInternalMap = new LinkedHashMap<>(); + mInternalNameMap = new LinkedHashMap<>(); if (aList != null && aList.size() > 0) { for (V obj : aList) { add(obj); @@ -90,8 +90,8 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect * @param aArray - Data to be inserted into the AutoMap. */ public AutoMap(V[] aArray) { - mInternalMap = new LinkedHashMap(); - mInternalNameMap = new LinkedHashMap(); + mInternalMap = new LinkedHashMap<>(); + mInternalNameMap = new LinkedHashMap<>(); if (aArray != null && aArray.length > 0) { for (V obj : aArray) { add(obj); @@ -244,7 +244,7 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect @Override public boolean retainAll(Collection c) { - AutoMap aTempAllocation = new AutoMap(); + AutoMap aTempAllocation = new AutoMap<>(); boolean aTrue = false; aTempAllocation = this; aTempAllocation.removeAll(c); @@ -346,7 +346,7 @@ public class AutoMap implements Iterable, Cloneable, Serializable, Collect @Override public List subList(int fromIndex, int toIndex) { - AutoMap aNewSubList = new AutoMap(); + AutoMap aNewSubList = new AutoMap<>(); for (int slot = fromIndex; slot <= toIndex; slot++) { V obj = mInternalMap.get(slot); if (obj == null) { diff --git a/src/main/java/gtPlusPlus/api/objects/data/Quad.java b/src/main/java/gtPlusPlus/api/objects/data/Quad.java index 54839ac930..a2597061e0 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/Quad.java +++ b/src/main/java/gtPlusPlus/api/objects/data/Quad.java @@ -34,7 +34,7 @@ public class Quad { } public final List values() { - List aVals = new ArrayList(); + List aVals = new ArrayList<>(); aVals.add(key); aVals.add(value); aVals.add(value2); diff --git a/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java b/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java index e4b4e0db88..ea12972af4 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 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<>((V) arg0); Logger.WARNING("Adding new key to map: " + aKey); } aValue.add(); @@ -152,7 +152,7 @@ public class TypeCounter implements Set { for (String k : this.mInternalMap.keySet()) { if (k != null) { InternalTypeCounterObject aVal = this.mInternalMap.get(k); - aArray[aPos++] = new Pair>(k, aVal); + aArray[aPos++] = new Pair<>(k, aVal); } } return aArray; diff --git a/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java b/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java index 9d9201066b..ae1f28f0c9 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java +++ b/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java @@ -11,7 +11,7 @@ import gregtech.api.objects.XSTR; public class WeightedCollection implements Map { - private NavigableMap map = new TreeMap(); + private NavigableMap map = new TreeMap<>(); private Random random; private int total = 0; diff --git a/src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java index c9176c00c5..199d20e06a 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java +++ b/src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java @@ -9,6 +9,6 @@ public class WeakAutoMap extends AutoMap { private static final long serialVersionUID = 8328345351801363386L; public WeakAutoMap() { - super(new WeakHashMap()); + super(new WeakHashMap<>()); } } diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java index cd6edf5411..686c0e7667 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java @@ -87,10 +87,9 @@ public class BlockPos implements Serializable { if (other == this) { return true; } - if (!(other instanceof BlockPos)) { + if (!(other instanceof BlockPos otherPoint)) { return false; } - BlockPos otherPoint = (BlockPos) other; return this.xPos == otherPoint.xPos && this.yPos == otherPoint.yPos && this.zPos == otherPoint.zPos && this.dim == otherPoint.dim; @@ -153,7 +152,7 @@ public class BlockPos implements Serializable { } public AutoMap getSurroundingBlocks() { - AutoMap sides = new AutoMap(); + AutoMap sides = new AutoMap<>(); sides.put(getUp()); sides.put(getDown()); sides.put(getXPos()); @@ -219,7 +218,7 @@ public class BlockPos implements Serializable { * @return - Does this block have a neighbour that is the same? */ public AutoMap getSimilarNeighbour(boolean strict) { - AutoMap sides = new AutoMap(); + AutoMap sides = new AutoMap<>(); for (BlockPos g : getSurroundingBlocks().values()) { if (getBlockAtPos(g) == getBlockAtPos()) { if (!strict) { @@ -237,7 +236,7 @@ public class BlockPos implements Serializable { public Set getValidNeighboursAndSelf() { AutoMap h = getSimilarNeighbour(true); h.put(this); - Set result = new HashSet(); + Set result = new HashSet<>(); for (BlockPos f : h.values()) { result.add(f); } diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java index 6fe2f9ddb5..d68ef1a93f 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java @@ -33,7 +33,7 @@ public abstract class ItemPackage implements RunnableWithInfo { public abstract boolean generateRecipes(); - private final void init() { + private void init() { items(); blocks(); fluids(); diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java b/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java index 84f5fe5fba..58a7affa90 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java @@ -18,18 +18,18 @@ import gtPlusPlus.core.util.Utils; public class SafeTexture implements Runnable { @SideOnly(Side.CLIENT) - private static final HashMap mHashToIconCache = new HashMap(); + private static final HashMap mHashToIconCache = new HashMap<>(); @SideOnly(Side.CLIENT) - private static final HashMap mPathToHashCash = new HashMap(); + private static final HashMap mPathToHashCash = new HashMap<>(); - private static final HashMap mTextureObjectCache = new HashMap(); + private static final HashMap mTextureObjectCache = new HashMap<>(); private final int mHash; private final String mTextureName; - private static final String getKey(String aTexPath) { + private static String getKey(String aTexPath) { String aNameKey = Utils.sanitizeString(aTexPath); aNameKey = aNameKey.replace('/', ' '); aNameKey = aNameKey.toLowerCase(); diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java index 12916af64b..db9599e130 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java @@ -72,15 +72,10 @@ public class ShapedRecipe { + " has incorrect number of inputs. Size: " + aInputs.length + "."); - // Logger.RECIPE("[1234abcd] Reciped exists at location: "+ReflectionUtils.getMethodName(1)); - // Logger.RECIPE("[1234abcd] Reciped exists at location: "+ReflectionUtils.getMethodName(2)); - // Logger.RECIPE("[1234abcd] Reciped exists at location: "+ReflectionUtils.getMethodName(3)); - // Logger.RECIPE("[1234abcd] Reciped exists at location: "+ReflectionUtils.getMethodName(4)); - // Logger.RECIPE("Reciped exists at location: "+ReflectionUtils.getMethodName(1)); } // Build a Pair for each slot - AutoMap> aRecipePairs = new AutoMap>(); + AutoMap> aRecipePairs = new AutoMap<>(); int aCharSlot = 0; int aMemSlot = 0; int aInfoSlot = 0; @@ -95,7 +90,7 @@ public class ShapedRecipe { } mInfo = ((ItemStack) stack).getDisplayName(); } - aRecipePairs.put(new Pair