Skip to content

Commit

Permalink
"""fix""": don't put linking related classes in core repackaged modul…
Browse files Browse the repository at this point in the history
…es to ensure "current" database impls for local linking continue to work
onebeastchris committed Sep 12, 2024
1 parent f8323fd commit 00e0d84
Showing 11 changed files with 14 additions and 14 deletions.
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;

Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -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;

Original file line number Diff line number Diff line change
@@ -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 {
Original file line number Diff line number Diff line change
@@ -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 {
Original file line number Diff line number Diff line change
@@ -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 {

0 comments on commit 00e0d84

Please sign in to comment.