diff --git a/src/main/java/net/raphimc/viaproxy/ViaProxy.java b/src/main/java/net/raphimc/viaproxy/ViaProxy.java index 4e2c4ff..d454500 100644 --- a/src/main/java/net/raphimc/viaproxy/ViaProxy.java +++ b/src/main/java/net/raphimc/viaproxy/ViaProxy.java @@ -94,10 +94,8 @@ public class ViaProxy { final boolean hasUI = args.length == 0 && !GraphicsEnvironment.isHeadless(); ConsoleHandler.hookConsole(); Logger.LOGGER.info("Initializing ViaProxy {} v{} (Injected using {})...", hasUI ? "GUI" : "CLI", VERSION, injectionMethod); + loadNetty(); saveManager = new SaveManager(); - setNettyParameters(); - MCPipeline.useOptimizedPipeline(); - c2pChannels = new DefaultChannelGroup(GlobalEventExecutor.INSTANCE); PluginManager.loadPlugins(); Thread loaderThread = new Thread(new LoaderTask(), "ViaProtocolHack-Loader"); @@ -167,14 +165,13 @@ public class ViaProxy { } } - private static void setNettyParameters() { + private static void loadNetty() { ResourceLeakDetector.setLevel(ResourceLeakDetector.Level.DISABLED); if (System.getProperty("io.netty.allocator.maxOrder") == null) { System.setProperty("io.netty.allocator.maxOrder", "9"); } - if (Options.NETTY_THREADS > 0) { - System.setProperty("io.netty.eventLoopThreads", Integer.toString(Options.NETTY_THREADS)); - } + MCPipeline.useOptimizedPipeline(); + c2pChannels = new DefaultChannelGroup(GlobalEventExecutor.INSTANCE); } } diff --git a/src/main/java/net/raphimc/viaproxy/cli/options/Options.java b/src/main/java/net/raphimc/viaproxy/cli/options/Options.java index b521644..dec4f05 100644 --- a/src/main/java/net/raphimc/viaproxy/cli/options/Options.java +++ b/src/main/java/net/raphimc/viaproxy/cli/options/Options.java @@ -45,7 +45,6 @@ public class Options { public static Account MC_ACCOUNT; // CLI only config options - public static int NETTY_THREADS = 0; public static int COMPRESSION_THRESHOLD = 256; public static boolean SRV_MODE; // Example: lenni0451.net_25565_1.8.x.viaproxy.127.0.0.1.nip.io public static boolean INTERNAL_SRV_MODE; // Example: ip\7port\7version\7mppass @@ -61,7 +60,6 @@ public class Options { final OptionSpec srvMode = parser.acceptsAll(asList("srv_mode", "srv", "s"), "Enable srv mode"); final OptionSpec iSrvMode = parser.acceptsAll(asList("internal_srv_mode", "isrv"), "Enable internal srv mode").availableUnless(srvMode); final OptionSpec onlineMode = parser.acceptsAll(asList("online_mode", "om", "o"), "Enable online mode"); - final OptionSpec nettyThreads = parser.acceptsAll(asList("netty_threads", "t"), "The amount of netty threads to use").withRequiredArg().ofType(Integer.class).defaultsTo(NETTY_THREADS); final OptionSpec compressionThreshold = parser.acceptsAll(asList("compression_threshold", "ct", "c"), "The threshold for packet compression").withRequiredArg().ofType(Integer.class).defaultsTo(COMPRESSION_THRESHOLD); final OptionSpec connectAddress = parser.acceptsAll(asList("connect_address", "target_ip", "ca", "a"), "The address of the target server").withRequiredArg().ofType(String.class).required(); final OptionSpec connectPort = parser.acceptsAll(asList("connect_port", "target_port", "cp", "p"), "The port of the target server").withRequiredArg().ofType(Integer.class); @@ -83,7 +81,6 @@ public class Options { SRV_MODE = options.has(srvMode); INTERNAL_SRV_MODE = options.has(iSrvMode); ONLINE_MODE = options.has(onlineMode); - NETTY_THREADS = options.valueOf(nettyThreads); CONNECT_ADDRESS = options.valueOf(connectAddress); PROTOCOL_VERSION = options.valueOf(version); if (options.has(connectPort)) {