diff --git a/src/main/java/slimeknights/mantle/Mantle.java b/src/main/java/slimeknights/mantle/Mantle.java index d72d414..0e1dc55 100644 --- a/src/main/java/slimeknights/mantle/Mantle.java +++ b/src/main/java/slimeknights/mantle/Mantle.java @@ -47,8 +47,6 @@ public class Mantle { @Mod.EventHandler public void postInit(FMLPostInitializationEvent event) { - if(event.getSide().isClient()) { - MinecraftForge.EVENT_BUS.register(new ExtraHeartRenderHandler()); - } + proxy.postInit(); } } diff --git a/src/main/java/slimeknights/mantle/client/ClientProxy.java b/src/main/java/slimeknights/mantle/client/ClientProxy.java index cfabbca..f31693a 100644 --- a/src/main/java/slimeknights/mantle/client/ClientProxy.java +++ b/src/main/java/slimeknights/mantle/client/ClientProxy.java @@ -1,11 +1,31 @@ package slimeknights.mantle.client; +import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.IReloadableResourceManager; +import net.minecraftforge.common.MinecraftForge; + +import java.awt.print.Book; + import slimeknights.mantle.client.book.BookLoader; import slimeknights.mantle.common.CommonProxy; public class ClientProxy extends CommonProxy { + + private BookLoader bookLoader; + @Override public void preInit() { - new BookLoader(); + bookLoader = new BookLoader(); + } + + @Override + public void init() { + bookLoader.onResourceManagerReload(Minecraft.getMinecraft().getResourceManager()); + } + + @Override + public void postInit() { + ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(bookLoader); + MinecraftForge.EVENT_BUS.register(new ExtraHeartRenderHandler()); } } diff --git a/src/main/java/slimeknights/mantle/client/book/BookLoader.java b/src/main/java/slimeknights/mantle/client/book/BookLoader.java index 9e88344..9570d25 100644 --- a/src/main/java/slimeknights/mantle/client/book/BookLoader.java +++ b/src/main/java/slimeknights/mantle/client/book/BookLoader.java @@ -59,8 +59,6 @@ public class BookLoader implements IResourceManagerReloadListener { private static final NetworkWrapper wrapper = new NetworkWrapper("mantle:books"); public BookLoader() { - ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(this); - wrapper.registerPacketServer(PacketUpdateSavedPage.class); // Register page types diff --git a/src/main/java/slimeknights/mantle/common/CommonProxy.java b/src/main/java/slimeknights/mantle/common/CommonProxy.java index ab788f8..de915fa 100644 --- a/src/main/java/slimeknights/mantle/common/CommonProxy.java +++ b/src/main/java/slimeknights/mantle/common/CommonProxy.java @@ -3,4 +3,8 @@ package slimeknights.mantle.common; public class CommonProxy { public void preInit() { } + + public void init() {} + + public void postInit() {} }