Repackage the constants class to avoid multiple org.geysermc.floodgat…

…e.util modules
GeyserMC · Jul 13, 2024 · f8323fd · f8323fd
1 parent 9293b13
commit f8323fd
Show file tree

Hide file tree

Showing 25 changed files with 27 additions and 26 deletions.
diff --git a/core/src/main/java/org/geysermc/floodgate/core/addon/data/CommonDataHandler.java b/core/src/main/java/org/geysermc/floodgate/core/addon/data/CommonDataHandler.java
@@ -39,7 +39,7 @@
 import org.geysermc.floodgate.core.player.FloodgateHandshakeHandler;
 import org.geysermc.floodgate.core.player.FloodgateHandshakeHandler.HandshakeResult;
 import org.geysermc.floodgate.core.player.HostnameSeparationResult;
-import org.geysermc.floodgate.util.Constants;
+import org.geysermc.floodgate.core.util.Constants;
 
 @RequiredArgsConstructor
 public abstract class CommonDataHandler extends ChannelInboundHandlerAdapter {

diff --git a/core/src/main/java/org/geysermc/floodgate/core/api/SimpleFloodgateApi.java b/core/src/main/java/org/geysermc/floodgate/core/api/SimpleFloodgateApi.java
@@ -47,7 +47,7 @@
 import org.geysermc.floodgate.core.pluginmessage.PluginMessageManager;
 import org.geysermc.floodgate.core.pluginmessage.channel.FormChannel;
 import org.geysermc.floodgate.core.pluginmessage.channel.TransferChannel;
-import org.geysermc.floodgate.util.Constants;
+import org.geysermc.floodgate.core.util.Constants;
 import org.geysermc.floodgate.core.util.HttpClient;
 import org.geysermc.floodgate.core.util.Utils;
 

diff --git a/core/src/main/java/org/geysermc/floodgate/core/command/LinkAccountCommand.java b/core/src/main/java/org/geysermc/floodgate/core/command/LinkAccountCommand.java
@@ -44,7 +44,7 @@
 import org.geysermc.floodgate.core.player.UserAudience.PlayerAudience;
 import org.geysermc.floodgate.core.player.audience.PlayerAudienceArgument;
 import org.geysermc.floodgate.core.player.audience.ProfileAudience;
-import org.geysermc.floodgate.util.Constants;
+import org.geysermc.floodgate.core.util.Constants;
 import org.incendo.cloud.Command;
 import org.incendo.cloud.CommandManager;
 import org.incendo.cloud.context.CommandContext;

diff --git a/core/src/main/java/org/geysermc/floodgate/core/command/TestCommand.java b/core/src/main/java/org/geysermc/floodgate/core/command/TestCommand.java
@@ -29,7 +29,7 @@
 import org.geysermc.floodgate.core.config.FloodgateConfig;
 import org.geysermc.floodgate.core.platform.command.FloodgateCommand;
 import org.geysermc.floodgate.core.player.UserAudience;
-import org.geysermc.floodgate.util.Constants;
+import org.geysermc.floodgate.core.util.Constants;
 import org.incendo.cloud.Command;
 import org.incendo.cloud.CommandManager;
 import org.incendo.cloud.context.CommandContext;

diff --git a/core/src/main/java/org/geysermc/floodgate/core/command/UnlinkAccountCommand.java b/core/src/main/java/org/geysermc/floodgate/core/command/UnlinkAccountCommand.java
@@ -39,7 +39,7 @@
 import org.geysermc.floodgate.core.platform.command.TranslatableMessage;
 import org.geysermc.floodgate.core.player.UserAudience;
 import org.geysermc.floodgate.core.player.UserAudience.PlayerAudience;
-import org.geysermc.floodgate.util.Constants;
+import org.geysermc.floodgate.core.util.Constants;
 import org.incendo.cloud.Command;
 import org.incendo.cloud.CommandManager;
 import org.incendo.cloud.context.CommandContext;

diff --git a/core/src/main/java/org/geysermc/floodgate/core/command/WhitelistCommand.java b/core/src/main/java/org/geysermc/floodgate/core/command/WhitelistCommand.java
@@ -43,7 +43,7 @@
 import org.geysermc.floodgate.core.player.UserAudience;
 import org.geysermc.floodgate.core.player.audience.PlayerAudienceArgument;
 import org.geysermc.floodgate.core.player.audience.ProfileAudience;
-import org.geysermc.floodgate.util.Constants;
+import org.geysermc.floodgate.core.util.Constants;
 import org.geysermc.floodgate.core.util.HttpClient;
 import org.incendo.cloud.Command;
 import org.incendo.cloud.CommandManager;

diff --git a/core/src/main/java/org/geysermc/floodgate/core/command/main/FirewallCheckSubcommand.java b/core/src/main/java/org/geysermc/floodgate/core/command/main/FirewallCheckSubcommand.java
@@ -25,7 +25,7 @@
 
 package org.geysermc.floodgate.core.command.main;
 
-import static org.geysermc.floodgate.util.Constants.COLOR_CHAR;
+import static org.geysermc.floodgate.core.util.Constants.COLOR_CHAR;
 
 import com.google.gson.JsonElement;
 import com.google.inject.Inject;
@@ -36,7 +36,7 @@
 import org.geysermc.floodgate.core.command.util.Permission;
 import org.geysermc.floodgate.core.platform.command.FloodgateSubCommand;
 import org.geysermc.floodgate.core.player.UserAudience;
-import org.geysermc.floodgate.util.Constants;
+import org.geysermc.floodgate.core.util.Constants;
 import org.geysermc.floodgate.core.util.HttpClient;
 import org.geysermc.floodgate.core.util.HttpClient.HttpResponse;
 import org.geysermc.floodgate.core.util.Utils;

diff --git a/core/src/main/java/org/geysermc/floodgate/core/command/main/MainCommand.java b/core/src/main/java/org/geysermc/floodgate/core/command/main/MainCommand.java
@@ -25,7 +25,7 @@
 
 package org.geysermc.floodgate.core.command.main;
 
-import static org.geysermc.floodgate.util.Constants.COLOR_CHAR;
+import static org.geysermc.floodgate.core.util.Constants.COLOR_CHAR;
 
 import java.util.Locale;
 import org.geysermc.floodgate.core.command.util.Permission;

diff --git a/core/src/main/java/org/geysermc/floodgate/core/command/main/VersionSubcommand.java b/core/src/main/java/org/geysermc/floodgate/core/command/main/VersionSubcommand.java
@@ -25,7 +25,7 @@
 
 package org.geysermc.floodgate.core.command.main;
 
-import static org.geysermc.floodgate.util.Constants.COLOR_CHAR;
+import static org.geysermc.floodgate.core.util.Constants.COLOR_CHAR;
 
 import com.google.gson.JsonObject;
 import com.google.inject.Inject;
@@ -35,7 +35,7 @@
 import org.geysermc.floodgate.core.command.util.Permission;
 import org.geysermc.floodgate.core.platform.command.FloodgateSubCommand;
 import org.geysermc.floodgate.core.player.UserAudience;
-import org.geysermc.floodgate.util.Constants;
+import org.geysermc.floodgate.core.util.Constants;
 import org.geysermc.floodgate.core.util.HttpClient;
 import org.incendo.cloud.context.CommandContext;
 

diff --git a/core/src/main/java/org/geysermc/floodgate/core/link/GlobalPlayerLinking.java b/core/src/main/java/org/geysermc/floodgate/core/link/GlobalPlayerLinking.java
@@ -25,7 +25,7 @@
 
 package org.geysermc.floodgate.core.link;
 
-import static org.geysermc.floodgate.util.Constants.GET_BEDROCK_LINK;
+import static org.geysermc.floodgate.core.util.Constants.GET_BEDROCK_LINK;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;

diff --git a/core/src/main/java/org/geysermc/floodgate/core/link/PlayerLinkHolder.java b/core/src/main/java/org/geysermc/floodgate/core/link/PlayerLinkHolder.java
@@ -52,7 +52,7 @@
 import org.geysermc.floodgate.core.config.FloodgateConfig;
 import org.geysermc.floodgate.core.config.FloodgateConfig.PlayerLinkConfig;
 import org.geysermc.floodgate.core.event.lifecycle.ShutdownEvent;
-import org.geysermc.floodgate.util.Constants;
+import org.geysermc.floodgate.core.util.Constants;
 import org.geysermc.floodgate.core.util.InjectorHolder;
 import org.geysermc.floodgate.core.util.Utils;
 

diff --git a/core/src/main/java/org/geysermc/floodgate/core/module/CommonModule.java b/core/src/main/java/org/geysermc/floodgate/core/module/CommonModule.java
@@ -69,7 +69,7 @@
 import org.geysermc.floodgate.core.player.FloodgateHandshakeHandler;
 import org.geysermc.floodgate.core.pluginmessage.PluginMessageManager;
 import org.geysermc.floodgate.core.skin.SkinUploadManager;
-import org.geysermc.floodgate.util.Constants;
+import org.geysermc.floodgate.core.util.Constants;
 import org.geysermc.floodgate.core.util.HttpClient;
 import org.geysermc.floodgate.core.util.LanguageManager;
 

diff --git a/core/src/main/java/org/geysermc/floodgate/core/news/NewsChecker.java b/core/src/main/java/org/geysermc/floodgate/core/news/NewsChecker.java
@@ -45,7 +45,7 @@
 import org.geysermc.floodgate.news.data.CheckAfterData;
 import org.geysermc.floodgate.core.platform.command.CommandUtil;
 import org.geysermc.floodgate.core.util.AutoBind;
-import org.geysermc.floodgate.util.Constants;
+import org.geysermc.floodgate.core.util.Constants;
 import org.geysermc.floodgate.core.util.HttpClient;
 import org.geysermc.floodgate.core.util.HttpClient.HttpResponse;
 

diff --git a/core/src/main/java/org/geysermc/floodgate/core/player/FloodgateHandshakeHandler.java b/core/src/main/java/org/geysermc/floodgate/core/player/FloodgateHandshakeHandler.java
@@ -52,8 +52,8 @@
 import org.geysermc.floodgate.crypto.FloodgateCipher;
 import org.geysermc.floodgate.core.skin.SkinUploadManager;
 import org.geysermc.floodgate.util.BedrockData;
-import org.geysermc.floodgate.util.Constants;
 import org.geysermc.floodgate.util.InvalidFormatException;
+import org.geysermc.floodgate.core.util.Constants;
 import org.geysermc.floodgate.core.util.LanguageManager;
 import org.geysermc.floodgate.util.LinkedPlayer;
 import org.geysermc.floodgate.core.util.Utils;

diff --git a/core/src/main/java/org/geysermc/floodgate/core/skin/SkinDataImpl.java b/core/src/main/java/org/geysermc/floodgate/core/skin/SkinDataImpl.java
@@ -29,7 +29,7 @@
 import java.util.Objects;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.geysermc.floodgate.api.event.skin.SkinApplyEvent.SkinData;
-import org.geysermc.floodgate.util.Constants;
+import org.geysermc.floodgate.core.util.Constants;
 
 public class SkinDataImpl implements SkinData {
     public static final SkinData DEFAULT_SKIN = new SkinDataImpl(

diff --git a/core/src/main/java/org/geysermc/floodgate/core/skin/SkinUploadSocket.java b/core/src/main/java/org/geysermc/floodgate/core/skin/SkinUploadSocket.java
@@ -25,7 +25,7 @@
 
 package org.geysermc.floodgate.core.skin;
 
-import static org.geysermc.floodgate.util.Constants.WEBSOCKET_URL;
+import static org.geysermc.floodgate.core.util.Constants.WEBSOCKET_URL;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;

diff --git a/core/src/main/java/org/geysermc/floodgate/core/util/Metrics.java b/core/src/main/java/org/geysermc/floodgate/core/util/Metrics.java
@@ -46,7 +46,7 @@
 import org.geysermc.floodgate.core.config.FloodgateConfig.MetricsConfig;
 import org.geysermc.floodgate.core.event.lifecycle.ShutdownEvent;
 import org.geysermc.floodgate.core.platform.util.PlatformUtils;
-import org.geysermc.floodgate.util.Constants;
+import org.geysermc.floodgate.core.util.Constants;
 
 @Listener
 @AutoBind

diff --git a/core/src/main/java/org/geysermc/floodgate/core/util/MojangUtils.java b/core/src/main/java/org/geysermc/floodgate/core/util/MojangUtils.java
@@ -42,7 +42,7 @@
 import org.geysermc.floodgate.api.event.skin.SkinApplyEvent.SkinData;
 import org.geysermc.floodgate.core.skin.SkinDataImpl;
 import org.geysermc.floodgate.core.util.HttpClient.HttpResponse;
-import org.geysermc.floodgate.util.Constants;
+import org.geysermc.floodgate.core.util.Constants;
 
 @Singleton
 public class MojangUtils {

diff --git a/core/src/main/java/org/geysermc/floodgate/core/util/ReflectionUtils.java b/core/src/main/java/org/geysermc/floodgate/core/util/ReflectionUtils.java
@@ -33,7 +33,7 @@
 import javax.annotation.Nullable;
 import lombok.Getter;
 import lombok.Setter;
-import org.geysermc.floodgate.util.Constants;
+import org.geysermc.floodgate.core.util.Constants;
 
 @SuppressWarnings("PMD.AvoidBranchingStatementAsLastInLoop")
 public final class ReflectionUtils {

diff --git a/core/src/main/java/org/geysermc/floodgate/core/util/Utils.java b/core/src/main/java/org/geysermc/floodgate/core/util/Utils.java
@@ -42,7 +42,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import org.geysermc.floodgate.util.Constants;
+import org.geysermc.floodgate.core.util.Constants;
 
 public class Utils {
     private static final Pattern NON_UNIQUE_PREFIX = Pattern.compile("^\\w{0,16}$");

diff --git a/core/src/main/templates/org/geysermc/floodgate/core/util/Constants.java b/core/src/main/templates/org/geysermc/floodgate/core/util/Constants.java
@@ -23,7 +23,7 @@
  * @link https://github.com/GeyserMC/Floodgate
  */
 
-package org.geysermc.floodgate.util;
+package org.geysermc.floodgate.core.util;
 
 public final class Constants {
     public static final String VERSION = "@floodgateVersion@";

diff --git a/spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataHandler.java b/spigot/src/main/java/org/geysermc/floodgate/addon/data/SpigotDataHandler.java
@@ -40,8 +40,8 @@
 import org.geysermc.floodgate.core.config.FloodgateConfig;
 import org.geysermc.floodgate.core.player.FloodgateHandshakeHandler;
 import org.geysermc.floodgate.core.player.FloodgateHandshakeHandler.HandshakeResult;
+import org.geysermc.floodgate.core.util.Constants;
 import org.geysermc.floodgate.util.ClassNames;
-import org.geysermc.floodgate.util.Constants;
 import org.geysermc.floodgate.util.ProxyUtils;
 
 public final class SpigotDataHandler extends CommonDataHandler {

diff --git a/spigot/src/main/java/org/geysermc/floodgate/listener/PaperProfileListener.java b/spigot/src/main/java/org/geysermc/floodgate/listener/PaperProfileListener.java
@@ -35,7 +35,7 @@
 import org.bukkit.event.Listener;
 import org.geysermc.floodgate.core.api.SimpleFloodgateApi;
 import org.geysermc.floodgate.api.player.FloodgatePlayer;
-import org.geysermc.floodgate.util.Constants;
+import org.geysermc.floodgate.core.util.Constants;
 
 public final class PaperProfileListener implements Listener {
     private static final ProfileProperty DEFAULT_TEXTURE_PROPERTY = new ProfileProperty(

diff --git a/spigot/src/main/java/org/geysermc/floodgate/util/ClassNames.java b/spigot/src/main/java/org/geysermc/floodgate/util/ClassNames.java
@@ -49,6 +49,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.geysermc.floodgate.core.util.Constants;
 import org.geysermc.floodgate.core.util.ReflectionUtils;
 
 @SuppressWarnings("PMD.SystemPrintln")

diff --git a/velocity/src/main/java/org/geysermc/floodgate/listener/VelocityListener.java b/velocity/src/main/java/org/geysermc/floodgate/listener/VelocityListener.java
@@ -58,7 +58,7 @@
 import org.geysermc.floodgate.api.player.FloodgatePlayer;
 import org.geysermc.floodgate.core.config.ProxyFloodgateConfig;
 import org.geysermc.floodgate.core.skin.SkinDataImpl;
-import org.geysermc.floodgate.util.Constants;
+import org.geysermc.floodgate.core.util.Constants;
 import org.geysermc.floodgate.core.util.LanguageManager;
 import org.geysermc.floodgate.core.util.MojangUtils;