This commit is contained in:
modmuss50 2015-11-22 10:27:33 +00:00
parent d928472d84
commit 48a7f1cc6d
2 changed files with 13 additions and 5 deletions

View file

@ -18,6 +18,7 @@ public class CompatManager {
public static boolean isIC2Loaded = false;
public static boolean isIC2ClassicLoaded = false;
public static boolean isClassicEnet = false;
public static boolean isGrecgTechLoaded = false;
public CompatManager() {
isIC2Loaded = Loader.isModLoaded("IC2");
@ -28,6 +29,9 @@ public class CompatManager {
if(Loader.isModLoaded("Uncomplication")){
isClassicEnet = true;
}
if(Loader.isModLoaded("gregtech")){
isGrecgTechLoaded = true;
}
registerCompact(CompatModuleWaila.class, "Waila");
registerCompact(RecipesIC2.class, "IC2");

View file

@ -27,6 +27,7 @@ import techreborn.api.reactor.FusionReactorRecipe;
import techreborn.api.reactor.FusionReactorRecipeHelper;
import techreborn.api.recipe.RecipeHandler;
import techreborn.api.recipe.machines.*;
import techreborn.compat.CompatManager;
import techreborn.compat.ICompatModule;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModBlocks;
@ -1217,12 +1218,15 @@ public class RecipesIC2 implements ICompatModule {
}
}
if (!IC2Classic.isIc2ClassicLoaded() && OreUtil.doesOreExistAndValid("oreRedstone")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreRedstone"), null, new ItemStack(Items.redstone, 10));
}
if (OreUtil.doesOreExistAndValid("oreLapis")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreLapis"), null, ItemDusts.getDustByName("lapis", 12));
if(!Loader.isModLoaded("gregtech")){
if (!IC2Classic.isIc2ClassicLoaded() && OreUtil.doesOreExistAndValid("oreRedstone")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreRedstone"), null, new ItemStack(Items.redstone, 9));
}
if (OreUtil.doesOreExistAndValid("oreLapis")) {
Recipes.macerator.addRecipe(new RecipeInputOreDict("oreLapis"), null, ItemDusts.getDustByName("lapis", 9));
}
}
if (OreUtil.doesOreExistAndValid("oreTeslatite")) {
ItemStack teslatiteStack = OreDictionary.getOres("dustTeslatite").get(0);
teslatiteStack.stackSize = 10;