aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/common/Recipes.java4
-rw-r--r--src/main/java/common/recipeLoaders/AlloySmelter.java4
-rw-r--r--src/main/java/common/recipeLoaders/AssemblyLine.java43
-rw-r--r--src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java17
-rw-r--r--src/main/java/kekztech/KekzCore.java5
5 files changed, 44 insertions, 29 deletions
diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java
index 4574009b07..6e9c10fee5 100644
--- a/src/main/java/common/Recipes.java
+++ b/src/main/java/common/Recipes.java
@@ -28,6 +28,8 @@ import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
+import static gregtech.api.enums.Mods.ThaumicTinkerer;
+
public class Recipes {
public static final HashMap<String, InfusionRecipe> infusionRecipes = new HashMap<>();
@@ -92,7 +94,7 @@ public class Recipes {
new ItemStack(Blocks.jarThaumiumReinforced, 1, 0),
recipe_voidjarupgrade));
- final ItemStack[] recipe_jarichor = { GT_ModHandler.getModItem("ThaumicTinkerer", "kamiResource", 1, 0),
+ final ItemStack[] recipe_jarichor = { GT_ModHandler.getModItem(ThaumicTinkerer.ID, "kamiResource", 1, 0),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1),
new ItemStack(net.minecraft.init.Blocks.glass_pane),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 1),
diff --git a/src/main/java/common/recipeLoaders/AlloySmelter.java b/src/main/java/common/recipeLoaders/AlloySmelter.java
index 3ceeb8da17..433e1a23fc 100644
--- a/src/main/java/common/recipeLoaders/AlloySmelter.java
+++ b/src/main/java/common/recipeLoaders/AlloySmelter.java
@@ -8,6 +8,8 @@ import cpw.mods.fml.common.Loader;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
+import static gregtech.api.enums.Mods.BartWorks;
+
public class AlloySmelter implements Runnable {
@Override
@@ -18,7 +20,7 @@ public class AlloySmelter implements Runnable {
GT_Values.RA.addAlloySmelterRecipe(
craftingItem.getStackOfAmountFromDamage(
Items.YSZCeramicDust.getMetaID(),
- Loader.isModLoaded("bartworks") ? 3 : 10),
+ BartWorks.isModLoaded() ? 3 : 10),
ItemList.Shape_Mold_Plate.get(0),
craftingItem.getStackOfAmountFromDamage(Items.YSZCeramicPlate.getMetaID(), 1),
400,
diff --git a/src/main/java/common/recipeLoaders/AssemblyLine.java b/src/main/java/common/recipeLoaders/AssemblyLine.java
index cbb3cdef43..d1dfdb4c54 100644
--- a/src/main/java/common/recipeLoaders/AssemblyLine.java
+++ b/src/main/java/common/recipeLoaders/AssemblyLine.java
@@ -16,6 +16,14 @@ import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
+import static gregtech.api.enums.Mods.Avaritia;
+import static gregtech.api.enums.Mods.EnderIO;
+import static gregtech.api.enums.Mods.EternalSingularity;
+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.enums.Mods.UniversalSingularities;
+
public class AssemblyLine implements Runnable {
@Override
@@ -39,10 +47,10 @@ public class AssemblyLine implements Runnable {
new ItemStack[] { ItemList.Casing_Tank_7.get(4),
GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.CrystallinePinkSlime, 6),
GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Naquadah, 3),
- GT_ModHandler.getModItem("dreamcraft", "item.ChromeBars", 6),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ChromeBars", 6),
GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Quantium, 6),
ItemList.Field_Generator_EV.get(8), ItemList.FluidRegulator_LuV.get(1),
- GT_ModHandler.getModItem("dreamcraft", "item.EngineeringProcessorFluidEmeraldCore", 4) },
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngineeringProcessorFluidEmeraldCore", 4) },
new FluidStack[] { Materials.Enderium.getMolten(1440), Materials.Polybenzimidazole.getMolten(1584) },
new ItemStack(Blocks.tfftStorageField, 1, 6),
600,
@@ -55,11 +63,11 @@ public class AssemblyLine implements Runnable {
new ItemStack[] { ItemList.Casing_Tank_10.get(16),
GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.MelodicAlloy, 6),
GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.NetherStar, 3),
- GT_ModHandler.getModItem("dreamcraft", "item.OsmiumBars", 6),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.OsmiumBars", 6),
GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.MysteriousCrystal, 6),
ItemList.Field_Generator_IV.get(16), ItemList.Field_Generator_LuV.get(4),
ItemList.FluidRegulator_UV.get(1),
- GT_ModHandler.getModItem("dreamcraft", "item.EngineeringProcessorFluidEmeraldCore", 16) },
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngineeringProcessorFluidEmeraldCore", 16) },
new FluidStack[] { Materials.CrystallineAlloy.getMolten(2880),
Materials.Polybenzimidazole.getMolten(2016) },
new ItemStack(Blocks.tfftStorageField, 1, 7),
@@ -71,16 +79,16 @@ public class AssemblyLine implements Runnable {
new ItemStack(Blocks.tfftStorageField, 1, 7),
120000,
new ItemStack[] { ItemList.Quantum_Tank_IV.get(1),
- GT_ModHandler.getModItem("Avaritia", "Neutronium_Compressor", 1),
+ GT_ModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 1),
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.StellarAlloy, 6),
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.StellarAlloy, 6),
GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.DraconiumAwakened, 3),
- GT_ModHandler.getModItem("dreamcraft", "item.NeutroniumBars", 6),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.NeutroniumBars", 6),
GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.InfinityCatalyst, 6),
ItemList.Field_Generator_ZPM.get(16), ItemList.Field_Generator_UV.get(4),
- GT_ModHandler.getModItem("GoodGenerator", "huiCircuit", 4, 2),
+ GT_ModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 4, 2),
GT_ModHandler
- .getModItem("universalsingularities", "universal.tinkersConstruct.singularity", 1, 4) },
+ .getModItem(UniversalSingularities.ID, "universal.tinkersConstruct.singularity", 1, 4) },
new FluidStack[] { Materials.CrystallinePinkSlime.getMolten(4320), new FluidStack(radoxPoly, 2880) },
new ItemStack(Blocks.tfftStorageField, 1, 8),
600,
@@ -91,16 +99,15 @@ public class AssemblyLine implements Runnable {
new ItemStack(Blocks.tfftStorageField, 1, 8),
160000,
new ItemStack[] { ItemList.Quantum_Tank_IV.get(4),
- GT_ModHandler.getModItem("Avaritia", "Neutronium_Compressor", 2),
+ GT_ModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 2),
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TranscendentMetal, 6),
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TranscendentMetal, 6),
GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 3),
ItemList.EnergisedTesseract.get(1),
- GT_ModHandler.getModItem("miscutils", "itemRotorHypogen", 6),
+ GT_ModHandler.getModItem(GTPlusPlus.ID, "itemRotorHypogen", 6),
ItemList.Field_Generator_UHV.get(16), ItemList.Field_Generator_UEV.get(4),
- GT_ModHandler.getModItem("GoodGenerator", "huiCircuit", 4, 3),
- GT_ModHandler
- .getModItem("universalsingularities", "universal.tinkersConstruct.singularity", 1, 4) },
+ GT_ModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 4, 3),
+ GT_ModHandler.getModItem(UniversalSingularities.ID, "universal.tinkersConstruct.singularity", 1, 4) },
new FluidStack[] { Materials.MelodicAlloy.getMolten(5760), new FluidStack(radoxPoly, 3456) },
new ItemStack(Blocks.tfftStorageField, 1, 9),
600,
@@ -111,17 +118,17 @@ public class AssemblyLine implements Runnable {
new ItemStack(Blocks.tfftStorageField, 1, 9),
200000,
new ItemStack[] { ItemList.Quantum_Tank_IV.get(16),
- GT_ModHandler.getModItem("Avaritia", "Neutronium_Compressor", 4),
+ GT_ModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 4),
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 6),
GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 6),
GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.SpaceTime, 3),
ItemList.EnergisedTesseract.get(6),
GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.SpaceTime, 6),
ItemList.Field_Generator_UEV.get(16), ItemList.Field_Generator_UIV.get(4),
- GT_ModHandler.getModItem("GoodGenerator", "huiCircuit", 4, 4),
- GT_ModHandler.getModItem("GoodGenerator", "huiCircuit", 4, 4),
- GT_ModHandler.getModItem("EnderIO", "itemBasicCapacitor", 64, 6),
- GT_ModHandler.getModItem("eternalsingularity", "eternal_singularity", 1) },
+ GT_ModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 4, 4),
+ GT_ModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 4, 4),
+ GT_ModHandler.getModItem(EnderIO.ID, "itemBasicCapacitor", 64, 6),
+ GT_ModHandler.getModItem(EternalSingularity.ID, "eternal_singularity", 1) },
new FluidStack[] { Materials.StellarAlloy.getMolten(7200), new FluidStack(radoxPoly, 4608) },
new ItemStack(Blocks.tfftStorageField, 1, 10),
600,
diff --git a/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java b/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java
index 3c87ede484..0034d7a79e 100644
--- a/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java
+++ b/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java
@@ -16,6 +16,9 @@ import gregtech.api.enums.TierEU;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
+import static gregtech.api.enums.Mods.GTPlusPlus;
+import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
+
public class ResearchableAssemblyLine implements Runnable {
@Override
@@ -49,7 +52,7 @@ public class ResearchableAssemblyLine implements Runnable {
250 * 20,
(int) TierEU.RECIPE_UEV);
- if (Loader.isModLoaded("miscutils")) {
+ if (GTPlusPlus.isModLoaded()) {
// Insanely Ultimate Capacitor (UIV)
TT_recipeAdder.addResearchableAssemblylineRecipe(
new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 8),
@@ -59,15 +62,15 @@ public class ResearchableAssemblyLine implements Runnable {
32,
new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 4),
GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TranscendentMetal, 24),
- GT_ModHandler.getModItem("miscutils", "itemPlateDoubleHypogen", 32),
- GT_ModHandler.getModItem("miscutils", "itemPlateDoubleHypogen", 32),
+ GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleHypogen", 32),
+ GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleHypogen", 32),
new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 },
new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 },
new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 },
new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 }, ItemList.ZPM4.get(8L),
ItemList.Field_Generator_UIV.get(4), ItemList.Circuit_Wafer_QPIC.get(64),
ItemList.Circuit_Wafer_QPIC.get(64),
- GT_ModHandler.getModItem("dreamcraft", "item.RawPicoWafer", 64),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RawPicoWafer", 64),
ItemList.Circuit_Parts_DiodeXSMD.get(64), ItemList.Circuit_Parts_InductorXSMD.get(32),
GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUIV, 64) },
new FluidStack[] { new FluidStack(solderUEV, 18_432),
@@ -86,15 +89,15 @@ public class ResearchableAssemblyLine implements Runnable {
64,
new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 4),
GT_OreDictUnificator.get(OrePrefixes.screw, Materials.SpaceTime, 24),
- GT_ModHandler.getModItem("miscutils", "itemPlateDoubleDragonblood", 32),
- GT_ModHandler.getModItem("miscutils", "itemPlateDoubleDragonblood", 32),
+ GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleDragonblood", 32),
+ GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleDragonblood", 32),
new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 },
new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 },
new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 },
new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, ItemList.ZPM5.get(8L),
ItemList.Field_Generator_UMV.get(4), ItemList.Circuit_Wafer_QPIC.get(64),
ItemList.Circuit_Wafer_QPIC.get(64),
- GT_ModHandler.getModItem("dreamcraft", "item.PicoWafer", 64),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 64),
ItemList.Circuit_Parts_DiodeXSMD.get(64), ItemList.Circuit_Parts_InductorXSMD.get(64),
GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 64) },
new FluidStack[] { new FluidStack(solderUEV, 36_864),
diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java
index 7a815caa2c..06c9538eaf 100644
--- a/src/main/java/kekztech/KekzCore.java
+++ b/src/main/java/kekztech/KekzCore.java
@@ -3,6 +3,7 @@ package kekztech;
import java.util.List;
import java.util.Set;
+import gregtech.api.enums.Mods;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -34,12 +35,12 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
public class KekzCore {
public static final String NAME = "KekzTech";
- public static final String MODID = "kekztech";
+ public static final String MODID = Mods.Names.KEKZ_TECH;
public static final String VERSION = "GRADLETOKEN_VERSION";
public static final Logger LOGGER = LogManager.getLogger(NAME);
- @Mod.Instance("kekztech")
+ @Mod.Instance(Mods.Names.KEKZ_TECH)
public static KekzCore instance;
@SidedProxy(clientSide = "client.ClientProxy", serverSide = "kekztech.ServerProxy")
generated by cgit (git 2.46.0) at 2025-03-06 23:25:54 +0000