From 9b0cf70949beab972a7f9b2e6884dc9eb4cb8dca Mon Sep 17 00:00:00 2001 From: boubou19 Date: Tue, 4 Apr 2023 13:57:15 +0200 Subject: Modid work (#1833) * add all mods founds in NHCore * depracte old strings * add ars magica 2 * more enum work * use a switch * spotless * more mod id rework * more mod id rework * more mod id rework * should be last * spotless * rename to make more sense * add path attribute * add getResourcePath to enum * spotless --- .../loaders/postload/chains/GT_NaniteChain.java | 41 ++++++++++++---------- .../postload/chains/GT_PCBFactoryRecipes.java | 13 +++---- 2 files changed, 29 insertions(+), 25 deletions(-) (limited to 'src/main/java/gregtech/loaders/postload/chains') diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java index be48d7b45b..63e4ab98ea 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java @@ -1,7 +1,9 @@ package gregtech.loaders.postload.chains; -import static gregtech.api.enums.ModIDs.GTPlusPlus; -import static gregtech.api.enums.ModIDs.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GoodGenerator; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.util.GT_ModHandler.getModItem; import net.minecraft.item.ItemStack; @@ -19,9 +21,9 @@ public class GT_NaniteChain { public static void run() { - ItemStack aUVTierLens = getModItem(NewHorizonsCoreMod.modID, "item.MysteriousCrystalLens", 0); - ItemStack aUHVTierLens = getModItem(NewHorizonsCoreMod.modID, "item.ChromaticLens", 0); - ItemStack aUEVTierLens = getModItem(NewHorizonsCoreMod.modID, "item.RadoxPolymerLens", 0); + ItemStack aUVTierLens = getModItem(NewHorizonsCoreMod.ID, "item.MysteriousCrystalLens", 0); + ItemStack aUHVTierLens = getModItem(NewHorizonsCoreMod.ID, "item.ChromaticLens", 0); + ItemStack aUEVTierLens = getModItem(NewHorizonsCoreMod.ID, "item.RadoxPolymerLens", 0); ItemStack aUIVTierLens = ItemList.EnergisedTesseract.get(0); ItemStack aUMVTierLens = GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Dilithium, 0, false); @@ -66,7 +68,8 @@ public class GT_NaniteChain { // Carbon Nanites - Used to make more Nano Forge Controllers GT_Values.RA.addNanoForgeRecipe( - new ItemStack[] { aUVTierLens, getModItem("bartworks", "bw.werkstoffblockscasingadvanced.01", 8, 31776), + new ItemStack[] { aUVTierLens, + getModItem(BartWorks.ID, "bw.werkstoffblockscasingadvanced.01", 8, 31776), ItemList.Circuit_Chip_SoC.get(64) }, new FluidStack[] { Materials.UUMatter.getFluid(200_000) }, new ItemStack[] { Materials.Carbon.getNanite(64), }, @@ -101,7 +104,7 @@ public class GT_NaniteChain { // Glowstone Nanites - Used in the optical circuit line GT_Values.RA.addNanoForgeRecipe( - new ItemStack[] { aUEVTierLens, getModItem(GTPlusPlus.modID, "blockCompressedObsidian", 8, 7), // Double + new ItemStack[] { aUEVTierLens, getModItem(GTPlusPlus.ID, "blockCompressedObsidian", 8, 7), // Double // compressed // glowstone // blocks @@ -143,13 +146,13 @@ public class GT_NaniteChain { // White Dwarf Matter Nanites. Used to make Magnetohydrodynamically constrained star matter. GT_Values.RA.addNanoForgeRecipe( - new ItemStack[] { aUMVTierLens, getModItem("bartworks", "gt.bwMetaGeneratedlens", 0, 36), // Magneto - // lens - getModItem(GTPlusPlus.modID, "MU-metaitem.01", 0, 32105), // Quantum Anomaly, couldn't find any + new ItemStack[] { aUMVTierLens, getModItem(BartWorks.ID, "gt.bwMetaGeneratedlens", 0, 36), // Magneto + // lens + getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105), // Quantum Anomaly, couldn't find any // better naming Materials.WhiteDwarfMatter.getBlocks(8), - getModItem(NewHorizonsCoreMod.modID, "item.PicoWafer", 32), - getModItem("GoodGenerator", "huiCircuit", 1, 4) // Paradox circuit + getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32), + getModItem(GoodGenerator.ID, "huiCircuit", 1, 4) // Paradox circuit }, new FluidStack[] { Materials.UUMatter.getFluid(500_000), Materials.RawStarMatter.getFluid(50_000), Materials.Space.getMolten(720), }, @@ -162,13 +165,13 @@ public class GT_NaniteChain { // Black Dwarf Matter Nanites. Used to make Magnetohydrodynamically constrained star matter. GT_Values.RA.addNanoForgeRecipe( - new ItemStack[] { aUMVTierLens, getModItem("bartworks", "gt.bwMetaGeneratedlens", 0, 36), // Magneto - // lens - getModItem(GTPlusPlus.modID, "MU-metaitem.01", 0, 32105), // Quantum Anomaly, couldn't find any + new ItemStack[] { aUMVTierLens, getModItem(BartWorks.ID, "gt.bwMetaGeneratedlens", 0, 36), // Magneto + // lens + getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105), // Quantum Anomaly, couldn't find any // better naming Materials.BlackDwarfMatter.getBlocks(8), - getModItem(NewHorizonsCoreMod.modID, "item.PicoWafer", 32), - getModItem("GoodGenerator", "huiCircuit", 1, 4) // Paradox circuit + getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32), + getModItem(GoodGenerator.ID, "huiCircuit", 1, 4) // Paradox circuit }, new FluidStack[] { Materials.UUMatter.getFluid(500_000), Materials.RawStarMatter.getFluid(50_000), Materials.Time.getMolten(720), }, @@ -183,10 +186,10 @@ public class GT_NaniteChain { GT_Values.RA.addNanoForgeRecipe( new ItemStack[] { aUMVTierLens, // Quantum Anomaly, couldn't find any better naming. - getModItem(GTPlusPlus.modID, "MU-metaitem.01", 0, 32105), Materials.Universium.getBlocks(8), + getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105), Materials.Universium.getBlocks(8), ItemList.Optically_Perfected_CPU.get(16), ItemList.Optically_Compatible_Memory.get(16), - getModItem("GoodGenerator", "huiCircuit", 1, 4) // Paradox circuit + getModItem(GoodGenerator.ID, "huiCircuit", 1, 4) // Paradox circuit }, new FluidStack[] { Materials.SpaceTime.getMolten(144), Materials.Infinity.getMolten(576), Materials.UUMatter.getFluid(1_000_000), }, diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java index 8cbdc42301..51f8c930bf 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java @@ -1,6 +1,7 @@ package gregtech.loaders.postload.chains; -import static gregtech.api.enums.ModIDs.GTPlusPlus; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.GTPlusPlus; import java.util.ArrayList; import java.util.List; @@ -59,7 +60,7 @@ public class GT_PCBFactoryRecipes { 30 * 20, (int) GT_Values.VP[9]); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_ModHandler.getModItem(GTPlusPlus.modID, "blockFrameGtCelestialTungsten", 1), + new ItemStack[] { GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtCelestialTungsten", 1), Materials.get("Quantum") .getPlates(6) }, null, @@ -67,7 +68,7 @@ public class GT_PCBFactoryRecipes { 30 * 20, (int) GT_Values.VP[11]); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_ModHandler.getModItem(GTPlusPlus.modID, "blockFrameGtHypogen", 1), + new ItemStack[] { GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtHypogen", 1), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 2), Materials.Thulium.getPlates(6) }, Materials.SpaceTime.getMolten(144 * 8), @@ -608,7 +609,7 @@ public class GT_PCBFactoryRecipes { GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_ModHandler.getModItem( - "bartworks", + BartWorks.ID, "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106), @@ -642,7 +643,7 @@ public class GT_PCBFactoryRecipes { GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_ModHandler.getModItem( - "bartworks", + BartWorks.ID, "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106), @@ -676,7 +677,7 @@ public class GT_PCBFactoryRecipes { GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), GT_ModHandler.getModItem( - "bartworks", + BartWorks.ID, "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106), -- cgit