R3944Realms/Ambassador
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed ChannelInitializers to be more compatible

Browse Source
This commit is contained in:
Adrian Bergqvist 2023-06-06 00:24:35 +02:00
parent 9c5f49f6e9
commit 07547130be
No known key found for this signature in database
GPG Key ID: FAE7D8EDE225E686
4 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -5,7 +5,7 @@ plugins {
} }
group = "org.adde0109" group = "org.adde0109"
version = "1.4.0-beta-rc7" version = "1.4.0-beta-rc8"
repositories { repositories {
mavenCentral() mavenCentral()

11
src/main/java/org/adde0109/ambassador/Ambassador.java
View File

@ -37,10 +37,9 @@ import java.nio.file.Path;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_19; import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_19;
import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_19_3;
import static com.velocitypowered.proxy.protocol.packet.brigadier.ArgumentIdentifier.mapSet; import static com.velocitypowered.proxy.protocol.packet.brigadier.ArgumentIdentifier.mapSet;
@Plugin(id = "ambassador", name = "Ambassador", version = "1.4.0-beta-rc7", authors = {"adde0109"}) @Plugin(id = "ambassador", name = "Ambassador", version = "1.4.0-beta-rc8", authors = {"adde0109"})
public class Ambassador { public class Ambassador {
public ProxyServer server; public ProxyServer server;
@ -104,11 +103,11 @@ public class Ambassador {
Field cmField = VelocityServer.class.getDeclaredField("cm"); Field cmField = VelocityServer.class.getDeclaredField("cm");
cmField.setAccessible(true); cmField.setAccessible(true);
ChannelInitializer<?> original = ((ConnectionManager) cmField.get(server)).serverChannelInitializer.get(); ChannelInitializer<?> original = ((ConnectionManager) cmField.get(server)).getServerChannelInitializer().get();
((ConnectionManager) cmField.get(server)).serverChannelInitializer.set(new VelocityServerChannelInitializer(original,(VelocityServer) server)); ((ConnectionManager) cmField.get(server)).getServerChannelInitializer().set(new VelocityServerChannelInitializer(original,(VelocityServer) server));
ChannelInitializer<?> originalBackend = ((ConnectionManager) cmField.get(server)).backendChannelInitializer.get(); ChannelInitializer<?> originalBackend = ((ConnectionManager) cmField.get(server)).getBackendChannelInitializer().get();
((ConnectionManager) cmField.get(server)).backendChannelInitializer.set(new VelocityBackendChannelInitializer(originalBackend,(VelocityServer) server)); ((ConnectionManager) cmField.get(server)).getBackendChannelInitializer().set(new VelocityBackendChannelInitializer(originalBackend,(VelocityServer) server));
Method argumentRegistry = ArgumentPropertyRegistry.class.getDeclaredMethod("register", ArgumentIdentifier.class, Class.class, ArgumentPropertySerializer.class); Method argumentRegistry = ArgumentPropertyRegistry.class.getDeclaredMethod("register", ArgumentIdentifier.class, Class.class, ArgumentPropertySerializer.class);
argumentRegistry.setAccessible(true); argumentRegistry.setAccessible(true);

17
src/main/java/org/adde0109/ambassador/velocity/VelocityBackendChannelInitializer.java
View File

@ -13,24 +13,21 @@ import java.lang.reflect.Method;
public class VelocityBackendChannelInitializer extends BackendChannelInitializer { public class VelocityBackendChannelInitializer extends BackendChannelInitializer {
private static final Method INIT_CHANNEL; private Method INIT_CHANNEL;
private final ChannelInitializer<?> delegate; private final ChannelInitializer<?> delegate;
private final VelocityServer server; private final VelocityServer server;
static {
try {
INIT_CHANNEL = ChannelInitializer.class.getDeclaredMethod("initChannel", Channel.class);
INIT_CHANNEL.setAccessible(true);
} catch (ReflectiveOperationException e) {
throw new RuntimeException(e);
}
}
public VelocityBackendChannelInitializer(ChannelInitializer<?> delegate, VelocityServer server) { public VelocityBackendChannelInitializer(ChannelInitializer<?> delegate, VelocityServer server) {
super(server); super(server);
this.delegate = delegate; this.delegate = delegate;
this.server = server; this.server = server;
try {
INIT_CHANNEL = delegate.getClass().getDeclaredMethod("initChannel", Channel.class);
INIT_CHANNEL.setAccessible(true);
} catch (ReflectiveOperationException e) {
throw new RuntimeException(e);
}
} }
@Override @Override

28
src/main/java/org/adde0109/ambassador/velocity/VelocityServerChannelInitializer.java
View File

@ -14,22 +14,19 @@ import org.jetbrains.annotations.NotNull;
import java.lang.reflect.Method; import java.lang.reflect.Method;
public class VelocityServerChannelInitializer extends ServerChannelInitializer { public class VelocityServerChannelInitializer extends ServerChannelInitializer {
private static final Method INIT_CHANNEL; private Method INIT_CHANNEL;
private final ChannelInitializer<?> delegate; private final ChannelInitializer<?> delegate;
static {
try {
INIT_CHANNEL = ChannelInitializer.class.getDeclaredMethod("initChannel", Channel.class);
INIT_CHANNEL.setAccessible(true);
} catch (ReflectiveOperationException e) {
throw new RuntimeException(e);
}
}
public VelocityServerChannelInitializer(ChannelInitializer<?> delegate,VelocityServer server) { public VelocityServerChannelInitializer(ChannelInitializer<?> delegate,VelocityServer server) {
super(server); super(server);
this.delegate = delegate; this.delegate = delegate;
try {
INIT_CHANNEL = delegate.getClass().getDeclaredMethod("initChannel", Channel.class);
INIT_CHANNEL.setAccessible(true);
} catch (ReflectiveOperationException e) {
throw new RuntimeException(e);
}
} }
@Override @Override
@ -39,9 +36,12 @@ public class VelocityServerChannelInitializer extends ServerChannelInitializer {
} catch (ReflectiveOperationException e) { } catch (ReflectiveOperationException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
ChannelHandler handler = ch.pipeline().get(Connections.HANDLER); finally {
if (!(handler instanceof final MinecraftConnection connection)) throw new RuntimeException("plugin conflict"); if (ch.pipeline().get(MinecraftConnection.class) == null)
HandshakeSessionHandler originalSessionHandler = (HandshakeSessionHandler) connection.getSessionHandler(); super.initChannel(ch);
connection.setSessionHandler(new VelocityHandshakeSessionHandler(originalSessionHandler, connection)); MinecraftConnection handler = ch.pipeline().get(MinecraftConnection.class);
HandshakeSessionHandler originalSessionHandler = (HandshakeSessionHandler) handler.getSessionHandler();
handler.setSessionHandler(new VelocityHandshakeSessionHandler(originalSessionHandler, handler));
}
} }
} }