From d0e4e436addaf24ea80637d468c72b358630f950 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 20 Jan 2016 19:52:38 -0600 Subject: [PATCH] MOve recipes to init and remove thaumcraft after requirement. CLoses #53 --- .../common/core/proxy/CommonProxy.java | 22 +++++++++---------- .../vazkii/botania/common/lib/LibMisc.java | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index f53c737e7..5a477c328 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -94,6 +94,17 @@ public class CommonProxy { ModPotions.init(); ModBrews.init(); + ModAchievements.init(); + ModMultiblocks.init(); + ModBanners.init(); + + ChestGenHandler.init(); + + if(Botania.gardenOfGlassLoaded) + new WorldTypeSkyblock(); + } + + public void init(FMLInitializationEvent event) { ModCraftingRecipes.init(); ModPetalRecipes.init(); ModPureDaisyRecipes.init(); @@ -103,19 +114,8 @@ public class CommonProxy { ModManaInfusionRecipes.init(); ModElvenTradeRecipes.init(); ModBrewRecipes.init(); - ModAchievements.init(); - ModMultiblocks.init(); - ModBanners.init(); - - ChestGenHandler.init(); - LexiconData.init(); - if(Botania.gardenOfGlassLoaded) - new WorldTypeSkyblock(); - } - - public void init(FMLInitializationEvent event) { NetworkRegistry.INSTANCE.registerGuiHandler(Botania.instance, new GuiHandler()); MinecraftForge.TERRAIN_GEN_BUS.register(new BiomeDecorationHandler()); diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 597fdb274..f09bd0c0b 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -19,7 +19,7 @@ public final class LibMisc { public static final String MOD_NAME = MOD_ID; public static final String BUILD = "GRADLE:BUILD"; public static final String VERSION = "GRADLE:VERSION-" + BUILD; - public static final String DEPENDENCIES = "required-after:Baubles;after:Thaumcraft"; + public static final String DEPENDENCIES = "required-after:Baubles"; public static final String MC_VERSIONS = "[1.8.8,1.8.9]"; // Network Contants