From 7d1f51a8937e0a86486267437d444696e81e8aa0 Mon Sep 17 00:00:00 2001 From: Jakub <53441451+kuba6000@users.noreply.github.com> Date: Mon, 29 Aug 2022 16:04:28 +0200 Subject: Buildscript + Spotless (#318) * Convert AES.java to readable class * Buildscript * Spotless --- .../java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java | 1112 ++-- .../xmod/gregtech/api/energy/IC2ElectricItem.java | 85 +- .../api/energy/IC2ElectricItemManager.java | 140 +- .../xmod/gregtech/api/enums/CustomGtTextures.java | 142 +- .../xmod/gregtech/api/enums/CustomOrePrefix.java | 230 +- .../xmod/gregtech/api/enums/GregtechItemList.java | 2068 ++++---- .../gregtech/api/enums/GregtechOreDictNames.java | 33 +- .../gregtech/api/enums/GregtechOrePrefixes.java | 3476 +++++++++---- .../gregtech/api/enums/GregtechTextureSet.java | 298 +- .../xmod/gregtech/api/enums/GregtechTextures.java | 351 +- .../gregtech/api/enums/GregtechToolDictNames.java | 11 +- .../gregtech/api/gui/CONTAINER_AdvancedBoiler.java | 53 +- .../xmod/gregtech/api/gui/CONTAINER_Cyclotron.java | 49 +- .../xmod/gregtech/api/gui/CONTAINER_DataHatch.java | 38 +- .../gregtech/api/gui/CONTAINER_DeluxeTank.java | 110 +- .../api/gui/CONTAINER_Hatch_Muffler_Advanced.java | 86 +- .../api/gui/CONTAINER_IndustrialCentrifuge.java | 55 +- .../api/gui/CONTAINER_IronBlastFurnace.java | 41 +- .../xmod/gregtech/api/gui/CONTAINER_MatterFab.java | 137 +- .../api/gui/CONTAINER_MetaTileMachineLong.java | 470 +- .../gregtech/api/gui/CONTAINER_MultiMachine.java | 493 +- .../CONTAINER_MultiMachine_NoPlayerInventory.java | 24 +- .../api/gui/CONTAINER_PowerSubStation.java | 139 +- .../xmod/gregtech/api/gui/CONTAINER_SafeBlock.java | 160 +- .../gregtech/api/gui/CONTAINER_SolarGenerator.java | 143 +- .../gregtech/api/gui/CONTAINER_SteamCondenser.java | 167 +- .../gregtech/api/gui/CONTAINER_SuperChest.java | 103 +- .../gregtech/api/gui/CONTAINER_TreeFarmer.java | 109 +- .../xmod/gregtech/api/gui/GUI_AdvancedBoiler.java | 10 +- .../xmod/gregtech/api/gui/GUI_Cyclotron.java | 35 +- .../xmod/gregtech/api/gui/GUI_DataHatch.java | 18 +- .../xmod/gregtech/api/gui/GUI_DeluxeTank.java | 56 +- .../api/gui/GUI_Hatch_Muffler_Advanced.java | 71 +- .../gregtech/api/gui/GUI_IndustrialCentrifuge.java | 121 +- .../gregtech/api/gui/GUI_IronBlastFurnace.java | 58 +- .../xmod/gregtech/api/gui/GUI_MatterFab.java | 143 +- .../xmod/gregtech/api/gui/GUI_MultiMachine.java | 612 ++- .../gregtech/api/gui/GUI_MultiMachine_Default.java | 42 +- .../gregtech/api/gui/GUI_Multi_Basic_Slotted.java | 130 +- .../xmod/gregtech/api/gui/GUI_PowerSubStation.java | 218 +- .../xmod/gregtech/api/gui/GUI_SafeBlock.java | 79 +- .../xmod/gregtech/api/gui/GUI_SolarGenerator.java | 71 +- .../xmod/gregtech/api/gui/GUI_SteamCondenser.java | 84 +- .../xmod/gregtech/api/gui/GUI_SuperChest.java | 55 +- .../xmod/gregtech/api/gui/GUI_TreeFarmer.java | 76 +- .../xmod/gregtech/api/gui/SyncedLong.java | 2 +- .../xmod/gregtech/api/gui/SyncedValueManager.java | 1 - .../GT_Container_ElectricAutoWorkbench.java | 210 +- .../GT_Container_ElectricInventoryManager.java | 509 +- .../GT_GUIContainer_ElectricAutoWorkbench.java | 84 +- .../GT_GUIContainer_ElectricInventoryManager.java | 218 +- .../api/gui/basic/CONTAINER_PollutionCleaner.java | 168 +- .../api/gui/basic/GT_Container_CropHarvestor.java | 326 +- .../gui/basic/GT_GUIContainer_CropHarvestor.java | 118 +- .../api/gui/basic/GUI_PollutionCleaner.java | 115 +- .../gui/computer/GT_Container_ComputerCube.java | 734 ++- .../GT_Container_RedstoneCircuitBlock.java | 293 +- .../gui/computer/GT_GUIContainer_ComputerCube.java | 349 +- .../GT_GUIContainer_RedstoneCircuitBlock.java | 187 +- .../gui/fluidreactor/Container_FluidReactor.java | 318 +- .../api/gui/fluidreactor/GUI_FluidReactor.java | 220 +- .../api/gui/hatches/CONTAINER_1by1_Turbine.java | 67 +- .../gregtech/api/gui/hatches/CONTAINER_2by2.java | 5 +- .../gregtech/api/gui/hatches/CONTAINER_4by4.java | 5 +- .../gui/hatches/CONTAINER_HatchNbtConsumable.java | 198 +- .../gregtech/api/gui/hatches/GUI_1by1_Turbine.java | 10 +- .../xmod/gregtech/api/gui/hatches/GUI_2by2.java | 18 +- .../xmod/gregtech/api/gui/hatches/GUI_4by4.java | 18 +- .../api/gui/hatches/GUI_HatchNbtConsumable.java | 52 +- .../hatches/charge/CONTAINER_Electric_2by2.java | 17 +- .../hatches/charge/CONTAINER_Electric_4by4.java | 14 +- .../api/gui/hatches/charge/GUI_Electric_2by2.java | 22 +- .../api/gui/hatches/charge/GUI_Electric_4by4.java | 23 +- .../api/gui/power/CONTAINER_BasicTank.java | 89 +- .../xmod/gregtech/api/gui/power/GUI_BasicTank.java | 46 +- .../workbench/GT_Container_AdvancedWorkbench.java | 206 +- .../workbench/GT_Container_BronzeWorkbench.java | 202 +- .../GT_GUIContainer_AdvancedWorkbench.java | 123 +- .../workbench/GT_GUIContainer_BronzeWorkbench.java | 9 +- .../api/interfaces/GregtechItemContainer.java | 49 +- .../api/interfaces/IBaseCustomMetaTileEntity.java | 3 +- .../xmod/gregtech/api/interfaces/IHeatEntity.java | 21 +- .../xmod/gregtech/api/interfaces/IHeatSink.java | 13 +- .../api/interfaces/IMetaTileEntityHeatPipe.java | 12 +- .../interfaces/internal/IGregtech_RecipeAdder.java | 861 ++- .../internal/Interface_IconContainer.java | 26 +- .../internal/Interface_ItemBehaviour.java | 79 +- .../internal/Interface_OreRecipeRegistrator.java | 34 +- .../Interface_OreRecipeRegistrator_GT.java | 23 +- .../api/interfaces/internal/Interface_Texture.java | 16 +- .../interfaces/internal/Interface_ToolStats.java | 362 +- .../gregtech/api/items/Gregtech_Generic_Item.java | 347 +- .../xmod/gregtech/api/items/Gregtech_MetaItem.java | 651 +-- .../gregtech/api/items/Gregtech_MetaItem_Base.java | 1399 ++--- .../gregtech/api/items/Gregtech_MetaItem_X32.java | 431 +- .../xmod/gregtech/api/items/Gregtech_MetaTool.java | 1115 ++-- .../gregtech/api/items/tools/GT_MetaGenTool.java | 1124 ++-- .../gregtech/api/items/types/ToolType_Base.java | 184 +- .../api/items/types/ToolType_HardHammer.java | 233 +- .../gregtech/api/items/types/ToolType_Pump.java | 275 +- .../gregtech/api/items/types/ToolType_Wrench.java | 326 +- .../api/metatileentity/BaseCustomTileEntity.java | 382 +- .../custom/power/BaseCustomPower_MTE.java | 552 +- .../power/GTPP_MTE_BasicLosslessGenerator.java | 610 +-- .../custom/power/GTPP_MTE_BasicMachine.java | 350 +- .../custom/power/GTPP_MTE_BasicTank.java | 71 +- .../custom/power/GTPP_MTE_TieredMachineBlock.java | 47 +- .../custom/power/MetaTileEntityCustomPower.java | 142 +- .../GT_MetaTileEntity_BasicBreaker.java | 539 +- ...GT_MetaTileEntity_BasicMachine_GTPP_Recipe.java | 140 +- .../GT_MetaTileEntity_Dehydrator.java | 282 +- .../GT_MetaTileEntity_DeluxeMachine.java | 371 +- .../GT_MetaTileEntity_DeluxeTank.java | 693 +-- .../GT_MetaTileEntity_Hatch_AirIntake.java | 204 +- .../GT_MetaTileEntity_Hatch_AirIntake_Extreme.java | 46 +- .../GT_MetaTileEntity_Hatch_ControlCore.java | 96 +- .../GT_MetaTileEntity_Hatch_DynamoBuffer.java | 131 +- ...etaTileEntity_Hatch_ElementalDataOrbHolder.java | 318 +- .../GT_MetaTileEntity_Hatch_Energy_RTG.java | 547 +- .../GT_MetaTileEntity_Hatch_FluidGenerator.java | 420 +- .../GT_MetaTileEntity_Hatch_InputBattery.java | 366 +- .../GT_MetaTileEntity_Hatch_Muffler_Adv.java | 614 +-- .../GT_MetaTileEntity_Hatch_Naquadah.java | 385 +- .../GT_MetaTileEntity_Hatch_OutputBattery.java | 427 +- .../GT_MetaTileEntity_Hatch_Plasma.java | 395 +- .../GT_MetaTileEntity_Hatch_Reservoir.java | 205 +- .../GT_MetaTileEntity_Hatch_Steam_BusInput.java | 505 +- .../GT_MetaTileEntity_Hatch_Steam_BusOutput.java | 124 +- .../GT_MetaTileEntity_Hatch_Turbine.java | 757 +-- .../GT_MetaTileEntity_Hatch_TurbineProvider.java | 382 +- .../GT_MetaTileEntity_SuperBus_Input.java | 258 +- .../GT_MetaTileEntity_SuperBus_Output.java | 326 +- .../GregtechMetaPipeEntityFluid.java | 250 +- .../GregtechMetaPipeEntity_Cable.java | 422 +- .../GregtechMetaTreeFarmerStructural.java | 99 +- .../implementations/base/CustomMetaTileBase.java | 74 +- .../GT_MetaTileEntity_Hatch_CustomFluidBase.java | 354 +- .../base/GregtechMetaPipeEntityBase_Cable.java | 964 ++-- .../base/GregtechMetaTileEntity.java | 125 +- .../base/GregtechMetaTransformerHiAmp.java | 221 +- .../base/GregtechMeta_MultiBlockBase.java | 5494 ++++++++++---------- .../base/GregtechMeta_SteamMultiBase.java | 1318 ++--- .../GregtechDoubleFuelGeneratorBase.java | 861 +-- .../base/generators/GregtechMetaBoilerBase.java | 713 ++- .../generators/GregtechMetaSolarGenerator.java | 441 +- .../GregtechRocketFuelGeneratorBase.java | 731 +-- .../base/machines/GregtechMetaSafeBlockBase.java | 572 +- .../base/machines/GregtechMetaTreeFarmerBase.java | 355 +- .../GT_MetaTileEntity_Hatch_Catalysts.java | 60 +- .../GT_MetaTileEntity_Hatch_MillingBalls.java | 60 +- .../GT_MetaTileEntity_Hatch_NbtConsumable.java | 559 +- .../api/objects/GTPP_CopiedBlockTexture.java | 3 +- .../gregtech/api/objects/GTPP_RenderedTexture.java | 3 +- .../xmod/gregtech/api/objects/GregtechFluid.java | 37 +- .../gregtech/api/objects/GregtechItemData.java | 281 +- .../api/objects/GregtechMaterialStack.java | 94 +- .../ProcessingSkookumChoocherToolRecipes.java | 30 +- .../xmod/gregtech/api/util/GTPP_Config.java | 25 +- .../api/util/GregtechOreDictUnificator.java | 166 +- .../api/util/SpecialBehaviourTooltipHandler.java | 46 +- .../xmod/gregtech/api/world/GTPP_Worldgen.java | 28 +- .../gregtech/api/world/GTPP_Worldgen_Boulder.java | 74 +- .../api/world/GTPP_Worldgen_GT_Ore_Layer.java | 398 +- .../gregtech/api/world/GTPP_Worldgen_Handler.java | 82 +- .../xmod/gregtech/api/world/GTPP_Worldgen_Ore.java | 20 +- .../api/world/GTPP_Worldgen_Ore_Normal.java | 91 +- .../xmod/gregtech/api/world/GT_OreVein_Object.java | 56 +- .../xmod/gregtech/api/world/WorldGenUtils.java | 38 +- .../xmod/gregtech/common/Meta_GT_Proxy.java | 1176 +++-- .../xmod/gregtech/common/StaticFields59.java | 549 +- .../common/blocks/GTPP_Block_Machines.java | 988 ++-- .../gregtech/common/blocks/GTPP_Item_Machines.java | 457 +- .../common/blocks/GregtechMetaCasingBlocks.java | 114 +- .../common/blocks/GregtechMetaCasingBlocks2.java | 131 +- .../common/blocks/GregtechMetaCasingBlocks3.java | 693 +-- .../common/blocks/GregtechMetaCasingBlocks4.java | 184 +- .../common/blocks/GregtechMetaCasingBlocks5.java | 148 +- .../blocks/GregtechMetaCasingBlocksAbstract.java | 260 +- .../GregtechMetaCasingBlocksPipeGearbox.java | 156 +- .../common/blocks/GregtechMetaCasingItems.java | 9 +- .../common/blocks/GregtechMetaItemCasings1.java | 53 +- .../blocks/GregtechMetaItemCasingsAbstract.java | 98 +- .../blocks/GregtechMetaSpecialMachineCasings.java | 117 +- .../blocks/GregtechMetaSpecialMultiCasings.java | 204 +- .../blocks/GregtechMetaSpecialMultiCasings2.java | 167 +- .../blocks/GregtechMetaTieredCasingBlocks1.java | 172 +- .../common/blocks/fluid/GregtechFluidHandler.java | 266 +- .../blocks/textures/CasingTextureHandler.java | 146 +- .../blocks/textures/CasingTextureHandler2.java | 98 +- .../blocks/textures/CasingTextureHandler3.java | 118 +- .../textures/TexturesCentrifugeMultiblock.java | 300 +- .../common/blocks/textures/TexturesGregtech58.java | 947 ++-- .../common/blocks/textures/TexturesGregtech59.java | 957 ++-- .../blocks/textures/TexturesGrinderMultiblock.java | 266 +- .../common/blocks/textures/TexturesGtBlock.java | 1578 +++--- .../blocks/textures/TexturesGtCutomCovers.java | 47 +- .../common/blocks/textures/TexturesGtTools.java | 92 +- .../turbine/LargeTurbineTextureHandler.java | 601 ++- .../common/computer/GT_ComputerCube_Setup.java | 132 +- .../computer/GT_Computercube_Description.java | 702 ++- .../common/computer/GT_Computercube_Simulator.java | 269 +- .../xmod/gregtech/common/covers/CoverManager.java | 198 +- .../common/covers/GTPP_Cover_Overflow.java | 488 +- .../common/covers/GTPP_Cover_Overflow_Item.java | 342 +- .../common/covers/GTPP_Cover_ToggleVisual.java | 349 +- .../gregtech/common/helpers/ChargingHelper.java | 848 +-- .../gregtech/common/helpers/CraftingHelper.java | 58 +- .../common/helpers/FlotationRecipeHandler.java | 97 +- .../gregtech/common/helpers/GT_MethodHelper.java | 122 +- .../common/helpers/MachineUpdateHandler.java | 55 +- .../gregtech/common/helpers/TreeFarmHelper.java | 1935 +++---- .../common/helpers/VolumetricFlaskHelper.java | 305 +- .../helpers/autocrafter/AC_Helper_Container.java | 203 +- .../helpers/autocrafter/AC_Helper_Utils.java | 132 +- .../common/helpers/tesseract/TesseractHelper.java | 476 +- .../common/helpers/treefarm/TreeGenerator.java | 715 ++- .../gregtech/common/items/MetaCustomCoverItem.java | 389 +- .../common/items/MetaGeneratedGregtechItems.java | 1571 ++++-- .../common/items/MetaGeneratedGregtechTools.java | 171 +- .../items/behaviours/Behaviour_Choocher.java | 147 +- .../behaviours/Behaviour_Electric_Lighter.java | 388 +- .../common/items/behaviours/Behaviour_Grinder.java | 174 +- .../items/behaviours/Behaviour_Prospecting_Ex.java | 226 +- .../common/items/covers/MetaItemCoverCasings.java | 57 +- .../gregtech/common/render/GTPP_CapeRenderer.java | 996 ++-- .../gregtech/common/render/GTPP_FlaskRenderer.java | 18 +- .../common/render/GTPP_Render_MachineBlock.java | 1401 ++--- .../GT_MetaTileEntity_ElectricAutoWorkbench.java | 1586 +++--- ...GT_MetaTileEntity_ElectricInventoryManager.java | 1006 ++-- .../GT_MetaTileEntity_TesseractGenerator.java | 1443 ++--- .../GT_MetaTileEntity_TesseractTerminal.java | 1151 ++-- .../generators/GT_MetaTileEntity_Boiler_Base.java | 553 +- .../generators/GT_MetaTileEntity_Boiler_HV.java | 75 +- .../generators/GT_MetaTileEntity_Boiler_LV.java | 93 +- .../generators/GT_MetaTileEntity_Boiler_MV.java | 93 +- .../generators/GT_MetaTileEntity_Boiler_Solar.java | 384 +- .../generators/GT_MetaTileEntity_RfConvertor.java | 647 +-- .../GT_MetaTileEntity_SemiFluidGenerator.java | 310 +- ...gtechMetaTileEntityDoubleFuelGeneratorBase.java | 297 +- .../GregtechMetaTileEntityGeothermalGenerator.java | 300 +- .../GregtechMetaTileEntityRocketFuelGenerator.java | 278 +- .../GregtechMetaTileEntitySolarGenerator.java | 369 +- .../generators/GregtechMetaTileEntity_RTG.java | 751 +-- .../GT_MetaTileEntity_ULV_CombustionGenerator.java | 33 +- .../ULV/GT_MetaTileEntity_ULV_GasTurbine.java | 37 +- .../ULV/GT_MetaTileEntity_ULV_SteamTurbine.java | 36 +- .../creative/GregtechMetaCreativeEnergyBuffer.java | 424 +- .../basic/GT_MetaTileEntity_CropHarvestor.java | 1372 ++--- .../basic/GT_MetaTileEntity_WorldAccelerator.java | 613 ++- .../GregtechMetaAtmosphericReconditioner.java | 1689 +++--- .../machines/basic/GregtechMetaCondensor.java | 294 +- .../basic/GregtechMetaGarbageCollector.java | 702 +-- .../basic/GregtechMetaPollutionCreator.java | 835 +-- .../basic/GregtechMetaPollutionDetector.java | 935 ++-- .../basic/GregtechMetaTileEntityChunkLoader.java | 832 +-- ...GregtechMetaTileEntityThaumcraftResearcher.java | 466 +- .../basic/GregtechMetaTileEntity_AutoChisel.java | 239 +- .../basic/GregtechMetaTileEntity_BasicWasher.java | 104 +- .../GregtechMetaTileEntity_ChemicalReactor.java | 1283 ++--- ...regtechMetaTileEntity_CompactFusionReactor.java | 1382 ++--- .../basic/GregtechMetaTileEntity_PocketFusion.java | 1386 ++--- .../GregtechMetaTileEntity_ReactorColdTrap.java | 93 +- ...egtechMetaTileEntity_ReactorProcessingUnit.java | 104 +- .../basic/GregtechMetaWirelessCharger.java | 1249 +++-- .../machines/multi/misc/GMTE_AmazonPackager.java | 1152 ++-- .../multi/misc/GregtechMTE_TeslaTower.java | 949 ++-- ...gtechMetaTileEntity_IndustrialAlloySmelter.java | 737 +-- ...regtechMetaTileEntity_IndustrialArcFurnace.java | 564 +- ...regtechMetaTileEntity_IndustrialCentrifuge.java | 430 +- .../GregtechMetaTileEntity_IndustrialChisel.java | 818 ++- .../GregtechMetaTileEntity_IndustrialCokeOven.java | 419 +- ...echMetaTileEntity_IndustrialCuttingMachine.java | 391 +- ...regtechMetaTileEntity_IndustrialDehydrator.java | 728 +-- ...gtechMetaTileEntity_IndustrialElectrolyzer.java | 318 +- .../GregtechMetaTileEntity_IndustrialExtruder.java | 408 +- ...egtechMetaTileEntity_IndustrialFluidHeater.java | 388 +- ...egtechMetaTileEntity_IndustrialForgeHammer.java | 594 +-- ...GregtechMetaTileEntity_IndustrialMacerator.java | 444 +- .../GregtechMetaTileEntity_IndustrialMixer.java | 398 +- ...aTileEntity_IndustrialMolecularTransformer.java | 447 +- ...gtechMetaTileEntity_IndustrialMultiMachine.java | 997 ++-- ...regtechMetaTileEntity_IndustrialPlatePress.java | 414 +- .../GregtechMetaTileEntity_IndustrialSifter.java | 390 +- .../GregtechMetaTileEntity_IndustrialSinter.java | 24 - ...MetaTileEntity_IndustrialThermalCentrifuge.java | 377 +- ...techMetaTileEntity_IndustrialVacuumFreezer.java | 484 +- ...GregtechMetaTileEntity_IndustrialWashPlant.java | 623 +-- .../GregtechMetaTileEntity_IndustrialWireMill.java | 347 +- .../GregtechMetaTileEntity_IronBlastFurnace.java | 898 ++-- .../processing/GregtechMetaTileEntity_IsaMill.java | 1296 +++-- .../GregtechMetaTileEntity_SpargeTower.java | 851 +-- .../GregtechMetaTileEntity_Adv_AssemblyLine.java | 1302 ++--- ...egtechMetaTileEntity_Adv_DistillationTower.java | 889 ++-- .../advanced/GregtechMetaTileEntity_Adv_EBF.java | 951 ++-- .../GregtechMetaTileEntity_Adv_Fusion_MK4.java | 199 +- .../GregtechMetaTileEntity_Adv_HeatExchanger.java | 239 +- .../GregtechMetaTileEntity_Adv_Implosion.java | 358 +- .../GregtechMetaTileEntity_SteamCompressor.java | 259 +- .../GregtechMetaTileEntity_SteamMacerator.java | 264 +- .../multi/production/GT4Entity_AutoCrafter.java | 1223 ++--- .../multi/production/GT4Entity_ThermalBoiler.java | 679 +-- .../GregtechMTE_ElementalDuplicator.java | 1376 ++--- .../production/GregtechMTE_FastNeutronReactor.java | 35 +- .../production/GregtechMTE_FrothFlotationCell.java | 852 ++- .../production/GregtechMTE_LargeNaqReactor.java | 111 +- .../production/GregtechMTE_MiniFusionPlant.java | 77 +- .../production/GregtechMTE_NuclearReactor.java | 1046 ++-- .../GregtechMetaTileEntityGeneratorArray.java | 966 ++-- .../production/GregtechMetaTileEntityTreeFarm.java | 1070 ++-- .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 609 +-- .../GregtechMetaTileEntity_Cyclotron.java | 847 ++- ...egtechMetaTileEntity_IndustrialFishingPond.java | 1185 +++-- ...egtechMetaTileEntity_IndustrialRockBreaker.java | 996 ++-- .../GregtechMetaTileEntity_LargeRocketEngine.java | 1135 ++-- ...techMetaTileEntity_LargeSemifluidGenerator.java | 651 ++- .../GregtechMetaTileEntity_MassFabricator.java | 1314 ++--- .../GregtechMetaTileEntity_Refinery.java | 453 +- .../GregtechMetaTileEntity_SolarTower.java | 1491 +++--- .../algae/GregtechMTE_AlgaePondBase.java | 953 ++-- ...gtechMetaTileEntity_BedrockMiningPlatform1.java | 5 - ...gtechMetaTileEntity_BedrockMiningPlatform2.java | 5 - ...chMetaTileEntity_BedrockMiningPlatformBase.java | 1255 +++-- .../chemplant/GregtechMTE_ChemicalPlant.java | 1936 +++---- .../turbines/GT_MTE_LargeTurbine_Gas.java | 95 +- .../turbines/GT_MTE_LargeTurbine_Plasma.java | 298 +- .../turbines/GT_MTE_LargeTurbine_SHSteam.java | 150 +- .../turbines/GT_MTE_LargeTurbine_Steam.java | 151 +- .../GregtechMetaTileEntity_LargerTurbineBase.java | 1620 +++--- .../storage/GregtechMetaTileEntity_MultiTank.java | 1025 ++-- ...chMetaTileEntity_PowerSubStationController.java | 1521 +++--- .../misc/GT_TileEntity_ComputerCube.java | 1812 +++---- .../tileentities/misc/TileEntitySolarHeater.java | 674 +-- .../redstone/GT_MetaTileEntity_RedstoneBase.java | 230 +- .../GT_MetaTileEntity_RedstoneButtonPanel.java | 436 +- .../GT_MetaTileEntity_RedstoneCircuitBlock.java | 954 ++-- .../redstone/GT_MetaTileEntity_RedstoneLamp.java | 115 +- .../GT_MetaTileEntity_RedstoneStrengthDisplay.java | 288 +- .../GT_MetaTileEntity_RedstoneStrengthScale.java | 83 +- .../GT_MetaTileEntity_AdvancedCraftingTable.java | 1069 ++-- .../GT_MetaTileEntity_BronzeCraftingTable.java | 127 +- .../GT_MetaTileEntity_ConnectableCrate.java | 1101 ++-- .../storage/GT_MetaTileEntity_TieredChest.java | 393 +- .../storage/GT_MetaTileEntity_TieredTank.java | 310 +- .../storage/GregtechMetaEnergyBuffer.java | 897 ++-- .../storage/GregtechMetaSafeBlock.java | 107 +- .../GT_MetaTileEntity_InfiniteItemHolder.java | 180 +- .../storage/shelving/GT4Entity_Shelf.java | 693 +-- .../shelving/GT4Entity_Shelf_Compartment.java | 49 +- .../storage/shelving/GT4Entity_Shelf_Desk.java | 68 +- .../shelving/GT4Entity_Shelf_FileCabinet.java | 87 +- .../storage/shelving/GT4Entity_Shelf_Iron.java | 65 +- .../storage/shelving/GT4Entity_Shelf_Large.java | 500 +- .../common/tools/TOOL_Gregtech_AngleGrinder.java | 351 +- .../gregtech/common/tools/TOOL_Gregtech_Base.java | 340 +- .../common/tools/TOOL_Gregtech_Choocher.java | 397 +- .../tools/TOOL_Gregtech_ElectricButcherKnife.java | 330 +- .../tools/TOOL_Gregtech_ElectricLighter.java | 282 +- .../common/tools/TOOL_Gregtech_ElectricSnips.java | 125 +- .../xmod/gregtech/loaders/GT_Material_Loader.java | 541 +- .../xmod/gregtech/loaders/Gregtech_Blocks.java | 27 +- .../gregtech/loaders/ProcessingAngleGrinder.java | 221 +- .../loaders/ProcessingElectricButcherKnife.java | 215 +- .../loaders/ProcessingElectricLighter.java | 209 +- .../gregtech/loaders/ProcessingElectricSnips.java | 206 +- .../loaders/ProcessingToolHeadChoocher.java | 174 +- .../loaders/Processing_Textures_Items.java | 6 +- .../gregtech/loaders/RecipeGen_AlloySmelter.java | 104 +- .../xmod/gregtech/loaders/RecipeGen_Assembler.java | 119 +- .../xmod/gregtech/loaders/RecipeGen_Base.java | 15 +- .../gregtech/loaders/RecipeGen_BlastSmelter.java | 490 +- .../loaders/RecipeGen_BlastSmelterGT_Ex.java | 351 +- .../loaders/RecipeGen_BlastSmelterGT_GTNH.java | 463 +- .../gregtech/loaders/RecipeGen_DustGeneration.java | 841 ++- .../xmod/gregtech/loaders/RecipeGen_Extruder.java | 311 +- .../gregtech/loaders/RecipeGen_FluidCanning.java | 453 +- .../xmod/gregtech/loaders/RecipeGen_Fluids.java | 464 +- .../xmod/gregtech/loaders/RecipeGen_Fluorite.java | 424 +- .../loaders/RecipeGen_MaterialProcessing.java | 498 +- .../gregtech/loaders/RecipeGen_MetalRecipe.java | 139 +- .../RecipeGen_MultisUsingFluidInsteadOfCells.java | 342 +- .../xmod/gregtech/loaders/RecipeGen_Ore.java | 1188 +++-- .../xmod/gregtech/loaders/RecipeGen_Plasma.java | 71 +- .../xmod/gregtech/loaders/RecipeGen_Plates.java | 307 +- .../xmod/gregtech/loaders/RecipeGen_Recycling.java | 744 +-- .../gregtech/loaders/RecipeGen_ShapedCrafting.java | 588 ++- .../loaders/misc/AddCustomMachineToPA.java | 13 +- .../gregtech/loaders/misc/AssLineAchievements.java | 315 +- .../loaders/recipe/RecipeLoader_AlgaeFarm.java | 367 +- .../gregtech/loaders/recipe/RecipeLoader_GTNH.java | 38 +- .../loaders/recipe/RecipeLoader_GlueLine.java | 285 +- .../gregtech/loaders/recipe/RecipeLoader_LFTR.java | 275 +- .../recipe/RecipeLoader_MolecularTransformer.java | 95 +- .../loaders/recipe/RecipeLoader_Nuclear.java | 1311 +++-- .../recipe/RecipeLoader_NuclearFuelProcessing.java | 689 ++- .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 3992 +++++++------- .../xmod/gregtech/recipes/RecipesToRemove.java | 81 +- .../machines/RECIPEHANDLER_AssemblyLine.java | 21 +- .../recipes/machines/RECIPEHANDLER_CokeOven.java | 117 +- .../recipes/machines/RECIPEHANDLER_Dehydrator.java | 167 +- .../machines/RECIPEHANDLER_MatterFabricator.java | 105 +- .../registration/gregtech/Gregtech4Content.java | 281 +- .../gregtech/GregtechAdvancedBoilers.java | 251 +- .../gregtech/GregtechAdvancedMixer.java | 358 +- .../gregtech/GregtechAlgaeContent.java | 80 +- .../gregtech/GregtechAmazonWarehouse.java | 25 +- .../gregtech/GregtechBedrockPlatforms.java | 3 - .../gregtech/GregtechBufferDynamos.java | 187 +- .../gregtech/GregtechComponentAssembler.java | 1249 +++-- .../registration/gregtech/GregtechConduits.java | 1826 ++++--- .../gregtech/GregtechCustomHatches.java | 423 +- .../registration/gregtech/GregtechCyclotron.java | 23 +- .../registration/gregtech/GregtechDehydrator.java | 428 +- .../gregtech/GregtechEnergyBuffer.java | 315 +- .../GregtechFactoryGradeReplacementMultis.java | 44 +- .../gregtech/GregtechFluidReactor.java | 37 +- .../gregtech/GregtechGeneratorsULV.java | 82 +- .../GregtechGeothermalThermalGenerator.java | 138 +- .../gregtech/GregtechHiAmpTransformer.java | 488 +- .../gregtech/GregtechIndustrialAlloySmelter.java | 25 +- .../gregtech/GregtechIndustrialArcFurnace.java | 26 +- .../gregtech/GregtechIndustrialBlastSmelter.java | 31 +- .../gregtech/GregtechIndustrialCentrifuge.java | 29 +- .../gregtech/GregtechIndustrialChisel.java | 29 +- .../gregtech/GregtechIndustrialCokeOven.java | 31 +- .../gregtech/GregtechIndustrialCuttingFactory.java | 30 +- .../gregtech/GregtechIndustrialElectrolyzer.java | 31 +- .../GregtechIndustrialElementDuplicator.java | 19 +- .../gregtech/GregtechIndustrialExtruder.java | 31 +- .../gregtech/GregtechIndustrialFishPond.java | 29 +- .../gregtech/GregtechIndustrialFluidHeater.java | 25 +- .../gregtech/GregtechIndustrialForgeHammer.java | 25 +- .../gregtech/GregtechIndustrialFuelRefinery.java | 29 +- .../gregtech/GregtechIndustrialGeneratorArray.java | 30 +- .../gregtech/GregtechIndustrialMacerator.java | 31 +- .../gregtech/GregtechIndustrialMassFabricator.java | 248 +- .../gregtech/GregtechIndustrialMixer.java | 30 +- .../gregtech/GregtechIndustrialMultiMachine.java | 29 +- .../gregtech/GregtechIndustrialMultiTank.java | 4 - .../gregtech/GregtechIndustrialPlatePress.java | 31 +- .../gregtech/GregtechIndustrialRockBreaker.java | 10 +- .../gregtech/GregtechIndustrialSifter.java | 29 +- .../GregtechIndustrialThermalCentrifuge.java | 29 +- .../gregtech/GregtechIndustrialTreeFarm.java | 30 +- .../gregtech/GregtechIndustrialWashPlant.java | 29 +- .../gregtech/GregtechIndustrialWiremill.java | 30 +- .../gregtech/GregtechIronBlastFurnace.java | 26 +- .../registration/gregtech/GregtechIsaMill.java | 23 +- .../registration/gregtech/GregtechLFTR.java | 54 +- .../GregtechLargeTurbinesAndHeatExchanger.java | 40 +- .../gregtech/GregtechMiniRaFusion.java | 18 +- .../gregtech/GregtechMolecularTransformer.java | 25 +- .../registration/gregtech/GregtechNaqReactor.java | 3 - .../gregtech/GregtechNitroDieselFix.java | 392 +- .../gregtech/GregtechPollutionDevices.java | 96 +- .../gregtech/GregtechPowerBreakers.java | 74 +- .../gregtech/GregtechPowerSubStation.java | 68 +- .../registration/gregtech/GregtechRTG.java | 23 +- .../gregtech/GregtechRocketFuelGenerator.java | 309 +- .../registration/gregtech/GregtechSafeBlock.java | 325 +- .../gregtech/GregtechSemiFluidgenerators.java | 25 +- .../gregtech/GregtechSimpleWasher.java | 185 +- .../gregtech/GregtechSolarGenerators.java | 76 +- .../registration/gregtech/GregtechSolarTower.java | 63 +- .../gregtech/GregtechSteamCondenser.java | 28 +- .../registration/gregtech/GregtechSteamMultis.java | 28 +- .../registration/gregtech/GregtechSuperChests.java | 170 +- .../gregtech/GregtechSuperConductionPoint.java | 23 +- .../registration/gregtech/GregtechTeslaTower.java | 11 +- .../gregtech/GregtechThaumcraftDevices.java | 29 +- .../gregtech/GregtechThreadedBuffers.java | 343 +- .../gregtech/GregtechTieredChunkloaders.java | 36 +- .../gregtech/GregtechTieredFluidTanks.java | 93 +- .../gregtech/GregtechTreeFarmerTE.java | 24 +- .../gregtech/GregtechWirelessChargers.java | 115 +- .../gregtech/NewHorizonsAccelerator.java | 295 +- 475 files changed, 97714 insertions(+), 85508 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java index 913b72fb0a..c0652c2a6d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java @@ -3,10 +3,6 @@ package gtPlusPlus.xmod.gregtech; import static gtPlusPlus.core.recipe.common.CI.bits; import static gtPlusPlus.core.util.minecraft.MaterialUtils.getMaterialName; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - import cpw.mods.fml.common.event.FMLLoadCompleteEvent; import gregtech.api.GregTech_API; import gregtech.api.enums.Element; @@ -18,8 +14,8 @@ import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; import gregtech.api.util.GT_Config; import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_ModHandler.RecipeBits; +import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.api.util.GT_Utility; @@ -70,431 +66,478 @@ import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_MolecularTransformer import gtPlusPlus.xmod.gregtech.recipes.RecipesToRemove; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechNitroDieselFix; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; public class HANDLER_GT { - public static GT_Config mMaterialProperties = null; + public static GT_Config mMaterialProperties = null; + + public static GTPP_Config sCustomWorldgenFile = null; + public static final List sWorldgenListEverglades = new ArrayList(); + public static final List sWorldgenListAustralia = new ArrayList(); + public static final List sCustomWorldgenList = new ArrayList(); + public static GT_MetaGenerated_Tool sMetaGeneratedToolInstance; + + public static void preInit() { + + if (mMaterialProperties != null) { + GT_Materials.init(mMaterialProperties); + } + + if (ConfigSwitches.enableOldGTcircuits && !CORE.GTNH) { + OldCircuitHandler.preInit(); + } + + GregtechFluidHandler.run(); + } + + public static void init() { + + // Load General Blocks and set up some Basic Meta Tile Entity states + Gregtech_Blocks.run(); + + // Add Custom Pipes, Wires and Cables. + GregtechConduits.run(); + + // Register Tile Entities + COMPAT_HANDLER.registerGregtechMachines(); + + // Only loads if the config option is true (default: true) + if (CORE.ConfigSwitches.enableSkookumChoochers) { + sMetaGeneratedToolInstance = MetaGeneratedGregtechTools.getInstance(); + } + + if (ConfigSwitches.enableOldGTcircuits && !CORE.GTNH) { + OldCircuitHandler.init(); + } + + // Generates recipes for all gregtech smelting and alloy smelting combinations. + // RecipeGen_BlastSmelterGT.generateRecipes(); + // new RecipeGen_BlastSmelterGT_Ex(); + + } + + public static void postInit() { + + // Only loads if the config option is true (default: true) + if (CORE.ConfigSwitches.enableSkookumChoochers) { + new ProcessingToolHeadChoocher().run(); + } + new ProcessingAngleGrinder().run(); + new ProcessingElectricSnips().run(); + new ProcessingElectricButcherKnife().run(); + new ProcessingElectricLighter().run(); + + if (CORE.ConfigSwitches.enableNitroFix) { + GregtechNitroDieselFix.run(); + } + + if (ConfigSwitches.enableOldGTcircuits && !CORE.GTNH) { + OldCircuitHandler.postInit(); + } + + // Register custom singles to the PA + AddCustomMachineToPA.register(); + + // Register the No-Bonus Special Behaviour. + Multiblock_API.registerSpecialMultiBehaviour(new NoOutputBonusMultiBehaviour()); + Multiblock_API.registerSpecialMultiBehaviour(new NoSpeedBonusMultiBehaviour()); + Multiblock_API.registerSpecialMultiBehaviour(new NoEUBonusMultiBehaviour()); + + // Register some custom recipe maps for any enabled multiblocks. + // MultiblockRecipeMapHandler.run(); + + if (GregtechItemList.Circuit_BioRecipeSelector.hasBeenSet()) { + for (int i = 1; i <= 24; i++) { + GregTech_API.registerConfigurationCircuit(CI.getNumberedBioCircuit(i), 0); + } + } + + if (GregtechItemList.Circuit_T3RecipeSelector.hasBeenSet()) { + for (int i = 1; i <= 24; i++) { + GregTech_API.registerConfigurationCircuit(CI.getNumberedAdvancedCircuit(i), 3); + } + } + } + + public static void onLoadComplete(FMLLoadCompleteEvent event) { + removeCrudeTurbineRotors(); + // cleanAssemblyLineRecipeMap(); + if (ConfigSwitches.enableHarderRecipesForHighTierCasings) { + removeOldHighTierCasingRecipes(); + } + RecipesToRemove.go(); + convertPyroToCokeOven(); + generateElementalDuplicatorRecipes(); + Meta_GT_Proxy.fixIC2FluidNames(); + GT_Computercube_Description.addStandardDescriptions(); + GT_ComputerCube_Setup.init(); + RecipeLoader_AlgaeFarm.generateRecipes(); + if (LoadedMods.AdvancedSolarPanel) { + RecipeLoader_MolecularTransformer.run(); + } + } + + public static void addNewOrePrefixes() { + for (CustomOrePrefix aPrefixTest : CustomOrePrefix.values()) { + Logger.INFO("Adding " + aPrefixTest.name() + " to OrePrefixes Enum."); + Logger.INFO("Injecting: " + aPrefixTest.addToEnum()); + } + } + + private static void generateElementalDuplicatorRecipes() { + for (GT_Recipe aRecipe : GT_Recipe_Map.sReplicatorFakeRecipes.mRecipeList) { + Object aDataOrb = aRecipe.mSpecialItems; + if (aDataOrb != null) { + ItemStack aOutput = aRecipe.mOutputs[0]; + if (aOutput != null) { + FluidStack aFluid = aRecipe.mFluidInputs[0]; + if (aFluid != null && aFluid.amount > 0) { + ItemStack tDataOrb = GregtechMTE_ElementalDuplicator.getSpecialSlotStack(aRecipe); + Materials tMaterial = Element.get(Behaviour_DataOrb.getDataName(tDataOrb)) + .mLinkedMaterials + .get(0); + FluidStack aOutputFluid = null; + ItemStack aOutputItem = null; + if (tMaterial != null) { + boolean aUsingFluid = false; + if ((aOutputItem = GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial, 1L)) == null) { + if ((aOutputItem = GT_OreDictUnificator.get(OrePrefixes.cell, tMaterial, 1L)) != null) { + aOutputFluid = GT_Utility.getFluidForFilledItem(aOutputItem, true); + aUsingFluid = true; + } + } + GTPP_Recipe aNewRecipe = new GTPP_Recipe( + false, + new ItemStack[] {}, + new ItemStack[] {!aUsingFluid ? aOutputItem : null}, + aRecipe.mSpecialItems, + null, + aRecipe.mFluidInputs, + new FluidStack[] {aUsingFluid ? aOutputFluid : null}, + aRecipe.mDuration, + aRecipe.mEUt, + aRecipe.mFluidInputs[0].amount); + GTPP_Recipe_Map.sElementalDuplicatorRecipes.add(aNewRecipe); + + Logger.INFO("[EM] Generated recipe for " + tMaterial.mLocalizedName + ", Outputs " + + (aUsingFluid ? "Fluid" : "Dust")); + } + } else { + Logger.INFO("[EM] Bad UU Requirement. " + RecipeUtils.getRecipeInfo(aRecipe)); + } + } else { + Logger.INFO("[EM] Bad Output. " + RecipeUtils.getRecipeInfo(aRecipe)); + } + } else { + Logger.INFO("[EM] Bad Data Orb. " + RecipeUtils.getRecipeInfo(aRecipe)); + } + } + int aSize = GTPP_Recipe_Map.sElementalDuplicatorRecipes.mRecipeList.size(); + Logger.INFO("[EM] Generated " + aSize + "/" + GT_Recipe_Map.sReplicatorFakeRecipes.mRecipeList.size() + + " Replicator recipes."); + } + + private static void convertPyroToCokeOven() { + if (ReflectionUtils.doesFieldExist(GT_Recipe.GT_Recipe_Map.class, "sPyrolyseRecipes")) { + int aCount = 0; + GT_Recipe_Map aMap = StaticFields59.getPyrolyseRecipeMap(); + if (aMap != null) { + for (GT_Recipe g : aMap.mRecipeList) { + if (AddGregtechRecipe.importPyroRecipe(g)) { + aCount++; + } + } + Logger.INFO("Converted " + aCount + " Pyrolyse recipes into Industrial Coke Oven recipes."); + } + } + } + + private static GT_Recipe replaceItemInRecipeWithAnother( + GT_Recipe aRecipe, ItemStack aExisting, ItemStack aNewItem) { + ItemStack[] aInputItemsCopy = aRecipe.mInputs; + String aOutputName = ItemUtils.getItemName(aRecipe.mOutputs[0]); + boolean aDidChange = false; + Logger.INFO("Attempting to Modify Recipe for " + aOutputName); + for (int i = 0; i < aRecipe.mInputs.length; i++) { + ItemStack aCurrentInputSlot = aRecipe.mInputs[i]; + if (aCurrentInputSlot != null) { + if (GT_Utility.areStacksEqual(aCurrentInputSlot, aExisting, true)) { + aInputItemsCopy[i] = ItemUtils.getSimpleStack(aNewItem, aCurrentInputSlot.stackSize); + aDidChange = true; + } + } + } + if (aDidChange) { + aRecipe.mInputs = aInputItemsCopy; + Logger.INFO("Modifed Recipe for " + aOutputName); + return aRecipe; + } else { + Logger.INFO("Failed to Modify Recipe for " + aOutputName); + return aRecipe; + } + } - public static GTPP_Config sCustomWorldgenFile = null; - public static final List sWorldgenListEverglades = new ArrayList(); - public static final List sWorldgenListAustralia = new ArrayList(); - public static final List sCustomWorldgenList = new ArrayList(); - public static GT_MetaGenerated_Tool sMetaGeneratedToolInstance; - - public static void preInit(){ - - if (mMaterialProperties != null){ - GT_Materials.init(mMaterialProperties); - } - - if (ConfigSwitches.enableOldGTcircuits && !CORE.GTNH){ - OldCircuitHandler.preInit(); - } - - GregtechFluidHandler.run(); - } - - public static void init(){ - - //Load General Blocks and set up some Basic Meta Tile Entity states - Gregtech_Blocks.run(); - - //Add Custom Pipes, Wires and Cables. - GregtechConduits.run(); - - //Register Tile Entities - COMPAT_HANDLER.registerGregtechMachines(); - - - //Only loads if the config option is true (default: true) - if (CORE.ConfigSwitches.enableSkookumChoochers){ - sMetaGeneratedToolInstance= MetaGeneratedGregtechTools.getInstance(); - } - - if (ConfigSwitches.enableOldGTcircuits && !CORE.GTNH){ - OldCircuitHandler.init(); - } - - //Generates recipes for all gregtech smelting and alloy smelting combinations. - //RecipeGen_BlastSmelterGT.generateRecipes(); - //new RecipeGen_BlastSmelterGT_Ex(); - - } - - public static void postInit(){ - - //Only loads if the config option is true (default: true) - if (CORE.ConfigSwitches.enableSkookumChoochers){ - new ProcessingToolHeadChoocher().run(); - } - new ProcessingAngleGrinder().run(); - new ProcessingElectricSnips().run(); - new ProcessingElectricButcherKnife().run(); - new ProcessingElectricLighter().run(); - - if (CORE.ConfigSwitches.enableNitroFix){ - GregtechNitroDieselFix.run(); - } - - if (ConfigSwitches.enableOldGTcircuits && !CORE.GTNH){ - OldCircuitHandler.postInit(); - } - - // Register custom singles to the PA - AddCustomMachineToPA.register(); - - - // Register the No-Bonus Special Behaviour. - Multiblock_API.registerSpecialMultiBehaviour(new NoOutputBonusMultiBehaviour()); - Multiblock_API.registerSpecialMultiBehaviour(new NoSpeedBonusMultiBehaviour()); - Multiblock_API.registerSpecialMultiBehaviour(new NoEUBonusMultiBehaviour()); - - //Register some custom recipe maps for any enabled multiblocks. - //MultiblockRecipeMapHandler.run(); - - if (GregtechItemList.Circuit_BioRecipeSelector.hasBeenSet()) { - for (int i = 1; i <= 24; i++) { - GregTech_API.registerConfigurationCircuit(CI.getNumberedBioCircuit(i), 0); - } - } - - if (GregtechItemList.Circuit_T3RecipeSelector.hasBeenSet()) { - for (int i = 1; i <= 24; i++) { - GregTech_API.registerConfigurationCircuit(CI.getNumberedAdvancedCircuit(i), 3); - } - } - } - - public static void onLoadComplete(FMLLoadCompleteEvent event) { - removeCrudeTurbineRotors(); - //cleanAssemblyLineRecipeMap(); - if (ConfigSwitches.enableHarderRecipesForHighTierCasings) { - removeOldHighTierCasingRecipes(); - } - RecipesToRemove.go(); - convertPyroToCokeOven(); - generateElementalDuplicatorRecipes(); - Meta_GT_Proxy.fixIC2FluidNames(); - GT_Computercube_Description.addStandardDescriptions(); - GT_ComputerCube_Setup.init(); - RecipeLoader_AlgaeFarm.generateRecipes(); - if (LoadedMods.AdvancedSolarPanel) { - RecipeLoader_MolecularTransformer.run(); - } - } - - public static void addNewOrePrefixes() { - for (CustomOrePrefix aPrefixTest : CustomOrePrefix.values()) { - Logger.INFO("Adding "+aPrefixTest.name()+" to OrePrefixes Enum."); - Logger.INFO("Injecting: "+aPrefixTest.addToEnum()); - } - } - - - private static void generateElementalDuplicatorRecipes() { - for (GT_Recipe aRecipe : GT_Recipe_Map.sReplicatorFakeRecipes.mRecipeList) { - Object aDataOrb = aRecipe.mSpecialItems; - if (aDataOrb != null) { - ItemStack aOutput = aRecipe.mOutputs[0]; - if (aOutput != null) { - FluidStack aFluid = aRecipe.mFluidInputs[0]; - if (aFluid != null && aFluid.amount > 0) { - ItemStack tDataOrb = GregtechMTE_ElementalDuplicator.getSpecialSlotStack(aRecipe); - Materials tMaterial = Element.get(Behaviour_DataOrb.getDataName(tDataOrb)).mLinkedMaterials.get(0); - FluidStack aOutputFluid = null; - ItemStack aOutputItem = null; - if (tMaterial != null) { - boolean aUsingFluid = false; - if ((aOutputItem = GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial, 1L)) == null) { - if ((aOutputItem = GT_OreDictUnificator.get(OrePrefixes.cell, tMaterial, 1L)) != null) { - aOutputFluid = GT_Utility.getFluidForFilledItem(aOutputItem, true); - aUsingFluid = true; - } - } - GTPP_Recipe aNewRecipe = new GTPP_Recipe( - false, - new ItemStack[] {}, - new ItemStack[] {!aUsingFluid ? aOutputItem : null}, - aRecipe.mSpecialItems, - null, - aRecipe.mFluidInputs, - new FluidStack[] {aUsingFluid ? aOutputFluid : null}, - aRecipe.mDuration, - aRecipe.mEUt, - aRecipe.mFluidInputs[0].amount); - GTPP_Recipe_Map.sElementalDuplicatorRecipes.add(aNewRecipe); - - Logger.INFO("[EM] Generated recipe for "+tMaterial.mLocalizedName+", Outputs "+(aUsingFluid ? "Fluid" : "Dust")); - } - } - else { - Logger.INFO("[EM] Bad UU Requirement. "+RecipeUtils.getRecipeInfo(aRecipe)); - } - } - else { - Logger.INFO("[EM] Bad Output. "+RecipeUtils.getRecipeInfo(aRecipe)); - } - } - else { - Logger.INFO("[EM] Bad Data Orb. "+RecipeUtils.getRecipeInfo(aRecipe)); - } - } - int aSize = GTPP_Recipe_Map.sElementalDuplicatorRecipes.mRecipeList.size(); - Logger.INFO("[EM] Generated "+aSize+"/"+GT_Recipe_Map.sReplicatorFakeRecipes.mRecipeList.size()+" Replicator recipes."); - } - - private static void convertPyroToCokeOven() { - if (ReflectionUtils.doesFieldExist(GT_Recipe.GT_Recipe_Map.class, "sPyrolyseRecipes")) { - int aCount = 0; - GT_Recipe_Map aMap = StaticFields59.getPyrolyseRecipeMap(); - if (aMap != null) { - for (GT_Recipe g : aMap.mRecipeList) { - if (AddGregtechRecipe.importPyroRecipe(g)) { - aCount++; - } - } - Logger.INFO("Converted "+aCount+" Pyrolyse recipes into Industrial Coke Oven recipes."); - } - } + private static void updateRecipeMap(GT_Recipe aOld, GT_Recipe aNew, GT_Recipe_Map aMap) { + RecipeUtils.removeGtRecipe(aOld, aMap); + RecipeUtils.addGtRecipe(aNew, aMap); + Logger.INFO("Updating recipe map: " + aMap.mNEIName); + Logger.INFO("Removed Recipe with hash: " + aOld.hashCode()); + Logger.INFO("Added Recipe with hash: " + aNew.hashCode()); } - private static GT_Recipe replaceItemInRecipeWithAnother(GT_Recipe aRecipe, ItemStack aExisting, ItemStack aNewItem) { - ItemStack[] aInputItemsCopy = aRecipe.mInputs; - String aOutputName = ItemUtils.getItemName(aRecipe.mOutputs[0]); - boolean aDidChange = false; - Logger.INFO("Attempting to Modify Recipe for "+aOutputName); - for (int i=0;i> aDataToModify = new AutoMap>(); - - - Outer :for (final GT_Recipe r : GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.mRecipeList) { - - if (r != null && r.mOutputs != null && r.mOutputs.length > 0) { - - GT_Recipe aOldRecipeCopy = r; - GT_Recipe aNewRecipe = r.copy(); - - //Casings - Inner : for (ItemStack aCasingObject : aCasings) { - if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aCasingObject)) { - String aOutputName = ItemUtils.getItemName(aOldRecipeCopy.mOutputs[0]); - Logger.INFO("Attempting to Modify Assembly Recipe for "+aOutputName); - //Replace Chrome - if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aCasing_LUV)) { - aNewRecipe = replaceItemInRecipeWithAnother(aOldRecipeCopy, ItemUtils.getItemStackOfAmountFromOreDict("plateChrome", 1), ELEMENT.getInstance().SELENIUM.getPlate(1)); - aDataToModify.put(new Pair(r, aNewRecipe)); - aUpdateCount++; - continue Outer; - } - //Replace Iridium - else if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aCasing_ZPM)) { - aNewRecipe = replaceItemInRecipeWithAnother(aOldRecipeCopy, ItemUtils.getItemStackOfAmountFromOreDict("plateIridium", 1), CI.getPlate(aTier_ZPM, 1)); - aDataToModify.put(new Pair(r, aNewRecipe)); + + Outer: + for (final GT_Recipe r : GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.mRecipeList) { + + if (r != null && r.mOutputs != null && r.mOutputs.length > 0) { + + GT_Recipe aOldRecipeCopy = r; + GT_Recipe aNewRecipe = r.copy(); + + // Casings + Inner: + for (ItemStack aCasingObject : aCasings) { + if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aCasingObject)) { + String aOutputName = ItemUtils.getItemName(aOldRecipeCopy.mOutputs[0]); + Logger.INFO("Attempting to Modify Assembly Recipe for " + aOutputName); + // Replace Chrome + if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aCasing_LUV)) { + aNewRecipe = replaceItemInRecipeWithAnother( + aOldRecipeCopy, + ItemUtils.getItemStackOfAmountFromOreDict("plateChrome", 1), + ELEMENT.getInstance().SELENIUM.getPlate(1)); + aDataToModify.put(new Pair(r, aNewRecipe)); + aUpdateCount++; + continue Outer; + } + // Replace Iridium + else if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aCasing_ZPM)) { + aNewRecipe = replaceItemInRecipeWithAnother( + aOldRecipeCopy, + ItemUtils.getItemStackOfAmountFromOreDict("plateIridium", 1), + CI.getPlate(aTier_ZPM, 1)); + aDataToModify.put(new Pair(r, aNewRecipe)); aUpdateCount++; - continue Outer; - } - //Replace Osmium - else if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aCasing_UV)) { - aNewRecipe = replaceItemInRecipeWithAnother(aOldRecipeCopy, ItemUtils.getItemStackOfAmountFromOreDict("plateOsmium", 1), CI.getPlate(aTier_UV, 1)); - aDataToModify.put(new Pair(r, aNewRecipe)); + continue Outer; + } + // Replace Osmium + else if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aCasing_UV)) { + aNewRecipe = replaceItemInRecipeWithAnother( + aOldRecipeCopy, + ItemUtils.getItemStackOfAmountFromOreDict("plateOsmium", 1), + CI.getPlate(aTier_UV, 1)); + aDataToModify.put(new Pair(r, aNewRecipe)); aUpdateCount++; - continue Outer; - } - //else if (aOldRecipeCopy.mOutputs[0] == aCasing_LUV) { - // aOldRecipeCopy = replaceItemInRecipeWithAnother(aOldRecipeCopy, ItemUtils.getItemStackOfAmountFromOreDict("plateChrome", 8), CI.getPlate(aTier_MAX, 8)); - // updateRecipeMap(aOldRecipeCopy, aNewRecipe, GT_Recipe.GT_Recipe_Map.sAssemblerRecipes); - //} - else { - continue Inner; - } - } - } - - //Hulls - Inner : for (ItemStack aHullObject : aHulls) { - if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aHullObject)) { + continue Outer; + } + // else if (aOldRecipeCopy.mOutputs[0] == aCasing_LUV) { + // aOldRecipeCopy = replaceItemInRecipeWithAnother(aOldRecipeCopy, + // ItemUtils.getItemStackOfAmountFromOreDict("plateChrome", 8), CI.getPlate(aTier_MAX, 8)); + // updateRecipeMap(aOldRecipeCopy, aNewRecipe, GT_Recipe.GT_Recipe_Map.sAssemblerRecipes); + // } + else { + continue Inner; + } + } + } + + // Hulls + Inner: + for (ItemStack aHullObject : aHulls) { + if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aHullObject)) { String aOutputName = ItemUtils.getItemName(aOldRecipeCopy.mOutputs[0]); - Logger.INFO("Attempting to Modify Assembly Recipe for "+aOutputName); - //Replace Chrome - if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aHull_LUV)) { - aNewRecipe = replaceItemInRecipeWithAnother(aOldRecipeCopy, ItemUtils.getItemStackOfAmountFromOreDict("plateChrome", 1), ELEMENT.getInstance().SELENIUM.getPlate(1)); - aDataToModify.put(new Pair(r, aNewRecipe)); + Logger.INFO("Attempting to Modify Assembly Recipe for " + aOutputName); + // Replace Chrome + if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aHull_LUV)) { + aNewRecipe = replaceItemInRecipeWithAnother( + aOldRecipeCopy, + ItemUtils.getItemStackOfAmountFromOreDict("plateChrome", 1), + ELEMENT.getInstance().SELENIUM.getPlate(1)); + aDataToModify.put(new Pair(r, aNewRecipe)); aUpdateCount++; - continue Outer; - } - //Replace Iridium - else if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aHull_ZPM)) { - aNewRecipe = replaceItemInRecipeWithAnother(aOldRecipeCopy, ItemUtils.getItemStackOfAmountFromOreDict("plateIridium", 1), CI.getPlate(aTier_ZPM, 1)); - aDataToModify.put(new Pair(r, aNewRecipe)); + continue Outer; + } + // Replace Iridium + else if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aHull_ZPM)) { + aNewRecipe = replaceItemInRecipeWithAnother( + aOldRecipeCopy, + ItemUtils.getItemStackOfAmountFromOreDict("plateIridium", 1), + CI.getPlate(aTier_ZPM, 1)); + aDataToModify.put(new Pair(r, aNewRecipe)); aUpdateCount++; - continue Outer; - } - //Replace Osmium - else if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aHull_UV)) { - aNewRecipe = replaceItemInRecipeWithAnother(aOldRecipeCopy, ItemUtils.getItemStackOfAmountFromOreDict("plateOsmium", 1), CI.getPlate(aTier_UV, 1)); - aDataToModify.put(new Pair(r, aNewRecipe)); + continue Outer; + } + // Replace Osmium + else if (GT_Utility.areStacksEqual(aOldRecipeCopy.mOutputs[0], aHull_UV)) { + aNewRecipe = replaceItemInRecipeWithAnother( + aOldRecipeCopy, + ItemUtils.getItemStackOfAmountFromOreDict("plateOsmium", 1), + CI.getPlate(aTier_UV, 1)); + aDataToModify.put(new Pair(r, aNewRecipe)); aUpdateCount++; - continue Outer; - } - //else if (aOldRecipeCopy.mOutputs[0] == aHull_LUV) { - // aOldRecipeCopy = replaceItemInRecipeWithAnother(aOldRecipeCopy, ItemUtils.getItemStackOfAmountFromOreDict("plateChrome", 8), CI.getPlate(aTier_MAX, 8)); - // updateRecipeMap(aOldRecipeCopy, aNewRecipe, GT_Recipe.GT_Recipe_Map.sAssemblerRecipes); - //} - else { - continue Inner; - } - } - } - } - } - - Logger.INFO("There is "+aUpdateCount+" recipes flagged for update."); - - if (aUpdateCount > 0) { - for (Pair g : aDataToModify) { - updateRecipeMap(g.getKey(), g.getValue(), GT_Recipe.GT_Recipe_Map.sAssemblerRecipes); - } - Logger.INFO("Modified "+aUpdateCount+" recipes."); + continue Outer; + } + // else if (aOldRecipeCopy.mOutputs[0] == aHull_LUV) { + // aOldRecipeCopy = replaceItemInRecipeWithAnother(aOldRecipeCopy, + // ItemUtils.getItemStackOfAmountFromOreDict("plateChrome", 8), CI.getPlate(aTier_MAX, 8)); + // updateRecipeMap(aOldRecipeCopy, aNewRecipe, GT_Recipe.GT_Recipe_Map.sAssemblerRecipes); + // } + else { + continue Inner; + } + } + } + } } - + Logger.INFO("There is " + aUpdateCount + " recipes flagged for update."); + + if (aUpdateCount > 0) { + for (Pair g : aDataToModify) { + updateRecipeMap(g.getKey(), g.getValue(), GT_Recipe.GT_Recipe_Map.sAssemblerRecipes); + } +