From 5ef6f992369ede56caea6b80ed34e1504fdf7a4b Mon Sep 17 00:00:00 2001 From: Adrian Date: Tue, 7 Feb 2023 17:44:09 -0500 Subject: [PATCH] misc: rename AuthMeUtils --- .../authmevelocity/velocity/listener/ConnectListener.java | 4 ++-- .../velocity/listener/PluginMessageListener.java | 4 ++-- .../authmevelocity/velocity/listener/ProxyListener.java | 4 ++-- .../velocity/utils/{AuthmeUtils.java => AuthMeUtils.java} | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) rename velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/utils/{AuthmeUtils.java => AuthMeUtils.java} (98%) diff --git a/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/ConnectListener.java b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/ConnectListener.java index 703d0c8..dee9c9a 100644 --- a/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/ConnectListener.java +++ b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/ConnectListener.java @@ -29,7 +29,7 @@ import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.server.RegisteredServer; import io.github._4drian3d.authmevelocity.velocity.AuthMeVelocityPlugin; -import io.github._4drian3d.authmevelocity.velocity.utils.AuthmeUtils; +import io.github._4drian3d.authmevelocity.velocity.utils.AuthMeUtils; import org.slf4j.Logger; import java.util.Optional; @@ -67,7 +67,7 @@ public final class ConnectListener { return; } final var config = plugin.config().get(); - final var server = AuthmeUtils.serverToSend( + final var server = AuthMeUtils.serverToSend( config.ensureAuthServer().sendMode(), proxy, config.authServers(), config.advanced().randomAttempts()); // Velocity takes over in case the initial server is not present diff --git a/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/PluginMessageListener.java b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/PluginMessageListener.java index 7ea8eb0..608b95a 100644 --- a/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/PluginMessageListener.java +++ b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/PluginMessageListener.java @@ -28,7 +28,7 @@ import com.velocitypowered.api.proxy.server.RegisteredServer; import io.github._4drian3d.authmevelocity.api.velocity.event.*; import io.github._4drian3d.authmevelocity.common.MessageType; import io.github._4drian3d.authmevelocity.velocity.AuthMeVelocityPlugin; -import io.github._4drian3d.authmevelocity.velocity.utils.AuthmeUtils; +import io.github._4drian3d.authmevelocity.velocity.utils.AuthMeUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; @@ -114,7 +114,7 @@ public class PluginMessageListener { final var config = plugin.config().get(); - final var toSend = AuthmeUtils.serverToSend( + final var toSend = AuthMeUtils.serverToSend( config.sendOnLogin().sendMode(), proxy, config.sendOnLogin().teleportServers(), config.advanced().randomAttempts()); if (toSend.isEmpty()) { diff --git a/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/ProxyListener.java b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/ProxyListener.java index 7718fe8..293d604 100644 --- a/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/ProxyListener.java +++ b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/ProxyListener.java @@ -28,7 +28,7 @@ import com.velocitypowered.api.event.player.TabCompleteEvent; import com.velocitypowered.api.network.ProtocolVersion; import com.velocitypowered.api.proxy.Player; import io.github._4drian3d.authmevelocity.velocity.AuthMeVelocityPlugin; -import io.github._4drian3d.authmevelocity.velocity.utils.AuthmeUtils; +import io.github._4drian3d.authmevelocity.velocity.utils.AuthMeUtils; import net.kyori.adventure.text.minimessage.MiniMessage; public final class ProxyListener { @@ -69,7 +69,7 @@ public final class ProxyListener { if (plugin.isInAuthServer(player)) { plugin.logDebug("CommandExecuteEvent | Player is in Auth Server"); - String command = AuthmeUtils.getFirstArgument(event.getCommand()); + String command = AuthMeUtils.getFirstArgument(event.getCommand()); if (!plugin.config().get().commands().allowedCommands().contains(command)) { plugin.logDebug("CommandExecuteEvent | Player executed an blocked command"); sendBlockedMessage(player); diff --git a/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/utils/AuthmeUtils.java b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/utils/AuthMeUtils.java similarity index 98% rename from velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/utils/AuthmeUtils.java rename to velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/utils/AuthMeUtils.java index 4ff64bb..d79d1b5 100644 --- a/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/utils/AuthmeUtils.java +++ b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/utils/AuthMeUtils.java @@ -27,7 +27,7 @@ import java.util.Objects; import java.util.Optional; import java.util.Random; -public class AuthmeUtils { +public class AuthMeUtils { //Origin: https://github.com/4drian3d/ChatRegulator/blob/main/src/main/java/me/dreamerzero/chatregulator/utils/CommandUtils.java#L71 /** * Get the first argument of a string @@ -92,5 +92,5 @@ public class AuthmeUtils { } }; } - private AuthmeUtils() {} + private AuthMeUtils() {} }