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
This commit is contained in:
Arthur Uzulin committed 2019-09-29 04:14:58 +10:00
1 parent 56d8289ed2
commit 27fc2e66c9
3 files changed
+16 -6

No files matched your search

@@ -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) {
@@ -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<String, BookData> 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));
}
/**
@@ -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);
}
}