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

misc: Improved code

Browse Source
This commit is contained in:
4drian3d 2022-06-02 00:46:49 +00:00
parent 2c2e6f1bad
commit 29049019f5
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
proxy/src/main/java/com/glyart/authmevelocity/proxy/AuthMeVelocityPlugin.java
View File

@ -21,12 +21,12 @@ import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
public class AuthMeVelocityPlugin { public class AuthMeVelocityPlugin {
public static final ChannelIdentifier AUTHMEVELOCITY_CHANNEL = MinecraftChannelIdentifier.create("authmevelocity", "main"); public static final ChannelIdentifier AUTHMEVELOCITY_CHANNEL
= MinecraftChannelIdentifier.create("authmevelocity", "main");
private final ProxyServer proxy; private final ProxyServer proxy;
private final Logger logger; private final Logger logger;
private final Path pluginDirectory; private final Path pluginDirectory;
@ -48,7 +48,7 @@ public class AuthMeVelocityPlugin {
logger.warn("Failed to load config.toml. Shutting down."); logger.warn("Failed to load config.toml. Shutting down.");
return; return;
} }
AuthMeConfig config = Objects.requireNonNull(new AuthMeConfig(toml), "configuration cannot be null"); AuthMeConfig config = new AuthMeConfig(toml);
this.api = new AuthmeVelocityAPI(this, config); this.api = new AuthmeVelocityAPI(this, config);
proxy.getChannelRegistrar().register(AUTHMEVELOCITY_CHANNEL); proxy.getChannelRegistrar().register(AUTHMEVELOCITY_CHANNEL);
proxy.getEventManager().register(this, new ProxyListener(config, api, logger, proxy)); proxy.getEventManager().register(this, new ProxyListener(config, api, logger, proxy));

11
proxy/src/main/java/com/glyart/authmevelocity/proxy/listener/PluginMessageListener.java
View File

@ -42,7 +42,10 @@ public class PluginMessageListener {
@Subscribe @Subscribe
public void onPluginMessage(final PluginMessageEvent event, Continuation continuation) { public void onPluginMessage(final PluginMessageEvent event, Continuation continuation) {
if (!(event.getSource() instanceof ServerConnection) || !event.getIdentifier().equals(AuthMeVelocityPlugin.AUTHMEVELOCITY_CHANNEL)){ if (
!(event.getSource() instanceof ServerConnection)
|| !event.getIdentifier().equals(AuthMeVelocityPlugin.AUTHMEVELOCITY_CHANNEL)
) {
continuation.resume(); continuation.resume();
return; return;
} }
@ -90,8 +93,8 @@ public class PluginMessageListener {
proxy.getServer(randomServer).ifPresentOrElse(serverToSend -> proxy.getServer(randomServer).ifPresentOrElse(serverToSend ->
proxy.getEventManager().fire(new PreSendOnLoginEvent(loggedPlayer, loginServer, serverToSend)).thenAcceptAsync(preSendEvent -> { proxy.getEventManager().fire(new PreSendOnLoginEvent(loggedPlayer, loginServer, serverToSend)).thenAcceptAsync(preSendEvent -> {
if(preSendEvent.getResult().isAllowed()){ if(preSendEvent.getResult().isAllowed()){
loggedPlayer.createConnectionRequest(serverToSend).connectWithIndication().thenAcceptAsync(result -> { loggedPlayer.createConnectionRequest(serverToSend).connect().thenAcceptAsync(result -> {
if(!result.booleanValue()) { if(!result.isSuccessful()) {
logger.info("Unable to connect the player {} to the server {}", logger.info("Unable to connect the player {} to the server {}",
loggedPlayer.getUsername(), loggedPlayer.getUsername(),
serverToSend.getServerInfo().getName()); serverToSend.getServerInfo().getName());
@ -99,7 +102,7 @@ public class PluginMessageListener {
}); });
} }
}) })
, () -> logger.info("The server {} does not exist", randomServer)); , () -> logger.warn("The server {} does not exist", randomServer));
} }
} }
} }

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

@ -82,11 +82,10 @@ public final class ProxyListener {
@Subscribe @Subscribe
public void onServerPreConnect(ServerPreConnectEvent event, Continuation continuation) { public void onServerPreConnect(ServerPreConnectEvent event, Continuation continuation) {
if (!event.getResult().isAllowed() && api.isLogged(event.getPlayer())){ if (
continuation.resume(); !event.getResult().isAllowed() && api.isLogged(event.getPlayer())
return; || !event.getResult().getServer().map(api::isAuthServer).orElse(false)
} ) {
if(!event.getResult().getServer().map(api::isAuthServer).orElse(false)){
continuation.resume(); continuation.resume();
return; return;
} }
@ -116,11 +115,10 @@ public final class ProxyListener {
@Subscribe(order = PostOrder.LATE) @Subscribe(order = PostOrder.LATE)
public void onInitialServer(PlayerChooseInitialServerEvent event, Continuation continuation){ public void onInitialServer(PlayerChooseInitialServerEvent event, Continuation continuation){
if(!config.getEnsureOptions().ensureAuthServer()){ if(
continuation.resume(); !config.getEnsureOptions().ensureAuthServer()
return; || event.getInitialServer().map(api::isAuthServer).orElse(false)
} ) {
if(event.getInitialServer().map(api::isAuthServer).orElse(false)){
continuation.resume(); continuation.resume();
return; return;
} }