RedGuy/AuthMeVelocity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improvements

Browse Source
This commit is contained in:
4drian3d 2021-11-21 19:09:24 -05:00
parent 234e25396c
commit 8d16142c4e
6 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -12,8 +12,8 @@ This plugin adds the support for [Velocity](https://velocitypowered.com/) to [Au
3. Put the jar that ends with "-spigot" in the Spigot servers that contains AuthMe
4. Start the Velocity proxy and set up the config.yml with the auth servers
# Plugin API
## Plugin API
Check the plugin API [here](https://github.com/4drian3d/AuthMeVelocity/wiki/Plugin-API)
# Configuration
## Configuration
Check the plugin configuration [here](https://github.com/4drian3d/AuthMeVelocity/wiki/Configuration)

5
proxy/src/main/java/com/glyart/authmevelocity/proxy/config/AuthMeConfig.java
View File

@ -1,6 +1,5 @@
package com.glyart.authmevelocity.proxy.config;
import java.io.File;
import java.nio.file.Path;
import java.util.List;
import java.util.Set;
@ -26,9 +25,9 @@ public class AuthMeConfig {
.header(HEADER)
);
public static void loadConfig(@NotNull Path path, @NotNull Logger logger){
File configFile = new File(path.toFile(), "config.conf");
Path configPath = path.resolve("config.conf");
final HoconConfigurationLoader loader = configBuilder
.file(configFile)
.path(configPath)
.build();
try {

47
proxy/src/main/java/com/glyart/authmevelocity/proxy/listener/ProxyListener.java
View File

@ -5,6 +5,7 @@ import com.glyart.authmevelocity.proxy.config.AuthMeConfig;
import com.glyart.authmevelocity.proxy.event.PreSendOnLoginEvent;
import com.glyart.authmevelocity.proxy.event.ProxyLoginEvent;
import com.google.common.io.ByteArrayDataInput;
import com.velocitypowered.api.event.Continuation;
import com.velocitypowered.api.event.EventTask;
import com.velocitypowered.api.event.Subscribe;
import com.velocitypowered.api.event.command.CommandExecuteEvent;
@ -24,7 +25,6 @@ import org.slf4j.Logger;
import java.util.List;
import java.util.Optional;
import java.util.Random;
import java.util.UUID;
public class ProxyListener {
private final ProxyServer proxy;
@ -40,35 +40,39 @@ public class ProxyListener {
}
@Subscribe
public void onPluginMessage(final PluginMessageEvent event) {
if (!(event.getSource() instanceof ServerConnection) || !event.getIdentifier().getId().equals("authmevelocity:main"))
return;
public void onPluginMessage(final PluginMessageEvent event, Continuation continuation) {
if (!(event.getSource() instanceof ServerConnection connection) || !event.getIdentifier().getId().equals("authmevelocity:main")){
continuation.resume();
return;
}
ByteArrayDataInput input = event.dataAsDataStream();
String sChannel = input.readUTF();
if (!sChannel.equals("LOGIN")) return;
final String sChannel = input.readUTF();
if (!sChannel.equals("LOGIN")) {
continuation.resume();
return;
}
String user = input.readUTF();
Optional<Player> optionalPlayer = proxy.getPlayer(UUID.fromString(user));
if (optionalPlayer.isEmpty()) return;
Player loggedPlayer = optionalPlayer.get();
event.setResult(PluginMessageEvent.ForwardResult.handled());
//TODO: Test this
final Player loggedPlayer = connection.getPlayer();
if (AuthmeVelocityAPI.addPlayer(loggedPlayer)){
createServerConnectionRequest(loggedPlayer, config, proxy, logger);
createServerConnectionRequest(loggedPlayer, config, proxy, logger, connection);
continuation.resume();
}
}
private void createServerConnectionRequest(Player loggedPlayer, AuthMeConfig.Config config, ProxyServer proxy, Logger logger){
final RegisteredServer loginServer = loggedPlayer.getCurrentServer().orElseThrow().getServer();
private void createServerConnectionRequest(Player loggedPlayer, AuthMeConfig.Config config, ProxyServer proxy, Logger logger, ServerConnection connection){
final RegisteredServer loginServer = loggedPlayer.getCurrentServer().orElse(connection).getServer();
proxy.getEventManager().fireAndForget(new ProxyLoginEvent(loggedPlayer, loginServer));
if(config.getToServerOptions().sendToServer()){
final List<String> serverList = config.getToServerOptions().getTeleportServers();
final String randomServer = serverList.get(rm.nextInt(serverList.size()));
Optional<RegisteredServer> optionalServer = proxy.getServer(randomServer);
optionalServer.ifPresentOrElse(serverToSend ->
proxy.getEventManager().fire(new PreSendOnLoginEvent(loggedPlayer, loginServer, serverToSend)).thenAccept(preSendEvent -> {
proxy.getEventManager().fire(new PreSendOnLoginEvent(loggedPlayer, loginServer, serverToSend)).thenAcceptAsync(preSendEvent -> {
if(preSendEvent.getResult().isAllowed()){
loggedPlayer.createConnectionRequest(serverToSend).connect().thenAccept(result -> {
loggedPlayer.createConnectionRequest(serverToSend).connect().thenAcceptAsync(result -> {
if(!result.isSuccessful()) {
logger.info("Unable to connect the player {} to the server {}",
loggedPlayer.getUsername(),
@ -101,12 +105,16 @@ public class ProxyListener {
}
@Subscribe
public void onPlayerChat(final PlayerChatEvent event) {
public void onPlayerChat(final PlayerChatEvent event, Continuation continuation) {
final Player player = event.getPlayer();
if (AuthmeVelocityAPI.isLogged(player)) return;
if (AuthmeVelocityAPI.isLogged(player)) {
continuation.resume();
return;
}
Optional<ServerConnection> server = player.getCurrentServer();
if (server.isPresent() && config.getAuthServers().contains(server.get().getServerInfo().getName())) {
continuation.resume();
return;
}
@ -127,8 +135,7 @@ public class ProxyListener {
@Subscribe
public EventTask onTabComplete(TabCompleteEvent event){
final Player player = event.getPlayer();
if (!AuthmeVelocityAPI.isLogged(player)){
if (!AuthmeVelocityAPI.isLogged(event.getPlayer())){
return EventTask.async(() -> event.getSuggestions().clear());
}
return null;

1
spigot/src/main/java/com/glyart/authmevelocity/spigot/AuthMeVelocityPlugin.java
View File

@ -19,7 +19,6 @@ public class AuthMeVelocityPlugin extends JavaPlugin {
public void sendLoginToProxy(@NotNull final Player player) {
ByteArrayDataOutput out = ByteStreams.newDataOutput();
out.writeUTF("LOGIN");
out.writeUTF(player.getUniqueId().toString());
player.sendPluginMessage(this, "authmevelocity:main", out.toByteArray());
}

5
spigot/src/main/java/com/glyart/authmevelocity/spigot/events/PreSendLoginEvent.java
View File

@ -1,5 +1,6 @@
package com.glyart.authmevelocity.spigot.events;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList;
@ -10,8 +11,8 @@ public class PreSendLoginEvent extends PlayerEvent implements Cancellable {
private static final HandlerList HANDLERS = new HandlerList();
private boolean isCancelled;
public PreSendLoginEvent(@NotNull final Player player, boolean async) {
super(player, async);
public PreSendLoginEvent(@NotNull final Player player) {
super(player, !Bukkit.isPrimaryThread());
}
@Override

4
spigot/src/main/java/com/glyart/authmevelocity/spigot/listeners/AuthMeListener.java
View File

@ -18,9 +18,9 @@ public class AuthMeListener implements Listener {
}
@EventHandler
public void onLogin(LoginEvent event) {
public void onLogin(final LoginEvent event) {
final Player player = event.getPlayer();
PreSendLoginEvent preSendLoginEvent = new PreSendLoginEvent(player, false);
PreSendLoginEvent preSendLoginEvent = new PreSendLoginEvent(player);
Bukkit.getPluginManager().callEvent(preSendLoginEvent);
if(!preSendLoginEvent.isCancelled()){
plugin.sendLoginToProxy(player);