diff options
Diffstat (limited to 'src/main/java/gregtech/loaders/postload/chains')
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java | 40 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java | 9 |
2 files changed, 25 insertions, 24 deletions
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 f5dd2dcc05..be48d7b45b 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,7 @@ package gregtech.loaders.postload.chains; -import static gregtech.api.enums.GT_Values.MOD_ID_DC; -import static gregtech.api.enums.GT_Values.MOD_ID_GTPP; +import static gregtech.api.enums.ModIDs.GTPlusPlus; +import static gregtech.api.enums.ModIDs.NewHorizonsCoreMod; import static gregtech.api.util.GT_ModHandler.getModItem; import net.minecraft.item.ItemStack; @@ -19,9 +19,9 @@ public class GT_NaniteChain { public static void run() { - ItemStack aUVTierLens = getModItem(MOD_ID_DC, "item.MysteriousCrystalLens", 0); - ItemStack aUHVTierLens = getModItem(MOD_ID_DC, "item.ChromaticLens", 0); - ItemStack aUEVTierLens = getModItem(MOD_ID_DC, "item.RadoxPolymerLens", 0); + 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 aUIVTierLens = ItemList.EnergisedTesseract.get(0); ItemStack aUMVTierLens = GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Dilithium, 0, false); @@ -101,13 +101,13 @@ public class GT_NaniteChain { // Glowstone Nanites - Used in the optical circuit line GT_Values.RA.addNanoForgeRecipe( - new ItemStack[] { aUEVTierLens, getModItem(MOD_ID_GTPP, "blockCompressedObsidian", 8, 7), // Double - // compressed - // glowstone - // blocks - // (yes, it's - // not - // obsidian) + new ItemStack[] { aUEVTierLens, getModItem(GTPlusPlus.modID, "blockCompressedObsidian", 8, 7), // Double + // compressed + // glowstone + // blocks + // (yes, it's + // not + // obsidian) ItemList.Circuit_Chip_SoC2.get(64) }, new FluidStack[] { Materials.UUMatter.getFluid(50000) }, new ItemStack[] { Materials.Glowstone.getNanite(64) }, @@ -145,9 +145,10 @@ public class GT_NaniteChain { GT_Values.RA.addNanoForgeRecipe( new ItemStack[] { aUMVTierLens, getModItem("bartworks", "gt.bwMetaGeneratedlens", 0, 36), // Magneto // lens - getModItem(MOD_ID_GTPP, "MU-metaitem.01", 0, 32105), // Quantum Anomaly, couldn't find any - // better naming - Materials.WhiteDwarfMatter.getBlocks(8), getModItem(MOD_ID_DC, "item.PicoWafer", 32), + getModItem(GTPlusPlus.modID, "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 }, new FluidStack[] { Materials.UUMatter.getFluid(500_000), Materials.RawStarMatter.getFluid(50_000), @@ -163,9 +164,10 @@ public class GT_NaniteChain { GT_Values.RA.addNanoForgeRecipe( new ItemStack[] { aUMVTierLens, getModItem("bartworks", "gt.bwMetaGeneratedlens", 0, 36), // Magneto // lens - getModItem(MOD_ID_GTPP, "MU-metaitem.01", 0, 32105), // Quantum Anomaly, couldn't find any - // better naming - Materials.BlackDwarfMatter.getBlocks(8), getModItem(MOD_ID_DC, "item.PicoWafer", 32), + getModItem(GTPlusPlus.modID, "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 }, new FluidStack[] { Materials.UUMatter.getFluid(500_000), Materials.RawStarMatter.getFluid(50_000), @@ -181,7 +183,7 @@ public class GT_NaniteChain { GT_Values.RA.addNanoForgeRecipe( new ItemStack[] { aUMVTierLens, // Quantum Anomaly, couldn't find any better naming. - getModItem(MOD_ID_GTPP, "MU-metaitem.01", 0, 32105), Materials.Universium.getBlocks(8), + getModItem(GTPlusPlus.modID, "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 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 38406215ec..3cb705cc2a 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,6 @@ package gregtech.loaders.postload.chains; -import static gregtech.api.enums.GT_Values.MOD_ID_GTPP; +import static gregtech.api.enums.ModIDs.GTPlusPlus; import java.util.ArrayList; import java.util.List; @@ -10,7 +10,6 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import cpw.mods.fml.common.Loader; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -59,14 +58,14 @@ public class GT_PCBFactoryRecipes { 30 * 20, (int) GT_Values.VP[9]); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_ModHandler.getModItem(MOD_ID_GTPP, "blockFrameGtCelestialTungsten", 1), + new ItemStack[] { GT_ModHandler.getModItem(GTPlusPlus.modID, "blockFrameGtCelestialTungsten", 1), Materials.get("Quantum").getPlates(6) }, null, ItemList.RadiationProofPhotolithographicFrameworkCasing.get(1), 30 * 20, (int) GT_Values.VP[11]); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_ModHandler.getModItem(MOD_ID_GTPP, "blockFrameGtHypogen", 1), + new ItemStack[] { GT_ModHandler.getModItem(GTPlusPlus.modID, "blockFrameGtHypogen", 1), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 2), Materials.Thulium.getPlates(6) }, Materials.SpaceTime.getMolten(144 * 8), @@ -526,7 +525,7 @@ public class GT_PCBFactoryRecipes { mTier3BitMap | mBioUpgradeBitMap); } - if (Loader.isModLoaded("miscutils")) { + if (GTPlusPlus.isModLoaded()) { // Optical Circuit Board for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 7)))); |