From 6f31720697bcc351421a4d86ba3bf749375dd12c Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Sat, 27 Aug 2022 10:19:57 +0100 Subject: Update buildscript & apply spotless (#1306) * Update dependencies * Update buildscript, apply spotless --- src/main/java/gregtech/api/GregTech_API.java | 444 +- .../api/damagesources/GT_DamageSources.java | 12 +- .../api/enchants/Enchantment_EnderDamage.java | 15 +- .../java/gregtech/api/enums/ConfigCategories.java | 7 +- src/main/java/gregtech/api/enums/Dyes.java | 24 +- src/main/java/gregtech/api/enums/Element.java | 9 +- .../gregtech/api/enums/GTNH_ExtraMaterials.java | 637 +- .../java/gregtech/api/enums/GT_HatchElement.java | 8 +- src/main/java/gregtech/api/enums/GT_Values.java | 352 +- .../java/gregtech/api/enums/HeatingCoilLevel.java | 112 +- src/main/java/gregtech/api/enums/ItemList.java | 370 +- .../java/gregtech/api/enums/MaterialBuilder.java | 518 +- src/main/java/gregtech/api/enums/Materials.java | 18509 +++++++++++++++++-- .../java/gregtech/api/enums/MaterialsBotania.java | 194 +- .../java/gregtech/api/enums/MaterialsKevlar.java | 597 +- src/main/java/gregtech/api/enums/OreDictNames.java | 1 - src/main/java/gregtech/api/enums/OrePrefixes.java | 4026 +++- src/main/java/gregtech/api/enums/ParticleFX.java | 1 - .../java/gregtech/api/enums/SoundResource.java | 12 +- src/main/java/gregtech/api/enums/SubTag.java | 23 +- src/main/java/gregtech/api/enums/TC_Aspects.java | 2 +- src/main/java/gregtech/api/enums/TextureSet.java | 7 +- src/main/java/gregtech/api/enums/Textures.java | 1387 +- src/main/java/gregtech/api/enums/Tier.java | 506 +- .../java/gregtech/api/enums/ToolDictNames.java | 2 +- .../gregtech/api/events/BlockScanningEvent.java | 18 +- src/main/java/gregtech/api/fluid/FluidTankGT.java | 37 +- .../java/gregtech/api/graphs/GenerateNodeMap.java | 56 +- .../gregtech/api/graphs/GenerateNodeMapPower.java | 22 +- src/main/java/gregtech/api/graphs/Lock.java | 5 +- src/main/java/gregtech/api/graphs/Node.java | 4 +- src/main/java/gregtech/api/graphs/NodeList.java | 13 +- src/main/java/gregtech/api/graphs/PowerNode.java | 6 +- src/main/java/gregtech/api/graphs/PowerNodes.java | 33 +- .../api/graphs/consumers/ConsumerNode.java | 6 +- .../api/graphs/consumers/EmptyPowerConsumer.java | 11 +- .../api/graphs/consumers/NodeEnergyConnected.java | 10 +- .../api/graphs/consumers/NodeEnergyReceiver.java | 99 +- .../api/graphs/consumers/NodeEnergySink.java | 10 +- .../api/graphs/consumers/NodeGTBaseMetaTile.java | 5 +- .../java/gregtech/api/graphs/paths/NodePath.java | 2 +- .../gregtech/api/graphs/paths/PowerNodePath.java | 1 - src/main/java/gregtech/api/gui/GT_Container.java | 84 +- .../api/gui/GT_ContainerMetaTile_Machine.java | 38 +- .../gregtech/api/gui/GT_Container_2by2_Fluid.java | 9 +- .../api/gui/GT_Container_BasicMachine.java | 36 +- .../gregtech/api/gui/GT_Container_BasicTank.java | 12 +- .../api/gui/GT_Container_MaintenanceHatch.java | 6 +- .../api/gui/GT_Container_MultiMachine.java | 3 +- .../api/gui/GT_Container_SpecialFilter.java | 39 +- .../java/gregtech/api/gui/GT_GUIColorOverride.java | 11 +- .../java/gregtech/api/gui/GT_GUIContainer.java | 13 +- .../api/gui/GT_GUIContainerMetaTile_Machine.java | 104 +- .../gregtech/api/gui/GT_GUIContainer_1by1.java | 9 +- .../gregtech/api/gui/GT_GUIContainer_2by2.java | 7 +- .../api/gui/GT_GUIContainer_2by2_Fluid.java | 5 +- .../gregtech/api/gui/GT_GUIContainer_3by3.java | 7 +- .../gregtech/api/gui/GT_GUIContainer_4by4.java | 7 +- .../api/gui/GT_GUIContainer_BasicMachine.java | 167 +- .../api/gui/GT_GUIContainer_BasicTank.java | 20 +- .../api/gui/GT_GUIContainer_MaintenanceHatch.java | 10 +- .../api/gui/GT_GUIContainer_MultiMachine.java | 62 +- src/main/java/gregtech/api/gui/GT_GUICover.java | 13 +- .../gregtech/api/gui/GT_GUIDialogSelectItem.java | 422 +- src/main/java/gregtech/api/gui/GT_GUIScreen.java | 568 +- src/main/java/gregtech/api/gui/GT_Slot_Holo.java | 19 +- .../java/gregtech/api/gui/GT_Slot_Holo_ME.java | 3 +- .../api/gui/widgets/GT_GuiCoverTabLine.java | 70 +- .../api/gui/widgets/GT_GuiFakeItemButton.java | 32 +- .../java/gregtech/api/gui/widgets/GT_GuiIcon.java | 123 +- .../gregtech/api/gui/widgets/GT_GuiIconButton.java | 39 +- .../api/gui/widgets/GT_GuiIconCheckButton.java | 13 +- .../api/gui/widgets/GT_GuiIntegerTextBox.java | 15 +- .../api/gui/widgets/GT_GuiSlotTooltip.java | 3 +- .../api/gui/widgets/GT_GuiSmartTooltip.java | 11 +- .../java/gregtech/api/gui/widgets/GT_GuiTab.java | 74 +- .../gregtech/api/gui/widgets/GT_GuiTabLine.java | 108 +- .../gregtech/api/gui/widgets/GT_GuiTooltip.java | 32 +- .../api/gui/widgets/GT_GuiTooltipManager.java | 21 +- .../gregtech/api/interfaces/IBlockContainer.java | 1 + .../gregtech/api/interfaces/IDebugableBlock.java | 3 +- .../api/interfaces/IGlobalWirelessEnergy.java | 68 +- .../java/gregtech/api/interfaces/IGuiIcon.java | 5 + .../java/gregtech/api/interfaces/IGuiScreen.java | 9 +- .../gregtech/api/interfaces/IHatchElement.java | 42 +- .../java/gregtech/api/interfaces/IHeatingCoil.java | 6 +- .../gregtech/api/interfaces/IIconContainer.java | 12 +- .../gregtech/api/interfaces/IItemBehaviour.java | 37 +- .../api/interfaces/INetworkUpdatableItem.java | 18 +- .../gregtech/api/interfaces/IProjectileItem.java | 3 +- .../java/gregtech/api/interfaces/ITexture.java | 2 +- .../java/gregtech/api/interfaces/IToolStats.java | 19 +- .../gregtech/api/interfaces/internal/IGT_Mod.java | 2 +- .../api/interfaces/internal/IGT_RecipeAdder.java | 724 +- .../api/interfaces/internal/IThaumcraftCompat.java | 32 +- .../api/interfaces/internal/IUETileEntity.java | 1 - .../IConfigurationCircuitSupport.java | 7 +- .../interfaces/metatileentity/IConnectable.java | 20 +- .../metatileentity/IMachineCallback.java | 2 + .../interfaces/metatileentity/IMetaTileEntity.java | 46 +- .../metatileentity/IMetaTileEntityCable.java | 6 +- .../metatileentity/IMetaTileEntityItemPipe.java | 64 +- .../tileentity/IBasicEnergyContainer.java | 12 +- .../api/interfaces/tileentity/ICoverable.java | 6 +- .../tileentity/IDebugableTileEntity.java | 3 +- .../interfaces/tileentity/IEnergyConnected.java | 16 +- .../tileentity/IExperimentalEnergyTileEntity.java | 36 +- .../api/interfaces/tileentity/IGTEnet.java | 11 +- .../interfaces/tileentity/IGregTechTileEntity.java | 44 +- .../tileentity/IGregtechWailaProvider.java | 15 +- .../api/interfaces/tileentity/IIC2Enet.java | 1 - .../tileentity/IMachineBlockUpdateable.java | 2 +- .../interfaces/tileentity/IMachineProgress.java | 5 +- .../api/interfaces/tileentity/ITurnable.java | 3 +- .../interfaces/tileentity/IUpgradableMachine.java | 1 - .../api/items/GT_Block_LongDistancePipe.java | 19 +- .../gregtech/api/items/GT_BreederCell_Item.java | 41 +- .../gregtech/api/items/GT_CoolantCellIC_Item.java | 18 +- .../gregtech/api/items/GT_CoolantCell_Item.java | 41 +- .../gregtech/api/items/GT_EnergyArmor_Item.java | 85 +- .../java/gregtech/api/items/GT_Generic_Block.java | 4 +- .../java/gregtech/api/items/GT_Generic_Item.java | 29 +- .../java/gregtech/api/items/GT_MetaBase_Item.java | 239 +- .../gregtech/api/items/GT_MetaGenerated_Item.java | 69 +- .../api/items/GT_MetaGenerated_Item_X01.java | 55 +- .../api/items/GT_MetaGenerated_Item_X32.java | 57 +- .../gregtech/api/items/GT_MetaGenerated_Tool.java | 523 +- .../api/items/GT_RadioactiveCellIC_Item.java | 100 +- .../api/items/GT_RadioactiveCell_Item.java | 56 +- .../gregtech/api/items/GT_SolderingTool_Item.java | 46 +- .../java/gregtech/api/items/GT_Spray_Bug_Item.java | 20 +- .../gregtech/api/items/GT_Spray_Foam_Item.java | 49 +- .../gregtech/api/items/GT_Spray_Hardener_Item.java | 34 +- .../api/items/GT_Spray_Hydration_Item.java | 23 +- .../java/gregtech/api/items/GT_Spray_Ice_Item.java | 49 +- .../gregtech/api/items/GT_Spray_Pepper_Item.java | 52 +- src/main/java/gregtech/api/items/GT_Tool_Item.java | 48 +- .../api/metatileentity/BaseMetaPipeEntity.java | 450 +- .../api/metatileentity/BaseMetaTileEntity.java | 879 +- .../api/metatileentity/BaseTileEntity.java | 57 +- .../api/metatileentity/CommonMetaTileEntity.java | 7 +- .../api/metatileentity/CoverableTileEntity.java | 211 +- .../api/metatileentity/MetaPipeEntity.java | 409 +- .../api/metatileentity/MetaTileEntity.java | 370 +- .../api/metatileentity/TileIC2EnergySink.java | 51 +- .../examples/GT_MetaTileEntity_E_Furnace.java | 76 +- .../implementations/GT_MetaPipeEntity_Cable.java | 421 +- .../implementations/GT_MetaPipeEntity_Fluid.java | 325 +- .../implementations/GT_MetaPipeEntity_Frame.java | 55 +- .../implementations/GT_MetaPipeEntity_Item.java | 275 +- .../GT_MetaTileEntity_BasicBatteryBuffer.java | 101 +- .../GT_MetaTileEntity_BasicGenerator.java | 98 +- .../GT_MetaTileEntity_BasicHull.java | 50 +- .../GT_MetaTileEntity_BasicHull_NonElectric.java | 17 +- .../GT_MetaTileEntity_BasicMachine.java | 460 +- .../GT_MetaTileEntity_BasicMachine_Bronze.java | 235 +- .../GT_MetaTileEntity_BasicMachine_GT_Recipe.java | 441 +- .../GT_MetaTileEntity_BasicMachine_Steel.java | 128 +- .../GT_MetaTileEntity_BasicTank.java | 82 +- .../implementations/GT_MetaTileEntity_Buffer.java | 156 +- .../GT_MetaTileEntity_CubicMultiBlockBase.java | 171 +- .../GT_MetaTileEntity_EnhancedMultiBlockBase.java | 347 +- .../implementations/GT_MetaTileEntity_Hatch.java | 111 +- .../GT_MetaTileEntity_Hatch_DataAccess.java | 35 +- .../GT_MetaTileEntity_Hatch_Dynamo.java | 15 +- .../GT_MetaTileEntity_Hatch_Energy.java | 18 +- .../GT_MetaTileEntity_Hatch_Input.java | 47 +- .../GT_MetaTileEntity_Hatch_InputBus.java | 118 +- .../GT_MetaTileEntity_Hatch_Maintenance.java | 134 +- .../GT_MetaTileEntity_Hatch_Muffler.java | 43 +- .../GT_MetaTileEntity_Hatch_MultiInput.java | 40 +- .../GT_MetaTileEntity_Hatch_Output.java | 183 +- .../GT_MetaTileEntity_Hatch_OutputBus.java | 80 +- .../GT_MetaTileEntity_MultiBlockBase.java | 432 +- .../GT_MetaTileEntity_SpecialFilter.java | 13 +- .../GT_MetaTileEntity_TieredMachineBlock.java | 32 +- .../GT_MetaTileEntity_TooltipMultiBlockBase.java | 9 +- .../GT_MetaTileEntity_Transformer.java | 192 +- .../GT_MetaTileEntity_Wireless_Dynamo.java | 21 +- .../GT_MetaTileEntity_Wireless_Hatch.java | 25 +- .../api/multitileentity/MultiTileEntityBlock.java | 317 +- .../MultiTileEntityBlockInternal.java | 75 +- .../MultiTileEntityClassContainer.java | 29 +- .../multitileentity/MultiTileEntityContainer.java | 9 +- .../MultiTileEntityItemInternal.java | 148 +- .../multitileentity/MultiTileEntityRegistry.java | 109 +- .../multitileentity/base/BaseMultiTileEntity.java | 720 +- .../base/BaseNontickableMultiTileEntity.java | 22 +- .../base/BaseTickableMultiTileEntity.java | 24 +- .../interfaces/IMultiBlockController.java | 8 +- .../interfaces/IMultiBlockEnergy.java | 50 +- .../interfaces/IMultiBlockFluidHandler.java | 17 +- .../interfaces/IMultiBlockInventory.java | 59 +- .../interfaces/IMultiTileEntity.java | 98 +- .../machine/MultiTileBasicMachine.java | 109 +- .../multiblock/base/MultiBlockController.java | 217 +- .../multiblock/base/MultiBlockPart.java | 277 +- .../multiblock/base/MultiBlock_Stackable.java | 10 +- .../multiblock/casing/CasingBehaviorBase.java | 3 +- .../gregtech/api/net/GT_Packet_Block_Event.java | 3 +- .../api/net/GT_Packet_ClientPreference.java | 6 +- .../api/net/GT_Packet_GtTileEntityGuiRequest.java | 29 +- src/main/java/gregtech/api/net/GT_Packet_New.java | 33 +- .../java/gregtech/api/net/GT_Packet_Pollution.java | 5 +- .../api/net/GT_Packet_RequestCoverData.java | 14 +- .../gregtech/api/net/GT_Packet_SendCoverData.java | 8 +- .../api/net/GT_Packet_SetConfigurationCircuit.java | 5 +- .../gregtech/api/net/GT_Packet_SetLockedFluid.java | 138 +- .../java/gregtech/api/net/GT_Packet_Sound.java | 11 +- .../gregtech/api/net/GT_Packet_TileEntity.java | 128 +- .../api/net/GT_Packet_TileEntityCover.java | 3 +- .../api/net/GT_Packet_TileEntityCoverGUI.java | 51 +- .../api/net/GT_Packet_TileEntityCoverNew.java | 9 +- .../gregtech/api/net/GT_Packet_UpdateItem.java | 84 +- .../api/net/GT_Packet_WirelessRedstoneCover.java | 12 +- .../api/objects/AE2DigitalChestHandler.java | 21 +- .../java/gregtech/api/objects/CollectorUtils.java | 7 +- .../java/gregtech/api/objects/ElementStack.java | 11 +- .../java/gregtech/api/objects/GT_ArrayList.java | 19 +- .../java/gregtech/api/objects/GT_ChunkManager.java | 83 +- .../api/objects/GT_CopiedBlockTexture.java | 4 +- .../gregtech/api/objects/GT_Cover_Default.java | 17 +- .../java/gregtech/api/objects/GT_Cover_None.java | 160 +- src/main/java/gregtech/api/objects/GT_Fluid.java | 8 +- .../java/gregtech/api/objects/GT_FluidStack.java | 28 +- src/main/java/gregtech/api/objects/GT_HashSet.java | 3 +- .../java/gregtech/api/objects/GT_ItemStack.java | 5 +- .../java/gregtech/api/objects/GT_MultiTexture.java | 2 +- .../gregtech/api/objects/GT_RenderedTexture.java | 6 +- .../java/gregtech/api/objects/GT_SidedTexture.java | 33 +- .../api/objects/GT_StdRenderedTexture.java | 5 +- .../java/gregtech/api/objects/GT_UO_Dimension.java | 73 +- .../gregtech/api/objects/GT_UO_DimensionList.java | 143 +- .../java/gregtech/api/objects/GT_UO_Fluid.java | 102 +- src/main/java/gregtech/api/objects/ItemData.java | 10 +- .../java/gregtech/api/objects/MaterialStack.java | 46 +- src/main/java/gregtech/api/objects/ObjMap.java | 274 +- .../gregtech/api/objects/ReverseShapedRecipe.java | 13 +- .../api/objects/ReverseShapelessRecipe.java | 13 +- src/main/java/gregtech/api/objects/XSTR.java | 42 +- .../java/gregtech/api/render/TextureFactory.java | 39 +- .../api/threads/GT_Runnable_Cable_Update.java | 26 +- .../threads/GT_Runnable_MachineBlockUpdate.java | 66 +- .../gregtech/api/threads/GT_Runnable_Sound.java | 34 +- .../gregtech/api/util/ColorsMetadataSection.java | 16 +- .../api/util/ColorsMetadataSectionSerializer.java | 32 +- .../java/gregtech/api/util/GT_ApiaryUpgrade.java | 53 +- .../gregtech/api/util/GT_AssemblyLineUtils.java | 1023 +- .../gregtech/api/util/GT_Assemblyline_Server.java | 722 +- src/main/java/gregtech/api/util/GT_BaseCrop.java | 145 +- src/main/java/gregtech/api/util/GT_BlockMap.java | 221 +- src/main/java/gregtech/api/util/GT_BlockSet.java | 48 +- src/main/java/gregtech/api/util/GT_CLS_Compat.java | 56 +- .../gregtech/api/util/GT_ChunkAssociatedData.java | 820 +- .../gregtech/api/util/GT_CircuitryBehavior.java | 58 +- .../gregtech/api/util/GT_ClientPreference.java | 6 +- src/main/java/gregtech/api/util/GT_Config.java | 30 +- .../java/gregtech/api/util/GT_CoverBehavior.java | 192 +- .../gregtech/api/util/GT_CoverBehaviorBase.java | 196 +- .../api/util/GT_ExoticEnergyInputHelper.java | 110 +- src/main/java/gregtech/api/util/GT_FoodStat.java | 13 +- .../java/gregtech/api/util/GT_Forestry_Compat.java | 129 +- src/main/java/gregtech/api/util/GT_GC_Compat.java | 23 +- .../gregtech/api/util/GT_HatchElementBuilder.java | 158 +- .../api/util/GT_ItsNotMyFaultException.java | 3 +- .../java/gregtech/api/util/GT_LanguageManager.java | 529 +- src/main/java/gregtech/api/util/GT_Log.java | 4 +- src/main/java/gregtech/api/util/GT_ModHandler.java | 1167 +- .../api/util/GT_Multiblock_Tooltip_Builder.java | 975 +- .../gregtech/api/util/GT_OreDictUnificator.java | 164 +- .../java/gregtech/api/util/GT_PlayedSound.java | 9 +- .../api/util/GT_ProcessingArray_Manager.java | 7 +- src/main/java/gregtech/api/util/GT_Recipe.java | 4076 +++- .../gregtech/api/util/GT_RecipeRegistrator.java | 513 +- .../java/gregtech/api/util/GT_RenderingWorld.java | 328 +- .../java/gregtech/api/util/GT_Shaped_Recipe.java | 37 +- .../gregtech/api/util/GT_Shapeless_Recipe.java | 69 +- .../gregtech/api/util/GT_Single_Recipe_Check.java | 28 +- .../GT_Single_Recipe_Check_Processing_Array.java | 31 +- .../gregtech/api/util/GT_SpawnEventHandler.java | 20 +- .../gregtech/api/util/GT_StructureUtility.java | 202 +- .../gregtech/api/util/GT_ToolHarvestHelper.java | 118 +- .../gregtech/api/util/GT_TooltipDataCache.java | 14 +- src/main/java/gregtech/api/util/GT_Util.java | 96 +- src/main/java/gregtech/api/util/GT_Utility.java | 2285 ++- .../java/gregtech/api/util/GT_UtilityClient.java | 68 +- .../java/gregtech/api/util/IGT_HatchAdder.java | 4 +- .../gregtech/api/util/ISerializableObject.java | 15 +- .../java/gregtech/api/util/LightingHelper.java | 1108 +- .../api/util/WorldSpawnedEventBuilder.java | 119 +- .../gregtech/api/util/extensions/IteratorExt.java | 1 - src/main/java/gregtech/api/world/GT_Worldgen.java | 57 +- .../java/gregtech/api/world/GT_Worldgen_Ore.java | 17 +- .../api/world/GT_Worldgen_Ore_SingleBlock.java | 57 +- .../GT_Worldgen_Ore_SingleBlock_UnderLava.java | 60 +- 295 files changed, 46640 insertions(+), 14414 deletions(-) (limited to 'src/main/java/gregtech/api') diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java index 2400f1eef9..56e80d4971 100644 --- a/src/main/java/gregtech/api/GregTech_API.java +++ b/src/main/java/gregtech/api/GregTech_API.java @@ -1,5 +1,10 @@ package gregtech.api; +import static gregtech.api.enums.GT_Values.B; +import static gregtech.api.enums.GT_Values.L; +import static gregtech.api.enums.GT_Values.M; +import static gregtech.api.enums.GT_Values.MOD_ID_IC2; + import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; import cpw.mods.fml.common.registry.GameRegistry; @@ -37,16 +42,6 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.api.world.GT_Worldgen; import gregtech.common.items.GT_IntegratedCircuit_Item; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.world.World; -import net.minecraftforge.fluids.Fluid; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -62,11 +57,15 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.BiFunction; import java.util.function.Predicate; import java.util.stream.Collectors; - -import static gregtech.api.enums.GT_Values.B; -import static gregtech.api.enums.GT_Values.L; -import static gregtech.api.enums.GT_Values.M; -import static gregtech.api.enums.GT_Values.MOD_ID_IC2; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.world.World; +import net.minecraftforge.fluids.Fluid; /** * Please do not include this File in your Mod-download as it ruins compatibility, like with the IC2-API @@ -84,7 +83,6 @@ import static gregtech.api.enums.GT_Values.MOD_ID_IC2; * * @author Gregorius Techneticies */ - @SuppressWarnings("unused") // API class has legitimately unused methods and members public class GregTech_API { @@ -102,6 +100,7 @@ public class GregTech_API { * Fixes the HashMap Mappings for ItemStacks once the Server started */ public static final Collection> sItemStackMappings = new ArrayList<>(); + public static final Collection> sFluidMappings = new ArrayList<>(); /** * The MetaTileEntity-ID-List-Length @@ -110,8 +109,7 @@ public class GregTech_API { /** * My Creative Tab */ - public static final CreativeTabs - TAB_GREGTECH = new GT_CreativeTab("Main", "Main"), + public static final CreativeTabs TAB_GREGTECH = new GT_CreativeTab("Main", "Main"), TAB_GREGTECH_MATERIALS = new GT_CreativeTab("Materials", "Materials"), TAB_GREGTECH_ORES = new GT_CreativeTab("Ores", "Ores"); /** @@ -189,8 +187,7 @@ public class GregTech_API { /** * The List of Tools, which can be used. Accepts regular damageable Items and Electric Items */ - public static final GT_HashSet - sToolList = new GT_HashSet<>(), + public static final GT_HashSet sToolList = new GT_HashSet<>(), sCrowbarList = new GT_HashSet<>(), sScrewdriverList = new GT_HashSet<>(), sWrenchList = new GT_HashSet<>(), @@ -202,17 +199,20 @@ public class GregTech_API { /** * The List of Hazmat Armors */ - public static final GT_HashSet - sGasHazmatList = new GT_HashSet<>(), + public static final GT_HashSet sGasHazmatList = new GT_HashSet<>(), sBioHazmatList = new GT_HashSet<>(), sFrostHazmatList = new GT_HashSet<>(), sHeatHazmatList = new GT_HashSet<>(), sRadioHazmatList = new GT_HashSet<>(), sElectroHazmatList = new GT_HashSet<>(); - private static final Multimap sRealConfigurationList = Multimaps.newListMultimap(new TreeMap<>(), ArrayList::new); + + private static final Multimap sRealConfigurationList = + Multimaps.newListMultimap(new TreeMap<>(), ArrayList::new); private static final Map> sConfigurationLists = new HashMap<>(); - private static final Map, BiFunction> sRealCircuitProgrammerList = new LinkedHashMap<>(); - public static final Map, BiFunction> sCircuitProgrammerList = Collections.unmodifiableMap(sRealCircuitProgrammerList); + private static final Map, BiFunction> + sRealCircuitProgrammerList = new LinkedHashMap<>(); + public static final Map, BiFunction> + sCircuitProgrammerList = Collections.unmodifiableMap(sRealCircuitProgrammerList); /** * The List of Dimensions, which are Whitelisted for the Teleporter. This list should not contain other Planets. @@ -231,9 +231,7 @@ public class GregTech_API { /** * This is the generic Cover behavior. Used for the default Covers, which have no Behavior. */ - public static final GT_CoverBehavior - sDefaultBehavior = new GT_Cover_Default(), - sNoBehavior = new GT_Cover_None(); + public static final GT_CoverBehavior sDefaultBehavior = new GT_Cover_Default(), sNoBehavior = new GT_Cover_None(); /** * For the API Version check */ @@ -252,8 +250,7 @@ public class GregTech_API { /** * These Lists are getting executed at their respective timings. Useful if you have to do things right before/after I do them, without having to control the load order. Add your "Commands" in the Constructor or in a static Code Block of your Mods Main Class. These are not Threaded, I just use a native Java Interface for their execution. Implement just the Method run() and everything should work */ - public static List - sBeforeGTPreload = new ArrayList<>(), + public static List sBeforeGTPreload = new ArrayList<>(), sAfterGTPreload = new ArrayList<>(), sBeforeGTLoad = new ArrayList<>(), sAfterGTLoad = new ArrayList<>(), @@ -270,14 +267,11 @@ public class GregTech_API { * The Icon Registers from Blocks and Items. They will get set right before the corresponding Icon Load Phase as executed in the Runnable List above. */ @SideOnly(Side.CLIENT) - public static IIconRegister - sBlockIcons, - sItemIcons; + public static IIconRegister sBlockIcons, sItemIcons; /** * The Configuration Objects */ - public static GT_Config - sRecipeFile = null, + public static GT_Config sRecipeFile = null, sMachineFile = null, sWorldgenFile = null, sMaterialProperties = null, @@ -286,20 +280,18 @@ public class GregTech_API { sSpecialFile = null, sClientDataFile, sOPStuff = null; - public static int - TICKS_FOR_LAG_AVERAGING = 25, - MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING = 100; + + public static int TICKS_FOR_LAG_AVERAGING = 25, MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING = 100; /** * Initialized by the Block creation. */ public static Block sBlockMachines; - public static Block - sBlockOres1, + public static Block sBlockOres1, sBlockOresUb1, sBlockOresUb2, sBlockOresUb3, - /*sBlockGem,*/ + /*sBlockGem,*/ sBlockMetal1, sBlockMetal2, sBlockMetal3, @@ -313,25 +305,19 @@ public class GregTech_API { sBlockGem2, sBlockGem3, sBlockReinforced; - public static Block - sBlockGranites, - sBlockConcretes, - sBlockStones; - public static Block - sBlockCasings1, + public static Block sBlockGranites, sBlockConcretes, sBlockStones; + public static Block sBlockCasings1, sBlockCasings2, sBlockCasings3, sBlockCasings4, sBlockCasings5, sBlockCasings6, sBlockCasings8; - public static Block - sBlockLongDistancePipes; + public static Block sBlockLongDistancePipes; /** * Getting assigned by the Config */ - public static boolean - sTimber = true, + public static boolean sTimber = true, sDrinksAlwaysDrinkable = false, sMultiThreadedSounds = false, sDoShowAllItemsInCreative = false, @@ -358,31 +344,28 @@ public class GregTech_API { mTConstruct = false, mGalacticraft = false, mAE2 = false; - public static int - mEUtoRF = 360, - mRFtoEU = 20; + public static int mEUtoRF = 360, mRFtoEU = 20; /** * Option to not use MACHINE_METAL mixing into colors */ public static boolean sUseMachineMetal = false; - public static boolean mUseOnlyGoodSolderingMaterials = false; private static final String aTextIC2Lower = MOD_ID_IC2.toLowerCase(Locale.ENGLISH); /** * Getting assigned by the Mod loading */ - public static boolean - sUnificationEntriesRegistered = false, + public static boolean sUnificationEntriesRegistered = false, sPreloadStarted = false, sPreloadFinished = false, sLoadStarted = false, sLoadFinished = false, sPostloadStarted = false, sPostloadFinished = false; + private static Class sBaseMetaTileEntityClass = null; static { @@ -408,7 +391,8 @@ public class GregTech_API { */ public static ItemStack getUnificatedOreDictStack(ItemStack aOreStack) { if (!GregTech_API.sPreloadFinished) - GT_Log.err.println("GregTech_API ERROR: " + aOreStack.getItem() + "." + aOreStack.getItemDamage() + " - OreDict Unification Entries are not registered now, please call it in the postload phase."); + GT_Log.err.println("GregTech_API ERROR: " + aOreStack.getItem() + "." + aOreStack.getItemDamage() + + " - OreDict Unification Entries are not registered now, please call it in the postload phase."); return GT_OreDictUnificator.get(true, aOreStack); } @@ -449,8 +433,7 @@ public class GregTech_API { */ @SuppressWarnings("UnusedReturnValue") // Retains API method signature public static boolean registerMachineBlock(Block aBlock, int aMeta) { - if (aBlock == null) - return false; + if (aBlock == null) return false; if (GregTech_API.sThaumcraftCompat != null) GregTech_API.sThaumcraftCompat.registerPortholeBlacklistedBlock(aBlock); sMachineIDs.put(aBlock, aMeta); @@ -461,8 +444,7 @@ public class GregTech_API { * Like above but with boolean Parameters instead of a BitMask */ public static boolean registerMachineBlock(Block aBlock, boolean... aMeta) { - if (aBlock == null || aMeta == null || aMeta.length == 0) - return false; + if (aBlock == null || aMeta == null || aMeta.length == 0) return false; if (GregTech_API.sThaumcraftCompat != null) GregTech_API.sThaumcraftCompat.registerPortholeBlacklistedBlock(aBlock); int rMeta = 0; @@ -488,132 +470,279 @@ public class GregTech_API { public static Item constructCoolantCellItem(String aUnlocalized, String aEnglish, int aMaxStore) { try { return new GT_CoolantCellIC_Item(aUnlocalized, aEnglish, aMaxStore); -// return (Item)Class.forName("gregtech.api.items.GT_CoolantCellIC_Item").getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxStore); - } catch (Throwable e) {/*Do nothing*/} + // return + // (Item)Class.forName("gregtech.api.items.GT_CoolantCellIC_Item").getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxStore); + } catch (Throwable e) { + /*Do nothing*/ + } try { return new GT_CoolantCell_Item(aUnlocalized, aEnglish, aMaxStore); -// return (Item)Class.forName("gregtech.api.items.GT_CoolantCell_Item").getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxStore); - } catch (Throwable e) {/*Do nothing*/} - return new gregtech.api.items.GT_Generic_Item(aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug", false); + // return + // (Item)Class.forName("gregtech.api.items.GT_CoolantCell_Item").getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxStore); + } catch (Throwable e) { + /*Do nothing*/ + } + return new gregtech.api.items.GT_Generic_Item( + aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug", false); } /** * Creates a new Energy Armor Item */ - public static Item constructElectricArmorItem(String aUnlocalized, String aEnglish, int aCharge, int aTransfer, int aTier, int aDamageEnergyCost, int aSpecials, double aArmorAbsorbtionPercentage, boolean aChargeProvider, int aType, int aArmorIndex) { + public static Item constructElectricArmorItem( + String aUnlocalized, + String aEnglish, + int aCharge, + int aTransfer, + int aTier, + int aDamageEnergyCost, + int aSpecials, + double aArmorAbsorbtionPercentage, + boolean aChargeProvider, + int aType, + int aArmorIndex) { try { - return (Item) Class.forName("gregtechmod.api.items.GT_EnergyArmorIC_Item").getConstructors()[0].newInstance(aUnlocalized, aEnglish, aCharge, aTransfer, aTier, aDamageEnergyCost, aSpecials, aArmorAbsorbtionPercentage, aChargeProvider, aType, aArmorIndex); - } catch (Throwable e) {/*Do nothing*/} + return (Item) Class.forName("gregtechmod.api.items.GT_EnergyArmorIC_Item") + .getConstructors()[0] + .newInstance( + aUnlocalized, + aEnglish, + aCharge, + aTransfer, + aTier, + aDamageEnergyCost, + aSpecials, + aArmorAbsorbtionPercentage, + aChargeProvider, + aType, + aArmorIndex); + } catch (Throwable e) { + /*Do nothing*/ + } try { - return (Item) Class.forName("gregtechmod.api.items.GT_EnergyArmor_Item").getConstructors()[0].newInstance(aUnlocalized, aEnglish, aCharge, aTransfer, aTier, aDamageEnergyCost, aSpecials, aArmorAbsorbtionPercentage, aChargeProvider, aType, aArmorIndex); - } catch (Throwable e) {/*Do nothing*/} - return new gregtech.api.items.GT_Generic_Item(aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug", false); + return (Item) Class.forName("gregtechmod.api.items.GT_EnergyArmor_Item") + .getConstructors()[0] + .newInstance( + aUnlocalized, + aEnglish, + aCharge, + aTransfer, + aTier, + aDamageEnergyCost, + aSpecials, + aArmorAbsorbtionPercentage, + aChargeProvider, + aType, + aArmorIndex); + } catch (Throwable e) { + /*Do nothing*/ + } + return new gregtech.api.items.GT_Generic_Item( + aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug", false); } /** * Creates a new Energy Battery Item */ - public static Item constructElectricEnergyStorageItem(String aUnlocalized, String aEnglish, int aCharge, int aTransfer, int aTier, int aEmptyID, int aFullID) { + public static Item constructElectricEnergyStorageItem( + String aUnlocalized, String aEnglish, int aCharge, int aTransfer, int aTier, int aEmptyID, int aFullID) { try { - return (Item) Class.forName("gregtechmod.api.items.GT_EnergyStoreIC_Item").getConstructors()[0].newInstance(aUnlocalized, aEnglish, aCharge, aTransfer, aTier, aEmptyID, aFullID); - } catch (Throwable e) {/*Do nothing*/} + return (Item) Class.forName("gregtechmod.api.items.GT_EnergyStoreIC_Item") + .getConstructors()[0] + .newInstance(aUnlocalized, aEnglish, aCharge, aTransfer, aTier, aEmptyID, aFullID); + } catch (Throwable e) { + /*Do nothing*/ + } try { - return (Item) Class.forName("gregtechmod.api.items.GT_EnergyStore_Item").getConstructors()[0].newInstance(aUnlocalized, aEnglish, aCharge, aTransfer, aTier, aEmptyID, aFullID); - } catch (Throwable e) {/*Do nothing*/} - return new gregtech.api.items.GT_Generic_Item(aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug", false); + return (Item) Class.forName("gregtechmod.api.items.GT_EnergyStore_Item") + .getConstructors()[0] + .newInstance(aUnlocalized, aEnglish, aCharge, aTransfer, aTier, aEmptyID, aFullID); + } catch (Throwable e) { + /*Do nothing*/ + } + return new gregtech.api.items.GT_Generic_Item( + aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug", false); } /** * Creates a new Hard Hammer Item */ - public static GT_Tool_Item constructHardHammerItem(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage) { + public static GT_Tool_Item constructHardHammerItem( + String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage) { try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_HardHammer_Item").getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage); - } catch (Throwable e) {/*Do nothing*/} - return new gregtech.api.items.GT_Tool_Item(aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage, false); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_HardHammer_Item") + .getConstructors()[0] + .newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage); + } catch (Throwable e) { + /*Do nothing*/ + } + return new gregtech.api.items.GT_Tool_Item( + aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage, false); } /** * Creates a new Crowbar Item */ - public static GT_Tool_Item constructCrowbarItem(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage) { + public static GT_Tool_Item constructCrowbarItem( + String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage) { try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_CrowbarRC_Item").getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage); - } catch (Throwable e) {/*Do nothing*/} + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_CrowbarRC_Item") + .getConstructors()[0] + .newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage); + } catch (Throwable e) { + /*Do nothing*/ + } try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_Crowbar_Item").getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage); - } catch (Throwable e) {/*Do nothing*/} - return new gregtech.api.items.GT_Tool_Item(aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage, false); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_Crowbar_Item") + .getConstructors()[0] + .newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage); + } catch (Throwable e) { + /*Do nothing*/ + } + return new gregtech.api.items.GT_Tool_Item( + aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage, false); } /** * Creates a new Wrench Item */ - public static GT_Tool_Item constructWrenchItem(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage, int aDisChargedGTID) { + public static GT_Tool_Item constructWrenchItem( + String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage, int aDisChargedGTID) { try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_Wrench_Item").getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID); - } catch (Throwable e) {/*Do nothing*/} - return new gregtech.api.items.GT_Tool_Item(aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage, false); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_Wrench_Item") + .getConstructors()[0] + .newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID); + } catch (Throwable e) { + /*Do nothing*/ + } + return new gregtech.api.items.GT_Tool_Item( + aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage, false); } /** * Creates a new electric Screwdriver Item */ - public static GT_Tool_Item constructElectricScrewdriverItem(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage, int aDisChargedGTID) { + public static GT_Tool_Item constructElectricScrewdriverItem( + String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage, int aDisChargedGTID) { try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_ScrewdriverIC_Item").getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID); - } catch (Throwable e) {/*Do nothing*/} - return new gregtech.api.items.GT_Tool_Item(aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage, false); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_ScrewdriverIC_Item") + .getConstructors()[0] + .newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID); + } catch (Throwable e) { + /*Do nothing*/ + } + return new gregtech.api.items.GT_Tool_Item( + aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage, false); } /** * Creates a new electric Wrench Item */ - public static GT_Tool_Item constructElectricWrenchItem(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage, int aDisChargedGTID) { + public static GT_Tool_Item constructElectricWrenchItem( + String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage, int aDisChargedGTID) { try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_WrenchIC_Item").getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID); - } catch (Throwable e) {/*Do nothing*/} - return new gregtech.api.items.GT_Tool_Item(aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage, false); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_WrenchIC_Item") + .getConstructors()[0] + .newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID); + } catch (Throwable e) { + /*Do nothing*/ + } + return new gregtech.api.items.GT_Tool_Item( + aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage, false); } /** * Creates a new electric Saw Item */ - public static GT_Tool_Item constructElectricSawItem(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage, int aToolQuality, float aToolStrength, int aEnergyConsumptionPerBlockBreak, int aDisChargedGTID) { + public static GT_Tool_Item constructElectricSawItem( + String aUnlocalized, + String aEnglish, + int aMaxDamage, + int aEntityDamage, + int aToolQuality, + float aToolStrength, + int aEnergyConsumptionPerBlockBreak, + int aDisChargedGTID) { try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_SawIC_Item").getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aToolQuality, aToolStrength, aEnergyConsumptionPerBlockBreak, aDisChargedGTID); - } catch (Throwable e) {/*Do nothing*/} - return new gregtech.api.items.GT_Tool_Item(aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage, false); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_SawIC_Item") + .getConstructors()[0] + .newInstance( + aUnlocalized, + aEnglish, + aMaxDamage, + aEntityDamage, + aToolQuality, + aToolStrength, + aEnergyConsumptionPerBlockBreak, + aDisChargedGTID); + } catch (Throwable e) { + /*Do nothing*/ + } + return new gregtech.api.items.GT_Tool_Item( + aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage, false); } /** * Creates a new electric Drill Item */ - public static GT_Tool_Item constructElectricDrillItem(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage, int aToolQuality, float aToolStrength, int aEnergyConsumptionPerBlockBreak, int aDisChargedGTID) { + public static GT_Tool_Item constructElectricDrillItem( + String aUnlocalized, + String aEnglish, + int aMaxDamage, + int aEntityDamage, + int aToolQuality, + float aToolStrength, + int aEnergyConsumptionPerBlockBreak, + int aDisChargedGTID) { try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_DrillIC_Item").getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aToolQuality, aToolStrength, aEnergyConsumptionPerBlockBreak, aDisChargedGTID); - } catch (Throwable e) {/*Do nothing*/} - return new gregtech.api.items.GT_Tool_Item(aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage, false); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_DrillIC_Item") + .getConstructors()[0] + .newInstance( + aUnlocalized, + aEnglish, + aMaxDamage, + aEntityDamage, + aToolQuality, + aToolStrength, + aEnergyConsumptionPerBlockBreak, + aDisChargedGTID); + } catch (Throwable e) { + /*Do nothing*/ + } + return new gregtech.api.items.GT_Tool_Item( + aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage, false); } /** * Creates a new electric Soldering Tool */ - public static GT_Tool_Item constructElectricSolderingToolItem(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage, int aDisChargedGTID) { + public static GT_Tool_Item constructElectricSolderingToolItem( + String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage, int aDisChargedGTID) { try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_SolderingToolIC_Item").getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID); - } catch (Throwable e) {/*Do nothing*/} - return new gregtech.api.items.GT_Tool_Item(aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage, false); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_SolderingToolIC_Item") + .getConstructors()[0] + .newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID); + } catch (Throwable e) { + /*Do nothing*/ + } + return new gregtech.api.items.GT_Tool_Item( + aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug", aMaxDamage, aEntityDamage, false); } /** * Creates a new empty electric Tool */ - public static GT_Tool_Item constructEmptyElectricToolItem(String aUnlocalized, String aEnglish, int aMaxDamage, int aChargedGTID) { + public static GT_Tool_Item constructEmptyElectricToolItem( + String aUnlocalized, String aEnglish, int aMaxDamage, int aChargedGTID) { try { - return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_EmptyToolIC_Item").getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aChargedGTID); - } catch (Throwable e) {/*Do nothing*/} - return new gregtech.api.items.GT_Tool_Item(aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug", aMaxDamage, 0, false); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_EmptyToolIC_Item") + .getConstructors()[0] + .newInstance(aUnlocalized, aEnglish, aMaxDamage, aChargedGTID); + } catch (Throwable e) { + /*Do nothing*/ + } + return new gregtech.api.items.GT_Tool_Item( + aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug", aMaxDamage, 0, false); } /** @@ -623,7 +752,9 @@ public class GregTech_API { if (sBaseMetaTileEntityClass == null) { try { return (sBaseMetaTileEntityClass = BaseMetaTileEntity.class).newInstance(); - } catch (Throwable e) {/*Do nothing*/} + } catch (Throwable e) { + /*Do nothing*/ + } } try { @@ -650,11 +781,9 @@ public class GregTech_API { * in LV+ single blocks, GT++ breakthrough circuit is offered in HV+ single blocks */ public static void registerConfigurationCircuit(ItemStack aStack, int minTier) { - if (GT_Utility.isStackInvalid(aStack)) - return; + if (GT_Utility.isStackInvalid(aStack)) return; for (ItemStack tRegistered : sRealConfigurationList.values()) - if (GT_Utility.areStacksEqual(tRegistered, aStack)) - return; + if (GT_Utility.areStacksEqual(tRegistered, aStack)) return; ItemStack stack = GT_Utility.copyAmount(0, aStack); sRealConfigurationList.put(minTier, stack); sConfigurationLists.entrySet().stream() @@ -671,35 +800,40 @@ public class GregTech_API { * DO NOT MODIFY THE ItemStacks! */ public static List getConfigurationCircuitList(int machineTier) { - return Collections.unmodifiableList( - sConfigurationLists.computeIfAbsent(machineTier, (t) -> sRealConfigurationList.entries().stream().filter(e -> e.getKey() <= machineTier).map(Map.Entry::getValue).collect(Collectors.toList())) + return Collections.unmodifiableList(sConfigurationLists + .computeIfAbsent(machineTier, (t) -> sRealConfigurationList.entries().stream() + .filter(e -> e.getKey() <= machineTier) + .map(Map.Entry::getValue) + .collect(Collectors.toList())) .stream() .sorted(getConfigurationCircuitsComparator()) - .collect(Collectors.toList()) - ); + .collect(Collectors.toList())); } public static Comparator getConfigurationCircuitsComparator() { - return Comparator - .comparingInt((ItemStack is) -> { - // By default, the Programmed Circuit should be the earliest configuration circuit to which the player is exposed - if (GT_Mod.gregtechproxy.mCircuitsOrder.isEmpty()) - return is.getItem() instanceof GT_IntegratedCircuit_Item ? 0 : 1; - return GT_Mod.gregtechproxy.mCircuitsOrder.getOrDefault(GameRegistry.findUniqueIdentifierFor(is.getItem()).toString(), Integer.MAX_VALUE); - }) - .thenComparing(ItemStack::getUnlocalizedName) - .thenComparing(ItemStack::getItemDamage); + return Comparator.comparingInt((ItemStack is) -> { + // By default, the Programmed Circuit should be the earliest configuration circuit to which the + // player is exposed + if (GT_Mod.gregtechproxy.mCircuitsOrder.isEmpty()) + return is.getItem() instanceof GT_IntegratedCircuit_Item ? 0 : 1; + return GT_Mod.gregtechproxy.mCircuitsOrder.getOrDefault( + GameRegistry.findUniqueIdentifierFor(is.getItem()).toString(), Integer.MAX_VALUE); + }) + .thenComparing(ItemStack::getUnlocalizedName) + .thenComparing(ItemStack::getItemDamage); } public static void registerCircuitProgrammer(ItemStack stack, boolean ignoreNBT, boolean useContainer) { - registerCircuitProgrammer(rhs -> GT_Utility.areStacksEqual(stack, rhs, ignoreNBT), useContainer); + registerCircuitProgrammer(rhs -> GT_Utility.areStacksEqual(stack, rhs, ignoreNBT), useContainer); } public static void registerCircuitProgrammer(Predicate predicate, boolean useContainer) { - sRealCircuitProgrammerList.put(predicate, useContainer ? (s, p) -> s.getItem().getContainerItem(s) : (s, p) -> s); + sRealCircuitProgrammerList.put( + predicate, useContainer ? (s, p) -> s.getItem().getContainerItem(s) : (s, p) -> s); } - public static void registerCircuitProgrammer(Predicate predicate, BiFunction doDamage) { + public static void registerCircuitProgrammer( + Predicate predicate, BiFunction doDamage) { sRealCircuitProgrammerList.put(predicate, doDamage); } @@ -709,9 +843,10 @@ public class GregTech_API { public static void registerCover(ItemStack aStack, ITexture aCover, GT_CoverBehaviorBase aBehavior) { if (!sCovers.containsKey(new GT_ItemStack(aStack))) - sCovers.put(new GT_ItemStack(aStack), aCover == null || !aCover.isValidTexture() ? Textures.BlockIcons.ERROR_RENDERING[0] : aCover); - if (aBehavior != null) - sCoverBehaviors.put(new GT_ItemStack(aStack), aBehavior); + sCovers.put( + new GT_ItemStack(aStack), + aCover == null || !aCover.isValidTexture() ? Textures.BlockIcons.ERROR_RENDERING[0] : aCover); + if (aBehavior != null) sCoverBehaviors.put(new GT_ItemStack(aStack), aBehavior); } public static void registerCoverBehavior(ItemStack aStack, GT_CoverBehavior aBehavior) { @@ -728,7 +863,7 @@ public class GregTech_API { * @param aBehavior can be null */ public static void registerCover(Collection aStackList, ITexture aCover, GT_CoverBehavior aBehavior) { - registerCover(aStackList, aCover, (GT_CoverBehaviorBase)aBehavior); + registerCover(aStackList, aCover, (GT_CoverBehaviorBase) aBehavior); } /** @@ -736,7 +871,8 @@ public class GregTech_API { * * @param aBehavior can be null */ - public static void registerCover(Collection aStackList, ITexture aCover, GT_CoverBehaviorBase aBehavior) { + public static void registerCover( + Collection aStackList, ITexture aCover, GT_CoverBehaviorBase aBehavior) { if (aCover.isValidTexture()) aStackList.forEach(tStack -> GregTech_API.registerCover(tStack, aCover, aBehavior)); } @@ -746,11 +882,9 @@ public class GregTech_API { */ @Deprecated public static GT_CoverBehavior getCoverBehavior(ItemStack aStack) { - if (aStack == null || aStack.getItem() == null) - return sNoBehavior; + if (aStack == null || aStack.getItem() == null) return sNoBehavior; GT_CoverBehaviorBase rCover = sCoverBehaviors.get(new GT_ItemStack(aStack)); - if (!(rCover instanceof GT_CoverBehavior)) - return sDefaultBehavior; + if (!(rCover instanceof GT_CoverBehavior)) return sDefaultBehavior; return (GT_CoverBehavior) rCover; } @@ -759,8 +893,7 @@ public class GregTech_API { * @return The Cover behavior */ public static GT_CoverBehaviorBase getCoverBehaviorNew(ItemStack aStack) { - if (aStack == null || aStack.getItem() == null) - return sNoBehavior; + if (aStack == null || aStack.getItem() == null) return sNoBehavior; GT_CoverBehaviorBase rCover = sCoverBehaviors.get(new GT_ItemStack(aStack)); if (rCover != null) return rCover; rCover = sCoverBehaviors.get(new GT_ItemStack(aStack, true)); @@ -773,8 +906,7 @@ public class GregTech_API { */ @Deprecated public static GT_CoverBehavior getCoverBehavior(int aStack) { - if (aStack == 0) - return sNoBehavior; + if (aStack == 0) return sNoBehavior; return getCoverBehavior(GT_Utility.intToStack(aStack)); } @@ -782,8 +914,7 @@ public class GregTech_API { * returns a Cover behavior, guaranteed to not return null */ public static GT_CoverBehaviorBase getCoverBehaviorNew(int aStack) { - if (aStack == 0) - return sNoBehavior; + if (aStack == 0) return sNoBehavior; return getCoverBehaviorNew(GT_Utility.intToStack(aStack)); } @@ -881,8 +1012,11 @@ public class GregTech_API { * Contains all sanity Checks for Tools, like preventing one Tool from being registered for multiple purposes as controls would override each other. */ public static boolean registerTool(ItemStack aTool, Collection aToolList) { - if (aTool == null || GT_Utility.isStackInList(aTool, sToolList) || (!aTool.getItem().isDamageable() && !GT_ModHandler.isElectricItem(aTool) && !(aTool.getItem() instanceof IDamagableItem))) - return false; + if (aTool == null + || GT_Utility.isStackInList(aTool, sToolList) + || (!aTool.getItem().isDamageable() + && !GT_ModHandler.isElectricItem(aTool) + && !(aTool.getItem() instanceof IDamagableItem))) return false; aToolList.add(new GT_ItemStack(GT_Utility.copyAmount(1, aTool))); sToolList.add(new GT_ItemStack(GT_Utility.copyAmount(1, aTool))); return true; diff --git a/src/main/java/gregtech/api/damagesources/GT_DamageSources.java b/src/main/java/gregtech/api/damagesources/GT_DamageSources.java index 45f3fd5323..a012f030c5 100644 --- a/src/main/java/gregtech/api/damagesources/GT_DamageSources.java +++ b/src/main/java/gregtech/api/damagesources/GT_DamageSources.java @@ -1,11 +1,10 @@ package gregtech.api.damagesources; +import javax.annotation.Nullable; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.*; -import javax.annotation.Nullable; - public class GT_DamageSources { public static DamageSource getElectricDamage() { return ic2.api.info.Info.DMG_ELECTRIC; @@ -57,7 +56,8 @@ public class GT_DamageSources { @Override public IChatComponent func_151519_b(EntityLivingBase aTarget) { - return new ChatComponentText(EnumChatFormatting.RED + aTarget.getCommandSenderName() + EnumChatFormatting.WHITE + " got frozen"); + return new ChatComponentText( + EnumChatFormatting.RED + aTarget.getCommandSenderName() + EnumChatFormatting.WHITE + " got frozen"); } } @@ -69,7 +69,8 @@ public class GT_DamageSources { @Override public IChatComponent func_151519_b(EntityLivingBase aTarget) { - return new ChatComponentText(EnumChatFormatting.RED + aTarget.getCommandSenderName() + EnumChatFormatting.WHITE + " was boiled alive"); + return new ChatComponentText(EnumChatFormatting.RED + aTarget.getCommandSenderName() + + EnumChatFormatting.WHITE + " was boiled alive"); } } @@ -97,7 +98,8 @@ public class GT_DamageSources { @Override public IChatComponent func_151519_b(EntityLivingBase aTarget) { - return new ChatComponentText(EnumChatFormatting.RED + aTarget.getCommandSenderName() + EnumChatFormatting.WHITE + " exploded"); + return new ChatComponentText( + EnumChatFormatting.RED + aTarget.getCommandSenderName() + EnumChatFormatting.WHITE + " exploded"); } } } diff --git a/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java b/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java index 9a9521d130..a31b802219 100644 --- a/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java +++ b/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java @@ -43,11 +43,20 @@ public class Enchantment_EnderDamage extends EnchantmentDamage { @Override public void func_151367_b(EntityLivingBase aHurtEntity, Entity aDamagingEntity, int aLevel) { - if ((aHurtEntity instanceof EntityEnderman || aHurtEntity instanceof EntityDragon || (aHurtEntity.getClass().getName().contains(".") && aHurtEntity.getClass().getName().substring(aHurtEntity.getClass().getName().lastIndexOf(".")).contains("Ender")))) { + if ((aHurtEntity instanceof EntityEnderman + || aHurtEntity instanceof EntityDragon + || (aHurtEntity.getClass().getName().contains(".") + && aHurtEntity + .getClass() + .getName() + .substring(aHurtEntity.getClass().getName().lastIndexOf(".")) + .contains("Ender")))) { // Weakness causes Endermen to not be able to teleport with GT being installed. - aHurtEntity.addPotionEffect(new PotionEffect(Potion.weakness.id, aLevel * 200, Math.max(1, (5 * aLevel) / 7))); + aHurtEntity.addPotionEffect( + new PotionEffect(Potion.weakness.id, aLevel * 200, Math.max(1, (5 * aLevel) / 7))); // They also get Poisoned. If you have this Enchant on an Arrow, you can kill the Ender Dragon easier. - aHurtEntity.addPotionEffect(new PotionEffect(Potion.poison.id, aLevel * 200, Math.max(1, (5 * aLevel) / 7))); + aHurtEntity.addPotionEffect( + new PotionEffect(Potion.poison.id, aLevel * 200, Math.max(1, (5 * aLevel) / 7))); } } diff --git a/src/main/java/gregtech/api/enums/ConfigCategories.java b/src/main/java/gregtech/api/enums/ConfigCategories.java index 513872ce38..ae4b425e5e 100644 --- a/src/main/java/gregtech/api/enums/ConfigCategories.java +++ b/src/main/java/gregtech/api/enums/ConfigCategories.java @@ -15,7 +15,8 @@ public enum ConfigCategories { heatdamage, oreprocessingoutputmultiplier, blastfurnacerequirements, - blastinductionsmelter,; + blastinductionsmelter, + ; } public enum Recipes { @@ -25,7 +26,7 @@ public enum ConfigCategories { disabledrecipes, recipereplacements, storageblockcrafting, - storageblockdecrafting, + storageblockdecrafting, crops; } @@ -61,6 +62,6 @@ public enum ConfigCategories { hammertripleplate, hammerquadrupleplate, hammerquintupleplate, - scoop; + scoop; } } diff --git a/src/main/java/gregtech/api/enums/Dyes.java b/src/main/java/gregtech/api/enums/Dyes.java index 6b1ce244c0..46207ee781 100644 --- a/src/main/java/gregtech/api/enums/Dyes.java +++ b/src/main/java/gregtech/api/enums/Dyes.java @@ -3,11 +3,10 @@ package gregtech.api.enums; import gregtech.api.interfaces.IColorModulationContainer; import gregtech.api.objects.GT_ArrayList; import gregtech.api.util.GT_Utility; +impo