From 55f64675b42ac8d3c557cc850f78664bee006f6f Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 28 Jan 2023 19:32:44 -0800 Subject: [ci skip] spotlessApply with the new settings --- .../java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java | 164 +- .../xmod/gregtech/api/energy/IC2ElectricItem.java | 5 +- .../api/energy/IC2ElectricItemManager.java | 65 +- .../xmod/gregtech/api/enums/CustomGtTextures.java | 12 +- .../xmod/gregtech/api/enums/CustomOrePrefix.java | 92 +- .../xmod/gregtech/api/enums/GregtechItemList.java | 37 +- .../gregtech/api/enums/GregtechOreDictNames.java | 33 +- .../gregtech/api/enums/GregtechOrePrefixes.java | 1853 +++----------------- .../gregtech/api/enums/GregtechTextureSet.java | 41 +- .../xmod/gregtech/api/enums/GregtechTextures.java | 75 +- .../xmod/gregtech/api/gui/GTPP_UITextures.java | 180 +- .../api/gui/widget/DataStickSlotWidget.java | 7 +- .../api/gui/widget/ElectricSlotWidget.java | 11 +- .../api/interfaces/GregtechItemContainer.java | 1 + .../xmod/gregtech/api/interfaces/IHeatEntity.java | 3 +- .../api/interfaces/IMetaTileEntityHeatPipe.java | 4 +- .../interfaces/internal/IGregtech_RecipeAdder.java | 808 +++------ .../internal/Interface_IconContainer.java | 1 + .../internal/Interface_ItemBehaviour.java | 45 +- .../internal/Interface_OreRecipeRegistrator.java | 19 +- .../Interface_OreRecipeRegistrator_GT.java | 11 +- .../api/interfaces/internal/Interface_Texture.java | 1 + .../interfaces/internal/Interface_ToolStats.java | 50 +- .../gregtech/api/items/Gregtech_Generic_Item.java | 60 +- .../xmod/gregtech/api/items/Gregtech_MetaItem.java | 69 +- .../gregtech/api/items/Gregtech_MetaItem_Base.java | 207 +-- .../gregtech/api/items/Gregtech_MetaItem_X32.java | 58 +- .../xmod/gregtech/api/items/Gregtech_MetaTool.java | 267 +-- .../gregtech/api/items/tools/GT_MetaGenTool.java | 167 +- .../gregtech/api/items/types/ToolType_Base.java | 91 +- .../api/items/types/ToolType_HardHammer.java | 74 +- .../gregtech/api/items/types/ToolType_Pump.java | 192 +- .../gregtech/api/items/types/ToolType_Wrench.java | 160 +- .../api/metatileentity/BaseCustomTileEntity.java | 30 +- .../custom/power/BaseCustomPower_MTE.java | 20 +- .../power/GTPP_MTE_BasicLosslessGenerator.java | 104 +- .../custom/power/GTPP_MTE_BasicMachine.java | 329 ++-- .../custom/power/GTPP_MTE_BasicTank.java | 49 +- .../custom/power/GTPP_MTE_TieredMachineBlock.java | 37 +- .../custom/power/MetaTileEntityCustomPower.java | 54 +- .../GT_MetaTileEntity_BasicBreaker.java | 104 +- ...GT_MetaTileEntity_BasicMachine_GTPP_Recipe.java | 67 +- .../GT_MetaTileEntity_Dehydrator.java | 78 +- .../GT_MetaTileEntity_DeluxeMachine.java | 320 ++-- .../GT_MetaTileEntity_DeluxeTank.java | 108 +- .../GT_MetaTileEntity_Hatch_AirIntake.java | 18 +- .../GT_MetaTileEntity_Hatch_AirIntake_Extreme.java | 8 +- .../GT_MetaTileEntity_Hatch_ControlCore.java | 48 +- .../GT_MetaTileEntity_Hatch_DynamoBuffer.java | 49 +- ...etaTileEntity_Hatch_ElementalDataOrbHolder.java | 66 +- .../GT_MetaTileEntity_Hatch_Energy_RTG.java | 52 +- .../GT_MetaTileEntity_Hatch_FluidGenerator.java | 56 +- .../GT_MetaTileEntity_Hatch_InputBattery.java | 46 +- .../GT_MetaTileEntity_Hatch_Muffler_Adv.java | 52 +- .../GT_MetaTileEntity_Hatch_Naquadah.java | 78 +- .../GT_MetaTileEntity_Hatch_OutputBattery.java | 46 +- .../GT_MetaTileEntity_Hatch_Plasma.java | 77 +- .../GT_MetaTileEntity_Hatch_Reservoir.java | 44 +- .../GT_MetaTileEntity_Hatch_Steam_BusInput.java | 186 +- .../GT_MetaTileEntity_Hatch_Steam_BusOutput.java | 159 +- .../GT_MetaTileEntity_Hatch_Turbine.java | 68 +- .../GT_MetaTileEntity_Hatch_TurbineProvider.java | 42 +- .../GT_MetaTileEntity_SuperBus_Input.java | 15 +- .../GT_MetaTileEntity_SuperBus_Output.java | 24 +- .../GregtechMetaPipeEntityFluid.java | 164 +- .../GregtechMetaPipeEntity_Cable.java | 260 +-- .../GregtechMetaTreeFarmerStructural.java | 32 +- .../implementations/base/CustomMetaTileBase.java | 38 +- .../GT_MetaTileEntity_Hatch_CustomFluidBase.java | 66 +- .../base/GregtechMetaPipeEntityBase_Cable.java | 342 ++-- .../base/GregtechMetaTileEntity.java | 28 +- .../base/GregtechMetaTransformerHiAmp.java | 76 +- .../base/GregtechMeta_MultiBlockBase.java | 1311 +++++++------- .../base/GregtechMeta_SteamMultiBase.java | 139 +- .../GregtechDoubleFuelGeneratorBase.java | 227 ++- .../base/generators/GregtechMetaBoilerBase.java | 180 +- .../generators/GregtechMetaSolarGenerator.java | 70 +- .../GregtechRocketFuelGeneratorBase.java | 164 +- .../base/machines/GregtechMetaSafeBlockBase.java | 126 +- .../base/machines/GregtechMetaTreeFarmerBase.java | 61 +- .../GT_MetaTileEntity_Hatch_Catalysts.java | 9 +- .../GT_MetaTileEntity_Hatch_MillingBalls.java | 9 +- .../GT_MetaTileEntity_Hatch_NbtConsumable.java | 145 +- .../api/objects/GTPP_CopiedBlockTexture.java | 4 +- .../gregtech/api/objects/GTPP_RenderedTexture.java | 1 + .../xmod/gregtech/api/objects/GregtechFluid.java | 7 +- .../gregtech/api/objects/GregtechItemData.java | 26 +- .../api/objects/GregtechMaterialStack.java | 4 +- .../ProcessingSkookumChoocherToolRecipes.java | 20 +- .../xmod/gregtech/api/util/GTPP_Config.java | 30 +- .../api/util/GregtechOreDictUnificator.java | 90 +- .../api/util/SpecialBehaviourTooltipHandler.java | 6 +- .../xmod/gregtech/api/world/GTPP_Worldgen.java | 27 +- .../gregtech/api/world/GTPP_Worldgen_Boulder.java | 44 +- .../api/world/GTPP_Worldgen_GT_Ore_Layer.java | 206 +-- .../gregtech/api/world/GTPP_Worldgen_Handler.java | 13 +- .../xmod/gregtech/api/world/GTPP_Worldgen_Ore.java | 19 +- .../api/world/GTPP_Worldgen_Ore_Normal.java | 76 +- .../xmod/gregtech/api/world/GT_OreVein_Object.java | 13 +- .../xmod/gregtech/api/world/WorldGenUtils.java | 27 +- .../xmod/gregtech/common/Meta_GT_Proxy.java | 324 ++-- .../xmod/gregtech/common/StaticFields59.java | 41 +- .../common/blocks/GTPP_Block_Machines.java | 119 +- .../gregtech/common/blocks/GTPP_Item_Machines.java | 211 +-- .../common/blocks/GregtechMetaCasingBlocks.java | 26 +- .../common/blocks/GregtechMetaCasingBlocks2.java | 25 +- .../common/blocks/GregtechMetaCasingBlocks3.java | 74 +- .../common/blocks/GregtechMetaCasingBlocks4.java | 21 +- .../common/blocks/GregtechMetaCasingBlocks5.java | 47 +- .../blocks/GregtechMetaCasingBlocksAbstract.java | 31 +- .../GregtechMetaCasingBlocksPipeGearbox.java | 12 +- .../common/blocks/GregtechMetaCasingItems.java | 1 + .../common/blocks/GregtechMetaItemCasings1.java | 6 +- .../blocks/GregtechMetaItemCasingsAbstract.java | 32 +- .../blocks/GregtechMetaSpecialMachineCasings.java | 24 +- .../blocks/GregtechMetaSpecialMultiCasings.java | 50 +- .../blocks/GregtechMetaSpecialMultiCasings2.java | 18 +- .../blocks/GregtechMetaTieredCasingBlocks1.java | 12 +- .../common/blocks/fluid/GregtechFluidHandler.java | 50 +- .../blocks/textures/CasingTextureHandler.java | 51 +- .../blocks/textures/CasingTextureHandler2.java | 3 +- .../blocks/textures/CasingTextureHandler3.java | 3 +- .../textures/TexturesCentrifugeMultiblock.java | 70 +- .../common/blocks/textures/TexturesGregtech58.java | 113 +- .../common/blocks/textures/TexturesGregtech59.java | 149 +- .../blocks/textures/TexturesGrinderMultiblock.java | 58 +- .../common/blocks/textures/TexturesGtBlock.java | 654 ++++--- .../blocks/textures/TexturesGtCutomCovers.java | 15 +- .../common/blocks/textures/TexturesGtTools.java | 8 +- .../turbine/LargeTurbineTextureHandler.java | 171 +- .../common/computer/GT_ComputerCube_Setup.java | 76 +- .../computer/GT_Computercube_Description.java | 754 +++----- .../common/computer/GT_Computercube_Simulator.java | 72 +- .../xmod/gregtech/common/covers/CoverManager.java | 158 +- .../common/covers/GTPP_Cover_Overflow.java | 103 +- .../common/covers/GTPP_Cover_Overflow_Item.java | 56 +- .../common/covers/GTPP_Cover_ToggleVisual.java | 57 +- .../gregtech/common/helpers/ChargingHelper.java | 152 +- .../gregtech/common/helpers/CraftingHelper.java | 5 +- .../common/helpers/FlotationRecipeHandler.java | 8 +- .../gregtech/common/helpers/GT_MethodHelper.java | 37 +- .../common/helpers/MachineUpdateHandler.java | 6 +- .../gregtech/common/helpers/TreeFarmHelper.java | 230 +-- .../common/helpers/VolumetricFlaskHelper.java | 24 +- .../helpers/autocrafter/AC_Helper_Container.java | 7 +- .../helpers/autocrafter/AC_Helper_Utils.java | 8 +- .../common/helpers/tesseract/TesseractHelper.java | 54 +- .../common/helpers/treefarm/TreeGenerator.java | 107 +- .../gregtech/common/items/MetaCustomCoverItem.java | 49 +- .../common/items/MetaGeneratedGregtechItems.java | 1534 +++++++++------- .../common/items/MetaGeneratedGregtechTools.java | 64 +- .../items/behaviours/Behaviour_Choocher.java | 54 +- .../behaviours/Behaviour_Electric_Lighter.java | 86 +- .../common/items/behaviours/Behaviour_Grinder.java | 44 +- .../items/behaviours/Behaviour_Prospecting_Ex.java | 73 +- .../common/items/covers/MetaItemCoverCasings.java | 13 +- .../gregtech/common/render/GTPP_CapeRenderer.java | 127 +- .../gregtech/common/render/GTPP_FlaskRenderer.java | 10 +- .../common/render/GTPP_Render_MachineBlock.java | 184 +- .../GT_MetaTileEntity_ElectricAutoWorkbench.java | 295 ++-- ...GT_MetaTileEntity_ElectricInventoryManager.java | 640 +++---- .../GT_MetaTileEntity_TesseractGenerator.java | 179 +- .../GT_MetaTileEntity_TesseractTerminal.java | 161 +- .../generators/GT_MetaTileEntity_Boiler_Base.java | 55 +- .../generators/GT_MetaTileEntity_Boiler_HV.java | 19 +- .../generators/GT_MetaTileEntity_Boiler_LV.java | 19 +- .../generators/GT_MetaTileEntity_Boiler_MV.java | 19 +- .../generators/GT_MetaTileEntity_Boiler_Solar.java | 78 +- .../generators/GT_MetaTileEntity_RfConvertor.java | 192 +- .../GT_MetaTileEntity_SemiFluidGenerator.java | 79 +- ...gtechMetaTileEntityDoubleFuelGeneratorBase.java | 92 +- .../GregtechMetaTileEntityGeothermalGenerator.java | 88 +- .../GregtechMetaTileEntityRocketFuelGenerator.java | 75 +- .../GregtechMetaTileEntitySolarGenerator.java | 175 +- .../generators/GregtechMetaTileEntity_RTG.java | 141 +- .../GT_MetaTileEntity_ULV_CombustionGenerator.java | 17 +- .../ULV/GT_MetaTileEntity_ULV_GasTurbine.java | 19 +- .../ULV/GT_MetaTileEntity_ULV_SteamTurbine.java | 19 +- .../creative/GregtechMetaCreativeEnergyBuffer.java | 86 +- .../basic/GT_MetaTileEntity_CropHarvestor.java | 237 +-- .../basic/GT_MetaTileEntity_WorldAccelerator.java | 95 +- .../GregtechMetaAtmosphericReconditioner.java | 315 ++-- .../machines/basic/GregtechMetaCondensor.java | 171 +- .../basic/GregtechMetaGarbageCollector.java | 113 +- .../basic/GregtechMetaPollutionCreator.java | 133 +- .../basic/GregtechMetaPollutionDetector.java | 159 +- .../basic/GregtechMetaTileEntityChunkLoader.java | 179 +- ...GregtechMetaTileEntityThaumcraftResearcher.java | 86 +- .../basic/GregtechMetaTileEntity_AutoChisel.java | 72 +- .../basic/GregtechMetaTileEntity_BasicWasher.java | 44 +- .../GregtechMetaTileEntity_ChemicalReactor.java | 186 +- ...regtechMetaTileEntity_CompactFusionReactor.java | 187 +- .../basic/GregtechMetaTileEntity_PocketFusion.java | 188 +- .../GregtechMetaTileEntity_ReactorColdTrap.java | 47 +- ...egtechMetaTileEntity_ReactorProcessingUnit.java | 36 +- .../basic/GregtechMetaWirelessCharger.java | 202 +-- .../machines/multi/misc/GMTE_AmazonPackager.java | 89 +- .../multi/misc/GregtechMTE_TeslaTower.java | 118 +- ...gtechMetaTileEntity_IndustrialAlloySmelter.java | 111 +- ...regtechMetaTileEntity_IndustrialArcFurnace.java | 113 +- ...regtechMetaTileEntity_IndustrialCentrifuge.java | 54 +- .../GregtechMetaTileEntity_IndustrialChisel.java | 81 +- .../GregtechMetaTileEntity_IndustrialCokeOven.java | 67 +- ...echMetaTileEntity_IndustrialCuttingMachine.java | 55 +- ...regtechMetaTileEntity_IndustrialDehydrator.java | 103 +- ...gtechMetaTileEntity_IndustrialElectrolyzer.java | 49 +- .../GregtechMetaTileEntity_IndustrialExtruder.java | 52 +- ...egtechMetaTileEntity_IndustrialFluidHeater.java | 66 +- ...egtechMetaTileEntity_IndustrialForgeHammer.java | 63 +- ...GregtechMetaTileEntity_IndustrialMacerator.java | 89 +- .../GregtechMetaTileEntity_IndustrialMixer.java | 58 +- ...aTileEntity_IndustrialMolecularTransformer.java | 70 +- ...gtechMetaTileEntity_IndustrialMultiMachine.java | 125 +- ...regtechMetaTileEntity_IndustrialPlatePress.java | 55 +- .../GregtechMetaTileEntity_IndustrialSifter.java | 73 +- .../GregtechMetaTileEntity_IndustrialSinter.java | 329 +--- ...MetaTileEntity_IndustrialThermalCentrifuge.java | 38 +- ...techMetaTileEntity_IndustrialVacuumFreezer.java | 86 +- ...GregtechMetaTileEntity_IndustrialWashPlant.java | 88 +- .../GregtechMetaTileEntity_IndustrialWireMill.java | 81 +- .../GregtechMetaTileEntity_IronBlastFurnace.java | 280 ++- .../processing/GregtechMetaTileEntity_IsaMill.java | 113 +- .../GregtechMetaTileEntity_SpargeTower.java | 115 +- .../GregtechMetaTileEntity_Adv_AssemblyLine.java | 201 ++- ...egtechMetaTileEntity_Adv_DistillationTower.java | 137 +- .../advanced/GregtechMetaTileEntity_Adv_EBF.java | 130 +- .../GregtechMetaTileEntity_Adv_Fusion_MK4.java | 70 +- .../GregtechMetaTileEntity_Adv_HeatExchanger.java | 228 +-- .../GregtechMetaTileEntity_Adv_Implosion.java | 31 +- .../GregtechMetaTileEntity_SteamCompressor.java | 41 +- .../GregtechMetaTileEntity_SteamMacerator.java | 41 +- .../multi/production/GT4Entity_AutoCrafter.java | 265 +-- .../multi/production/GT4Entity_ThermalBoiler.java | 63 +- .../GregtechMTE_ElementalDuplicator.java | 301 ++-- .../production/GregtechMTE_FastNeutronReactor.java | 254 +-- .../production/GregtechMTE_FrothFlotationCell.java | 87 +- .../production/GregtechMTE_LargeNaqReactor.java | 623 ++----- .../production/GregtechMTE_MiniFusionPlant.java | 444 +---- .../production/GregtechMTE_NuclearReactor.java | 201 +-- .../GregtechMetaTileEntityGeneratorArray.java | 205 +-- .../production/GregtechMetaTileEntityTreeFarm.java | 198 +-- .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 76 +- .../GregtechMetaTileEntity_Cyclotron.java | 164 +- ...egtechMetaTileEntity_IndustrialFishingPond.java | 226 +-- ...egtechMetaTileEntity_IndustrialRockBreaker.java | 111 +- .../GregtechMetaTileEntity_LargeRocketEngine.java | 112 +- ...techMetaTileEntity_LargeSemifluidGenerator.java | 74 +- .../GregtechMetaTileEntity_MassFabricator.java | 189 +- ...techMetaTileEntity_QuantumForceTransformer.java | 719 +++----- .../GregtechMetaTileEntity_Refinery.java | 61 +- .../GregtechMetaTileEntity_SolarTower.java | 597 +++---- .../algae/GregtechMTE_AlgaePondBase.java | 126 +- ...gtechMetaTileEntity_BedrockMiningPlatform1.java | 51 +- ...gtechMetaTileEntity_BedrockMiningPlatform2.java | 51 +- ...chMetaTileEntity_BedrockMiningPlatformBase.java | 68 +- .../chemplant/GregtechMTE_ChemicalPlant.java | 202 +-- ...egTechMetaTileEntity_MegaAlloyBlastSmelter.java | 517 ++---- .../turbines/GT_MTE_LargeTurbine_Gas.java | 25 +- .../turbines/GT_MTE_LargeTurbine_Plasma.java | 63 +- .../turbines/GT_MTE_LargeTurbine_SCSteam.java | 14 +- .../turbines/GT_MTE_LargeTurbine_SHSteam.java | 35 +- .../turbines/GT_MTE_LargeTurbine_Steam.java | 33 +- .../GregtechMetaTileEntity_LargerTurbineBase.java | 333 ++-- .../storage/GregtechMetaTileEntity_MultiTank.java | 850 +++------ ...chMetaTileEntity_PowerSubStationController.java | 306 ++-- .../misc/GT_TileEntity_ComputerCube.java | 1035 +++++------ .../tileentities/misc/TileEntitySolarHeater.java | 126 +- .../redstone/GT_MetaTileEntity_RedstoneBase.java | 37 +- .../GT_MetaTileEntity_RedstoneButtonPanel.java | 109 +- .../GT_MetaTileEntity_RedstoneCircuitBlock.java | 360 ++-- .../redstone/GT_MetaTileEntity_RedstoneLamp.java | 16 +- .../GT_MetaTileEntity_RedstoneStrengthDisplay.java | 93 +- .../GT_MetaTileEntity_RedstoneStrengthScale.java | 33 +- .../GT_MetaTileEntity_AdvancedCraftingTable.java | 480 +++-- .../GT_MetaTileEntity_BronzeCraftingTable.java | 12 +- .../GT_MetaTileEntity_ConnectableCrate.java | 155 +- .../storage/GT_MetaTileEntity_TieredChest.java | 119 +- .../storage/GT_MetaTileEntity_TieredTank.java | 63 +- .../storage/GregtechMetaEnergyBuffer.java | 229 +-- .../storage/GregtechMetaSafeBlock.java | 46 +- .../GT_MetaTileEntity_InfiniteItemHolder.java | 17 +- .../storage/shelving/GT4Entity_Shelf.java | 98 +- .../shelving/GT4Entity_Shelf_Compartment.java | 9 +- .../storage/shelving/GT4Entity_Shelf_Desk.java | 14 +- .../shelving/GT4Entity_Shelf_FileCabinet.java | 17 +- .../storage/shelving/GT4Entity_Shelf_Iron.java | 14 +- .../storage/shelving/GT4Entity_Shelf_Large.java | 99 +- .../common/tools/TOOL_Gregtech_AngleGrinder.java | 86 +- .../gregtech/common/tools/TOOL_Gregtech_Base.java | 41 +- .../common/tools/TOOL_Gregtech_Choocher.java | 76 +- .../tools/TOOL_Gregtech_ElectricButcherKnife.java | 43 +- .../tools/TOOL_Gregtech_ElectricLighter.java | 41 +- .../common/tools/TOOL_Gregtech_ElectricSnips.java | 28 +- .../xmod/gregtech/loaders/GT_Material_Loader.java | 137 +- .../gregtech/loaders/ProcessingAngleGrinder.java | 73 +- .../loaders/ProcessingElectricButcherKnife.java | 63 +- .../loaders/ProcessingElectricLighter.java | 53 +- .../gregtech/loaders/ProcessingElectricSnips.java | 53 +- .../loaders/ProcessingToolHeadChoocher.java | 54 +- .../gregtech/loaders/RecipeGen_AlloySmelter.java | 5 +- .../xmod/gregtech/loaders/RecipeGen_Assembler.java | 47 +- .../gregtech/loaders/RecipeGen_BlastSmelter.java | 165 +- .../loaders/RecipeGen_BlastSmelterGT_Ex.java | 76 +- .../loaders/RecipeGen_BlastSmelterGT_GTNH.java | 53 +- .../gregtech/loaders/RecipeGen_DustGeneration.java | 110 +- .../xmod/gregtech/loaders/RecipeGen_Extruder.java | 27 +- .../gregtech/loaders/RecipeGen_FluidCanning.java | 94 +- .../xmod/gregtech/loaders/RecipeGen_Fluids.java | 297 ++-- .../xmod/gregtech/loaders/RecipeGen_Fluorite.java | 93 +- .../loaders/RecipeGen_MaterialProcessing.java | 129 +- .../gregtech/loaders/RecipeGen_MetalRecipe.java | 54 +- .../RecipeGen_MultisUsingFluidInsteadOfCells.java | 17 +- .../xmod/gregtech/loaders/RecipeGen_Ore.java | 270 +-- .../xmod/gregtech/loaders/RecipeGen_Plasma.java | 12 +- .../xmod/gregtech/loaders/RecipeGen_Plates.java | 133 +- .../xmod/gregtech/loaders/RecipeGen_Recycling.java | 131 +- .../gregtech/loaders/RecipeGen_ShapedCrafting.java | 148 +- .../loaders/misc/AddCustomMachineToPA.java | 5 +- .../gregtech/loaders/misc/AssLineAchievements.java | 32 +- .../loaders/recipe/RecipeLoader_AlgaeFarm.java | 23 +- .../loaders/recipe/RecipeLoader_ChemicalSkips.java | 538 ++---- .../gregtech/loaders/recipe/RecipeLoader_GTNH.java | 9 +- .../loaders/recipe/RecipeLoader_GlueLine.java | 168 +- .../gregtech/loaders/recipe/RecipeLoader_LFTR.java | 88 +- .../recipe/RecipeLoader_MolecularTransformer.java | 5 +- .../loaders/recipe/RecipeLoader_Nuclear.java | 249 ++- .../recipe/RecipeLoader_NuclearFuelProcessing.java | 229 +-- .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 1498 +++++++--------- .../xmod/gregtech/recipes/RecipesToRemove.java | 33 +- .../machines/RECIPEHANDLER_AssemblyLine.java | 11 +- .../recipes/machines/RECIPEHANDLER_CokeOven.java | 131 +- .../recipes/machines/RECIPEHANDLER_Dehydrator.java | 131 +- .../machines/RECIPEHANDLER_MatterFabricator.java | 71 +- .../registration/gregtech/Gregtech4Content.java | 55 +- .../gregtech/GregtechAdvancedBoilers.java | 160 +- .../gregtech/GregtechBedrockPlatforms.java | 19 +- .../gregtech/GregtechBufferDynamos.java | 220 ++- .../gregtech/GregtechComponentAssembler.java | 310 ++-- .../registration/gregtech/GregtechConduits.java | 1069 +++++------ .../gregtech/GregtechCustomHatches.java | 152 +- .../registration/gregtech/GregtechDehydrator.java | 218 +-- .../gregtech/GregtechEnergyBuffer.java | 192 +- .../GregtechFactoryGradeReplacementMultis.java | 24 +- .../gregtech/GregtechFluidReactor.java | 18 +- .../gregtech/GregtechGeneratorsULV.java | 76 +- .../GregtechGeothermalThermalGenerator.java | 105 +- .../gregtech/GregtechHiAmpTransformer.java | 434 ++--- .../gregtech/GregtechIndustrialAlloySmelter.java | 8 +- .../gregtech/GregtechIndustrialArcFurnace.java | 8 +- .../gregtech/GregtechIndustrialBlastSmelter.java | 16 +- .../gregtech/GregtechIndustrialCentrifuge.java | 8 +- .../gregtech/GregtechIndustrialChisel.java | 8 +- .../gregtech/GregtechIndustrialCokeOven.java | 8 +- .../gregtech/GregtechIndustrialCuttingFactory.java | 8 +- .../gregtech/GregtechIndustrialElectrolyzer.java | 8 +- .../GregtechIndustrialElementDuplicator.java | 9 +- .../gregtech/GregtechIndustrialExtruder.java | 8 +- .../gregtech/GregtechIndustrialFishPond.java | 8 +- .../gregtech/GregtechIndustrialFluidHeater.java | 8 +- .../gregtech/GregtechIndustrialForgeHammer.java | 8 +- .../gregtech/GregtechIndustrialFuelRefinery.java | 8 +- .../gregtech/GregtechIndustrialGeneratorArray.java | 8 +- .../gregtech/GregtechIndustrialMacerator.java | 8 +- .../gregtech/GregtechIndustrialMassFabricator.java | 66 +- .../gregtech/GregtechIndustrialMixer.java | 8 +- .../gregtech/GregtechIndustrialMultiMachine.java | 8 +- .../gregtech/GregtechIndustrialMultiTank.java | 36 +- .../gregtech/GregtechIndustrialPlatePress.java | 8 +- .../gregtech/GregtechIndustrialRockBreaker.java | 8 +- .../gregtech/GregtechIndustrialSifter.java | 8 +- .../GregtechIndustrialThermalCentrifuge.java | 8 +- .../gregtech/GregtechIndustrialWashPlant.java | 8 +- .../gregtech/GregtechIndustrialWiremill.java | 8 +- .../gregtech/GregtechIronBlastFurnace.java | 8 +- .../GregtechLargeTurbinesAndHeatExchanger.java | 12 +- .../gregtech/GregtechMiniRaFusion.java | 50 +- .../gregtech/GregtechMolecularTransformer.java | 8 +- .../registration/gregtech/GregtechNaqReactor.java | 26 +- .../gregtech/GregtechNitroDieselFix.java | 67 +- .../gregtech/GregtechPollutionDevices.java | 98 +- .../gregtech/GregtechPowerBreakers.java | 110 +- .../gregtech/GregtechPowerSubStation.java | 34 +- .../gregtech/GregtechQuantumForceTransformer.java | 8 +- .../registration/gregtech/GregtechRTG.java | 9 +- .../gregtech/GregtechRocketFuelGenerator.java | 238 +-- .../registration/gregtech/GregtechSafeBlock.java | 181 +- .../gregtech/GregtechSemiFluidgenerators.java | 53 +- .../gregtech/GregtechSimpleWasher.java | 20 +- .../gregtech/GregtechSolarGenerators.java | 55 +- .../registration/gregtech/GregtechSolarTower.java | 13 +- .../registration/gregtech/GregtechSteamMultis.java | 17 +- .../registration/gregtech/GregtechSuperChests.java | 101 +- .../gregtech/GregtechSuperConductionPoint.java | 2 +- .../gregtech/GregtechThaumcraftDevices.java | 11 +- .../gregtech/GregtechThreadedBuffers.java | 175 +- .../gregtech/GregtechTieredChunkloaders.java | 1 + .../gregtech/GregtechTieredFluidTanks.java | 1 + .../gregtech/GregtechTreeFarmerTE.java | 1 + .../gregtech/GregtechWirelessChargers.java | 57 +- .../gregtech/NewHorizonsAccelerator.java | 256 +-- 400 files changed, 20066 insertions(+), 27882 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 44d6fb3a09..96b17f0685 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java @@ -3,6 +3,14 @@ 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 net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + import cpw.mods.fml.common.event.FMLLoadCompleteEvent; import gregtech.api.GregTech_API; import gregtech.api.enums.Element; @@ -65,12 +73,6 @@ 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 { @@ -195,8 +197,7 @@ public class HANDLER_GT { 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 + Materials tMaterial = Element.get(Behaviour_DataOrb.getDataName(tDataOrb)).mLinkedMaterials .get(0); FluidStack aOutputFluid = null; ItemStack aOutputItem = null; @@ -211,18 +212,20 @@ public class HANDLER_GT { GTPP_Recipe aNewRecipe = new GTPP_Recipe( false, new ItemStack[] {}, - new ItemStack[] {!aUsingFluid ? aOutputItem : null}, + new ItemStack[] { !aUsingFluid ? aOutputItem : null }, aRecipe.mSpecialItems, null, aRecipe.mFluidInputs, - new FluidStack[] {aUsingFluid ? aOutputFluid : null}, + 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")); + Logger.INFO( + "[EM] Generated recipe for " + tMaterial.mLocalizedName + + ", Outputs " + + (aUsingFluid ? "Fluid" : "Dust")); } } else { Logger.INFO("[EM] Bad UU Requirement. " + RecipeUtils.getRecipeInfo(aRecipe)); @@ -235,8 +238,11 @@ public class HANDLER_GT { } } int aSize = GTPP_Recipe_Map.sElementalDuplicatorRecipes.mRecipeList.size(); - Logger.INFO("[EM] Generated " + aSize + "/" + GT_Recipe_Map.sReplicatorFakeRecipes.mRecipeList.size() - + " Replicator recipes."); + Logger.INFO( + "[EM] Generated " + aSize + + "/" + + GT_Recipe_Map.sReplicatorFakeRecipes.mRecipeList.size() + + " Replicator recipes."); } private static void convertPyroToCokeOven() { @@ -254,8 +260,8 @@ public class HANDLER_GT { } } - private static GT_Recipe replaceItemInRecipeWithAnother( - GT_Recipe aRecipe, ItemStack aExisting, ItemStack aNewItem) { + 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; @@ -294,8 +300,9 @@ public class HANDLER_GT { boolean aHardCasings = aHardCasingsTest != null ? (boolean) aHardCasingsTest : false; - Logger.INFO("Are Hard casings/hulls enabled within GT? " - + (aHardCasingsTest == null ? "Version does not support config option" : aHardCasings)); + Logger.INFO( + "Are Hard casings/hulls enabled within GT? " + + (aHardCasingsTest == null ? "Version does not support config option" : aHardCasings)); // Static objects to save memory ItemStack aCasing_LUV = CI.machineCasing_LuV; @@ -313,8 +320,8 @@ public class HANDLER_GT { int aTier_UV = 7; // int aTier_MAX = 8; - ItemStack[] aCasings = new ItemStack[] {aCasing_LUV, aCasing_ZPM, aCasing_UV, aCasing_MAX}; - ItemStack[] aHulls = new ItemStack[] {aHull_LUV, aHull_ZPM, aHull_UV, aHull_MAX}; + ItemStack[] aCasings = new ItemStack[] { aCasing_LUV, aCasing_ZPM, aCasing_UV, aCasing_MAX }; + ItemStack[] aHulls = new ItemStack[] { aHull_LUV, aHull_ZPM, aHull_UV, aHull_MAX }; // Remove Hand Crafting Recipes @@ -339,8 +346,7 @@ public class HANDLER_GT { AutoMap> aDataToModify = new AutoMap>(); - Outer: - for (final GT_Recipe r : GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.mRecipeList) { + Outer: for (final GT_Recipe r : GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.mRecipeList) { if (r != null && r.mOutputs != null && r.mOutputs.length > 0) { @@ -348,8 +354,7 @@ public class HANDLER_GT { GT_Recipe aNewRecipe = r.copy(); // Casings - Inner: - for (ItemStack aCasingObject : aCasings) { + 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); @@ -389,8 +394,7 @@ public class HANDLER_GT { } // Hulls - Inner: - for (ItemStack aHullObject : aHulls) { + 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); @@ -441,72 +445,60 @@ public class HANDLER_GT { } Logger.INFO("Adding new Shaped recipes for Casings."); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_LuV.get(1), bits, new Object[] { - "PPP", "PwP", "PPP", 'P', ELEMENT.getInstance().SELENIUM.getPlate(1) - }); GT_ModHandler.addCraftingRecipe( - ItemList.Casing_ZPM.get(1), bits, new Object[] {"PPP", "PwP", "PPP", 'P', CI.getPlate(aTier_ZPM, 1)}); + ItemList.Casing_LuV.get(1), + bits, + new Object[] { "PPP", "PwP", "PPP", 'P', ELEMENT.getInstance().SELENIUM.getPlate(1) }); + GT_ModHandler.addCraftingRecipe( + ItemList.Casing_ZPM.get(1), + bits, + new Object[] { "PPP", "PwP", "PPP", 'P', CI.getPlate(aTier_ZPM, 1) }); GT_ModHandler.addCraftingRecipe( - ItemList.Casing_UV.get(1), bits, new Object[] {"PPP", "PwP", "PPP", 'P', CI.getPlate(aTier_UV, 1)}); + ItemList.Casing_UV.get(1), + bits, + new Object[] { "PPP", "PwP", "PPP", 'P', CI.getPlate(aTier_UV, 1) }); if (!aHardCasings) { Logger.INFO("Adding new easy Shaped recipes for Hulls."); GT_ModHandler.addCraftingRecipe( - ItemList.Hull_LuV.get(1), RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, new Object[] { - "CMC", 'M', ItemList.Casing_LuV, 'C', OrePrefixes.cableGt01.get(Materials.VanadiumGallium) - }); + ItemList.Hull_LuV.get(1), + RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, + new Object[] { "CMC", 'M', ItemList.Casing_LuV, 'C', + OrePrefixes.cableGt01.get(Materials.VanadiumGallium) }); GT_ModHandler.addCraftingRecipe( ItemList.Hull_ZPM.get(1), RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, - new Object[] {"CMC", 'M', ItemList.Casing_ZPM, 'C', OrePrefixes.cableGt01.get(Materials.Naquadah)}); + new Object[] { "CMC", 'M', ItemList.Casing_ZPM, 'C', + OrePrefixes.cableGt01.get(Materials.Naquadah) }); GT_ModHandler.addCraftingRecipe( - ItemList.Hull_UV.get(1), RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, new Object[] { - "CMC", 'M', ItemList.Casing_UV, 'C', OrePrefixes.wireGt04.get(Materials.NaquadahAlloy) - }); + ItemList.Hull_UV.get(1), + RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, + new Object[] { "CMC", 'M', ItemList.Casing_UV, 'C', + OrePrefixes.wireGt04.get(Materials.NaquadahAlloy) }); } else { Materials aPolytetrafluoroethylene = MaterialUtils.getMaterial("Polytetrafluoroethylene", "Plastic"); Logger.INFO("Adding new hard Shaped recipes for Hulls."); GT_ModHandler.addCraftingRecipe( - ItemList.Hull_LuV.get(1), RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, new Object[] { - "PHP", - "CMC", - 'M', - ItemList.Casing_LuV, - 'C', - OrePrefixes.cableGt01.get(Materials.VanadiumGallium), - 'H', - ELEMENT.getInstance().SELENIUM.getPlate(1), - 'P', - OrePrefixes.plate.get(Materials.Plastic) - }); + ItemList.Hull_LuV.get(1), + RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, + new Object[] { "PHP", "CMC", 'M', ItemList.Casing_LuV, 'C', + OrePrefixes.cableGt01.get(Materials.VanadiumGallium), 'H', + ELEMENT.getInstance().SELENIUM.getPlate(1), 'P', + OrePrefixes.plate.get(Materials.Plastic) }); GT_ModHandler.addCraftingRecipe( - ItemList.Hull_ZPM.get(1), RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, new Object[] { - "PHP", - "CMC", - 'M', - ItemList.Casing_ZPM, - 'C', - OrePrefixes.cableGt01.get(Materials.Naquadah), - 'H', - CI.getPlate(aTier_ZPM, 1), - 'P', - OrePrefixes.plate.get(aPolytetrafluoroethylene) - }); + ItemList.Hull_ZPM.get(1), + RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, + new Object[] { "PHP", "CMC", 'M', ItemList.Casing_ZPM, 'C', + OrePrefixes.cableGt01.get(Materials.Naquadah), 'H', CI.getPlate(aTier_ZPM, 1), 'P', + OrePrefixes.plate.get(aPolytetrafluoroethylene) }); GT_ModHandler.addCraftingRecipe( - ItemList.Hull_UV.get(1), RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, new Object[] { - "PHP", - "CMC", - 'M', - ItemList.Casing_UV, - 'C', - OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), - 'H', - CI.getPlate(aTier_UV, 1), - 'P', - OrePrefixes.plate.get(aPolytetrafluoroethylene) - }); + ItemList.Hull_UV.get(1), + RecipeBits.NOT_REMOVABLE | RecipeBits.BUFFERED, + new Object[] { "PHP", "CMC", 'M', ItemList.Casing_UV, 'C', + OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), 'H', CI.getPlate(aTier_UV, 1), 'P', + OrePrefixes.plate.get(aPolytetrafluoroethylene) }); } } @@ -517,11 +509,9 @@ public class HANDLER_GT { Collection aAssRecipes = GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.mRecipeList; // 170, 172, 174, 176 if (aAssRecipes.size() > 0 && (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK || CORE.GTNH)) { - recipe: - for (GT_Recipe aG : aAssRecipes) { + recipe: for (GT_Recipe aG : aAssRecipes) { if (aG.mOutputs != null && aG.mOutputs.length > 0) { - outputs: - for (ItemStack aI : aG.mOutputs) { + outputs: for (ItemStack aI : aG.mOutputs) { if (aI == null) { continue; } @@ -533,19 +523,23 @@ public class HANDLER_GT { int aMeta = aI.getItemDamage(); if (aMeta >= 170 && aMeta <= 176) { // Found a Turbine - int aCutoff = aMeta == 170 - ? CUT + int aCutoff = aMeta == 170 ? CUT : (aMeta == 172 ? CUT * 2 : (aMeta == 174 ? CUT * 3 : CUT * 4)); - String aType = aMeta == 170 - ? "Small " + String aType = aMeta == 170 ? "Small " : (aMeta == 172 ? "" : (aMeta == 174 ? "Large " : "Huge ")); Materials aMainMaterial = GT_MetaGenerated_Tool.getPrimaryMaterial(aI); Materials aSecondaryMaterial = GT_MetaGenerated_Tool.getSecondaryMaterial(aI); long rotorDurabilityMax = GT_MetaGenerated_Tool.getToolMaxDamage(aI); if (rotorDurabilityMax < aCutoff) { - Logger.WARNING("[Turbine Cleanup] " + getMaterialName(aMainMaterial) + " " + aType - + "Turbines have " + rotorDurabilityMax - + ", which is below the cutoff durability of " + aCutoff + ", disabling."); + Logger.WARNING( + "[Turbine Cleanup] " + getMaterialName(aMainMaterial) + + " " + + aType + + "Turbines have " + + rotorDurabilityMax + + ", which is below the cutoff durability of " + + aCutoff + + ", disabling."); aG.mEnabled = false; aG.mHidden = true; aG.mCanBeBuffered = false; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java index d4a7f97051..78b5cced08 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItem.java @@ -9,6 +9,7 @@ import net.minecraft.item.ItemStack; * The item should have a maximum damage of 13. */ public interface IC2ElectricItem { + /** * Determine if the item can be used in a machine or as an armor part to supply energy. * @@ -38,8 +39,8 @@ public interface IC2ElectricItem { double getMaxCharge(ItemStack itemStack); /** - * Get the item's tier, lower tiers can't send energy to higher ones. - * Batteries are Tier 1, Energy Crystals are Tier 2, Lapotron Crystals are Tier 3. + * Get the item's tier, lower tiers can't send energy to higher ones. Batteries are Tier 1, Energy Crystals are Tier + * 2, Lapotron Crystals are Tier 3. * * @return Item's tier */ diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java index 4ec01ce63c..007d66de66 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/energy/IC2ElectricItemManager.java @@ -6,26 +6,24 @@ import net.minecraft.item.ItemStack; /** * This interface specifies a manager to handle the various tasks for electric items. * - * The default implementation does the following: - * - store and retrieve the charge - * - handle charging, taking amount, tier, transfer limit, canProvideEnergy and simulate into account - * - replace item IDs if appropriate (getChargedItemId() and getEmptyItemId()) - * - update and manage the damage value for the visual charge indicator + * The default implementation does the following: - store and retrieve the charge - handle charging, taking amount, + * tier, transfer limit, canProvideEnergy and simulate into account - replace item IDs if appropriate + * (getChargedItemId() and getEmptyItemId()) - update and manage the damage value for the visual charge indicator * - * @note If you're implementing your own variant (ISpecialElectricItem), you can delegate to the - * default implementations through ElectricItem.rawManager. The default implementation is designed - * to minimize its dependency on its own constraints/structure and delegates most work back to the - * more atomic features in the gateway manager. + * @note If you're implementing your own variant (ISpecialElectricItem), you can delegate to the default implementations + * through ElectricItem.rawManager. The default implementation is designed to minimize its dependency on its own + * constraints/structure and delegates most work back to the more atomic features in the gateway manager. */ public interface IC2ElectricItemManager { + /** * Charge an item with a specified amount of energy. * - * @param itemStack electric item's stack - * @param amount amount of energy to charge in EU - * @param tier tier of the charging device, has to be at least as high as the item to charge + * @param itemStack electric item's stack + * @param amount amount of energy to charge in EU + * @param tier tier of the charging device, has to be at least as high as the item to charge * @param ignoreTransferLimit ignore the transfer limit specified by getTransferLimit() - * @param simulate don't actually change the item, just determine the return value + * @param simulate don't actually change the item, just determine the return value * @return Energy transferred into the electric item */ double charge(ItemStack stack, double amount, int tier, boolean ignoreTransferLimit, boolean simulate); @@ -33,20 +31,15 @@ public interface IC2ElectricItemManager { /** * Discharge an item by a specified amount of energy * - * @param itemStack electric item's stack - * @param amount amount of energy to discharge in EU - * @param tier tier of the discharging device, has to be at least as high as the item to discharge + * @param itemStack electric item's stack + * @param amount amount of energy to discharge in EU + * @param tier tier of the discharging device, has to be at least as high as the item to discharge * @param ignoreTransferLimit ignore the transfer limit specified by getTransferLimit() - * @param externally use the supplied item externally, i.e. to power something else as if it was a battery - * @param simulate don't actually discharge the item, just determine the return value + * @param externally use the supplied item externally, i.e. to power something else as if it was a battery + * @param simulate don't actually discharge the item, just determine the return value * @return Energy retrieved from the electric item */ - double discharge( - ItemStack stack, - double amount, - int tier, - boolean ignoreTransferLimit, - boolean externally, + double discharge(ItemStack stack, double amount, int tier, boolean ignoreTransferLimit, boolean externally, boolean simulate); /** @@ -58,34 +51,34 @@ public interface IC2ElectricItemManager { double getCharge(ItemStack stack); /** - * Determine if the specified electric item has at least a specific amount of EU. - * This is supposed to be used in the item code during operation, for example if you want to implement your own electric item. - * BatPacks are not taken into account. + * Determine if the specified electric item has at least a specific amount of EU. This is supposed to be used in the + * item code during operation, for example if you want to implement your own electric item. BatPacks are not taken + * into account. * * @param itemStack electric item's stack - * @param amount minimum amount of energy required + * @param amount minimum amount of energy required * @return true if there's enough energy */ boolean canUse(ItemStack stack, double amount); /** - * Try to retrieve a specific amount of energy from an Item, and if applicable, a BatPack. - * This is supposed to be used in the item code during operation, for example if you want to implement your own electric item. + * Try to retrieve a specific amount of energy from an Item, and if applicable, a BatPack. This is supposed to be + * used in the item code during operation, for example if you want to implement your own electric item. * * @param itemStack electric item's stack - * @param amount amount of energy to discharge in EU - * @param entity entity holding the item + * @param amount amount of energy to discharge in EU + * @param entity entity holding the item * @return true if the operation succeeded */ boolean use(ItemStack stack, double amount, EntityLivingBase entity); /** - * Charge an item from the BatPack a player is wearing. - * This is supposed to be used in the item code during operation, for example if you want to implement your own electric item. - * use() already contains this functionality. + * Charge an item from the BatPack a player is wearing. This is supposed to be used in the item code during + * operation, for example if you want to implement your own electric item. use() already contains this + * functionality. * * @param itemStack electric item's stack - * @param entity entity holding the item + * @param entity entity holding the item */ void chargeFromArmor(ItemStack stack, EntityLivingBase entity); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java index a31e728e23..74c9d9ee5b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java @@ -1,22 +1,25 @@ package gtPlusPlus.xmod.gregtech.api.enums; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; + import gregtech.api.GregTech_API; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.objects.GT_RenderedTexture; import gtPlusPlus.core.lib.CORE; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; public class CustomGtTextures { + public enum ItemIcons implements IIconContainer, Runnable { + VOID, // The Empty Texture RENDERING_ERROR, PUMP, SKOOKUMCHOOCHER; - public static final ITexture[] ERROR_RENDERING = new ITexture[] {new GT_RenderedTexture(RENDERING_ERROR)}; + public static final ITexture[] ERROR_RENDERING = new ITexture[] { new GT_RenderedTexture(RENDERING_ERROR) }; protected IIcon mIcon, mOverlay; @@ -46,6 +49,7 @@ public class CustomGtTextures { } public static class CustomIcon implements IIconContainer, Runnable { + protected IIcon mIcon, mOverlay; protected String mIconName; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java index c0c4e6a5c8..fcbbd019a9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java @@ -2,28 +2,14 @@ package gtPlusPlus.xmod.gregtech.api.enums; import static gregtech.api.enums.GT_Values.B; -import gregtech.api.enums.OrePrefixes; import net.minecraftforge.common.util.EnumHelper; +import gregtech.api.enums.OrePrefixes; + public enum CustomOrePrefix { - milled( - "Milled Ores", - "Milled ", - " Ore", - true, - true, - false, - false, - false, - false, - false, - false, - false, - true, - B[3], - -1, - 64, - -1); + + milled("Milled Ores", "Milled ", " Ore", true, true, false, false, false, false, false, false, false, true, B[3], + -1, 64, -1); private final String mRegularLocalName; private final String mLocalizedMaterialPre; @@ -45,24 +31,11 @@ public enum CustomOrePrefix { private OrePrefixes mSelfReference; - private CustomOrePrefix( - String aRegularLocalName, - String aLocalizedMaterialPre, - String aLocalizedMaterialPost, - boolean aIsUnificatable, - boolean aIsMaterialBased, - boolean aIsSelfReferencing, - boolean aIsContainer, - boolean aDontUnificateActively, - boolean aIsUsedForBlocks, - boolean aAllowNormalRecycling, - boolean aGenerateDefaultItem, - boolean aIsEnchantable, - boolean aIsUsedForOreProcessing, - int aMaterialGenerationBits, - long aMaterialAmount, - int aDefaultStackSize, - int aTextureindex) { + private CustomOrePrefix(String aRegularLocalName, String aLocalizedMaterialPre, String aLocalizedMaterialPost, + boolean aIsUnificatable, boolean aIsMaterialBased, boolean aIsSelfReferencing, boolean aIsContainer, + boolean aDontUnificateActively, boolean aIsUsedForBlocks, boolean aAllowNormalRecycling, + boolean aGenerateDefaultItem, boolean aIsEnchantable, boolean aIsUsedForOreProcessing, + int aMaterialGenerationBits, long aMaterialAmount, int aDefaultStackSize, int aTextureindex) { mRegularLocalName = aRegularLocalName; mLocalizedMaterialPre = aLocalizedMaterialPre; @@ -88,44 +61,13 @@ public enum CustomOrePrefix { mSelfReference = EnumHelper.addEnum( OrePrefixes.class, this.name(), - new Class[] { - String.class, - String.class, - String.class, - boolean.class, - boolean.class, - boolean.class, - boolean.class, - boolean.class, - boolean.class, - boolean.class, - boolean.class, - boolean.class, - boolean.class, - int.class, - long.class, - int.class, - int.class - }, - new Object[] { - mRegularLocalName, - mLocalizedMaterialPre, - mLocalizedMaterialPost, - mIsUnificatable, - mIsMaterialBased, - mIsSelfReferencing, - mIsContainer, - mDontUnificateActively, - mIsUsedForBlocks, - mAllowNormalRecycling, - mGenerateDefaultItem, - mIsEnchantable, - mIsUsedForOreProcessing, - mMaterialGenerationBits, - mMaterialAmount, - mDefaultStackSize, - mTextureindex - }); + new Class[] { String.class, String.class, String.class, boolean.class, boolean.class, boolean.class, + boolean.class, boolean.class, boolean.class, boolean.class, boolean.class, boolean.class, + boolean.class, int.class, long.class, int.class, int.class }, + new Object[] { mRegularLocalName, mLocalizedMaterialPre, mLocalizedMaterialPost, mIsUnificatable, + mIsMaterialBased, mIsSelfReferencing, mIsContainer, mDontUnificateActively, mIsUsedForBlocks, + mAllowNormalRecycling, mGenerateDefaultItem, mIsEnchantable, mIsUsedForOreProcessing, + mMaterialGenerationBits, mMaterialAmount, mDefaultStackSize, mTextureindex }); return mSelfReference != null; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index 355b1c7477..2506af7af5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -2,15 +2,16 @@ package gtPlusPlus.xmod.gregtech.api.enums; import static gregtech.api.enums.GT_Values.W; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.xmod.gregtech.api.interfaces.GregtechItemContainer; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; +import gtPlusPlus.xmod.gregtech.api.interfaces.GregtechItemContainer; + /** * Class containing all non-OreDict Items of GregTech. */ @@ -308,7 +309,7 @@ public enum GregtechItemList implements GregtechItemContainer { Casing_Reactor_II, // Multitank - /*Industrial_MultiTank,*/ + /* Industrial_MultiTank, */ Industrial_MultiTankDense, Casing_MultitankExterior, @@ -379,9 +380,9 @@ public enum GregtechItemList implements GregtechItemContainer { Casing_Multi_Use, // Bedrock Mining Platforms - /*BedrockMiner_MKI, */ - /*BedrockMiner_MKII, */ - /*BedrockMiner_MKIII, */ + /* BedrockMiner_MKI, */ + /* BedrockMiner_MKII, */ + /* BedrockMiner_MKIII, */ Casing_BedrockMiner, // Large Packager @@ -413,7 +414,7 @@ public enum GregtechItemList implements GregtechItemContainer { Casing_Naq_Reactor_A, Casing_Naq_Reactor_B, Casing_Naq_Reactor_C, - /*Controller_Naq_Reactor, */ + /* Controller_Naq_Reactor, */ Casing_Containment, // Arc Furnace @@ -757,7 +758,7 @@ public enum GregtechItemList implements GregtechItemContainer { Charger_MAX, // Tiny Fusion - /*Miniature_Fusion, */ + /* Miniature_Fusion, */ // Component Makers Machine_LV_Component_Maker, @@ -932,7 +933,7 @@ public enum GregtechItemList implements GregtechItemContainer { GT_Chisel_HV, // Plasma Tank - /*Plasma_Tank,*/ + /* Plasma_Tank, */ // ---------------------------------------------------------------------------- @@ -968,11 +969,11 @@ public enum GregtechItemList implements GregtechItemContainer { FakeMachineCasingPlate_UV, FakeMachineCasingPlate_MAX, -// ---------------------------------------------------------------------------- + // ---------------------------------------------------------------------------- -; + ; - public static final GregtechItemList[] DYE_ONLY_ITEMS = {Energy_Buffer_1by1_EV, Energy_Buffer_1by1_EV}; + public static final GregtechItemList[] DYE_ONLY_ITEMS = { Energy_Buffer_1by1_EV, Energy_Buffer_1by1_EV }; private ItemStack mStack; private boolean mHasNotBeenSet = true; @@ -1028,8 +1029,8 @@ public enum GregtechItemList implements GregtechItemContainer { if (GT_Utility.isStackInvalid(aStack)) { return false; } - return GT_Utility.areUnificationsEqual( - (ItemStack) aStack, aWildcard ? this.getWildcard(1) : this.get(1), aIgnoreNBT); + return GT_Utility + .areUnificationsEqual((ItemStack) aStack, aWildcard ? this.getWildcard(1) : this.get(1), aIgnoreNBT); } public static Block getBlockFromStack(Object aStack) { @@ -1078,8 +1079,8 @@ public enum GregtechItemList implements GregtechItemContainer { if (GT_Utility.isStackInvalid(this.mStack)) { return GT_Utility.copyAmount(aAmount, aReplacements); } - return GT_Utility.copyAmountAndMetaData( - aAmount, this.mStack.getMaxDamage() - 1, GT_OreDictUnificator.get(this.mStack)); + return GT_Utility + .copyAmountAndMetaData(aAmount, this.mStack.getMaxDamage() - 1, GT_OreDictUnificator.get(this.mStack)); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java index b535236575..4bd8831098 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java @@ -1,29 +1,18 @@ package gtPlusPlus.xmod.gregtech.api.enums; -/* Electric Components. - * - * usual Materials for this are: - * Primitive (Tier 1) - * Basic (Tier 2) as used by UE as well : IC2 Circuit and RE-Battery - * Good (Tier 3) - * Advanced (Tier 4) as used by UE as well : Advanced Circuit, Advanced Battery and Lithium Battery - * Data (Tier 5) : Data Storage Circuit - * Elite (Tier 6) as used by UE as well : Energy Crystal and Data Control Circuit - * Master (Tier 7) : Energy Flow Circuit and Lapotron Crystal - * Ultimate (Tier 8) : Data Orb and Lapotronic Energy Orb - * Infinite (Cheaty) - * -Circuits - Circuit_Primitive, Circuit_Basic, Circuit_Good, Circuit_Advanced, - Circuit_Data, Circuit_Elite, Circuit_Master, Tool_DataOrb, Circuit_Ultimate, Tool_DataStick, - Circuit_IV, Circuit_LuV, Circuit_ZPM, -Circuit Parts - Circuit_Board_IV, Circuit_Board_LuV, Circuit_Board_ZPM, - Circuit_Parts_Crystal_Chip_IV, Circuit_Parts_Crystal_Chip_LuV, Circuit_Parts_Crystal_Chip_ZPM, - Circuit_Parts_IV, Circuit_Parts_LuV, Circuit_Parts_ZPM, - Circuit_Parts_Wiring_IV, Circuit_Parts_Wiring_LuV, Circuit_Parts_Wiring_ZPM; +/* + * Electric Components. usual Materials for this are: Primitive (Tier 1) Basic (Tier 2) as used by UE as well : IC2 + * Circuit and RE-Battery Good (Tier 3) Advanced (Tier 4) as used by UE as well : Advanced Circuit, Advanced Battery and + * Lithium Battery Data (Tier 5) : Data Storage Circuit Elite (Tier 6) as used by UE as well : Energy Crystal and Data + * Control Circuit Master (Tier 7) : Energy Flow Circuit and Lapotron Crystal Ultimate (Tier 8) : Data Orb and + * Lapotronic Energy Orb Infinite (Cheaty) Circuits Circuit_Primitive, Circuit_Basic, Circuit_Good, Circuit_Advanced, + * Circuit_Data, Circuit_Elite, Circuit_Master, Tool_DataOrb, Circuit_Ultimate, Tool_DataStick, Circuit_IV, Circuit_LuV, + * Circuit_ZPM, Circuit Parts Circuit_Board_IV, Circuit_Board_LuV, Circuit_Board_ZPM, Circuit_Parts_Crystal_Chip_IV, + * Circuit_Parts_Crystal_Chip_LuV, Circuit_Parts_Crystal_Chip_ZPM, Circuit_Parts_IV, Circuit_Parts_LuV, + * Circuit_Parts_ZPM, Circuit_Parts_Wiring_IV, Circuit_Parts_Wiring_LuV, Circuit_Parts_Wiring_ZPM; */ public enum GregtechOreDictNames { + buffer_core, itemGregConduit, Circuit_IV, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java index 03d2741fe3..f71e07f0a3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java @@ -3,6 +3,13 @@ package gtPlusPlus.xmod.gregtech.api.enums; import static gregtech.api.enums.GT_Values.*; import static gtPlusPlus.core.util.Utils.getTcAspectStack; +import java.util.*; + +import net.minecraft.enchantment.Enchantment; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.enums.*; import gregtech.api.enums.TC_Aspects.TC_AspectStack; import gregtech.api.interfaces.*; @@ -13,486 +20,88 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator; import gtPlusPlus.xmod.gregtech.api.objects.GregtechItemData; import gtPlusPlus.xmod.gregtech.api.objects.GregtechMaterialStack; -import java.util.*; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; public enum GregtechOrePrefixes { - /* Electric Components. - * - * usual Materials for this are: - * Primitive (Tier 1) - * Basic (Tier 2) as used by UE as well : IC2 Circuit and RE-Battery - * Good (Tier 3) - * Advanced (Tier 4) as used by UE as well : Advanced Circuit, Advanced Battery and Lithium Battery - * Data (Tier