aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/core/recipe
diff options
context:
space:
mode:
authorboubou19 <miisterunknown@gmail.com>2023-04-09 01:08:26 +0200
committerGitHub <noreply@github.com>2023-04-09 01:08:26 +0200
commit26caa265b7eae49767947e1ff4e6cfc8166b07f5 (patch)
tree0fc0332da7a843cf153bf75fcc2e20601bbf18ee /src/main/java/gtPlusPlus/core/recipe
parentc33b3ba66194c7441fbd437530d21a51aa4395d5 (diff)
downloadGT5-Unofficial-26caa265b7eae49767947e1ff4e6cfc8166b07f5.tar.gz
GT5-Unofficial-26caa265b7eae49767947e1ff4e6cfc8166b07f5.tar.bz2
GT5-Unofficial-26caa265b7eae49767947e1ff4e6cfc8166b07f5.zip
clean up GT++ code (#589)
* yeet big reactor support * yeet IC2 classic support * yeet pneumaticraft support * yeet More Planets support * yeet Immersive Engineering support * yeet Psychedilicraft support * yeet Beyond Reality Core support * sort mods to see what must be purged * yeet simply jetpacks * yeet RFTools * yeet xReliquary * yeet RedTech * yeet Mekanism * yeet GrowthCraft * yeet ihl * leftover cleaning * yeet thermal fondation support * yeet compact windmills support * spotless * remove constants from LoadedMods (part 1 / 2) * spotless * remove constants from LoadedMods (part 2 / 2) * use mod id enum instead of strings + optimize imports * Loaded.isModLoaded -> enum * restore RA init * missing ! * start organizing recipes stuff * fix crash on world load in dev * remove unused class * remove HazmatUtils.java * move all the removals * remove enableHarderRecipesForHighTierCasings and usages(disabled in the pack) * move some pyrolyse oven recipes to its own file * sa * bump GT version * bump GT5U version * spotless apply * use Everglades entry from the mod enum --------- Co-authored-by: miozune <miozune@gmail.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gtPlusPlus/core/recipe')
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java99
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java77
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java5
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java1
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java78
5 files changed, 65 insertions, 195 deletions
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index f483d1571c..06a1fb2841 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -1,16 +1,23 @@
package gtPlusPlus.core.recipe;
-import java.util.ArrayList;
+import static gregtech.api.enums.Mods.Backpack;
+import static gregtech.api.enums.Mods.Baubles;
+import static gregtech.api.enums.Mods.PamsHarvestCraft;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.oredict.OreDictionary;
-import cpw.mods.fml.common.Loader;
-import gregtech.api.enums.*;
-import gregtech.api.util.*;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.TierEU;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.HotFuel;
+import gregtech.api.util.ThermalFuel;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.item.ModItems;
@@ -21,15 +28,17 @@ import gtPlusPlus.core.item.chemistry.RocketFuels;
import gtPlusPlus.core.item.crafting.ItemDummyResearch;
import gtPlusPlus.core.item.crafting.ItemDummyResearch.ASSEMBLY_LINE_RESEARCH;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.material.*;
+import gtPlusPlus.core.material.ALLOY;
+import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.material.MISC_MATERIALS;
+import gtPlusPlus.core.material.ORES;
+import gtPlusPlus.core.material.Particle;
import gtPlusPlus.core.material.nuclear.FLUORIDES;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.EnchantingUtils;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.MaterialUtils;
-import gtPlusPlus.core.util.reflect.AddGregtechRecipe;
import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
@@ -41,7 +50,6 @@ public class RECIPES_GREGTECH {
}
private static void execute() {
- cokeOvenRecipes();
electrolyzerRecipes();
assemblerRecipes();
fluidcannerRecipes();
@@ -52,10 +60,8 @@ public class RECIPES_GREGTECH {
chemicalReactorRecipes();
dehydratorRecipes();
blastFurnaceRecipes();
-
largeChemReactorRecipes();
fusionRecipes();
-
fissionFuelRecipes();
autoclaveRecipes();
compressorRecipes();
@@ -65,7 +71,6 @@ public class RECIPES_GREGTECH {
benderRecipes();
cyclotronRecipes();
blastSmelterRecipes();
- // advancedMixerRecipes();
sifterRecipes();
electroMagneticSeperatorRecipes();
extruderRecipes();
@@ -79,7 +84,6 @@ public class RECIPES_GREGTECH {
chemplantRecipes();
packagerRecipes();
alloySmelterRecipes();
- implosionRecipes();
/**
* Special Recipe handlers
@@ -430,7 +434,7 @@ public class RECIPES_GREGTECH {
(int) MaterialUtils.getVoltageForTier(j));
}
- if (LoadedMods.Baubles) {
+ if (Baubles.isModLoaded()) {
// Nano Healer
CORE.RA.addAssemblylineRecipe(
ItemUtils.simpleMetaStack(Items.golden_apple, 1, 1),
@@ -898,69 +902,6 @@ public class RECIPES_GREGTECH {
240);
}
- private static void cokeOvenRecipes() {
- Logger.INFO("Loading Recipes for Industrial Coking Oven.");
- // Wood to Charcoal
- // Try use all woods found
- ArrayList<ItemStack> aLogData = OreDictionary.getOres("logWood");
- for (ItemStack stack : aLogData) {
- AddGregtechRecipe.addCokeAndPyrolyseRecipes(
- ItemUtils.getSimpleStack(stack, 20),
- 20,
- GT_ModHandler.getSteam(1000),
- GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Charcoal, 24L),
- FluidUtils.getFluidStack("fluid.coalgas", 1440),
- 60,
- 30);
- }
-
- // Coal to Coke
- AddGregtechRecipe.addCokeAndPyrolyseRecipes(
- GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 16L),
- 22,
- GT_ModHandler.getSteam(1000),
- ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 10),
- FluidUtils.getFluidStack("fluid.coalgas", 2880),
- 30,
- 120);
-
- // Coke & Coal
- CORE.RA.addCokeOvenRecipe(
- GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Coal, 12L),
- ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 6),
- GT_ModHandler.getSteam(2000),
- FluidUtils.getFluidStack("fluid.coalgas", 5040),
- ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 14),
- 60 * 20,
- 240);
- }
-
- private static void matterFabRecipes() {
- Logger.INFO("Loading Recipes for Matter Fabricator.");
-
- try {
-
- CORE.RA.addMatterFabricatorRecipe(
- Materials.UUAmplifier.getFluid(1L), // Fluid
- // Input
- Materials.UUMatter.getFluid(1L), // Fluid Output
- 800, // Time in ticks
- 32); // EU
- } catch (final NullPointerException e) {
- Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
- }
- try {
-
- CORE.RA.addMatterFabricatorRecipe(
- null, // Fluid Input
- Materials.UUMatter.getFluid(1L), // Fluid Output
- 3200, // Time in ticks
- 32); // EU
- } catch (final NullPointerException e) {
- Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");
- }
- }
-
private static void dehydratorRecipes() {
Logger.INFO("Loading Recipes for Chemical Dehydrator.");
@@ -1008,7 +949,7 @@ public class RECIPES_GREGTECH {
/*
* Try Add custom Recipe for drying leather
*/
- if (LoadedMods.PamsHarvestcraft && Loader.isModLoaded("Backpack")) {
+ if (PamsHarvestCraft.isModLoaded() && Backpack.isModLoaded()) {
ItemStack aLeather1, aLeather2;
aLeather1 = ItemUtils.getCorrectStacktype("harvestcraft:hardenedleatherItem", 1);
aLeather2 = ItemUtils.getCorrectStacktype("Backpack:tannedLeather", 1);
@@ -1320,7 +1261,7 @@ public class RECIPES_GREGTECH {
(int) GT_Values.V[i]);
}
- if (LoadedMods.Baubles) {
+ if (Baubles.isModLoaded()) {
// Turbine Housing Research Page
CORE.RA.addSixSlotAssemblingRecipe(
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
index 96c1d940a8..4620895a20 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -1,5 +1,7 @@
package gtPlusPlus.core.recipe;
+import static gregtech.api.enums.Mods.EnderIO;
+import static gregtech.api.enums.Mods.Thaumcraft;
import static gtPlusPlus.core.recipe.common.CI.bitsd;
import static gtPlusPlus.core.util.minecraft.ItemUtils.getSimpleStack;
import static gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits.generatePipeRecipes;
@@ -16,11 +18,13 @@ import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.material.ALLOY;
import gtPlusPlus.core.material.ELEMENT;
import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.minecraft.*;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.MaterialUtils;
+import gtPlusPlus.core.util.minecraft.RecipeUtils;
import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
@@ -99,71 +103,6 @@ public class RECIPES_General {
RECIPE_StainlessPlate,
OUTPUT_Workbench_Advanced);
- // Generates recipes for the Dull shard when TC is not installed.
- if (!LoadedMods.Thaumcraft) {
- // Dull Shard to Aer
- RecipeUtils.addShapedRecipe(
- RECIPE_HydrogenDust,
- RECIPE_HydrogenDust,
- RECIPE_HydrogenDust,
- RECIPE_HydrogenDust,
- ItemUtils.getSimpleStack(ModItems.shardDull),
- RECIPE_HydrogenDust,
- RECIPE_HydrogenDust,
- RECIPE_HydrogenDust,
- RECIPE_HydrogenDust,
- ItemUtils.getSimpleStack(ModItems.shardAer));
- // Dull Shard to Ignis
- RecipeUtils.addShapedRecipe(
- RECIPE_Obsidian,
- RECIPE_Obsidian,
- RECIPE_Obsidian,
- RECIPE_Obsidian,
- ItemUtils.getSimpleStack(ModItems.shardDull),
- RECIPE_Obsidian,
- RECIPE_Obsidian,
- RECIPE_Obsidian,
- RECIPE_Obsidian,
- ItemUtils.getSimpleStack(ModItems.shardIgnis));
- // Dull Shard to Terra
- RecipeUtils.addShapedRecipe(
- RECIPE_Dirt,
- RECIPE_Dirt,
- RECIPE_Dirt,
- RECIPE_Dirt,
- ItemUtils.getSimpleStack(ModItems.shardDull),
- RECIPE_Dirt,
- RECIPE_Dirt,
- RECIPE_Dirt,
- RECIPE_Dirt,
- ItemUtils.getSimpleStack(ModItems.shardTerra));
- // Dull Shard to Aqua
- RecipeUtils.addShapedRecipe(
- RECIPE_LapisDust,
- RECIPE_LapisDust,
- RECIPE_LapisDust,
- RECIPE_LapisDust,
- ItemUtils.getSimpleStack(ModItems.shardDull),
- RECIPE_LapisDust,
- RECIPE_LapisDust,
- RECIPE_LapisDust,
- RECIPE_LapisDust,
- ItemUtils.getSimpleStack(ModItems.shardAqua));
-
- GT_ModHandler.addPulverisationRecipe(
- ItemUtils.getSimpleStack(ModItems.shardAer),
- ItemUtils.getSimpleStack(ModItems.dustAer, 2));
- GT_ModHandler.addPulverisationRecipe(
- ItemUtils.getSimpleStack(ModItems.shardIgnis),
- ItemUtils.getSimpleStack(ModItems.dustIgnis, 2));
- GT_ModHandler.addPulverisationRecipe(
- ItemUtils.getSimpleStack(ModItems.shardTerra),
- ItemUtils.getSimpleStack(ModItems.dustTerra, 2));
- GT_ModHandler.addPulverisationRecipe(
- ItemUtils.getSimpleStack(ModItems.shardAqua),
- ItemUtils.getSimpleStack(ModItems.dustAqua, 2));
- }
-
// Rainforest oak Sapling
if (RecipeUtils.addShapedRecipe(
"stickWood",
@@ -504,7 +443,7 @@ public class RECIPES_General {
GT_Materials.HastelloyX, GT_Materials.TriniumNaquadahCarbonite, };
for (GT_Materials e : g) {
if (e == GT_Materials.Void) {
- if (!LoadedMods.Thaumcraft) {
+ if (!Thaumcraft.isModLoaded()) {
continue;
}
}
@@ -517,7 +456,7 @@ public class RECIPES_General {
for (Materials e : h) {
if (e == Materials.DarkSteel) {
- if (!LoadedMods.EnderIO) {
+ if (!EnderIO.isModLoaded()) {
continue;
}
}
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
index 65c7a1ca56..70620f9749 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
@@ -2,7 +2,10 @@ package gtPlusPlus.core.recipe;
import net.minecraft.item.ItemStack;
-import gregtech.api.enums.*;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OreDictNames;
+import gregtech.api.enums.OrePrefixes;
import gregtech.api.interfaces.IOreRecipeRegistrator;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
index 2b35ba70ab..29a09fc2b4 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
@@ -1,6 +1,5 @@
package gtPlusPlus.core.recipe;
-import gregtech.api.enums.*;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.minecraft.RecipeUtils;
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 1964777df8..92efee13b4 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -1,5 +1,14 @@
package gtPlusPlus.core.recipe;
+import static gregtech.api.enums.Mods.BartWorks;
+import static gregtech.api.enums.Mods.COFHCore;
+import static gregtech.api.enums.Mods.EternalSingularity;
+import static gregtech.api.enums.Mods.GoodGenerator;
+import static gregtech.api.enums.Mods.GregTech;
+import static gregtech.api.enums.Mods.Railcraft;
+import static gregtech.api.enums.Mods.RemoteIO;
+import static gregtech.api.enums.Mods.ZTones;
+
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -12,9 +21,11 @@ import net.minecraftforge.oredict.OreDictionary;
import com.github.technus.tectech.recipe.TT_recipeAdder;
import com.github.technus.tectech.thing.CustomItemList;
-import cpw.mods.fml.common.Loader;
import gregtech.api.GregTech_API;
-import gregtech.api.enums.*;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
@@ -25,13 +36,15 @@ import gtPlusPlus.core.item.chemistry.AgriculturalChem;
import gtPlusPlus.core.item.crafting.ItemDummyResearch;
import gtPlusPlus.core.item.crafting.ItemDummyResearch.ASSEMBLY_LINE_RESEARCH;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.material.ALLOY;
import gtPlusPlus.core.material.ELEMENT;
import gtPlusPlus.core.material.MISC_MATERIALS;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.minecraft.*;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.MaterialUtils;
+import gtPlusPlus.core.util.minecraft.RecipeUtils;
import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.everglades.dimension.Dimension_Everglades;
@@ -215,7 +228,6 @@ public class RECIPES_Machines {
// Misc
public static ItemStack INPUT_RCCokeOvenBlock;
- public static ItemStack INPUT_IECokeOvenBlock;
public static final void loadRecipes() {
run();
@@ -668,22 +680,22 @@ public class RECIPES_Machines {
GregtechItemList.Large_Plasma_Turbine.get(1),
20 * 60,
MaterialUtils.getVoltageForTier(7));
- if (LoadedMods.GoodGenerator) {
+ if (GoodGenerator.isModLoaded()) {
GT_Values.RA.addAssemblerRecipe(
new ItemStack[] { CI.getNumberedAdvancedCircuit(18),
- GT_ModHandler.getModItem("GoodGenerator", "supercriticalFluidTurbineCasing", 1),
- GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedplate", 4, 10101),
- GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedscrew", 8, 10101) },
+ GT_ModHandler.getModItem(GoodGenerator.ID, "supercriticalFluidTurbineCasing", 1),
+ GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedplate", 4, 10101),
+ GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedscrew", 8, 10101) },
FluidRegistry.getFluidStack("molten.adamantium alloy", 144 * 2),
GregtechItemList.Casing_Turbine_SC.get(1),
20 * 5,
MaterialUtils.getVoltageForTier(6));
GT_Values.RA.addAssemblerRecipe(
new ItemStack[] { CI.getNumberedAdvancedCircuit(18),
- GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 1, 32016),
- GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedplate", 8, 10104),
- GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedscrew", 16, 10104),
- GT_ModHandler.getModItem("bartworks", "gt.bwMetaGeneratedgearGt", 4, 10104),
+ GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 32016),
+ GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedplate", 8, 10104),
+ GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedscrew", 16, 10104),
+ GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedgearGt", 4, 10104),
CI.getCircuit(7, 8) },
FluidRegistry.getFluidStack("molten.hikarium", 144 * 8),
GregtechItemList.Large_SCSteam_Turbine.get(1),
@@ -986,19 +998,10 @@ public class RECIPES_Machines {
IV_MACHINE_Mixer = ItemList.Machine_IV_Mixer.get(1);
EV_MACHINE_ChemicalBath = ItemList.Machine_EV_ChemicalBath.get(1);
if (CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven) {
- if (LoadedMods.Railcraft) {
+ if (Railcraft.isModLoaded()) {
// Misc
INPUT_RCCokeOvenBlock = ItemUtils
- .getItemStackWithMeta(LoadedMods.Railcraft, "Railcraft:machine.alpha", "Coke_Oven_RC", 7, 1);
- }
- if (LoadedMods.ImmersiveEngineering) {
- // Misc
- INPUT_IECokeOvenBlock = ItemUtils.getItemStackWithMeta(
- LoadedMods.ImmersiveEngineering,
- "ImmersiveEngineering:stoneDecoration",
- "Coke_Oven_IE",
- 1,
- 1);
+ .getItemStackWithMeta(Railcraft.isModLoaded(), "Railcraft:machine.alpha", "Coke_Oven_RC", 7, 1);
}
}
runModRecipes();
@@ -1199,7 +1202,7 @@ public class RECIPES_Machines {
GregtechItemList.Hatch_Output_Bus_Steam.get(1));
// RF Convertor
- if (LoadedMods.CoFHCore && CORE.ConfigSwitches.enableMachine_RF_Convetor) {
+ if (COFHCore.isModLoaded() && CORE.ConfigSwitches.enableMachine_RF_Convetor) {
RecipeUtils.addShapedGregtechRecipe(
CI.getPlate(4, 1),
CI.getTieredCircuitOreDictName(5),
@@ -1327,7 +1330,7 @@ public class RECIPES_Machines {
RECIPE_IndustrialCokeOvenCasingA = GregtechItemList.Casing_CokeOven_Coil1.get(1);
RECIPE_IndustrialCokeOvenCasingB = GregtechItemList.Casing_CokeOven_Coil2.get(1);
- if (LoadedMods.Railcraft) {
+ if (Railcraft.isModLoaded()) {
// Industrial Coke Oven
RecipeUtils.addShapedGregtechRecipe(
CI.component_Plate[7],
@@ -1341,20 +1344,6 @@ public class RECIPES_Machines {
CI.component_Plate[7],
RECIPE_IndustrialCokeOvenController);
}
- if (LoadedMods.ImmersiveEngineering) {
- // Industrial Coke Oven
- RecipeUtils.addShapedGregtechRecipe(
- CI.component_Plate[8],
- CI.circuitTier4,
- CI.component_Plate[8],
- CI.machineCasing_EV,
- INPUT_IECokeOvenBlock,
- CI.machineCasing_EV,
- CI.component_Plate[8],
- CI.circuitTier4,
- CI.component_Plate[8],
- RECIPE_IndustrialCokeOvenController);
- }
// Coke Oven Frame Casing
RecipeUtils.addShapedGregtechRecipe(
CI.component_Plate[7],
@@ -1820,7 +1809,7 @@ public class RECIPES_Machines {
(int) GT_Values.VP[11],
16,
new Object[] { GregtechItemList.Controller_MolecularTransformer.get(1),
- GT_ModHandler.getModItem("eternalsingularity", "eternal_singularity", 1),
+ GT_ModHandler.getModItem(EternalSingularity.ID, "eternal_singularity", 1),
new Object[] { OrePrefixes.circuit.get(Materials.Bio), 8 }, ItemList.Electric_Pump_UEV.get(4),
ItemList.Field_Generator_UEV.get(4), GregtechItemList.Laser_Lens_Special.get(1) },
new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 10),
@@ -2993,8 +2982,8 @@ public class RECIPES_Machines {
// Reservoir Hatch
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] { ItemList.Hatch_Input_EV.get(1), GT_ModHandler.getModItem("RIO", "tile.machine", 1),
- ItemList.Electric_Pump_EV.get(1) },
+ new ItemStack[] { ItemList.Hatch_Input_EV.get(1),
+ GT_ModHandler.getModItem(RemoteIO.ID, "tile.machine", 1), ItemList.Electric_Pump_EV.get(1) },
GT_Values.NF,
GregtechItemList.Hatch_Reservoir.get(1),
100,
@@ -3446,8 +3435,7 @@ public class RECIPES_Machines {
}
private static void ztonesCoverRecipes() {
-
- if (!Loader.isModLoaded("Ztones")) {
+ if (!ZTones.isModLoaded()) {
return;
}
Class ModBlocksClass = ReflectionUtils.getClass("com.riciJak.Ztones.init.ModBlocks");