aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/postload/chains
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/loaders/postload/chains')
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java36
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java39
2 files changed, 41 insertions, 34 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 7143c8e7e1..266f7198e6 100644
--- a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java
+++ b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java
@@ -1,8 +1,6 @@
package gregtech.loaders.postload.chains;
-import static gregtech.api.enums.Mods.BartWorks;
-import static gregtech.api.enums.Mods.GTPlusPlus;
-import static gregtech.api.enums.Mods.GoodGenerator;
+import static goodgenerator.loader.Loaders.huiCircuit;
import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
import static gregtech.api.recipe.RecipeMaps.nanoForgeRecipes;
import static gregtech.api.util.GT_ModHandler.getModItem;
@@ -13,12 +11,15 @@ import static gregtech.api.util.GT_RecipeConstants.AssemblyLine;
import static gregtech.api.util.GT_RecipeConstants.NANO_FORGE_TIER;
import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM;
import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME;
+import static gtPlusPlus.core.block.ModBlocks.blockCompressedObsidian;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
+import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
@@ -26,6 +27,7 @@ import gregtech.api.enums.MaterialsUEVplus;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
public class GT_NaniteChain {
@@ -89,7 +91,7 @@ public class GT_NaniteChain {
GT_Values.RA.stdBuilder()
.itemInputs(
aUVTierLens,
- getModItem(BartWorks.ID, "bw.werkstoffblockscasingadvanced.01", 8, 31776),
+ new ItemStack(WerkstoffLoader.BWBlockCasingsAdvanced, 8, 31776),
ItemList.Circuit_Chip_SoC.get(64))
.itemOutputs(Materials.Carbon.getNanite(64))
.fluidInputs(Materials.UUMatter.getFluid(200_000))
@@ -126,8 +128,8 @@ public class GT_NaniteChain {
GT_Values.RA.stdBuilder()
.itemInputs(
aUEVTierLens,
- getModItem(GTPlusPlus.ID, "blockCompressedObsidian", 8, 7), // Double compressed glowstone blocks (yes,
- // it's not obsidian)
+ new ItemStack(blockCompressedObsidian, 8, 7), // Double compressed glowstone blocks (yes,
+ // it's not obsidian)
ItemList.Circuit_Chip_SoC2.get(64))
.itemOutputs(Materials.Glowstone.getNanite(64))
.fluidInputs(Materials.UUMatter.getFluid(50_000))
@@ -165,12 +167,12 @@ public class GT_NaniteChain {
GT_Values.RA.stdBuilder()
.itemInputs(
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
+ new ItemStack(WerkstoffLoader.items.get(OrePrefixes.lens), 0, 36), // Magneto lens
+ GregtechItemList.Laser_Lens_Special.get(0), // Quantum Anomaly, couldn't find any better
+ // naming
MaterialsUEVplus.WhiteDwarfMatter.getBlocks(8),
getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32),
- getModItem(GoodGenerator.ID, "huiCircuit", 1, 4) // Paradox circuit
+ new ItemStack(huiCircuit, 1, 4) // Paradox circuit
)
.itemOutputs(MaterialsUEVplus.WhiteDwarfMatter.getNanite(4))
.fluidInputs(
@@ -186,12 +188,12 @@ public class GT_NaniteChain {
GT_Values.RA.stdBuilder()
.itemInputs(
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
+ new ItemStack(WerkstoffLoader.items.get(OrePrefixes.lens), 0, 36), // Magneto lens
+ GregtechItemList.Laser_Lens_Special.get(0), // Quantum Anomaly, couldn't find any better
+ // naming
MaterialsUEVplus.BlackDwarfMatter.getBlocks(8),
getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32),
- getModItem(GoodGenerator.ID, "huiCircuit", 1, 4) // Paradox circuit
+ new ItemStack(huiCircuit, 1, 4) // Paradox circuit
)
.itemOutputs(MaterialsUEVplus.BlackDwarfMatter.getNanite(4))
.fluidInputs(
@@ -208,11 +210,11 @@ public class GT_NaniteChain {
.itemInputs(
aUMVTierLens,
// Quantum Anomaly, couldn't find any better naming.
- getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105),
+ GregtechItemList.Laser_Lens_Special.get(0),
MaterialsUEVplus.Universium.getBlocks(8),
ItemList.Optically_Perfected_CPU.get(16),
ItemList.Optically_Compatible_Memory.get(16),
- getModItem(GoodGenerator.ID, "huiCircuit", 1, 4) // Paradox circuit
+ new ItemStack(huiCircuit, 1, 4) // Paradox circuit
)
.itemOutputs(MaterialsUEVplus.Universium.getNanite(2))
.fluidInputs(
@@ -229,7 +231,7 @@ public class GT_NaniteChain {
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Forcicium, 0, false),
// Quantum Anomaly
- getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105),
+ GregtechItemList.Laser_Lens_Special.get(0),
MaterialsUEVplus.TranscendentMetal.getNanite(1),
MaterialsUEVplus.Eternity.getBlocks(8),
getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32),
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 c9dafacf52..6be4ab534e 100644
--- a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java
@@ -1,7 +1,5 @@
package gregtech.loaders.postload.chains;
-import static gregtech.api.enums.Mods.BartWorks;
-import static gregtech.api.enums.Mods.GTPlusPlus;
import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
import static gregtech.api.recipe.metadata.PCBFactoryUpgrade.BIO;
import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
@@ -9,6 +7,9 @@ import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
import static gregtech.api.util.GT_RecipeConstants.AssemblyLine;
import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM;
import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME;
+import static gtPlusPlus.core.material.ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN;
+import static gtPlusPlus.core.material.ELEMENT.STANDALONE.CHRONOMATIC_GLASS;
+import static gtPlusPlus.core.material.ELEMENT.STANDALONE.HYPOGEN;
import java.util.ArrayList;
import java.util.List;
@@ -18,6 +19,8 @@ import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
+import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
+
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
@@ -27,7 +30,6 @@ import gregtech.api.enums.TierEU;
import gregtech.api.recipe.RecipeMaps;
import gregtech.api.recipe.metadata.PCBFactoryTierKey;
import gregtech.api.recipe.metadata.PCBFactoryUpgradeKey;
-import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_PCBFactoryManager;
import gregtech.api.util.GT_Utility;
@@ -77,7 +79,7 @@ public class GT_PCBFactoryRecipes {
.addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
- GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtCelestialTungsten", 1),
+ CELESTIAL_TUNGSTEN.getFrameBox(1),
Materials.get("Quantum")
.getPlates(6))
.itemOutputs(ItemList.RadiationProofPhotolithographicFrameworkCasing.get(1))
@@ -86,7 +88,7 @@ public class GT_PCBFactoryRecipes {
.addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
- GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtHypogen", 1),
+ HYPOGEN.getFrameBox(1),
GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 2),
Materials.Thulium.getPlates(6))
.itemOutputs(ItemList.InfinityCooledCasing.get(1))
@@ -609,12 +611,13 @@ public class GT_PCBFactoryRecipes {
GT_Utility.getIntegratedCircuit(1),
GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
.getPlates(1),
- GT_ModHandler
- .getModItem(BartWorks.ID, "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106),
+ new ItemStack(
+ WerkstoffLoader.items.get(OrePrefixes.foil),
+ (int) (16 * (Math.sqrt(tier - 6))),
+ 10106),
GT_OreDictUnificator
.get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))),
- GT_ModHandler
- .getModItem(GTPlusPlus.ID, "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6)))))
+ CHRONOMATIC_GLASS.getFoil((int) (16 * (Math.sqrt(tier - 6)))))
.fluidInputs(
Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))),
Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))),
@@ -639,12 +642,13 @@ public class GT_PCBFactoryRecipes {
GT_Utility.getNaniteAsCatalyst(Materials.Silver),
GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
.getPlates(1),
- GT_ModHandler
- .getModItem(BartWorks.ID, "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106),
+ new ItemStack(
+ WerkstoffLoader.items.get(OrePrefixes.foil),
+ (int) (16 * (Math.sqrt(tier - 6))),
+ 10106),
GT_OreDictUnificator
.get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))),
- GT_ModHandler
- .getModItem(GTPlusPlus.ID, "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6)))))
+ CHRONOMATIC_GLASS.getFoil((int) (16 * (Math.sqrt(tier - 6)))))
.fluidInputs(
Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))),
Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))),
@@ -669,12 +673,13 @@ public class GT_PCBFactoryRecipes {
GT_Utility.getNaniteAsCatalyst(Materials.Gold),
GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
.getPlates(1),
- GT_ModHandler
- .getModItem(BartWorks.ID, "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106),
+ new ItemStack(
+ WerkstoffLoader.items.get(OrePrefixes.foil),
+ (int) (16 * (Math.sqrt(tier - 6))),
+ 10106),
GT_OreDictUnificator
.get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))),
- GT_ModHandler
- .getModItem(GTPlusPlus.ID, "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6)))))
+ CHRONOMATIC_GLASS.getFoil((int) (16 * (Math.sqrt(tier - 6)))))
.fluidInputs(
Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))),
Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))),
generated by cgit (git 2.46.0) at 2025-11-30 12:29:18 +0000