diff --git a/src/main/java/dev/micle/loginprotection/events/client/OnClientInputEventHandler.java b/src/main/java/dev/micle/loginprotection/events/client/OnClientInputEventHandler.java
index bd55fb8..1156d73 100644
--- a/src/main/java/dev/micle/loginprotection/events/client/OnClientInputEventHandler.java
+++ b/src/main/java/dev/micle/loginprotection/events/client/OnClientInputEventHandler.java
@@ -60,12 +60,12 @@ public class OnClientInputEventHandler {
     }
 
     @SubscribeEvent
-    public void KeyInputEvent(InputEvent.KeyInputEvent event) {
+    public void KeyInputEvent(InputEvent.Key event) {
         handle(event.getAction(), event.getKey());
     }
 
     @SubscribeEvent
-    public void MouseInputEvent(InputEvent.MouseInputEvent event) {
+    public void MouseInputEvent(InputEvent.MouseButton event) {
         handle(event.getAction(), event.getButton());
     }
 
diff --git a/src/main/java/dev/micle/loginprotection/events/common/OnLivingSetAttackTargetEventHandler.java b/src/main/java/dev/micle/loginprotection/events/common/OnLivingSetAttackTargetEventHandler.java
index 8665116..9993c2a 100644
--- a/src/main/java/dev/micle/loginprotection/events/common/OnLivingSetAttackTargetEventHandler.java
+++ b/src/main/java/dev/micle/loginprotection/events/common/OnLivingSetAttackTargetEventHandler.java
@@ -5,13 +5,13 @@ import dev.micle.loginprotection.data.ProtectedPlayerManager;
 import dev.micle.loginprotection.setup.Config;
 import net.minecraft.world.entity.Mob;
 import net.minecraft.world.entity.player.Player;
-import net.minecraftforge.event.entity.living.LivingSetAttackTargetEvent;
+import net.minecraftforge.event.entity.living.LivingChangeTargetEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 public class OnLivingSetAttackTargetEventHandler {
     @SubscribeEvent
-    public void LivingSetAttackTargetEvent(LivingSetAttackTargetEvent event) {
-        if (!(event.getTarget() instanceof Player target)) {
+    public void LivingSetAttackTargetEvent(LivingChangeTargetEvent event) {
+        if (!(event.getNewTarget() instanceof Player target)) {
             return;
         }
 
@@ -25,7 +25,7 @@ public class OnLivingSetAttackTargetEventHandler {
                 (player.getState().equals(ProtectedPlayer.State.AFK) && Config.Server.AFK_MOBS_IGNORE_PLAYER.get()) ||
                 (player.getState().equals(ProtectedPlayer.State.LOGIN_GRACE) && Config.Server.LOGIN_GRACE_MOBS_IGNORE_PLAYER.get()) ||
                 (player.getState().equals(ProtectedPlayer.State.AFK_GRACE) && Config.Server.AFK_GRACE_MOBS_IGNORE_PLAYER.get())) {
-            ((Mob) event.getEntityLiving()).setTarget(null);
+            ((Mob) event.getEntity()).setTarget(null);
         }
     }
 
diff --git a/src/main/java/dev/micle/loginprotection/events/common/OnPlayerJoinEventHandler.java b/src/main/java/dev/micle/loginprotection/events/common/OnPlayerJoinEventHandler.java
index 80a27fa..f7850ef 100644
--- a/src/main/java/dev/micle/loginprotection/events/common/OnPlayerJoinEventHandler.java
+++ b/src/main/java/dev/micle/loginprotection/events/common/OnPlayerJoinEventHandler.java
@@ -1,17 +1,12 @@
 package dev.micle.loginprotection.events.common;
 
 import dev.micle.loginprotection.data.ProtectedPlayerManager;
-import net.minecraft.world.entity.player.Player;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 public class OnPlayerJoinEventHandler {
     @SubscribeEvent
     public void EntityJoinWorldEvent(PlayerEvent.PlayerLoggedInEvent event) {
-        if (!(event.getEntity() instanceof Player player)) {
-            return;
-        }
-
-        ProtectedPlayerManager.addPlayer(player.getUUID());
+        ProtectedPlayerManager.addPlayer(event.getEntity().getUUID());
     }
 }
diff --git a/src/main/java/dev/micle/loginprotection/events/common/OnPlayerLeaveEventHandler.java b/src/main/java/dev/micle/loginprotection/events/common/OnPlayerLeaveEventHandler.java
index 7626d41..3d2d843 100644
--- a/src/main/java/dev/micle/loginprotection/events/common/OnPlayerLeaveEventHandler.java
+++ b/src/main/java/dev/micle/loginprotection/events/common/OnPlayerLeaveEventHandler.java
@@ -1,17 +1,12 @@
 package dev.micle.loginprotection.events.common;
 
 import dev.micle.loginprotection.data.ProtectedPlayerManager;
-import net.minecraft.world.entity.player.Player;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 public class OnPlayerLeaveEventHandler {
     @SubscribeEvent
     public void PlayerLeaveEvent(PlayerEvent.PlayerLoggedOutEvent event) {
-        if (!(event.getEntity() instanceof Player player)) {
-            return;
-        }
-
-        ProtectedPlayerManager.removePlayer(player.getUUID());
+        ProtectedPlayerManager.removePlayer(event.getEntity().getUUID());
     }
 }
diff --git a/src/main/java/dev/micle/loginprotection/mixin/GuiRenderTickMixin.java b/src/main/java/dev/micle/loginprotection/mixin/GuiRenderTickMixin.java
index 04901f0..6b61d66 100644
--- a/src/main/java/dev/micle/loginprotection/mixin/GuiRenderTickMixin.java
+++ b/src/main/java/dev/micle/loginprotection/mixin/GuiRenderTickMixin.java
@@ -8,13 +8,13 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.client.gui.ForgeIngameGui;
+import net.minecraftforge.client.gui.overlay.ForgeGui;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(ForgeIngameGui.class)
+@Mixin(ForgeGui.class)
 @OnlyIn(Dist.CLIENT)
 public class GuiRenderTickMixin {
     @Inject(method = "render", at = @At(value = "HEAD"))
diff --git a/src/main/java/dev/micle/loginprotection/network/NetworkManager.java b/src/main/java/dev/micle/loginprotection/network/NetworkManager.java
index cca8353..3831f1d 100644
--- a/src/main/java/dev/micle/loginprotection/network/NetworkManager.java
+++ b/src/main/java/dev/micle/loginprotection/network/NetworkManager.java
@@ -24,22 +24,22 @@ public class NetworkManager {
         channel.messageBuilder(InputPacket.class, id++)
                 .encoder(InputPacket::encode)
                 .decoder(InputPacket::decode)
-                .consumer(InputPacket::handle)
+                .consumerNetworkThread(InputPacket::handle)
                 .add();
         channel.messageBuilder(PlayerStatePacket.class, id++)
                 .encoder(PlayerStatePacket::encode)
                 .decoder(PlayerStatePacket::decode)
-                .consumer(PlayerStatePacket::handle)
+                .consumerNetworkThread(PlayerStatePacket::handle)
                 .add();
         channel.messageBuilder(RequestLastInputTickPacket.class, id++)
                 .encoder(RequestLastInputTickPacket::encode)
                 .decoder(RequestLastInputTickPacket::decode)
-                .consumer(RequestLastInputTickPacket::handle)
+                .consumerNetworkThread(RequestLastInputTickPacket::handle)
                 .add();
         channel.messageBuilder(LastInputTickPacket.class, id++)
                 .encoder(LastInputTickPacket::encode)
                 .decoder(LastInputTickPacket::decode)
-                .consumer(LastInputTickPacket::handle)
+                .consumerNetworkThread(LastInputTickPacket::handle)
                 .add();
     }