diff --git a/.jenkins/Jenkinsfile.deploy b/.jenkins/Jenkinsfile.deploy
index 56e71cc..cd9b9d8 100644
--- a/.jenkins/Jenkinsfile.deploy
+++ b/.jenkins/Jenkinsfile.deploy
@@ -1,5 +1,5 @@
 def JDK = "21"
-def majorMc = "1.21.2";
+def majorMc = "1.21.5";
 
 pipeline {
     agent {
diff --git a/.jenkins/Jenkinsfile.snapshot b/.jenkins/Jenkinsfile.snapshot
index 9a71915..42a23e1 100644
--- a/.jenkins/Jenkinsfile.snapshot
+++ b/.jenkins/Jenkinsfile.snapshot
@@ -1,10 +1,10 @@
 def projectName = "CraterLib";
 def projectIcon = "https://cdn.modrinth.com/data/Nn8Wasaq/a172c634683a11a2e9ae593e56eba7885743bb44.png";
 def JDK = "21";
-def majorMc = "1.21.2";
+def majorMc = "1.21.5";
 def modLoaders = "neoforge|fabric|quilt|paper";
-def supportedMc = "1.21.3|1.21.4";
-def reltype = "port";
+def supportedMc = "25w06a";
+def reltype = "experimental";
 
 pipeline {
     agent {
@@ -63,7 +63,7 @@ pipeline {
                 projectIcon: "${projectIcon}",
                 modLoaders: "${modLoaders}",
                 minecraftVersions: "${supportedMc}",
-                type: "snapshot",
+                type: "experimental",
                 dependsOn: "",
                 failWebhook: env.SSS_WEBHOOK,
                 publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"
diff --git a/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java b/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java
index 364cc22..bf54650 100644
--- a/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java
+++ b/Common/src/main/java/com/hypherionmc/craterlib/api/events/server/CraterCommandEvent.java
@@ -53,6 +53,6 @@ public class CraterCommandEvent extends CraterEvent {
     }
 
     public Component getMessage() {
-        return ChatUtils.mojangToAdventure(ComponentArgument.getComponent(parseResults.getContext().build(parseResults.getReader().getString()), "message"));
+        return ChatUtils.mojangToAdventure(ComponentArgument.getRawComponent(parseResults.getContext().build(parseResults.getReader().getString()), "message"));
     }
 }
diff --git a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java
index 38d0cc6..01953c9 100644
--- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java
+++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java
@@ -233,7 +233,7 @@ public class CraterConfigScreen extends Screen {
             buffer.addVertex((scrollbarPositionMaxX - 1), (minY + height - 1), 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1);
             buffer.addVertex((scrollbarPositionMaxX - 1), minY, 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1);
             buffer.addVertex(scrollbarPositionMinX, minY, 0.0f).setColor(SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, SCROLLBAR_TOP_COLOR, 1);
-            BufferUploader.drawWithShader(buffer.buildOrThrow());
+            //BufferUploader.drawWithShader(buffer.buildOrThrow());
             RenderSystem.disableBlend();
             //RenderSystem.enableTexture();
         }
@@ -255,7 +255,7 @@ public class CraterConfigScreen extends Screen {
         buffer.addVertex(matrix, width, height - BOTTOM, 0.0F).setUv(1, 1).setColor(0, 0, 0, 185);
         buffer.addVertex(matrix, width, height - BOTTOM - 4, 0.0F).setUv(1, 0).setColor(0, 0, 0, 0);
         buffer.addVertex(matrix, 0, height - BOTTOM - 4, 0.0F).setUv(0, 0).setColor(0, 0, 0, 0);
-        BufferUploader.drawWithShader(buffer.buildOrThrow());
+        //BufferUploader.drawWithShader(buffer.buildOrThrow());
         //RenderSystem.enableTexture();
         RenderSystem.disableBlend();
     }
@@ -274,7 +274,7 @@ public class CraterConfigScreen extends Screen {
         buffer.addVertex(matrix, maxX, maxY, 0.0F).setUv(maxX / 32.0F, maxY / 32.0F).setColor(red, green, blue, endAlpha);
         buffer.addVertex(matrix, maxX, minY, 0.0F).setUv(maxX / 32.0F, minY / 32.0F).setColor(red, green, blue, startAlpha);
         buffer.addVertex(matrix, minX, minY, 0.0F).setUv(minX / 32.0F, minY / 32.0F).setColor(red, green, blue, startAlpha);
-        BufferUploader.drawWithShader(buffer.buildOrThrow());
+        //BufferUploader.drawWithShader(buffer.buildOrThrow());
     }
 
     public int scrollHeight() {
diff --git a/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java b/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
index 576a276..7c644d4 100644
--- a/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
+++ b/Fabric/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 ce18835..e65cacd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ plugins {
 var relType = project.properties["releaseType"] ?: "${release_type}"
 
 ext {
-    isPort = (relType == 'port')
+    isPort = (relType == 'experimental')
 }
 
 orion.setup {
diff --git a/gradle.properties b/gradle.properties
index 83f4345..820b5a7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,12 +10,12 @@ mod_id=craterlib
 mod_name=CraterLib
 
 # Shared
-minecraft_version=1.21.3
+minecraft_version=25w06a
 project_group=com.hypherionmc.craterlib
 
 # Fabric
-fabric_loader=0.16.7
-fabric_api=0.107.3+1.21.3
+fabric_loader=0.16.10
+fabric_api=0.116.0+1.21.5
 
 # Forge
 forge_version=50.0.6
@@ -45,7 +45,7 @@ creative_core=6113754
 # Publishing
 curse_id=867099
 modrinth_id=Nn8Wasaq
-release_type=port
+release_type=experimental
 
 # Gradle
 org.gradle.jvmargs=-Xmx3G
diff --git a/settings.gradle b/settings.gradle
index e3b6e5f..5839bc6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,6 +14,6 @@ pluginManagement {
 }
 
 rootProject.name = 'CraterLib'
-include("Common", "Fabric", "NeoForge")
-include 'Paper'
+include("Common", "Fabric"/*, "NeoForge"*/)
+//include 'Paper'