GeyserMC-Mirror/Floodgate
1
0
Fork 0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2026-01-06 15:42:03 +00:00
Code Issues Releases Activity

Configurable username prefix (#11)

Browse Source 
* Add configurable username prefix
This commit is contained in:
William Johnstone
2020-03-20 16:57:57 +00:00
committed by GitHub
parent 2904612b5a
commit 95e1a8122b
8 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bukkit/src/main/java/org/geysermc/floodgate/PacketHandler.java
View File

@@ -127,7 +127,7 @@ public class PacketHandler extends SimpleChannelInboundHandler<Object> {
}
static {
handshakeHandler = new HandshakeHandler(plugin.getConfiguration().getPrivateKey(), false);
handshakeHandler = new HandshakeHandler(plugin.getConfiguration().getPrivateKey(), false, plugin.getConfiguration().getUsernamePrefix());
networkManagerClass = getPrefixedClass("NetworkManager");
loginStartPacketClass = getPrefixedClass("PacketLoginInStart");

2
bungee/src/main/java/org/geysermc/floodgate/BungeePlugin.java
View File

@@ -35,7 +35,7 @@ public class BungeePlugin extends Plugin implements Listener {
getDataFolder().mkdir();
}
config = FloodgateConfig.load(getLogger(), getDataFolder().toPath().resolve("config.yml"), BungeeFloodgateConfig.class);
handshakeHandler = new HandshakeHandler(config.getPrivateKey(), true);
handshakeHandler = new HandshakeHandler(config.getPrivateKey(), true, config.getUsernamePrefix());
}
@Override

5
bungee/src/main/resources/config.yml
View File

@@ -3,6 +3,11 @@
# The public key should be used for the Geyser(s) and the private key for the Floodgate(s)
key-file-name: key.pem
# Floodgate appends a prefix to bedrock usernames to avoid conflicts
# However, certain conflicts can cause issues with some plugins so this prefix is configurable using the property below
# It is recommended to use a prefix that does not contain alphanumerical to avoid the possibility of duplicate usernames.
username-prefix: "*"
# Should Bungeecord send the bedrock player data to the servers it is connecting to?
# This requires Floodgate to be installed on the servers.
# You'll get kicked if you don't use the plugin. The default value is false because of it

2
common/src/main/java/org/geysermc/floodgate/FloodgateConfig.java
View File

@@ -25,6 +25,8 @@ public class FloodgateConfig {
private String keyFileName;
@JsonProperty(value = "disconnect")
private DisconnectMessages messages;
@JsonProperty(value = "username-prefix")
private String usernamePrefix;
@JsonProperty
private boolean debug;

5
common/src/main/java/org/geysermc/floodgate/FloodgatePlayer.java
View File

@@ -37,10 +37,11 @@ public class FloodgatePlayer {
*/
private UUID javaUniqueId;
FloodgatePlayer(BedrockData data) {
FloodgatePlayer(BedrockData data, String prefix) {
version = data.getVersion();
username = data.getUsername();
javaUsername = "*" + data.getUsername().substring(0, Math.min(data.getUsername().length(), 15));
if (prefix.length() < 1) prefix = "*";
javaUsername = prefix + data.getUsername().substring(0, Math.min(data.getUsername().length(), 16 - prefix.length()));
xuid = data.getXuid();
deviceOS = DeviceOS.getById(data.getDeviceId());
languageCode = data.getLanguageCode();

6
common/src/main/java/org/geysermc/floodgate/HandshakeHandler.java
View File

@@ -17,10 +17,12 @@ import static org.geysermc.floodgate.util.BedrockData.FLOODGATE_IDENTIFIER;
public class HandshakeHandler {
private PrivateKey privateKey;
private boolean bungee;
private String usernamePrefix;
public HandshakeHandler(@NonNull PrivateKey privateKey, boolean bungee) {
public HandshakeHandler(@NonNull PrivateKey privateKey, boolean bungee, String usernamePrefix) {
this.privateKey = privateKey;
this.bungee = bungee;
this.usernamePrefix = usernamePrefix;
}
public HandshakeResult handle(@NonNull String handshakeData) {
@@ -40,7 +42,7 @@ public class HandshakeHandler {
return ResultType.INVALID_DATA_LENGTH.getCachedResult();
}
FloodgatePlayer player = new FloodgatePlayer(bedrockData);
FloodgatePlayer player = new FloodgatePlayer(bedrockData, usernamePrefix);
AbstractFloodgateAPI.players.put(player.getJavaUniqueId(), player);
return new HandshakeResult(ResultType.SUCCESS, data, bedrockData, player);
} catch (NoSuchPaddingException | NoSuchAlgorithmException | InvalidKeyException | IllegalBlockSizeException | BadPaddingException e) {

5
common/src/main/resources/config.yml
View File

@@ -3,6 +3,11 @@
# The public key should be used for the Geyser(s) and the private key for the Floodgate(s)
key-file-name: key.pem
# Floodgate appends a prefix to bedrock usernames to avoid conflicts
# However, certain conflicts can cause issues with some plugins so this prefix is configurable using the property below
# It is recommended to use a prefix that does not contain alphanumerical to avoid the possibility of duplicate usernames.
username-prefix: "*"
disconnect:
# The disconnect message Geyser users should get when connecting
# to the server with an invalid key

2
velocity/src/main/java/org/geysermc/floodgate/VelocityPlugin.java
View File

@@ -78,7 +78,7 @@ public class VelocityPlugin {
}
config = FloodgateConfig.load(logger, dataFolder.toPath().resolve("config.yml"), VelocityFloodgateConfig.class);
handshakeHandler = new HandshakeHandler(config.getPrivateKey(), true);
handshakeHandler = new HandshakeHandler(config.getPrivateKey(), true, config.getUsernamePrefix());
}
@Subscribe