GeyserMC-Mirror/Floodgate
1
0
Fork 0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2025-12-19 14:59:20 +00:00
Code Issues Releases Activity

"""fix""": don't put linking related classes in core repackaged modules to ensure "current" database impls for local linking continue to work

Browse Source
This commit is contained in:
onebeastchris
2024-09-13 01:39:08 +08:00
parent f8323fde71
commit 00e0d84245
11 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/geysermc/floodgate/core/command/LinkAccountCommand.java
View File

@@ -37,7 +37,7 @@ import org.geysermc.floodgate.api.link.PlayerLink;
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;

2
core/src/main/java/org/geysermc/floodgate/core/command/UnlinkAccountCommand.java
View File

@@ -34,7 +34,7 @@ import org.geysermc.floodgate.api.FloodgateApi;
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;

2
core/src/main/java/org/geysermc/floodgate/core/module/CommonModule.java
View File

@@ -65,7 +65,7 @@ import org.geysermc.floodgate.core.event.EventBus;
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;

2
core/src/main/java/org/geysermc/floodgate/core/link/CommonPlayerLink.java → core/src/main/java/org/geysermc/floodgate/link/CommonPlayerLink.java
View File

@@ -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;

2
core/src/main/java/org/geysermc/floodgate/core/link/DisabledPlayerLink.java → core/src/main/java/org/geysermc/floodgate/link/DisabledPlayerLink.java
View File

@@ -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;

2
core/src/main/java/org/geysermc/floodgate/core/link/GlobalPlayerLinking.java → core/src/main/java/org/geysermc/floodgate/link/GlobalPlayerLinking.java
View File

@@ -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;

2
core/src/main/java/org/geysermc/floodgate/core/link/LinkRequestImpl.java → core/src/main/java/org/geysermc/floodgate/link/LinkRequestImpl.java
View File

@@ -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;

2
core/src/main/java/org/geysermc/floodgate/core/link/PlayerLinkHolder.java → core/src/main/java/org/geysermc/floodgate/link/PlayerLinkHolder.java
View File

@@ -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;

4
database/mongo/src/main/java/org/geysermc/floodgate/database/MongoDbDatabase.java
View File

@@ -51,8 +51,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.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 {

4
database/mysql/src/main/java/org/geysermc/floodgate/database/MysqlDatabase.java
View File

@@ -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.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 {

4
database/sqlite/src/main/java/org/geysermc/floodgate/database/SqliteDatabase.java
View File

@@ -42,8 +42,8 @@ import javax.inject.Named;
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 {