mirror of
https://github.com/GTNewHorizons/ForbiddenMagic.git
synced 2026-11-19 03:39:08 +00:00
Register the wildcard magical log ore dictionary entry only without Salis Arcana
This commit is contained in:
2 files changed
+9
-2
No files matched your search
@@ -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
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user