aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/preload
diff options
context:
space:
mode:
authorGlease <4586901+Glease@users.noreply.github.com>2023-04-02 00:02:47 +0800
committerGitHub <noreply@github.com>2023-04-01 18:02:47 +0200
commit6b77557e0e87cf5afd9ebd3985323ff1249e615c (patch)
tree36474042ef39f863aedc007eab81a9b09cc7aa78 /src/main/java/gregtech/loaders/preload
parent655cc902d3df19a1ac2bfaa38cc928ed629d0171 (diff)
downloadGT5-Unofficial-6b77557e0e87cf5afd9ebd3985323ff1249e615c.tar.gz
GT5-Unofficial-6b77557e0e87cf5afd9ebd3985323ff1249e615c.tar.bz2
GT5-Unofficial-6b77557e0e87cf5afd9ebd3985323ff1249e615c.zip
Recipe Adder v2 (#1770)
* add everything * fixes * migrate plasma forge recipes * syntax update * make chances array length differ a fatal error * time constants + long eut overload * migrate extruder recipes * migrate electromagnetic separator recipes * migrate wiremill recipes * migrate forming press recipes * migrate bender recipes * add doc to clarify the three itemInputs * migrate alloy smelter recipes * migrate arc furnace recipes * added ModIDs enum * sort ModIDs * migrate autoclave recipes * migrated some assembler recipes * split a bit more assembler recipes * migrate canner recipes * migrate brewing recipes * ic2 mod check in canner recipes * use some loops to reduce the amount of recipes to migrate * add requested helper methods * migrate vacuum freezer recipes * migrate thermal centrifuge recipes * format smelter recipes only, doesn't go through normal GT recipe * migrated slicer recipes * migrated sifter recipes * Use proper enum now * remove more constants * cleaning cutting recipes before migration * remove tons of dead commented recipes * migrate pyrolyse recipes * use ModIDs enum more * migrate printer recipes * add a less confusing way to specify value of specialItem * migrate pulverizer recipes * less confusing special item specification * even more ModIDs enum usage * fix auto * import confusing Minecraft enum value with Minecraft client object * migrated blast furnace recipes * migrated Centrifuge recipes * migrated assembler recipes * migrated implosion compressor recipes * migrated extractor recipes * migrated mixer recipes * remove useless code * mgrate universal chemical recipes * refactor chemical recipes * migrate single block only chem reactor recipes * migrate chem reactor recipes * reworked circuit assembler recipes before migrating them * migrated circuit assembler recipes * fix merge conflict for assembler recipes * remove leftover of the merge conflicts * fix weird translation glitch * example of assembly line recipe using RA2 * bugfixes for assline * remove specialValue usage in blast furnace recipes * fix more bugs * add nooptimize to where it make sense * add recipe descriptions * Materials.Superconductor -> Materials.SuperconductorUHV * remove useless Object creations * remove explicit long casts * migrate assemblyline recipes * migrate chemical bath recipes * migrate compressor recipes * move smelting recipe where it belongs * migrated cutting machine recipes * migrated fermenter recipes (unhide alcohol) * remove explicit long casts * migrate fluid canner recipes * migrate fluid heater recipes * migrated fusion recipes * migrated lathe recipes * migrated laser engraver recipes * migrated packager recipes * migrated forge hammer recipes * migrated TPM recipes * exit early and reduced indents * migrated fluid extractor recipes * migrated fluid solidifier recipes * migrated electrolyzer recipes * migrated crop processing recipes * migrated default polymerization recipes * migrate distillery recipes * migrate matter amplifier recipes * add metadata identifier for fusion ignition threshold * migrate fuel recipes * update bs (cherry picked from commit c2d931c9b6caa0376e9d50591894cd849021104d) * spotless (cherry picked from commit 1060f5357fb95e28bfae1f052025f55dabc21a0f) * guard against null itemstacks * wrong translation * fix empty arrays being accessed * add 0 duration and 0 EU/t for fuel recipes * fix typo in matter amplifier recipes * spotless apply --------- Co-authored-by: boubou19 <miisterunknown@gmail.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gregtech/loaders/preload')
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java4
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java60
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java52
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_PreLoad.java25
4 files changed, 71 insertions, 70 deletions
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java b/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java
index fc9f7d936d..4e9566c2d1 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java
@@ -1,6 +1,6 @@
package gregtech.loaders.preload;
-import static gregtech.api.enums.GT_Values.MOD_ID_DC;
+import static gregtech.api.enums.ModIDs.NewHorizonsCoreMod;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -152,7 +152,7 @@ public class GT_Loader_ItemData implements Runnable {
GT_OreDictUnificator
.addItemData(new ItemStack(Blocks.iron_bars, 8, 32767), new ItemData(Materials.Iron, 10886400L));
GT_OreDictUnificator.addItemData(
- GT_ModHandler.getModItem(MOD_ID_DC, "item.SteelBars", 8L, 0),
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.SteelBars", 8L, 0),
new ItemData(Materials.Steel, 10886400L));
GT_OreDictUnificator
.addItemData(GT_ModHandler.getIC2Item("ironFurnace", 1L), new ItemData(Materials.Iron, 18144000L));
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
index f7652b3c86..a1256c5ea7 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
@@ -1,12 +1,13 @@
package gregtech.loaders.preload;
+import static gregtech.api.enums.ModIDs.*;
+
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import codechicken.nei.api.API;
-import cpw.mods.fml.common.Loader;
import gregtech.GT_Mod;
import gregtech.api.GregTech_API;
import gregtech.api.enums.*;
@@ -248,8 +249,6 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
| GT_ModHandler.RecipeBits.BUFFERED;
private static final long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE | bits;
- private static final Boolean isNEILoaded = Loader.isModLoaded("NotEnoughItems");
-
private static void run1() {
GT_ModHandler.addCraftingRecipe(
ItemList.Casing_Pipe_Polytetrafluoroethylene.get(1L),
@@ -5624,7 +5623,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
new Object[] { "ACA", aTextWireHull, "ACA", 'M', ItemList.Hull_IV, 'A', ItemList.Robot_Arm_IV, 'C',
OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten) });
- if (Loader.isModLoaded("Forestry")) {
+ if (Forestry.isModLoaded()) {
ItemList.Machine_IndustrialApiary.set(
new GT_MetaTileEntity_IndustrialApiary(
9399,
@@ -5633,76 +5632,77 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
8).getStackForm(1L));
/* Conversion recipes */
- if (Loader.isModLoaded("gendustry")) {
+ // TODO: Move those recipes with the other recipes
+ if (Gendustry.isModLoaded()) {
GT_ModHandler.addShapelessCraftingRecipe(
ItemList.Machine_IndustrialApiary.get(1L),
- new Object[] { GT_ModHandler.getModItem("gendustry", "IndustrialApiary", 1, 0) });
+ new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "IndustrialApiary", 1, 0) });
GT_ModHandler.addShapelessCraftingRecipe(
ItemList.IndustrialApiary_Upgrade_Frame.get(1),
- new Object[] { GT_ModHandler.getModItem("gendustry", "UpgradeFrame", 1) });
+ new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "UpgradeFrame", 1) });
GT_ModHandler.addShapelessCraftingRecipe(
ItemList.IndustrialApiary_Upgrade_PRODUCTION.get(1L),
- new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 0) });
+ new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 0) });
GT_ModHandler.addShapelessCraftingRecipe(
ItemList.IndustrialApiary_Upgrade_PLAINS.get(1L),
- new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 17) });
+ new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 17) });
GT_ModHandler.addShapelessCraftingRecipe(
ItemList.IndustrialApiary_Upgrade_LIGHT.get(1L),
- new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 11) });
+ new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 11) });
GT_ModHandler.addShapelessCraftingRecipe(
ItemList.IndustrialApiary_Upgrade_FLOWERING.get(1L),
- new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 2) });
+ new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 2) });
GT_ModHandler.addShapelessCraftingRecipe(
ItemList.IndustrialApiary_Upgrade_WINTER.get(1L),
- new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 20) });
+ new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 20) });
GT_ModHandler.addShapelessCraftingRecipe(
ItemList.IndustrialApiary_Upgrade_DRYER.get(1L),
- new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 5) });
+ new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 5) });
GT_ModHandler.addShapelessCraftingRecipe(
ItemList.IndustrialApiary_Upgrade_AUTOMATION.get(1L),
- new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 14) });
+ new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 14) });
GT_ModHandler.addShapelessCraftingRecipe(
ItemList.IndustrialApiary_Upgrade_HUMIDIFIER.get(1L),
- new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 4) });
+ new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 4) });
GT_ModHandler.addShapelessCraftingRecipe(
ItemList.IndustrialApiary_Upgrade_HELL.get(1L),
- new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 13) });
+ new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 13) });
GT_ModHandler.addShapelessCraftingRecipe(
ItemList.IndustrialApiary_Upgrade_POLLEN.get(1L),
- new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 22) });
+ new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 22) });
GT_ModHandler.addShapelessCraftingRecipe(
ItemList.IndustrialApiary_Upgrade_DESERT.get(1L),
- new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 16) });
+ new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 16) });
GT_ModHandler.addShapelessCraftingRecipe(
ItemList.IndustrialApiary_Upgrade_COOLER.get(1L),
- new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 7) });
+ new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 7) });
GT_ModHandler.addShapelessCraftingRecipe(
ItemList.IndustrialApiary_Upgrade_LIFESPAN.get(1L),
- new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 1) });
+ new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 1) });
GT_ModHandler.addShapelessCraftingRecipe(
ItemList.IndustrialApiary_Upgrade_SEAL.get(1L),
- new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 10) });
+ new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 10) });
GT_ModHandler.addShapelessCraftingRecipe(
ItemList.IndustrialApiary_Upgrade_STABILIZER.get(1L),
- new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 19) });
+ new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 19) });
GT_ModHandler.addShapelessCraftingRecipe(
ItemList.IndustrialApiary_Upgrade_JUNGLE.get(1L),
- new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 18) });
+ new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 18) });
GT_ModHandler.addShapelessCraftingRecipe(
ItemList.IndustrialApiary_Upgrade_TERRITORY.get(1L),
- new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 3) });
+ new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 3) });
GT_ModHandler.addShapelessCraftingRecipe(
ItemList.IndustrialApiary_Upgrade_OCEAN.get(1L),
- new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 21) });
+ new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 21) });
GT_ModHandler.addShapelessCraftingRecipe(
ItemList.IndustrialApiary_Upgrade_SKY.get(1L),
- new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 12) });
+ new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 12) });
GT_ModHandler.addShapelessCraftingRecipe(
ItemList.IndustrialApiary_Upgrade_HEATER.get(1L),
- new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 6) });
+ new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 6) });
GT_ModHandler.addShapelessCraftingRecipe(
ItemList.IndustrialApiary_Upgrade_SIEVE.get(1L),
- new Object[] { GT_ModHandler.getModItem("gendustry", "ApiaryUpgrade", 1, 15) });
+ new Object[] { GT_ModHandler.getModItem(Gendustry.modID, "ApiaryUpgrade", 1, 15) });
}
}
@@ -8593,7 +8593,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
"basicgenerator.magicenergyabsorber.tier.04",
"Grandmaster Magic Energy Absorber",
4).getStackForm(1L));
- if (!Loader.isModLoaded("Thaumcraft")) {
+ if (!Thaumcraft.isModLoaded()) {
GT_ModHandler.addCraftingRecipe(
ItemList.MagicEnergyConverter_LV.get(1L),
bitsd,
@@ -9241,7 +9241,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
1200,
120);
} else {
- if (isNEILoaded) {
+ if (NotEnoughItems.isModLoaded()) {
API.hideItem(ItemList.Machine_Multi_Cleanroom.get(1L));
}
}
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java
index 273dcf1427..56ea3ffcee 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java
@@ -1,6 +1,6 @@
package gregtech.loaders.preload;
-import static gregtech.api.enums.GT_Values.MOD_ID_DC;
+import static gregtech.api.enums.ModIDs.NewHorizonsCoreMod;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -320,97 +320,99 @@ public class GT_Loader_OreDictionary implements Runnable {
GT_OreDictUnificator.registerOre(
OrePrefixes.itemCasing,
Materials.Osmium,
- GT_ModHandler.getModItem(MOD_ID_DC, "item.OsmiumItemCasing", 1L, 0));
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.OsmiumItemCasing", 1L, 0));
GT_OreDictUnificator.registerOre(
OrePrefixes.itemCasing,
Materials.Aluminium,
- GT_ModHandler.getModItem(MOD_ID_DC, "item.AluminiumItemCasing", 1L, 0));
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.AluminiumItemCasing", 1L, 0));
GT_OreDictUnificator.registerOre(
OrePrefixes.itemCasing,
Materials.StainlessSteel,
- GT_ModHandler.getModItem(MOD_ID_DC, "item.StainlessSteelItemCasing", 1L, 0));
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.StainlessSteelItemCasing", 1L, 0));
GT_OreDictUnificator.registerOre(
OrePrefixes.itemCasing,
Materials.Tungsten,
- GT_ModHandler.getModItem(MOD_ID_DC, "item.TungstenItemCasing", 1L, 0));
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TungstenItemCasing", 1L, 0));
GT_OreDictUnificator.registerOre(
OrePrefixes.itemCasing,
Materials.Neutronium,
- GT_ModHandler.getModItem(MOD_ID_DC, "item.NeutroniumItemCasing", 1L, 0));
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.NeutroniumItemCasing", 1L, 0));
GT_OreDictUnificator.registerOre(
OrePrefixes.itemCasing,
Materials.TungstenSteel,
- GT_ModHandler.getModItem(MOD_ID_DC, "item.TungstenSteelItemCasing", 1L, 0));
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TungstenSteelItemCasing", 1L, 0));
GT_OreDictUnificator.registerOre(
OrePrefixes.itemCasing,
Materials.Iridium,
- GT_ModHandler.getModItem(MOD_ID_DC, "item.IridiumItemCasing", 1L, 0));
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.IridiumItemCasing", 1L, 0));
GT_OreDictUnificator.registerOre(
OrePrefixes.itemCasing,
Materials.Titanium,
- GT_ModHandler.getModItem(MOD_ID_DC, "item.TitaniumItemCasing", 1L, 0));
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.TitaniumItemCasing", 1L, 0));
GT_OreDictUnificator.registerOre(
OrePrefixes.itemCasing,
Materials.Chrome,
- GT_ModHandler.getModItem(MOD_ID_DC, "item.ChromeItemCasing", 1L, 0));
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.ChromeItemCasing", 1L, 0));
// Fake Circuits
GT_OreDictUnificator.registerOre(
OrePrefixes.circuit,
Materials.Primitive,
- GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitULV", 1L));
- // GT_OreDictUnificator.registerOre(OrePrefixes.circuit, Materials.Basic, GT_ModHandler.getModItem(MOD_ID_DC,
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitULV", 1L));
+ // GT_OreDictUnificator.registerOre(OrePrefixes.circuit, Materials.Basic,
+ // GT_ModHandler.getModItem(NewHorizonsCoreMod.modID,
// "item.CircuitLV", 1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.circuit,
Materials.Good,
- GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitMV", 1L));
- // GT_OreDictUnificator.registerOre(OrePrefixes.circuit, Materials.Advanced, GT_ModHandler.getModItem(MOD_ID_DC,
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitMV", 1L));
+ // GT_OreDictUnificator.registerOre(OrePrefixes.circuit, Materials.Advanced,
+ // GT_ModHandler.getModItem(NewHorizonsCoreMod.modID,
// "item.CircuitHV", 1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.circuit,
Materials.Data,
- GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitEV", 1L));
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitEV", 1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.circuit,
Materials.Elite,
- GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitIV", 1L));
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitIV", 1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.circuit,
Materials.Master,
- GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitLuV", 1L));
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitLuV", 1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.circuit,
Materials.Ultimate,
- GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitZPM", 1L));
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitZPM", 1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.circuit,
Materials.Superconductor,
- GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitUV", 1L));
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitUV", 1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.circuit,
Materials.Infinite,
- GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitUHV", 1L));
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitUHV", 1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.circuit,
Materials.Bio,
- GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitUEV", 1L));
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitUEV", 1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.circuit,
Materials.Optical,
- GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitUIV", 1L));
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitUIV", 1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.circuit,
Materials.Exotic,
- GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitUMV", 1L));
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitUMV", 1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.circuit,
Materials.Cosmic,
- GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitUXV", 1L));
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitUXV", 1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.circuit,
Materials.Transcendent,
- GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitMAX", 1L));
+ GT_ModHandler.getModItem(NewHorizonsCoreMod.modID, "item.CircuitMAX", 1L));
GT_OreDictUnificator.registerOre(
OrePrefixes.block,
diff --git a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java
index a9e6f80da7..0d1c8f33a3 100644
--- a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java
+++ b/src/main/java/gregtech/loaders/preload/GT_PreLoad.java
@@ -1,8 +1,7 @@
package gregtech.loaders.preload;
import static gregtech.GT_Mod.GT_FML_LOGGER;
-import static gregtech.api.enums.GT_Values.MOD_ID_AE;
-import static gregtech.api.enums.GT_Values.MOD_ID_GTPP;
+import static gregtech.api.enums.ModIDs.*;
import java.io.BufferedReader;
import java.io.File;
@@ -119,14 +118,14 @@ public class GT_PreLoad {
}
public static void initCompat() {
- GregTech_API.mIC2Classic = Loader.isModLoaded("IC2-Classic-Spmod");
- GregTech_API.mGTPlusPlus = Loader.isModLoaded(MOD_ID_GTPP);
- GregTech_API.mTranslocator = Loader.isModLoaded("Translocator");
- GregTech_API.mTConstruct = Loader.isModLoaded("TConstruct");
- GregTech_API.mGalacticraft = Loader.isModLoaded("GalacticraftCore");
- GregTech_API.mAE2 = Loader.isModLoaded(MOD_ID_AE);
- GregTech_API.mHodgepodge = Loader.isModLoaded("hodgepodge");
- GregTech_API.mEternalSingularity = Loader.isModLoaded("eternalsingularity");
+ GregTech_API.mIC2Classic = IndustrialCraft2Classic.isModLoaded();
+ GregTech_API.mGTPlusPlus = GTPlusPlus.isModLoaded();
+ GregTech_API.mTranslocator = Translocator.isModLoaded();
+ GregTech_API.mTConstruct = TinkerConstruct.isModLoaded();
+ GregTech_API.mGalacticraft = GalacticraftCore.isModLoaded();
+ GregTech_API.mAE2 = AppliedEnergistics2.isModLoaded();
+ GregTech_API.mHodgepodge = HodgePodge.isModLoaded();
+ GregTech_API.mEternalSingularity = EternalSingularity.isModLoaded();
}
public static void createLogFiles(File parentFile, Configuration tMainConfig) {
@@ -187,7 +186,7 @@ public class GT_PreLoad {
}
public static void runMineTweakerCompat() {
- if (!Loader.isModLoaded("MineTweaker3")) return;
+ if (!CraftTweaker.isModLoaded()) return;
GT_FML_LOGGER.info("preReader");
final List<String> oreTags = new ArrayList<>();
@@ -614,7 +613,7 @@ public class GT_PreLoad {
GT_Mod.gregtechproxy.mUndergroundOil.getConfig(tMainConfig, "undergroundfluid");
GT_Mod.gregtechproxy.mEnableCleanroom = tMainConfig.get("general", "EnableCleanroom", true).getBoolean(true);
if (GT_Mod.gregtechproxy.mEnableCleanroom) GT_MetaTileEntity_Cleanroom.loadConfig(tMainConfig);
- GT_Mod.gregtechproxy.mLowGravProcessing = Loader.isModLoaded(GT_Values.MOD_ID_GC_CORE)
+ GT_Mod.gregtechproxy.mLowGravProcessing = GalacticraftCore.isModLoaded()
&& tMainConfig.get("general", "LowGravProcessing", true).getBoolean(true);
GT_Mod.gregtechproxy.mUseGreatlyShrukenReplacementList = tMainConfig
.get("general", "GTNH Optimised Material Loading", true).getBoolean(true);
@@ -633,7 +632,7 @@ public class GT_PreLoad {
GregTech_API.mEUtoRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "100EUtoRF", 360);
GregTech_API.mRFtoEU = GregTech_API.sOPStuff.get(ConfigCategories.general, "100RFtoEU", 20);
GregTech_API.mRFExplosions = GregTech_API.sOPStuff.get(ConfigCategories.general, "RFExplosions", false);
- GregTech_API.meIOLoaded = Loader.isModLoaded("EnderIO");
+ GregTech_API.meIOLoaded = EnderIO.isModLoaded();
GT_Mod.gregtechproxy.mForceFreeFace = GregTech_API.sMachineFile
.get(ConfigCategories.machineconfig, "forceFreeFace", true);
GT_Mod.gregtechproxy.mBrickedBlastFurnace = tMainConfig.get("general", "BrickedBlastFurnace", true)