Merge pull request #41 from Andre601/feature/uuid-usage

Improve player caching behaviour

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Andre_601
+Copyright (c) 2022-2023 Andre_601
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

bungeecord/pom.xml

@@ -2,7 +2,7 @@
 <!--
   ~ MIT License
   ~
-  ~ Copyright (c) 2022 Andre_601
+  ~ Copyright (c) 2022-2023 Andre_601
   ~
   ~ Permission is hereby granted, free of charge, to any person obtaining a copy
   ~ of this software and associated documentation files (the "Software"), to deal

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/BungeeCordCore.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/BungeePlayer.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,13 +25,15 @@
 
 package ch.andre601.advancedserverlist.bungeecord;
 
+import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
 import ch.andre601.advancedserverlist.core.profiles.players.GenericPlayer;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 
 public class BungeePlayer extends GenericPlayer<ProxiedPlayer>{
     
-    public BungeePlayer(String name, int protocol){
-        this.name = name;
+    public BungeePlayer(CachedPlayer player, int protocol){
+        this.name = player.getName();
         this.protocol = protocol;
+        this.uuid = player.getUuid();
     }
 }

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/commands/BungeeCmdSender.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/commands/CmdAdvancedServerList.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/events/BungeeEventWrapper.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,6 +29,7 @@ import ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
 import ch.andre601.advancedserverlist.bungeecord.BungeePlayer;
 import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
+import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
 import ch.andre601.advancedserverlist.core.profiles.players.GenericPlayer;
 import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.PlayerPlaceholders;
 import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.ServerPlaceholders;
@@ -145,8 +146,8 @@ public class BungeeEventWrapper implements GenericEventWrapper<ProxiedPlayer, Fa
     }
     
     @Override
-    public GenericPlayer<ProxiedPlayer> createPlayer(String name, int protocol){
-        return new BungeePlayer(name, protocol);
+    public GenericPlayer<ProxiedPlayer> createPlayer(CachedPlayer player, int protocol){
+        return new BungeePlayer(player, protocol);
     }
     
     @Override

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/events/JoinEvent.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,6 +26,7 @@
 package ch.andre601.advancedserverlist.bungeecord.events;
 
 import ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.PostLoginEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
@@ -44,6 +45,8 @@ public class JoinEvent implements Listener{
     @EventHandler
     public void onJoin(PostLoginEvent event){
         InetSocketAddress address = (InetSocketAddress)event.getPlayer().getPendingConnection().getSocketAddress();
-        plugin.getCore().getPlayerHandler().addPlayer(event.getPlayer().getName(), address.getHostString());
+        ProxiedPlayer player = event.getPlayer();
+        
+        plugin.getCore().getPlayerHandler().addPlayer(address.getHostString(), player.getName(), player.getUniqueId());
     }
 }

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/events/PingEvent.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/logging/BungeeLogger.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/pom.xml

@@ -2,7 +2,7 @@
 <!--
   ~ MIT License
   ~
-  ~ Copyright (c) 2022 Andre_601
+  ~ Copyright (c) 2022-2023 Andre_601
   ~
   ~ Permission is hereby granted, free of charge, to any person obtaining a copy
   ~ of this software and associated documentation files (the "Software"), to deal

core/src/main/java/ch/andre601/advancedserverlist/core/AdvancedServerList.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -77,7 +77,7 @@ public class AdvancedServerList{
     }
     
     public void disable(){
-        getPlugin().getPluginLogger().info("Saving cache.data file...");
+        getPlugin().getPluginLogger().info("Saving playercache.json file...");
         getPlayerHandler().save();
         
         if(updateChecker != null){
@@ -125,7 +125,7 @@ public class AdvancedServerList{
         plugin.loadEvents();
         getPlugin().getPluginLogger().info("Events loaded!");
     
-        getPlugin().getPluginLogger().info("Loading cache.data...");
+        getPlugin().getPluginLogger().info("Loading playercache.json...");
         getPlayerHandler().load();
     
         getPlugin().getPluginLogger().info("Loading bStats metrics. Disable it in the global config under /plugins/bstats/");

core/src/main/java/ch/andre601/advancedserverlist/core/check/UpdateCheckThread.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/ch/andre601/advancedserverlist/core/check/UpdateChecker.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/ch/andre601/advancedserverlist/core/commands/CommandHandler.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/ch/andre601/advancedserverlist/core/events/PingEventHandler.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -43,9 +43,9 @@ public class PingEventHandler{
             return;
         
         PluginCore<F> plugin = event.getPlugin();
-    
+        
         GenericPlayer<P> player = event.createPlayer(
-            plugin.getCore().getPlayerHandler().getPlayerByIp(event.getPlayerIP()),
+            plugin.getCore().getPlayerHandler().getCachedPlayer(event.getPlayerIP()),
             event.getProtocolVersion()
         );
         String host = event.getVirtualHost();

core/src/main/java/ch/andre601/advancedserverlist/core/file/FileHandler.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/ch/andre601/advancedserverlist/core/interfaces/CmdSender.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/ch/andre601/advancedserverlist/core/interfaces/PluginLogger.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/ch/andre601/advancedserverlist/core/interfaces/core/PluginCore.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/ch/andre601/advancedserverlist/core/interfaces/core/ProxyCore.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/ch/andre601/advancedserverlist/core/interfaces/core/ServerCore.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/ch/andre601/advancedserverlist/core/interfaces/events/GenericEventWrapper.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,6 +26,7 @@
 package ch.andre601.advancedserverlist.core.interfaces.events;
 
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
+import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
 import ch.andre601.advancedserverlist.core.profiles.players.GenericPlayer;
 import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.PlayerPlaceholders;
 import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.ServerPlaceholders;
@@ -69,7 +70,7 @@ public interface GenericEventWrapper<P, F>{
     
     PluginCore<F> getPlugin();
     
-    GenericPlayer<P> createPlayer(String name, int protocol);
+    GenericPlayer<P> createPlayer(CachedPlayer player, int protocol);
     
     F createFavicon(BufferedImage image) throws Exception;
     

core/src/main/java/ch/andre601/advancedserverlist/core/objects/CachedPlayer.java

@@ -25,25 +25,30 @@
 
 package ch.andre601.advancedserverlist.core.objects;
 
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.Map;
+import java.util.UUID;
 
-/*
- * Original by Imo van den Berge (aka Bergerkiller: https://github.com/Bergerkiller)
- *
- * Original Source: https://github.com/bergerhealer/BKCommonLib/blob/master/src/main/java/com/bergerkiller/bukkit/common/collections/EntryList.java
- */
-public class EntryList<K, V> extends ArrayList<Map.Entry<K, V>>{
-    public void add(K key, V value){
-        add(new AbstractMap.SimpleEntry<>(key, value));
+@SuppressWarnings("FieldMayBeFinal")
+public class CachedPlayer{
+    
+    private String ip;
+    private String name;
+    private UUID uuid;
+    
+    public CachedPlayer(String ip, String name, UUID uuid){
+        this.ip = ip;
+        this.name = name;
+        this.uuid = uuid;
     }
     
-    public boolean containsKey(K key){
-        for(Map.Entry<K, V> entry : this){
-            if(entry.getKey().equals(key))
-                return true;
-        }
-        return false;
+    public String getIp(){
+        return ip;
+    }
+    
+    public String getName(){
+        return name;
+    }
+    
+    public UUID getUuid(){
+        return uuid;
     }
 }

core/src/main/java/ch/andre601/advancedserverlist/core/objects/NullBool.java

@@ -29,7 +29,7 @@ package ch.andre601.advancedserverlist.core.objects;
  * A simple class to allow having a nullable boolean without having to deal with possible NPEs
  * when trying to get Boolean.getValue() while it is null...
  * 
- * Here, it simply checks if the value is null and if it is, returns a default. Otherwise it gives
+ * Here, it simply checks if the value is null and if it is, returns a default. Otherwise, it gives
  * the value.
  */
 public class NullBool{

core/src/main/java/ch/andre601/advancedserverlist/core/parsing/ComponentParser.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/ServerListProfile.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/Expression.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/favicon/FaviconHandler.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/players/GenericPlayer.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/players/PlayerHandler.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,110 +26,133 @@
 package ch.andre601.advancedserverlist.core.profiles.players;
 
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
-import ch.andre601.advancedserverlist.core.objects.EntryList;
+import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
+import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
+import com.google.gson.Gson;
+import io.leangen.geantyref.TypeToken;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
+import java.io.Reader;
+import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.List;
-import java.util.Map;
-import java.util.StringJoiner;
+import java.util.*;
 
 public class PlayerHandler{
     
     private final AdvancedServerList core;
+    private final PluginLogger logger;
     private final Path cache;
-    private final EntryList<String, String> players = new EntryList<>();
+    private List<CachedPlayer> cachedPlayers = new ArrayList<>();
+    
+    private final Type listType = new TypeToken<ArrayList<CachedPlayer>>(){}.getType();
+    private final Gson gson = new Gson();
+    
+    // UUID of MHF_Question
+    private final String defaultUUID = "606e2ff0-ed77-4842-9d6c-e1d3321c7838";
+    
+    private CachedPlayer defaultPlayer = null;
     
     public PlayerHandler(AdvancedServerList core){
         this.core = core;
-        this.cache = core.getPlugin().getFolderPath().resolve("cache.data");
+        this.logger = core.getPlugin().getPluginLogger();
+        this.cache = core.getPlugin().getFolderPath().resolve("playercache.json");
     }
     
     public void load(){
         if(!cache.toFile().exists()){
-            core.getPlugin().getPluginLogger().info("No cache.data present. Skipping...");
+            logger.info("No playercache.json file present. Skipping...");
             return;
         }
         
         if(core.getFileHandler().getBoolean("disable_cache")){
-            core.getPlugin().getPluginLogger().info("Cache disabled. Skipping player loading...");
+            logger.info("'disable_cache' is set to true. Skipping playercache.json loading...");
             return;
         }
-        
-        List<String> lines;
+    
         try{
-            lines = Files.readAllLines(cache);
+            Reader reader = Files.newBufferedReader(cache);
+            
+            cachedPlayers = gson.fromJson(reader, listType);
+            
+            reader.close();
         }catch(IOException ex){
-            core.getPlugin().getPluginLogger().warn("Encountered IOException while trying to read cache.data", ex);
+            logger.warn("Encountered IOException while reading the playercache.json file!", ex);
             return;
         }
         
-        if(lines.isEmpty()){
-            core.getPlugin().getPluginLogger().info("cache.data is empty. Skipping...");
-            return;
-        }
-        
-        for(String line : lines){
-            String[] parts = line.split("=", 2);
-            if(parts.length < 2 || parts[0].isEmpty() || parts[1].isEmpty())
-                continue;
-            
-            if(players.containsKey(parts[0]))
-                continue;
-            
-            players.add(parts[0], parts[1]);
-        }
-        
-        core.getPlugin().getPluginLogger().info("Loaded " + players.size() + " players into cache!");
+        logger.info("Loaded %d players into cache!", cachedPlayers.size());
     }
     
     public void save(){
-        if(players.isEmpty()){
-            core.getPlugin().getPluginLogger().info("No data to save. Skipping...");
+        if(cachedPlayers.isEmpty()){
+            logger.info("No players in cache to save. Skipping...");
             return;
         }
-    
+        
         if(core.getFileHandler().getBoolean("disable_cache")){
-            core.getPlugin().getPluginLogger().info("Cache disabled. Skipping player saving...");
+            logger.info("'disable_cache' is set to true. Skipping saving of cached players...");
             return;
         }
         
-        StringJoiner joiner = new StringJoiner("\n");
-        for(Map.Entry<String, String> entry : players){
-            joiner.add(entry.getKey() + "=" + entry.getValue());
-        }
-        
-        try{
-            BufferedWriter writer = Files.newBufferedWriter(cache, StandardCharsets.UTF_8);
-            
-            writer.write(joiner.toString());
-            writer.close();
-            
-            core.getPlugin().getPluginLogger().info("Successfully saved cache.data file.");
+        try(BufferedWriter writer = Files.newBufferedWriter(cache, StandardCharsets.UTF_8)){
+            gson.toJson(cachedPlayers, listType, writer);
+            logger.info("Successfully saved playercache.json file.");
         }catch(IOException ex){
-            core.getPlugin().getPluginLogger().warn("Cannot save player data to cache.data file!", ex);
+            logger.warn("Encountered IOException while saving cached players to playercache.json!", ex);
         }
+        
+        
     }
     
-    public void addPlayer(String name, String ip){
-        if(players.containsKey(name) || core.getFileHandler().getBoolean("disable_cache"))
+    public void addPlayer(String ip, String name, UUID uuid){
+        if(contains(ip) || core.getFileHandler().getBoolean("disable_cache"))
             return;
         
-        players.add(name, ip);
+        cachedPlayers.add(new CachedPlayer(ip, name, uuid));
     }
     
-    public String getPlayerByIp(String ip){
-        if(core.getFileHandler().getBoolean("disable_cache"))
-            core.getFileHandler().getString("Anonymous", "unknown_player");
+    public CachedPlayer getCachedPlayer(String key){
+        if(!contains(key) || core.getFileHandler().getBoolean("disable_cache"))
+            return getDefaultPlayer();
         
-        for(Map.Entry<String, String> entry : players){
-            if(entry.getValue().equals(ip))
-                return entry.getKey();
+        for(CachedPlayer player : cachedPlayers){
+            if(player.getIp().equals(key))
+                return player;
         }
         
-        return core.getFileHandler().getString("Anonymous", "unknown_player");
+        return getDefaultPlayer();
     }
+    
+    private boolean contains(String ip){
+        for(CachedPlayer player : cachedPlayers){
+            if(player.getIp().equals(ip))
+                return true;
+        }
+        
+        return false;
+    }
+    
+    private CachedPlayer getDefaultPlayer(){
+        if(defaultPlayer != null)
+            return defaultPlayer;
+        
+        return (defaultPlayer = new CachedPlayer(
+            "0.0.0.0",
+            core.getFileHandler().getString("Anonymous", "unknown_player"),
+            convertToUUID(core.getFileHandler().getString(defaultUUID, "unknown_player_uuid"))
+        ));
+    }
+    
+    private UUID convertToUUID(String uuid){
+        try{
+            return UUID.fromString(uuid);
+        }catch(IllegalArgumentException ex){
+            // This is always a valid UUID.
+            return UUID.fromString(defaultUUID);
+        }
+    }
+    
 }

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/profile/ProfileEntry.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/profile/ProfileManager.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/profile/ProfileSerializer.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/replacer/StringReplacer.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/replacer/placeholders/Placeholders.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/replacer/placeholders/PlayerPlaceholders.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -37,6 +37,7 @@ public class PlayerPlaceholders implements Placeholders{
     public PlayerPlaceholders(GenericPlayer<?> player){
         this.replacements.put("${player name}", player.getName());
         this.replacements.put("${player protocol}", player.getProtocol());
+        this.replacements.put("${player uuid}", player.getUniqueId());
         
         if(player.getVersion() != null)
             this.replacements.put("${player version}", player.getVersion());
@@ -47,7 +48,6 @@ public class PlayerPlaceholders implements Placeholders{
         this.replacements.put("${player hasPlayedBefore}", player.hasPlayedBefore());
         this.replacements.put("${player isBanned}", player.isBanned());
         this.replacements.put("${player isWhitelisted}", player.isWhitelisted());
-        this.replacements.put("${player uuid}", player.getUniqueId());
     }
     
     @Override

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/replacer/placeholders/ServerPlaceholders.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

core/src/main/resources/config.yml

@@ -5,6 +5,14 @@
 #
 unknown_player: "Anonymous"
 
+#
+# UUID used for when AdvancedServerList doesn't have a cached player to use for the ${player uuid}
+# placeholder.
+#
+# Defaults to the UUID of MHF_Question (606e2ff0-ed77-4842-9d6c-e1d3321c7838) when not present.
+#
+unknown_player_uuid: "606e2ff0-ed77-4842-9d6c-e1d3321c7838"
+
 #
 # Should the Caching of players be disabled?
 #

core/src/main/resources/version.properties

@@ -1,7 +1,7 @@
 #
 # MIT License
 #
-# Copyright (c) 2022 Andre_601
+# Copyright (c) 2022-2023 Andre_601
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

core/src/test/java/ch/andre601/advancedserverlist/test/FlexVerTests.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

paper/pom.xml

@@ -2,7 +2,7 @@
 <!--
   ~ MIT License
   ~
-  ~ Copyright (c) 2022 Andre_601
+  ~ Copyright (c) 2022-2023 Andre_601
   ~
   ~ Permission is hereby granted, free of charge, to any person obtaining a copy
   ~ of this software and associated documentation files (the "Software"), to deal

paper/src/main/java/ch/andre601/advancedserverlist/paper/PaperCore.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

paper/src/main/java/ch/andre601/advancedserverlist/paper/PaperPlayer.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,23 +25,25 @@
 
 package ch.andre601.advancedserverlist.paper;
 
+import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
 import ch.andre601.advancedserverlist.core.profiles.players.GenericPlayer;
 import org.bukkit.OfflinePlayer;
 
 public class PaperPlayer extends GenericPlayer<OfflinePlayer>{
     
-    public PaperPlayer(OfflinePlayer player, String name, int protocol){
+    public PaperPlayer(OfflinePlayer player, CachedPlayer cachedPlayer, int protocol){
         this.player = player;
         
-        this.name = player == null ? name : player.getName();
+        this.name = player == null ? cachedPlayer.getName() : player.getName();
         this.protocol = protocol;
         
+        this.uuid = player == null ? cachedPlayer.getUuid() : player.getUniqueId();
+        
         if(player == null)
             return;
         
         this.playedBefore = player.hasPlayedBefore();
         this.banned = player.isBanned();
         this.whitelisted = player.isWhitelisted();
-        this.uuid = player.getUniqueId();
     }
 }

paper/src/main/java/ch/andre601/advancedserverlist/paper/commands/CmdAdvancedServerList.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

paper/src/main/java/ch/andre601/advancedserverlist/paper/commands/PaperCmdSender.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

paper/src/main/java/ch/andre601/advancedserverlist/paper/events/JoinEvent.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,6 +26,7 @@
 package ch.andre601.advancedserverlist.paper.events;
 
 import ch.andre601.advancedserverlist.paper.PaperCore;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
@@ -46,7 +47,8 @@ public class JoinEvent implements Listener{
         InetSocketAddress address = event.getPlayer().getAddress();
         if(address == null)
             return;
-        
-        plugin.getCore().getPlayerHandler().addPlayer(event.getPlayer().getName(), address.getHostString());
+    
+        Player player = event.getPlayer();
+        plugin.getCore().getPlayerHandler().addPlayer(address.getHostString(), player.getName(), player.getUniqueId());
     }
 }

paper/src/main/java/ch/andre601/advancedserverlist/paper/events/PaperEventWrapper.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -27,6 +27,7 @@ package ch.andre601.advancedserverlist.paper.events;
 
 import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
+import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
 import ch.andre601.advancedserverlist.core.profiles.players.GenericPlayer;
 import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.PlayerPlaceholders;
 import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.ServerPlaceholders;
@@ -141,16 +142,10 @@ public class PaperEventWrapper implements GenericEventWrapper<OfflinePlayer, Cac
     }
     
     @Override
-    public GenericPlayer<OfflinePlayer> createPlayer(String name, int protocol){
-        OfflinePlayer player = Bukkit.getPlayerExact(name);
+    public GenericPlayer<OfflinePlayer> createPlayer(CachedPlayer player, int protocol){
+        OfflinePlayer pl = Bukkit.getOfflinePlayer(player.getUuid());
         
-        if(player == null){
-            player = Bukkit.getOfflinePlayer(name);
-            
-            return new PaperPlayer(player.hasPlayedBefore() ? player : null, name, protocol);
-        }
-        
-        return new PaperPlayer(player, name, protocol);
+        return new PaperPlayer(pl.hasPlayedBefore() ? pl : null, player, protocol);
     }
     
     @Override

paper/src/main/java/ch/andre601/advancedserverlist/paper/events/PingEvent.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

paper/src/main/java/ch/andre601/advancedserverlist/paper/logging/PaperLogger.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

pom.xml

@@ -1,4 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ MIT License
+  ~
+  ~ Copyright (c) 2022-2023 Andre_601
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
+  ~ of this software and associated documentation files (the "Software"), to deal
+  ~ in the Software without restriction, including without limitation the rights
+  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  ~ copies of the Software, and to permit persons to whom the Software is
+  ~ furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in all
+  ~ copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  ~ SOFTWARE.
+  ~
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -12,7 +37,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         
-        <plugin.version>1.10.2</plugin.version>
+        <plugin.version>1.11.0</plugin.version>
         <plugin.description>Create multiple Server lists based on conditions.</plugin.description>
         
         <maven.compiler.source>16</maven.compiler.source>

spigot/pom.xml

@@ -2,7 +2,7 @@
 <!--
   ~ MIT License
   ~
-  ~ Copyright (c) 2022 Andre_601
+  ~ Copyright (c) 2022-2023 Andre_601
   ~
   ~ Permission is hereby granted, free of charge, to any person obtaining a copy
   ~ of this software and associated documentation files (the "Software"), to deal

spigot/src/main/java/ch/andre601/advancedserverlist/spigot/SpigotCore.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

spigot/src/main/java/ch/andre601/advancedserverlist/spigot/SpigotPlayer.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,23 +25,25 @@
 
 package ch.andre601.advancedserverlist.spigot;
 
+import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
 import ch.andre601.advancedserverlist.core.profiles.players.GenericPlayer;
 import org.bukkit.OfflinePlayer;
 
 public class SpigotPlayer extends GenericPlayer<OfflinePlayer>{
     
-    public SpigotPlayer(OfflinePlayer player, String name, int protocol){
+    public SpigotPlayer(OfflinePlayer player, CachedPlayer cachedPlayer, int protocol){
         this.player = player;
-        
-        this.name = player == null ? name : player.getName();
+    
+        this.name = player == null ? cachedPlayer.getName() : player.getName();
         this.protocol = protocol;
-        
+    
+        this.uuid = player == null ? cachedPlayer.getUuid() : player.getUniqueId();
+    
         if(player == null)
             return;
-        
+    
         this.playedBefore = player.hasPlayedBefore();
         this.banned = player.isBanned();
         this.whitelisted = player.isWhitelisted();
-        this.uuid = player.getUniqueId();
     }
 }

spigot/src/main/java/ch/andre601/advancedserverlist/spigot/commands/CmdAdvancedServerList.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

spigot/src/main/java/ch/andre601/advancedserverlist/spigot/commands/SpigotCmdSender.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

spigot/src/main/java/ch/andre601/advancedserverlist/spigot/events/JoinEvent.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,6 +26,7 @@
 package ch.andre601.advancedserverlist.spigot.events;
 
 import ch.andre601.advancedserverlist.spigot.SpigotCore;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
@@ -45,7 +46,8 @@ public class JoinEvent implements Listener{
         InetSocketAddress address = event.getPlayer().getAddress();
         if(address == null)
             return;
-        
-        plugin.getCore().getPlayerHandler().addPlayer(event.getPlayer().getName(), address.getHostString());
+    
+        Player player = event.getPlayer();
+        plugin.getCore().getPlayerHandler().addPlayer(address.getHostString(), player.getName(), player.getUniqueId());
     }
 }

spigot/src/main/java/ch/andre601/advancedserverlist/spigot/events/LoadEvent.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

spigot/src/main/java/ch/andre601/advancedserverlist/spigot/events/PingEvent.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

spigot/src/main/java/ch/andre601/advancedserverlist/spigot/events/ProtocolLibEventWrapper.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -27,6 +27,7 @@ package ch.andre601.advancedserverlist.spigot.events;
 
 import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
+import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
 import ch.andre601.advancedserverlist.core.profiles.players.GenericPlayer;
 import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.PlayerPlaceholders;
 import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.ServerPlaceholders;
@@ -150,17 +151,10 @@ public class ProtocolLibEventWrapper implements GenericEventWrapper<OfflinePlaye
     }
     
     @Override
-    public GenericPlayer<OfflinePlayer> createPlayer(String name, int protocol){
-        OfflinePlayer player = Bukkit.getPlayerExact(name);
+    public GenericPlayer<OfflinePlayer> createPlayer(CachedPlayer player, int protocol){
+        OfflinePlayer pl = Bukkit.getOfflinePlayer(player.getUuid());
         
-        if(player == null){
-            //noinspection deprecation
-            player = Bukkit.getOfflinePlayer(name);
-            
-            return new SpigotPlayer(player.hasPlayedBefore() ? player : null, name, protocol);
-        }
-        
-        return new SpigotPlayer(player, name, protocol);
+        return new SpigotPlayer(pl.hasPlayedBefore() ? pl : null, player, protocol);
     }
     
     @Override

spigot/src/main/java/ch/andre601/advancedserverlist/spigot/logging/SpigotLogger.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

velocity/pom.xml

@@ -2,7 +2,7 @@
 <!--
   ~ MIT License
   ~
-  ~ Copyright (c) 2022 Andre_601
+  ~ Copyright (c) 2022-2023 Andre_601
   ~
   ~ Permission is hereby granted, free of charge, to any person obtaining a copy
   ~ of this software and associated documentation files (the "Software"), to deal

velocity/src/main/java/ch/andre601/advancedserverlist/velocity/VelocityCore.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

velocity/src/main/java/ch/andre601/advancedserverlist/velocity/VelocityPlayer.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,15 +25,18 @@
 
 package ch.andre601.advancedserverlist.velocity;
 
+import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
 import ch.andre601.advancedserverlist.core.profiles.players.GenericPlayer;
 import com.velocitypowered.api.network.ProtocolVersion;
 import com.velocitypowered.api.proxy.Player;
 
 public class VelocityPlayer extends GenericPlayer<Player>{
     
-    public VelocityPlayer(String name, int protocol){
-        this.name = name;
+    public VelocityPlayer(CachedPlayer player, int protocol){
+        this.name = player.getName();
         this.protocol = protocol;
+        this.uuid = player.getUuid();
+        
         this.version = ProtocolVersion.getProtocolVersion(protocol).getVersionIntroducedIn();
     }
 }

velocity/src/main/java/ch/andre601/advancedserverlist/velocity/commands/CmdAdvancedServerList.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

velocity/src/main/java/ch/andre601/advancedserverlist/velocity/commands/VelocityCmdSender.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

velocity/src/main/java/ch/andre601/advancedserverlist/velocity/events/JoinEvent.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -28,6 +28,7 @@ package ch.andre601.advancedserverlist.velocity.events;
 import ch.andre601.advancedserverlist.velocity.VelocityCore;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.connection.PostLoginEvent;
+import com.velocitypowered.api.proxy.Player;
 
 import java.net.InetSocketAddress;
 
@@ -43,6 +44,8 @@ public class JoinEvent{
     @Subscribe
     public void onJoin(PostLoginEvent event){
         InetSocketAddress address = event.getPlayer().getRemoteAddress();
-        plugin.getCore().getPlayerHandler().addPlayer(event.getPlayer().getUsername(), address.getHostString());
+        Player player = event.getPlayer();
+        
+        plugin.getCore().getPlayerHandler().addPlayer(address.getHostString(), player.getUsername(), player.getUniqueId());
     }
 }

velocity/src/main/java/ch/andre601/advancedserverlist/velocity/events/PingEvent.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

velocity/src/main/java/ch/andre601/advancedserverlist/velocity/events/VelocityEventWrapper.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -27,6 +27,7 @@ package ch.andre601.advancedserverlist.velocity.events;
 
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
+import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
 import ch.andre601.advancedserverlist.core.profiles.players.GenericPlayer;
 import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.PlayerPlaceholders;
 import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.ServerPlaceholders;
@@ -139,8 +140,8 @@ public class VelocityEventWrapper implements GenericEventWrapper<Player, Favicon
     }
     
     @Override
-    public GenericPlayer<Player> createPlayer(String name, int protocol){
-        return new VelocityPlayer(name, protocol);
+    public GenericPlayer<Player> createPlayer(CachedPlayer player, int protocol){
+        return new VelocityPlayer(player, protocol);
     }
     
     @Override

velocity/src/main/java/ch/andre601/advancedserverlist/velocity/logging/VelocityLogger.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022 Andre_601
+ * Copyright (c) 2022-2023 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal