Update to RccServer 1.14.3 and RccDiscord to 1.7.8

ReconnectedCC · Oct 26, 2024 · db13869 · db13869
1 parent ef31a95
commit db13869
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 29 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -9,15 +9,15 @@ yarn_mappings=1.20.1+build.10
 loader_version=0.16.7
 
 # Mod Properties
-mod_version=1.7.3
+mod_version=1.7.4
 maven_group=cc.reconnected
 archives_base_name=rcc-chatbox
 
 # Dependencies
 fabric_version=0.92.2+1.20.1
 
-rccserver_version=1.13.0
-rccdiscord_version=1.7.7
+rccserver_version=1.14.3
+rccdiscord_version=1.7.8
 
 permissions_api_version=0.2-SNAPSHOT
 

diff --git a/src/main/java/cc/reconnected/chatbox/ChatboxEvents.java b/src/main/java/cc/reconnected/chatbox/ChatboxEvents.java
@@ -13,8 +13,8 @@
 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.api.PlayerMeta;
+import cc.reconnected.server.api.events.PlayerActivityEvents;
 import cc.reconnected.server.parser.MarkdownParser;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;
@@ -43,7 +43,7 @@ public class ChatboxEvents {
     public static void register() {
         ClientPacketsHandler.register();
         ClientConnectionEvents.CONNECT.register((conn, license, isGuest) -> {
-            var playerData = PlayerData.getPlayer(license.userId());
+            var playerData = PlayerMeta.getPlayer(license.userId());
 
             var helloPacket = new HelloPacket();
             helloPacket.capabilities = license.capabilities().stream().map(c -> c.toString().toLowerCase()).toArray(String[]::new);

diff --git a/src/main/java/cc/reconnected/chatbox/ClientPacketsHandler.java b/src/main/java/cc/reconnected/chatbox/ClientPacketsHandler.java
@@ -10,7 +10,7 @@
 import cc.reconnected.chatbox.utils.DateUtils;
 import cc.reconnected.chatbox.utils.TextComponents;
 import cc.reconnected.chatbox.ws.ClientErrors;
-import cc.reconnected.server.database.PlayerData;
+import cc.reconnected.server.api.PlayerMeta;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
 import net.kyori.adventure.text.Component;
@@ -106,7 +106,7 @@ public static void register() {
 
         ChatboxMessageEvents.SAY.register((client, packet) -> {
             var ownerId = client.license.userId();
-            var owner = PlayerData.getPlayer(ownerId);
+            var owner = PlayerMeta.getPlayer(ownerId);
 
             var name = packet.name != null ? packet.name : owner.getEffectiveName();
             var label = TextComponents.formatLabel(name);
@@ -133,7 +133,7 @@ public static void register() {
 
         ChatboxMessageEvents.TELL.register((client, packet) -> {
             var ownerId = client.license.userId();
-            var owner = PlayerData.getPlayer(ownerId);
+            var owner = PlayerMeta.getPlayer(ownerId);
 
             var player = mcServer.getPlayerManager().getPlayer(packet.user);
             if (player == null) {

diff --git a/src/main/java/cc/reconnected/chatbox/license/LicenseManager.java b/src/main/java/cc/reconnected/chatbox/license/LicenseManager.java
@@ -1,7 +1,7 @@
 package cc.reconnected.chatbox.license;
 
 import cc.reconnected.chatbox.Chatbox;
-import cc.reconnected.server.database.PlayerData;
+import cc.reconnected.server.api.PlayerMeta;
 import com.google.gson.reflect.TypeToken;
 import org.jetbrains.annotations.Nullable;
 
@@ -81,7 +81,7 @@ public License getLicense(UUID licenseId) {
 
         // Migrate from LP
         var ownerUuid = serverState.licenses.get(licenseId);
-        var playerData = PlayerData.getPlayer(ownerUuid);
+        var playerData = PlayerMeta.getPlayer(ownerUuid);
         var licenseUuid = playerData.get(KEYS.licenseUuid);
         var capabilitiesStr = playerData.get(KEYS.capabilities);
         int packedCapabilities = 0;
@@ -117,7 +117,7 @@ public License getLicenseFromUser(UUID userId) {
             return license;
         }
 
-        var playerData = PlayerData.getPlayer(userId);
+        var playerData = PlayerMeta.getPlayer(userId);
         var licenseUuid = playerData.get(KEYS.licenseUuid);
         if (licenseUuid == null)
             return null;
@@ -156,7 +156,7 @@ public boolean deleteLicense(UUID licenseId) {
             return false;
         }
 
-        var playerData = PlayerData.getPlayer(license.userId());
+        var playerData = PlayerMeta.getPlayer(license.userId());
         playerData.delete(KEYS.licenseUuid).join();
         playerData.delete(KEYS.capabilities).join();
 

diff --git a/src/main/java/cc/reconnected/chatbox/models/User.java b/src/main/java/cc/reconnected/chatbox/models/User.java
@@ -1,9 +1,8 @@
 package cc.reconnected.chatbox.models;
 
 import cc.reconnected.discordbridge.Bridge;
-import cc.reconnected.server.RccServer;
 import cc.reconnected.server.core.AfkTracker;
-import cc.reconnected.server.database.PlayerData;
+import cc.reconnected.server.api.PlayerMeta;
 import net.dv8tion.jda.api.entities.UserSnowflake;
 import net.minecraft.server.network.ServerPlayerEntity;
 import org.jetbrains.annotations.Nullable;
@@ -26,29 +25,29 @@ public class User {
     public DiscordUser linkedUser;
 
     private static void fillInData(User user, @Nullable ServerPlayerEntity entity, boolean resolveDiscord) {
-        PlayerData playerData;
+        PlayerMeta playerData;
         if(entity != null) {
-            playerData = PlayerData.getPlayer(entity);
+            playerData = PlayerMeta.getPlayer(entity);
             user.afk = AfkTracker.getInstance().isPlayerAfk(entity.getUuid());
         } else {
-            playerData = PlayerData.getPlayer(UUID.fromString(user.uuid));
+            playerData = PlayerMeta.getPlayer(UUID.fromString(user.uuid));
             user.afk = false;
         }
 
         user.group = playerData.getPrimaryGroup();
-        user.pronouns = playerData.get(PlayerData.KEYS.pronouns);
-        user.alt = playerData.getBoolean(PlayerData.KEYS.isAlt);
-        user.bot = playerData.getBoolean(PlayerData.KEYS.isBot);
+        user.pronouns = playerData.get(PlayerMeta.KEYS.pronouns);
+        user.alt = playerData.getBoolean(PlayerMeta.KEYS.isAlt);
+        user.bot = playerData.getBoolean(PlayerMeta.KEYS.isBot);
 
         user.supporter = 0;
-        var supporterStr = playerData.get(PlayerData.KEYS.supporterLevel);
+        var supporterStr = playerData.get(PlayerMeta.KEYS.supporterLevel);
         if (supporterStr != null) {
             user.supporter = Integer.parseInt(supporterStr);
         }
 
         user.linkedUser = null;
         if(resolveDiscord) {
-            var discordId = playerData.get(PlayerData.KEYS.discordId);
+            var discordId = playerData.get(PlayerMeta.KEYS.discordId);
             if (discordId != null) {
                 var member = Bridge.getInstance().getClient().guild().getMember(UserSnowflake.fromId(discordId));
                 if (member != null) {
@@ -79,7 +78,7 @@ public static User create(ServerPlayerEntity player) {
     public static User tryGet(UUID playerUuid, boolean resolveDiscord) {
         var user = new User();
 
-        var playerData = PlayerData.getPlayer(playerUuid);
+        var playerData = PlayerMeta.getPlayer(playerUuid);
 
         user.uuid = playerUuid.toString();
         user.name = playerData.getEffectiveName();

diff --git a/src/main/java/cc/reconnected/chatbox/utils/TextComponents.java b/src/main/java/cc/reconnected/chatbox/utils/TextComponents.java
@@ -1,7 +1,7 @@
 package cc.reconnected.chatbox.utils;
 
 import cc.reconnected.chatbox.parsers.MiniMessageSerializer;
-import cc.reconnected.server.database.PlayerData;
+import cc.reconnected.server.api.PlayerMeta;
 import cc.reconnected.server.parser.MarkdownParser;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.HoverEvent;
@@ -23,7 +23,7 @@ public class TextComponents {
             .append(Component.text("CB").color(NamedTextColor.DARK_GRAY).hoverEvent(HoverEvent.showText(Component.text("This message was publicly sent by an automated chatbot."))))
             .append(Component.text("]", NamedTextColor.GRAY));
 
-    public static Component addLabelInfo(Component name, PlayerData owner) {
+    public static Component addLabelInfo(Component name, PlayerMeta owner) {
         var ownerMeta = Component.text("Owned by " + owner.getEffectiveName());
         return name.hoverEvent(HoverEvent.showText(ownerMeta));
     }
@@ -50,7 +50,7 @@ public static Component formatContent(String content, @Nullable String type) {
         return formattedContent;
     }
 
-    public static Component buildChatbotMessage(Component label, Component content, PlayerData owner) {
+    public static Component buildChatbotMessage(Component label, Component content, PlayerMeta owner) {
         return Component.empty()
                 .append(addLabelInfo(label, owner))
                 .append(Component.text(':', NamedTextColor.GRAY))

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -27,8 +27,8 @@
 		"minecraft": "~1.20.1",
 		"java": ">=17",
 		"fabric-api": "*",
-		"rcc-server": ">=1.10.1",
-		"rcc-discord": ">=1.7.1",
+		"rcc-server": ">=1.14.3",
+		"rcc-discord": ">=1.7.8",
 		"luckperms": ">=5.4"
 	}
 }