diff --git a/build.gradle b/build.gradle
index cd3dc04..53a8b23 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,10 @@
 plugins {
-	id 'fabric-loom' version '1.6-SNAPSHOT'
+	id 'fabric-loom' version '1.10-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+sourceCompatibility = JavaVersion.VERSION_21
+targetCompatibility = JavaVersion.VERSION_21
 
 archivesBaseName = project.archives_base_name
 version = "mc${project.minecraft_version}-${project.mod_version}"
@@ -54,7 +54,7 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	it.options.release = 17
+	it.options.release = 21
 }
 
 java {
diff --git a/gradle.properties b/gradle.properties
index 5d69586..5129e85 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,16 +4,16 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21
-yarn_mappings=1.21+build.2
-loader_version=0.15.11
+minecraft_version=1.21.5
+yarn_mappings=1.21.5+build.1
+loader_version=0.16.10
 
 # Mod Properties
 # x-release-please-start-version
-mod_version=0.3.1
+mod_version=0.3.5
 # x-release-please-end
 maven_group=io.nihlen.scriptschunkloaders
 archives_base_name=scripts-chunk-loaders
 
 # Dependencies
-fabric_version=0.100.1+1.21
+fabric_version=0.119.5+1.21.5
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a80b22c..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.6-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/io/nihlen/scriptschunkloaders/mixin/AbstractMinecartEntityMixin.java b/src/main/java/io/nihlen/scriptschunkloaders/mixin/AbstractMinecartEntityMixin.java
index bad0ac1..939c069 100644
--- a/src/main/java/io/nihlen/scriptschunkloaders/mixin/AbstractMinecartEntityMixin.java
+++ b/src/main/java/io/nihlen/scriptschunkloaders/mixin/AbstractMinecartEntityMixin.java
@@ -23,7 +23,6 @@
 
 @Mixin(AbstractMinecartEntity.class)
 public abstract class AbstractMinecartEntityMixin extends Entity implements MinecartEntityExt {
-	@Shadow public abstract AbstractMinecartEntity.Type getMinecartType();
 
 	@Unique
 	private boolean isChunkLoader = false;
@@ -58,8 +57,9 @@ private void injectConstructor(CallbackInfo callbackInfo) {
 	}
 
 	public void scripts_chunk_loaders$setChunkLoaderNameFromInventory() {
-		var minecartType = this.getMinecartType();
-		if (minecartType == AbstractMinecartEntity.Type.CHEST) {
+		EntityType<?> minecartType = this.getType();
+
+		if (minecartType == EntityType.CHEST_MINECART) {
 			//noinspection DataFlowIssue - We're sure this is a chest because of the if statement.
 			var entity = (ChestMinecartEntity)(Object)this;
 			var firstSlot = entity.getInventory().get(0);
@@ -103,7 +103,7 @@ public void writeCustomDataToNbt(NbtCompound nbt, CallbackInfo ci) {
 
 	@Inject(method = "readCustomDataFromNbt", at = @At("RETURN"))
 	public void readCustomDataFromNbt(NbtCompound nbt, CallbackInfo ci) {
-		this.isChunkLoader = nbt.getBoolean("chunkLoader");
+			this.isChunkLoader = nbt.getBoolean("chunkLoader").orElse(false);
 	}
 
 	@Inject(method = "tick", at = @At("TAIL"))
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 9431364..b7c561a 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -23,8 +23,8 @@
 		"scripts-chunk-loaders.mixins.json"
 	],
 	"depends": {
-		"fabricloader": ">=0.15.11",
-		"minecraft": "1.21",
+		"fabricloader": ">=0.16.10",
+		"minecraft": "1.21.5",
 		"java": ">=21",
 		"fabric-api": "*"
 	}
diff --git a/src/main/resources/scripts-chunk-loaders.mixins.json b/src/main/resources/scripts-chunk-loaders.mixins.json
index 1705c82..56d2bf9 100644
--- a/src/main/resources/scripts-chunk-loaders.mixins.json
+++ b/src/main/resources/scripts-chunk-loaders.mixins.json
@@ -2,7 +2,7 @@
 	"required": true,
 	"minVersion": "0.8",
 	"package": "io.nihlen.scriptschunkloaders.mixin",
-	"compatibilityLevel": "JAVA_17",
+	"compatibilityLevel": "JAVA_21",
 	"mixins": [
 	],
 	"client": [