From 27fc2e66c9b6d33b7625d7c272ccb4df0f1aaa83 Mon Sep 17 00:00:00 2001 From: Arthur Uzulin Date: Sun, 29 Sep 2019 04:14:58 +1000 Subject: [PATCH] Fixed book network channel only registering on the client side - This fixes the inability to connect to a server even when Mantle is available on both sides --- src/main/java/slimeknights/mantle/Mantle.java | 3 +++ .../slimeknights/mantle/client/book/BookLoader.java | 8 ++------ .../java/slimeknights/mantle/network/BookNetwork.java | 11 +++++++++++ 3 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 src/main/java/slimeknights/mantle/network/BookNetwork.java diff --git a/src/main/java/slimeknights/mantle/Mantle.java b/src/main/java/slimeknights/mantle/Mantle.java index f56d41e..a3f6ff4 100644 --- a/src/main/java/slimeknights/mantle/Mantle.java +++ b/src/main/java/slimeknights/mantle/Mantle.java @@ -10,6 +10,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import slimeknights.mantle.client.ClientProxy; import slimeknights.mantle.common.ServerProxy; +import slimeknights.mantle.network.BookNetwork; /** * Mantle @@ -39,6 +40,8 @@ public class Mantle { private void preInit(final FMLCommonSetupEvent event) { proxy.preInit(); + + BookNetwork.registerPackets(); } private void init(final InterModEnqueueEvent event) { diff --git a/src/main/java/slimeknights/mantle/client/book/BookLoader.java b/src/main/java/slimeknights/mantle/client/book/BookLoader.java index 4395c86..466cfe9 100644 --- a/src/main/java/slimeknights/mantle/client/book/BookLoader.java +++ b/src/main/java/slimeknights/mantle/client/book/BookLoader.java @@ -16,7 +16,7 @@ import slimeknights.mantle.client.book.data.BookData; import slimeknights.mantle.client.book.data.content.*; import slimeknights.mantle.client.book.data.deserializer.HexStringDeserializer; import slimeknights.mantle.client.book.repository.BookRepository; -import slimeknights.mantle.network.NetworkWrapper; +import slimeknights.mantle.network.BookNetwork; import slimeknights.mantle.network.book.UpdateSavedPagePacket; import javax.annotation.Nonnull; @@ -35,11 +35,7 @@ public class BookLoader implements IResourceManagerReloadListener { /** Internal registry of all books for the purposes of the reloader, maps books to name */ private static final HashMap books = new HashMap<>(); - private static final NetworkWrapper wrapper = new NetworkWrapper("mantle:books"); - public BookLoader() { - wrapper.registerPacket(UpdateSavedPagePacket.class, UpdateSavedPagePacket::encode, UpdateSavedPagePacket::new, UpdateSavedPagePacket::handle); - // Register page types registerPageType("blank", ContentBlank.class); registerPageType("text", ContentText.class); @@ -130,7 +126,7 @@ public class BookLoader implements IResourceManagerReloadListener { } BookHelper.writeSavedPage(item, page); - wrapper.network.sendToServer(new UpdateSavedPagePacket(page)); + BookNetwork.wrapper.network.sendToServer(new UpdateSavedPagePacket(page)); } /** diff --git a/src/main/java/slimeknights/mantle/network/BookNetwork.java b/src/main/java/slimeknights/mantle/network/BookNetwork.java new file mode 100644 index 0000000..29d233c --- /dev/null +++ b/src/main/java/slimeknights/mantle/network/BookNetwork.java @@ -0,0 +1,11 @@ +package slimeknights.mantle.network; + +import slimeknights.mantle.network.book.UpdateSavedPagePacket; + +public class BookNetwork { + public static final NetworkWrapper wrapper = new NetworkWrapper("mantle:books"); + + public static void registerPackets() { + wrapper.registerPacket(UpdateSavedPagePacket.class, UpdateSavedPagePacket::encode, UpdateSavedPagePacket::new, UpdateSavedPagePacket::handle); + } +}