From b57da716275be525f50924a61bc92d96ac2b3510 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Tue, 22 Nov 2016 22:25:46 +0100 Subject: [PATCH] Move most recipes to postInit again Closes #398 --- .../mod/ActuallyAdditions.java | 19 +++++++++---------- .../mod/booklet/InitBooklet.java | 2 -- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java index 46ea18fad..e0b07e210 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java @@ -119,6 +119,15 @@ public class ActuallyAdditions{ InitCrafting.init(); InitEntities.init(); + proxy.init(event); + + ModUtil.LOGGER.info("Initialization Finished."); + } + + @EventHandler + public void postInit(FMLPostInitializationEvent event){ + ModUtil.LOGGER.info("Starting PostInitialization Phase..."); + InitVillager.init(); ItemCoffee.initIngredients(); CrusherCrafting.init(); @@ -129,16 +138,6 @@ public class ActuallyAdditions{ EmpowererHandler.init(); InitBooklet.init(); - proxy.init(event); - - ModUtil.LOGGER.info("Initialization Finished."); - } - - @EventHandler - public void postInit(FMLPostInitializationEvent event){ - ModUtil.LOGGER.info("Starting PostInitialization Phase..."); - - InitBooklet.postInit(); proxy.postInit(event); ModUtil.LOGGER.info("PostInitialization Finished."); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java index fd56bda2e..c3db32e80 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java @@ -69,9 +69,7 @@ public final class InitBooklet{ public static void init(){ initChapters(); - } - public static void postInit(){ int chapCount = 0; int pageCount = 0; int infoCount = 0;