MiniDay/Velocity
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Implement ProtocolState API (#1224)

Browse Source 
* Implement ProtocolState API

* Renamed method to #getProtocolState

* Added sinceMinecraft javadoc tag

* Fixed PreLoginEvent#getUniqueId documentation
This commit is contained in:
Adrian
2024-03-03 16:21:22 -05:00
committed by GitHub
parent 2c8355fc45
commit c34dafe2a2
11 changed files with 110 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
View File

@@ -33,6 +33,7 @@ import com.velocitypowered.api.event.player.KickedFromServerEvent.ServerKickResu
import com.velocitypowered.api.event.player.PlayerModInfoEvent;
import com.velocitypowered.api.event.player.PlayerSettingsChangedEvent;
import com.velocitypowered.api.event.player.ServerPreConnectEvent;
import com.velocitypowered.api.network.ProtocolState;
import com.velocitypowered.api.network.ProtocolVersion;
import com.velocitypowered.api.permission.PermissionFunction;
import com.velocitypowered.api.permission.PermissionProvider;
@@ -1170,6 +1171,11 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player,
}
}
@Override
public ProtocolState getProtocolState() {
return connection.getState().toProtocolState();
}
private final class ConnectionRequestBuilderImpl implements ConnectionRequestBuilder {
private final RegisteredServer toConnect;

10
proxy/src/main/java/com/velocitypowered/proxy/connection/client/HandshakeSessionHandler.java
View File

@@ -20,6 +20,7 @@ package com.velocitypowered.proxy.connection.client;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.velocitypowered.api.event.connection.ConnectionHandshakeEvent;
import com.velocitypowered.api.network.ProtocolState;
import com.velocitypowered.api.network.ProtocolVersion;
import com.velocitypowered.proxy.VelocityServer;
import com.velocitypowered.proxy.config.PlayerInfoForwarding;
@@ -247,9 +248,9 @@ public class HandshakeSessionHandler implements MinecraftSessionHandler {
@Override
public String toString() {
boolean isPlayerAddressLoggingEnabled = connection.server.getConfiguration()
final boolean isPlayerAddressLoggingEnabled = connection.server.getConfiguration()
.isPlayerAddressLoggingEnabled();
String playerIp =
final String playerIp =
isPlayerAddressLoggingEnabled
? this.getRemoteAddress().toString() : "<ip address withheld>";
return "[legacy connection] " + playerIp;
@@ -259,5 +260,10 @@ public class HandshakeSessionHandler implements MinecraftSessionHandler {
public MinecraftConnection getConnection() {
return connection;
}
@Override
public ProtocolState getProtocolState() {
return connection.getState().toProtocolState();
}
}
}

6
proxy/src/main/java/com/velocitypowered/proxy/connection/client/InitialInboundConnection.java
View File

@@ -17,6 +17,7 @@
package com.velocitypowered.proxy.connection.client;
import com.velocitypowered.api.network.ProtocolState;
import com.velocitypowered.api.network.ProtocolVersion;
import com.velocitypowered.api.proxy.InboundConnection;
import com.velocitypowered.proxy.connection.MinecraftConnection;
@@ -87,6 +88,11 @@ public final class InitialInboundConnection implements VelocityInboundConnection
return connection;
}
@Override
public ProtocolState getProtocolState() {
return connection.getState().toProtocolState();
}
/**
* Disconnects the connection from the server.
*

6
proxy/src/main/java/com/velocitypowered/proxy/connection/client/LoginInboundConnection.java
View File

@@ -17,6 +17,7 @@
package com.velocitypowered.proxy.connection.client;
import com.velocitypowered.api.network.ProtocolState;
import com.velocitypowered.api.network.ProtocolVersion;
import com.velocitypowered.api.proxy.LoginPhaseConnection;
import com.velocitypowered.api.proxy.crypto.IdentifiedKey;
@@ -166,4 +167,9 @@ public class LoginInboundConnection implements LoginPhaseConnection, KeyIdentifi
public IdentifiedKey getIdentifiedKey() {
return playerKey;
}
@Override
public ProtocolState getProtocolState() {
return delegate.getProtocolState();
}
}

16
proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java
View File

@@ -45,6 +45,7 @@ import static com.velocitypowered.proxy.protocol.ProtocolUtils.Direction;
import static com.velocitypowered.proxy.protocol.ProtocolUtils.Direction.CLIENTBOUND;
import static com.velocitypowered.proxy.protocol.ProtocolUtils.Direction.SERVERBOUND;
import com.velocitypowered.api.network.ProtocolState;
import com.velocitypowered.api.network.ProtocolVersion;
import com.velocitypowered.proxy.protocol.packet.AvailableCommandsPacket;
import com.velocitypowered.proxy.protocol.packet.BossBarPacket;
@@ -623,6 +624,21 @@ public enum StateRegistry {
return (direction == SERVERBOUND ? serverbound : clientbound).getProtocolRegistry(version);
}
/**
* Gets the API representation of the StateRegistry.
*
* @return the API representation
*/
public ProtocolState toProtocolState() {
return switch (this) {
case HANDSHAKE -> ProtocolState.HANDSHAKE;
case STATUS -> ProtocolState.STATUS;
case LOGIN -> ProtocolState.LOGIN;
case CONFIG -> ProtocolState.CONFIGURATION;
case PLAY -> ProtocolState.PLAY;
};
}
/**
* Packet registry.
*/