diff --git a/1.18.2/Fabric/build.gradle b/1.18.2/Fabric/build.gradle
index c812cb4..a124d33 100644
--- a/1.18.2/Fabric/build.gradle
+++ b/1.18.2/Fabric/build.gradle
@@ -29,6 +29,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**
diff --git a/1.18.2/Forge/build.gradle b/1.18.2/Forge/build.gradle
index d714f7c..29451b4 100644
--- a/1.18.2/Forge/build.gradle
+++ b/1.18.2/Forge/build.gradle
@@ -22,6 +22,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**
diff --git a/1.18.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java b/1.18.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
index f325837..34d519d 100644
--- a/1.18.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
+++ b/1.18.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
@@ -1,13 +1,18 @@
 package com.hypherionmc.craterlib.common;
 
 import com.hypherionmc.craterlib.core.platform.CompatUtils;
+import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import redstonedubstep.mods.vanishmod.VanishUtil;
 
 public class ForgeCompatHelper implements CompatUtils {
 
     @Override
     public boolean isPlayerActive(BridgedPlayer player) {
-        return true;
+        if (!ModloaderEnvironment.INSTANCE.isModLoaded("vmod"))
+            return true;
+
+        return VanishUtil.isVanished(player.toMojangServerPlayer());
     }
 
     @Override
diff --git a/1.18.2/gradle.properties b/1.18.2/gradle.properties
index 7ee9191..bf52fa4 100644
--- a/1.18.2/gradle.properties
+++ b/1.18.2/gradle.properties
@@ -1,8 +1,8 @@
 #Project
 version_major=2
 version_minor=0
-version_patch=2
-version_build=1
+version_patch=3
+version_build=0
 
 #Mod
 mod_author=HypherionSA
diff --git a/1.19.2/Fabric/build.gradle b/1.19.2/Fabric/build.gradle
index cfbced7..df92bab 100644
--- a/1.19.2/Fabric/build.gradle
+++ b/1.19.2/Fabric/build.gradle
@@ -29,6 +29,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**
diff --git a/1.19.2/Forge/build.gradle b/1.19.2/Forge/build.gradle
index ae66704..da32b75 100644
--- a/1.19.2/Forge/build.gradle
+++ b/1.19.2/Forge/build.gradle
@@ -22,6 +22,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**
diff --git a/1.19.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java b/1.19.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
index f325837..34d519d 100644
--- a/1.19.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
+++ b/1.19.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
@@ -1,13 +1,18 @@
 package com.hypherionmc.craterlib.common;
 
 import com.hypherionmc.craterlib.core.platform.CompatUtils;
+import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import redstonedubstep.mods.vanishmod.VanishUtil;
 
 public class ForgeCompatHelper implements CompatUtils {
 
     @Override
     public boolean isPlayerActive(BridgedPlayer player) {
-        return true;
+        if (!ModloaderEnvironment.INSTANCE.isModLoaded("vmod"))
+            return true;
+
+        return VanishUtil.isVanished(player.toMojangServerPlayer());
     }
 
     @Override
diff --git a/1.19.2/gradle.properties b/1.19.2/gradle.properties
index 58baf39..2b87c39 100644
--- a/1.19.2/gradle.properties
+++ b/1.19.2/gradle.properties
@@ -1,8 +1,8 @@
 #Project
 version_major=2
 version_minor=0
-version_patch=2
-version_build=1
+version_patch=3
+version_build=0
 
 #Mod
 mod_author=HypherionSA
diff --git a/1.19.3/Fabric/build.gradle b/1.19.3/Fabric/build.gradle
index c6bf8cc..0641b33 100644
--- a/1.19.3/Fabric/build.gradle
+++ b/1.19.3/Fabric/build.gradle
@@ -29,6 +29,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**
diff --git a/1.19.3/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java b/1.19.3/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
index fbd762b..ce6a603 100644
--- a/1.19.3/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
+++ b/1.19.3/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
@@ -26,8 +26,9 @@ public class ServerGamePacketListenerImplMixin {
             at = @At("HEAD"),
             cancellable = true
     )
+        Component finalArg = arg2 == null ? arg.decoratedContent() : arg2;
     private void injectChatEvent(PlayerChatMessage arg, CompletableFuture completableFuture, CompletableFuture completableFuture2, Void void_, CallbackInfo ci) {
-        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
+        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalArg.getString(), ChatUtils.mojangToAdventure(finalArg));
         CraterEventBus.INSTANCE.postEvent(event);
         if (event.wasCancelled())
             ci.cancel();
diff --git a/1.19.3/Forge/build.gradle b/1.19.3/Forge/build.gradle
index 9c07388..76719c8 100644
--- a/1.19.3/Forge/build.gradle
+++ b/1.19.3/Forge/build.gradle
@@ -22,6 +22,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**
diff --git a/1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java b/1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
index f325837..34d519d 100644
--- a/1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
+++ b/1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
@@ -1,13 +1,18 @@
 package com.hypherionmc.craterlib.common;
 
 import com.hypherionmc.craterlib.core.platform.CompatUtils;
+import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import redstonedubstep.mods.vanishmod.VanishUtil;
 
 public class ForgeCompatHelper implements CompatUtils {
 
     @Override
     public boolean isPlayerActive(BridgedPlayer player) {
-        return true;
+        if (!ModloaderEnvironment.INSTANCE.isModLoaded("vmod"))
+            return true;
+
+        return VanishUtil.isVanished(player.toMojangServerPlayer());
     }
 
     @Override
diff --git a/1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java b/1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
index ff98802..115dc72 100644
--- a/1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
+++ b/1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
@@ -26,8 +26,9 @@ public class ServerGamePacketListenerImplMixin {
             at = @At("HEAD"),
             cancellable = true
     )
+        Component finalArg = component == null ? arg.decoratedContent() : component;
     private void injectChatEvent(CompletableFuture completablefuture1, PlayerChatMessage arg, CompletableFuture completablefuture, Void p_248218_, CallbackInfo ci) {
-        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
+        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalArg.getString(), ChatUtils.mojangToAdventure(finalArg));
         CraterEventBus.INSTANCE.postEvent(event);
         if (event.wasCancelled())
             ci.cancel();
diff --git a/1.19.3/gradle.properties b/1.19.3/gradle.properties
index d95dffc..e7a3770 100644
--- a/1.19.3/gradle.properties
+++ b/1.19.3/gradle.properties
@@ -1,8 +1,8 @@
 #Project
 version_major=2
 version_minor=0
-version_patch=2
-version_build=1
+version_patch=3
+version_build=0
 
 #Mod
 mod_author=HypherionSA
diff --git a/1.20.2/Fabric/build.gradle b/1.20.2/Fabric/build.gradle
index 25c5039..1db77f0 100644
--- a/1.20.2/Fabric/build.gradle
+++ b/1.20.2/Fabric/build.gradle
@@ -29,6 +29,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**
diff --git a/1.20.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java b/1.20.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
index 4a7d904..ec01614 100644
--- a/1.20.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
+++ b/1.20.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
@@ -27,7 +27,8 @@ public class ServerGamePacketListenerImplMixin {
             cancellable = true
     )
     private void injectChatEvent(PlayerChatMessage arg, Component arg2, FilteredText arg3, CallbackInfo ci) {
-        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
+        Component finalArg = arg2 == null ? arg.decoratedContent() : arg2;
+        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalArg.getString(), ChatUtils.mojangToAdventure(finalArg));
         CraterEventBus.INSTANCE.postEvent(event);
         if (event.wasCancelled())
             ci.cancel();
diff --git a/1.20.2/Forge/build.gradle b/1.20.2/Forge/build.gradle
index 85c45b6..8603372 100644
--- a/1.20.2/Forge/build.gradle
+++ b/1.20.2/Forge/build.gradle
@@ -22,6 +22,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**
diff --git a/1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java b/1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
index f325837..34d519d 100644
--- a/1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
+++ b/1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
@@ -1,13 +1,18 @@
 package com.hypherionmc.craterlib.common;
 
 import com.hypherionmc.craterlib.core.platform.CompatUtils;
+import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import redstonedubstep.mods.vanishmod.VanishUtil;
 
 public class ForgeCompatHelper implements CompatUtils {
 
     @Override
     public boolean isPlayerActive(BridgedPlayer player) {
-        return true;
+        if (!ModloaderEnvironment.INSTANCE.isModLoaded("vmod"))
+            return true;
+
+        return VanishUtil.isVanished(player.toMojangServerPlayer());
     }
 
     @Override
diff --git a/1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java b/1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
index 6e2f601..c9b024b 100644
--- a/1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
+++ b/1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
@@ -27,7 +27,8 @@ public class ServerGamePacketListenerImplMixin {
             cancellable = true
     )
     private void injectChatEvent(Component component, PlayerChatMessage arg, FilteredText p_296589_, CallbackInfo ci) {
-        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
+        Component finalArg = component == null ? arg.decoratedContent() : component;
+        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalArg.getString(), ChatUtils.mojangToAdventure(finalArg));
         CraterEventBus.INSTANCE.postEvent(event);
         if (event.wasCancelled())
             ci.cancel();
diff --git a/1.20.2/gradle.properties b/1.20.2/gradle.properties
index 006bc65..46f844f 100644
--- a/1.20.2/gradle.properties
+++ b/1.20.2/gradle.properties
@@ -1,8 +1,8 @@
 #Project
 version_major=2
 version_minor=0
-version_patch=2
-version_build=1
+version_patch=3
+version_build=0
 
 #Mod
 mod_author=HypherionSA
diff --git a/1.20.4/Fabric/build.gradle b/1.20.4/Fabric/build.gradle
index 4bd0856..daf42ce 100644
--- a/1.20.4/Fabric/build.gradle
+++ b/1.20.4/Fabric/build.gradle
@@ -29,6 +29,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**
diff --git a/1.20.4/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java b/1.20.4/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
index 4a7d904..ec01614 100644
--- a/1.20.4/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
+++ b/1.20.4/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
@@ -27,7 +27,8 @@ public class ServerGamePacketListenerImplMixin {
             cancellable = true
     )
     private void injectChatEvent(PlayerChatMessage arg, Component arg2, FilteredText arg3, CallbackInfo ci) {
-        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
+        Component finalArg = arg2 == null ? arg.decoratedContent() : arg2;
+        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalArg.getString(), ChatUtils.mojangToAdventure(finalArg));
         CraterEventBus.INSTANCE.postEvent(event);
         if (event.wasCancelled())
             ci.cancel();
diff --git a/1.20.4/Forge/build.gradle b/1.20.4/Forge/build.gradle
index 15f36a2..1325c10 100644
--- a/1.20.4/Forge/build.gradle
+++ b/1.20.4/Forge/build.gradle
@@ -22,6 +22,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**
diff --git a/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java b/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
index f325837..34d519d 100644
--- a/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
+++ b/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
@@ -1,13 +1,18 @@
 package com.hypherionmc.craterlib.common;
 
 import com.hypherionmc.craterlib.core.platform.CompatUtils;
+import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import redstonedubstep.mods.vanishmod.VanishUtil;
 
 public class ForgeCompatHelper implements CompatUtils {
 
     @Override
     public boolean isPlayerActive(BridgedPlayer player) {
-        return true;
+        if (!ModloaderEnvironment.INSTANCE.isModLoaded("vmod"))
+            return true;
+
+        return VanishUtil.isVanished(player.toMojangServerPlayer());
     }
 
     @Override
diff --git a/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java b/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
index 6e2f601..c9b024b 100644
--- a/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
+++ b/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
@@ -27,7 +27,8 @@ public class ServerGamePacketListenerImplMixin {
             cancellable = true
     )
     private void injectChatEvent(Component component, PlayerChatMessage arg, FilteredText p_296589_, CallbackInfo ci) {
-        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
+        Component finalArg = component == null ? arg.decoratedContent() : component;
+        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalArg.getString(), ChatUtils.mojangToAdventure(finalArg));
         CraterEventBus.INSTANCE.postEvent(event);
         if (event.wasCancelled())
             ci.cancel();
diff --git a/1.20.4/NeoForge/build.gradle b/1.20.4/NeoForge/build.gradle
index 883bc06..7f53323 100644
--- a/1.20.4/NeoForge/build.gradle
+++ b/1.20.4/NeoForge/build.gradle
@@ -21,6 +21,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**
diff --git a/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java b/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
index 6e2f601..c9b024b 100644
--- a/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
+++ b/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
@@ -27,7 +27,8 @@ public class ServerGamePacketListenerImplMixin {
             cancellable = true
     )
     private void injectChatEvent(Component component, PlayerChatMessage arg, FilteredText p_296589_, CallbackInfo ci) {
-        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
+        Component finalArg = component == null ? arg.decoratedContent() : component;
+        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalArg.getString(), ChatUtils.mojangToAdventure(finalArg));
         CraterEventBus.INSTANCE.postEvent(event);
         if (event.wasCancelled())
             ci.cancel();
diff --git a/1.20.4/gradle.properties b/1.20.4/gradle.properties
index 2ff4166..1b37337 100644
--- a/1.20.4/gradle.properties
+++ b/1.20.4/gradle.properties
@@ -1,8 +1,8 @@
 #Project
 version_major=2
 version_minor=0
-version_patch=2
-version_build=1
+version_patch=3
+version_build=0
 
 #Mod
 mod_author=HypherionSA
diff --git a/1.20/Fabric/build.gradle b/1.20/Fabric/build.gradle
index 14deab5..f4ad92f 100644
--- a/1.20/Fabric/build.gradle
+++ b/1.20/Fabric/build.gradle
@@ -29,6 +29,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**
diff --git a/1.20/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java b/1.20/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
index fbd762b..ce6a603 100644
--- a/1.20/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
+++ b/1.20/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
@@ -26,8 +26,9 @@ public class ServerGamePacketListenerImplMixin {
             at = @At("HEAD"),
             cancellable = true
     )
+        Component finalArg = arg2 == null ? arg.decoratedContent() : arg2;
     private void injectChatEvent(PlayerChatMessage arg, CompletableFuture completableFuture, CompletableFuture completableFuture2, Void void_, CallbackInfo ci) {
-        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
+        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalArg.getString(), ChatUtils.mojangToAdventure(finalArg));
         CraterEventBus.INSTANCE.postEvent(event);
         if (event.wasCancelled())
             ci.cancel();
diff --git a/1.20/Forge/build.gradle b/1.20/Forge/build.gradle
index 20f0475..9e6a617 100644
--- a/1.20/Forge/build.gradle
+++ b/1.20/Forge/build.gradle
@@ -22,6 +22,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**
diff --git a/1.20/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java b/1.20/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
index f325837..34d519d 100644
--- a/1.20/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
+++ b/1.20/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
@@ -1,13 +1,18 @@
 package com.hypherionmc.craterlib.common;
 
 import com.hypherionmc.craterlib.core.platform.CompatUtils;
+import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import redstonedubstep.mods.vanishmod.VanishUtil;
 
 public class ForgeCompatHelper implements CompatUtils {
 
     @Override
     public boolean isPlayerActive(BridgedPlayer player) {
-        return true;
+        if (!ModloaderEnvironment.INSTANCE.isModLoaded("vmod"))
+            return true;
+
+        return VanishUtil.isVanished(player.toMojangServerPlayer());
     }
 
     @Override
diff --git a/1.20/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java b/1.20/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
index 2b79896..161760a 100644
--- a/1.20/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
+++ b/1.20/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
@@ -26,8 +26,9 @@ public class ServerGamePacketListenerImplMixin {
             at = @At("HEAD"),
             cancellable = true
     )
+        Component finalArg = component == null ? arg.decoratedContent() : component;
     private void injectChatEvent(CompletableFuture completablefuture1, PlayerChatMessage arg, CompletableFuture completablefuture, Void p_248218_, CallbackInfo ci) {
-        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
+        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalArg.getString(), ChatUtils.mojangToAdventure(finalArg));
         CraterEventBus.INSTANCE.postEvent(event);
         if (event.wasCancelled())
             ci.cancel();
diff --git a/1.20/gradle.properties b/1.20/gradle.properties
index 4bf6887..79b3647 100644
--- a/1.20/gradle.properties
+++ b/1.20/gradle.properties
@@ -1,8 +1,8 @@
 #Project
 version_major=2
 version_minor=0
-version_patch=2
-version_build=1
+version_patch=3
+version_build=0
 
 #Mod
 mod_author=HypherionSA
diff --git a/1.21/Fabric/build.gradle b/1.21/Fabric/build.gradle
index 78bcead..d3a187f 100644
--- a/1.21/Fabric/build.gradle
+++ b/1.21/Fabric/build.gradle
@@ -29,6 +29,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**
@@ -112,8 +113,8 @@ publisher {
     setVersionType("release")
     setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
     setProjectVersion("${minecraft_version}-${project.version}")
-    setDisplayName("[FABRIC/QUILT 1.21.x] CraterLib - ${project.version}")
-    setGameVersions("1.21", "1.21.1")
+    setDisplayName("[FABRIC/QUILT 1.21.0] CraterLib - ${project.version}")
+    setGameVersions("1.21")
     setLoaders("fabric", "quilt")
     setArtifact(remapJar)
     setCurseEnvironment("both")
diff --git a/1.21/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java b/1.21/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
index c654433..91b157b 100644
--- a/1.21/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
+++ b/1.21/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
@@ -27,7 +27,8 @@ public class ServerGamePacketListenerImplMixin {
             cancellable = true
     )
     private void injectChatEvent(PlayerChatMessage arg, Component arg2, FilteredText arg3, CallbackInfo ci) {
-        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
+        Component finalArg = arg2 == null ? arg.decoratedContent() : arg2;
+        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalArg.getString(), ChatUtils.mojangToAdventure(finalArg));
         CraterEventBus.INSTANCE.postEvent(event);
         if (event.wasCancelled())
             ci.cancel();
diff --git a/1.21/Forge/build.gradle b/1.21/Forge/build.gradle
index d7986a9..b117838 100644
--- a/1.21/Forge/build.gradle
+++ b/1.21/Forge/build.gradle
@@ -22,6 +22,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**
diff --git a/1.21/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java b/1.21/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
index 299f52c..7adbbe1 100644
--- a/1.21/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
+++ b/1.21/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
@@ -27,7 +27,8 @@ public class ServerGamePacketListenerImplMixin {
             cancellable = true
     )
     private void injectChatEvent(Component component, PlayerChatMessage arg, FilteredText p_296589_, CallbackInfo ci) {
-        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
+        Component finalArg = component == null ? arg.decoratedContent() : component;
+        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalArg.getString(), ChatUtils.mojangToAdventure(finalArg));
         CraterEventBus.INSTANCE.postEvent(event);
         if (event.wasCancelled())
             ci.cancel();
diff --git a/1.21/NeoForge/build.gradle b/1.21/NeoForge/build.gradle
index b3c4eba..b3b5659 100644
--- a/1.21/NeoForge/build.gradle
+++ b/1.21/NeoForge/build.gradle
@@ -21,6 +21,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**
@@ -105,8 +106,8 @@ publisher {
     setVersionType("release")
     setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
     setProjectVersion("${minecraft_version}-${project.version}")
-    setDisplayName("[NeoForge 1.21.x] CraterLib - ${project.version}")
-    setGameVersions("1.21", "1.21.1")
+    setDisplayName("[NeoForge 1.21.0] CraterLib - ${project.version}")
+    setGameVersions("1.21")
     setLoaders("neoforge")
     setArtifact(remapJar)
     setCurseEnvironment("both")
diff --git a/1.21/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java b/1.21/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
index 299f52c..7adbbe1 100644
--- a/1.21/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
+++ b/1.21/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
@@ -27,7 +27,8 @@ public class ServerGamePacketListenerImplMixin {
             cancellable = true
     )
     private void injectChatEvent(Component component, PlayerChatMessage arg, FilteredText p_296589_, CallbackInfo ci) {
-        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
+        Component finalArg = component == null ? arg.decoratedContent() : component;
+        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalArg.getString(), ChatUtils.mojangToAdventure(finalArg));
         CraterEventBus.INSTANCE.postEvent(event);
         if (event.wasCancelled())
             ci.cancel();
diff --git a/1.21/gradle.properties b/1.21/gradle.properties
index 45d6732..f086dac 100644
--- a/1.21/gradle.properties
+++ b/1.21/gradle.properties
@@ -1,8 +1,8 @@
 #Project
 version_major=2
 version_minor=0
-version_patch=2
-version_build=1
+version_patch=3
+version_build=0
 
 #Mod
 mod_author=HypherionSA
diff --git a/commit.sha b/commit.sha
index 25ea970..38347a2 100644
--- a/commit.sha
+++ b/commit.sha
@@ -1 +1 @@
-c8cfa985b1c8a74a42eab0d51db54add654d1f97
\ No newline at end of file
+2c13d507c30a460256f006d30428d7ead5da2719
\ No newline at end of file
diff --git a/patches/1.18.2/Fabric/build.gradle.patch b/patches/1.18.2/Fabric/build.gradle.patch
index b23c680..29cbdf2 100644
--- a/patches/1.18.2/Fabric/build.gradle.patch
+++ b/patches/1.18.2/Fabric/build.gradle.patch
@@ -1,6 +1,6 @@
 --- a/Fabric/build.gradle
 +++ b/Fabric/build.gradle
-@@ -112,8 +112,8 @@
+@@ -113,8 +113,8 @@
      setVersionType("release")
      setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
      setProjectVersion("${minecraft_version}-${project.version}")
diff --git a/patches/1.18.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch b/patches/1.18.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
index 0702bde..5378caa 100644
--- a/patches/1.18.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
+++ b/patches/1.18.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
@@ -13,7 +13,7 @@
  import org.spongepowered.asm.mixin.Mixin;
  import org.spongepowered.asm.mixin.Shadow;
  import org.spongepowered.asm.mixin.injection.At;
-@@ -22,12 +22,16 @@
+@@ -22,13 +22,16 @@
      public ServerPlayer player;
  
      @Inject(
@@ -24,7 +24,8 @@
              cancellable = true
      )
 -    private void injectChatEvent(PlayerChatMessage arg, Component arg2, FilteredText arg3, CallbackInfo ci) {
--        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
+-        Component finalArg = arg2 == null ? arg.decoratedContent() : arg2;
+-        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalArg.getString(), ChatUtils.mojangToAdventure(finalArg));
 +    private void injectChatEvent(TextFilter.FilteredText arg, CallbackInfo ci) {
 +        Component message = new TextComponent(arg.getRaw());
 +        if (message.getString().startsWith("/"))
diff --git a/patches/1.18.2/Forge/build.gradle.patch b/patches/1.18.2/Forge/build.gradle.patch
index a61f433..cca8a99 100644
--- a/patches/1.18.2/Forge/build.gradle.patch
+++ b/patches/1.18.2/Forge/build.gradle.patch
@@ -9,7 +9,7 @@
  
      // Do not edit or remove
      implementation project(":Common")
-@@ -106,8 +106,8 @@
+@@ -107,8 +107,8 @@
      setVersionType("release")
      setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
      setProjectVersion("${minecraft_version}-${project.version}")
diff --git a/patches/1.18.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch b/patches/1.18.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch
index 7272e3a..a1cb371 100644
--- a/patches/1.18.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch
+++ b/patches/1.18.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch
@@ -1,8 +1,10 @@
 --- a/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
 +++ b/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
-@@ -2,12 +2,16 @@
+@@ -1,13 +1,18 @@
+ package com.hypherionmc.craterlib.common;
  
  import com.hypherionmc.craterlib.core.platform.CompatUtils;
++import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
  import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
 +import redstonedubstep.mods.vanishmod.VanishUtil;
  
diff --git a/patches/1.18.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch b/patches/1.18.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
index 1b2b3ae..4cf20de 100644
--- a/patches/1.18.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
+++ b/patches/1.18.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
@@ -13,7 +13,7 @@
  import org.spongepowered.asm.mixin.Mixin;
  import org.spongepowered.asm.mixin.Shadow;
  import org.spongepowered.asm.mixin.injection.At;
-@@ -22,12 +22,16 @@
+@@ -22,13 +22,16 @@
      public ServerPlayer player;
  
      @Inject(
@@ -24,7 +24,8 @@
              cancellable = true
      )
 -    private void injectChatEvent(Component component, PlayerChatMessage arg, FilteredText p_296589_, CallbackInfo ci) {
--        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
+-        Component finalArg = component == null ? arg.decoratedContent() : component;
+-        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalArg.getString(), ChatUtils.mojangToAdventure(finalArg));
 +    private void injectChatEvent(TextFilter.FilteredText arg, CallbackInfo ci) {
 +        Component message = new TextComponent(arg.getRaw());
 +        if (message.getString().startsWith("/"))
diff --git a/patches/1.18.2/NeoForge/build.gradle.patch b/patches/1.18.2/NeoForge/build.gradle.patch
index a50d107..4a155d8 100644
--- a/patches/1.18.2/NeoForge/build.gradle.patch
+++ b/patches/1.18.2/NeoForge/build.gradle.patch
@@ -1,6 +1,6 @@
 --- a/NeoForge/build.gradle
 +++ /dev/null
-@@ -1,114 +1,0 @@
+@@ -1,115 +1,0 @@
 -archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}"
 -
 -dependencies {
@@ -24,6 +24,7 @@
 -    }
 -
 -    setArchiveClassifier('dev-shadow')
+-    mergeServiceFiles()
 -}
 -
 -/**
diff --git a/patches/1.18.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch b/patches/1.18.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
index 1c6224e..631e6a6 100644
--- a/patches/1.18.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
+++ b/patches/1.18.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
@@ -1,6 +1,6 @@
 --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
 +++ /dev/null
-@@ -1,36 +1,0 @@
+@@ -1,37 +1,0 @@
 -package com.hypherionmc.craterlib.mixin;
 -
 -import com.hypherionmc.craterlib.api.events.server.CraterServerChatEvent;
@@ -30,7 +30,8 @@
 -            cancellable = true
 -    )
 -    private void injectChatEvent(Component component, PlayerChatMessage arg, FilteredText p_296589_, CallbackInfo ci) {
--        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
+-        Component finalArg = component == null ? arg.decoratedContent() : component;
+-        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalArg.getString(), ChatUtils.mojangToAdventure(finalArg));
 -        CraterEventBus.INSTANCE.postEvent(event);
 -        if (event.wasCancelled())
 -            ci.cancel();
diff --git a/patches/1.19.2/Fabric/build.gradle.patch b/patches/1.19.2/Fabric/build.gradle.patch
index e5b7486..5af4dbc 100644
--- a/patches/1.19.2/Fabric/build.gradle.patch
+++ b/patches/1.19.2/Fabric/build.gradle.patch
@@ -1,6 +1,6 @@
 --- a/Fabric/build.gradle
 +++ b/Fabric/build.gradle
-@@ -112,8 +112,8 @@
+@@ -113,8 +113,8 @@
      setVersionType("release")
      setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
      setProjectVersion("${minecraft_version}-${project.version}")
diff --git a/patches/1.19.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch b/patches/1.19.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
index d79d961..73b23d3 100644
--- a/patches/1.19.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
+++ b/patches/1.19.2/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
@@ -20,7 +20,7 @@
  
  @Mixin(value = ServerGamePacketListenerImpl.class, priority = Integer.MIN_VALUE)
  public class ServerGamePacketListenerImplMixin {
-@@ -22,12 +22,12 @@
+@@ -22,13 +22,12 @@
      public ServerPlayer player;
  
      @Inject(
@@ -30,7 +30,8 @@
              cancellable = true
      )
 -    private void injectChatEvent(PlayerChatMessage arg, Component arg2, FilteredText arg3, CallbackInfo ci) {
--        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
+-        Component finalArg = arg2 == null ? arg.decoratedContent() : arg2;
+-        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalArg.getString(), ChatUtils.mojangToAdventure(finalArg));
 +    private void injectChatEvent(PlayerChatMessage arg, CallbackInfoReturnable<CompletableFuture> ci) {
 +        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.serverContent().getString(), ChatUtils.mojangToAdventure(arg.serverContent()));
          CraterEventBus.INSTANCE.postEvent(event);
diff --git a/patches/1.19.2/Forge/build.gradle.patch b/patches/1.19.2/Forge/build.gradle.patch
index a4dc8f8..e16081d 100644
--- a/patches/1.19.2/Forge/build.gradle.patch
+++ b/patches/1.19.2/Forge/build.gradle.patch
@@ -9,7 +9,7 @@
  
      // Do not edit or remove
      implementation project(":Common")
-@@ -106,8 +106,8 @@
+@@ -107,8 +107,8 @@
      setVersionType("release")
      setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
      setProjectVersion("${minecraft_version}-${project.version}")
diff --git a/patches/1.19.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch b/patches/1.19.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch
index 7272e3a..a1cb371 100644
--- a/patches/1.19.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch
+++ b/patches/1.19.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch
@@ -1,8 +1,10 @@
 --- a/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
 +++ b/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
-@@ -2,12 +2,16 @@
+@@ -1,13 +1,18 @@
+ package com.hypherionmc.craterlib.common;
  
  import com.hypherionmc.craterlib.core.platform.CompatUtils;
++import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
  import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
 +import redstonedubstep.mods.vanishmod.VanishUtil;
  
diff --git a/patches/1.19.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch b/patches/1.19.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
index c24fbe2..e153a68 100644
--- a/patches/1.19.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
+++ b/patches/1.19.2/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
@@ -20,7 +20,7 @@
  
  @Mixin(value = ServerGamePacketListenerImpl.class, priority = Integer.MIN_VALUE)
  public class ServerGamePacketListenerImplMixin {
-@@ -22,12 +22,12 @@
+@@ -22,13 +22,12 @@
      public ServerPlayer player;
  
      @Inject(
@@ -30,7 +30,8 @@
              cancellable = true
      )
 -    private void injectChatEvent(Component component, PlayerChatMessage arg, FilteredText p_296589_, CallbackInfo ci) {
--        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
+-        Component finalArg = component == null ? arg.decoratedContent() : component;
+-        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalArg.getString(), ChatUtils.mojangToAdventure(finalArg));
 +    private void injectChatEvent(PlayerChatMessage arg, CallbackInfoReturnable<CompletableFuture> ci) {
 +        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.serverContent().getString(), ChatUtils.mojangToAdventure(arg.serverContent()));
          CraterEventBus.INSTANCE.postEvent(event);
diff --git a/patches/1.19.2/NeoForge/build.gradle.patch b/patches/1.19.2/NeoForge/build.gradle.patch
index a50d107..4a155d8 100644
--- a/patches/1.19.2/NeoForge/build.gradle.patch
+++ b/patches/1.19.2/NeoForge/build.gradle.patch
@@ -1,6 +1,6 @@
 --- a/NeoForge/build.gradle
 +++ /dev/null
-@@ -1,114 +1,0 @@
+@@ -1,115 +1,0 @@
 -archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}"
 -
 -dependencies {
@@ -24,6 +24,7 @@
 -    }
 -
 -    setArchiveClassifier('dev-shadow')
+-    mergeServiceFiles()
 -}
 -
 -/**
diff --git a/patches/1.19.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch b/patches/1.19.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
index 1c6224e..631e6a6 100644
--- a/patches/1.19.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
+++ b/patches/1.19.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
@@ -1,6 +1,6 @@
 --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
 +++ /dev/null
-@@ -1,36 +1,0 @@
+@@ -1,37 +1,0 @@
 -package com.hypherionmc.craterlib.mixin;
 -
 -import com.hypherionmc.craterlib.api.events.server.CraterServerChatEvent;
@@ -30,7 +30,8 @@
 -            cancellable = true
 -    )
 -    private void injectChatEvent(Component component, PlayerChatMessage arg, FilteredText p_296589_, CallbackInfo ci) {
--        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
+-        Component finalArg = component == null ? arg.decoratedContent() : component;
+-        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalArg.getString(), ChatUtils.mojangToAdventure(finalArg));
 -        CraterEventBus.INSTANCE.postEvent(event);
 -        if (event.wasCancelled())
 -            ci.cancel();
diff --git a/patches/1.19.3/Fabric/build.gradle.patch b/patches/1.19.3/Fabric/build.gradle.patch
index b2d2baa..33b5cca 100644
--- a/patches/1.19.3/Fabric/build.gradle.patch
+++ b/patches/1.19.3/Fabric/build.gradle.patch
@@ -1,6 +1,6 @@
 --- a/Fabric/build.gradle
 +++ b/Fabric/build.gradle
-@@ -112,8 +112,8 @@
+@@ -113,8 +113,8 @@
      setVersionType("release")
      setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
      setProjectVersion("${minecraft_version}-${project.version}")
diff --git a/patches/1.19.3/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch b/patches/1.19.3/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
index da64010..f21c791 100644
--- a/patches/1.19.3/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
+++ b/patches/1.19.3/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
@@ -20,7 +20,7 @@
  @Mixin(value = ServerGamePacketListenerImpl.class, priority = Integer.MIN_VALUE)
  public class ServerGamePacketListenerImplMixin {
  
-@@ -22,11 +22,11 @@
+@@ -22,12 +22,12 @@
      public ServerPlayer player;
  
      @Inject(
@@ -30,7 +30,8 @@
              cancellable = true
      )
 -    private void injectChatEvent(PlayerChatMessage arg, Component arg2, FilteredText arg3, CallbackInfo ci) {
+         Component finalArg = arg2 == null ? arg.decoratedContent() : arg2;
 +    private void injectChatEvent(PlayerChatMessage arg, CompletableFuture completableFuture, CompletableFuture completableFuture2, Void void_, CallbackInfo ci) {
-         CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
+         CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalArg.getString(), ChatUtils.mojangToAdventure(finalArg));
          CraterEventBus.INSTANCE.postEvent(event);
          if (event.wasCancelled())
diff --git a/patches/1.19.3/Forge/build.gradle.patch b/patches/1.19.3/Forge/build.gradle.patch
index 67accae..ec5adc7 100644
--- a/patches/1.19.3/Forge/build.gradle.patch
+++ b/patches/1.19.3/Forge/build.gradle.patch
@@ -9,7 +9,7 @@
  
      // Do not edit or remove
      implementation project(":Common")
-@@ -106,8 +106,8 @@
+@@ -107,8 +107,8 @@
      setVersionType("release")
      setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
      setProjectVersion("${minecraft_version}-${project.version}")
diff --git a/patches/1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch b/patches/1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch
index 7272e3a..a1cb371 100644
--- a/patches/1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch
+++ b/patches/1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch
@@ -1,8 +1,10 @@
 --- a/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
 +++ b/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
-@@ -2,12 +2,16 @@
+@@ -1,13 +1,18 @@
+ package com.hypherionmc.craterlib.common;
  
  import com.hypherionmc.craterlib.core.platform.CompatUtils;
++import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
  import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
 +import redstonedubstep.mods.vanishmod.VanishUtil;
  
diff --git a/patches/1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch b/patches/1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
index edc9fa9..c7744e3 100644
--- a/patches/1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
+++ b/patches/1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
@@ -20,7 +20,7 @@
  @Mixin(value = ServerGamePacketListenerImpl.class, priority = Integer.MIN_VALUE)
  public class ServerGamePacketListenerImplMixin {
  
-@@ -22,11 +22,11 @@
+@@ -22,12 +22,12 @@
      public ServerPlayer player;
  
      @Inject(
@@ -30,7 +30,8 @@
              cancellable = true
      )
 -    private void injectChatEvent(Component component, PlayerChatMessage arg, FilteredText p_296589_, CallbackInfo ci) {
+         Component finalArg = component == null ? arg.decoratedContent() : component;
 +    private void injectChatEvent(CompletableFuture completablefuture1, PlayerChatMessage arg, CompletableFuture completablefuture, Void p_248218_, CallbackInfo ci) {
-         CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
+         CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalArg.getString(), ChatUtils.mojangToAdventure(finalArg));
          CraterEventBus.INSTANCE.postEvent(event);
          if (event.wasCancelled())
diff --git a/patches/1.19.3/NeoForge/build.gradle.patch b/patches/1.19.3/NeoForge/build.gradle.patch
index a50d107..4a155d8 100644
--- a/patches/1.19.3/NeoForge/build.gradle.patch
+++ b/patches/1.19.3/NeoForge/build.gradle.patch
@@ -1,6 +1,6 @@
 --- a/NeoForge/build.gradle
 +++ /dev/null
-@@ -1,114 +1,0 @@
+@@ -1,115 +1,0 @@
 -archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}"
 -
 -dependencies {
@@ -24,6 +24,7 @@
 -    }
 -
 -    setArchiveClassifier('dev-shadow')
+-    mergeServiceFiles()
 -}
 -
 -/**
diff --git a/patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch b/patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
index 1c6224e..631e6a6 100644
--- a/patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
+++ b/patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
@@ -1,6 +1,6 @@
 --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
 +++ /dev/null
-@@ -1,36 +1,0 @@
+@@ -1,37 +1,0 @@
 -package com.hypherionmc.craterlib.mixin;
 -
 -import com.hypherionmc.craterlib.api.events.server.CraterServerChatEvent;
@@ -30,7 +30,8 @@
 -            cancellable = true
 -    )
 -    private void injectChatEvent(Component component, PlayerChatMessage arg, FilteredText p_296589_, CallbackInfo ci) {
--        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
+-        Component finalArg = component == null ? arg.decoratedContent() : component;
+-        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalArg.getString(), ChatUtils.mojangToAdventure(finalArg));
 -        CraterEventBus.INSTANCE.postEvent(event);
 -        if (event.wasCancelled())
 -            ci.cancel();
diff --git a/patches/1.20.2/Fabric/build.gradle.patch b/patches/1.20.2/Fabric/build.gradle.patch
index d1797ce..a95e752 100644
--- a/patches/1.20.2/Fabric/build.gradle.patch
+++ b/patches/1.20.2/Fabric/build.gradle.patch
@@ -1,6 +1,6 @@
 --- a/Fabric/build.gradle
 +++ b/Fabric/build.gradle
-@@ -112,8 +112,8 @@
+@@ -113,8 +113,8 @@
      setVersionType("release")
      setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
      setProjectVersion("${minecraft_version}-${project.version}")
diff --git a/patches/1.20.2/Forge/build.gradle.patch b/patches/1.20.2/Forge/build.gradle.patch
index 5c08f83..4c45cc0 100644
--- a/patches/1.20.2/Forge/build.gradle.patch
+++ b/patches/1.20.2/Forge/build.gradle.patch
@@ -9,7 +9,7 @@
  
      // Do not edit or remove
      implementation project(":Common")
-@@ -106,8 +106,8 @@
+@@ -107,8 +107,8 @@
      setVersionType("release")
      setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
      setProjectVersion("${minecraft_version}-${project.version}")
diff --git a/patches/1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch b/patches/1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch
index 7272e3a..a1cb371 100644
--- a/patches/1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch
+++ b/patches/1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch
@@ -1,8 +1,10 @@
 --- a/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
 +++ b/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
-@@ -2,12 +2,16 @@
+@@ -1,13 +1,18 @@
+ package com.hypherionmc.craterlib.common;
  
  import com.hypherionmc.craterlib.core.platform.CompatUtils;
++import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
  import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
 +import redstonedubstep.mods.vanishmod.VanishUtil;
  
diff --git a/patches/1.20.2/NeoForge/build.gradle.patch b/patches/1.20.2/NeoForge/build.gradle.patch
index a50d107..4a155d8 100644
--- a/patches/1.20.2/NeoForge/build.gradle.patch
+++ b/patches/1.20.2/NeoForge/build.gradle.patch
@@ -1,6 +1,6 @@
 --- a/NeoForge/build.gradle
 +++ /dev/null
-@@ -1,114 +1,0 @@
+@@ -1,115 +1,0 @@
 -archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}"
 -
 -dependencies {
@@ -24,6 +24,7 @@
 -    }
 -
 -    setArchiveClassifier('dev-shadow')
+-    mergeServiceFiles()
 -}
 -
 -/**
diff --git a/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch b/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
index 1c6224e..631e6a6 100644
--- a/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
+++ b/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
@@ -1,6 +1,6 @@
 --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
 +++ /dev/null
-@@ -1,36 +1,0 @@
+@@ -1,37 +1,0 @@
 -package com.hypherionmc.craterlib.mixin;
 -
 -import com.hypherionmc.craterlib.api.events.server.CraterServerChatEvent;
@@ -30,7 +30,8 @@
 -            cancellable = true
 -    )
 -    private void injectChatEvent(Component component, PlayerChatMessage arg, FilteredText p_296589_, CallbackInfo ci) {
--        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
+-        Component finalArg = component == null ? arg.decoratedContent() : component;
+-        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalArg.getString(), ChatUtils.mojangToAdventure(finalArg));
 -        CraterEventBus.INSTANCE.postEvent(event);
 -        if (event.wasCancelled())
 -            ci.cancel();
diff --git a/patches/1.20.4/Fabric/build.gradle.patch b/patches/1.20.4/Fabric/build.gradle.patch
index a41e4c0..896ec96 100644
--- a/patches/1.20.4/Fabric/build.gradle.patch
+++ b/patches/1.20.4/Fabric/build.gradle.patch
@@ -1,6 +1,6 @@
 --- a/Fabric/build.gradle
 +++ b/Fabric/build.gradle
-@@ -112,8 +112,8 @@
+@@ -113,8 +113,8 @@
      setVersionType("release")
      setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
      setProjectVersion("${minecraft_version}-${project.version}")
diff --git a/patches/1.20.4/Forge/build.gradle.patch b/patches/1.20.4/Forge/build.gradle.patch
index 52300d6..d33a5f2 100644
--- a/patches/1.20.4/Forge/build.gradle.patch
+++ b/patches/1.20.4/Forge/build.gradle.patch
@@ -9,7 +9,7 @@
  
      // Do not edit or remove
      implementation project(":Common")
-@@ -106,8 +106,8 @@
+@@ -107,8 +107,8 @@
      setVersionType("release")
      setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
      setProjectVersion("${minecraft_version}-${project.version}")
diff --git a/patches/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch b/patches/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch
index 7272e3a..a1cb371 100644
--- a/patches/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch
+++ b/patches/1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch
@@ -1,8 +1,10 @@
 --- a/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
 +++ b/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
-@@ -2,12 +2,16 @@
+@@ -1,13 +1,18 @@
+ package com.hypherionmc.craterlib.common;
  
  import com.hypherionmc.craterlib.core.platform.CompatUtils;
++import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
  import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
 +import redstonedubstep.mods.vanishmod.VanishUtil;
  
diff --git a/patches/1.20.4/NeoForge/build.gradle.patch b/patches/1.20.4/NeoForge/build.gradle.patch
index 9d70c89..a551cad 100644
--- a/patches/1.20.4/NeoForge/build.gradle.patch
+++ b/patches/1.20.4/NeoForge/build.gradle.patch
@@ -1,6 +1,6 @@
 --- a/NeoForge/build.gradle
 +++ b/NeoForge/build.gradle
-@@ -50,7 +50,7 @@
+@@ -51,7 +51,7 @@
      from project(":Common").sourceSets.main.resources
      def buildProps = project.properties.clone()
  
@@ -9,7 +9,7 @@
          expand buildProps
      }
  }
-@@ -105,8 +105,8 @@
+@@ -106,8 +106,8 @@
      setVersionType("release")
      setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
      setProjectVersion("${minecraft_version}-${project.version}")
diff --git a/patches/1.20/Fabric/build.gradle.patch b/patches/1.20/Fabric/build.gradle.patch
index f4721ac..ce24ce9 100644
--- a/patches/1.20/Fabric/build.gradle.patch
+++ b/patches/1.20/Fabric/build.gradle.patch
@@ -1,6 +1,6 @@
 --- a/Fabric/build.gradle
 +++ b/Fabric/build.gradle
-@@ -112,8 +112,8 @@
+@@ -113,8 +113,8 @@
      setVersionType("release")
      setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-fabric.md")
      setProjectVersion("${minecraft_version}-${project.version}")
diff --git a/patches/1.20/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch b/patches/1.20/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
index da64010..f21c791 100644
--- a/patches/1.20/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
+++ b/patches/1.20/Fabric/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
@@ -20,7 +20,7 @@
  @Mixin(value = ServerGamePacketListenerImpl.class, priority = Integer.MIN_VALUE)
  public class ServerGamePacketListenerImplMixin {
  
-@@ -22,11 +22,11 @@
+@@ -22,12 +22,12 @@
      public ServerPlayer player;
  
      @Inject(
@@ -30,7 +30,8 @@
              cancellable = true
      )
 -    private void injectChatEvent(PlayerChatMessage arg, Component arg2, FilteredText arg3, CallbackInfo ci) {
+         Component finalArg = arg2 == null ? arg.decoratedContent() : arg2;
 +    private void injectChatEvent(PlayerChatMessage arg, CompletableFuture completableFuture, CompletableFuture completableFuture2, Void void_, CallbackInfo ci) {
-         CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
+         CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalArg.getString(), ChatUtils.mojangToAdventure(finalArg));
          CraterEventBus.INSTANCE.postEvent(event);
          if (event.wasCancelled())
diff --git a/patches/1.20/Forge/build.gradle.patch b/patches/1.20/Forge/build.gradle.patch
index 86f8e56..2482057 100644
--- a/patches/1.20/Forge/build.gradle.patch
+++ b/patches/1.20/Forge/build.gradle.patch
@@ -9,7 +9,7 @@
  
      // Do not edit or remove
      implementation project(":Common")
-@@ -106,8 +106,8 @@
+@@ -107,8 +107,8 @@
      setVersionType("release")
      setChangelog("https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md")
      setProjectVersion("${minecraft_version}-${project.version}")
diff --git a/patches/1.20/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch b/patches/1.20/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch
index 7272e3a..a1cb371 100644
--- a/patches/1.20/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch
+++ b/patches/1.20/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java.patch
@@ -1,8 +1,10 @@
 --- a/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
 +++ b/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java
-@@ -2,12 +2,16 @@
+@@ -1,13 +1,18 @@
+ package com.hypherionmc.craterlib.common;
  
  import com.hypherionmc.craterlib.core.platform.CompatUtils;
++import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
  import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
 +import redstonedubstep.mods.vanishmod.VanishUtil;
  
diff --git a/patches/1.20/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch b/patches/1.20/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
index 3156e3e..29b5cef 100644
--- a/patches/1.20/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
+++ b/patches/1.20/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
@@ -20,7 +20,7 @@
  @Mixin(value = ServerGamePacketListenerImpl.class, priority = Integer.MIN_VALUE)
  public class ServerGamePacketListenerImplMixin {
  
-@@ -22,11 +22,11 @@
+@@ -22,12 +22,12 @@
      public ServerPlayer player;
  
      @Inject(
@@ -30,7 +30,8 @@
              cancellable = true
      )
 -    private void injectChatEvent(Component component, PlayerChatMessage arg, FilteredText p_296589_, CallbackInfo ci) {
+         Component finalArg = component == null ? arg.decoratedContent() : component;
 +    private void injectChatEvent(CompletableFuture completablefuture1, PlayerChatMessage arg, CompletableFuture completablefuture, Void p_248218_, CallbackInfo ci) {
-         CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
+         CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalArg.getString(), ChatUtils.mojangToAdventure(finalArg));
          CraterEventBus.INSTANCE.postEvent(event);
          if (event.wasCancelled())
diff --git a/patches/1.20/NeoForge/build.gradle.patch b/patches/1.20/NeoForge/build.gradle.patch
index a50d107..4a155d8 100644
--- a/patches/1.20/NeoForge/build.gradle.patch
+++ b/patches/1.20/NeoForge/build.gradle.patch
@@ -1,6 +1,6 @@
 --- a/NeoForge/build.gradle
 +++ /dev/null
-@@ -1,114 +1,0 @@
+@@ -1,115 +1,0 @@
 -archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}"
 -
 -dependencies {
@@ -24,6 +24,7 @@
 -    }
 -
 -    setArchiveClassifier('dev-shadow')
+-    mergeServiceFiles()
 -}
 -
 -/**
diff --git a/patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch b/patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
index 1c6224e..631e6a6 100644
--- a/patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
+++ b/patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java.patch
@@ -1,6 +1,6 @@
 --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java
 +++ /dev/null
-@@ -1,36 +1,0 @@
+@@ -1,37 +1,0 @@
 -package com.hypherionmc.craterlib.mixin;
 -
 -import com.hypherionmc.craterlib.api.events.server.CraterServerChatEvent;
@@ -30,7 +30,8 @@
 -            cancellable = true
 -    )
 -    private void injectChatEvent(Component component, PlayerChatMessage arg, FilteredText p_296589_, CallbackInfo ci) {
--        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), arg.decoratedContent().getString(), ChatUtils.mojangToAdventure(arg.decoratedContent()));
+-        Component finalArg = component == null ? arg.decoratedContent() : component;
+-        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalArg.getString(), ChatUtils.mojangToAdventure(finalArg));
 -        CraterEventBus.INSTANCE.postEvent(event);
 -        if (event.wasCancelled())
 -            ci.cancel();