GeyserMC-Mirror/Floodgate
1
0
Fork 0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2025-12-19 14:59:20 +00:00
Code Issues Releases Activity

Add support for latest Velocity changes

Browse Source
This commit is contained in:
Tim203
2024-01-18 22:40:56 +01:00
parent 2876c57768
commit 94eabd7015
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityProxyDataHandler.java
View File

@@ -27,6 +27,7 @@ package org.geysermc.floodgate.addon.data;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static org.geysermc.floodgate.util.ReflectionUtils.getCastedValue; import static org.geysermc.floodgate.util.ReflectionUtils.getCastedValue;
import static org.geysermc.floodgate.util.ReflectionUtils.getClassOrFallbackPrefixed;
import static org.geysermc.floodgate.util.ReflectionUtils.getField; import static org.geysermc.floodgate.util.ReflectionUtils.getField;
import static org.geysermc.floodgate.util.ReflectionUtils.getMethodByName; import static org.geysermc.floodgate.util.ReflectionUtils.getMethodByName;
import static org.geysermc.floodgate.util.ReflectionUtils.getPrefixedClass; import static org.geysermc.floodgate.util.ReflectionUtils.getPrefixedClass;
@@ -63,7 +64,10 @@ public final class VelocityProxyDataHandler extends CommonDataHandler {
HANDSHAKE = getField(iic, "handshake"); HANDSHAKE = getField(iic, "handshake");
checkNotNull(HANDSHAKE, "Handshake field cannot be null"); checkNotNull(HANDSHAKE, "Handshake field cannot be null");
HANDSHAKE_PACKET = getPrefixedClass("protocol.packet.Handshake"); HANDSHAKE_PACKET = getClassOrFallbackPrefixed(
"protocol.packet.HandshakePacket",
"protocol.packet.Handshake"
);
checkNotNull(HANDSHAKE_PACKET, "Handshake packet class cannot be null"); checkNotNull(HANDSHAKE_PACKET, "Handshake packet class cannot be null");
HANDSHAKE_SERVER_ADDRESS = getField(HANDSHAKE_PACKET, "serverAddress"); HANDSHAKE_SERVER_ADDRESS = getField(HANDSHAKE_PACKET, "serverAddress");
@@ -73,7 +77,10 @@ public final class VelocityProxyDataHandler extends CommonDataHandler {
REMOTE_ADDRESS = getField(minecraftConnection, "remoteAddress"); REMOTE_ADDRESS = getField(minecraftConnection, "remoteAddress");
checkNotNull(REMOTE_ADDRESS, "remoteAddress cannot be null"); checkNotNull(REMOTE_ADDRESS, "remoteAddress cannot be null");
SERVER_LOGIN_PACKET = getPrefixedClass("protocol.packet.ServerLogin"); SERVER_LOGIN_PACKET = getClassOrFallbackPrefixed(
"protocol.packet.ServerLoginPacket",
"protocol.packet.ServerLogin"
);
checkNotNull(SERVER_LOGIN_PACKET, "ServerLogin packet class cannot be null"); checkNotNull(SERVER_LOGIN_PACKET, "ServerLogin packet class cannot be null");

6
velocity/src/main/java/org/geysermc/floodgate/addon/data/VelocityServerDataHandler.java
View File

@@ -28,6 +28,7 @@ package org.geysermc.floodgate.addon.data;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static org.geysermc.floodgate.util.ReflectionUtils.castedInvoke; import static org.geysermc.floodgate.util.ReflectionUtils.castedInvoke;
import static org.geysermc.floodgate.util.ReflectionUtils.getCastedValue; import static org.geysermc.floodgate.util.ReflectionUtils.getCastedValue;
import static org.geysermc.floodgate.util.ReflectionUtils.getClassOrFallbackPrefixed;
import static org.geysermc.floodgate.util.ReflectionUtils.getField; import static org.geysermc.floodgate.util.ReflectionUtils.getField;
import static org.geysermc.floodgate.util.ReflectionUtils.getMethod; import static org.geysermc.floodgate.util.ReflectionUtils.getMethod;
import static org.geysermc.floodgate.util.ReflectionUtils.getPrefixedClass; import static org.geysermc.floodgate.util.ReflectionUtils.getPrefixedClass;
@@ -55,7 +56,10 @@ public final class VelocityServerDataHandler extends ChannelOutboundHandlerAdapt
private static final Method GET_PLAYER; private static final Method GET_PLAYER;
static { static {
HANDSHAKE_PACKET = getPrefixedClass("protocol.packet.Handshake"); HANDSHAKE_PACKET = getClassOrFallbackPrefixed(
"protocol.packet.HandshakePacket",
"protocol.packet.Handshake"
);
checkNotNull(HANDSHAKE_PACKET, "Handshake packet class cannot be null"); checkNotNull(HANDSHAKE_PACKET, "Handshake packet class cannot be null");
HANDSHAKE_ADDRESS = getField(HANDSHAKE_PACKET, "serverAddress"); HANDSHAKE_ADDRESS = getField(HANDSHAKE_PACKET, "serverAddress");