aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/goodgenerator/crossmod
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/goodgenerator/crossmod')
-rw-r--r--src/main/java/goodgenerator/crossmod/LoadedList.java2
-rw-r--r--src/main/java/goodgenerator/crossmod/thaumcraft/Research.java6
2 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/goodgenerator/crossmod/LoadedList.java b/src/main/java/goodgenerator/crossmod/LoadedList.java
index f3921f64b8..372b3004ab 100644
--- a/src/main/java/goodgenerator/crossmod/LoadedList.java
+++ b/src/main/java/goodgenerator/crossmod/LoadedList.java
@@ -7,11 +7,13 @@ public class LoadedList {
public static boolean GTPP;
public static boolean GTNH_CORE;
public static boolean BOTDUSTRIES;
+ public static boolean EXTRA_CELLS;
public static void init() {
GTPP = Loader.isModLoaded("miscutils");
GTNH_CORE = Loader.isModLoaded("dreamcraft");
BOTDUSTRIES = Loader.isModLoaded("botdustries");
+ EXTRA_CELLS = Loader.isModLoaded("extracells");
}
}
diff --git a/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java b/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java
index 2eb3a4dbc0..123223872e 100644
--- a/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java
+++ b/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java
@@ -1,11 +1,11 @@
package goodgenerator.crossmod.thaumcraft;
+import goodgenerator.crossmod.LoadedList;
import goodgenerator.items.MyMaterial;
import goodgenerator.util.DescTextLocalization;
import goodgenerator.util.ItemRefer;
import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry;
import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
-import cpw.mods.fml.common.Loader;
import gregtech.api.GregTech_API;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
@@ -220,7 +220,7 @@ public class Research{
}
);
ItemStack broad = new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6);
- if (Loader.isModLoaded("dreamcraft")) broad = GT_ModHandler.getModItem("dreamcraft", "item.ArcaneSlate", 1);
+ if (LoadedList.GTNH_CORE) broad = GT_ModHandler.getModItem("dreamcraft", "item.ArcaneSlate", 1);
GregTech_API.sThaumcraftCompat.addResearch(
"ESSENTIA_UPGRADE_BLANK",
"Upgrade your generator",
@@ -375,7 +375,7 @@ public class Research{
}
);
ItemStack meatDust = GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 1);
- if (Loader.isModLoaded("dreamcraft")) meatDust = GT_ModHandler.getModItem("dreamcraft", "GTNHBioItems", 1, 2);
+ if (LoadedList.GTNH_CORE) meatDust = GT_ModHandler.getModItem("dreamcraft", "GTNHBioItems", 1, 2);
GregTech_API.sThaumcraftCompat.addResearch(
"ESSENTIA_UPGRADE_VICTUS",
"Essentia: VICTUS",