From 517bf59569d98b8f45896fbe02364060ef4d3b5f Mon Sep 17 00:00:00 2001 From: Adrian Bergqvist Date: Thu, 12 Jan 2023 18:53:09 +0100 Subject: [PATCH] Cast to ChannelInitializer for improved compatibility --- src/main/java/org/adde0109/ambassador/Ambassador.java | 6 +++--- .../velocity/VelocityBackendChannelInitializer.java | 4 ++-- .../velocity/VelocityServerChannelInitializer.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/adde0109/ambassador/Ambassador.java b/src/main/java/org/adde0109/ambassador/Ambassador.java index 8ef417b..be7058e 100644 --- a/src/main/java/org/adde0109/ambassador/Ambassador.java +++ b/src/main/java/org/adde0109/ambassador/Ambassador.java @@ -25,7 +25,7 @@ import org.slf4j.Logger; import java.nio.file.Path; -@Plugin(id = "ambassador", name = "Ambassador", version = "1.1.5B-alpha", authors = {"adde0109"}) +@Plugin(id = "ambassador", name = "Ambassador", version = "1.1.7-alpha", authors = {"adde0109"}) public class Ambassador { public ProxyServer server; @@ -62,10 +62,10 @@ public class Ambassador { cmField.setAccessible(true); ChannelInitializer original = ((ConnectionManager) cmField.get(server)).serverChannelInitializer.get(); - ((ConnectionManager) cmField.get(server)).serverChannelInitializer.set(new VelocityServerChannelInitializer((ServerChannelInitializer) original,(VelocityServer) server)); + ((ConnectionManager) cmField.get(server)).serverChannelInitializer.set(new VelocityServerChannelInitializer(original,(VelocityServer) server)); ChannelInitializer originalBackend = ((ConnectionManager) cmField.get(server)).backendChannelInitializer.get(); - ((ConnectionManager) cmField.get(server)).backendChannelInitializer.set(new VelocityBackendChannelInitializer((BackendChannelInitializer) originalBackend,(VelocityServer) server)); + ((ConnectionManager) cmField.get(server)).backendChannelInitializer.set(new VelocityBackendChannelInitializer(originalBackend,(VelocityServer) server)); } private void initMetrics() { diff --git a/src/main/java/org/adde0109/ambassador/velocity/VelocityBackendChannelInitializer.java b/src/main/java/org/adde0109/ambassador/velocity/VelocityBackendChannelInitializer.java index 62d3033..711acda 100644 --- a/src/main/java/org/adde0109/ambassador/velocity/VelocityBackendChannelInitializer.java +++ b/src/main/java/org/adde0109/ambassador/velocity/VelocityBackendChannelInitializer.java @@ -14,7 +14,7 @@ public class VelocityBackendChannelInitializer extends BackendChannelInitializer private static final Method INIT_CHANNEL; - private final BackendChannelInitializer delegate; + private final ChannelInitializer delegate; private final VelocityServer server; static { @@ -26,7 +26,7 @@ public class VelocityBackendChannelInitializer extends BackendChannelInitializer } } - public VelocityBackendChannelInitializer(BackendChannelInitializer delegate, VelocityServer server) { + public VelocityBackendChannelInitializer(ChannelInitializer delegate, VelocityServer server) { super(server); this.delegate = delegate; this.server = server; diff --git a/src/main/java/org/adde0109/ambassador/velocity/VelocityServerChannelInitializer.java b/src/main/java/org/adde0109/ambassador/velocity/VelocityServerChannelInitializer.java index c92c25e..825802a 100644 --- a/src/main/java/org/adde0109/ambassador/velocity/VelocityServerChannelInitializer.java +++ b/src/main/java/org/adde0109/ambassador/velocity/VelocityServerChannelInitializer.java @@ -15,7 +15,7 @@ import java.lang.reflect.Method; public class VelocityServerChannelInitializer extends ServerChannelInitializer { private static final Method INIT_CHANNEL; - private final ServerChannelInitializer delegate; + private final ChannelInitializer delegate; static { try { @@ -26,7 +26,7 @@ public class VelocityServerChannelInitializer extends ServerChannelInitializer { } } - public VelocityServerChannelInitializer(ServerChannelInitializer delegate,VelocityServer server) { + public VelocityServerChannelInitializer(ChannelInitializer delegate,VelocityServer server) { super(server); this.delegate = delegate; }