Remove incorrect extend for ServerLoginPacketListenerBridge; use Mojang name for some network mixins.

Author: InitAuther97

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/login/ServerLoginNetHandlerBridge.java arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/login/ServerLoginPacketListenerBridge.java

@@ -1,12 +1,11 @@
 package io.izzel.arclight.common.bridge.core.network.login;
 
 import com.mojang.authlib.GameProfile;
-import io.izzel.arclight.common.bridge.core.network.common.ServerCommonPacketListenerBridge;
 import io.izzel.arclight.common.mod.util.ArclightCustomQueryAnswerPayload;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.protocol.login.ServerboundCustomQueryAnswerPacket;
 
-public interface ServerLoginNetHandlerBridge extends ServerCommonPacketListenerBridge {
+public interface ServerLoginPacketListenerBridge {
     default Thread bridge$newHandleThread(String name, Runnable runnable) {
         return new Thread(runnable, name);
     }
@@ -15,6 +14,8 @@ public interface ServerLoginNetHandlerBridge extends ServerCommonPacketListenerB
 
     void bridge$preLogin(GameProfile authenticatedProfile) throws Exception;
 
+    void bridge$disconnect(String reason);
+
     default FriendlyByteBuf bridge$getDiscardedQueryAnswerData(ServerboundCustomQueryAnswerPacket packet) {
         return packet.payload() instanceof ArclightCustomQueryAnswerPayload payload
             ? new FriendlyByteBuf(payload.buf())

arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/play/ServerPlayNetHandlerBridge.java arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/network/play/ServerGamePacketListenerBridge.java

@@ -14,7 +14,7 @@
 import org.bukkit.Location;
 import org.bukkit.event.player.PlayerTeleportEvent;
 
-public interface ServerPlayNetHandlerBridge extends ServerCommonPacketListenerBridge {
+public interface ServerGamePacketListenerBridge extends ServerCommonPacketListenerBridge {
 
     void bridge$pushTeleportCause(PlayerTeleportEvent.TeleportCause cause);
 

arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerGamePacketListenerImplMixin.java

@@ -4,7 +4,7 @@
 import io.izzel.arclight.common.bridge.core.entity.player.PlayerEntityBridge;
 import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge;
 import io.izzel.arclight.common.bridge.core.inventory.container.ContainerBridge;
-import io.izzel.arclight.common.bridge.core.network.play.ServerPlayNetHandlerBridge;
+import io.izzel.arclight.common.bridge.core.network.play.ServerGamePacketListenerBridge;
 import io.izzel.arclight.common.bridge.core.network.play.TimestampedPacket;
 import io.izzel.arclight.common.bridge.core.server.MinecraftServerBridge;
 import io.izzel.arclight.common.bridge.core.server.management.PlayerInteractionManagerBridge;
@@ -139,7 +139,6 @@
 import org.bukkit.inventory.CraftingInventory;
 import org.bukkit.inventory.InventoryView;
 import org.bukkit.inventory.SmithingInventory;
-import org.objectweb.asm.Opcodes;
 import org.slf4j.Logger;
 import org.spigotmc.SpigotConfig;
 import org.spongepowered.asm.mixin.Final;
@@ -167,7 +166,7 @@
 import java.util.logging.Level;
 
 @Mixin(ServerGamePacketListenerImpl.class)
-public abstract class ServerGamePacketListenerImplMixin extends ServerCommonPacketListenerImplMixin implements ServerPlayNetHandlerBridge {
+public abstract class ServerGamePacketListenerImplMixin extends ServerCommonPacketListenerImplMixin implements ServerGamePacketListenerBridge {
 
     // @formatter:off
     @Shadow public ServerPlayer player;

arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ServerLoginPacketListenerImplMixin.java

@@ -5,7 +5,7 @@
 import com.mojang.authlib.properties.Property;
 import io.izzel.arclight.common.bridge.core.network.NetworkManagerBridge;
 import io.izzel.arclight.common.bridge.core.network.common.ServerCommonPacketListenerBridge;
-import io.izzel.arclight.common.bridge.core.network.login.ServerLoginNetHandlerBridge;
+import io.izzel.arclight.common.bridge.core.network.login.ServerLoginPacketListenerBridge;
 import io.izzel.arclight.common.bridge.core.server.MinecraftServerBridge;
 import io.izzel.arclight.common.bridge.core.server.management.PlayerListBridge;
 import io.izzel.arclight.common.mod.util.VelocitySupport;
@@ -67,7 +67,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 @Mixin(ServerLoginPacketListenerImpl.class)
-public abstract class ServerLoginPacketListenerImplMixin implements ServerLoginNetHandlerBridge, CraftPlayer.TransferCookieConnection {
+public abstract class ServerLoginPacketListenerImplMixin implements ServerLoginPacketListenerBridge, CraftPlayer.TransferCookieConnection {
 
     // @formatter:off
     @Shadow private ServerLoginPacketListenerImpl.State state;

arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/level/ServerPlayerMixin.java

@@ -5,7 +5,7 @@
 import io.izzel.arclight.common.bridge.core.entity.InternalEntityBridge;
 import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge;
 import io.izzel.arclight.common.bridge.core.inventory.container.ContainerBridge;
-import io.izzel.arclight.common.bridge.core.network.play.ServerPlayNetHandlerBridge;
+import io.izzel.arclight.common.bridge.core.network.play.ServerGamePacketListenerBridge;
 import io.izzel.arclight.common.bridge.core.util.FoodStatsBridge;
 import io.izzel.arclight.common.bridge.core.world.WorldBridge;
 import io.izzel.arclight.common.bridge.core.world.damagesource.CombatTrackerBridge;
@@ -457,7 +457,7 @@ public ItemEntity drop(ItemStack itemstack, boolean flag, boolean flag1, boolean
 
             PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn, isAnchorSpawn, arclight$respawnReason);
             Bukkit.getPluginManager().callEvent(respawnEvent);
-            if (((ServerPlayNetHandlerBridge) this.connection).bridge$isDisconnected()) {
+            if (((ServerGamePacketListenerBridge) this.connection).bridge$isDisconnected()) {
                 DecorationOps.cancel().invoke((DimensionTransition) null);
                 return;
             }
@@ -493,7 +493,7 @@ public boolean teleportTo(ServerLevel worldserver, double d0, double d1, double
     private void arclight$forwardReason(ServerLevel p_265564_, double p_265424_, double p_265680_, double p_265312_, Set<RelativeMovement> p_265192_, float p_265059_, float p_265266_, CallbackInfoReturnable<Boolean> cir) {
         var teleportCause = arclight$cause;
         arclight$cause = null;
-        ((ServerPlayNetHandlerBridge) this.connection).bridge$pushTeleportCause(teleportCause);
+        ((ServerGamePacketListenerBridge) this.connection).bridge$pushTeleportCause(teleportCause);
     }
 
     @Override
@@ -509,7 +509,7 @@ public CraftPortalEvent callPortalEvent(Entity entity, Location exit, PlayerTele
 
     @Inject(method = "changeDimension", cancellable = true, at = @At(value = "INVOKE", ordinal = 0, target = "Lnet/minecraft/server/network/ServerGamePacketListenerImpl;teleport(DDDFF)V"))
     private void arclight$cancelledTeleport(DimensionTransition dimensionTransition, CallbackInfoReturnable<Entity> cir) {
-        if (((ServerPlayNetHandlerBridge) this.connection).bridge$teleportCancelled()) {
+        if (((ServerGamePacketListenerBridge) this.connection).bridge$teleportCancelled()) {
             cir.setReturnValue(null);
         }
     }
@@ -527,7 +527,7 @@ public CraftPortalEvent callPortalEvent(Entity entity, Location exit, PlayerTele
         exit = tpEvent.getTo();
         newLevel = ((CraftWorld) exit.getWorld()).getHandle();
         dimensionTransition = new DimensionTransition(newLevel, new Vec3(exit.getX(), exit.getY(), exit.getZ()), dimensionTransition.speed(), exit.getYaw(), exit.getPitch(), dimensionTransition.postDimensionTransition());
-        ((ServerPlayNetHandlerBridge) this.connection).bridge$pushNoTeleportEvent();
+        ((ServerGamePacketListenerBridge) this.connection).bridge$pushNoTeleportEvent();
         DecorationOps.blackhole().invoke(newLevel, dimensionTransition);
     }
 
@@ -608,7 +608,7 @@ private Either<Player.BedSleepingProblem, Unit> getBedResult(BlockPos blockposit
             ci.cancel();
         } else {
             if (this.connection != null) {
-                ((ServerPlayNetHandlerBridge) this.connection).bridge$pushTeleportCause(PlayerTeleportEvent.TeleportCause.EXIT_BED);
+                ((ServerGamePacketListenerBridge) this.connection).bridge$pushTeleportCause(PlayerTeleportEvent.TeleportCause.EXIT_BED);
             }
         }
     }

arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerListMixin.java

@@ -6,7 +6,7 @@
 import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge;
 import io.izzel.arclight.common.bridge.core.network.NetworkManagerBridge;
 import io.izzel.arclight.common.bridge.core.network.datasync.SynchedEntityDataBridge;
-import io.izzel.arclight.common.bridge.core.network.play.ServerPlayNetHandlerBridge;
+import io.izzel.arclight.common.bridge.core.network.play.ServerGamePacketListenerBridge;
 import io.izzel.arclight.common.bridge.core.server.management.PlayerListBridge;
 import io.izzel.arclight.common.bridge.core.world.WorldBridge;
 import io.izzel.arclight.common.mod.server.ArclightServer;
@@ -314,14 +314,14 @@ public ServerPlayer respawn(ServerPlayer playerIn, boolean flag, Entity.RemovalR
         playerIn.connection.send(new ClientboundRespawnPacket(playerIn.createCommonSpawnInfo(serverWorld), (byte) (flag ? 1 : 0)));
         playerIn.connection.send(new ClientboundSetChunkCacheRadiusPacket(((WorldBridge) serverWorld).bridge$spigotConfig().viewDistance));
         playerIn.connection.send(new ClientboundSetSimulationDistancePacket(((WorldBridge) serverWorld).bridge$spigotConfig().simulationDistance));
-        ((ServerPlayNetHandlerBridge) playerIn.connection).bridge$teleport(new Location(((WorldBridge) serverWorld).bridge$getWorld(), playerIn.getX(), playerIn.getY(), playerIn.getZ(), playerIn.getYRot(), playerIn.getXRot()));
+        ((ServerGamePacketListenerBridge) playerIn.connection).bridge$teleport(new Location(((WorldBridge) serverWorld).bridge$getWorld(), playerIn.getX(), playerIn.getY(), playerIn.getZ(), playerIn.getYRot(), playerIn.getXRot()));
         playerIn.connection.send(new ClientboundSetDefaultSpawnPositionPacket(serverWorld.getSharedSpawnPos(), serverWorld.getSharedSpawnAngle()));
         playerIn.connection.send(new ClientboundChangeDifficultyPacket(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
         playerIn.connection.send(new ClientboundSetExperiencePacket(playerIn.experienceProgress, playerIn.totalExperience, playerIn.experienceLevel));
         this.sendActivePlayerEffects(playerIn);
         this.sendLevelInfo(playerIn, serverWorld);
         this.sendPlayerPermissionLevel(playerIn);
-        if (!((ServerPlayNetHandlerBridge) playerIn.connection).bridge$isDisconnected()) {
+        if (!((ServerGamePacketListenerBridge) playerIn.connection).bridge$isDisconnected()) {
             serverWorld.addRespawnedPlayer(playerIn);
             this.players.add(playerIn);
             this.playersByUUID.put(playerIn.getUUID(), playerIn);
@@ -343,7 +343,7 @@ public ServerPlayer respawn(ServerPlayer playerIn, boolean flag, Entity.RemovalR
             PlayerChangedWorldEvent event = new PlayerChangedWorldEvent(((ServerPlayerEntityBridge) playerIn).bridge$getBukkitEntity(), fromWorld);
             Bukkit.getPluginManager().callEvent(event);
         }
-        if (((ServerPlayNetHandlerBridge) playerIn.connection).bridge$isDisconnected()) {
+        if (((ServerGamePacketListenerBridge) playerIn.connection).bridge$isDisconnected()) {
             this.save(playerIn);
         }
         return playerIn;
@@ -397,7 +397,7 @@ public ServerPlayer respawn(ServerPlayer playerIn, boolean flag, Entity.RemovalR
     private void arclight$respawnPackets(ServerGamePacketListenerImpl instance, double d, double e, double f, float g, float h, @Local(ordinal = -1) ServerPlayer player) throws Throwable {
         player.connection.send(new ClientboundSetChunkCacheRadiusPacket(((WorldBridge) player.serverLevel()).bridge$spigotConfig().viewDistance));
         player.connection.send(new ClientboundSetSimulationDistancePacket(((WorldBridge) player.serverLevel()).bridge$spigotConfig().simulationDistance));
-        ((ServerPlayNetHandlerBridge) player.connection).bridge$teleport(new Location(player.serverLevel().bridge$getWorld(), player.getX(), player.getY(), player.getZ(), player.getYRot(), player.getXRot()));
+        ((ServerGamePacketListenerBridge) player.connection).bridge$teleport(new Location(player.serverLevel().bridge$getWorld(), player.getX(), player.getY(), player.getZ(), player.getYRot(), player.getXRot()));
         if (Blackhole.actuallyFalse()) {
             DecorationOps.callsite().invoke(instance, d, e, f, g, h);
         }
@@ -416,7 +416,7 @@ public ServerPlayer respawn(ServerPlayer playerIn, boolean flag, Entity.RemovalR
             PlayerChangedWorldEvent event = new PlayerChangedWorldEvent(((ServerPlayerEntityBridge) newPlayer).bridge$getBukkitEntity(), fromWorld.bridge$getWorld());
             Bukkit.getPluginManager().callEvent(event);
         }
-        if (((ServerPlayNetHandlerBridge) newPlayer.connection).bridge$isDisconnected()) {
+        if (((ServerGamePacketListenerBridge) newPlayer.connection).bridge$isDisconnected()) {
             this.save(newPlayer);
         }
     }

arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/LivingEntityMixin.java

@@ -6,7 +6,7 @@
 import com.mojang.datafixers.util.Either;
 import io.izzel.arclight.common.bridge.core.entity.LivingEntityBridge;
 import io.izzel.arclight.common.bridge.core.entity.player.ServerPlayerEntityBridge;
-import io.izzel.arclight.common.bridge.core.network.play.ServerPlayNetHandlerBridge;
+import io.izzel.arclight.common.bridge.core.network.play.ServerGamePacketListenerBridge;
 import io.izzel.arclight.common.mod.server.ArclightServer;
 import io.izzel.arclight.common.mod.util.EntityDamageResult;
 import io.izzel.arclight.common.util.IteratorUtil;
@@ -875,7 +875,7 @@ public boolean isPickable() {
     private void arclight$entityTeleport(LivingEntity entity, double x, double y, double z) throws Throwable {
         if ((Object) this instanceof ServerPlayer) {
             (((ServerPlayer) (Object) this).connection).teleport(x, y, z, this.getYRot(), this.getXRot(), java.util.Collections.emptySet());
-            if (!((ServerPlayNetHandlerBridge) ((ServerPlayer) (Object) this).connection).bridge$teleportCancelled()) {
+            if (!((ServerGamePacketListenerBridge) ((ServerPlayer) (Object) this).connection).bridge$teleportCancelled()) {
                 DecorationOps.cancel().invoke(false);
                 return;
             }

arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/item/ChorusFruitItemMixin.java

@@ -1,6 +1,6 @@
 package io.izzel.arclight.common.mixin.core.world.item;
 
-import io.izzel.arclight.common.bridge.core.network.play.ServerPlayNetHandlerBridge;
+import io.izzel.arclight.common.bridge.core.network.play.ServerGamePacketListenerBridge;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.ChorusFruitItem;
@@ -18,7 +18,7 @@ public class ChorusFruitItemMixin extends ItemMixin {
     @Inject(method = "finishUsingItem", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;randomTeleport(DDDZ)Z"))
     private void arclight$teleportCause(ItemStack itemStack, Level level, LivingEntity livingEntity, CallbackInfoReturnable<ItemStack> cir) {
         if (livingEntity instanceof ServerPlayer p) {
-            ((ServerPlayNetHandlerBridge) p.connection).bridge$pushTeleportCause(PlayerTeleportEvent.TeleportCause.CHORUS_FRUIT);
+            ((ServerGamePacketListenerBridge) p.connection).bridge$pushTeleportCause(PlayerTeleportEvent.TeleportCause.CHORUS_FRUIT);
         }
     }
 }

arclight-fabric/src/main/java/io/izzel/arclight/fabric/mixin/core/network/ServerLoginNetHandlerMixin_Fabric.java arclight-fabric/src/main/java/io/izzel/arclight/fabric/mixin/core/network/ServerLoginPacketListenerImplMixin_Fabric.java

@@ -1,6 +1,6 @@
 package io.izzel.arclight.fabric.mixin.core.network;
 
-import io.izzel.arclight.common.bridge.core.network.login.ServerLoginNetHandlerBridge;
+import io.izzel.arclight.common.bridge.core.network.login.ServerLoginPacketListenerBridge;
 import io.netty.buffer.Unpooled;
 import net.fabricmc.fabric.impl.networking.NetworkHandlerExtensions;
 import net.fabricmc.fabric.impl.networking.payload.PacketByteBufLoginQueryResponse;
@@ -11,7 +11,7 @@
 import org.spongepowered.asm.mixin.Mixin;
 
 @Mixin(ServerLoginPacketListenerImpl.class)
-public abstract class ServerLoginNetHandlerMixin_Fabric implements ServerLoginNetHandlerBridge, NetworkHandlerExtensions {
+public abstract class ServerLoginPacketListenerImplMixin_Fabric implements ServerLoginPacketListenerBridge, NetworkHandlerExtensions {
 
     @Override
     public FriendlyByteBuf bridge$getDiscardedQueryAnswerData(ServerboundCustomQueryAnswerPacket packet) {

arclight-fabric/src/main/resources/mixins.arclight.fabric.json

@@ -19,7 +19,7 @@
     "bukkit.CraftServerMixin_Fabric",
     "core.network.ServerCommonPacketListenerImplMixin_Fabric",
     "core.network.ServerConfigurationPacketListenerImplMixin_Fabric",
-    "core.network.ServerLoginNetHandlerMixin_Fabric",
+    "core.network.ServerLoginPacketListenerImplMixin_Fabric",
     "core.world.entity.EntityMixin_Fabric",
     "core.world.entity.LivingEntityMixin_Fabric",
     "core.world.entity.animal.SheepMixin_Fabric",

arclight-forge/src/main/java/io/izzel/arclight/forge/mixin/core/network/ServerPlayNetHandlerMixin_Forge.java arclight-forge/src/main/java/io/izzel/arclight/forge/mixin/core/network/ServerGamePacketListenerImplMixin_Forge.java

@@ -1,6 +1,6 @@
 package io.izzel.arclight.forge.mixin.core.network;
 
-import io.izzel.arclight.common.bridge.core.network.play.ServerPlayNetHandlerBridge;
+import io.izzel.arclight.common.bridge.core.network.play.ServerGamePacketListenerBridge;
 import io.izzel.tools.product.Product;
 import io.izzel.tools.product.Product3;
 import net.minecraft.network.chat.Component;
@@ -18,7 +18,7 @@
 import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(ServerGamePacketListenerImpl.class)
-public abstract class ServerPlayNetHandlerMixin_Forge extends ServerCommonPacketListenerImplMixin_Forge implements ServerPlayNetHandlerBridge {
+public abstract class ServerGamePacketListenerImplMixin_Forge extends ServerCommonPacketListenerImplMixin_Forge implements ServerGamePacketListenerBridge {
 
     @Shadow public ServerPlayer player;
 

arclight-forge/src/main/java/io/izzel/arclight/forge/mixin/core/network/ServerLoginNetHandlerMixin_Forge.java arclight-forge/src/main/java/io/izzel/arclight/forge/mixin/core/network/ServerLoginPacketListenerImplMixin_Forge.java

@@ -1,12 +1,12 @@
 package io.izzel.arclight.forge.mixin.core.network;
 
-import io.izzel.arclight.common.bridge.core.network.login.ServerLoginNetHandlerBridge;
+import io.izzel.arclight.common.bridge.core.network.login.ServerLoginPacketListenerBridge;
 import net.minecraft.server.network.ServerLoginPacketListenerImpl;
 import net.minecraftforge.fml.util.thread.SidedThreadGroups;
 import org.spongepowered.asm.mixin.Mixin;
 
 @Mixin(ServerLoginPacketListenerImpl.class)
-public abstract class ServerLoginNetHandlerMixin_Forge implements ServerLoginNetHandlerBridge {
+public abstract class ServerLoginPacketListenerImplMixin_Forge implements ServerLoginPacketListenerBridge {
 
     @Override
     public Thread bridge$newHandleThread(String name, Runnable runnable) {

arclight-forge/src/main/resources/mixins.arclight.forge.json

@@ -23,8 +23,8 @@
     "core.fluid.LavaFluidMixin_Forge",
     "core.network.ServerCommonPacketListenerImplMixin_Forge",
     "core.network.ServerHandshakePacketListenerImplMixin_Forge",
-    "core.network.ServerLoginNetHandlerMixin_Forge",
-    "core.network.ServerPlayNetHandlerMixin_Forge",
+    "core.network.ServerLoginPacketListenerImplMixin_Forge",
+    "core.network.ServerGamePacketListenerImplMixin_Forge",
     "core.network.ServerStatusNetHandlerMixin_Forge",
     "core.network.protocol.login.ServerboundCustomQueryAnswerPacketMixin_Forge",
     "core.network.protocol.status.ServerStatusMixin",

arclight-neoforge/src/main/java/io/izzel/arclight/neoforge/mixin/core/network/ServerPlayNetHandlerMixin_NeoForge.java arclight-neoforge/src/main/java/io/izzel/arclight/neoforge/mixin/core/network/ServerGamePacketListenerImplMixin_NeoForge.java

@@ -1,6 +1,6 @@
 package io.izzel.arclight.neoforge.mixin.core.network;
 
-import io.izzel.arclight.common.bridge.core.network.play.ServerPlayNetHandlerBridge;
+import io.izzel.arclight.common.bridge.core.network.play.ServerGamePacketListenerBridge;
 import io.izzel.tools.product.Product;
 import io.izzel.tools.product.Product3;
 import net.minecraft.network.chat.Component;
@@ -17,7 +17,7 @@
 import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(ServerGamePacketListenerImpl.class)
-public abstract class ServerPlayNetHandlerMixin_NeoForge extends ServerCommonPacketListenerImplMixin_NeoForge implements ServerPlayNetHandlerBridge {
+public abstract class ServerGamePacketListenerImplMixin_NeoForge extends ServerCommonPacketListenerImplMixin_NeoForge implements ServerGamePacketListenerBridge {
 
     @Shadow public ServerPlayer player;
 

arclight-neoforge/src/main/java/io/izzel/arclight/neoforge/mixin/core/network/ServerLoginNetHandlerMixin_NeoForge.java arclight-neoforge/src/main/java/io/izzel/arclight/neoforge/mixin/core/network/ServerLoginPacketListenerImplMixin_NeoForge.java

@@ -1,12 +1,12 @@
 package io.izzel.arclight.neoforge.mixin.core.network;
 
-import io.izzel.arclight.common.bridge.core.network.login.ServerLoginNetHandlerBridge;
+import io.izzel.arclight.common.bridge.core.network.login.ServerLoginPacketListenerBridge;
 import net.minecraft.server.network.ServerLoginPacketListenerImpl;
 import net.neoforged.fml.util.thread.SidedThreadGroups;
 import org.spongepowered.asm.mixin.Mixin;
 
 @Mixin(ServerLoginPacketListenerImpl.class)
-public abstract class ServerLoginNetHandlerMixin_NeoForge implements ServerLoginNetHandlerBridge {
+public abstract class ServerLoginPacketListenerImplMixin_NeoForge implements ServerLoginPacketListenerBridge {
 
     @Override
     public Thread bridge$newHandleThread(String name, Runnable runnable) {