Repackage core module

GeyserMC · Jul 13, 2024 · 9293b13 · 9293b13
1 parent 49bd564
commit 9293b13
Show file tree

Hide file tree

Showing 159 changed files with 641 additions and 603 deletions.
diff --git a/bungee/src/main/java/org/geysermc/floodgate/BungeePlugin.java b/bungee/src/main/java/org/geysermc/floodgate/BungeePlugin.java
@@ -29,13 +29,14 @@
 import com.google.inject.Injector;
 import net.md_5.bungee.api.plugin.Plugin;
 import org.geysermc.floodgate.api.logger.FloodgateLogger;
+import org.geysermc.floodgate.core.FloodgatePlatform;
 import org.geysermc.floodgate.module.BungeeAddonModule;
 import org.geysermc.floodgate.module.BungeeListenerModule;
 import org.geysermc.floodgate.module.BungeePlatformModule;
-import org.geysermc.floodgate.module.CommandModule;
-import org.geysermc.floodgate.module.PluginMessageModule;
-import org.geysermc.floodgate.module.ProxyCommonModule;
-import org.geysermc.floodgate.util.ReflectionUtils;
+import org.geysermc.floodgate.core.module.CommandModule;
+import org.geysermc.floodgate.core.module.PluginMessageModule;
+import org.geysermc.floodgate.core.module.ProxyCommonModule;
+import org.geysermc.floodgate.core.util.ReflectionUtils;
 
 public final class BungeePlugin extends Plugin {
     private FloodgatePlatform platform;

diff --git a/bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeDataAddon.java b/bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeDataAddon.java
@@ -29,12 +29,13 @@
 import com.google.inject.name.Named;
 import io.netty.channel.Channel;
 import io.netty.util.AttributeKey;
-import org.geysermc.floodgate.api.ProxyFloodgateApi;
+import org.geysermc.floodgate.core.addon.data.PacketBlocker;
+import org.geysermc.floodgate.core.api.ProxyFloodgateApi;
 import org.geysermc.floodgate.api.inject.InjectorAddon;
 import org.geysermc.floodgate.api.logger.FloodgateLogger;
 import org.geysermc.floodgate.api.player.FloodgatePlayer;
-import org.geysermc.floodgate.config.ProxyFloodgateConfig;
-import org.geysermc.floodgate.player.FloodgateHandshakeHandler;
+import org.geysermc.floodgate.core.config.ProxyFloodgateConfig;
+import org.geysermc.floodgate.core.player.FloodgateHandshakeHandler;
 
 public class BungeeDataAddon implements InjectorAddon {
     @Inject private FloodgateHandshakeHandler handshakeHandler;

diff --git a/bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeProxyDataHandler.java b/bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeProxyDataHandler.java
@@ -37,9 +37,11 @@
 import net.md_5.bungee.protocol.DefinedPacket;
 import net.md_5.bungee.protocol.PacketWrapper;
 import net.md_5.bungee.protocol.packet.Handshake;
-import org.geysermc.floodgate.config.ProxyFloodgateConfig;
-import org.geysermc.floodgate.player.FloodgateHandshakeHandler;
-import org.geysermc.floodgate.util.ReflectionUtils;
+import org.geysermc.floodgate.core.addon.data.CommonDataHandler;
+import org.geysermc.floodgate.core.addon.data.PacketBlocker;
+import org.geysermc.floodgate.core.config.ProxyFloodgateConfig;
+import org.geysermc.floodgate.core.player.FloodgateHandshakeHandler;
+import org.geysermc.floodgate.core.util.ReflectionUtils;
 
 @SuppressWarnings("ConstantConditions")
 public class BungeeProxyDataHandler extends CommonDataHandler {

diff --git a/bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeServerDataHandler.java b/bungee/src/main/java/org/geysermc/floodgate/addon/data/BungeeServerDataHandler.java
@@ -39,11 +39,11 @@
 import net.md_5.bungee.netty.HandlerBoss;
 import net.md_5.bungee.netty.PacketHandler;
 import net.md_5.bungee.protocol.packet.Handshake;
-import org.geysermc.floodgate.api.ProxyFloodgateApi;
+import org.geysermc.floodgate.core.api.ProxyFloodgateApi;
 import org.geysermc.floodgate.api.player.FloodgatePlayer;
-import org.geysermc.floodgate.player.FloodgatePlayerImpl;
+import org.geysermc.floodgate.core.player.FloodgatePlayerImpl;
 import org.geysermc.floodgate.util.BedrockData;
-import org.geysermc.floodgate.util.ReflectionUtils;
+import org.geysermc.floodgate.core.util.ReflectionUtils;
 
 @SuppressWarnings("ConstantConditions")
 @RequiredArgsConstructor

diff --git a/bungee/src/main/java/org/geysermc/floodgate/inject/bungee/BungeeInjector.java b/bungee/src/main/java/org/geysermc/floodgate/inject/bungee/BungeeInjector.java
@@ -38,9 +38,9 @@
 import net.md_5.bungee.protocol.Varint21LengthFieldExtraBufPrepender;
 import net.md_5.bungee.protocol.Varint21LengthFieldPrepender;
 import org.geysermc.floodgate.api.logger.FloodgateLogger;
-import org.geysermc.floodgate.inject.CommonPlatformInjector;
+import org.geysermc.floodgate.core.inject.CommonPlatformInjector;
 import org.geysermc.floodgate.util.BungeeReflectionUtils;
-import org.geysermc.floodgate.util.ReflectionUtils;
+import org.geysermc.floodgate.core.util.ReflectionUtils;
 
 @RequiredArgsConstructor
 public final class BungeeInjector extends CommonPlatformInjector {

diff --git a/bungee/src/main/java/org/geysermc/floodgate/listener/BungeeListener.java b/bungee/src/main/java/org/geysermc/floodgate/listener/BungeeListener.java
@@ -44,14 +44,14 @@
 import net.md_5.bungee.event.EventHandler;
 import net.md_5.bungee.event.EventPriority;
 import net.md_5.bungee.netty.ChannelWrapper;
-import org.geysermc.floodgate.api.ProxyFloodgateApi;
+import org.geysermc.floodgate.core.api.ProxyFloodgateApi;
 import org.geysermc.floodgate.api.logger.FloodgateLogger;
 import org.geysermc.floodgate.api.player.FloodgatePlayer;
-import org.geysermc.floodgate.skin.SkinApplier;
-import org.geysermc.floodgate.skin.SkinDataImpl;
-import org.geysermc.floodgate.util.LanguageManager;
-import org.geysermc.floodgate.util.MojangUtils;
-import org.geysermc.floodgate.util.ReflectionUtils;
+import org.geysermc.floodgate.core.skin.SkinApplier;
+import org.geysermc.floodgate.core.skin.SkinDataImpl;
+import org.geysermc.floodgate.core.util.LanguageManager;
+import org.geysermc.floodgate.core.util.MojangUtils;
+import org.geysermc.floodgate.core.util.ReflectionUtils;
 
 @SuppressWarnings("ConstantConditions")
 public final class BungeeListener implements Listener {

diff --git a/bungee/src/main/java/org/geysermc/floodgate/listener/BungeeListenerRegistration.java b/bungee/src/main/java/org/geysermc/floodgate/listener/BungeeListenerRegistration.java
@@ -30,7 +30,7 @@
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.plugin.Listener;
 import org.geysermc.floodgate.BungeePlugin;
-import org.geysermc.floodgate.platform.listener.ListenerRegistration;
+import org.geysermc.floodgate.core.platform.listener.ListenerRegistration;
 
 @RequiredArgsConstructor(onConstructor = @__(@Inject))
 public final class BungeeListenerRegistration implements ListenerRegistration<Listener> {

diff --git a/bungee/src/main/java/org/geysermc/floodgate/module/BungeeAddonModule.java b/bungee/src/main/java/org/geysermc/floodgate/module/BungeeAddonModule.java
@@ -28,12 +28,12 @@
 import com.google.inject.AbstractModule;
 import com.google.inject.Singleton;
 import com.google.inject.multibindings.ProvidesIntoSet;
-import org.geysermc.floodgate.addon.AddonManagerAddon;
-import org.geysermc.floodgate.addon.DebugAddon;
-import org.geysermc.floodgate.addon.PacketHandlerAddon;
+import org.geysermc.floodgate.core.addon.AddonManagerAddon;
+import org.geysermc.floodgate.core.addon.DebugAddon;
+import org.geysermc.floodgate.core.addon.PacketHandlerAddon;
 import org.geysermc.floodgate.addon.data.BungeeDataAddon;
 import org.geysermc.floodgate.api.inject.InjectorAddon;
-import org.geysermc.floodgate.register.AddonRegister;
+import org.geysermc.floodgate.core.register.AddonRegister;
 
 public final class BungeeAddonModule extends AbstractModule {
     @Override

diff --git a/bungee/src/main/java/org/geysermc/floodgate/module/BungeeListenerModule.java b/bungee/src/main/java/org/geysermc/floodgate/module/BungeeListenerModule.java
@@ -31,8 +31,8 @@
 import com.google.inject.multibindings.ProvidesIntoSet;
 import net.md_5.bungee.api.plugin.Listener;
 import org.geysermc.floodgate.listener.BungeeListener;
-import org.geysermc.floodgate.platform.pluginmessage.PluginMessageUtils;
-import org.geysermc.floodgate.register.ListenerRegister;
+import org.geysermc.floodgate.core.platform.pluginmessage.PluginMessageUtils;
+import org.geysermc.floodgate.core.register.ListenerRegister;
 
 public final class BungeeListenerModule extends AbstractModule {
     @Override

diff --git a/bungee/src/main/java/org/geysermc/floodgate/module/BungeePlatformModule.java b/bungee/src/main/java/org/geysermc/floodgate/module/BungeePlatformModule.java
@@ -37,26 +37,26 @@
 import org.geysermc.floodgate.BungeePlugin;
 import org.geysermc.floodgate.api.FloodgateApi;
 import org.geysermc.floodgate.api.logger.FloodgateLogger;
-import org.geysermc.floodgate.inject.CommonPlatformInjector;
+import org.geysermc.floodgate.core.inject.CommonPlatformInjector;
 import org.geysermc.floodgate.inject.bungee.BungeeInjector;
 import org.geysermc.floodgate.listener.BungeeListenerRegistration;
-import org.geysermc.floodgate.logger.JavaUtilFloodgateLogger;
-import org.geysermc.floodgate.platform.command.CommandUtil;
-import org.geysermc.floodgate.platform.listener.ListenerRegistration;
-import org.geysermc.floodgate.platform.pluginmessage.PluginMessageUtils;
-import org.geysermc.floodgate.platform.util.PlatformUtils;
-import org.geysermc.floodgate.player.FloodgateCommandPreprocessor;
-import org.geysermc.floodgate.player.UserAudience;
-import org.geysermc.floodgate.player.audience.FloodgateSenderMapper;
+import org.geysermc.floodgate.core.logger.JavaUtilFloodgateLogger;
+import org.geysermc.floodgate.core.platform.command.CommandUtil;
+import org.geysermc.floodgate.core.platform.listener.ListenerRegistration;
+import org.geysermc.floodgate.core.platform.pluginmessage.PluginMessageUtils;
+import org.geysermc.floodgate.core.platform.util.PlatformUtils;
+import org.geysermc.floodgate.core.player.FloodgateCommandPreprocessor;
+import org.geysermc.floodgate.core.player.UserAudience;
+import org.geysermc.floodgate.core.player.audience.FloodgateSenderMapper;
 import org.geysermc.floodgate.pluginmessage.BungeePluginMessageRegistration;
 import org.geysermc.floodgate.pluginmessage.BungeePluginMessageUtils;
 import org.geysermc.floodgate.pluginmessage.BungeeSkinApplier;
-import org.geysermc.floodgate.pluginmessage.PluginMessageManager;
-import org.geysermc.floodgate.pluginmessage.PluginMessageRegistration;
-import org.geysermc.floodgate.skin.SkinApplier;
+import org.geysermc.floodgate.core.pluginmessage.PluginMessageManager;
+import org.geysermc.floodgate.core.pluginmessage.PluginMessageRegistration;
+import org.geysermc.floodgate.core.skin.SkinApplier;
 import org.geysermc.floodgate.util.BungeeCommandUtil;
 import org.geysermc.floodgate.util.BungeePlatformUtils;
-import org.geysermc.floodgate.util.LanguageManager;
+import org.geysermc.floodgate.core.util.LanguageManager;
 import org.incendo.cloud.CommandManager;
 import org.incendo.cloud.bungee.BungeeCommandManager;
 import org.incendo.cloud.execution.ExecutionCoordinator;

diff --git a/...e/src/main/java/org/geysermc/floodgate/pluginmessage/BungeePluginMessageRegistration.java b/...e/src/main/java/org/geysermc/floodgate/pluginmessage/BungeePluginMessageRegistration.java
@@ -26,6 +26,8 @@
 package org.geysermc.floodgate.pluginmessage;
 
 import net.md_5.bungee.api.ProxyServer;
+import org.geysermc.floodgate.core.pluginmessage.PluginMessageChannel;
+import org.geysermc.floodgate.core.pluginmessage.PluginMessageRegistration;
 
 public class BungeePluginMessageRegistration implements PluginMessageRegistration {
     @Override

diff --git a/bungee/src/main/java/org/geysermc/floodgate/pluginmessage/BungeePluginMessageUtils.java b/bungee/src/main/java/org/geysermc/floodgate/pluginmessage/BungeePluginMessageUtils.java
@@ -37,9 +37,11 @@
 import net.md_5.bungee.event.EventHandler;
 import net.md_5.bungee.event.EventPriority;
 import org.geysermc.floodgate.api.logger.FloodgateLogger;
-import org.geysermc.floodgate.platform.pluginmessage.PluginMessageUtils;
-import org.geysermc.floodgate.pluginmessage.PluginMessageChannel.Identity;
-import org.geysermc.floodgate.pluginmessage.PluginMessageChannel.Result;
+import org.geysermc.floodgate.core.pluginmessage.PluginMessageChannel;
+import org.geysermc.floodgate.core.pluginmessage.PluginMessageManager;
+import org.geysermc.floodgate.core.platform.pluginmessage.PluginMessageUtils;
+import org.geysermc.floodgate.core.pluginmessage.PluginMessageChannel.Identity;
+import org.geysermc.floodgate.core.pluginmessage.PluginMessageChannel.Result;
 
 @RequiredArgsConstructor
 public final class BungeePluginMessageUtils extends PluginMessageUtils implements Listener {

diff --git a/bungee/src/main/java/org/geysermc/floodgate/pluginmessage/BungeeSkinApplier.java b/bungee/src/main/java/org/geysermc/floodgate/pluginmessage/BungeeSkinApplier.java
@@ -26,7 +26,7 @@
 package org.geysermc.floodgate.pluginmessage;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static org.geysermc.floodgate.util.ReflectionUtils.getFieldOfType;
+import static org.geysermc.floodgate.core.util.ReflectionUtils.getFieldOfType;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
@@ -43,11 +43,11 @@
 import org.geysermc.floodgate.api.event.skin.SkinApplyEvent.SkinData;
 import org.geysermc.floodgate.api.logger.FloodgateLogger;
 import org.geysermc.floodgate.api.player.FloodgatePlayer;
-import org.geysermc.floodgate.event.EventBus;
-import org.geysermc.floodgate.event.skin.SkinApplyEventImpl;
-import org.geysermc.floodgate.skin.SkinApplier;
-import org.geysermc.floodgate.skin.SkinDataImpl;
-import org.geysermc.floodgate.util.ReflectionUtils;
+import org.geysermc.floodgate.core.event.EventBus;
+import org.geysermc.floodgate.core.event.skin.SkinApplyEventImpl;
+import org.geysermc.floodgate.core.skin.SkinApplier;
+import org.geysermc.floodgate.core.skin.SkinDataImpl;
+import org.geysermc.floodgate.core.util.ReflectionUtils;
 
 @Singleton
 public final class BungeeSkinApplier implements SkinApplier {

diff --git a/bungee/src/main/java/org/geysermc/floodgate/util/BungeeCommandUtil.java b/bungee/src/main/java/org/geysermc/floodgate/util/BungeeCommandUtil.java
@@ -33,10 +33,12 @@
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.geysermc.floodgate.api.FloodgateApi;
-import org.geysermc.floodgate.platform.command.CommandUtil;
-import org.geysermc.floodgate.player.UserAudience;
-import org.geysermc.floodgate.player.UserAudience.ConsoleAudience;
-import org.geysermc.floodgate.player.UserAudience.PlayerAudience;
+import org.geysermc.floodgate.core.util.LanguageManager;
+import org.geysermc.floodgate.core.util.Utils;
+import org.geysermc.floodgate.core.platform.command.CommandUtil;
+import org.geysermc.floodgate.core.player.UserAudience;
+import org.geysermc.floodgate.core.player.UserAudience.ConsoleAudience;
+import org.geysermc.floodgate.core.player.UserAudience.PlayerAudience;
 
 public final class BungeeCommandUtil extends CommandUtil {
     private final ProxyServer server;

diff --git a/bungee/src/main/java/org/geysermc/floodgate/util/BungeePlatformUtils.java b/bungee/src/main/java/org/geysermc/floodgate/util/BungeePlatformUtils.java
@@ -29,7 +29,8 @@
 import java.util.List;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.protocol.ProtocolConstants;
-import org.geysermc.floodgate.platform.util.PlatformUtils;
+import org.geysermc.floodgate.core.util.ReflectionUtils;
+import org.geysermc.floodgate.core.platform.util.PlatformUtils;
 
 @SuppressWarnings("ConstantConditions")
 public final class BungeePlatformUtils extends PlatformUtils {

diff --git a/bungee/src/main/java/org/geysermc/floodgate/util/BungeeReflectionUtils.java b/bungee/src/main/java/org/geysermc/floodgate/util/BungeeReflectionUtils.java
@@ -25,7 +25,7 @@
 
 package org.geysermc.floodgate.util;
 
-import static org.geysermc.floodgate.util.MessageFormatter.format;
+import static org.geysermc.floodgate.core.util.MessageFormatter.format;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;

diff --git a/...geysermc/floodgate/FloodgatePlatform.java → ...rmc/floodgate/core/FloodgatePlatform.java b/...geysermc/floodgate/FloodgatePlatform.java → ...rmc/floodgate/core/FloodgatePlatform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org
+ * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,7 @@
  * @link https://github.com/GeyserMC/Floodgate
  */
 
-package org.geysermc.floodgate;
+package org.geysermc.floodgate.core;
 
 import com.google.inject.Inject;
 import com.google.inject.Injector;
@@ -36,11 +36,11 @@
 import org.geysermc.floodgate.api.inject.PlatformInjector;
 import org.geysermc.floodgate.api.link.PlayerLink;
 import org.geysermc.floodgate.api.packet.PacketHandlers;
-import org.geysermc.floodgate.config.FloodgateConfig;
-import org.geysermc.floodgate.event.EventBus;
-import org.geysermc.floodgate.event.lifecycle.PostEnableEvent;
-import org.geysermc.floodgate.event.lifecycle.ShutdownEvent;
-import org.geysermc.floodgate.module.PostInitializeModule;
+import org.geysermc.floodgate.core.config.FloodgateConfig;
+import org.geysermc.floodgate.core.event.EventBus;
+import org.geysermc.floodgate.core.event.lifecycle.PostEnableEvent;
+import org.geysermc.floodgate.core.event.lifecycle.ShutdownEvent;
+import org.geysermc.floodgate.core.module.PostInitializeModule;
 
 public class FloodgatePlatform {
     private static final UUID KEY = UUID.randomUUID();

diff --git a/...mc/floodgate/addon/AddonManagerAddon.java → ...oodgate/core/addon/AddonManagerAddon.java b/...mc/floodgate/addon/AddonManagerAddon.java → ...oodgate/core/addon/AddonManagerAddon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org
+ * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,12 +23,12 @@
  * @link https://github.com/GeyserMC/Floodgate
  */
 
-package org.geysermc.floodgate.addon;
+package org.geysermc.floodgate.core.addon;
 
 import com.google.inject.Inject;
 import io.netty.channel.Channel;
 import org.geysermc.floodgate.api.inject.InjectorAddon;
-import org.geysermc.floodgate.inject.CommonPlatformInjector;
+import org.geysermc.floodgate.core.inject.CommonPlatformInjector;
 
 public final class AddonManagerAddon implements InjectorAddon {
     @Inject private CommonPlatformInjector injector;

diff --git a/.../geysermc/floodgate/addon/DebugAddon.java → ...ermc/floodgate/core/addon/DebugAddon.java b/.../geysermc/floodgate/addon/DebugAddon.java → ...ermc/floodgate/core/addon/DebugAddon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org
+ * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,19 +23,19 @@
  * @link https://github.com/GeyserMC/Floodgate
  */
 
-package org.geysermc.floodgate.addon;
+package org.geysermc.floodgate.core.addon;
 
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelPipeline;
 import java.util.concurrent.atomic.AtomicInteger;
-import org.geysermc.floodgate.addon.debug.ChannelInDebugHandler;
-import org.geysermc.floodgate.addon.debug.ChannelOutDebugHandler;
+import org.geysermc.floodgate.core.addon.debug.ChannelInDebugHandler;
+import org.geysermc.floodgate.core.addon.debug.ChannelOutDebugHandler;
 import org.geysermc.floodgate.api.inject.InjectorAddon;
 import org.geysermc.floodgate.api.logger.FloodgateLogger;
-import org.geysermc.floodgate.config.FloodgateConfig;
-import org.geysermc.floodgate.util.Utils;
+import org.geysermc.floodgate.core.config.FloodgateConfig;
+import org.geysermc.floodgate.core.util.Utils;
 
 public final class DebugAddon implements InjectorAddon {
     @Inject private FloodgateConfig config;

diff --git a/...c/floodgate/addon/PacketHandlerAddon.java → ...odgate/core/addon/PacketHandlerAddon.java b/...c/floodgate/addon/PacketHandlerAddon.java → ...odgate/core/addon/PacketHandlerAddon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 GeyserMC. http://geysermc.org
+ * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,17 +23,17 @@
  * @link https://github.com/GeyserMC/Floodgate
  */
 
-package org.geysermc.floodgate.addon;
+package org.geysermc.floodgate.core.addon;
 
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelPipeline;
-import org.geysermc.floodgate.addon.packethandler.ChannelInPacketHandler;
-import org.geysermc.floodgate.addon.packethandler.ChannelOutPacketHandler;
+import org.geysermc.floodgate.core.addon.packethandler.ChannelInPacketHandler;
+import org.geysermc.floodgate.core.addon.packethandler.ChannelOutPacketHandler;
 import org.geysermc.floodgate.api.inject.InjectorAddon;
-import org.geysermc.floodgate.packet.PacketHandlersImpl;
-import org.geysermc.floodgate.util.Utils;
+import org.geysermc.floodgate.core.packet.PacketHandlersImpl;
+import org.geysermc.floodgate.core.util.Utils;
 
 public class PacketHandlerAddon implements InjectorAddon {
     @Inject private PacketHandlersImpl packetHandlers;