[BUG] Fix NeoForge/Forge issue with adventure

1.18.2/Fabric/build.gradle

@@ -29,6 +29,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**

1.18.2/Forge/build.gradle

@@ -22,6 +22,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**

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

1.18.2/gradle.properties

@@ -1,8 +1,8 @@
 #Project
 version_major=2
 version_minor=0
-version_patch=2
+version_patch=3
-version_build=1
+version_build=0
 
 #Mod
 mod_author=HypherionSA

1.19.2/Fabric/build.gradle

@@ -29,6 +29,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**

1.19.2/Forge/build.gradle

@@ -22,6 +22,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**

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

1.19.2/gradle.properties

@@ -1,8 +1,8 @@
 #Project
 version_major=2
 version_minor=0
-version_patch=2
+version_patch=3
-version_build=1
+version_build=0
 
 #Mod
 mod_author=HypherionSA

1.19.3/Fabric/build.gradle

@@ -29,6 +29,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**

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();

1.19.3/Forge/build.gradle

@@ -22,6 +22,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**

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

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();

1.19.3/gradle.properties

@@ -1,8 +1,8 @@
 #Project
 version_major=2
 version_minor=0
-version_patch=2
+version_patch=3
-version_build=1
+version_build=0
 
 #Mod
 mod_author=HypherionSA

1.20.2/Fabric/build.gradle

@@ -29,6 +29,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**

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();

1.20.2/Forge/build.gradle

@@ -22,6 +22,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**

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

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();

1.20.2/gradle.properties

@@ -1,8 +1,8 @@
 #Project
 version_major=2
 version_minor=0
-version_patch=2
+version_patch=3
-version_build=1
+version_build=0
 
 #Mod
 mod_author=HypherionSA

1.20.4/Fabric/build.gradle

@@ -29,6 +29,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**

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();

1.20.4/Forge/build.gradle

@@ -22,6 +22,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**

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

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();

1.20.4/NeoForge/build.gradle

@@ -21,6 +21,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**

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();

1.20.4/gradle.properties

@@ -1,8 +1,8 @@
 #Project
 version_major=2
 version_minor=0
-version_patch=2
+version_patch=3
-version_build=1
+version_build=0
 
 #Mod
 mod_author=HypherionSA

1.20/Fabric/build.gradle

@@ -29,6 +29,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**

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();

1.20/Forge/build.gradle

@@ -22,6 +22,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**

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

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();

1.20/gradle.properties

@@ -1,8 +1,8 @@
 #Project
 version_major=2
 version_minor=0
-version_patch=2
+version_patch=3
-version_build=1
+version_build=0
 
 #Mod
 mod_author=HypherionSA

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}")
+    setDisplayName("[FABRIC/QUILT 1.21.0] CraterLib - ${project.version}")
-    setGameVersions("1.21", "1.21.1")
+    setGameVersions("1.21")
     setLoaders("fabric", "quilt")
     setArtifact(remapJar)
     setCurseEnvironment("both")

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();

1.21/Forge/build.gradle

@@ -22,6 +22,7 @@ shadowJar {
     }
 
     setArchiveClassifier('dev-shadow')
+    mergeServiceFiles()
 }
 
 /**

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();

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}")
+    setDisplayName("[NeoForge 1.21.0] CraterLib - ${project.version}")
-    setGameVersions("1.21", "1.21.1")
+    setGameVersions("1.21")
     setLoaders("neoforge")
     setArtifact(remapJar)
     setCurseEnvironment("both")

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();

1.21/gradle.properties

@@ -1,8 +1,8 @@
 #Project
 version_major=2
 version_minor=0
-version_patch=2
+version_patch=3
-version_build=1
+version_build=0
 
 #Mod
 mod_author=HypherionSA

commit.sha

@@ -1 +1 @@
-c8cfa985b1c8a74a42eab0d51db54add654d1f97
+2c13d507c30a460256f006d30428d7ead5da2719

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}")

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("/"))

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}")

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;
  

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("/"))

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()
 -}
 -
 -/**

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();

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}")

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);

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}")

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;
  

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);

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()
 -}
 -
 -/**

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();

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}")

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())

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}")

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;
  

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())

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()
 -}
 -
 -/**

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();

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}")

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}")

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;
  

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()
 -}
 -
 -/**

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();

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}")

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}")

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;
  

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}")

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}")

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())

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}")

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;
  

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())

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()
 -}
 -
 -/**

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();