diff --git a/.jenkins/Jenkinsfile.snapshot b/.jenkins/Jenkinsfile.snapshot
index f7d330c..b783fad 100644
--- a/.jenkins/Jenkinsfile.snapshot
+++ b/.jenkins/Jenkinsfile.snapshot
@@ -3,7 +3,7 @@ def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae59
 def JDK = "21";
 def majorMc = "1.21.5";
 def modLoaders = "neoforge|fabric|quilt|paper";
-def supportedMc = "25w10a";
+def supportedMc = "1.21.5-rc1";
 def reltype = "experimental";
 
 pipeline {
diff --git a/NeoForge/build.gradle b/NeoForge/build.gradle
index 8c77aa8..95b7227 100644
--- a/NeoForge/build.gradle
+++ b/NeoForge/build.gradle
@@ -39,11 +39,11 @@ shadowJar {
 
 unimined.minecraft {
     neoForged {
-        /*if (isPort) {
+        if (isPort) {
             loader "net.neoforged:neoforge:${neoforge_version}:universal"
-        } else {*/
+        } else {
             loader neoforge_version
-        //}
+        }
 
         mixinConfig("${mod_id}.mixins.json", "${mod_id}.neoforge.mixins.json")
     }
diff --git a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java b/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
index 56d2e45..d7acb04 100644
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
+++ b/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
@@ -2,8 +2,6 @@ package com.hypherionmc.craterlib.client;
 
 import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
 import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
-import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
-import com.hypherionmc.craterlib.core.config.AbstractConfig;
 import com.hypherionmc.craterlib.core.config.ConfigController;
 import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
 import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
diff --git a/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java b/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
index 012b6ff..8a0fcfb 100644
--- a/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
+++ b/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
@@ -22,7 +22,7 @@ public class ServerGamePacketListenerImplMixin {
     public ServerPlayer player;
 
     @Inject(
-            method = "lambda$handleChat$5",
+            method = "lambda$handleChat$6",
             at = @At("HEAD"),
             cancellable = true
     )
diff --git a/build.gradle b/build.gradle
index e65cacd..9017bff 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ orion.setup {
     multiProject = true
     enableMirrorMaven = true
     enableReleasesMaven = true
-    //enableSnapshotsMaven = isPort
+    enableSnapshotsMaven = isPort
 
     dopplerToken = System.getenv("DOPPLER_KEY")
 
diff --git a/gradle.properties b/gradle.properties
index f0ce166..2973795 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,18 +10,18 @@ mod_id=craterlib
 mod_name=CraterLib
 
 # Shared
-minecraft_version=1.21.5-pre3
+minecraft_version=1.21.5-rc1
 project_group=com.hypherionmc.craterlib
 
 # Fabric
 fabric_loader=0.16.10
-fabric_api=0.119.2+1.21.5
+fabric_api=0.119.3+1.21.5
 
 # Forge
 forge_version=50.0.6
 
 # NeoForged
-neoforge_version=16-beta
+neoforge_version=21.5.0-alpha.1.21.5-rc1.20250322.150002
 
 # Dependencies
 moon_config=1.0.12
diff --git a/settings.gradle b/settings.gradle
index 5839bc6..90bd73d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,6 +14,6 @@ pluginManagement {
 }
 
 rootProject.name = 'CraterLib'
-include("Common", "Fabric"/*, "NeoForge"*/)
+include("Common", "Fabric", "NeoForge")
 //include 'Paper'