diff --git a/build.gradle b/build.gradle
index e4a7036..532ca2d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.6-SNAPSHOT'
+    id 'fabric-loom' version '1.10-SNAPSHOT'
     id 'maven-publish'
 }
 
diff --git a/gradle.properties b/gradle.properties
index 9c5531a..a97ae95 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://modmuss50.me/fabric.html
-	minecraft_version=1.20.5
-	yarn_mappings=1.20.5+build.1
-	loader_version=0.15.10
+	minecraft_version=1.21
+	yarn_mappings=1.21+build.9
+	loader_version=0.16.10
 
 # Mod Properties
 	mod_version = 1.0.1+build.1
@@ -15,4 +15,4 @@ org.gradle.jvmargs=-Xmx1G
 
 # Dependencies
 	# check this on https://modmuss50.me/fabric.html
-	fabric_version=0.97.8+1.20.6
+	fabric_version=0.102.0+1.21
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b82aa23..cea7a79 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/java/net/hypixel/modapi/fabric/FabricModAPI.java b/src/main/java/net/hypixel/modapi/fabric/FabricModAPI.java
index 0ecb49a..c8eaf68 100644
--- a/src/main/java/net/hypixel/modapi/fabric/FabricModAPI.java
+++ b/src/main/java/net/hypixel/modapi/fabric/FabricModAPI.java
@@ -16,6 +16,7 @@
 import net.minecraft.network.PacketByteBuf;
 import net.minecraft.network.codec.PacketCodec;
 import net.minecraft.network.packet.CustomPayload;
+import net.minecraft.util.Identifier;
 import org.slf4j.Logger;
 
 public class FabricModAPI implements ClientModInitializer {
@@ -79,7 +80,7 @@ private static void registerPacketSender() {
 
     private static void registerClientbound(String identifier) {
         try {
-            CustomPayload.Id<ClientboundHypixelPayload> clientboundId = CustomPayload.id(identifier);
+            CustomPayload.Id<ClientboundHypixelPayload> clientboundId = new CustomPayload.Id<>(Identifier.of(identifier));
             PacketCodec<PacketByteBuf, ClientboundHypixelPayload> codec = ClientboundHypixelPayload.buildCodec(clientboundId);
             PayloadTypeRegistry.playS2C().register(clientboundId, codec);
             PayloadTypeRegistry.configurationS2C().register(clientboundId, codec);
@@ -131,7 +132,7 @@ private static void handleIncomingPayload(String identifier, ClientboundHypixelP
 
     private static void registerServerbound(String identifier) {
         try {
-            CustomPayload.Id<ServerboundHypixelPayload> serverboundId = CustomPayload.id(identifier);
+            CustomPayload.Id<ServerboundHypixelPayload> serverboundId = new CustomPayload.Id<>(Identifier.of(identifier));
             PacketCodec<PacketByteBuf, ServerboundHypixelPayload> codec = ServerboundHypixelPayload.buildCodec(serverboundId);
             PayloadTypeRegistry.playC2S().register(serverboundId, codec);
             PayloadTypeRegistry.configurationC2S().register(serverboundId, codec);
diff --git a/src/main/java/net/hypixel/modapi/fabric/payload/ServerboundHypixelPayload.java b/src/main/java/net/hypixel/modapi/fabric/payload/ServerboundHypixelPayload.java
index 1a51e40..536b5f4 100644
--- a/src/main/java/net/hypixel/modapi/fabric/payload/ServerboundHypixelPayload.java
+++ b/src/main/java/net/hypixel/modapi/fabric/payload/ServerboundHypixelPayload.java
@@ -5,13 +5,14 @@
 import net.minecraft.network.PacketByteBuf;
 import net.minecraft.network.codec.PacketCodec;
 import net.minecraft.network.packet.CustomPayload;
+import net.minecraft.util.Identifier;
 
 public class ServerboundHypixelPayload implements CustomPayload {
     private final Id<ServerboundHypixelPayload> id;
     private final HypixelPacket packet;
 
     public ServerboundHypixelPayload(HypixelPacket packet) {
-        this.id = CustomPayload.id(packet.getIdentifier());
+        this.id = new CustomPayload.Id<>(Identifier.of(packet.getIdentifier()));
         this.packet = packet;
     }