Skip to content

Commit

Permalink
Fix IC2 compatibility crash, Closes #549
Browse files Browse the repository at this point in the history
  • Loading branch information
rubensworks committed Apr 25, 2017
1 parent 9505d8b commit 20f1c0a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ tconstruct_version=2.4.0.jenkins320
forestry_version=5.3.0.30
BM_version=2.0.3-344-ss
EE3_version=0.3.507
IC2_version=2.7.8-ex111
IC2_version=2.7.15-ex111
jei_version=1.11.2:4.2.0.211
ie_version=0.10-57-46
enderio_version=3.0.0.40_alpha
Expand Down
8 changes: 5 additions & 3 deletions src/main/java/org/cyclops/evilcraft/modcompat/ic2/IC2.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.cyclops.evilcraft.modcompat.ic2;

import ic2.api.recipe.Recipes;
import ic2.core.recipe.RecipeInputItemStack;
import ic2.core.recipe.RecipeInputFactory;
import net.minecraft.item.ItemStack;
import org.cyclops.evilcraft.Configs;
import org.cyclops.evilcraft.block.DarkOre;
Expand All @@ -17,15 +17,17 @@
public class IC2 {

public static void registerMaceratorRecipes() {
RecipeInputFactory recipeInputFactory = new RecipeInputFactory();

// Macerator dark ore
if(Configs.isEnabled(DarkOreConfig.class) && Configs.isEnabled(DarkGemConfig.class)) {
Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(DarkOre.getInstance())), null, false,
Recipes.macerator.addRecipe(recipeInputFactory.forStack(new ItemStack(DarkOre.getInstance())), null, false,
new ItemStack(DarkGem.getInstance(), 2));
}

// Macerator dark ore -> crushed
if(Configs.isEnabled(DarkGemConfig.class) && Configs.isEnabled(DarkGemCrushedConfig.class)) {
Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(DarkGem.getInstance())), null, false,
Recipes.macerator.addRecipe(recipeInputFactory.forStack(new ItemStack(DarkGem.getInstance())), null, false,
new ItemStack(DarkGemCrushedConfig._instance.getItemInstance(), 1));
}
}
Expand Down

0 comments on commit 20f1c0a

Please sign in to comment.