From 8ac58626bd4caa9e49f58acc6b97ac031f6c2107 Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Mon, 10 Apr 2023 17:49:16 +0100 Subject: Update spotless config to 0.2.2 --- src/main/java/gregtech/api/GregTech_API.java | 437 +- .../api/damagesources/GT_DamageSources.java | 10 +- .../api/enchants/Enchantment_EnderDamage.java | 28 +- .../api/enchants/Enchantment_Radioactivity.java | 10 +- src/main/java/gregtech/api/enums/Dyes.java | 2 +- src/main/java/gregtech/api/enums/Element.java | 2 +- src/main/java/gregtech/api/enums/FluidState.java | 2 +- .../gregtech/api/enums/GTNH_ExtraMaterials.java | 1144 ++-- .../java/gregtech/api/enums/GT_HatchElement.java | 6 +- src/main/java/gregtech/api/enums/GT_Values.java | 350 +- src/main/java/gregtech/api/enums/ItemList.java | 70 +- .../java/gregtech/api/enums/MaterialBuilder.java | 56 +- src/main/java/gregtech/api/enums/Materials.java | 1479 +++-- .../java/gregtech/api/enums/MaterialsBotania.java | 374 +- .../java/gregtech/api/enums/MaterialsKevlar.java | 1246 ++-- .../java/gregtech/api/enums/MaterialsOreAlum.java | 148 +- src/main/java/gregtech/api/enums/Mods.java | 2 +- src/main/java/gregtech/api/enums/OrePrefixes.java | 1218 ++-- .../java/gregtech/api/enums/SoundResource.java | 4 +- src/main/java/gregtech/api/enums/SubTag.java | 4 +- src/main/java/gregtech/api/enums/TextureSet.java | 104 +- src/main/java/gregtech/api/enums/Textures.java | 563 +- src/main/java/gregtech/api/enums/Tier.java | 856 +-- .../java/gregtech/api/enums/ToolDictNames.java | 2 +- .../gregtech/api/events/BlockScanningEvent.java | 3 +- src/main/java/gregtech/api/fluid/FluidTankGT.java | 17 +- .../java/gregtech/api/fluid/GT_FluidFactory.java | 18 +- .../java/gregtech/api/graphs/GenerateNodeMap.java | 24 +- .../gregtech/api/graphs/GenerateNodeMapPower.java | 26 +- src/main/java/gregtech/api/graphs/Node.java | 2 +- src/main/java/gregtech/api/graphs/PowerNodes.java | 46 +- .../api/graphs/consumers/NodeEnergyConnected.java | 2 +- .../api/graphs/consumers/NodeEnergyReceiver.java | 17 +- .../api/graphs/consumers/NodeEnergySink.java | 4 +- .../api/graphs/consumers/NodeGTBaseMetaTile.java | 2 +- .../gregtech/api/graphs/paths/PowerNodePath.java | 5 +- src/main/java/gregtech/api/gui/GT_Container.java | 96 +- .../api/gui/GT_ContainerMetaTile_Machine.java | 19 +- .../api/gui/GT_Container_BasicMachine.java | 12 +- .../gregtech/api/gui/GT_Container_BasicTank.java | 10 +- .../api/gui/GT_Container_MultiMachine.java | 2 +- .../java/gregtech/api/gui/GT_GUIColorOverride.java | 37 +- .../api/gui/GT_GUIContainerMetaTile_Machine.java | 60 +- .../gregtech/api/gui/GT_GUIContainer_1by1.java | 10 +- .../gregtech/api/gui/GT_GUIContainer_2by2.java | 10 +- .../gregtech/api/gui/GT_GUIContainer_3by3.java | 10 +- .../gregtech/api/gui/GT_GUIContainer_4by4.java | 10 +- .../api/gui/GT_GUIContainer_BasicMachine.java | 137 +- .../api/gui/GT_GUIContainer_BasicTank.java | 23 +- .../api/gui/GT_GUIContainer_MultiMachine.java | 98 +- src/main/java/gregtech/api/gui/GT_GUICover.java | 14 +- .../gregtech/api/gui/GT_GUIDialogSelectItem.java | 32 +- src/main/java/gregtech/api/gui/GT_Slot_Armor.java | 4 +- src/main/java/gregtech/api/gui/GT_Slot_Holo.java | 2 +- .../gui/modularui/FallbackableSteamTexture.java | 4 +- .../api/gui/modularui/GT_CoverUIBuildContext.java | 2 +- .../gregtech/api/gui/modularui/GT_UIInfos.java | 173 +- .../gregtech/api/gui/modularui/GT_UITextures.java | 855 +-- .../gregtech/api/gui/modularui/GUITextureSet.java | 66 +- .../gregtech/api/gui/modularui/SteamTexture.java | 32 +- .../api/gui/widgets/GT_GuiCoverTabLine.java | 42 +- .../api/gui/widgets/GT_GuiFakeItemButton.java | 14 +- .../java/gregtech/api/gui/widgets/GT_GuiIcon.java | 8 +- .../gregtech/api/gui/widgets/GT_GuiIconButton.java | 4 +- .../api/gui/widgets/GT_GuiIconCheckButton.java | 2 +- .../api/gui/widgets/GT_GuiIntegerTextBox.java | 18 +- .../java/gregtech/api/gui/widgets/GT_GuiTab.java | 32 +- .../gregtech/api/gui/widgets/GT_GuiTabLine.java | 24 +- .../api/gui/widgets/GT_GuiTooltipManager.java | 6 +- .../api/interfaces/IDragAndDropSupport.java | 2 +- .../api/interfaces/IGlobalWirelessEnergy.java | 10 +- .../gregtech/api/interfaces/IHatchElement.java | 50 +- .../gregtech/api/interfaces/IItemBehaviour.java | 8 +- .../gregtech/api/interfaces/IProjectileItem.java | 2 +- .../java/gregtech/api/interfaces/IToolStats.java | 4 +- .../api/interfaces/fluid/IGT_FluidBuilder.java | 2 +- .../api/interfaces/fluid/IGT_RegisteredFluid.java | 2 +- .../api/interfaces/internal/IGT_RecipeAdder.java | 206 +- .../api/interfaces/internal/IThaumcraftCompat.java | 26 +- .../interfaces/metatileentity/IMetaTileEntity.java | 12 +- .../metatileentity/IMetaTileEntityCable.java | 2 +- .../metatileentity/IMetaTileEntityItemPipe.java | 45 +- .../interfaces/tileentity/IColoredTileEntity.java | 4 +- .../api/interfaces/tileentity/ICoverable.java | 2 +- .../interfaces/tileentity/IEnergyConnected.java | 19 +- .../tileentity/IExperimentalEnergyTileEntity.java | 45 +- .../interfaces/tileentity/IGregTechTileEntity.java | 10 +- .../tileentity/IGregtechWailaProvider.java | 4 +- .../api/items/GT_Block_LongDistancePipe.java | 5 +- .../gregtech/api/items/GT_BreederCell_Item.java | 24 +- .../gregtech/api/items/GT_CoolantCellIC_Item.java | 2 +- .../gregtech/api/items/GT_CoolantCell_Item.java | 4 +- .../gregtech/api/items/GT_EnergyArmor_Item.java | 58 +- .../java/gregtech/api/items/GT_Generic_Item.java | 12 +- .../java/gregtech/api/items/GT_MetaBase_Item.java | 104 +- .../gregtech/api/items/GT_MetaGenerated_Item.java | 55 +- .../api/items/GT_MetaGenerated_Item_X01.java | 43 +- .../api/items/GT_MetaGenerated_Item_X32.java | 26 +- .../gregtech/api/items/GT_MetaGenerated_Tool.java | 415 +- .../api/items/GT_RadioactiveCellIC_Item.java | 45 +- .../api/items/GT_RadioactiveCell_Item.java | 10 +- .../gregtech/api/items/GT_SolderingTool_Item.java | 30 +- .../java/gregtech/api/items/GT_Spray_Bug_Item.java | 30 +- .../gregtech/api/items/GT_Spray_Foam_Item.java | 82 +- .../gregtech/api/items/GT_Spray_Hardener_Item.java | 35 +- .../api/items/GT_Spray_Hydration_Item.java | 22 +- .../java/gregtech/api/items/GT_Spray_Ice_Item.java | 38 +- .../gregtech/api/items/GT_Spray_Pepper_Item.java | 36 +- src/main/java/gregtech/api/items/GT_Tool_Item.java | 34 +- .../api/metatileentity/BaseMetaPipeEntity.java | 360 +- .../api/metatileentity/BaseMetaTileEntity.java | 804 ++- .../api/metatileentity/BaseTileEntity.java | 203 +- .../api/metatileentity/CommonMetaTileEntity.java | 2 +- .../api/metatileentity/CoverableTileEntity.java | 226 +- .../api/metatileentity/MetaPipeEntity.java | 67 +- .../api/metatileentity/MetaTileEntity.java | 107 +- .../api/metatileentity/TileIC2EnergySink.java | 22 +- .../examples/GT_MetaTileEntity_E_Furnace.java | 124 +- .../implementations/GT_MetaPipeEntity_Cable.java | 275 +- .../implementations/GT_MetaPipeEntity_Fluid.java | 299 +- .../implementations/GT_MetaPipeEntity_Frame.java | 31 +- .../implementations/GT_MetaPipeEntity_Item.java | 170 +- .../GT_MetaTileEntity_BasicBatteryBuffer.java | 177 +- .../GT_MetaTileEntity_BasicGenerator.java | 55 +- .../GT_MetaTileEntity_BasicHull.java | 16 +- .../GT_MetaTileEntity_BasicHull_NonElectric.java | 8 +- .../GT_MetaTileEntity_BasicMachine.java | 624 +- .../GT_MetaTileEntity_BasicMachine_Bronze.java | 171 +- .../GT_MetaTileEntity_BasicMachine_GT_Recipe.java | 446 +- .../GT_MetaTileEntity_BasicMachine_Steel.java | 64 +- .../GT_MetaTileEntity_BasicTank.java | 134 +- .../implementations/GT_MetaTileEntity_Buffer.java | 214 +- .../GT_MetaTileEntity_CubicMultiBlockBase.java | 42 +- .../GT_MetaTileEntity_EnhancedMultiBlockBase.java | 188 +- ...MetaTileEntity_ExtendedPowerMultiBlockBase.java | 112 +- .../implementations/GT_MetaTileEntity_Hatch.java | 12 +- .../GT_MetaTileEntity_Hatch_DataAccess.java | 28 +- .../GT_MetaTileEntity_Hatch_Dynamo.java | 14 +- .../GT_MetaTileEntity_Hatch_Energy.java | 18 +- .../GT_MetaTileEntity_Hatch_Input.java | 44 +- .../GT_MetaTileEntity_Hatch_InputBus.java | 56 +- .../GT_MetaTileEntity_Hatch_Maintenance.java | 121 +- .../GT_MetaTileEntity_Hatch_Muffler.java | 51 +- .../GT_MetaTileEntity_Hatch_MultiInput.java | 63 +- .../GT_MetaTileEntity_Hatch_Output.java | 275 +- .../GT_MetaTileEntity_Hatch_OutputBus.java | 58 +- .../GT_MetaTileEntity_MultiBlockBase.java | 779 ++- .../GT_MetaTileEntity_SpecialFilter.java | 144 +- .../GT_MetaTileEntity_TieredMachineBlock.java | 22 +- .../GT_MetaTileEntity_TooltipMultiBlockBase.java | 4 +- .../GT_MetaTileEntity_Transformer.java | 166 +- .../GT_MetaTileEntity_Wireless_Dynamo.java | 10 +- .../GT_MetaTileEntity_Wireless_Hatch.java | 12 +- .../api/multitileentity/MultiTileEntityBlock.java | 209 +- .../MultiTileEntityBlockInternal.java | 15 +- .../MultiTileEntityClassContainer.java | 14 +- .../MultiTileEntityItemInternal.java | 152 +- .../multitileentity/MultiTileEntityRegistry.java | 57 +- .../api/multitileentity/base/MultiTileEntity.java | 267 +- .../base/NonTickableMultiTileEntity.java | 2 +- .../interfaces/IMultiTileEntity.java | 12 +- .../machine/MultiTileBasicMachine.java | 110 +- .../multiblock/base/MultiBlockController.java | 571 +- .../multiblock/base/MultiBlockPart.java | 113 +- .../multiblock/base/MultiBlockPowerController.java | 2 +- .../gregtech/api/net/GT_Packet_Block_Event.java | 10 +- .../api/net/GT_Packet_ClientPreference.java | 2 +- .../api/net/GT_Packet_GtTileEntityGuiRequest.java | 40 +- .../api/net/GT_Packet_MultiTileEntity.java | 48 +- .../api/net/GT_Packet_RequestCoverData.java | 10 +- .../gregtech/api/net/GT_Packet_SendCoverData.java | 18 +- .../api/net/GT_Packet_SetConfigurationCircuit.java | 16 +- .../gregtech/api/net/GT_Packet_SetLockedFluid.java | 14 +- .../java/gregtech/api/net/GT_Packet_Sound.java | 12 +- .../gregtech/api/net/GT_Packet_TileEntity.java | 127 +- .../api/net/GT_Packet_TileEntityCover.java | 14 +- .../api/net/GT_Packet_TileEntityCoverGUI.java | 46 +- .../api/net/GT_Packet_TileEntityCoverNew.java | 20 +- .../api/net/GT_Packet_WirelessRedstoneCover.java | 23 +- .../api/objects/AE2DigitalChestHandler.java | 6 +- .../java/gregtech/api/objects/CollectorUtils.java | 2 +- .../java/gregtech/api/objects/ElementStack.java | 2 +- .../java/gregtech/api/objects/GT_ChunkManager.java | 75 +- .../gregtech/api/objects/GT_Cover_Default.java | 12 +- .../java/gregtech/api/objects/GT_Cover_None.java | 62 +- src/main/java/gregtech/api/objects/GT_Fluid.java | 2 +- .../java/gregtech/api/objects/GT_FluidStack.java | 16 +- src/main/java/gregtech/api/objects/GT_HashSet.java | 2 +- .../java/gregtech/api/objects/GT_ItemStack.java | 6 +- .../gregtech/api/objects/GT_RenderedTexture.java | 2 +- .../java/gregtech/api/objects/GT_SidedTexture.java | 8 +- .../api/objects/GT_StdRenderedTexture.java | 2 +- .../java/gregtech/api/objects/GT_UO_Dimension.java | 10 +- .../gregtech/api/objects/GT_UO_DimensionList.java | 37 +- .../java/gregtech/api/objects/GT_UO_Fluid.java | 20 +- src/main/java/gregtech/api/objects/ItemData.java | 10 +- .../java/gregtech/api/objects/MaterialStack.java | 3 +- src/main/java/gregtech/api/objects/ObjMap.java | 2 +- src/main/java/gregtech/api/objects/XSTR.java | 7 +- .../java/gregtech/api/render/TextureFactory.java | 42 +- .../api/threads/GT_Runnable_Cable_Update.java | 28 +- .../threads/GT_Runnable_MachineBlockUpdate.java | 40 +- .../gregtech/api/threads/GT_Runnable_Sound.java | 38 +- .../gregtech/api/util/ColorsMetadataSection.java | 4 +- .../api/util/ColorsMetadataSectionSerializer.java | 20 +- .../java/gregtech/api/util/GT_ApiaryUpgrade.java | 8 +- .../gregtech/api/util/GT_AssemblyLineUtils.java | 89 +- .../gregtech/api/util/GT_Assemblyline_Server.java | 475 +- src/main/java/gregtech/api/util/GT_BaseCrop.java | 95 +- src/main/java/gregtech/api/util/GT_CLS_Compat.java | 64 +- .../gregtech/api/util/GT_ChunkAssociatedData.java | 153 +- .../gregtech/api/util/GT_CircuitryBehavior.java | 74 +- .../gregtech/api/util/GT_ClientPreference.java | 8 +- src/main/java/gregtech/api/util/GT_Config.java | 50 +- .../java/gregtech/api/util/GT_CoverBehavior.java | 90 +- .../gregtech/api/util/GT_CoverBehaviorBase.java | 177 +- .../api/util/GT_ExoticEnergyInputHelper.java | 21 +- src/main/java/gregtech/api/util/GT_FoodStat.java | 38 +- .../java/gregtech/api/util/GT_Forestry_Compat.java | 224 +- src/main/java/gregtech/api/util/GT_GC_Compat.java | 16 +- .../gregtech/api/util/GT_HatchElementBuilder.java | 258 +- .../api/util/GT_ItsNotMyFaultException.java | 2 +- .../java/gregtech/api/util/GT_LanguageManager.java | 50 +- src/main/java/gregtech/api/util/GT_ModHandler.java | 938 ++- .../api/util/GT_Multiblock_Tooltip_Builder.java | 65 +- .../gregtech/api/util/GT_OreDictUnificator.java | 44 +- .../gregtech/api/util/GT_OverclockCalculator.java | 8 +- .../gregtech/api/util/GT_PCBFactoryManager.java | 2 +- .../java/gregtech/api/util/GT_ParallelHelper.java | 22 +- .../java/gregtech/api/util/GT_PlayedSound.java | 4 +- src/main/java/gregtech/api/util/GT_Recipe.java | 6340 ++++++++++---------- .../java/gregtech/api/util/GT_RecipeBuilder.java | 178 +- .../java/gregtech/api/util/GT_RecipeConstants.java | 186 +- .../java/gregtech/api/util/GT_RecipeMapUtil.java | 58 +- .../gregtech/api/util/GT_RecipeRegistrator.java | 641 +- .../java/gregtech/api/util/GT_RenderingWorld.java | 12 +- .../java/gregtech/api/util/GT_Shaped_Recipe.java | 40 +- .../gregtech/api/util/GT_Shapeless_Recipe.java | 40 +- .../gregtech/api/util/GT_Single_Recipe_Check.java | 112 +- .../GT_Single_Recipe_Check_Processing_Array.java | 46 +- .../gregtech/api/util/GT_SpawnEventHandler.java | 10 +- .../gregtech/api/util/GT_StructureUtility.java | 265 +- .../gregtech/api/util/GT_TooltipDataCache.java | 7 +- src/main/java/gregtech/api/util/GT_Util.java | 82 +- src/main/java/gregtech/api/util/GT_Utility.java | 2493 ++++---- .../java/gregtech/api/util/GT_UtilityClient.java | 19 +- .../java/gregtech/api/util/IGT_HatchAdder.java | 2 +- .../java/gregtech/api/util/LightingHelper.java | 1662 +++-- .../api/util/WorldSpawnedEventBuilder.java | 88 +- src/main/java/gregtech/api/world/GT_Worldgen.java | 30 +- .../java/gregtech/api/world/GT_Worldgen_Ore.java | 4 +- .../api/world/GT_Worldgen_Ore_SingleBlock.java | 44 +- .../GT_Worldgen_Ore_SingleBlock_UnderLava.java | 46 +- 253 files changed, 17298 insertions(+), 18998 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 59fa6776c3..3e0f7fdabe 100644 --- a/src/main/java/gregtech/api/GregTech_API.java +++ b/src/main/java/gregtech/api/GregTech_API.java @@ -108,8 +108,8 @@ public class GregTech_API { * My Creative Tab */ 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"); + TAB_GREGTECH_MATERIALS = new GT_CreativeTab("Materials", "Materials"), + TAB_GREGTECH_ORES = new GT_CreativeTab("Ores", "Ores"); /** * A List of all registered MetaTileEntities *

@@ -173,25 +173,23 @@ 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<>(), sCrowbarList = new GT_HashSet<>(), - sScrewdriverList = new GT_HashSet<>(), sWrenchList = new GT_HashSet<>(), - sSoftHammerList = new GT_HashSet<>(), sHardHammerList = new GT_HashSet<>(), - sWireCutterList = new GT_HashSet<>(), sSolderingToolList = new GT_HashSet<>(), - sSolderingMetalList = new GT_HashSet<>(); + sScrewdriverList = new GT_HashSet<>(), sWrenchList = new GT_HashSet<>(), sSoftHammerList = new GT_HashSet<>(), + sHardHammerList = new GT_HashSet<>(), sWireCutterList = new GT_HashSet<>(), + sSolderingToolList = new GT_HashSet<>(), sSolderingMetalList = new GT_HashSet<>(); /** * The List of Hazmat Armors */ 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<>(); + 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 ConcurrentHashMap<>(); private static final Map, BiFunction> sRealCircuitProgrammerList = new LinkedHashMap<>(); - public static final Map, BiFunction> sCircuitProgrammerList = Collections.unmodifiableMap( - sRealCircuitProgrammerList); + 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. @@ -233,11 +231,11 @@ public class GregTech_API { * Implement just the Method run() and everything should work */ public static List sBeforeGTPreload = new ArrayList<>(), sAfterGTPreload = new ArrayList<>(), - sBeforeGTLoad = new ArrayList<>(), sAfterGTLoad = new ArrayList<>(), sBeforeGTPostload = new ArrayList<>(), - sAfterGTPostload = new ArrayList<>(), sFirstWorldTick = new ArrayList<>(), - sBeforeGTServerstart = new ArrayList<>(), sAfterGTServerstart = new ArrayList<>(), - sBeforeGTServerstop = new ArrayList<>(), sAfterGTServerstop = new ArrayList<>(), - sGTBlockIconload = new ArrayList<>(), sGTItemIconload = new ArrayList<>(); + sBeforeGTLoad = new ArrayList<>(), sAfterGTLoad = new ArrayList<>(), sBeforeGTPostload = new ArrayList<>(), + sAfterGTPostload = new ArrayList<>(), sFirstWorldTick = new ArrayList<>(), + sBeforeGTServerstart = new ArrayList<>(), sAfterGTServerstart = new ArrayList<>(), + sBeforeGTServerstop = new ArrayList<>(), sAfterGTServerstop = new ArrayList<>(), + sGTBlockIconload = new ArrayList<>(), sGTItemIconload = new ArrayList<>(); /** * 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. @@ -248,7 +246,7 @@ public class GregTech_API { * The Configuration Objects */ public static GT_Config sRecipeFile = null, sMachineFile = null, sWorldgenFile = null, sMaterialProperties = null, - sMaterialComponents = null, sUnification = null, sSpecialFile = null, sClientDataFile, sOPStuff = null; + sMaterialComponents = null, sUnification = null, sSpecialFile = null, sClientDataFile, sOPStuff = null; public static int TICKS_FOR_LAG_AVERAGING = 25, MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING = 100; /** @@ -257,24 +255,24 @@ public class GregTech_API { public static Block sBlockMachines; public static Block sBlockOres1, sBlockOresUb1, sBlockOresUb2, sBlockOresUb3, - /* sBlockGem, */ - sBlockMetal1, sBlockMetal2, sBlockMetal3, sBlockMetal4, sBlockMetal5, sBlockMetal6, sBlockMetal7, - sBlockMetal8, sBlockMetal9, sBlockGem1, sBlockGem2, sBlockGem3, sBlockReinforced; + /* sBlockGem, */ + sBlockMetal1, sBlockMetal2, sBlockMetal3, sBlockMetal4, sBlockMetal5, sBlockMetal6, sBlockMetal7, sBlockMetal8, + sBlockMetal9, sBlockGem1, sBlockGem2, sBlockGem3, sBlockReinforced; public static Block sBlockGranites, sBlockConcretes, sBlockStones; public static Block sBlockCasings1, sBlockCasings2, sBlockCasings3, sBlockCasings4, sBlockCasings5, sBlockCasings6, - sBlockCasings8, sBlockCasings9, sSolenoidCoilCasings; + sBlockCasings8, sBlockCasings9, sSolenoidCoilCasings; public static Block sBlockLongDistancePipes; /** * Getting assigned by the Config */ public static boolean sTimber = true, sDrinksAlwaysDrinkable = false, sMultiThreadedSounds = false, - sDoShowAllItemsInCreative = false, sColoredGUI = true, sMachineMetalGUI = false, sConstantEnergy = true, - sMachineExplosions = true, sMachineFlammable = true, sMachineNonWrenchExplosions = true, - sMachineRainExplosions = true, sMachineThunderExplosions = true, sMachineFireExplosions = true, - sMachineWireFire = true, mOutputRF = false, mInputRF = false, meIOLoaded = false, mRFExplosions = false, - mServerStarted = false, mIC2Classic = false, mMagneticraft = false, mImmersiveEngineering = false, - mGTPlusPlus = false, mTranslocator = false, mTConstruct = false, mGalacticraft = false, mAE2 = false, - mHodgepodge = false, mEternalSingularity = false; + sDoShowAllItemsInCreative = false, sColoredGUI = true, sMachineMetalGUI = false, sConstantEnergy = true, + sMachineExplosions = true, sMachineFlammable = true, sMachineNonWrenchExplosions = true, + sMachineRainExplosions = true, sMachineThunderExplosions = true, sMachineFireExplosions = true, + sMachineWireFire = true, mOutputRF = false, mInputRF = false, meIOLoaded = false, mRFExplosions = false, + mServerStarted = false, mIC2Classic = false, mMagneticraft = false, mImmersiveEngineering = false, + mGTPlusPlus = false, mTranslocator = false, mTConstruct = false, mGalacticraft = false, mAE2 = false, + mHodgepodge = false, mEternalSingularity = false; public static int mEUtoRF = 360, mRFtoEU = 20; @@ -290,7 +288,7 @@ public class GregTech_API { * Getting assigned by the Mod loading */ public static boolean sUnificationEntriesRegistered = false, sPreloadStarted = false, sPreloadFinished = false, - sLoadStarted = false, sLoadFinished = false, sPostloadStarted = false, sPostloadFinished = false; + sLoadStarted = false, sLoadFinished = false, sPostloadStarted = false, sPostloadFinished = false; private static Class sBaseMetaTileEntityClass = null; @@ -348,10 +346,10 @@ 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."); + "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); } @@ -443,335 +441,285 @@ public class GregTech_API { /* Do nothing */ } return new gregtech.api.items.GT_Generic_Item( - aUnlocalized, - aEnglish, - "Doesn't work as intended, this is a Bug", - false); + 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) { + 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); + .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); + .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); + 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) { + 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); + .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); + .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); + 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) { + int aEntityDamage) { try { return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_HardHammer_Item") - .getConstructors()[0].newInstance( - aUnlocalized, - aEnglish, - aMaxDamage, - aEntityDamage); + .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); + 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) { + int aEntityDamage) { try { return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_CrowbarRC_Item") - .getConstructors()[0].newInstance( - aUnlocalized, - aEnglish, - aMaxDamage, - aEntityDamage); + .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); + .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); + 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) { + 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); + .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); + 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) { + 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); + .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); + 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) { + 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); + .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); + 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) { + 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); + .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); + 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) { + 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); + .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); + 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) { + 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); + .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); + 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) { + int aChargedGTID) { try { return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_EmptyToolIC_Item") - .getConstructors()[0].newInstance( - aUnlocalized, - aEnglish, - aMaxDamage, - aChargedGTID); + .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); + aUnlocalized, + aEnglish, + "Doesn't work as intended, this is a Bug", + aMaxDamage, + 0, + false); } /** @@ -818,9 +766,9 @@ public class GregTech_API { for (Map.Entry> e : sConfigurationLists.entrySet()) { if (e.getKey() >= minTier) { e.getValue() - .add(stack); + .add(stack); e.getValue() - .sort(getConfigurationCircuitsComparator()); + .sort(getConfigurationCircuitsComparator()); } } } @@ -834,14 +782,14 @@ public class GregTech_API { */ 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) - .sorted(getConfigurationCircuitsComparator()) - .collect(Collectors.toList()))); + sConfigurationLists.computeIfAbsent( + machineTier, + (t) -> sRealConfigurationList.entries() + .stream() + .filter(e -> e.getKey() <= machineTier) + .map(Map.Entry::getValue) + .sorted(getConfigurationCircuitsComparator()) + .collect(Collectors.toList()))); } public static Comparator getConfigurationCircuitsComparator() { @@ -850,12 +798,11 @@ public class GregTech_API { // player is exposed if (GT_Mod.gregtechproxy.mCircuitsOrder.isEmpty()) return is.getItem() instanceof GT_IntegratedCircuit_Item ? 0 : 1; - return GT_Mod.gregtechproxy.mCircuitsOrder.getOrDefault( - String.valueOf(GameRegistry.findUniqueIdentifierFor(is.getItem())), - Integer.MAX_VALUE); + return GT_Mod.gregtechproxy.mCircuitsOrder + .getOrDefault(String.valueOf(GameRegistry.findUniqueIdentifierFor(is.getItem())), Integer.MAX_VALUE); }) - .thenComparing(ItemStack::getUnlocalizedName) - .thenComparing(ItemStack::getItemDamage); + .thenComparing(ItemStack::getUnlocalizedName) + .thenComparing(ItemStack::getItemDamage); } public static void registerCircuitProgrammer(ItemStack stack, boolean ignoreNBT, boolean useContainer) { @@ -864,14 +811,13 @@ public class GregTech_API { public static void registerCircuitProgrammer(Predicate predicate, boolean useContainer) { sRealCircuitProgrammerList.put( - predicate, - useContainer ? (s, p) -> s.getItem() - .getContainerItem(s) - : (s, p) -> s); + predicate, + useContainer ? (s, p) -> s.getItem() + .getContainerItem(s) : (s, p) -> s); } public static void registerCircuitProgrammer(Predicate predicate, - BiFunction doDamage) { + BiFunction doDamage) { sRealCircuitProgrammerList.put(predicate, doDamage); } @@ -881,8 +827,8 @@ 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); + new GT_ItemStack(aStack), + aCover == null || !aCover.isValidTexture() ? Textures.BlockIcons.ERROR_RENDERING[0] : aCover); if (aBehavior != null) sCoverBehaviors.put(new GT_ItemStack(aStack), aBehavior); } @@ -909,7 +855,7 @@ public class GregTech_API { * @param aBehavior can be null */ public static void registerCover(Collection aStackList, ITexture aCover, - GT_CoverBehaviorBase aBehavior) { + GT_CoverBehaviorBase aBehavior) { if (aCover.isValidTexture()) aStackList.forEach(tStack -> GregTech_API.registerCover(tStack, aCover, aBehavior)); } @@ -1058,10 +1004,9 @@ public class GregTech_API { */ 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))) + || (!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))); @@ -1091,7 +1036,7 @@ public class GregTech_API { public static void registerTileEntityConstructor(int meta, IntFunction constructor) { if (meta < 0 || meta > 15 || constructor == null) throw new IllegalArgumentException(); if (teCreators[meta] != null) throw new IllegalStateException( - "previous constructor: " + teCreators[meta] + " new constructor: " + constructor + " meta:" + meta); + "previous constructor: " + teCreators[meta] + " new constructor: " + constructor + " meta:" + meta); teCreators[meta] = constructor; } diff --git a/src/main/java/gregtech/api/damagesources/GT_DamageSources.java b/src/main/java/gregtech/api/damagesources/GT_DamageSources.java index fca4d7fe9f..b8d53f71fb 100644 --- a/src/main/java/gregtech/api/damagesources/GT_DamageSources.java +++ b/src/main/java/gregtech/api/damagesources/GT_DamageSources.java @@ -61,7 +61,7 @@ public class GT_DamageSources { @Override public IChatComponent func_151519_b(EntityLivingBase aTarget) { return new ChatComponentText( - EnumChatFormatting.RED + aTarget.getCommandSenderName() + EnumChatFormatting.WHITE + " got frozen"); + EnumChatFormatting.RED + aTarget.getCommandSenderName() + EnumChatFormatting.WHITE + " got frozen"); } } @@ -75,9 +75,9 @@ public class GT_DamageSources { @Override public IChatComponent func_151519_b(EntityLivingBase aTarget) { return new ChatComponentText( - EnumChatFormatting.RED + aTarget.getCommandSenderName() - + EnumChatFormatting.WHITE - + " was boiled alive"); + EnumChatFormatting.RED + aTarget.getCommandSenderName() + + EnumChatFormatting.WHITE + + " was boiled alive"); } } @@ -108,7 +108,7 @@ public class GT_DamageSources { @Override public IChatComponent func_151519_b(EntityLivingBase aTarget) { return new ChatComponentText( - EnumChatFormatting.RED + aTarget.getCommandSenderName() + EnumChatFormatting.WHITE + " exploded"); + 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 e48b3e5b19..07c13b3509 100644 --- a/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java +++ b/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java @@ -46,22 +46,22 @@ 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")))) { + || (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/enchants/Enchantment_Radioactivity.java b/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java index bf4cc00be4..e68e55cd6a 100644 --- a/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java +++ b/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java @@ -19,15 +19,15 @@ public class Enchantment_Radioactivity extends EnchantmentDamage { super(GT_Config.addIDConfig(ConfigCategories.IDs.enchantments, "Radioactivity", 14), 0, -1); GT_LanguageManager.addStringLocalization(getName(), "Radioactivity"); Materials.Plutonium.setEnchantmentForTools(this, 1) - .setEnchantmentForArmors(this, 1); + .setEnchantmentForArmors(this, 1); Materials.Uranium235.setEnchantmentForTools(this, 2) - .setEnchantmentForArmors(this, 2); + .setEnchantmentForArmors(this, 2); Materials.Plutonium241.setEnchantmentForTools(this, 3) - .setEnchantmentForArmors(this, 3); + .setEnchantmentForArmors(this, 3); Materials.NaquadahEnriched.setEnchantmentForTools(this, 4) - .setEnchantmentForArmors(this, 4); + .setEnchantmentForArmors(this, 4); Materials.Naquadria.setEnchantmentForTools(this, 5) - .setEnchantmentForArmors(this, 5); + .setEnchantmentForArmors(this, 5); INSTANCE = this; } diff --git a/src/main/java/gregtech/api/enums/Dyes.java b/src/main/java/gregtech/api/enums/Dyes.java index 3b87e9ff67..2970219145 100644 --- a/src/main/java/gregtech/api/enums/Dyes.java +++ b/src/main/java/gregtech/api/enums/Dyes.java @@ -43,7 +43,7 @@ public enum Dyes implements IColorModulationContainer { MACHINE_METAL(-1, 210, 220, 255, "Machine Metal"); public static final Dyes[] VALUES = { dyeBlack, dyeRed, dyeGreen, dyeBrown, dyeBlue, dyePurple, dyeCyan, - dyeLightGray, dyeGray, dyePink, dyeLime, dyeYellow, dyeLightBlue, dyeMagenta, dyeOrange, dyeWhite }; + dyeLightGray, dyeGray, dyePink, dyeLime, dyeYellow, dyeLightBlue, dyeMagenta, dyeOrange, dyeWhite }; public final byte mIndex; public final String mName; diff --git a/src/main/java/gregtech/api/enums/Element.java b/src/main/java/gregtech/api/enums/Element.java index c66b9630a3..b4bcb01a41 100644 --- a/src/main/java/gregtech/api/enums/Element.java +++ b/src/main/java/gregtech/api/enums/Element.java @@ -296,7 +296,7 @@ public enum Element { * @param aName Name of the Element */ Element(long aProtons, long aNeutrons, long aAdditionalMass, long aHalfLifeSeconds, String aDecayTo, String aName, - boolean aIsIsotope) { + boolean aIsIsotope) { mProtons = aProtons; mNeutrons = aNeutrons; mAdditionalMass = aAdditionalMass; diff --git a/src/main/java/gregtech/api/enums/FluidState.java b/src/main/java/gregtech/api/enums/FluidState.java index e84657cc6a..5f6f8824f5 100644 --- a/src/main/java/gregtech/api/enums/FluidState.java +++ b/src/main/java/gregtech/api/enums/FluidState.java @@ -12,6 +12,6 @@ public enum FluidState { public static FluidState fromValue(int stateValue) { return stateValue >= 0 && stateValue < FluidState.VALID_STATES.length ? FluidState.VALID_STATES[stateValue] - : FluidState.LIQUID; + : FluidState.LIQUID; } } diff --git a/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java b/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java index c0a259197e..0b621d4461 100644 --- a/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java +++ b/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java @@ -15,604 +15,604 @@ public class GTNH_ExtraMaterials implements IMaterialHandler { * This Class is for adding new Materials since Java has a Limiation of 64kb per Method / Class header */ public static Materials Signalum = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 2, - 1 | 2, - 255, - 255, - 255, - 0, - "Signalum", - "Signalum", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes._NULL); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 2, + 1 | 2, + 255, + 255, + 255, + 0, + "Signalum", + "Signalum", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes._NULL); public static Materials Lumium = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 2, - 1 | 2, - 255, - 255, - 255, - 0, - "Lumium", - "Lumium", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes._NULL); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 2, + 1 | 2, + 255, + 255, + 255, + 0, + "Lumium", + "Lumium", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes._NULL); public static Materials EnrichedCopper = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 2, - 1 | 2, - 255, - 255, - 255, - 0, - "EnrichedCopper", - "Enriched Copper", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes._NULL); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 2, + 1 | 2, + 255, + 255, + 255, + 0, + "EnrichedCopper", + "Enriched Copper", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes._NULL); public static Materials DiamondCopper = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 2, - 1 | 2, - 255, - 255, - 255, - 0, - "DiamondCopper", - "Diamond Copper", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes._NULL); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 2, + 1 | 2, + 255, + 255, + 255, + 0, + "DiamondCopper", + "Diamond Copper", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes._NULL); public static Materials TarPitch = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 2, - 1 | 2, - 255, - 255, - 255, - 0, - "TarPitch", - "Tar Pitch", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes._NULL); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 2, + 1 | 2, + 255, + 255, + 255, + 0, + "TarPitch", + "Tar Pitch", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes._NULL); public static Materials LimePure = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 0, - 0, - 255, - 255, - 255, - 0, - "LimePure", - "Pure Lime", - 0, - 0, - -1, - 0, - false, - false, - 1, - 1, - 1, - Dyes.dyeLime); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 0, + 0, + 255, + 255, + 255, + 0, + "LimePure", + "Pure Lime", + 0, + 0, + -1, + 0, + false, + false, + 1, + 1, + 1, + Dyes.dyeLime); public static Materials Wimalite = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 2, - 8, - 255, - 255, - 255, - 0, - "Wimalite", - "Wimalite", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes.dyeYellow); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 2, + 8, + 255, + 255, + 255, + 0, + "Wimalite", + "Wimalite", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes.dyeYellow); public static Materials Yellorite = new Materials( - -1, - TextureSet.SET_NONE, -