From 00e0d8424582507cc1ebbf0afc417e0abafa0c29 Mon Sep 17 00:00:00 2001
From: onebeastchris <github@onechris.mozmail.com>
Date: Fri, 13 Sep 2024 01:39:08 +0800
Subject: [PATCH] """fix""": don't put linking related classes in core
 repackaged modules to ensure "current" database impls for local linking
 continue to work

---
 .../geysermc/floodgate/core/command/LinkAccountCommand.java   | 2 +-
 .../geysermc/floodgate/core/command/UnlinkAccountCommand.java | 2 +-
 .../java/org/geysermc/floodgate/core/module/CommonModule.java | 2 +-
 .../geysermc/floodgate/{core => }/link/CommonPlayerLink.java  | 2 +-
 .../floodgate/{core => }/link/DisabledPlayerLink.java         | 2 +-
 .../floodgate/{core => }/link/GlobalPlayerLinking.java        | 2 +-
 .../geysermc/floodgate/{core => }/link/LinkRequestImpl.java   | 2 +-
 .../geysermc/floodgate/{core => }/link/PlayerLinkHolder.java  | 2 +-
 .../java/org/geysermc/floodgate/database/MongoDbDatabase.java | 4 ++--
 .../java/org/geysermc/floodgate/database/MysqlDatabase.java   | 4 ++--
 .../java/org/geysermc/floodgate/database/SqliteDatabase.java  | 4 ++--
 11 files changed, 14 insertions(+), 14 deletions(-)
 rename core/src/main/java/org/geysermc/floodgate/{core => }/link/CommonPlayerLink.java (99%)
 rename core/src/main/java/org/geysermc/floodgate/{core => }/link/DisabledPlayerLink.java (98%)
 rename core/src/main/java/org/geysermc/floodgate/{core => }/link/GlobalPlayerLinking.java (99%)
 rename core/src/main/java/org/geysermc/floodgate/{core => }/link/LinkRequestImpl.java (98%)
 rename core/src/main/java/org/geysermc/floodgate/{core => }/link/PlayerLinkHolder.java (99%)

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
index 004ab2cf..38bf269f 100644
--- a/core/src/main/java/org/geysermc/floodgate/core/command/LinkAccountCommand.java
+++ b/core/src/main/java/org/geysermc/floodgate/core/command/LinkAccountCommand.java
@@ -37,7 +37,7 @@
 import org.geysermc.floodgate.api.logger.FloodgateLogger;
 import org.geysermc.floodgate.core.command.util.Permission;
 import org.geysermc.floodgate.core.config.FloodgateConfig;
-import org.geysermc.floodgate.core.link.GlobalPlayerLinking;
+import org.geysermc.floodgate.link.GlobalPlayerLinking;
 import org.geysermc.floodgate.core.platform.command.FloodgateCommand;
 import org.geysermc.floodgate.core.platform.command.TranslatableMessage;
 import org.geysermc.floodgate.core.player.UserAudience;
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
index 3bbf02a6..3176fab9 100644
--- a/core/src/main/java/org/geysermc/floodgate/core/command/UnlinkAccountCommand.java
+++ b/core/src/main/java/org/geysermc/floodgate/core/command/UnlinkAccountCommand.java
@@ -34,7 +34,7 @@
 import org.geysermc.floodgate.api.link.PlayerLink;
 import org.geysermc.floodgate.core.config.FloodgateConfig;
 import org.geysermc.floodgate.core.command.util.Permission;
-import org.geysermc.floodgate.core.link.GlobalPlayerLinking;
+import org.geysermc.floodgate.link.GlobalPlayerLinking;
 import org.geysermc.floodgate.core.platform.command.FloodgateCommand;
 import org.geysermc.floodgate.core.platform.command.TranslatableMessage;
 import org.geysermc.floodgate.core.player.UserAudience;
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
index abfd525d..34182d1b 100644
--- a/core/src/main/java/org/geysermc/floodgate/core/module/CommonModule.java
+++ b/core/src/main/java/org/geysermc/floodgate/core/module/CommonModule.java
@@ -65,7 +65,7 @@
 import org.geysermc.floodgate.core.event.lifecycle.ShutdownEvent;
 import org.geysermc.floodgate.core.event.util.ListenerAnnotationMatcher;
 import org.geysermc.floodgate.core.inject.CommonPlatformInjector;
-import org.geysermc.floodgate.core.link.PlayerLinkHolder;
+import org.geysermc.floodgate.link.PlayerLinkHolder;
 import org.geysermc.floodgate.core.player.FloodgateHandshakeHandler;
 import org.geysermc.floodgate.core.pluginmessage.PluginMessageManager;
 import org.geysermc.floodgate.core.skin.SkinUploadManager;
diff --git a/core/src/main/java/org/geysermc/floodgate/core/link/CommonPlayerLink.java b/core/src/main/java/org/geysermc/floodgate/link/CommonPlayerLink.java
similarity index 99%
rename from core/src/main/java/org/geysermc/floodgate/core/link/CommonPlayerLink.java
rename to core/src/main/java/org/geysermc/floodgate/link/CommonPlayerLink.java
index b50915ed..507b2fc7 100644
--- a/core/src/main/java/org/geysermc/floodgate/core/link/CommonPlayerLink.java
+++ b/core/src/main/java/org/geysermc/floodgate/link/CommonPlayerLink.java
@@ -23,7 +23,7 @@
  * @link https://github.com/GeyserMC/Floodgate
  */
 
-package org.geysermc.floodgate.core.link;
+package org.geysermc.floodgate.link;
 
 import com.google.inject.Inject;
 import com.google.inject.Key;
diff --git a/core/src/main/java/org/geysermc/floodgate/core/link/DisabledPlayerLink.java b/core/src/main/java/org/geysermc/floodgate/link/DisabledPlayerLink.java
similarity index 98%
rename from core/src/main/java/org/geysermc/floodgate/core/link/DisabledPlayerLink.java
rename to core/src/main/java/org/geysermc/floodgate/link/DisabledPlayerLink.java
index 94a83fa3..b4ac584e 100644
--- a/core/src/main/java/org/geysermc/floodgate/core/link/DisabledPlayerLink.java
+++ b/core/src/main/java/org/geysermc/floodgate/link/DisabledPlayerLink.java
@@ -23,7 +23,7 @@
  * @link https://github.com/GeyserMC/Floodgate
  */
 
-package org.geysermc.floodgate.core.link;
+package org.geysermc.floodgate.link;
 
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
diff --git a/core/src/main/java/org/geysermc/floodgate/core/link/GlobalPlayerLinking.java b/core/src/main/java/org/geysermc/floodgate/link/GlobalPlayerLinking.java
similarity index 99%
rename from core/src/main/java/org/geysermc/floodgate/core/link/GlobalPlayerLinking.java
rename to core/src/main/java/org/geysermc/floodgate/link/GlobalPlayerLinking.java
index d0f692a4..fdb2e119 100644
--- a/core/src/main/java/org/geysermc/floodgate/core/link/GlobalPlayerLinking.java
+++ b/core/src/main/java/org/geysermc/floodgate/link/GlobalPlayerLinking.java
@@ -23,7 +23,7 @@
  * @link https://github.com/GeyserMC/Floodgate
  */
 
-package org.geysermc.floodgate.core.link;
+package org.geysermc.floodgate.link;
 
 import static org.geysermc.floodgate.core.util.Constants.GET_BEDROCK_LINK;
 
diff --git a/core/src/main/java/org/geysermc/floodgate/core/link/LinkRequestImpl.java b/core/src/main/java/org/geysermc/floodgate/link/LinkRequestImpl.java
similarity index 98%
rename from core/src/main/java/org/geysermc/floodgate/core/link/LinkRequestImpl.java
rename to core/src/main/java/org/geysermc/floodgate/link/LinkRequestImpl.java
index 326dfbda..d2ebaae7 100644
--- a/core/src/main/java/org/geysermc/floodgate/core/link/LinkRequestImpl.java
+++ b/core/src/main/java/org/geysermc/floodgate/link/LinkRequestImpl.java
@@ -23,7 +23,7 @@
  * @link https://github.com/GeyserMC/Floodgate
  */
 
-package org.geysermc.floodgate.core.link;
+package org.geysermc.floodgate.link;
 
 import java.time.Instant;
 import java.util.UUID;
diff --git a/core/src/main/java/org/geysermc/floodgate/core/link/PlayerLinkHolder.java b/core/src/main/java/org/geysermc/floodgate/link/PlayerLinkHolder.java
similarity index 99%
rename from core/src/main/java/org/geysermc/floodgate/core/link/PlayerLinkHolder.java
rename to core/src/main/java/org/geysermc/floodgate/link/PlayerLinkHolder.java
index efc3baf5..17f69075 100644
--- a/core/src/main/java/org/geysermc/floodgate/core/link/PlayerLinkHolder.java
+++ b/core/src/main/java/org/geysermc/floodgate/link/PlayerLinkHolder.java
@@ -23,7 +23,7 @@
  * @link https://github.com/GeyserMC/Floodgate
  */
 
-package org.geysermc.floodgate.core.link;
+package org.geysermc.floodgate.link;
 
 import static java.util.Objects.requireNonNull;
 
diff --git a/database/mongo/src/main/java/org/geysermc/floodgate/database/MongoDbDatabase.java b/database/mongo/src/main/java/org/geysermc/floodgate/database/MongoDbDatabase.java
index 4ad7d3cb..19f9058b 100644
--- a/database/mongo/src/main/java/org/geysermc/floodgate/database/MongoDbDatabase.java
+++ b/database/mongo/src/main/java/org/geysermc/floodgate/database/MongoDbDatabase.java
@@ -51,8 +51,8 @@
 import org.geysermc.floodgate.api.link.LinkRequest;
 import org.geysermc.floodgate.api.link.LinkRequestResult;
 import org.geysermc.floodgate.database.config.MongoConfig;
-import org.geysermc.floodgate.core.link.CommonPlayerLink;
-import org.geysermc.floodgate.core.link.LinkRequestImpl;
+import org.geysermc.floodgate.link.CommonPlayerLink;
+import org.geysermc.floodgate.link.LinkRequestImpl;
 import org.geysermc.floodgate.util.LinkedPlayer;
 
 public class MongoDbDatabase extends CommonPlayerLink {
diff --git a/database/mysql/src/main/java/org/geysermc/floodgate/database/MysqlDatabase.java b/database/mysql/src/main/java/org/geysermc/floodgate/database/MysqlDatabase.java
index 50382174..60c19716 100644
--- a/database/mysql/src/main/java/org/geysermc/floodgate/database/MysqlDatabase.java
+++ b/database/mysql/src/main/java/org/geysermc/floodgate/database/MysqlDatabase.java
@@ -42,8 +42,8 @@
 import org.geysermc.floodgate.api.link.LinkRequest;
 import org.geysermc.floodgate.api.link.LinkRequestResult;
 import org.geysermc.floodgate.database.config.MysqlConfig;
-import org.geysermc.floodgate.core.link.CommonPlayerLink;
-import org.geysermc.floodgate.core.link.LinkRequestImpl;
+import org.geysermc.floodgate.link.CommonPlayerLink;
+import org.geysermc.floodgate.link.LinkRequestImpl;
 import org.geysermc.floodgate.util.LinkedPlayer;
 
 public class MysqlDatabase extends CommonPlayerLink {
diff --git a/database/sqlite/src/main/java/org/geysermc/floodgate/database/SqliteDatabase.java b/database/sqlite/src/main/java/org/geysermc/floodgate/database/SqliteDatabase.java
index 505b1204..78a54952 100644
--- a/database/sqlite/src/main/java/org/geysermc/floodgate/database/SqliteDatabase.java
+++ b/database/sqlite/src/main/java/org/geysermc/floodgate/database/SqliteDatabase.java
@@ -42,8 +42,8 @@
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.geysermc.floodgate.api.link.LinkRequest;
 import org.geysermc.floodgate.api.link.LinkRequestResult;
-import org.geysermc.floodgate.core.link.CommonPlayerLink;
-import org.geysermc.floodgate.core.link.LinkRequestImpl;
+import org.geysermc.floodgate.link.CommonPlayerLink;
+import org.geysermc.floodgate.link.LinkRequestImpl;
 import org.geysermc.floodgate.util.LinkedPlayer;
 
 public class SqliteDatabase extends CommonPlayerLink {