From da984227b1cdcc9f6d522c1671bfda37f662b223 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Fri, 3 Apr 2020 21:35:05 +0800 Subject: [PATCH] Use Netty Default Object Decoder/Encoder --- .../forge/screens/home/settings/VSubmenuPreferences.java | 4 ++-- .../src/forge/screens/settings/SettingsPage.java | 4 ++-- forge-gui/src/main/java/forge/net/client/FGameClient.java | 8 ++++---- .../src/main/java/forge/net/server/FServerManager.java | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java index 1f5b9e14dae..797a54208ea 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuPreferences.java @@ -292,8 +292,8 @@ public enum VSubmenuPreferences implements IVSubmenu { pnlPrefs.add(cbEnableUnknownCards, titleConstraints); pnlPrefs.add(new NoteLabel("Enable Unknown Cards to be loaded to Unknown Set. (Requires restart)"), descriptionConstraints); - pnlPrefs.add(cbUseElsa, titleConstraints); - pnlPrefs.add(new NoteLabel("Use ELSA Serializer for Network (EXPERIMENTAL Option, Requires restart)"), descriptionConstraints); + /*pnlPrefs.add(cbUseElsa, titleConstraints); + pnlPrefs.add(new NoteLabel("Use ELSA Serializer for Network (EXPERIMENTAL Option, Requires restart)"), descriptionConstraints);*/ // Graphic Options pnlPrefs.add(new SectionLabel(localizer.getMessage("GraphicOptions")), sectionConstraints + ", gaptop 2%"); diff --git a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java index 3b2548cf2af..6ffc68c2412 100644 --- a/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java +++ b/forge-gui-mobile/src/forge/screens/settings/SettingsPage.java @@ -240,10 +240,10 @@ public class SettingsPage extends TabPage { "Enable Unknown Cards", "Enable Unknown Cards to be loaded to Unknown Set. (Requires restart)"), 3); - lstSettings.addItem(new BooleanSetting(FPref.UI_USE_ELSA, + /*lstSettings.addItem(new BooleanSetting(FPref.UI_USE_ELSA, "Use ELSA Serializer", "Use ELSA Serializer for Network (EXPERIMENTAL Option, Requires restart)"), - 3); + 3);*/ //Graphic Options lstSettings.addItem(new BooleanSetting(FPref.UI_ENABLE_ONLINE_IMAGE_FETCHER, diff --git a/forge-gui/src/main/java/forge/net/client/FGameClient.java b/forge-gui/src/main/java/forge/net/client/FGameClient.java index 148118df536..44a1a7d79d5 100644 --- a/forge-gui/src/main/java/forge/net/client/FGameClient.java +++ b/forge-gui/src/main/java/forge/net/client/FGameClient.java @@ -1,7 +1,5 @@ package forge.net.client; -import forge.net.CustomObjectDecoder; -import forge.net.CustomObjectEncoder; import io.netty.bootstrap.Bootstrap; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; @@ -28,6 +26,8 @@ import forge.net.event.IdentifiableNetEvent; import forge.net.event.LobbyUpdateEvent; import forge.net.event.MessageEvent; import forge.net.event.NetEvent; +import io.netty.handler.codec.serialization.ObjectDecoder; +import io.netty.handler.codec.serialization.ObjectEncoder; public class FGameClient implements IToServer { @@ -58,8 +58,8 @@ public class FGameClient implements IToServer { public void initChannel(final SocketChannel ch) throws Exception { final ChannelPipeline pipeline = ch.pipeline(); pipeline.addLast( - new CustomObjectEncoder(), - new CustomObjectDecoder(CustomObjectDecoder.maxObjectsize, ClassResolvers.cacheDisabled(null)), + new ObjectEncoder(), + new ObjectDecoder(9766*1024, ClassResolvers.cacheDisabled(null)), new MessageHandler(), new LobbyUpdateHandler(), new GameClientHandler(FGameClient.this)); diff --git a/forge-gui/src/main/java/forge/net/server/FServerManager.java b/forge-gui/src/main/java/forge/net/server/FServerManager.java index beb3887d4c2..68e4f7d1bbd 100644 --- a/forge-gui/src/main/java/forge/net/server/FServerManager.java +++ b/forge-gui/src/main/java/forge/net/server/FServerManager.java @@ -6,8 +6,6 @@ import forge.interfaces.IGuiGame; import forge.interfaces.ILobbyListener; import forge.match.LobbySlot; import forge.match.LobbySlotType; -import forge.net.CustomObjectDecoder; -import forge.net.CustomObjectEncoder; import forge.net.event.LobbyUpdateEvent; import forge.net.event.LoginEvent; import forge.net.event.LogoutEvent; @@ -26,6 +24,8 @@ import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.nio.NioServerSocketChannel; import io.netty.handler.codec.serialization.ClassResolvers; +import io.netty.handler.codec.serialization.ObjectDecoder; +import io.netty.handler.codec.serialization.ObjectEncoder; import io.netty.handler.logging.LogLevel; import io.netty.handler.logging.LoggingHandler; @@ -99,8 +99,8 @@ public final class FServerManager { public final void initChannel(final SocketChannel ch) throws Exception { final ChannelPipeline p = ch.pipeline(); p.addLast( - new CustomObjectEncoder(), - new CustomObjectDecoder(CustomObjectDecoder.maxObjectsize, ClassResolvers.cacheDisabled(null)), + new ObjectEncoder(), + new ObjectDecoder(9766*1024, ClassResolvers.cacheDisabled(null)), new MessageHandler(), new RegisterClientHandler(), new LobbyInputHandler(),