diff --git a/src/main/java/fox/spiteful/forbidden/Forbidden.java b/src/main/java/fox/spiteful/forbidden/Forbidden.java index c5c2e07..2f6c7f9 100644 --- a/src/main/java/fox/spiteful/forbidden/Forbidden.java +++ b/src/main/java/fox/spiteful/forbidden/Forbidden.java @@ -6,6 +6,7 @@ import net.minecraft.item.Item; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; @@ -31,6 +32,8 @@ public class Forbidden { @Instance("ForbiddenMagic") public static Forbidden instance; + public static final boolean SALIS_ARCANA_LOADED = Loader.isModLoaded("salisarcana"); + public static CreativeTabs tab = new CreativeTabs("forbidden") { @Override diff --git a/src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java b/src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java index dd458d4..28b4829 100644 --- a/src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java +++ b/src/main/java/fox/spiteful/forbidden/ForbiddenRecipes.java @@ -446,7 +446,11 @@ public class ForbiddenRecipes { } }); - OreDictionary - .registerOre("logWood", new ItemStack(ConfigBlocks.blockMagicalLog, 1, OreDictionary.WILDCARD_VALUE)); + // Salis Arcana registers this entry itself. + if (!Forbidden.SALIS_ARCANA_LOADED) { + OreDictionary.registerOre( + "logWood", + new ItemStack(ConfigBlocks.blockMagicalLog, 1, OreDictionary.WILDCARD_VALUE)); + } } }