Update to RccServer 1.13.0

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.7-SNAPSHOT'
+    id 'fabric-loom' version '1.8-SNAPSHOT'
     id 'maven-publish'
 }
 

gradle.properties

@@ -6,18 +6,18 @@ org.gradle.parallel=true
 # check these on https://fabricmc.net/develop
 minecraft_version=1.20.1
 yarn_mappings=1.20.1+build.10
-loader_version=0.16.5
+loader_version=0.16.7
 
 # Mod Properties
-mod_version=1.7.2
+mod_version=1.7.3
 maven_group=cc.reconnected
 archives_base_name=rcc-chatbox
 
 # Dependencies
 fabric_version=0.92.2+1.20.1
 
-rccserver_version=1.10.1
-rccdiscord_version=1.7.1
+rccserver_version=1.13.0
+rccdiscord_version=1.7.7
 
 permissions_api_version=0.2-SNAPSHOT
 

src/main/java/cc/reconnected/chatbox/ChatboxEvents.java

@@ -9,13 +9,13 @@
 import cc.reconnected.chatbox.packets.serverPackets.PlayersPacket;
 import cc.reconnected.chatbox.packets.serverPackets.events.*;
 import cc.reconnected.chatbox.models.User;
-import cc.reconnected.chatbox.parsers.MarkdownParser;
 import cc.reconnected.chatbox.utils.DateUtils;
 import cc.reconnected.chatbox.ws.CloseCodes;
 import cc.reconnected.chatbox.ws.WsServer;
 import cc.reconnected.discordbridge.events.DiscordMessageEvents;
 import cc.reconnected.server.database.PlayerData;
 import cc.reconnected.server.events.PlayerActivityEvents;
+import cc.reconnected.server.parser.MarkdownParser;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;
 import net.fabricmc.fabric.api.entity.event.v1.ServerEntityWorldChangeEvents;
@@ -161,7 +161,7 @@ public static void register() {
         ServerMessageEvents.CHAT_MESSAGE.register((message, sender, params) -> {
             var packet = new InGameChatEvent();
 
-            var parsedMessage = MarkdownParser.contentParser.parseNode(message.getContent().getString()).toText();
+            var parsedMessage = MarkdownParser.defaultParser.parseNode(message.getContent().getString()).toText();
             packet.text = parsedMessage.getString();
             packet.rawText = message.getContent().getString();
             packet.renderedText = Text.Serializer.toJsonTree(parsedMessage);
@@ -255,7 +255,7 @@ private static void emitDiscordChatEvent(Message message, Member member, boolean
         var packet = new DiscordChatEvent();
         packet.text = message.getContentStripped();
         packet.rawText = message.getContentRaw();
-        packet.renderedText = Text.Serializer.toJsonTree(MarkdownParser.contentParser.parseNode(message.getContentDisplay()).toText());
+        packet.renderedText = Text.Serializer.toJsonTree(MarkdownParser.defaultParser.parseNode(message.getContentDisplay()).toText());
         packet.discordId = message.getId();
         packet.discordUser = user;
         packet.edited = isEdited;

src/main/java/cc/reconnected/chatbox/models/User.java

@@ -2,6 +2,7 @@
 
 import cc.reconnected.discordbridge.Bridge;
 import cc.reconnected.server.RccServer;
+import cc.reconnected.server.core.AfkTracker;
 import cc.reconnected.server.database.PlayerData;
 import net.dv8tion.jda.api.entities.UserSnowflake;
 import net.minecraft.server.network.ServerPlayerEntity;
@@ -28,7 +29,7 @@ private static void fillInData(User user, @Nullable ServerPlayerEntity entity, b
         PlayerData playerData;
         if(entity != null) {
             playerData = PlayerData.getPlayer(entity);
-            user.afk = RccServer.getInstance().isPlayerAfk(entity);
+            user.afk = AfkTracker.getInstance().isPlayerAfk(entity.getUuid());
         } else {
             playerData = PlayerData.getPlayer(UUID.fromString(user.uuid));
             user.afk = false;

src/main/java/cc/reconnected/chatbox/utils/TextComponents.java

@@ -1,8 +1,8 @@
 package cc.reconnected.chatbox.utils;
 
-import cc.reconnected.chatbox.parsers.MarkdownParser;
 import cc.reconnected.chatbox.parsers.MiniMessageSerializer;
 import cc.reconnected.server.database.PlayerData;
+import cc.reconnected.server.parser.MarkdownParser;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.HoverEvent;
 import net.kyori.adventure.text.format.NamedTextColor;
@@ -39,7 +39,7 @@ public static Component formatContent(String content, @Nullable String type) {
         switch (type) {
             case "format" -> formattedContent = legacySerializer.deserialize(content);
             case "markdown" -> {
-                var rawContent = MarkdownParser.contentParser.parseNode(content).toText();
+                var rawContent = MarkdownParser.defaultParser.parseNode(content).toText();
                 var json = JSONComponentSerializer.json();
                 formattedContent = json.deserialize(Text.Serializer.toJson(rawContent));
             }