diff --git a/Anticheat/pom.xml b/Anticheat/pom.xml
index e52f801..a9e95e7 100644
--- a/Anticheat/pom.xml
+++ b/Anticheat/pom.xml
@@ -200,6 +200,18 @@
             <version>2.2</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.viaversion</groupId>
+            <artifactId>viaversion-api</artifactId>
+            <version>LATEST</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.shevchik.protocolsupport</groupId>
+            <artifactId>protocolsupport</artifactId>
+            <version>1.8</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
diff --git a/Anticheat/src/main/java/dev/brighten/ac/handler/protocol/NoAPI.java b/Anticheat/src/main/java/dev/brighten/ac/handler/protocol/NoAPI.java
deleted file mode 100644
index 2416a4d..0000000
--- a/Anticheat/src/main/java/dev/brighten/ac/handler/protocol/NoAPI.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package dev.brighten.ac.handler.protocol;
-
-import dev.brighten.ac.handler.protocolsupport.Protocol;
-import dev.brighten.ac.packet.handler.HandlerAbstract;
-import org.bukkit.entity.Player;
-
-public class NoAPI implements Protocol {
-
-    @Override
-    public int getPlayerVersion(Player player) {
-        return HandlerAbstract.getHandler().getProtocolVersion(player);
-    }
-}
diff --git a/Anticheat/src/main/java/dev/brighten/ac/handler/protocol/Protocol.java b/Anticheat/src/main/java/dev/brighten/ac/handler/protocol/Protocol.java
index 1419b04..430baf3 100644
--- a/Anticheat/src/main/java/dev/brighten/ac/handler/protocol/Protocol.java
+++ b/Anticheat/src/main/java/dev/brighten/ac/handler/protocol/Protocol.java
@@ -1,9 +1,9 @@
 package dev.brighten.ac.handler.protocol;
 
 import dev.brighten.ac.Anticheat;
-import dev.brighten.ac.handler.protocolsupport.impl.NoAPI;
-import dev.brighten.ac.handler.protocolsupport.impl.ProtocolSupport;
-import dev.brighten.ac.handler.protocolsupport.impl.ViaVersionAPI;
+import dev.brighten.ac.handler.protocol.impl.NoAPI;
+import dev.brighten.ac.handler.protocol.impl.ProtocolSupport;
+import dev.brighten.ac.handler.protocol.impl.ViaVersionAPI;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
diff --git a/Anticheat/src/main/java/dev/brighten/ac/handler/protocol/ProtocolSupport.java b/Anticheat/src/main/java/dev/brighten/ac/handler/protocol/ProtocolSupport.java
deleted file mode 100644
index ec9943b..0000000
--- a/Anticheat/src/main/java/dev/brighten/ac/handler/protocol/ProtocolSupport.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package dev.brighten.ac.handler.protocol;
-
-import dev.brighten.ac.handler.protocolsupport.Protocol;
-import org.bukkit.entity.Player;
-import protocolsupport.api.ProtocolSupportAPI;
-
-public class ProtocolSupport implements Protocol {
-
-    @Override
-    public int getPlayerVersion(Player player) {
-        return ProtocolSupportAPI.getProtocolVersion(player).getId();
-    }
-}
diff --git a/Anticheat/src/main/java/dev/brighten/ac/handler/protocol/ViaVersionAPI.java b/Anticheat/src/main/java/dev/brighten/ac/handler/protocol/ViaVersionAPI.java
deleted file mode 100644
index 581ef56..0000000
--- a/Anticheat/src/main/java/dev/brighten/ac/handler/protocol/ViaVersionAPI.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package dev.brighten.ac.handler.protocol;
-
-import com.viaversion.viaversion.api.Via;
-import dev.brighten.ac.Anticheat;
-import dev.brighten.ac.handler.protocolsupport.Protocol;
-import org.bukkit.entity.Player;
-
-public class ViaVersionAPI implements Protocol {
-
-    @Override
-    public int getPlayerVersion(Player player) {
-        Anticheat.INSTANCE.alog("Getting player version for " + player.getName());
-        var toReturn = Via.getAPI().getPlayerVersion(player.getUniqueId());
-        Anticheat.INSTANCE.alog("Player version for " + player.getName() + " is " + toReturn);
-
-        return toReturn;
-    }
-}
diff --git a/Anticheat/src/main/java/dev/brighten/ac/handler/protocol/impl/NoAPI.java b/Anticheat/src/main/java/dev/brighten/ac/handler/protocol/impl/NoAPI.java
index e52d546..a342ab4 100644
--- a/Anticheat/src/main/java/dev/brighten/ac/handler/protocol/impl/NoAPI.java
+++ b/Anticheat/src/main/java/dev/brighten/ac/handler/protocol/impl/NoAPI.java
@@ -1,13 +1,13 @@
 package dev.brighten.ac.handler.protocol.impl;
 
-import dev.brighten.ac.handler.protocolsupport.Protocol;
-import dev.brighten.ac.packet.handler.HandlerAbstract;
+import com.github.retrooper.packetevents.PacketEvents;
+import dev.brighten.ac.handler.protocol.Protocol;
 import org.bukkit.entity.Player;
 
 public class NoAPI implements Protocol {
 
     @Override
     public int getPlayerVersion(Player player) {
-        return HandlerAbstract.getHandler().getProtocolVersion(player);
+        return PacketEvents.getAPI().getPlayerManager().getClientVersion(player).getProtocolVersion();
     }
 }
diff --git a/Anticheat/src/main/java/dev/brighten/ac/handler/protocol/impl/ProtocolSupport.java b/Anticheat/src/main/java/dev/brighten/ac/handler/protocol/impl/ProtocolSupport.java
index c90b932..68af03c 100644
--- a/Anticheat/src/main/java/dev/brighten/ac/handler/protocol/impl/ProtocolSupport.java
+++ b/Anticheat/src/main/java/dev/brighten/ac/handler/protocol/impl/ProtocolSupport.java
@@ -1,6 +1,6 @@
 package dev.brighten.ac.handler.protocol.impl;
 
-import dev.brighten.ac.handler.protocolsupport.Protocol;
+import dev.brighten.ac.handler.protocol.Protocol;
 import org.bukkit.entity.Player;
 import protocolsupport.api.ProtocolSupportAPI;
 
diff --git a/Anticheat/src/main/java/dev/brighten/ac/handler/protocol/impl/ViaVersionAPI.java b/Anticheat/src/main/java/dev/brighten/ac/handler/protocol/impl/ViaVersionAPI.java
index 1e2e498..6c673a0 100644
--- a/Anticheat/src/main/java/dev/brighten/ac/handler/protocol/impl/ViaVersionAPI.java
+++ b/Anticheat/src/main/java/dev/brighten/ac/handler/protocol/impl/ViaVersionAPI.java
@@ -2,7 +2,7 @@ package dev.brighten.ac.handler.protocol.impl;
 
 import com.viaversion.viaversion.api.Via;
 import dev.brighten.ac.Anticheat;
-import dev.brighten.ac.handler.protocolsupport.Protocol;
+import dev.brighten.ac.handler.protocol.Protocol;
 import org.bukkit.entity.Player;
 
 public class ViaVersionAPI implements Protocol {