From 7d61f9795c3f972d104c4b5a0f0a80c622b21f4b Mon Sep 17 00:00:00 2001 From: Robin Date: Sat, 10 Feb 2024 13:13:47 +0100 Subject: [PATCH] check find event loops in Waterfall --- .../minekube/connect/inject/bungee/BungeeInjector.java | 9 ++++++--- .../main/java/com/minekube/connect/ConnectPlatform.java | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/bungee/src/main/java/com/minekube/connect/inject/bungee/BungeeInjector.java b/bungee/src/main/java/com/minekube/connect/inject/bungee/BungeeInjector.java index 078e4bd0..f9123f42 100644 --- a/bungee/src/main/java/com/minekube/connect/inject/bungee/BungeeInjector.java +++ b/bungee/src/main/java/com/minekube/connect/inject/bungee/BungeeInjector.java @@ -97,7 +97,7 @@ public void initializeLocalChannel() { if (this.localChannel != null) { logger.warn( - "Geyser attempted to inject into the server connection handler twice! Please ensure you aren't using /reload or any plugin that (re)loads Geyser after the server has started."); + "Connect attempted to inject into the server connection handler twice! Please ensure you aren't using /reload or any plugin that (re)loads Connect after the server has started."); return; } @@ -126,8 +126,8 @@ private void initializeLocalChannel0() throws Exception { // TODO - allow Geyser to specify its own listener info properties if (proxy.getConfig().getListeners().size() != 1) { throw new UnsupportedOperationException( - "Geyser does not currently support multiple listeners with injection! " + - "Please reach out to us on our Discord at https://discord.gg/GeyserMC so we can hear feedback on your setup."); + "Connect does not currently support multiple listeners with injection! " + + "Please reach out to us on our Discord at https://minekube.com/discord so we can hear feedback on your setup."); } ListenerInfo listenerInfo = proxy.getConfig().getListeners().stream().findFirst().orElseThrow( IllegalStateException::new); @@ -149,6 +149,9 @@ private void initializeLocalChannel0() throws Exception { bossGroup = (EventLoopGroup) proxyClass.getField("bossEventLoopGroup").get(proxy); workerGroup = (EventLoopGroup) proxyClass.getField("workerEventLoopGroup").get(proxy); logger.debug("Waterfall event loop style detected."); + if (bossGroup == null || workerGroup == null) { + throw new IllegalStateException("Failed to find event loops in Waterfall"); + } } // Is currently just AttributeKey.valueOf("ListerInfo") but we might as well copy the value itself. diff --git a/core/src/main/java/com/minekube/connect/ConnectPlatform.java b/core/src/main/java/com/minekube/connect/ConnectPlatform.java index 89a428da..9e1eafc1 100644 --- a/core/src/main/java/com/minekube/connect/ConnectPlatform.java +++ b/core/src/main/java/com/minekube/connect/ConnectPlatform.java @@ -92,6 +92,7 @@ public void init( config = configLoader.load(); if (config.isDebug()) { logger.enableDebug(); + logger.debug("Debug mode enabled"); } configHolder.set(config);