Handle skin color

Author: Kazzuk

server/src/main/java/org/cloudburstmc/server/CloudServer.java

@@ -72,6 +72,7 @@
 import org.iq80.leveldb.DB;
 import org.iq80.leveldb.Options;
 
+import java.awt.*;
 import java.io.*;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
@@ -82,6 +83,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Matcher;
@@ -829,6 +831,7 @@ public void updatePlayerListData(UUID uuid, long entityId, String name, Serializ
         entry.setSkin(skin);
         entry.setXuid(xboxUserId);
         entry.setPlatformChatId("");
+        entry.setColor(parseSkinColor(skin.getSkinColor()));
         packet.getEntries().add(entry);
         CloudServer.broadcastPacket(players, packet);
     }
@@ -866,6 +869,7 @@ public void sendFullPlayerListData(CloudPlayer player) {
                     entry.setSkin(p.getSerializedSkin());
                     entry.setXuid(p.getXuid());
                     entry.setPlatformChatId("");
+                    entry.setColor(parseSkinColor(p.getSerializedSkin().getSkinColor()));
                     return entry;
                 }).collect(Collectors.toList()));
 
@@ -876,6 +880,16 @@ public void sendRecipeList(Player player) {
         this.craftingManager.sendRecipesTo((CloudPlayer) player);
     }
 
+    private static Color parseSkinColor(String skinColor) {
+        if (skinColor != null && skinColor.startsWith("#") && skinColor.length() == 7) {
+            try {
+                return Color.decode(skinColor);
+            } catch (NumberFormatException ignored) {
+            }
+        }
+        return Color.WHITE;
+    }
+
     private void checkTickUpdates(int currentTick, long tickTime) {
         for (Player p : new ArrayList<>(this.players.values())) {
             /*if (!p.loggedIn && (tickTime - p.creationTime) >= 10000 && p.kick(PlayerKickEvent.Reason.LOGIN_TIMEOUT, "Login timeout")) {

server/src/main/java/org/cloudburstmc/server/level/particle/FloatingTextParticle.java

@@ -12,6 +12,7 @@
 import org.cloudburstmc.protocol.bedrock.packet.*;
 import org.cloudburstmc.server.level.CloudLevel;
 
+import java.awt.*;
 import java.util.ArrayList;
 import java.util.EnumMap;
 import java.util.UUID;
@@ -33,8 +34,8 @@ public class FloatingTextParticle extends Particle {
                 .skinData(SKIN_DATA).build();
     }
 
-    protected UUID uuid = UUID.randomUUID();
     protected final CloudLevel level;
+    protected UUID uuid = UUID.randomUUID();
     protected long entityId = -1;
     protected boolean invisible = false;
     protected EntityDataMap dataMap = new EntityDataMap();
@@ -135,6 +136,7 @@ public BedrockPacket[] encode() {
             entry.setSkin(EMPTY_SKIN);
             entry.setXuid("");
             entry.setPlatformChatId("");
+            entry.setColor(Color.WHITE);
             PlayerListPacket playerAdd = new PlayerListPacket();
             playerAdd.getEntries().add(entry);
             playerAdd.setAction(PlayerListPacket.Action.ADD);