diff --git a/build.gradle b/build.gradle
index 9cfb568..e32eb42 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.8-SNAPSHOT'
+    id 'fabric-loom' version '1.10-SNAPSHOT'
     id 'maven-publish'
 }
 
diff --git a/gradle.properties b/gradle.properties
index 7566856..cf202cb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,9 +4,9 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.20.1
-yarn_mappings=1.20.1+build.10
-loader_version=0.16.7
+minecraft_version=1.21.1
+yarn_mappings=1.21.1+build.3
+loader_version=0.16.11
 
 # Mod Properties
 mod_version=dev
@@ -14,4 +14,4 @@ maven_group=dev.bigduckie
 archives_base_name=static-data
 
 # Dependencies
-fabric_version=0.92.2+1.20.1
\ No newline at end of file
+fabric_version=0.115.4+1.21.1
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index df97d72..37f853b 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.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/java/dev/bigduckie/staticdata/StaticData.java b/src/main/java/dev/bigduckie/staticdata/StaticData.java
index fc69f76..db322e9 100644
--- a/src/main/java/dev/bigduckie/staticdata/StaticData.java
+++ b/src/main/java/dev/bigduckie/staticdata/StaticData.java
@@ -145,7 +145,7 @@ public class StaticData {
             if (Files.isDirectory(globalStaticDataFolder)) {
                 Path data = globalStaticDataFolder.resolve(name);
                 if (Files.exists(data) && !Files.isDirectory(data)) {
-                    return Optional.of(new StaticDataItem(new Identifier(GLOBAL_DATA_NAMESPACE, name), data));
+                    return Optional.of(new StaticDataItem(Identifier.of(GLOBAL_DATA_NAMESPACE, name), data));
                 }
             }
 
@@ -246,10 +246,10 @@ public class StaticData {
         if (rel.startsWith("static_data/")) { //Should always be true
             rel = rel.substring("static_data/".length());
         }
-        return new Identifier(container.getMetadata().getId(), rel);
+        return Identifier.of(container.getMetadata().getId(), rel);
     }
 
     private static Identifier toGlobalIdentifier(Path root, Path path) {
-        return new Identifier(GLOBAL_DATA_NAMESPACE, getRelative(root, path));
+        return Identifier.of(GLOBAL_DATA_NAMESPACE, getRelative(root, path));
     }
 }