diff --git a/src/main/java/fox/spiteful/avaritia/Config.java b/src/main/java/fox/spiteful/avaritia/Config.java index 83fac59..b7fc335 100644 --- a/src/main/java/fox/spiteful/avaritia/Config.java +++ b/src/main/java/fox/spiteful/avaritia/Config.java @@ -38,6 +38,8 @@ public class Config { public static boolean witch = true; public static boolean rotisserie = true; + public static boolean alfheim = false; + public static boolean copper = true; public static boolean tin = true; public static boolean silver = true; @@ -86,6 +88,8 @@ public class Config { witch = conf.get("compatibility", "Witchery", true).getBoolean(true); rotisserie = conf.get("compatibility", "Rotarycraft", true).getBoolean(true); + alfheim = conf.get("compatibility", "Alfheim", false).getBoolean(false); + conf.addCustomCategoryComment("materials", "Disable to stop using that material in recipes. Useful if a mod adds unobtainable placeholder ores."); copper = conf.get("materials", "Copper", true).getBoolean(true); tin = conf.get("materials", "Tin", true).getBoolean(true); diff --git a/src/main/java/fox/spiteful/avaritia/compat/botania/Tsundere.java b/src/main/java/fox/spiteful/avaritia/compat/botania/Tsundere.java index 12c7305..6b78168 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/botania/Tsundere.java +++ b/src/main/java/fox/spiteful/avaritia/compat/botania/Tsundere.java @@ -2,6 +2,7 @@ package fox.spiteful.avaritia.compat.botania; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.registry.GameRegistry; +import fox.spiteful.avaritia.Config; import fox.spiteful.avaritia.blocks.LudicrousBlocks; import fox.spiteful.avaritia.compat.Compat; import fox.spiteful.avaritia.compat.botania.alfheim.Alfheim; @@ -35,7 +36,8 @@ public class Tsundere { Grinder.catalyst.getInput().add(terra); Grinder.catalyst.getInput().add(gaia); - Alfheim.vacationTime(); + if(Config.alfheim) + Alfheim.vacationTime(); BotaniaAPI.registerSubTile("asgardandelion", SubTileCheaty.class); BotaniaAPI.registerSubTileSignature(SubTileCheaty.class, new Signature("asgardandelion")); diff --git a/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/Alfheim.java b/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/Alfheim.java index 63978f2..dbebf01 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/Alfheim.java +++ b/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/Alfheim.java @@ -8,10 +8,12 @@ import cpw.mods.fml.common.FMLCommonHandler; public class Alfheim { public static void vacationTime() { AlfheimBlocks.alfheimify(); - - AlfheimEvents alfevents = new AlfheimEvents(); - FMLCommonHandler.instance().bus().register(alfevents); - MinecraftForge.EVENT_BUS.register(alfevents); + + if(FMLCommonHandler.instance().getSide().isClient()) { + AlfheimEvents alfevents = new AlfheimEvents(); + FMLCommonHandler.instance().bus().register(alfevents); + MinecraftForge.EVENT_BUS.register(alfevents); + } } // this stuff needs to happen whether or not botania is active it seems D: