[FEAT/BUG] Adventure parser backport and added Compat API for Advanced Chat

1.18.2/Common/src/main/java/com/hypherionmc/craterlib/core/platform/CompatUtils.java

@@ -2,6 +2,7 @@ package com.hypherionmc.craterlib.core.platform;
 
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
 import com.hypherionmc.craterlib.utils.InternalServiceUtil;
+import net.kyori.adventure.text.Component;
 
 public interface CompatUtils {
 
@@ -12,5 +13,7 @@ public interface CompatUtils {
     boolean isPlayerBleeding(BridgedPlayer player);
     boolean playerBledOut(BridgedPlayer player);
     boolean playerRevived(BridgedPlayer player);
+    boolean isPrivateMessage(BridgedPlayer player);
+    Component getChannelPrefix(BridgedPlayer player);
 
 }

1.18.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/commands/BridgedCommandSourceStack.java

@@ -9,13 +9,27 @@ import net.minecraft.commands.CommandSourceStack;
 
 import java.util.function.Supplier;
 
+import static net.minecraft.world.level.GameRules.RULE_SENDCOMMANDFEEDBACK;
+
 @RequiredArgsConstructor(staticName = "of")
 public class BridgedCommandSourceStack {
 
     private final CommandSourceStack internal;
 
     public void sendSuccess(Supplier<Component> supplier, boolean bl) {
-        internal.sendSuccess(ChatUtils.adventureToMojang(supplier.get()), bl);
+        if (!internal.getServer().getGameRules().getBoolean(RULE_SENDCOMMANDFEEDBACK)) {
+            try {
+                internal.getPlayerOrException().displayClientMessage(ChatUtils.adventureToMojang(supplier.get()), false);
+            } catch (Exception ignored) {}
+        } else {
+            internal.sendSuccess(ChatUtils.adventureToMojang(supplier.get()), bl);
+        }
+    }
+
+    public void sendMessage(Component text) {
+        try {
+            internal.getPlayerOrException().displayClientMessage(ChatUtils.adventureToMojang(text), false);
+        } catch (Exception ignored) {}
     }
 
     public void sendFailure(Component text) {

1.18.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java

@@ -31,8 +31,12 @@ public class ChatUtils {
     }
 
     public static net.kyori.adventure.text.Component mojangToAdventure(Component inComponent) {
-        final String serialised = Component.Serializer.toJson(inComponent);
-        return adventureSerializer.deserialize(serialised);
+        try {
+            final String serialised = Component.Serializer.toJson(inComponent);
+            return adventureSerializer.deserialize(serialised);
+        } catch (Exception e) {
+            return net.kyori.adventure.text.Component.text(inComponent.getString());
+        }
     }
 
     // Some text components contain duplicate text, resulting in duplicate messages

1.18.2/Fabric/src/main/java/com/hypherionmc/craterlib/common/FabricCompatHelper.java

@@ -5,6 +5,7 @@ import com.hypherionmc.craterlib.compat.Vanish;
 import com.hypherionmc.craterlib.core.platform.CompatUtils;
 import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import net.kyori.adventure.text.Component;
 
 public class FabricCompatHelper implements CompatUtils {
 
@@ -35,4 +36,14 @@ public class FabricCompatHelper implements CompatUtils {
     public boolean playerRevived(BridgedPlayer player) {
         return false;
     }
+
+    @Override
+    public boolean isPrivateMessage(BridgedPlayer player) {
+        return false;
+    }
+
+    @Override
+    public Component getChannelPrefix(BridgedPlayer player) {
+        return Component.empty();
+    }
 }

1.18.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java

@@ -3,6 +3,7 @@ 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 net.kyori.adventure.text.Component;
 import team.creative.playerrevive.api.IBleeding;
 import team.creative.playerrevive.server.PlayerReviveServer;
 import redstonedubstep.mods.vanishmod.VanishUtil;
@@ -47,4 +48,14 @@ public class ForgeCompatHelper implements CompatUtils {
         IBleeding bleeding = PlayerReviveServer.getBleeding(player.toMojangServerPlayer());
         return bleeding != null && bleeding.revived();
     }
+
+    @Override
+    public boolean isPrivateMessage(BridgedPlayer player) {
+        return false;
+    }
+
+    @Override
+    public Component getChannelPrefix(BridgedPlayer player) {
+        return Component.empty();
+    }
 }

1.18.2/changelog.md

@@ -1,13 +1,8 @@
 **Bug Fixes**:
 
-- Fixed LuckPerms breaking commands on Paper
-- Fix Config watcher using too many threads and not detecting changes on Linux systems
+- Fix Adventure Serializer failing completely when serialization fails, causing game glitches
 
 **New Features**:
 
-- Added Nojang API to allow mods to access GameRules (SDLink)
-- Exposed Adventure JSON serializer to mods
-
-**Dev Changes**:
-
-- Bumped MoonConfig - `1.0.10` -> `1.0.12`
+- Allow commands to send feedback as chat messages, if command feedback is disabled
+- Added Compat API for Advanced Chat

1.18.2/gradle.properties

@@ -1,8 +1,8 @@
 #Project
 version_major=2
 version_minor=1
-version_patch=4
-version_build=2
+version_patch=5
+version_build=0
 
 #Mod
 mod_author=HypherionSA
@@ -29,6 +29,7 @@ discord_formatter=2.0.0
 cloth_config=6.5.102
 
 # Mod Dependencies
+advanced_chat=SNA4dye5
 player_revive=5335413
 creative_core=5335387
 ftb_ranks=1802.1.11-build.71

1.19.2/Common/src/main/java/com/hypherionmc/craterlib/core/platform/CompatUtils.java

@@ -2,6 +2,7 @@ package com.hypherionmc.craterlib.core.platform;
 
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
 import com.hypherionmc.craterlib.utils.InternalServiceUtil;
+import net.kyori.adventure.text.Component;
 
 public interface CompatUtils {
 
@@ -12,5 +13,7 @@ public interface CompatUtils {
     boolean isPlayerBleeding(BridgedPlayer player);
     boolean playerBledOut(BridgedPlayer player);
     boolean playerRevived(BridgedPlayer player);
+    boolean isPrivateMessage(BridgedPlayer player);
+    Component getChannelPrefix(BridgedPlayer player);
 
 }

1.19.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/commands/BridgedCommandSourceStack.java

@@ -8,13 +8,23 @@ import net.minecraft.commands.CommandSourceStack;
 
 import java.util.function.Supplier;
 
+import static net.minecraft.world.level.GameRules.RULE_SENDCOMMANDFEEDBACK;
+
 @RequiredArgsConstructor(staticName = "of")
 public class BridgedCommandSourceStack {
 
     private final CommandSourceStack internal;
 
     public void sendSuccess(Supplier<Component> supplier, boolean bl) {
-        internal.sendSuccess(ChatUtils.adventureToMojang(supplier.get()), bl);
+        if (!internal.getServer().getGameRules().getBoolean(RULE_SENDCOMMANDFEEDBACK)) {
+            internal.sendSystemMessage(ChatUtils.adventureToMojang(supplier.get()));
+        } else {
+            internal.sendSuccess(ChatUtils.adventureToMojang(supplier.get()), bl);
+        }
+    }
+
+    public void sendMessage(Component text) {
+        internal.sendSystemMessage(ChatUtils.adventureToMojang(text));
     }
 
     public void sendFailure(Component text) {

1.19.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java

@@ -29,8 +29,12 @@ public class ChatUtils {
     }
 
     public static net.kyori.adventure.text.Component mojangToAdventure(Component inComponent) {
+        try {
         final String serialised = Component.Serializer.toJson(inComponent);
-        return adventureSerializer.deserialize(serialised);
+            return adventureSerializer.deserialize(serialised);
+        } catch (Exception e) {
+            return net.kyori.adventure.text.Component.text(inComponent.getString());
+        }
     }
 
     // Some text components contain duplicate text, resulting in duplicate messages

1.19.2/Fabric/src/main/java/com/hypherionmc/craterlib/common/FabricCompatHelper.java

@@ -5,6 +5,7 @@ import com.hypherionmc.craterlib.compat.Vanish;
 import com.hypherionmc.craterlib.core.platform.CompatUtils;
 import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import net.kyori.adventure.text.Component;
 
 public class FabricCompatHelper implements CompatUtils {
 
@@ -35,4 +36,14 @@ public class FabricCompatHelper implements CompatUtils {
     public boolean playerRevived(BridgedPlayer player) {
         return false;
     }
+
+    @Override
+    public boolean isPrivateMessage(BridgedPlayer player) {
+        return false;
+    }
+
+    @Override
+    public Component getChannelPrefix(BridgedPlayer player) {
+        return Component.empty();
+    }
 }

1.19.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java

@@ -3,6 +3,7 @@ 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 net.kyori.adventure.text.Component;
 import team.creative.playerrevive.api.IBleeding;
 import team.creative.playerrevive.server.PlayerReviveServer;
 import redstonedubstep.mods.vanishmod.VanishUtil;
@@ -47,4 +48,14 @@ public class ForgeCompatHelper implements CompatUtils {
         IBleeding bleeding = PlayerReviveServer.getBleeding(player.toMojangServerPlayer());
         return bleeding != null && bleeding.revived();
     }
+
+    @Override
+    public boolean isPrivateMessage(BridgedPlayer player) {
+        return false;
+    }
+
+    @Override
+    public Component getChannelPrefix(BridgedPlayer player) {
+        return Component.empty();
+    }
 }

1.19.2/changelog.md

@@ -1,13 +1,8 @@
 **Bug Fixes**:
 
-- Fixed LuckPerms breaking commands on Paper
-- Fix Config watcher using too many threads and not detecting changes on Linux systems
+- Fix Adventure Serializer failing completely when serialization fails, causing game glitches
 
 **New Features**:
 
-- Added Nojang API to allow mods to access GameRules (SDLink)
-- Exposed Adventure JSON serializer to mods
-
-**Dev Changes**:
-
-- Bumped MoonConfig - `1.0.10` -> `1.0.12`
+- Allow commands to send feedback as chat messages, if command feedback is disabled
+- Added Compat API for Advanced Chat

1.19.2/gradle.properties

@@ -1,8 +1,8 @@
 #Project
 version_major=2
 version_minor=1
-version_patch=4
-version_build=2
+version_patch=5
+version_build=0
 
 #Mod
 mod_author=HypherionSA
@@ -29,6 +29,7 @@ discord_formatter=2.0.0
 cloth_config=8.3.134
 
 # Mod Dependencies
+advanced_chat=SNA4dye5
 player_revive=5491953
 creative_core=5491926
 ftb_ranks=1902.1.16-build.114

1.19.3/Common/src/main/java/com/hypherionmc/craterlib/core/platform/CompatUtils.java

@@ -2,6 +2,7 @@ package com.hypherionmc.craterlib.core.platform;
 
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
 import com.hypherionmc.craterlib.utils.InternalServiceUtil;
+import net.kyori.adventure.text.Component;
 
 public interface CompatUtils {
 
@@ -12,5 +13,7 @@ public interface CompatUtils {
     boolean isPlayerBleeding(BridgedPlayer player);
     boolean playerBledOut(BridgedPlayer player);
     boolean playerRevived(BridgedPlayer player);
+    boolean isPrivateMessage(BridgedPlayer player);
+    Component getChannelPrefix(BridgedPlayer player);
 
 }

1.19.3/Common/src/main/java/com/hypherionmc/craterlib/nojang/commands/BridgedCommandSourceStack.java

@@ -8,13 +8,23 @@ import net.minecraft.commands.CommandSourceStack;
 
 import java.util.function.Supplier;
 
+import static net.minecraft.world.level.GameRules.RULE_SENDCOMMANDFEEDBACK;
+
 @RequiredArgsConstructor(staticName = "of")
 public class BridgedCommandSourceStack {
 
     private final CommandSourceStack internal;
 
     public void sendSuccess(Supplier<Component> supplier, boolean bl) {
-        internal.sendSuccess(ChatUtils.adventureToMojang(supplier.get()), bl);
+        if (!internal.getServer().getGameRules().getBoolean(RULE_SENDCOMMANDFEEDBACK)) {
+            internal.sendSystemMessage(ChatUtils.adventureToMojang(supplier.get()));
+        } else {
+            internal.sendSuccess(ChatUtils.adventureToMojang(supplier.get()), bl);
+        }
+    }
+
+    public void sendMessage(Component text) {
+        internal.sendSystemMessage(ChatUtils.adventureToMojang(text));
     }
 
     public void sendFailure(Component text) {

1.19.3/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java

@@ -31,8 +31,12 @@ public class ChatUtils {
     }
 
     public static net.kyori.adventure.text.Component mojangToAdventure(Component inComponent) {
+        try {
         final String serialised = Component.Serializer.toJson(inComponent);
-        return adventureSerializer.deserialize(serialised);
+            return adventureSerializer.deserialize(serialised);
+        } catch (Exception e) {
+            return net.kyori.adventure.text.Component.text(inComponent.getString());
+        }
     }
 
     // Some text components contain duplicate text, resulting in duplicate messages

1.19.3/Fabric/build.gradle

@@ -14,6 +14,7 @@ dependencies {
     modImplementation("me.shedaniel.cloth:cloth-config-fabric:${cloth_config}")
     modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
     modImplementation "maven.modrinth:vanish:${vanish}"
+    modImplementation("unimaven.modrinth:advanced-chat:${advanced_chat}")
 
     // Do not edit or remove
     implementation project(":Common")

1.19.3/Fabric/src/main/java/com/hypherionmc/craterlib/common/FabricCompatHelper.java

@@ -5,6 +5,8 @@ import com.hypherionmc.craterlib.compat.Vanish;
 import com.hypherionmc.craterlib.core.platform.CompatUtils;
 import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import me.wesley1808.advancedchat.api.AdvancedChatAPI;
+import net.kyori.adventure.text.Component;
 
 public class FabricCompatHelper implements CompatUtils {
 
@@ -35,4 +37,15 @@ public class FabricCompatHelper implements CompatUtils {
     public boolean playerRevived(BridgedPlayer player) {
         return false;
     }
+
+    @Override
+    public boolean isPrivateMessage(BridgedPlayer player) {
+        return !AdvancedChatAPI.isPublicChat(player.toMojangServerPlayer());
+    }
+
+    @Override
+    public Component getChannelPrefix(BridgedPlayer player) {
+        net.minecraft.network.chat.Component c = AdvancedChatAPI.getChannelPrefix(player.toMojangServerPlayer());
+        return c.getString().isBlank() ? Component.empty() : Component.text(c.getString());
+    }
 }

1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java

@@ -3,6 +3,7 @@ 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 net.kyori.adventure.text.Component;
 import team.creative.playerrevive.api.IBleeding;
 import team.creative.playerrevive.server.PlayerReviveServer;
 import redstonedubstep.mods.vanishmod.VanishUtil;
@@ -47,4 +48,14 @@ public class ForgeCompatHelper implements CompatUtils {
         IBleeding bleeding = PlayerReviveServer.getBleeding(player.toMojangServerPlayer());
         return bleeding != null && bleeding.revived();
     }
+
+    @Override
+    public boolean isPrivateMessage(BridgedPlayer player) {
+        return false;
+    }
+
+    @Override
+    public Component getChannelPrefix(BridgedPlayer player) {
+        return Component.empty();
+    }
 }

1.19.3/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java

@@ -4,6 +4,7 @@ import com.hypherionmc.craterlib.core.platform.CompatUtils;
 import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
 import com.hypherionmc.craterlib.utils.ChatUtils;
+import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.metadata.MetadataValue;
@@ -89,4 +90,14 @@ public class PaperCompatHelper implements CompatUtils {
     public boolean playerRevived(BridgedPlayer player) {
         return false;
     }
+
+    @Override
+    public boolean isPrivateMessage(BridgedPlayer player) {
+        return false;
+    }
+
+    @Override
+    public Component getChannelPrefix(BridgedPlayer player) {
+        return Component.empty();
+    }
 }

1.19.3/changelog.md

@@ -1,13 +1,8 @@
 **Bug Fixes**:
 
-- Fixed LuckPerms breaking commands on Paper
-- Fix Config watcher using too many threads and not detecting changes on Linux systems
+- Fix Adventure Serializer failing completely when serialization fails, causing game glitches
 
 **New Features**:
 
-- Added Nojang API to allow mods to access GameRules (SDLink)
-- Exposed Adventure JSON serializer to mods
-
-**Dev Changes**:
-
-- Bumped MoonConfig - `1.0.10` -> `1.0.12`
+- Allow commands to send feedback as chat messages, if command feedback is disabled
+- Added Compat API for Advanced Chat

1.19.3/gradle.properties

@@ -1,8 +1,8 @@
 #Project
 version_major=2
 version_minor=1
-version_patch=4
-version_build=2
+version_patch=5
+version_build=0
 
 #Mod
 mod_author=HypherionSA
@@ -29,6 +29,7 @@ discord_formatter=2.0.0
 cloth_config=9.1.104
 
 # Mod Dependencies
+advanced_chat=RN7kRIrY
 player_revive=4353422
 creative_core=4407520
 ftb_ranks=1904.1.1-build.82

1.20.2/Common/src/main/java/com/hypherionmc/craterlib/core/platform/CompatUtils.java

@@ -2,6 +2,7 @@ package com.hypherionmc.craterlib.core.platform;
 
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
 import com.hypherionmc.craterlib.utils.InternalServiceUtil;
+import net.kyori.adventure.text.Component;
 
 public interface CompatUtils {
 
@@ -12,5 +13,7 @@ public interface CompatUtils {
     boolean isPlayerBleeding(BridgedPlayer player);
     boolean playerBledOut(BridgedPlayer player);
     boolean playerRevived(BridgedPlayer player);
+    boolean isPrivateMessage(BridgedPlayer player);
+    Component getChannelPrefix(BridgedPlayer player);
 
 }

1.20.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/commands/BridgedCommandSourceStack.java

@@ -8,13 +8,23 @@ import net.minecraft.commands.CommandSourceStack;
 
 import java.util.function.Supplier;
 
+import static net.minecraft.world.level.GameRules.RULE_SENDCOMMANDFEEDBACK;
+
 @RequiredArgsConstructor(staticName = "of")
 public class BridgedCommandSourceStack {
 
     private final CommandSourceStack internal;
 
     public void sendSuccess(Supplier<Component> supplier, boolean bl) {
-        internal.sendSuccess(() -> ChatUtils.adventureToMojang(supplier.get()), bl);
+        if (!internal.getServer().getGameRules().getBoolean(RULE_SENDCOMMANDFEEDBACK)) {
+            internal.sendSystemMessage(ChatUtils.adventureToMojang(supplier.get()));
+        } else {
+            internal.sendSuccess(() -> ChatUtils.adventureToMojang(supplier.get()), bl);
+        }
+    }
+
+    public void sendMessage(Component text) {
+        internal.sendSystemMessage(ChatUtils.adventureToMojang(text));
     }
 
     public void sendFailure(Component text) {

1.20.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java

@@ -31,8 +31,12 @@ public class ChatUtils {
     }
 
     public static net.kyori.adventure.text.Component mojangToAdventure(Component inComponent) {
+        try {
         final String serialised = Component.Serializer.toJson(inComponent);
-        return adventureSerializer.deserialize(serialised);
+            return adventureSerializer.deserialize(serialised);
+        } catch (Exception e) {
+            return net.kyori.adventure.text.Component.text(inComponent.getString());
+        }
     }
 
     // Some text components contain duplicate text, resulting in duplicate messages

1.20.2/Fabric/build.gradle

@@ -14,6 +14,7 @@ dependencies {
     modImplementation("me.shedaniel.cloth:cloth-config-fabric:${cloth_config}")
     modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
     modImplementation "maven.modrinth:vanish:${vanish}"
+    modImplementation("unimaven.modrinth:advanced-chat:${advanced_chat}")
 
     // Do not edit or remove
     implementation project(":Common")

1.20.2/Fabric/src/main/java/com/hypherionmc/craterlib/common/FabricCompatHelper.java

@@ -5,6 +5,8 @@ import com.hypherionmc.craterlib.compat.Vanish;
 import com.hypherionmc.craterlib.core.platform.CompatUtils;
 import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import me.wesley1808.advancedchat.api.AdvancedChatAPI;
+import net.kyori.adventure.text.Component;
 
 public class FabricCompatHelper implements CompatUtils {
 
@@ -35,4 +37,15 @@ public class FabricCompatHelper implements CompatUtils {
     public boolean playerRevived(BridgedPlayer player) {
         return false;
     }
+
+    @Override
+    public boolean isPrivateMessage(BridgedPlayer player) {
+        return !AdvancedChatAPI.isPublicChat(player.toMojangServerPlayer());
+    }
+
+    @Override
+    public Component getChannelPrefix(BridgedPlayer player) {
+        net.minecraft.network.chat.Component c = AdvancedChatAPI.getChannelPrefix(player.toMojangServerPlayer());
+        return c.getString().isBlank() ? Component.empty() : Component.text(c.getString());
+    }
 }

1.20.2/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java

@@ -3,6 +3,7 @@ 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 net.kyori.adventure.text.Component;
 import team.creative.playerrevive.api.IBleeding;
 import team.creative.playerrevive.server.PlayerReviveServer;
 import redstonedubstep.mods.vanishmod.VanishUtil;
@@ -47,4 +48,14 @@ public class ForgeCompatHelper implements CompatUtils {
         IBleeding bleeding = PlayerReviveServer.getBleeding(player.toMojangServerPlayer());
         return bleeding != null && bleeding.revived();
     }
+
+    @Override
+    public boolean isPrivateMessage(BridgedPlayer player) {
+        return false;
+    }
+
+    @Override
+    public Component getChannelPrefix(BridgedPlayer player) {
+        return Component.empty();
+    }
 }

1.20.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java

@@ -4,6 +4,7 @@ import com.hypherionmc.craterlib.core.platform.CompatUtils;
 import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
 import com.hypherionmc.craterlib.utils.ChatUtils;
+import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.metadata.MetadataValue;
@@ -89,4 +90,14 @@ public class PaperCompatHelper implements CompatUtils {
     public boolean playerRevived(BridgedPlayer player) {
         return false;
     }
+
+    @Override
+    public boolean isPrivateMessage(BridgedPlayer player) {
+        return false;
+    }
+
+    @Override
+    public Component getChannelPrefix(BridgedPlayer player) {
+        return Component.empty();
+    }
 }

1.20.2/changelog.md

@@ -1,13 +1,8 @@
 **Bug Fixes**:
 
-- Fixed LuckPerms breaking commands on Paper
-- Fix Config watcher using too many threads and not detecting changes on Linux systems
+- Fix Adventure Serializer failing completely when serialization fails, causing game glitches
 
 **New Features**:
 
-- Added Nojang API to allow mods to access GameRules (SDLink)
-- Exposed Adventure JSON serializer to mods
-
-**Dev Changes**:
-
-- Bumped MoonConfig - `1.0.10` -> `1.0.12`
+- Allow commands to send feedback as chat messages, if command feedback is disabled
+- Added Compat API for Advanced Chat

1.20.2/gradle.properties

@@ -1,8 +1,8 @@
 #Project
 version_major=2
 version_minor=1
-version_patch=4
-version_build=2
+version_patch=5
+version_build=0
 
 #Mod
 mod_author=HypherionSA
@@ -29,6 +29,7 @@ discord_formatter=2.0.0
 cloth_config=12.0.137
 
 # Mod Dependencies
+advanced_chat=bLHDrebO
 player_revive=4785938
 creative_core=4796447
 ftb_ranks=2001.1.3

1.20.4/Common/src/main/java/com/hypherionmc/craterlib/core/platform/CompatUtils.java

@@ -2,6 +2,7 @@ package com.hypherionmc.craterlib.core.platform;
 
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
 import com.hypherionmc.craterlib.utils.InternalServiceUtil;
+import net.kyori.adventure.text.Component;
 
 public interface CompatUtils {
 
@@ -12,5 +13,7 @@ public interface CompatUtils {
     boolean isPlayerBleeding(BridgedPlayer player);
     boolean playerBledOut(BridgedPlayer player);
     boolean playerRevived(BridgedPlayer player);
+    boolean isPrivateMessage(BridgedPlayer player);
+    Component getChannelPrefix(BridgedPlayer player);
 
 }

1.20.4/Common/src/main/java/com/hypherionmc/craterlib/nojang/commands/BridgedCommandSourceStack.java

@@ -8,13 +8,23 @@ import net.minecraft.commands.CommandSourceStack;
 
 import java.util.function.Supplier;
 
+import static net.minecraft.world.level.GameRules.RULE_SENDCOMMANDFEEDBACK;
+
 @RequiredArgsConstructor(staticName = "of")
 public class BridgedCommandSourceStack {
 
     private final CommandSourceStack internal;
 
     public void sendSuccess(Supplier<Component> supplier, boolean bl) {
-        internal.sendSuccess(() -> ChatUtils.adventureToMojang(supplier.get()), bl);
+        if (!internal.getServer().getGameRules().getBoolean(RULE_SENDCOMMANDFEEDBACK)) {
+            internal.sendSystemMessage(ChatUtils.adventureToMojang(supplier.get()));
+        } else {
+            internal.sendSuccess(() -> ChatUtils.adventureToMojang(supplier.get()), bl);
+        }
+    }
+
+    public void sendMessage(Component text) {
+        internal.sendSystemMessage(ChatUtils.adventureToMojang(text));
     }
 
     public void sendFailure(Component text) {

1.20.4/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java

@@ -29,8 +29,12 @@ public class ChatUtils {
     }
 
     public static net.kyori.adventure.text.Component mojangToAdventure(Component inComponent) {
+        try {
         final String serialised = Component.Serializer.toJson(inComponent);
-        return adventureSerializer.deserialize(serialised);
+            return adventureSerializer.deserialize(serialised);
+        } catch (Exception e) {
+            return net.kyori.adventure.text.Component.text(inComponent.getString());
+        }
     }
 
     // Some text components contain duplicate text, resulting in duplicate messages

1.20.4/Fabric/build.gradle

@@ -15,6 +15,7 @@ dependencies {
     modImplementation("me.shedaniel.cloth:cloth-config-fabric:${cloth_config}")
     modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
     modImplementation "maven.modrinth:vanish:${vanish}"
+    modImplementation("unimaven.modrinth:advanced-chat:${advanced_chat}")
 
     // Do not edit or remove
     implementation project(":Common")

1.20.4/Fabric/src/main/java/com/hypherionmc/craterlib/common/FabricCompatHelper.java

@@ -5,6 +5,8 @@ import com.hypherionmc.craterlib.compat.Vanish;
 import com.hypherionmc.craterlib.core.platform.CompatUtils;
 import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import me.wesley1808.advancedchat.api.AdvancedChatAPI;
+import net.kyori.adventure.text.Component;
 
 public class FabricCompatHelper implements CompatUtils {
 
@@ -35,4 +37,15 @@ public class FabricCompatHelper implements CompatUtils {
     public boolean playerRevived(BridgedPlayer player) {
         return false;
     }
+
+    @Override
+    public boolean isPrivateMessage(BridgedPlayer player) {
+        return !AdvancedChatAPI.isPublicChat(player.toMojangServerPlayer());
+    }
+
+    @Override
+    public Component getChannelPrefix(BridgedPlayer player) {
+        net.minecraft.network.chat.Component c = AdvancedChatAPI.getChannelPrefix(player.toMojangServerPlayer());
+        return c.getString().isBlank() ? Component.empty() : Component.text(c.getString());
+    }
 }

1.20.4/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java

@@ -3,6 +3,7 @@ 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 net.kyori.adventure.text.Component;
 import redstonedubstep.mods.vanishmod.VanishUtil;
 
 public class ForgeCompatHelper implements CompatUtils {
@@ -34,4 +35,14 @@ public class ForgeCompatHelper implements CompatUtils {
     public boolean playerRevived(BridgedPlayer player) {
         return false;
     }
+
+    @Override
+    public boolean isPrivateMessage(BridgedPlayer player) {
+        return false;
+    }
+
+    @Override
+    public Component getChannelPrefix(BridgedPlayer player) {
+        return Component.empty();
+    }
 }

1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java

@@ -3,6 +3,7 @@ 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 net.kyori.adventure.text.Component;
 import redstonedubstep.mods.vanishmod.VanishUtil;
 import team.creative.playerrevive.api.IBleeding;
 import team.creative.playerrevive.server.PlayerReviveServer;
@@ -47,4 +48,14 @@ public class NeoForgeCompatHelper implements CompatUtils {
         IBleeding bleeding = PlayerReviveServer.getBleeding(player.toMojangServerPlayer());
         return bleeding != null && bleeding.revived();
     }
+
+    @Override
+    public boolean isPrivateMessage(BridgedPlayer player) {
+        return false;
+    }
+
+    @Override
+    public Component getChannelPrefix(BridgedPlayer player) {
+        return Component.empty();
+    }
 }

1.20.4/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java

@@ -4,6 +4,7 @@ import com.hypherionmc.craterlib.core.platform.CompatUtils;
 import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
 import com.hypherionmc.craterlib.utils.ChatUtils;
+import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.metadata.MetadataValue;
@@ -89,4 +90,14 @@ public class PaperCompatHelper implements CompatUtils {
     public boolean playerRevived(BridgedPlayer player) {
         return false;
     }
+
+    @Override
+    public boolean isPrivateMessage(BridgedPlayer player) {
+        return false;
+    }
+
+    @Override
+    public Component getChannelPrefix(BridgedPlayer player) {
+        return Component.empty();
+    }
 }

1.20.4/changelog.md

@@ -1,13 +1,8 @@
 **Bug Fixes**:
 
-- Fixed LuckPerms breaking commands on Paper
-- Fix Config watcher using too many threads and not detecting changes on Linux systems
+- Fix Adventure Serializer failing completely when serialization fails, causing game glitches
 
 **New Features**:
 
-- Added Nojang API to allow mods to access GameRules (SDLink)
-- Exposed Adventure JSON serializer to mods
-
-**Dev Changes**:
-
-- Bumped MoonConfig - `1.0.10` -> `1.0.12`
+- Allow commands to send feedback as chat messages, if command feedback is disabled
+- Added Compat API for Advanced Chat

1.20.4/gradle.properties

@@ -1,8 +1,8 @@
 #Project
 version_major=2
 version_minor=1
-version_patch=4
-version_build=2
+version_patch=5
+version_build=0
 
 #Mod
 mod_author=HypherionSA
@@ -37,6 +37,7 @@ vanish=1.5.4+1.20.4
 mod_menu_version=9.2.0-beta.2
 vanishmod=1.1.15
 vanishmod_neo=puxrKAMr
+advanced_chat=tBkISdKZ
 player_revive=5019850
 creative_core=5140174
 ftb_ranks=2004.2.0

1.20/Common/src/main/java/com/hypherionmc/craterlib/core/platform/CompatUtils.java

@@ -2,6 +2,7 @@ package com.hypherionmc.craterlib.core.platform;
 
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
 import com.hypherionmc.craterlib.utils.InternalServiceUtil;
+import net.kyori.adventure.text.Component;
 
 public interface CompatUtils {
 
@@ -12,5 +13,7 @@ public interface CompatUtils {
     boolean isPlayerBleeding(BridgedPlayer player);
     boolean playerBledOut(BridgedPlayer player);
     boolean playerRevived(BridgedPlayer player);
+    boolean isPrivateMessage(BridgedPlayer player);
+    Component getChannelPrefix(BridgedPlayer player);
 
 }

1.20/Common/src/main/java/com/hypherionmc/craterlib/nojang/commands/BridgedCommandSourceStack.java

@@ -8,13 +8,23 @@ import net.minecraft.commands.CommandSourceStack;
 
 import java.util.function.Supplier;
 
+import static net.minecraft.world.level.GameRules.RULE_SENDCOMMANDFEEDBACK;
+
 @RequiredArgsConstructor(staticName = "of")
 public class BridgedCommandSourceStack {
 
     private final CommandSourceStack internal;
 
     public void sendSuccess(Supplier<Component> supplier, boolean bl) {
-        internal.sendSuccess(() -> ChatUtils.adventureToMojang(supplier.get()), bl);
+        if (!internal.getServer().getGameRules().getBoolean(RULE_SENDCOMMANDFEEDBACK)) {
+            internal.sendSystemMessage(ChatUtils.adventureToMojang(supplier.get()));
+        } else {
+            internal.sendSuccess(() -> ChatUtils.adventureToMojang(supplier.get()), bl);
+        }
+    }
+
+    public void sendMessage(Component text) {
+        internal.sendSystemMessage(ChatUtils.adventureToMojang(text));
     }
 
     public void sendFailure(Component text) {

1.20/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java

@@ -31,8 +31,12 @@ public class ChatUtils {
     }
 
     public static net.kyori.adventure.text.Component mojangToAdventure(Component inComponent) {
+        try {
         final String serialised = Component.Serializer.toJson(inComponent);
-        return adventureSerializer.deserialize(serialised);
+            return adventureSerializer.deserialize(serialised);
+        } catch (Exception e) {
+            return net.kyori.adventure.text.Component.text(inComponent.getString());
+        }
     }
 
     // Some text components contain duplicate text, resulting in duplicate messages

1.20/Fabric/build.gradle

@@ -14,6 +14,7 @@ dependencies {
     modImplementation("me.shedaniel.cloth:cloth-config-fabric:${cloth_config}")
     modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
     modImplementation "maven.modrinth:vanish:${vanish}"
+    modImplementation("unimaven.modrinth:advanced-chat:${advanced_chat}")
 
     // Do not edit or remove
     implementation project(":Common")

1.20/Fabric/src/main/java/com/hypherionmc/craterlib/common/FabricCompatHelper.java

@@ -5,6 +5,8 @@ import com.hypherionmc.craterlib.compat.Vanish;
 import com.hypherionmc.craterlib.core.platform.CompatUtils;
 import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import me.wesley1808.advancedchat.api.AdvancedChatAPI;
+import net.kyori.adventure.text.Component;
 
 public class FabricCompatHelper implements CompatUtils {
 
@@ -35,4 +37,15 @@ public class FabricCompatHelper implements CompatUtils {
     public boolean playerRevived(BridgedPlayer player) {
         return false;
     }
+
+    @Override
+    public boolean isPrivateMessage(BridgedPlayer player) {
+        return !AdvancedChatAPI.isPublicChat(player.toMojangServerPlayer());
+    }
+
+    @Override
+    public Component getChannelPrefix(BridgedPlayer player) {
+        net.minecraft.network.chat.Component c = AdvancedChatAPI.getChannelPrefix(player.toMojangServerPlayer());
+        return c.getString().isBlank() ? Component.empty() : Component.text(c.getString());
+    }
 }

1.20/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java

@@ -3,6 +3,7 @@ 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 net.kyori.adventure.text.Component;
 import team.creative.playerrevive.api.IBleeding;
 import team.creative.playerrevive.server.PlayerReviveServer;
 import redstonedubstep.mods.vanishmod.VanishUtil;
@@ -47,4 +48,14 @@ public class ForgeCompatHelper implements CompatUtils {
         IBleeding bleeding = PlayerReviveServer.getBleeding(player.toMojangServerPlayer());
         return bleeding != null && bleeding.revived();
     }
+
+    @Override
+    public boolean isPrivateMessage(BridgedPlayer player) {
+        return false;
+    }
+
+    @Override
+    public Component getChannelPrefix(BridgedPlayer player) {
+        return Component.empty();
+    }
 }

1.20/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java

@@ -4,6 +4,7 @@ import com.hypherionmc.craterlib.core.platform.CompatUtils;
 import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
 import com.hypherionmc.craterlib.utils.ChatUtils;
+import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.metadata.MetadataValue;
@@ -89,4 +90,14 @@ public class PaperCompatHelper implements CompatUtils {
     public boolean playerRevived(BridgedPlayer player) {
         return false;
     }
+
+    @Override
+    public boolean isPrivateMessage(BridgedPlayer player) {
+        return false;
+    }
+
+    @Override
+    public Component getChannelPrefix(BridgedPlayer player) {
+        return Component.empty();
+    }
 }

1.20/changelog.md

@@ -1,14 +1,9 @@
 **Bug Fixes**:
 
-- Fixed LuckPerms breaking commands on Paper
-- Fix Config watcher using too many threads and not detecting changes on Linux systems
+- Fix Adventure Serializer failing completely when serialization fails, causing game glitches
 - Fixed crash when trying to open config screens on NeoForge
 
 **New Features**:
 
-- Added Nojang API to allow mods to access GameRules (SDLink)
-- Exposed Adventure JSON serializer to mods
-
-**Dev Changes**:
-
-- Bumped MoonConfig - `1.0.10` -> `1.0.12`
+- Allow commands to send feedback as chat messages, if command feedback is disabled
+- Added Compat API for Advanced Chat

1.20/gradle.properties

@@ -1,8 +1,8 @@
 #Project
 version_major=2
 version_minor=1
-version_patch=4
-version_build=2
+version_patch=5
+version_build=0
 
 #Mod
 mod_author=HypherionSA
@@ -29,6 +29,7 @@ discord_formatter=2.0.0
 cloth_config=11.1.136
 
 # Mod Dependencies
+advanced_chat=Unjr2LZL
 player_revive=4798215
 creative_core=4798202
 ftb_ranks=2001.1.3

1.21.2/Common/src/main/java/com/hypherionmc/craterlib/core/platform/CompatUtils.java

@@ -2,6 +2,7 @@ package com.hypherionmc.craterlib.core.platform;
 
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
 import com.hypherionmc.craterlib.utils.InternalServiceUtil;
+import net.kyori.adventure.text.Component;
 
 public interface CompatUtils {
 
@@ -12,5 +13,7 @@ public interface CompatUtils {
     boolean isPlayerBleeding(BridgedPlayer player);
     boolean playerBledOut(BridgedPlayer player);
     boolean playerRevived(BridgedPlayer player);
+    boolean isPrivateMessage(BridgedPlayer player);
+    Component getChannelPrefix(BridgedPlayer player);
 
 }

1.21.2/Common/src/main/java/com/hypherionmc/craterlib/nojang/commands/BridgedCommandSourceStack.java

@@ -8,13 +8,23 @@ import net.minecraft.commands.CommandSourceStack;
 
 import java.util.function.Supplier;
 
+import static net.minecraft.world.level.GameRules.RULE_SENDCOMMANDFEEDBACK;
+
 @RequiredArgsConstructor(staticName = "of")
 public class BridgedCommandSourceStack {
 
     private final CommandSourceStack internal;
 
     public void sendSuccess(Supplier<Component> supplier, boolean bl) {
-        internal.sendSuccess(() -> ChatUtils.adventureToMojang(supplier.get()), bl);
+        if (!internal.getServer().getGameRules().getBoolean(RULE_SENDCOMMANDFEEDBACK)) {
+            internal.sendSystemMessage(ChatUtils.adventureToMojang(supplier.get()));
+        } else {
+            internal.sendSuccess(() -> ChatUtils.adventureToMojang(supplier.get()), bl);
+        }
+    }
+
+    public void sendMessage(Component text) {
+        internal.sendSystemMessage(ChatUtils.adventureToMojang(text));
     }
 
     public void sendFailure(Component text) {

1.21.2/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java

@@ -36,8 +36,12 @@ public class ChatUtils {
     }
 
     public static net.kyori.adventure.text.Component mojangToAdventure(Component inComponent) {
-        final String serialised = Component.Serializer.toJson(inComponent, getRegistryLookup());
-        return adventureSerializer.deserialize(serialised);
+        try {
+            final String serialised = Component.Serializer.toJson(inComponent, getRegistryLookup());
+            return adventureSerializer.deserialize(serialised);
+        } catch (Exception e) {
+            return net.kyori.adventure.text.Component.text(inComponent.getString());
+        }
     }
 
     private static HolderLookup.Provider getRegistryLookup() {

1.21.2/Fabric/build.gradle

@@ -15,6 +15,7 @@ dependencies {
     modImplementation("me.shedaniel.cloth:cloth-config-fabric:${cloth_config}")
     modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
     modImplementation "maven.modrinth:vanish:${vanish}"
+    modImplementation("unimaven.modrinth:advanced-chat:${advanced_chat}")
 
     // Do not edit or remove
     implementation project(":Common")
@@ -133,4 +134,4 @@ publisher {
         required("fabric-api")
         optional("cloth-config", "modmenu")
     }
-}
+}

1.21.2/Fabric/src/main/java/com/hypherionmc/craterlib/common/FabricCompatHelper.java

@@ -5,6 +5,8 @@ import com.hypherionmc.craterlib.compat.Vanish;
 import com.hypherionmc.craterlib.core.platform.CompatUtils;
 import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import me.wesley1808.advancedchat.api.AdvancedChatAPI;
+import net.kyori.adventure.text.Component;
 
 public class FabricCompatHelper implements CompatUtils {
 
@@ -35,4 +37,15 @@ public class FabricCompatHelper implements CompatUtils {
     public boolean playerRevived(BridgedPlayer player) {
         return false;
     }
+
+    @Override
+    public boolean isPrivateMessage(BridgedPlayer player) {
+        return !AdvancedChatAPI.isPublicChat(player.toMojangServerPlayer());
+    }
+
+    @Override
+    public Component getChannelPrefix(BridgedPlayer player) {
+        net.minecraft.network.chat.Component c = AdvancedChatAPI.getChannelPrefix(player.toMojangServerPlayer());
+        return c.getString().isBlank() ? Component.empty() : Component.text(c.getString());
+    }
 }

1.21.2/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java

@@ -3,6 +3,7 @@ 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 net.kyori.adventure.text.Component;
 import redstonedubstep.mods.vanishmod.VanishUtil;
 import team.creative.playerrevive.api.IBleeding;
 import team.creative.playerrevive.server.PlayerReviveServer;
@@ -47,4 +48,14 @@ public class NeoForgeCompatHelper implements CompatUtils {
         IBleeding bleeding = PlayerReviveServer.getBleeding(player.toMojangServerPlayer());
         return bleeding != null && bleeding.revived();
     }
+
+    @Override
+    public boolean isPrivateMessage(BridgedPlayer player) {
+        return false;
+    }
+
+    @Override
+    public Component getChannelPrefix(BridgedPlayer player) {
+        return Component.empty();
+    }
 }

1.21.2/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java

@@ -4,6 +4,7 @@ import com.hypherionmc.craterlib.core.platform.CompatUtils;
 import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
 import com.hypherionmc.craterlib.utils.ChatUtils;
+import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.metadata.MetadataValue;
@@ -89,4 +90,14 @@ public class PaperCompatHelper implements CompatUtils {
     public boolean playerRevived(BridgedPlayer player) {
         return false;
     }
+
+    @Override
+    public boolean isPrivateMessage(BridgedPlayer player) {
+        return false;
+    }
+
+    @Override
+    public Component getChannelPrefix(BridgedPlayer player) {
+        return Component.empty();
+    }
 }

1.21.2/changelog.md

@@ -1,13 +1,8 @@
 **Bug Fixes**:
 
-- Fixed LuckPerms breaking commands on Paper
-- Fix Config watcher using too many threads and not detecting changes on Linux systems
+- Fix Adventure Serializer failing completely when serialization fails, causing game glitches
 
 **New Features**:
 
-- Added Nojang API to allow mods to access GameRules (SDLink)
-- Exposed Adventure JSON serializer to mods
-
-**Dev Changes**:
-
-- Bumped MoonConfig - `1.0.10` -> `1.0.12`
+- Allow commands to send feedback as chat messages, if command feedback is disabled
+- Added Compat API for Advanced Chat

1.21.2/gradle.properties

@@ -1,8 +1,8 @@
 #Project
 version_major=2
 version_minor=1
-version_patch=4
-version_build=2
+version_patch=5
+version_build=0
 
 #Mod
 mod_author=HypherionSA
@@ -39,6 +39,7 @@ vanishmod=1.1.12.1
 vanishmod_neo=puxrKAMr
 ftb_essentials=2101.1.0
 ftb_ranks=2101.1.1
+advanced_chat=SNA4dye5
 player_revive=5886329
 creative_core=5886272
 

1.21.5/Common/src/main/java/com/hypherionmc/craterlib/core/platform/CompatUtils.java

@@ -2,6 +2,7 @@ package com.hypherionmc.craterlib.core.platform;
 
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
 import com.hypherionmc.craterlib.utils.InternalServiceUtil;
+import net.kyori.adventure.text.Component;
 
 public interface CompatUtils {
 
@@ -12,5 +13,7 @@ public interface CompatUtils {
     boolean isPlayerBleeding(BridgedPlayer player);
     boolean playerBledOut(BridgedPlayer player);
     boolean playerRevived(BridgedPlayer player);
+    boolean isPrivateMessage(BridgedPlayer player);
+    Component getChannelPrefix(BridgedPlayer player);
 
 }

1.21.5/Common/src/main/java/com/hypherionmc/craterlib/nojang/commands/BridgedCommandSourceStack.java

@@ -8,13 +8,23 @@ import net.minecraft.commands.CommandSourceStack;
 
 import java.util.function.Supplier;
 
+import static net.minecraft.world.level.GameRules.RULE_SENDCOMMANDFEEDBACK;
+
 @RequiredArgsConstructor(staticName = "of")
 public class BridgedCommandSourceStack {
 
     private final CommandSourceStack internal;
 
     public void sendSuccess(Supplier<Component> supplier, boolean bl) {
-        internal.sendSuccess(() -> ChatUtils.adventureToMojang(supplier.get()), bl);
+        if (!internal.getServer().getGameRules().getBoolean(RULE_SENDCOMMANDFEEDBACK)) {
+            internal.sendSystemMessage(ChatUtils.adventureToMojang(supplier.get()));
+        } else {
+            internal.sendSuccess(() -> ChatUtils.adventureToMojang(supplier.get()), bl);
+        }
+    }
+
+    public void sendMessage(Component text) {
+        internal.sendSystemMessage(ChatUtils.adventureToMojang(text));
     }
 
     public void sendFailure(Component text) {

1.21.5/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java

@@ -36,8 +36,12 @@ public class ChatUtils {
     }
 
     public static net.kyori.adventure.text.Component mojangToAdventure(Component inComponent) {
-        final String serialised = Component.Serializer.toJson(inComponent, getRegistryLookup());
-        return adventureSerializer.deserialize(serialised);
+        try {
+            final String serialised = Component.Serializer.toJson(inComponent, getRegistryLookup());
+            return adventureSerializer.deserialize(serialised);
+        } catch (Exception e) {
+            return net.kyori.adventure.text.Component.text(inComponent.getString());
+        }
     }
 
     private static HolderLookup.Provider getRegistryLookup() {

1.21.5/Fabric/build.gradle

@@ -15,6 +15,7 @@ dependencies {
     modImplementation("me.shedaniel.cloth:cloth-config-fabric:${cloth_config}")
     modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
     modImplementation "maven.modrinth:vanish:${vanish}"
+    modImplementation("unimaven.modrinth:advanced-chat:${advanced_chat}")
 
     // Do not edit or remove
     implementation project(":Common")

1.21.5/Fabric/src/main/java/com/hypherionmc/craterlib/common/FabricCompatHelper.java

@@ -5,6 +5,8 @@ import com.hypherionmc.craterlib.compat.Vanish;
 import com.hypherionmc.craterlib.core.platform.CompatUtils;
 import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
+import me.wesley1808.advancedchat.api.AdvancedChatAPI;
+import net.kyori.adventure.text.Component;
 
 public class FabricCompatHelper implements CompatUtils {
 
@@ -35,4 +37,15 @@ public class FabricCompatHelper implements CompatUtils {
     public boolean playerRevived(BridgedPlayer player) {
         return false;
     }
+
+    @Override
+    public boolean isPrivateMessage(BridgedPlayer player) {
+        return !AdvancedChatAPI.isPublicChat(player.toMojangServerPlayer());
+    }
+
+    @Override
+    public Component getChannelPrefix(BridgedPlayer player) {
+        net.minecraft.network.chat.Component c = AdvancedChatAPI.getChannelPrefix(player.toMojangServerPlayer());
+        return c.getString().isBlank() ? Component.empty() : Component.text(c.getString());
+    }
 }

1.21.5/Forge/build.gradle

@@ -1,128 +0,0 @@
-// Adjust the output jar name here
-archivesBaseName = "${mod_name.replace(" ", "")}-Forge-${minecraft_version}"
-
-dependencies {
-    // Compat
-    // NOT AVAILABLE ON FORGE modImplementation("maven.modrinth:vanishmod:${vanishmod}")
-
-    modImplementation("me.shedaniel.cloth:cloth-config-forge:${cloth_config}")
-    modImplementation("unimaven.curseforge:playerrevive-266890:${player_revive}")
-    modImplementation("unimaven.curseforge:creativecore-257814:${creative_core}")
-
-    // Do not edit or remove
-    implementation project(":Common")
-}
-
-shadowJar {
-    from sourceSets.main.output
-    configurations = [project.configurations.shade]
-
-    dependencies {
-        exclude(dependency('com.google.code.gson:.*'))
-
-        relocate 'me.hypherionmc.moonconfig', 'shadow.hypherionmc.moonconfig'
-        relocate 'me.hypherionmc.mcdiscordformatter', 'shadow.hypherionmc.mcdiscordformatter'
-        relocate 'net.kyori', 'shadow.kyori'
-    }
-
-    setArchiveClassifier('dev-shadow')
-    mergeServiceFiles()
-}
-
-/**
- * ===============================================================================
- * =       DO NOT EDIT BELOW THIS LINE UNLESS YOU KNOW WHAT YOU ARE DOING        =
- * ===============================================================================
- */
-
-unimined.minecraft {
-    minecraftForge {
-        loader forge_version
-        mixinConfig("${mod_id}.mixins.json", "${mod_id}.forge.mixins.json")
-    }
-}
-
-remapJar {
-    inputFile.set shadowJar.archiveFile
-    dependsOn shadowJar
-    archiveClassifier.set null
-}
-
-jar {
-    archiveClassifier.set "dev"
-}
-
-processResources {
-    from project(":Common").sourceSets.main.resources
-    def buildProps = project.properties.clone()
-
-    filesMatching("META-INF/mods.toml") {
-        expand buildProps
-    }
-}
-
-compileTestJava.enabled = false
-
-tasks.withType(JavaCompile).configureEach {
-    source(project(":Common").sourceSets.main.allSource)
-}
-
-/**
- * Publishing Config
- */
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            artifactId project.archivesBaseName
-            from components.java
-
-            artifact(remapJar) {
-                builtBy remapJar
-            }
-
-            pom.withXml {
-                Node pomNode = asNode()
-                pomNode.dependencies.'*'.findAll() {
-                    it.artifactId.text() == 'regutils-joined-fabric' ||
-                            it.artifactId.text() == 'core' ||
-                            it.artifactId.text() == 'toml'
-                }.each() {
-                    it.parent().remove(it)
-                }
-            }
-        }
-    }
-
-    repositories {
-        maven rootProject.orion.getPublishingMaven()
-    }
-}
-
-publisher {
-    apiKeys {
-        modrinth(System.getenv("MODRINTH_TOKEN"))
-        curseforge(System.getenv("CURSE_TOKEN"))
-        nightbloom(System.getenv("PLATFORM_KEY"))
-    }
-
-    setCurseID(curse_id)
-    setModrinthID(modrinth_id)
-    setNightbloomID("craterlib")
-    setVersionType("release")
-    setChangelog(rootProject.file("changelog.md"))
-    setProjectVersion("${minecraft_version}-${project.version}")
-    setDisplayName("[Forge 1.20.6] CraterLib - ${project.version}")
-    setGameVersions("1.20.6")
-    setLoaders("forge")
-    setArtifact(remapJar)
-    setCurseEnvironment("both")
-    setIsManualRelease(true)
-
-    curseDepends {
-        optional("cloth-config")
-    }
-
-    modrinthDepends {
-        optional("cloth-config")
-    }
-}

1.21.5/Forge/src/main/java/com/hypherionmc/craterlib/CraterLib.java

@@ -1,36 +0,0 @@
-package com.hypherionmc.craterlib;
-
-import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
-import com.hypherionmc.craterlib.common.ForgeServerEvents;
-import com.hypherionmc.craterlib.core.event.CraterEventBus;
-import com.hypherionmc.craterlib.core.networking.CraterPacketNetwork;
-import com.hypherionmc.craterlib.core.networking.data.PacketSide;
-import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
-import com.hypherionmc.craterlib.network.CraterForgeNetworkHandler;
-import com.hypherionmc.craterlib.nojang.client.BridgedMinecraft;
-import com.hypherionmc.craterlib.nojang.client.BridgedOptions;
-import net.minecraft.client.Minecraft;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.DistExecutor;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.fml.loading.FMLLoader;
-
-@Mod(CraterConstants.MOD_ID)
-public class CraterLib {
-
-    public CraterLib() {
-        MinecraftForge.EVENT_BUS.register(new ForgeServerEvents());
-        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::commonSetup);
-    }
-
-    public void commonSetup(FMLCommonSetupEvent evt) {
-        new CraterPacketNetwork(new CraterForgeNetworkHandler(FMLLoader.getDist().isClient() ? PacketSide.CLIENT : PacketSide.SERVER));
-        DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> {
-            LateInitEvent event = new LateInitEvent(new BridgedMinecraft(), BridgedOptions.of(Minecraft.getInstance().options));
-            CraterEventBus.INSTANCE.postEvent(event);
-        });
-    }
-}

1.21.5/Forge/src/main/java/com/hypherionmc/craterlib/client/ForgeClientEvents.java

@@ -1,25 +0,0 @@
-package com.hypherionmc.craterlib.client;
-
-import com.hypherionmc.craterlib.CraterConstants;
-import com.hypherionmc.craterlib.api.events.client.CraterClientTickEvent;
-import com.hypherionmc.craterlib.core.event.CraterEventBus;
-import com.hypherionmc.craterlib.nojang.client.multiplayer.BridgedClientLevel;
-import net.minecraft.client.Minecraft;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.event.TickEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
-
-@Mod.EventBusSubscriber(modid = CraterConstants.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE, value = Dist.CLIENT)
-public class ForgeClientEvents {
-
-    @SubscribeEvent
-    public static void clientTick(TickEvent.LevelTickEvent event) {
-        if (Minecraft.getInstance().level == null)
-            return;
-
-        CraterClientTickEvent craterClientTickEvent = new CraterClientTickEvent(BridgedClientLevel.of(Minecraft.getInstance().level));
-        CraterEventBus.INSTANCE.postEvent(craterClientTickEvent);
-    }
-
-}

1.21.5/Forge/src/main/java/com/hypherionmc/craterlib/client/ForgeClientHelper.java

@@ -1,41 +0,0 @@
-package com.hypherionmc.craterlib.client;
-
-import com.hypherionmc.craterlib.core.platform.ClientPlatform;
-import com.hypherionmc.craterlib.nojang.client.BridgedMinecraft;
-import com.hypherionmc.craterlib.nojang.client.multiplayer.BridgedClientLevel;
-import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
-import net.minecraft.client.Minecraft;
-import net.minecraft.network.Connection;
-
-import java.util.Objects;
-
-/**
- * @author HypherionSA
- * @date 16/06/2022
- */
-public class ForgeClientHelper implements ClientPlatform {
-
-    public ForgeClientHelper() {
-    }
-
-    @Override
-    public BridgedMinecraft getClientInstance() {
-        return new BridgedMinecraft();
-    }
-
-    @Override
-    public BridgedPlayer getClientPlayer() {
-        return BridgedPlayer.of(Minecraft.getInstance().player);
-    }
-
-    @Override
-    public BridgedClientLevel getClientLevel() {
-        return BridgedClientLevel.of(Minecraft.getInstance().level);
-    }
-
-    @Override
-    public Connection getClientConnection() {
-        Objects.requireNonNull(Minecraft.getInstance().getConnection(), "Cannot send packets when not in game!");
-        return Minecraft.getInstance().getConnection().getConnection();
-    }
-}

1.21.5/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCommonHelper.java

@@ -1,26 +0,0 @@
-package com.hypherionmc.craterlib.common;
-
-import com.hypherionmc.craterlib.core.platform.CommonPlatform;
-import com.hypherionmc.craterlib.nojang.server.BridgedMinecraftServer;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.CreativeModeTab;
-import net.minecraftforge.server.ServerLifecycleHooks;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author HypherionSA
- */
-public class ForgeCommonHelper implements CommonPlatform {
-
-    public static Map<ResourceLocation, CreativeModeTab> TABS = new HashMap<>();
-
-    public ForgeCommonHelper() {
-    }
-
-    @Override
-    public BridgedMinecraftServer getMCServer() {
-        return BridgedMinecraftServer.of(ServerLifecycleHooks.getCurrentServer());
-    }
-}

1.21.5/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeCompatHelper.java

@@ -1,45 +0,0 @@
-package com.hypherionmc.craterlib.common;
-
-import com.hypherionmc.craterlib.core.platform.CompatUtils;
-import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
-import team.creative.playerrevive.api.IBleeding;
-import team.creative.playerrevive.server.PlayerReviveServer;
-
-public class ForgeCompatHelper implements CompatUtils {
-
-    @Override
-    public boolean isPlayerActive(BridgedPlayer player) {
-        return true;
-    }
-
-    @Override
-    public String getSkinUUID(BridgedPlayer player) {
-        return player.getStringUUID();
-    }
-
-    @Override
-    public boolean isPlayerBleeding(BridgedPlayer player) {
-        if (!ModloaderEnvironment.INSTANCE.isModLoaded("playerrevive"))
-            return false;
-
-        return PlayerReviveServer.isBleeding(player.toMojangServerPlayer());
-    }
-
-    @Override
-    public boolean playerBledOut(BridgedPlayer player) {
-        if (!ModloaderEnvironment.INSTANCE.isModLoaded("playerrevive"))
-            return false;
-
-        IBleeding bleeding = PlayerReviveServer.getBleeding(player.toMojangServerPlayer());
-        return bleeding != null && bleeding.bledOut();
-    }
-
-    @Override
-    public boolean playerRevived(BridgedPlayer player) {
-        if (!ModloaderEnvironment.INSTANCE.isModLoaded("playerrevive"))
-            return false;
-
-        IBleeding bleeding = PlayerReviveServer.getBleeding(player.toMojangServerPlayer());
-        return bleeding != null && bleeding.revived();
-    }
-}

1.21.5/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeLoaderHelper.java

@@ -1,79 +0,0 @@
-package com.hypherionmc.craterlib.common;
-
-import com.hypherionmc.craterlib.core.platform.Environment;
-import com.hypherionmc.craterlib.core.platform.LoaderType;
-import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
-import net.minecraft.SharedConstants;
-import net.minecraft.client.Minecraft;
-import net.minecraftforge.fml.ModList;
-import net.minecraftforge.fml.loading.FMLLoader;
-import net.minecraftforge.fml.loading.FMLPaths;
-
-import java.io.File;
-
-/**
- * @author HypherionSA
- */
-public class ForgeLoaderHelper implements ModloaderEnvironment {
-
-    public ForgeLoaderHelper() {
-    }
-
-    @Override
-    public boolean isFabric() {
-        return false;
-    }
-
-    @Override
-    public LoaderType getLoaderType() {
-        return LoaderType.FORGE;
-    }
-
-    @Override
-    public String getGameVersion() {
-        return SharedConstants.VERSION_STRING;
-    }
-
-    @Override
-    public File getGameFolder() {
-        return Minecraft.getInstance().gameDirectory;
-    }
-
-    @Override
-    public File getConfigFolder() {
-        return FMLPaths.CONFIGDIR.get().toFile();
-    }
-
-    @Override
-    public File getModsFolder() {
-        return FMLPaths.MODSDIR.get().toFile();
-    }
-
-    @Override
-    public Environment getEnvironment() {
-        switch (FMLLoader.getDist()) {
-            case CLIENT -> {
-                return Environment.CLIENT;
-            }
-            case DEDICATED_SERVER -> {
-                return Environment.SERVER;
-            }
-        }
-        return Environment.UNKNOWN;
-    }
-
-    @Override
-    public boolean isModLoaded(String modid) {
-        return ModList.get().isLoaded(modid);
-    }
-
-    @Override
-    public boolean isDevEnv() {
-        return !FMLLoader.isProduction();
-    }
-
-    @Override
-    public int getModCount() {
-        return ModList.get().size();
-    }
-}

1.21.5/Forge/src/main/java/com/hypherionmc/craterlib/common/ForgeServerEvents.java

@@ -1,43 +0,0 @@
-package com.hypherionmc.craterlib.common;
-
-import com.hypherionmc.craterlib.api.events.server.CraterRegisterCommandEvent;
-import com.hypherionmc.craterlib.api.events.server.CraterServerLifecycleEvent;
-import com.hypherionmc.craterlib.core.event.CraterEventBus;
-import com.hypherionmc.craterlib.nojang.commands.CommandsRegistry;
-import com.hypherionmc.craterlib.nojang.server.BridgedMinecraftServer;
-import net.minecraftforge.event.RegisterCommandsEvent;
-import net.minecraftforge.event.server.ServerStartedEvent;
-import net.minecraftforge.event.server.ServerStartingEvent;
-import net.minecraftforge.event.server.ServerStoppedEvent;
-import net.minecraftforge.event.server.ServerStoppingEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-
-public class ForgeServerEvents {
-
-    @SubscribeEvent
-    public void serverStarting(ServerStartingEvent event) {
-        CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Starting(BridgedMinecraftServer.of(event.getServer())));
-    }
-
-    @SubscribeEvent
-    public void serverStarted(ServerStartedEvent event) {
-        CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Started(BridgedMinecraftServer.of(event.getServer())));
-    }
-
-    @SubscribeEvent
-    public void serverStopping(ServerStoppingEvent event) {
-        CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Stopping(BridgedMinecraftServer.of(event.getServer())));
-    }
-
-    @SubscribeEvent
-    public void serverStopped(ServerStoppedEvent event) {
-        CraterEventBus.INSTANCE.postEvent(new CraterServerLifecycleEvent.Stopped(BridgedMinecraftServer.of(event.getServer())));
-    }
-
-    @SubscribeEvent
-    public void onCommandRegister(RegisterCommandsEvent event) {
-        CraterEventBus.INSTANCE.postEvent(new CraterRegisterCommandEvent());
-        CommandsRegistry.INSTANCE.registerCommands(event.getDispatcher());
-    }
-
-}

1.21.5/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java

@@ -1,43 +0,0 @@
-package com.hypherionmc.craterlib.mixin;
-
-import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
-import com.hypherionmc.craterlib.core.config.ConfigController;
-import com.hypherionmc.craterlib.core.config.ModuleConfig;
-import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraftforge.client.ConfigScreenHandler;
-import net.minecraftforge.forgespi.language.IModInfo;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import java.util.Optional;
-import java.util.function.BiFunction;
-
-/**
- * @author HypherionSA
- */
-@Mixin(ConfigScreenHandler.class)
-public class ConfigScreenHandlerMixin {
-
-    /**
-     * Inject Auto Generated config Screens into forge
-     *
-     */
-    @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
-    private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
-        ConfigController.getMonitoredConfigs().forEach((conf, config) -> {
-            if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
-                return;
-
-            if (config.getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
-                ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
-            } else {
-                //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));
-            }
-        });
-    }
-
-}

1.21.5/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerGamePacketListenerImplMixin.java

@@ -1,37 +0,0 @@
-package com.hypherionmc.craterlib.mixin;
-
-import com.hypherionmc.craterlib.api.events.server.CraterServerChatEvent;
-import com.hypherionmc.craterlib.core.event.CraterEventBus;
-import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
-import com.hypherionmc.craterlib.utils.ChatUtils;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.PlayerChatMessage;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.server.network.FilteredText;
-import net.minecraft.server.network.ServerGamePacketListenerImpl;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(value = ServerGamePacketListenerImpl.class, priority = Integer.MIN_VALUE)
-public class ServerGamePacketListenerImplMixin {
-
-    @Shadow
-    public ServerPlayer player;
-
-    @Inject(
-            method = "lambda$handleChat$5",
-            at = @At("HEAD"),
-            cancellable = true
-    )
-    private void injectChatEvent(Component component, PlayerChatMessage arg, FilteredText p_296589_, CallbackInfo ci) {
-        Component finalcomp = component == null ? arg.decoratedContent() : component;
-        CraterServerChatEvent event = new CraterServerChatEvent(BridgedPlayer.of(this.player), finalcomp.getString(), ChatUtils.mojangToAdventure(finalcomp));
-        CraterEventBus.INSTANCE.postEvent(event);
-        if (event.wasCancelled())
-            ci.cancel();
-    }
-
-}

1.21.5/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ServerStatusPacketListenerMixin.java

@@ -1,53 +0,0 @@
-package com.hypherionmc.craterlib.mixin;
-
-import com.hypherionmc.craterlib.api.events.server.ServerStatusEvent;
-import com.hypherionmc.craterlib.core.event.CraterEventBus;
-import com.hypherionmc.craterlib.utils.ChatUtils;
-import net.minecraft.network.Connection;
-import net.minecraft.network.protocol.status.ClientboundStatusResponsePacket;
-import net.minecraft.network.protocol.status.ServerStatus;
-import net.minecraft.network.protocol.status.ServerboundStatusRequestPacket;
-import net.minecraft.server.network.ServerStatusPacketListenerImpl;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(ServerStatusPacketListenerImpl.class)
-public class ServerStatusPacketListenerMixin {
-
-    @Shadow
-    @Final
-    private ServerStatus status;
-
-    @Shadow @Final private Connection connection;
-
-    @Inject(method = "handleStatusRequest",
-            at = @At(
-                    value = "INVOKE",
-                    target = "Lnet/minecraft/network/Connection;send(Lnet/minecraft/network/protocol/Packet;)V",
-                    shift = At.Shift.BEFORE),
-            cancellable = true
-    )
-    private void injectHandleStatusRequest(ServerboundStatusRequestPacket arg, CallbackInfo ci) {
-        ServerStatusEvent.StatusRequestEvent event = new ServerStatusEvent.StatusRequestEvent(ChatUtils.mojangToAdventure(status.description()));
-        CraterEventBus.INSTANCE.postEvent(event);
-
-        if (event.getNewStatus() != null) {
-            ci.cancel();
-            this.connection.send(new ClientboundStatusResponsePacket(
-                    new ServerStatus(ChatUtils.adventureToMojang(
-                            event.getNewStatus()),
-                            status.players(),
-                            status.version(),
-                            status.favicon(),
-                            status.enforcesSecureChat(),
-                            status.isModded()
-                    )
-            ));
-        }
-    }
-
-}

1.21.5/Forge/src/main/java/com/hypherionmc/craterlib/network/CraterForgeNetworkHandler.java

@@ -1,98 +0,0 @@
-package com.hypherionmc.craterlib.network;
-
-import com.hypherionmc.craterlib.CraterConstants;
-import com.hypherionmc.craterlib.core.networking.PacketRegistry;
-import com.hypherionmc.craterlib.core.networking.data.PacketContext;
-import com.hypherionmc.craterlib.core.networking.data.PacketHolder;
-import com.hypherionmc.craterlib.core.networking.data.PacketSide;
-import com.hypherionmc.craterlib.nojang.network.BridgedFriendlyByteBuf;
-import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
-import net.minecraft.client.Minecraft;
-import net.minecraft.network.Connection;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.server.network.ServerGamePacketListenerImpl;
-import net.minecraftforge.event.network.CustomPayloadEvent;
-import net.minecraftforge.network.ChannelBuilder;
-import net.minecraftforge.network.PacketDistributor;
-import net.minecraftforge.network.SimpleChannel;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-/**
- * Based on https://github.com/mysticdrew/common-networking/tree/1.20.4
- */
-public class CraterForgeNetworkHandler extends PacketRegistry {
-    private final Map<Class<?>, SimpleChannel> CHANNELS = new HashMap<>();
-
-    public CraterForgeNetworkHandler(PacketSide side) {
-        super(side);
-    }
-
-    protected <T> void registerPacket(PacketHolder<T> holder) {
-        if (CHANNELS.get(holder.messageType()) == null) {
-            SimpleChannel channel = ChannelBuilder
-                    .named(holder.type().id())
-                    .clientAcceptedVersions((a, b) -> true)
-                    .serverAcceptedVersions((a, b) -> true)
-                    .networkProtocolVersion(1)
-                    .simpleChannel();
-
-            channel.messageBuilder(holder.messageType())
-                    .decoder(mojangDecoder(holder.decoder()))
-                    .encoder(mojangEncoder(holder.encoder()))
-                    .consumerNetworkThread(buildHandler(holder.handler()))
-                    .add();
-
-            CHANNELS.put(holder.messageType(), channel);
-        } else {
-            CraterConstants.LOG.error("Trying to register duplicate packet for type {}", holder.messageType());
-        }
-    }
-
-    public <T> void sendToServer(T packet) {
-        this.sendToServer(packet, false);
-    }
-
-    public <T> void sendToServer(T packet, boolean ignoreCheck) {
-        SimpleChannel channel = CHANNELS.get(packet.getClass());
-        Connection connection = Minecraft.getInstance().getConnection().getConnection();
-        if (channel.isRemotePresent(connection) || ignoreCheck) {
-            channel.send(packet, PacketDistributor.SERVER.noArg());
-        }
-    }
-
-    public <T> void sendToClient(T packet, BridgedPlayer player) {
-        SimpleChannel channel = CHANNELS.get(packet.getClass());
-        ServerGamePacketListenerImpl connection = player.getConnection();
-        if (connection == null)
-            return;
-
-        if (channel.isRemotePresent(connection.getConnection())) {
-            channel.send(packet, PacketDistributor.PLAYER.with(player.toMojangServerPlayer()));
-        }
-    }
-
-    private <T> Function<FriendlyByteBuf, T> mojangDecoder(Function<BridgedFriendlyByteBuf, T> handler) {
-        return byteBuf -> handler.apply(BridgedFriendlyByteBuf.of(byteBuf));
-    }
-
-    private <T> BiConsumer<T, FriendlyByteBuf> mojangEncoder(BiConsumer<T, BridgedFriendlyByteBuf> handler) {
-        return ((t, byteBuf) -> handler.accept(t, BridgedFriendlyByteBuf.of(byteBuf)));
-    }
-
-    private <T> BiConsumer<T, CustomPayloadEvent.Context> buildHandler(Consumer<PacketContext<T>> handler) {
-        return (message, ctx) -> {
-            ctx.enqueueWork(() -> {
-                PacketSide side = ctx.getDirection().getReceptionSide().isServer() ? PacketSide.SERVER : PacketSide.CLIENT;
-                ServerPlayer player = ctx.getSender();
-                handler.accept(new PacketContext<>(BridgedPlayer.of(player), message, side));
-            });
-            ctx.setPacketHandled(true);
-        };
-    }
-}

1.21.5/Forge/src/main/resources/META-INF/mods.toml

@@ -1,31 +0,0 @@
-modLoader = "javafml"
-loaderVersion = "[50,)"
-license = "MIT"
-issueTrackerURL = "https://github.com/firstdarkdev/craterLib/issues"
-
-[[mods]]
-    modId = "${mod_id}"
-    version = "${version}"
-    displayName = "${mod_name}"
-    displayURL = "https://modrinth.com/mod/craterlib"
-    logoFile = "craterlib_logo.png"
-    #credits="Thanks for this example mod goes to Java"
-    authors = "${mod_author}, Zenith"
-    description = '''
-    A library mod used by First Dark Development and HypherionSA Mods
-    '''
-    displayTest = "NONE"
-
-[[dependencies.${ mod_id }]]
-    modId = "forge"
-    mandatory = true
-    versionRange = "[50,)"
-    ordering = "NONE"
-    side = "BOTH"
-
-[[dependencies.${ mod_id }]]
-    modId = "minecraft"
-    mandatory = true
-    versionRange = "[1.20.6,1.21)"
-    ordering = "NONE"
-    side = "BOTH"

1.21.5/Forge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.ClientPlatform

@@ -1 +0,0 @@
-com.hypherionmc.craterlib.client.ForgeClientHelper

1.21.5/Forge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.CommonPlatform

@@ -1 +0,0 @@
-com.hypherionmc.craterlib.common.ForgeCommonHelper

1.21.5/Forge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.CompatUtils

@@ -1 +0,0 @@
-com.hypherionmc.craterlib.common.ForgeCompatHelper

1.21.5/Forge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.ModloaderEnvironment

@@ -1 +0,0 @@
-com.hypherionmc.craterlib.common.ForgeLoaderHelper

1.21.5/Forge/src/main/resources/craterlib.forge.mixins.json

@@ -1,18 +0,0 @@
-{
-  "required": true,
-  "minVersion": "0.8",
-  "package": "com.hypherionmc.craterlib.mixin",
-  "compatibilityLevel": "JAVA_17",
-  "mixins": [
-  ],
-  "client": [
-    "ConfigScreenHandlerMixin"
-  ],
-  "server": [
-    "ServerGamePacketListenerImplMixin",
-    "ServerStatusPacketListenerMixin"
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  }
-}

1.21.5/NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCompatHelper.java

@@ -3,6 +3,7 @@ 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 net.kyori.adventure.text.Component;
 import redstonedubstep.mods.vanishmod.VanishUtil;
 import team.creative.playerrevive.api.IBleeding;
 import team.creative.playerrevive.server.PlayerReviveServer;
@@ -47,4 +48,14 @@ public class NeoForgeCompatHelper implements CompatUtils {
         IBleeding bleeding = PlayerReviveServer.getBleeding(player.toMojangServerPlayer());
         return bleeding != null && bleeding.revived();
     }
+
+    @Override
+    public boolean isPrivateMessage(BridgedPlayer player) {
+        return false;
+    }
+
+    @Override
+    public Component getChannelPrefix(BridgedPlayer player) {
+        return Component.empty();
+    }
 }

1.21.5/Paper/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "io.papermc.paperweight.userdev" version "1.7.3"
+    id "io.papermc.paperweight.userdev" version "1.7.7"
     id "xyz.jpenilla.run-paper" version "2.3.0"
 }
 

1.21.5/Paper/src/main/java/com/hypherionmc/craterlib/common/PaperCompatHelper.java

@@ -89,4 +89,14 @@ public class PaperCompatHelper implements CompatUtils {
     public boolean playerRevived(BridgedPlayer player) {
         return false;
     }
+
+    @Override
+    public boolean isPrivateMessage(BridgedPlayer player) {
+        return false;
+    }
+
+    @Override
+    public Component getChannelPrefix(BridgedPlayer player) {
+        return Component.empty();
+    }
 }

1.21.5/changelog.md

@@ -1,13 +1,8 @@
 **Bug Fixes**:
 
-- Fixed LuckPerms breaking commands on Paper
-- Fix Config watcher using too many threads and not detecting changes on Linux systems
+- Fix Adventure Serializer failing completely when serialization fails, causing game glitches
 
 **New Features**:
 
-- Added Nojang API to allow mods to access GameRules (SDLink)
-- Exposed Adventure JSON serializer to mods
-
-**Dev Changes**:
-
-- Bumped MoonConfig - `1.0.10` -> `1.0.12`
+- Allow commands to send feedback as chat messages, if command feedback is disabled
+- Added Compat API for Advanced Chat

1.21.5/gradle.properties

@@ -1,8 +1,8 @@
 #Project
 version_major=2
 version_minor=1
-version_patch=4
-version_build=2
+version_patch=5
+version_build=0
 
 #Mod
 mod_author=HypherionSA
@@ -41,6 +41,7 @@ ftb_essentials=2101.1.0
 ftb_ranks=2101.1.1
 player_revive=6119534
 creative_core=6113754
+advanced_chat=CEJSc93h
 
 # Publishing
 curse_id=867099

1.21.5/settings.gradle

@@ -15,5 +15,4 @@ pluginManagement {
 
 rootProject.name = 'CraterLib'
 include("Common", "Fabric", "NeoForge")
-//include 'Paper'
-
+//include 'Paper'

1.21/Common/src/main/java/com/hypherionmc/craterlib/core/platform/CompatUtils.java

@@ -2,6 +2,7 @@ package com.hypherionmc.craterlib.core.platform;
 
 import com.hypherionmc.craterlib.nojang.world.entity.player.BridgedPlayer;
 import com.hypherionmc.craterlib.utils.InternalServiceUtil;
+import net.kyori.adventure.text.Component;
 
 public interface CompatUtils {
 
@@ -12,5 +13,7 @@ public interface CompatUtils {
     boolean isPlayerBleeding(BridgedPlayer player);
     boolean playerBledOut(BridgedPlayer player);
     boolean playerRevived(BridgedPlayer player);
+    boolean isPrivateMessage(BridgedPlayer player);
+    Component getChannelPrefix(BridgedPlayer player);
 
 }

1.21/Common/src/main/java/com/hypherionmc/craterlib/nojang/commands/BridgedCommandSourceStack.java

@@ -8,13 +8,23 @@ import net.minecraft.commands.CommandSourceStack;
 
 import java.util.function.Supplier;
 
+import static net.minecraft.world.level.GameRules.RULE_SENDCOMMANDFEEDBACK;
+
 @RequiredArgsConstructor(staticName = "of")
 public class BridgedCommandSourceStack {
 
     private final CommandSourceStack internal;
 
     public void sendSuccess(Supplier<Component> supplier, boolean bl) {
-        internal.sendSuccess(() -> ChatUtils.adventureToMojang(supplier.get()), bl);
+        if (!internal.getServer().getGameRules().getBoolean(RULE_SENDCOMMANDFEEDBACK)) {
+            internal.sendSystemMessage(ChatUtils.adventureToMojang(supplier.get()));
+        } else {
+            internal.sendSuccess(() -> ChatUtils.adventureToMojang(supplier.get()), bl);
+        }
+    }
+
+    public void sendMessage(Component text) {
+        internal.sendSystemMessage(ChatUtils.adventureToMojang(text));
     }
 
     public void sendFailure(Component text) {

1.21/Common/src/main/java/com/hypherionmc/craterlib/utils/ChatUtils.java

@@ -36,8 +36,12 @@ public class ChatUtils {
     }
 
     public static net.kyori.adventure.text.Component mojangToAdventure(Component inComponent) {
-        final String serialised = Component.Serializer.toJson(inComponent, getRegistryLookup());
-        return adventureSerializer.deserialize(serialised);
+        try {
+            final String serialised = Component.Serializer.toJson(inComponent, getRegistryLookup());
+            return adventureSerializer.deserialize(serialised);
+        } catch (Exception e) {
+            return net.kyori.adventure.text.Component.text(inComponent.getString());
+        }
     }
 
     private static HolderLookup.Provider getRegistryLookup() {

1.21/Fabric/build.gradle

@@ -15,6 +15,7 @@ dependencies {
     modImplementation("me.shedaniel.cloth:cloth-config-fabric:${cloth_config}")
     modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
     modImplementation "maven.modrinth:vanish:${vanish}"
+    modImplementation("unimaven.modrinth:advanced-chat:${advanced_chat}")
 
     // Do not edit or remove
     implementation project(":Common")