From 5f50e4a36ec000657b0a1664784acf00275293c6 Mon Sep 17 00:00:00 2001 From: boubou19 Date: Sat, 1 Apr 2023 18:11:43 +0200 Subject: update spotless formatting (#1827) --- src/main/java/gregtech/api/GregTech_API.java | 218 ++-- .../api/enchants/Enchantment_EnderDamage.java | 20 +- .../api/enchants/Enchantment_Radioactivity.java | 15 +- .../java/gregtech/api/enums/GT_HatchElement.java | 3 +- src/main/java/gregtech/api/enums/GT_Values.java | 10 +- src/main/java/gregtech/api/enums/ItemList.java | 8 +- .../java/gregtech/api/enums/MaterialBuilder.java | 6 +- src/main/java/gregtech/api/enums/Materials.java | 484 +++++--- .../java/gregtech/api/enums/MaterialsBotania.java | 169 ++- .../java/gregtech/api/enums/MaterialsKevlar.java | 1012 ++++++++++------ .../java/gregtech/api/enums/MaterialsOreAlum.java | 102 +- src/main/java/gregtech/api/enums/OrePrefixes.java | 170 ++- .../java/gregtech/api/enums/SoundResource.java | 5 +- src/main/java/gregtech/api/enums/Textures.java | 6 +- .../java/gregtech/api/enums/ToolDictNames.java | 3 +- src/main/java/gregtech/api/fluid/FluidTankGT.java | 4 +- .../java/gregtech/api/fluid/GT_FluidFactory.java | 13 +- .../gregtech/api/graphs/GenerateNodeMapPower.java | 6 +- src/main/java/gregtech/api/graphs/Node.java | 3 +- .../api/graphs/consumers/NodeEnergyReceiver.java | 12 +- .../gregtech/api/graphs/paths/PowerNodePath.java | 7 +- src/main/java/gregtech/api/gui/GT_Container.java | 13 +- .../api/gui/GT_ContainerMetaTile_Machine.java | 5 +- .../java/gregtech/api/gui/GT_GUIColorOverride.java | 34 +- .../api/gui/GT_GUIContainerMetaTile_Machine.java | 6 +- .../api/gui/GT_GUIContainer_BasicMachine.java | 4 +- .../api/gui/GT_GUIContainer_BasicTank.java | 7 +- .../api/gui/GT_GUIContainer_MultiMachine.java | 58 +- .../gregtech/api/gui/GT_GUIDialogSelectItem.java | 28 +- src/main/java/gregtech/api/gui/GT_Slot_Armor.java | 4 +- .../gui/modularui/FallbackableSteamTexture.java | 4 +- .../gregtech/api/gui/modularui/GT_UIInfos.java | 130 +- .../gregtech/api/gui/modularui/GT_UITextures.java | 562 +++++---- .../gregtech/api/gui/modularui/GUITextureSet.java | 63 +- .../api/gui/widgets/GT_GuiCoverTabLine.java | 6 +- .../api/gui/widgets/GT_GuiFakeItemButton.java | 14 +- .../java/gregtech/api/gui/widgets/GT_GuiTab.java | 14 +- .../gregtech/api/gui/widgets/GT_GuiTabLine.java | 3 +- .../api/gui/widgets/GT_GuiTooltipManager.java | 7 +- .../api/interfaces/IGlobalWirelessEnergy.java | 11 +- .../gregtech/api/interfaces/IHatchElement.java | 35 +- .../metatileentity/IMetaTileEntityItemPipe.java | 20 +- .../interfaces/tileentity/IColoredTileEntity.java | 4 +- .../interfaces/tileentity/IEnergyConnected.java | 20 +- .../tileentity/IExperimentalEnergyTileEntity.java | 25 +- .../api/items/GT_Block_LongDistancePipe.java | 4 +- .../gregtech/api/items/GT_EnergyArmor_Item.java | 37 +- .../java/gregtech/api/items/GT_Generic_Item.java | 6 +- .../java/gregtech/api/items/GT_MetaBase_Item.java | 44 +- .../gregtech/api/items/GT_MetaGenerated_Item.java | 31 +- .../api/items/GT_MetaGenerated_Item_X01.java | 3 +- .../gregtech/api/items/GT_MetaGenerated_Tool.java | 59 +- .../api/items/GT_RadioactiveCellIC_Item.java | 11 +- .../gregtech/api/items/GT_Spray_Foam_Item.java | 17 +- .../gregtech/api/items/GT_Spray_Hardener_Item.java | 7 +- .../gregtech/api/items/GT_Spray_Pepper_Item.java | 10 +- .../api/metatileentity/BaseMetaPipeEntity.java | 6 +- .../api/metatileentity/BaseMetaTileEntity.java | 91 +- .../api/metatileentity/BaseTileEntity.java | 111 +- .../api/metatileentity/CommonMetaTileEntity.java | 3 +- .../api/metatileentity/CoverableTileEntity.java | 111 +- .../api/metatileentity/MetaPipeEntity.java | 31 +- .../api/metatileentity/MetaTileEntity.java | 54 +- .../api/metatileentity/TileIC2EnergySink.java | 11 +- .../examples/GT_MetaTileEntity_E_Furnace.java | 40 +- .../implementations/GT_MetaPipeEntity_Cable.java | 21 +- .../implementations/GT_MetaPipeEntity_Fluid.java | 132 ++- .../implementations/GT_MetaPipeEntity_Frame.java | 5 +- .../implementations/GT_MetaPipeEntity_Item.java | 23 +- .../GT_MetaTileEntity_BasicBatteryBuffer.java | 87 +- .../GT_MetaTileEntity_BasicGenerator.java | 6 +- .../GT_MetaTileEntity_BasicMachine.java | 228 ++-- .../GT_MetaTileEntity_BasicMachine_Bronze.java | 70 +- .../GT_MetaTileEntity_BasicMachine_GT_Recipe.java | 180 +-- .../GT_MetaTileEntity_BasicTank.java | 96 +- .../implementations/GT_MetaTileEntity_Buffer.java | 100 +- .../GT_MetaTileEntity_CubicMultiBlockBase.java | 38 +- .../GT_MetaTileEntity_EnhancedMultiBlockBase.java | 10 +- ...MetaTileEntity_ExtendedPowerMultiBlockBase.java | 6 +- .../GT_MetaTileEntity_Hatch_DataAccess.java | 12 +- .../GT_MetaTileEntity_Hatch_InputBus.java | 11 +- .../GT_MetaTileEntity_Hatch_Maintenance.java | 76 +- .../GT_MetaTileEntity_Hatch_Muffler.java | 32 +- .../GT_MetaTileEntity_Hatch_MultiInput.java | 52 +- .../GT_MetaTileEntity_Hatch_Output.java | 121 +- .../GT_MetaTileEntity_Hatch_OutputBus.java | 4 +- .../GT_MetaTileEntity_MultiBlockBase.java | 563 +++++---- .../GT_MetaTileEntity_SpecialFilter.java | 120 +- .../GT_MetaTileEntity_TieredMachineBlock.java | 12 +- .../GT_MetaTileEntity_Transformer.java | 10 +- .../GT_MetaTileEntity_Wireless_Dynamo.java | 3 +- .../GT_MetaTileEntity_Wireless_Hatch.java | 7 +- .../api/multitileentity/MultiTileEntityBlock.java | 21 +- .../MultiTileEntityBlockInternal.java | 12 +- .../MultiTileEntityClassContainer.java | 7 +- .../MultiTileEntityItemInternal.java | 119 +- .../multitileentity/MultiTileEntityRegistry.java | 14 +- .../api/multitileentity/base/MultiTileEntity.java | 33 +- .../machine/MultiTileBasicMachine.java | 29 +- .../multiblock/base/MultiBlockController.java | 418 ++++--- .../multiblock/base/MultiBlockPart.java | 34 +- .../java/gregtech/api/net/GT_Packet_Pollution.java | 4 +- .../gregtech/api/net/GT_Packet_SendCoverData.java | 4 +- .../api/net/GT_Packet_SetConfigurationCircuit.java | 8 +- .../gregtech/api/net/GT_Packet_TileEntity.java | 15 +- .../api/net/GT_Packet_TileEntityCoverGUI.java | 7 +- .../api/net/GT_Packet_TileEntityCoverNew.java | 4 +- .../api/net/GT_Packet_WirelessRedstoneCover.java | 4 +- .../java/gregtech/api/objects/GT_ChunkManager.java | 37 +- .../java/gregtech/api/objects/GT_FluidStack.java | 15 +- src/main/java/gregtech/api/objects/GT_HashSet.java | 3 +- .../api/objects/GT_StdRenderedTexture.java | 3 +- .../java/gregtech/api/objects/GT_UO_Dimension.java | 13 +- .../gregtech/api/objects/GT_UO_DimensionList.java | 33 +- .../java/gregtech/api/objects/GT_UO_Fluid.java | 19 +- src/main/java/gregtech/api/objects/ItemData.java | 4 +- .../gregtech/api/objects/ReverseShapedRecipe.java | 6 +- .../api/objects/ReverseShapelessRecipe.java | 6 +- src/main/java/gregtech/api/objects/XSTR.java | 4 +- .../java/gregtech/api/render/TextureFactory.java | 37 +- .../api/threads/GT_Runnable_Cable_Update.java | 4 +- .../threads/GT_Runnable_MachineBlockUpdate.java | 12 +- .../gregtech/api/util/ColorsMetadataSection.java | 3 +- .../api/util/ColorsMetadataSectionSerializer.java | 14 +- .../java/gregtech/api/util/GT_ApiaryUpgrade.java | 6 +- .../gregtech/api/util/GT_AssemblyLineUtils.java | 31 +- .../gregtech/api/util/GT_Assemblyline_Server.java | 448 ++++--- src/main/java/gregtech/api/util/GT_BaseCrop.java | 43 +- src/main/java/gregtech/api/util/GT_CLS_Compat.java | 39 +- .../gregtech/api/util/GT_ChunkAssociatedData.java | 106 +- .../gregtech/api/util/GT_CircuitryBehavior.java | 84 +- .../gregtech/api/util/GT_ClientPreference.java | 6 +- src/main/java/gregtech/api/util/GT_Config.java | 29 +- .../gregtech/api/util/GT_CoverBehaviorBase.java | 37 +- .../api/util/GT_ExoticEnergyInputHelper.java | 23 +- src/main/java/gregtech/api/util/GT_FoodStat.java | 21 +- .../java/gregtech/api/util/GT_Forestry_Compat.java | 3 +- src/main/java/gregtech/api/util/GT_GC_Compat.java | 6 +- .../gregtech/api/util/GT_HatchElementBuilder.java | 171 ++- .../java/gregtech/api/util/GT_LanguageManager.java | 28 +- src/main/java/gregtech/api/util/GT_ModHandler.java | 302 +++-- .../api/util/GT_Multiblock_Tooltip_Builder.java | 19 +- .../gregtech/api/util/GT_OreDictUnificator.java | 21 +- .../gregtech/api/util/GT_PCBFactoryManager.java | 3 +- .../java/gregtech/api/util/GT_ParallelHelper.java | 10 +- src/main/java/gregtech/api/util/GT_Recipe.java | 1243 +++++++++++--------- .../java/gregtech/api/util/GT_RecipeBuilder.java | 19 +- .../java/gregtech/api/util/GT_RecipeConstants.java | 101 +- .../java/gregtech/api/util/GT_RecipeMapUtil.java | 36 +- .../gregtech/api/util/GT_RecipeRegistrator.java | 29 +- .../java/gregtech/api/util/GT_RenderingWorld.java | 14 +- .../java/gregtech/api/util/GT_Shaped_Recipe.java | 17 +- .../gregtech/api/util/GT_Shapeless_Recipe.java | 17 +- .../gregtech/api/util/GT_Single_Recipe_Check.java | 50 +- .../GT_Single_Recipe_Check_Processing_Array.java | 18 +- .../gregtech/api/util/GT_SpawnEventHandler.java | 12 +- .../gregtech/api/util/GT_StructureUtility.java | 67 +- src/main/java/gregtech/api/util/GT_Util.java | 52 +- src/main/java/gregtech/api/util/GT_Utility.java | 423 ++++--- .../java/gregtech/api/util/GT_UtilityClient.java | 6 +- .../java/gregtech/api/util/LightingHelper.java | 654 ++++++---- src/main/java/gregtech/api/world/GT_Worldgen.java | 21 +- .../api/world/GT_Worldgen_Ore_SingleBlock.java | 3 +- .../GT_Worldgen_Ore_SingleBlock_UnderLava.java | 3 +- 164 files changed, 7222 insertions(+), 4010 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 d8ad1ca07b..7a8b495a4b 100644 --- a/src/main/java/gregtech/api/GregTech_API.java +++ b/src/main/java/gregtech/api/GregTech_API.java @@ -185,12 +185,13 @@ public class GregTech_API { 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. @@ -455,34 +456,36 @@ public class GregTech_API { 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); + 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); + 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 */ } @@ -499,14 +502,28 @@ public class GregTech_API { 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); + 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); + 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 */ } @@ -523,8 +540,12 @@ public class GregTech_API { 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); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_HardHammer_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aMaxDamage, + aEntityDamage); } catch (Throwable e) { /* Do nothing */ } @@ -543,14 +564,22 @@ public class GregTech_API { 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); + 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); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_Crowbar_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aMaxDamage, + aEntityDamage); } catch (Throwable e) { /* Do nothing */ } @@ -569,8 +598,13 @@ public class GregTech_API { 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); + 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 */ } @@ -589,8 +623,13 @@ public class GregTech_API { 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); + 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 */ } @@ -609,8 +648,13 @@ public class GregTech_API { 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); + 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 */ } @@ -630,15 +674,16 @@ public class GregTech_API { 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); + 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 */ } @@ -658,16 +703,16 @@ public class GregTech_API { 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); + 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 */ } @@ -686,8 +731,13 @@ public class GregTech_API { 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); + 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 */ } @@ -706,8 +756,12 @@ public class GregTech_API { 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); + return (GT_Tool_Item) Class.forName("gregtechmod.api.items.GT_EmptyToolIC_Item") + .getConstructors()[0].newInstance( + aUnlocalized, + aEnglish, + aMaxDamage, + aChargedGTID); } catch (Throwable e) { /* Do nothing */ } @@ -763,8 +817,10 @@ public class GregTech_API { sRealConfigurationList.put(minTier, stack); for (Map.Entry> e : sConfigurationLists.entrySet()) { if (e.getKey() >= minTier) { - e.getValue().add(stack); - e.getValue().sort(getConfigurationCircuitsComparator()); + e.getValue() + .add(stack); + e.getValue() + .sort(getConfigurationCircuitsComparator()); } } } @@ -780,9 +836,12 @@ public class GregTech_API { return Collections.unmodifiableList( sConfigurationLists.computeIfAbsent( machineTier, - (t) -> sRealConfigurationList.entries().stream().filter(e -> e.getKey() <= machineTier) - .map(Map.Entry::getValue).sorted(getConfigurationCircuitsComparator()) - .collect(Collectors.toList()))); + (t) -> sRealConfigurationList.entries() + .stream() + .filter(e -> e.getKey() <= machineTier) + .map(Map.Entry::getValue) + .sorted(getConfigurationCircuitsComparator()) + .collect(Collectors.toList()))); } public static Comparator getConfigurationCircuitsComparator() { @@ -794,7 +853,9 @@ public class GregTech_API { 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) { @@ -802,8 +863,11 @@ 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); + sRealCircuitProgrammerList.put( + predicate, + useContainer ? (s, p) -> s.getItem() + .getContainerItem(s) + : (s, p) -> s); } public static void registerCircuitProgrammer(Predicate predicate, @@ -994,7 +1058,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() + .isDamageable() + && !GT_ModHandler.isElectricItem(aTool) && !(aTool.getItem() instanceof IDamagableItem))) return false; aToolList.add(new GT_ItemStack(GT_Utility.copyAmount(1, aTool))); diff --git a/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java b/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java index 52fd3b1134..e48b3e5b19 100644 --- a/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java +++ b/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java @@ -46,14 +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 34035c9457..bf4cc00be4 100644 --- a/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java +++ b/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java @@ -18,11 +18,16 @@ public class Enchantment_Radioactivity extends EnchantmentDamage { public Enchantment_Radioactivity() { super(GT_Config.addIDConfig(ConfigCategories.IDs.enchantments, "Radioactivity", 14), 0, -1); GT_LanguageManager.addStringLocalization(getName(), "Radioactivity"); - Materials.Plutonium.setEnchantmentForTools(this, 1).setEnchantmentForArmors(this, 1); - Materials.Uranium235.setEnchantmentForTools(this, 2).setEnchantmentForArmors(this, 2); - Materials.Plutonium241.setEnchantmentForTools(this, 3).setEnchantmentForArmors(this, 3); - Materials.NaquadahEnriched.setEnchantmentForTools(this, 4).setEnchantmentForArmors(this, 4); - Materials.Naquadria.setEnchantmentForTools(this, 5).setEnchantmentForArmors(this, 5); + Materials.Plutonium.setEnchantmentForTools(this, 1) + .setEnchantmentForArmors(this, 1); + Materials.Uranium235.setEnchantmentForTools(this, 2) + .setEnchantmentForArmors(this, 2); + Materials.Plutonium241.setEnchantmentForTools(this, 3) + .setEnchantmentForArmors(this, 3); + Materials.NaquadahEnriched.setEnchantmentForTools(this, 4) + .setEnchantmentForArmors(this, 4); + Materials.Naquadria.setEnchantmentForTools(this, 5) + .setEnchantmentForArmors(this, 5); INSTANCE = this; } diff --git a/src/main/java/gregtech/api/enums/GT_HatchElement.java b/src/main/java/gregtech/api/enums/GT_HatchElement.java index 8d8603a10e..ac8dc7c4dd 100644 --- a/src/main/java/gregtech/api/enums/GT_HatchElement.java +++ b/src/main/java/gregtech/api/enums/GT_HatchElement.java @@ -86,7 +86,8 @@ public enum GT_HatchElement implements IHatchElement BigInteger.valueOf(i).multiply(BigInteger.valueOf(30)).divide(BigInteger.valueOf(32)).longValueExact()) - .toArray(); + public static final long[] VP = Arrays.stream(V) + .map( + i -> BigInteger.valueOf(i) + .multiply(BigInteger.valueOf(30)) + .divide(BigInteger.valueOf(32)) + .longValueExact()) + .toArray(); // Why -7? Mystery of the universe. Something may break if you change this so please do not without extensive // testing. // TODO:Adding that in coremod!!! diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 25957078aa..e1b6ada3e6 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -2163,8 +2163,12 @@ public enum ItemList implements IItemContainer { StringBuilder tCamelCasedDisplayNameBuilder = new StringBuilder(); final String[] tDisplayNameWords = aDisplayName.split("\\W"); for (String tWord : tDisplayNameWords) { - if (tWord.length() > 0) tCamelCasedDisplayNameBuilder.append(tWord.substring(0, 1).toUpperCase(Locale.US)); - if (tWord.length() > 1) tCamelCasedDisplayNameBuilder.append(tWord.substring(1).toLowerCase(Locale.US)); + if (tWord.length() > 0) tCamelCasedDisplayNameBuilder.append( + tWord.substring(0, 1) + .toUpperCase(Locale.US)); + if (tWord.length() > 1) tCamelCasedDisplayNameBuilder.append( + tWord.substring(1) + .toLowerCase(Locale.US)); } if (tCamelCasedDisplayNameBuilder.length() == 0) { // CamelCased DisplayName is empty, so use hash of aDisplayName diff --git a/src/main/java/gregtech/api/enums/MaterialBuilder.java b/src/main/java/gregtech/api/enums/MaterialBuilder.java index d265faae8e..fd131bbc8c 100644 --- a/src/main/java/gregtech/api/enums/MaterialBuilder.java +++ b/src/main/java/gregtech/api/enums/MaterialBuilder.java @@ -42,7 +42,8 @@ public class MaterialBuilder { public MaterialBuilder(int metaItemSubID, TextureSet iconSet, String defaultLocalName) { this.metaItemSubID = metaItemSubID; this.iconSet = iconSet; - this.name = defaultLocalName.replace(" ", "").replace("-", ""); + this.name = defaultLocalName.replace(" ", "") + .replace("-", ""); this.defaultLocalName = defaultLocalName; } @@ -72,7 +73,8 @@ public class MaterialBuilder { color, extraData, materialList, - aspects).setHasCorrespondingFluid(hasCorrespondingFluid).setHasCorrespondingGas(hasCorrespondingGas) + aspects).setHasCorrespondingFluid(hasCorrespondingFluid) + .setHasCorrespondingGas(hasCorrespondingGas) .setCanBeCracked(canBeCracked); } diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 3ff4d70920..c64b7a6d14 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -1329,9 +1329,12 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { aColor); mExtraData = aExtraData; mMaterialList.addAll(aMaterialList); - if (mMaterialList.size() == 1) mChemicalFormula = mMaterialList.get(0).toString(true); - else mChemicalFormula = mMaterialList.stream().map(MaterialStack::toString).collect(Collectors.joining()) - .replaceAll("_", "-"); + if (mMaterialList.size() == 1) mChemicalFormula = mMaterialList.get(0) + .toString(true); + else mChemicalFormula = mMaterialList.stream() + .map(MaterialStack::toString) + .collect(Collectors.joining()) + .replaceAll("_", "-"); int tAmountOfComponents = 0, tMeltingPoint = 0; for (MaterialStack tMaterial : mMaterialList) { @@ -1352,18 +1355,39 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { } private static void setSmeltingInto() { - SamariumMagnetic.setSmeltingInto(Samarium).setMaceratingInto(Samarium).setArcSmeltingInto(Samarium); - NeodymiumMagnetic.setSmeltingInto(Neodymium).setMaceratingInto(Neodymium).setArcSmeltingInto(Neodymium); - SteelMagnetic.setSmeltingInto(Steel).setMaceratingInto(Steel).setArcSmeltingInto(Steel); - Iron.setSmeltingInto(Iron).setMaceratingInto(Iron).setArcSmeltingInto(WroughtIron); - AnyIron.setSmeltingInto(Iron).setMaceratingInto(Iron).setArcSmeltingInto(WroughtIron); - PigIron.setSmeltingInto(Iron).setMaceratingInto(Iron).setArcSmeltingInto(WroughtIron); - WroughtIron.setSmeltingInto(WroughtIron).setMaceratingInto(WroughtIron).setArcSmeltingInto(WroughtIron); - IronMagnetic.setSmeltingInto(Iron).setMaceratingInto(Iron).setArcSmeltingInto(WroughtIron); - Copper.setSmeltingInto(Copper).setMaceratingInto(Copper).setArcSmeltingInto(AnnealedCopper); - AnyCopper.setSmeltingInto(Copper).setMaceratingInto(Copper).setArcSmeltingInto(AnnealedCopper); - AnnealedCopper.setSmeltingInto(AnnealedCopper).setMaceratingInto(AnnealedCopper) - .setArcSmeltingInto(AnnealedCopper); + SamariumMagnetic.setSmeltingInto(Samarium) + .setMaceratingInto(Samarium) + .setArcSmeltingInto(Samarium); + NeodymiumMagnetic.setSmeltingInto(Neodymium) + .setMaceratingInto(Neodymium) + .setArcSmeltingInto(Neodymium); + SteelMagnetic.setSmeltingInto(Steel) + .setMaceratingInto(Steel) + .setArcSmeltingInto(Steel); + Iron.setSmeltingInto(Iron) + .setMaceratingInto(Iron) + .setArcSmeltingInto(WroughtIron); + AnyIron.setSmeltingInto(Iron) + .setMaceratingInto(Iron) + .setArcSmeltingInto(WroughtIron); + PigIron.setSmeltingInto(Iron) + .setMaceratingInto(Iron) + .setArcSmeltingInto(WroughtIron); + WroughtIron.setSmeltingInto(WroughtIron) + .setMaceratingInto(WroughtIron) + .setArcSmeltingInto(WroughtIron); + IronMagnetic.setSmeltingInto(Iron) + .setMaceratingInto(Iron) + .setArcSmeltingInto(WroughtIron); + Copper.setSmeltingInto(Copper) + .setMaceratingInto(Copper) + .setArcSmeltingInto(AnnealedCopper); + AnyCopper.setSmeltingInto(Copper) + .setMaceratingInto(Copper) + .setArcSmeltingInto(AnnealedCopper); + AnnealedCopper.setSmeltingInto(AnnealedCopper) + .setMaceratingInto(AnnealedCopper) + .setArcSmeltingInto(AnnealedCopper); Netherrack.setSmeltingInto(NetherBrick); MeatRaw.setSmeltingInto(MeatCooked); Sand.setSmeltingInto(Glass); @@ -1378,18 +1402,29 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { } private static void setDirectSmelting() { - Cinnabar.setDirectSmelting(Mercury).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT).add(SubTag.SMELTING_TO_GEM); - Tetrahedrite.setDirectSmelting(Copper).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT) - .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); - Chalcopyrite.setDirectSmelting(Copper).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT) - .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); - Malachite.setDirectSmelting(Copper).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); - Pentlandite.setDirectSmelting(Nickel).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); - Sphalerite.setDirectSmelting(Zinc).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); - Pyrite.setDirectSmelting(Iron).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); - BasalticMineralSand.setDirectSmelting(Iron).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); - GraniticMineralSand.setDirectSmelting(Iron).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); - YellowLimonite.setDirectSmelting(Iron).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); + Cinnabar.setDirectSmelting(Mercury) + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT) + .add(SubTag.SMELTING_TO_GEM); + Tetrahedrite.setDirectSmelting(Copper) + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT) + .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); + Chalcopyrite.setDirectSmelting(Copper) + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT) + .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); + Malachite.setDirectSmelting(Copper) + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); + Pentlandite.setDirectSmelting(Nickel) + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); + Sphalerite.setDirectSmelting(Zinc) + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); + Pyrite.setDirectSmelting(Iron) + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); + BasalticMineralSand.setDirectSmelting(Iron) + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); + GraniticMineralSand.setDirectSmelting(Iron) + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); + YellowLimonite.setDirectSmelting(Iron) + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); BrownLimonite.setDirectSmelting(Iron); BandedIron.setDirectSmelting(Iron); Magnetite.setDirectSmelting(Iron); @@ -1399,8 +1434,10 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { Garnierite.setDirectSmelting(Nickel); Cobaltite.setDirectSmelting(Cobalt); Stibnite.setDirectSmelting(Antimony); - Cooperite.setDirectSmelting(Platinum).add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); - Molybdenite.setDirectSmelting(Molybdenum).add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); + Cooperite.setDirectSmelting(Platinum) + .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); + Molybdenite.setDirectSmelting(Molybdenum) + .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); Galena.setDirectSmelting(Lead); RoastedIron.setDirectSmelting(Iron); RoastedAntimony.setDirectSmelting(Antimony); @@ -1413,35 +1450,69 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { } private static void setMultipliers() { - Amber.setOreMultiplier(2).setSmeltingMultiplier(2); - InfusedAir.setOreMultiplier(2).setSmeltingMultiplier(2); - InfusedFire.setOreMultiplier(2).setSmeltingMultiplier(2); - InfusedEarth.setOreMultiplier(2).setSmeltingMultiplier(2); - InfusedWater.setOreMultiplier(2).setSmeltingMultiplier(2); - InfusedEntropy.setOreMultiplier(2).setSmeltingMultiplier(2); - InfusedOrder.setOreMultiplier(2).setSmeltingMultiplier(2); - InfusedVis.setOreMultiplier(2).setSmeltingMultiplier(2); - InfusedDull.setOreMultiplier(2).setSmeltingMultiplier(2); - Salt.setOreMultiplier(2).setSmeltingMultiplier(2); - RockSalt.setOreMultiplier(2).setSmeltingMultiplier(2); - Scheelite.setOreMultiplier(2).setSmeltingMultiplier(2); - Tungstate.setOreMultiplier(2).setSmeltingMultiplier(2); - Cassiterite.setOreMultiplier(2).setSmeltingMultiplier(2); - CassiteriteSand.setOreMultiplier(2).setSmeltingMultiplier(2); - NetherQuartz.setOreMultiplier(2).setSmeltingMultiplier(2); - CertusQuartz.setOreMultiplier(2).setSmeltingMultiplier(2); - TricalciumPhosphate.setOreMultiplier(3).setSmeltingMultiplier(3); - Saltpeter.setOreMultiplier(4).setSmeltingMultiplier(4); - Apatite.setOreMultiplier(4).setSmeltingMultiplier(4).setByProductMultiplier(2); - Electrotine.setOreMultiplier(5).setSmeltingMultiplier(5); - Teslatite.setOreMultiplier(5).setSmeltingMultiplier(5); - Redstone.setOreMultiplier(5).setSmeltingMultiplier(5); - Glowstone.setOreMultiplier(5).setSmeltingMultiplier(5); - Lapis.setOreMultiplier(6).setSmeltingMultiplier(6).setByProductMultiplier(4); - Sodalite.setOreMultiplier(6).setSmeltingMultiplier(6).setByProductMultiplier(4); - Lazurite.setOreMultiplier(6).setSmeltingMultiplier(6).setByProductMultiplier(4); - Monazite.setOreMultiplier(8).setSmeltingMultiplier(8).setByProductMultiplier(2); - Cryolite.setOreMultiplier(4).setByProductMultiplier(4); + Amber.setOreMultiplier(2) + .setSmeltingMultiplier(2); + InfusedAir.setOreMultiplier(2) + .setSmeltingMultiplier(2); + InfusedFire.setOreMultiplier(2) + .setSmeltingMultiplier(2); + InfusedEarth.setOreMultiplier(2) + .setSmeltingMultiplier(2); + InfusedWater.setOreMultiplier(2) + .setSmeltingMultiplier(2); + InfusedEntropy.setOreMultiplier(2) + .setSmeltingMultiplier(2); + InfusedOrder.setOreMultiplier(2) + .setSmeltingMultiplier(2); + InfusedVis.setOreMultiplier(2) + .setSmeltingMultiplier(2); + InfusedDull.setOreMultiplier(2) + .setSmeltingMultiplier(2); + Salt.setOreMultiplier(2) + .setSmeltingMultiplier(2); + RockSalt.setOreMultiplier(2) + .setSmeltingMultiplier(2); + Scheelite.setOreMultiplier(2) + .setSmeltingMultiplier(2); + Tungstate.setOreMultiplier(2) + .setSmeltingMultiplier(2); + Cassiterite.setOreMultiplier(2) + .setSmeltingMultiplier(2); + CassiteriteSand.setOreMultiplier(2) + .setSmeltingMultiplier(2); + NetherQuartz.setOreMultiplier(2) + .setSmeltingMultiplier(2); + CertusQuartz.setOreMultiplier(2) + .setSmeltingMultiplier(2); + TricalciumPhosphate.setOreMultiplier(3) + .setSmeltingMultiplier(3); + Saltpeter.setOreMultiplier(4) + .setSmeltingMultiplier(4); + Apatite.setOreMultiplier(4) + .setSmeltingMultiplier(4) + .setByProductMultiplier(2); + Electrotine.setOreMultiplier(5) + .setSmeltingMultiplier(5); + Teslatite.setOreMultiplier(5) + .setSmeltingMultiplier(5); + Redstone.setOreMultiplier(5) + .setSmeltingMultiplier(5); + Glowstone.setOreMultiplier(5) + .setSmeltingMultiplier(5); + Lapis.setOreMultiplier(6) + .setSmeltingMultiplier(6) + .setByProductMultiplier(4); + Sodalite.setOreMultiplier(6) + .setSmeltingMultiplier(6) + .setByProductMultiplier(4); + Lazurite.setOreMultiplier(6) + .setSmeltingMultiplier(6) + .setByProductMultiplier(4); + Monazite.setOreMultiplier(8) + .setSmeltingMultiplier(8) + .setByProductMultiplier(2); + Cryolite.setOreMultiplier(4) + .setByProductMultiplier(4); } private static void setEnchantmentKnockbackTools() { @@ -1630,7 +1701,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { YellowLimonite.addOreByProducts(Nickel, BrownLimonite, Cobalt); Lepidolite.addOreByProducts(Lithium, Caesium); Andradite.addOreByProducts(GarnetYellow, Iron); - Pyrolusite.addOreByProducts(Manganese, Tantalite, Niobium).add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); + Pyrolusite.addOreByProducts(Manganese, Tantalite, Niobium) + .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); TricalciumPhosphate.addOreByProducts(Apatite, Phosphate, Pyrochlore); Apatite.addOreByProducts(TricalciumPhosphate, Phosphate, Pyrochlore); Pyrochlore.addOreByProducts(Apatite, Calcite, Niobium); @@ -1838,8 +1910,11 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { private static void initSubTags() { SubTag.ELECTROMAGNETIC_SEPERATION_NEODYMIUM.addTo(Bastnasite, Monazite, Forcicium, Forcillium); - SubTag.ELECTROMAGNETIC_SEPERATION_GOLD - .addTo(Magnetite, VanadiumMagnetite, BasalticMineralSand, GraniticMineralSand); + SubTag.ELECTROMAGNETIC_SEPERATION_GOLD.addTo( + Magnetite, + VanadiumMagnetite, + BasalticMineralSand, + GraniticMineralSand); SubTag.NO_RECIPES.addTo(MagnetohydrodynamicallyConstrainedStarMatter); @@ -1861,8 +1936,13 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { Chromite, Andradite); - SubTag.BLASTFURNACE_CALCITE_DOUBLE - .addTo(Pyrite, BrownLimonite, YellowLimonite, BasalticMineralSand, GraniticMineralSand, Magnetite); + SubTag.BLASTFURNACE_CALCITE_DOUBLE.addTo( + Pyrite, + BrownLimonite, + YellowLimonite, + BasalticMineralSand, + GraniticMineralSand, + Magnetite); SubTag.BLASTFURNACE_CALCITE_TRIPLE.addTo(Iron, PigIron, DeepIron, ShadowIron, WroughtIron, MeteoricIron); @@ -2240,14 +2320,22 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { Monazite.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE); Quartzite.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); Quartz.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); - SiliconDioxide - .add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); + SiliconDioxide.add( + SubTag.CRYSTAL, + SubTag.NO_SMASHING, + SubTag.NO_SMELTING, + SubTag.CRYSTALLISABLE, + SubTag.QUARTZ); Dilithium.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); NetherQuartz.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); CertusQuartz.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); Fluix.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); - TricalciumPhosphate - .add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.FLAMMABLE, SubTag.EXPLOSIVE); + TricalciumPhosphate.add( + SubTag.CRYSTAL, + SubTag.NO_SMASHING, + SubTag.NO_SMELTING, + SubTag.FLAMMABLE, + SubTag.EXPLOSIVE); Phosphate.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.FLAMMABLE, SubTag.EXPLOSIVE); InfusedAir.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.MAGICAL, SubTag.UNBURNABLE); InfusedFire.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.MAGICAL, SubTag.UNBURNABLE); @@ -2313,16 +2401,19 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { mMaterialHandlers.forEach(IMaterialHandler::onMaterialsInit); // This is where addon mods can add/manipulate // materials initMaterialProperties(); // No more material addition or manipulation should be done past this point! - MATERIALS_ARRAY = MATERIALS_MAP.values().toArray(new Materials[0]); // Generate standard object array. This is a - // lot faster to loop over. + MATERIALS_ARRAY = MATERIALS_MAP.values() + .toArray(new Materials[0]); // Generate standard object array. This is a + // lot faster to loop over. VALUES = Arrays.asList(MATERIALS_ARRAY); if (!NewHorizonsCoreMod.isModLoaded() && !GT_Mod.gregtechproxy.mEnableAllComponents) OrePrefixes.initMaterialComponents(); else { OrePrefixes.ingotHot.mDisabledItems.addAll( - Arrays.stream(Materials.values()).parallel().filter(OrePrefixes.ingotHot::doGenerateItem) - .filter(m -> m.mBlastFurnaceTemp < 1750 && m.mAutoGenerateBlastFurnaceRecipes) - .collect(Collectors.toSet())); + Arrays.stream(Materials.values()) + .parallel() + .filter(OrePrefixes.ingotHot::doGenerateItem) + .filter(m -> m.mBlastFurnaceTemp < 1750 && m.mAutoGenerateBlastFurnaceRecipes) + .collect(Collectors.toSet())); OrePrefixes.ingotHot.disableComponent(Materials.Reinforced); OrePrefixes.ingotHot.disableComponent(Materials.ConductiveIron); OrePrefixes.ingotHot.disableComponent(Materials.FierySteel); @@ -2384,22 +2475,32 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { } private static void addTemperatureValues(Materials aMaterial, String aConfigPath) { - aMaterial.mMeltingPoint = GregTech_API.sMaterialProperties - .get(aConfigPath, "MeltingPoint", aMaterial.mMeltingPoint); - aMaterial.mBlastFurnaceRequired = GregTech_API.sMaterialProperties - .get(aConfigPath, "BlastFurnaceRequired", aMaterial.mBlastFurnaceRequired); - aMaterial.mBlastFurnaceTemp = (short) GregTech_API.sMaterialProperties - .get(aConfigPath, "BlastFurnaceTemp", aMaterial.mBlastFurnaceTemp); + aMaterial.mMeltingPoint = GregTech_API.sMaterialProperties.get( + aConfigPath, + "MeltingPoint", + aMaterial.mMeltingPoint); + aMaterial.mBlastFurnaceRequired = GregTech_API.sMaterialProperties.get( + aConfigPath, + "BlastFurnaceRequired", + aMaterial.mBlastFurnaceRequired); + aMaterial.mBlastFurnaceTemp = (short) GregTech_API.sMaterialProperties.get( + aConfigPath, + "BlastFurnaceTemp", + aMaterial.mBlastFurnaceTemp); aMaterial.mGasTemp = GregTech_API.sMaterialProperties.get(aConfigPath, "GasTemp", aMaterial.mGasTemp); aMaterial.setHeatDamage( (float) GregTech_API.sMaterialProperties.get(aConfigPath, "HeatDamage", aMaterial.mHeatDamage)); } private static void addDensityValues(Materials aMaterial, String aConfigPath) { - aMaterial.mDensityMultiplier = GregTech_API.sMaterialProperties - .get(aConfigPath, "DensityMultiplier", aMaterial.mDensityMultiplier); - aMaterial.mDensityDivider = GregTech_API.sMaterialProperties - .get(aConfigPath, "DensityDivider", aMaterial.mDensityDivider); + aMaterial.mDensityMultiplier = GregTech_API.sMaterialProperties.get( + aConfigPath, + "DensityMultiplier", + aMaterial.mDensityMultiplier); + aMaterial.mDensityDivider = GregTech_API.sMaterialProperties.get( + aConfigPath, + "DensityDivider", + aMaterial.mDensityDivider); aMaterial.mDensity = (long) GregTech_API.sMaterialProperties.get( aConfigPath, "Density", @@ -2408,10 +2509,14 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { } private static void addColorValues(Materials aMaterial, String aConfigPath) { - aMaterial.mTransparent = GregTech_API.sMaterialProperties - .get(aConfigPath, "Transparent", aMaterial.mTransparent); - String aColor = GregTech_API.sMaterialProperties - .get(aConfigPath, "DyeColor", aMaterial.mColor == Dyes._NULL ? "None" : aMaterial.mColor.toString()); + aMaterial.mTransparent = GregTech_API.sMaterialProperties.get( + aConfigPath, + "Transparent", + aMaterial.mTransparent); + String aColor = GregTech_API.sMaterialProperties.get( + aConfigPath, + "DyeColor", + aMaterial.mColor == Dyes._NULL ? "None" : aMaterial.mColor.toString()); aMaterial.mColor = aColor.equals("None") ? Dyes._NULL : Dyes.get(aColor); String[] aRGBA = GregTech_API.sMaterialProperties.get( aConfigPath, @@ -2423,7 +2528,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { + "," + aMaterial.mRGBa[3] + ",") - .split(","); + .split(","); aMaterial.mRGBa[0] = Short.parseShort(aRGBA[0]); aMaterial.mRGBa[1] = Short.parseShort(aRGBA[1]); aMaterial.mRGBa[2] = Short.parseShort(aRGBA[2]); @@ -2431,12 +2536,18 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { } private static void addToolValues(Materials aMaterial, String aConfigPath) { - aMaterial.mDurability = GregTech_API.sMaterialProperties - .get(aConfigPath, "ToolDurability", aMaterial.mDurability); - aMaterial.mToolSpeed = (float) GregTech_API.sMaterialProperties - .get(aConfigPath, "ToolSpeed", aMaterial.mToolSpeed); - aMaterial.mToolQuality = (byte) GregTech_API.sMaterialProperties - .get(aConfigPath, "ToolQuality", aMaterial.mToolQuality); + aMaterial.mDurability = GregTech_API.sMaterialProperties.get( + aConfigPath, + "ToolDurability", + aMaterial.mDurability); + aMaterial.mToolSpeed = (float) GregTech_API.sMaterialProperties.get( + aConfigPath, + "ToolSpeed", + aMaterial.mToolSpeed); + aMaterial.mToolQuality = (byte) GregTech_API.sMaterialProperties.get( + aConfigPath, + "ToolQuality", + aMaterial.mToolQuality); // Moved from GT_Proxy? (Not sure) aMaterial.mHandleMaterial = (aMaterial == Desh ? aMaterial.mHandleMaterial : aMaterial == Diamond || aMaterial == Thaumium ? Wood @@ -2456,32 +2567,42 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { } private static void addEnchantmentValues(Materials aMaterial, String aConfigPath) { - aMaterial.mEnchantmentToolsLevel = (byte) GregTech_API.sMaterialProperties - .get(aConfigPath, "EnchantmentLevel", aMaterial.mEnchantmentToolsLevel); + aMaterial.mEnchantmentToolsLevel = (byte) GregTech_API.sMaterialProperties.get( + aConfigPath, + "EnchantmentLevel", + aMaterial.mEnchantmentToolsLevel); String aEnchantmentName = GregTech_API.sMaterialProperties.get( aConfigPath, "Enchantment", aMaterial.mEnchantmentTools != null ? aMaterial.mEnchantmentTools.getName() : ""); if (aMaterial.mEnchantmentTools != null && !aEnchantmentName.equals(aMaterial.mEnchantmentTools.getName())) IntStream.range(0, Enchantment.enchantmentsList.length) - .filter(i -> aEnchantmentName.equals(Enchantment.enchantmentsList[i].getName())) - .forEach(i -> aMaterial.mEnchantmentTools = Enchantment.enchantmentsList[i]); + .filter(i -> aEnchantmentName.equals(Enchantment.enchantmentsList[i].getName())) + .forEach(i -> aMaterial.mEnchantmentTools = Enchantment.enchantmentsList[i]); } private static void addProcessingIntoValues(Materials aMaterial, String aConfigPath) { aMaterial.mSmeltInto = MATERIALS_MAP.get( GregTech_API.sMaterialProperties.get(aConfigPath, "MaterialSmeltInto", aMaterial.mSmeltInto.mName)); aMaterial.mMacerateInto = MATERIALS_MAP.get( - GregTech_API.sMaterialProperties - .get(aConfigPath, "MaterialMacerateInto", aMaterial.mMacerateInto.mName)); + GregTech_API.sMaterialProperties.get( + aConfigPath, + "MaterialMacerateInto", +