"""fix""": don't put database related classes in core repackaged modu…

…les to ensure "current" database impls continue to work
GeyserMC · Nov 27, 2024 · 07b516f · 07b516f
1 parent 00e0d84
commit 07b516f
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 6 deletions.
diff --git a/.../core/database/config/DatabaseConfig.java → ...dgate/database/config/DatabaseConfig.java b/.../core/database/config/DatabaseConfig.java → ...dgate/database/config/DatabaseConfig.java
@@ -23,7 +23,7 @@
  * @link https://github.com/GeyserMC/Floodgate
  */
 
-package org.geysermc.floodgate.core.database.config;
+package org.geysermc.floodgate.database.config;
 
 /**
  * Base class for every database related configuration.

diff --git a/...database/config/DatabaseConfigLoader.java → ...database/config/DatabaseConfigLoader.java b/...database/config/DatabaseConfigLoader.java → ...database/config/DatabaseConfigLoader.java
@@ -23,7 +23,7 @@
  * @link https://github.com/GeyserMC/Floodgate
  */
 
-package org.geysermc.floodgate.core.database.config;
+package org.geysermc.floodgate.database.config;
 
 import com.google.gson.JsonObject;
 import com.google.inject.Inject;

diff --git a/core/src/main/java/org/geysermc/floodgate/link/CommonPlayerLink.java b/core/src/main/java/org/geysermc/floodgate/link/CommonPlayerLink.java
@@ -41,8 +41,8 @@
 import org.geysermc.floodgate.api.link.PlayerLink;
 import org.geysermc.floodgate.api.logger.FloodgateLogger;
 import org.geysermc.floodgate.core.config.FloodgateConfig;
-import org.geysermc.floodgate.core.database.config.DatabaseConfig;
-import org.geysermc.floodgate.core.database.config.DatabaseConfigLoader;
+import org.geysermc.floodgate.database.config.DatabaseConfig;
+import org.geysermc.floodgate.database.config.DatabaseConfigLoader;
 import org.geysermc.floodgate.core.event.lifecycle.ShutdownEvent;
 import org.geysermc.floodgate.core.util.InjectorHolder;
 

diff --git a/database/mongo/src/main/java/org/geysermc/floodgate/database/config/MongoConfig.java b/database/mongo/src/main/java/org/geysermc/floodgate/database/config/MongoConfig.java
@@ -26,7 +26,6 @@
 package org.geysermc.floodgate.database.config;
 
 import lombok.Getter;
-import org.geysermc.floodgate.core.database.config.DatabaseConfig;
 
 @Getter
 public class MongoConfig implements DatabaseConfig {

diff --git a/database/mysql/src/main/java/org/geysermc/floodgate/database/config/MysqlConfig.java b/database/mysql/src/main/java/org/geysermc/floodgate/database/config/MysqlConfig.java
@@ -26,7 +26,6 @@
 package org.geysermc.floodgate.database.config;
 
 import lombok.Getter;
-import org.geysermc.floodgate.core.database.config.DatabaseConfig;
 
 @Getter
 public class MysqlConfig implements DatabaseConfig {