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

Improve player caching behaviour

.github/workflows/release.yml

@@ -7,7 +7,8 @@ name: Publish Assets
 
 on:
   release:
-    types: [published]
+    types:
+    - published
 
 jobs:
   buildJars:

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
@@ -52,4 +52,9 @@ public class BungeeLogger implements PluginLogger{
     public void warn(String msg, Throwable throwable){
         logger.log(Level.WARNING, msg, throwable);
     }
+    
+    @Override
+    public void warn(String msg, Throwable throwable, Object... args){
+        logger.log(Level.WARNING, String.format(msg, args), throwable);
+    }
 }

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
@@ -43,6 +43,13 @@
         <maven.compiler.target>16</maven.compiler.target>
     </properties>
     
+    <repositories>
+        <repository>
+            <id>flexver-repo</id>
+            <url>https://repo.sleeping.town/</url>
+        </repository>
+    </repositories>
+    
     <dependencies>
         <dependency>
             <groupId>org.spongepowered</groupId>
@@ -73,13 +80,26 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10</version>
+            <version>2.10.1</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
             <version>4.10.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.unascribed</groupId>
+            <artifactId>flexver-java</artifactId>
+            <version>1.0.2</version>
+        </dependency>
+        
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -111,6 +131,12 @@
                             </excludes>
                         </filter>
                     </filters>
+                    <relocations>
+                        <relocation>
+                            <pattern>com.unascribed</pattern>
+                            <shadedPattern>ch.andre601.advancedserverlist.core.depends.flexver</shadedPattern>
+                        </relocation>
+                    </relocations>
                 </configuration>
                 <executions>
                     <execution>

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
@@ -31,6 +31,7 @@ import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonSyntaxException;
+import com.unascribed.flexver.FlexVerComparator;
 import io.leangen.geantyref.TypeToken;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -41,7 +42,10 @@ import java.io.IOException;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 public class UpdateChecker{
     
@@ -80,13 +84,12 @@ public class UpdateChecker{
         
                 int result = version.compare(core.getVersion());
                 switch(result){
-                    case -2 -> {
-                        logger.warn("Encountered an exception while comparing versions. Are they valid?");
-                        logger.warn("Own version: %s; New version: %s", core.getVersion(), version.getVersionNumber());
-                    }
-                    case -1 -> logger.info("You seem to run a newer version compared to Modrinth. Are you running a dev build?");
+                    case -1 -> printUpdateBanner(version.getVersionNumber(), version.getId(), version.isRelease());
                     case 0 -> logger.info("No new update found. You're running the latest version!");
-                    case 1 -> printUpdateBanner(version.getVersionNumber(), version.getId());
+                    case 1 -> logger.info(
+                        "Your version (%s) is higher than the latest release (%s). Are you running a dev build?",
+                        core.getVersion(), version.getVersionNumber()
+                    );
                 }
             });
         }, 0L, 12L, TimeUnit.HOURS);
@@ -94,12 +97,19 @@ public class UpdateChecker{
     
     public void disable(){
         executor.shutdown();
+        client.dispatcher().executorService().shutdown();
         try{
             if(!executor.awaitTermination(1, TimeUnit.SECONDS)){
                 executor.shutdownNow();
                 if(!executor.awaitTermination(1, TimeUnit.SECONDS))
                     logger.warn("Scheduler didn't terminate in time!");
             }
+            
+            if(!client.dispatcher().executorService().awaitTermination(1, TimeUnit.SECONDS)){
+                client.dispatcher().executorService().shutdownNow();
+                if(!client.dispatcher().executorService().awaitTermination(1, TimeUnit.SECONDS))
+                    logger.warn("OkHttp's Scheduler didn't terminate in time!");
+            }
         }catch(InterruptedException ex){
             executor.shutdownNow();
             Thread.currentThread().interrupt();
@@ -144,6 +154,7 @@ public class UpdateChecker{
                 }
                 
                 ModrinthVersion version = list.get(0);
+                
                 if(version.getVersionNumber() == null || version.getVersionNumber().isEmpty()){
                     logger.warn("Cannot check latest version. Received version number was null/empty.");
                     return null;
@@ -160,13 +171,20 @@ public class UpdateChecker{
         });
     }
     
-    private void printUpdateBanner(String version, String versionId){
+    private void printUpdateBanner(String version, String versionId, boolean isRelease){
         logger.info("==================================================================");
         logger.info("You are running an outdated version of AdvancedServerList!");
         logger.info("");
         logger.info("Your version: %s", core.getVersion());
         logger.info("Modrinth version: %s", version);
         logger.info("");
+        
+        if(!isRelease){
+            logger.info("WARNING: This release is an Alpha/Beta! It may contain");
+            logger.info("         breaking changes!");
+            logger.info("");
+        }
+        
         logger.info("You can download the latest release from here:");
         logger.info("https://modrinth.com/plugin/advancedserverlist/version/%s", versionId);
         logger.info("==================================================================");
@@ -177,10 +195,13 @@ public class UpdateChecker{
         private String id;
         @SuppressWarnings("FieldMayBeFinal")
         private String versionNumber;
+        @SuppressWarnings("FieldMayBeFinal")
+        private String versionType;
         
-        public ModrinthVersion(String id, String versionNumber){
+        public ModrinthVersion(String id, String versionNumber, String versionType){
             this.id = id;
             this.versionNumber = versionNumber;
+            this.versionType = versionType;
         }
     
         public String getId(){
@@ -191,26 +212,12 @@ public class UpdateChecker{
             return versionNumber;
         }
         
+        public boolean isRelease(){
+            return versionType.equals("release");
+        }
+        
         public int compare(String version){
-            String[] oldParts = version.split("\\.");
-            String[] newParts = versionNumber.split("\\.");
-            int length = Math.max(oldParts.length, newParts.length);
-            
-            for(int i = 0; i < length; i++){
-                try{
-                    int oldPart = i < oldParts.length ? Integer.parseInt(oldParts[i]) : 0;
-                    int newPart = i < newParts.length ? Integer.parseInt(newParts[i]) : 0;
-                    
-                    if(oldPart < newPart)
-                        return 1;
-                    
-                    if(oldPart > newPart)
-                        return -1;
-                }catch(NumberFormatException ex){
-                    return -2;
-                }
-            }
-            return 0;
+            return FlexVerComparator.compare(version, versionNumber);
         }
     }
 }

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
@@ -25,10 +25,11 @@
 
 package ch.andre601.advancedserverlist.core.events;
 
-import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
+import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
 import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
-import ch.andre601.advancedserverlist.core.profiles.ProfileManager;
+import ch.andre601.advancedserverlist.core.profiles.profile.ProfileEntry;
+import ch.andre601.advancedserverlist.core.profiles.profile.ProfileManager;
 import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
 import ch.andre601.advancedserverlist.core.profiles.players.GenericPlayer;
 import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
@@ -42,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();
@@ -62,35 +63,35 @@ public class PingEventHandler{
         
         if(profile == null)
             return;
+    
+        ProfileEntry entry = ProfileManager.merge(profile);
         
-        if(profile.isExtraPlayersEnabled()){
-            max = online + profile.getExtraPlayers();
+        if(entry.isExtraPlayersEnabled().getValue(false)){
+            max = online + (entry.getExtraPlayersCount() == null ? 0 : entry.getExtraPlayersCount());
             event.setMaxPlayers(max);
         }
         
         serverPlaceholders = new ServerPlaceholders(online, max, host);
         
-        if(!profile.getMOTDs().isEmpty()){
-            ServerListProfile.Motd motd = profile.getRandomMOTD();
-            
-            if(motd != null){
-                event.setMotd(
-                    ComponentParser.text(motd.getText())
-                        .replacements(playerPlaceholders)
-                        .replacements(serverPlaceholders)
-                        .modifyText(text -> event.parsePAPIPlaceholders(text, player))
-                        .toComponent()
-                );
-            }
+        if(!entry.getMOTD().isEmpty()){
+            event.setMotd(
+                ComponentParser.list(entry.getMOTD())
+                    .replacements(playerPlaceholders)
+                    .replacements(serverPlaceholders)
+                    .modifyText(text -> event.parsePAPIPlaceholders(text, player))
+                    .toComponent()
+            );
         }
         
-        if(profile.isHidePlayersEnabled()){
+        boolean hidePlayers = entry.isHidePlayersEnabled().getValue(false);
+        
+        if(hidePlayers){
             event.hidePlayers();
         }
         
-        if(!profile.getPlayerCountText().isEmpty() && !profile.isHidePlayersEnabled()){
+        if(!entry.getPlayerCountText().isEmpty() && !hidePlayers){
             event.setPlayerCount(
-                ComponentParser.text(profile.getPlayerCountText())
+                ComponentParser.text(entry.getPlayerCountText())
                     .replacements(playerPlaceholders)
                     .replacements(serverPlaceholders)
                     .modifyText(text -> event.parsePAPIPlaceholders(text, player))
@@ -98,12 +99,12 @@ public class PingEventHandler{
             );
         }
         
-        if(!profile.getPlayers().isEmpty() && !profile.isHidePlayersEnabled()){
-            event.setPlayers(profile.getPlayers(), player, playerPlaceholders, serverPlaceholders);
+        if(!entry.getPlayers().isEmpty() && !hidePlayers){
+            event.setPlayers(entry.getPlayers(), player, playerPlaceholders, serverPlaceholders);
         }
         
-        if(!profile.getFavicon().isEmpty()){
-            String favicon = StringReplacer.replace(profile.getFavicon(), playerPlaceholders.getReplacements());
+        if(!entry.getFavicon().isEmpty()){
+            String favicon = StringReplacer.replace(entry.getFavicon(), playerPlaceholders.getReplacements());
             
             F fav = plugin.getFaviconHandler().getFavicon(favicon, image -> {
                 try{

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
@@ -27,7 +27,9 @@ package ch.andre601.advancedserverlist.core.file;
 
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
+import ch.andre601.advancedserverlist.core.profiles.profile.ProfileEntry;
 import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
+import ch.andre601.advancedserverlist.core.profiles.profile.ProfileSerializer;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
 
@@ -106,6 +108,7 @@ public class FileHandler{
                 return false;
             }
         }
+        
         return reloadProfiles();
     }
     
@@ -127,7 +130,7 @@ public class FileHandler{
             if(tmp == null)
                 continue;
             
-            profiles.add(ServerListProfile.Builder.resolve(tmp, logger).build());
+            profiles.add(ServerListProfile.Builder.resolve(file.getName(), tmp, logger).build());
             logger.info("Loaded " + file.getName());
         }
         
@@ -142,6 +145,7 @@ public class FileHandler{
     
     public ConfigurationNode getConfigurationNode(Path path){
         YamlConfigurationLoader loader = YamlConfigurationLoader.builder()
+            .defaultOptions(opts -> opts.serializers(build -> build.register(ProfileEntry.class, ProfileSerializer.INSTANCE)))
             .path(path)
             .build();
         

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
@@ -32,4 +32,6 @@ public interface PluginLogger{
     void warn(String msg, Object... args);
     
     void warn(String msg, Throwable throwable);
+    
+    void warn(String msg, Throwable throwable, Object... args);
 }

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

@@ -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
@@ -23,27 +23,32 @@
  *
  */
 
-package ch.andre601.advancedserverlist.core.profiles.replacer;
+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

@@ -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
@@ -23,42 +23,31 @@
  *
  */
 
-package ch.andre601.advancedserverlist.core.profiles;
+package ch.andre601.advancedserverlist.core.objects;
 
-import ch.andre601.advancedserverlist.core.AdvancedServerList;
-import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.Placeholders;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class ProfileManager{
+/*
+ * 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
+ * the value.
+ */
+public class NullBool{
     
-    private final AdvancedServerList core;
+    public static final NullBool FALSE = new NullBool(false);
+    public static final NullBool NULL = new NullBool(null);
     
-    private final Map<String, Object> replacements = new HashMap<>();
+    private final Boolean value;
     
-    private ProfileManager(AdvancedServerList core){
-        this.core = core;
+    public NullBool(Boolean value){
+        this.value = value;
     }
     
-    public static ProfileManager get(AdvancedServerList core){
-        return new ProfileManager(core);
+    public boolean isNull(){
+        return value == null;
     }
     
-    public ProfileManager replacements(Placeholders placeholders){
-        this.replacements.putAll(placeholders.getReplacements());
-        return this;
-    }
-    
-    public ServerListProfile getProfile(){
-        for(ServerListProfile profile : core.getFileHandler().getProfiles()){
-            if(profile.isInvalidProfile())
-                continue;
-            
-            if(profile.evaluateConditions(replacements))
-                return profile;
-        }
-        
-        return null;
+    public boolean getValue(boolean def){
+        return isNull() ? def : value;
     }
 }

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
@@ -27,84 +27,36 @@ package ch.andre601.advancedserverlist.core.profiles;
 
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 import ch.andre601.advancedserverlist.core.profiles.conditions.Expression;
+import ch.andre601.advancedserverlist.core.profiles.profile.ProfileEntry;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
 
 public class ServerListProfile{
     
     private final int priority;
     private final List<Expression> expressions;
+    private final ProfileEntry defaultProfile;
     
-    private final List<Motd> motds;
-    private final List<String> players;
-    private final String playerCount;
-    private final String favicon;
-    private final boolean hidePlayers;
-    private final boolean extraPlayersEnabled;
-    private final int extraPlayers;
+    private final List<ProfileEntry> profiles;
     
     private final Random random = new Random();
     
-    public ServerListProfile(int priority, List<Expression> expressions, List<Motd> motds, List<String> players,
-                             String playerCount, String favicon, boolean hidePlayers, boolean extraPlayersEnabled,
-                             int extraPlayers){
+    public ServerListProfile(int priority, List<Expression> expressions, List<ProfileEntry> profiles, ProfileEntry defaultProfile){
         this.priority = priority;
         this.expressions = expressions;
-        this.motds = motds;
-        this.players = players;
-        this.playerCount = playerCount;
-        this.favicon = favicon;
-        this.hidePlayers = hidePlayers;
-        this.extraPlayersEnabled = extraPlayersEnabled;
-        this.extraPlayers = extraPlayers;
+        this.profiles = profiles;
+        this.defaultProfile = defaultProfile;
     }
     
     public int getPriority(){
         return priority;
     }
     
-    public List<Motd> getMOTDs(){
-        return motds;
-    }
-    
-    public Motd getRandomMOTD(){
-        if(motds.isEmpty())
-            return null;
-        
-        if(motds.size() == 1)
-            return motds.get(0);
-        
-        synchronized(random){
-            return motds.get(random.nextInt(motds.size()));
-        }
-    }
-    
-    public List<String> getPlayers(){
-        return players;
-    }
-    
-    public String getPlayerCountText(){
-        return playerCount;
-    }
-    
-    public String getFavicon(){
-        return favicon;
-    }
-    
-    public boolean isHidePlayersEnabled(){
-        return hidePlayers;
-    }
-    
-    public boolean isExtraPlayersEnabled(){
-        return extraPlayersEnabled;
-    }
-    
-    public int getExtraPlayers(){
-        return extraPlayers;
-    }
-    
     public boolean evaluateConditions(Map<String, Object> replacements){
         if(expressions.isEmpty())
             return true;
@@ -117,6 +69,23 @@ public class ServerListProfile{
         return true;
     }
     
+    public ProfileEntry getRandomProfile(){
+        if(profiles.isEmpty()){
+            return null;
+        }
+        
+        if(profiles.size() == 1)
+            return profiles.get(0); // No need to run a random for 1 profile.
+        
+        synchronized(random){
+            return profiles.get(random.nextInt(profiles.size()));
+        }
+    }
+    
+    public ProfileEntry getDefaultProfile(){
+        return defaultProfile;
+    }
+    
     /*
      * Returns true if the Profile...
      * ...doesn't have any valid MOTD set AND
@@ -125,171 +94,95 @@ public class ServerListProfile{
      * ...doesn't have a favicon set.
      */
     public boolean isInvalidProfile(){
-        return getMOTDs().isEmpty() &&
-            getPlayers().isEmpty() &&
-            (getPlayerCountText().isEmpty() && !isHidePlayersEnabled()) &&
-            getFavicon().isEmpty();
+        if(profiles.isEmpty())
+            return defaultProfile.isInvalidProfile();
+        
+        boolean profilesValid = false;
+        
+        for(ProfileEntry profile : profiles){
+            if(profile.isInvalidProfile())
+                continue;
+            
+            profilesValid = true;
+            break;
+        }
+    
+        return !profilesValid && defaultProfile.isInvalidProfile();
     }
     
     public static class Builder{
         
+        private final String fileName;
         private final ConfigurationNode node;
-        
         private final int priority;
+        private final List<Expression> expressions = new ArrayList<>();
+        
         private final PluginLogger logger;
         
-        private final List<Expression> expressions = new ArrayList<>();
-        private final List<Motd> motds = new ArrayList<>();
-        private List<String> players = new ArrayList<>();
-        private String playerCount = null;
-        private String favicon = null;
-        private boolean hidePlayers = false;
-        private boolean extraPlayersEnabled = false;
-        private int extraPlayers = 0;
+        private List<ProfileEntry> profiles = new ArrayList<>();
+        private ProfileEntry defaultProfile = ProfileEntry.empty();
         
-        private Builder(ConfigurationNode node, PluginLogger logger){
+        private Builder(String fileName, ConfigurationNode node, PluginLogger logger){
+            this.fileName = fileName;
             this.node = node;
             this.priority = node.node("priority").getInt();
             this.logger = logger;
         }
         
-        public static Builder resolve(ConfigurationNode node, PluginLogger logger){
-            return new Builder(node, logger)
+        public static Builder resolve(String fileName, ConfigurationNode node, PluginLogger logger){
+            return new Builder(fileName, node, logger)
                 .resolveExpressions()
-                .resolveMOTDs()
-                .resolvePlayers()
-                .resolvePlayerCount()
-                .resolveFavicon()
-                .resolveHidePlayers()
-                .resolveExtraPlayers()
-                .resolveExtraPlayersCount();
+                .resolveProfiles()
+                .resolveDefaultProfile();
         }
-    
+        
         private Builder resolveExpressions(){
-            List<String> list = getList("conditions");
-            if(list.isEmpty())
+            List<String> temp;
+            try{
+                temp = node.node("conditions").getList(String.class);
+            }catch(SerializationException ex){
+                logger.warn("Encountered a SerializationException while resolving conditions for %s", ex, fileName);
+                return this;
+            }
+            
+            if(temp == null || temp.isEmpty())
                 return this;
             
-            for(String str : list){
-                Expression expression = new Expression(str);
+            for(String str : temp){
+                Expression expr = new Expression(str);
                 
-                if(expression.getResult() != Expression.ExpressionResult.VALID){
-                    logger.warn("Detected invalid expression in condition '%s'! Reason: %s", str, expression.getResult().getMessage());
+                if(expr.getResult() != Expression.ExpressionResult.VALID){
+                    logger.warn("Found invalid expression in condition '%s'! Reason: %s", str, expr.getResult().getMessage());
                     continue;
                 }
                 
-                this.expressions.add(expression);
+                this.expressions.add(expr);
             }
             
             return this;
         }
-    
-        private Builder resolveMOTDs(){
-            List<String> list = getList("motds");
-            if(!list.isEmpty()){
-                for(String lines : list){
-                    Motd motd = Motd.resolve(lines);
-                    if(motd == null)
-                        continue;
-                    
-                    this.motds.add(motd);
-                }
-                return this;
-            }
-            
-            list = getList("motd");
-            if(list.isEmpty())
-                return this;
-            
-            Motd motd = Motd.resolve(list);
-            if(motd == null)
-                return this;
-            
-            this.motds.add(motd);
-            return this;
-        }
-    
-        private Builder resolvePlayers(){
-            this.players = getList("playerCount", "hover");
-            return this;
-        }
-    
-        private Builder resolvePlayerCount(){
-            this.playerCount = node.node("playerCount", "text").getString("");
-            return this;
-        }
-    
-        private Builder resolveFavicon(){
-            this.favicon = node.node("favicon").getString("");
-            return this;
-        }
-    
-        private Builder resolveHidePlayers(){
-            this.hidePlayers = node.node("playerCount", "hidePlayers").getBoolean();
-            return this;
-        }
-    
-        private Builder resolveExtraPlayers(){
-            this.extraPlayersEnabled = node.node("playerCount", "extraPlayers", "enabled").getBoolean();
-            return this;
-        }
-    
-        private Builder resolveExtraPlayersCount(){
-            this.extraPlayers = node.node("playerCount", "extraPlayers", "amount").getInt();
-            return this;
-        }
-    
-        public ServerListProfile build(){
-            return new ServerListProfile(this.priority, this.expressions, this.motds, this.players, this.playerCount,
-                this.favicon, this.hidePlayers, this.extraPlayersEnabled, this.extraPlayers);
-        }
         
-        private List<String> getList(Object... path){
-            List<String> temp;
+        private Builder resolveProfiles(){
             try{
-                temp = node.node(path).getList(String.class);
+                this.profiles = node.node("profiles").getList(ProfileEntry.class);
             }catch(SerializationException ex){
-                temp = null;
+                logger.warn("Encountered a SerializationException while resolving the profiles entry for %s", ex, fileName);
             }
             
-            if(temp == null)
-                return Collections.emptyList();
-            
-            return temp;
-        }
-    }
-    
-    public static class Motd{
-        String text;
-        
-        private Motd(String[] lines){
-            text = resolveLines(lines);
+            return this;
         }
         
-        public static Motd resolve(String text){
-            String[] split = text.split("\n");
-            if(split.length == 0)
-                return null;
-            
-            return new Motd(split);
+        private Builder resolveDefaultProfile(){
+            try{
+                this.defaultProfile = node.get(ProfileEntry.class);
+            }catch(SerializationException ex){
+                logger.warn("Encountered a SerializationException while resolving the global profile for %s", ex, fileName);
+            }
+            return this;
         }
         
-        public static Motd resolve(List<String> lines){
-            if(lines.size() == 0)
-                return null;
-            
-            return new Motd(lines.toArray(new String[0]));
-        }
-    
-        public String getText(){
-            return text;
-        }
-    
-        private String resolveLines(String[] lines){
-            if(lines.length > 2)
-                return String.join("\n", lines[0], lines[1]);
-            
-            return String.join("\n", lines);
+        public ServerListProfile build(){
+            return new ServerListProfile(this.priority, this.expressions, this.profiles, this.defaultProfile);
         }
     }
 }

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.profiles.replacer.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

@@ -0,0 +1,194 @@
+/*
+ * 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.
+ *
+ */
+
+package ch.andre601.advancedserverlist.core.profiles.profile;
+
+import ch.andre601.advancedserverlist.core.objects.NullBool;
+import org.spongepowered.configurate.ConfigurationNode;
+import org.spongepowered.configurate.serialize.SerializationException;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class ProfileEntry{
+    
+    private final List<String> motd;
+    private final List<String> players;
+    private final String playerCountText;
+    private final String favicon;
+    private final NullBool hidePlayersEnabled;
+    private final NullBool extraPlayersEnabled;
+    private final Integer extraPlayersCount;
+    
+    public ProfileEntry(List<String> motd, List<String> players,
+                        String playerCountText, String favicon, NullBool hidePlayersEnabled,
+                        NullBool extraPlayersEnabled, Integer extraPlayersCount){
+        this.motd = motd;
+        this.players = players;
+        this.playerCountText = playerCountText;
+        this.favicon = favicon;
+        this.hidePlayersEnabled = hidePlayersEnabled;
+        this.extraPlayersEnabled = extraPlayersEnabled;
+        this.extraPlayersCount = extraPlayersCount;
+    }
+    
+    public static ProfileEntry empty(){
+        return new ProfileEntry(Collections.emptyList(), Collections.emptyList(), "", "",
+            NullBool.FALSE, NullBool.FALSE, 0);
+    }
+    
+    public List<String> getMOTD(){
+        return motd;
+    }
+    
+    public List<String> getPlayers(){
+        return players;
+    }
+    
+    public String getPlayerCountText(){
+        return playerCountText;
+    }
+    
+    public String getFavicon(){
+        return favicon;
+    }
+    
+    public NullBool isHidePlayersEnabled(){
+        return hidePlayersEnabled;
+    }
+    
+    public NullBool isExtraPlayersEnabled(){
+        return extraPlayersEnabled;
+    }
+    
+    public Integer getExtraPlayersCount(){
+        return extraPlayersCount;
+    }
+    
+    public boolean isInvalidProfile(){
+        return getMOTD().isEmpty() &&
+            getPlayers().isEmpty() &&
+            (getPlayerCountText().isEmpty() && !isHidePlayersEnabled().getValue(false)) &&
+            getFavicon().isEmpty();
+    }
+    
+    public static class Builder{
+    
+        private final ConfigurationNode node;
+        
+        private List<String> motd = new ArrayList<>();
+        private List<String> players = new ArrayList<>();
+        private String playerCountText = null;
+        private String favicon = null;
+        private NullBool hidePlayersEnabled = NullBool.FALSE;
+        private NullBool extraPlayersEnabled = NullBool.FALSE;
+        private Integer extraPlayersCount = 0;
+    
+        private Builder(ConfigurationNode node){
+            this.node = node;
+        }
+    
+        public static Builder resolve(ConfigurationNode node){
+            return new Builder(node)
+                .resolveMOTD()
+                .resolvePlayers()
+                .resolvePlayerCountText()
+                .resolveFavicon()
+                .resolveHidePlayersEnabled()
+                .resolveExtraPlayersEnabled()
+                .resolveExtraPlayersCount();
+        }
+        
+        public Builder resolveMOTD(){
+            List<String> motd = resolveList(node, "motd");
+            if(motd.size() <= 2){
+                this.motd = motd;
+                return this;
+            }
+        
+            this.motd = motd.subList(0, 2);
+            return this;
+        }
+        
+        public Builder resolvePlayers(){
+            this.players = this.resolveList(node, "playerCount", "hover");
+            return this;
+        }
+        
+        public Builder resolvePlayerCountText(){
+            this.playerCountText = node.node("playerCount", "text").getString("");
+            return this;
+        }
+        
+        public Builder resolveFavicon(){
+            this.favicon = node.node("favicon").getString("");
+            return this;
+        }
+        
+        public Builder resolveHidePlayersEnabled(){
+            if(node.node("playerCount", "hidePlayers").virtual()){
+                this.hidePlayersEnabled = NullBool.NULL;
+                return this;
+            }
+    
+            this.hidePlayersEnabled = new NullBool(node.node("playerCount", "hidePlayers").getBoolean());
+            return this;
+        }
+        
+        public Builder resolveExtraPlayersEnabled(){
+            if(node.node("playerCount", "extraPlayers", "enabled").virtual()){
+                this.extraPlayersEnabled = NullBool.NULL;
+                return this;
+            }
+            
+            this.extraPlayersEnabled = new NullBool(node.node("playerCount", "extraPlayers", "enabled").getBoolean());
+            return this;
+        }
+        
+        public Builder resolveExtraPlayersCount(){
+            if(node.node("playerCount", "extraPlayers", "amount").virtual()){
+                this.extraPlayersCount = null;
+                return this;
+            }
+            
+            this.extraPlayersCount = node.node("playerCount", "extraPlayers", "amount").getInt();
+            return this;
+        }
+        
+        public ProfileEntry build(){
+            return new ProfileEntry(this.motd, this.players, this.playerCountText,
+                this.favicon, this.hidePlayersEnabled, this.extraPlayersEnabled, this.extraPlayersCount);
+        }
+    
+        private List<String> resolveList(ConfigurationNode node, Object... path){
+            try{
+                return node.node(path).getList(String.class);
+            }catch(SerializationException ex){
+                return Collections.emptyList();
+            }
+        }
+    }
+}

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

@@ -0,0 +1,137 @@
+/*
+ * 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.
+ *
+ */
+
+package ch.andre601.advancedserverlist.core.profiles.profile;
+
+import ch.andre601.advancedserverlist.core.AdvancedServerList;
+import ch.andre601.advancedserverlist.core.objects.NullBool;
+import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
+import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.Placeholders;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ProfileManager{
+    
+    private final AdvancedServerList core;
+    
+    private final Map<String, Object> replacements = new HashMap<>();
+    
+    private ProfileManager(AdvancedServerList core){
+        this.core = core;
+    }
+    
+    public static ProfileManager get(AdvancedServerList core){
+        return new ProfileManager(core);
+    }
+    
+    public ProfileManager replacements(Placeholders placeholders){
+        this.replacements.putAll(placeholders.getReplacements());
+        return this;
+    }
+    
+    public ServerListProfile getProfile(){
+        for(ServerListProfile profile : core.getFileHandler().getProfiles()){
+            if(profile.isInvalidProfile())
+                continue;
+            
+            if(profile.evaluateConditions(replacements))
+                return profile;
+        }
+        
+        return null;
+    }
+    
+    /*
+     * Convenience method to get a ProfileEntry instance with values merged.
+     * If the random profile's value is not null will it be used instead of the default one.
+     */
+    public static ProfileEntry merge(ServerListProfile profile){
+        ProfileEntry entry = profile.getRandomProfile();
+        ProfileEntry defEntry = profile.getDefaultProfile();
+        
+        List<String> motd = resolveMOTD(entry, defEntry);
+        List<String> players = resolvePlayers(entry, defEntry);
+        String playerCountText = resolvePlayerCountText(entry, defEntry);
+        String favicon = resolveFavicon(entry, defEntry);
+        boolean isHidePlayersEnabled = resolveHidePlayersEnabled(entry, defEntry);
+        boolean isExtraPlayersEnabled = resolveExtraPlayersEnabled(entry, defEntry);
+        Integer extraPlayersCount = resolveExtraPlayersCount(entry, defEntry);
+        
+        return new ProfileEntry(motd, players, playerCountText, favicon, 
+            new NullBool(isHidePlayersEnabled), new NullBool(isExtraPlayersEnabled), extraPlayersCount);
+    }
+    
+    private static List<String> resolveMOTD(ProfileEntry profile, ProfileEntry defaultProfile){
+        if(profile == null || profile.getMOTD().isEmpty())
+            return defaultProfile.getMOTD();
+        
+        return profile.getMOTD();
+    }
+    
+    private static List<String> resolvePlayers(ProfileEntry profile, ProfileEntry defaultProfile){
+        if(profile == null || profile.getPlayers().isEmpty())
+            return defaultProfile.getPlayers();
+        
+        return profile.getPlayers();
+    }
+    
+    private static String resolvePlayerCountText(ProfileEntry profile, ProfileEntry defaultProfile){
+        if(profile == null || profile.getPlayerCountText().isEmpty())
+            return defaultProfile.getPlayerCountText();
+        
+        return profile.getPlayerCountText();
+    }
+    
+    private static String resolveFavicon(ProfileEntry profile, ProfileEntry defaultProfile){
+        if(profile == null || profile.getFavicon().isEmpty())
+            return defaultProfile.getFavicon();
+        
+        return profile.getFavicon();
+    }
+    
+    private static boolean resolveHidePlayersEnabled(ProfileEntry profile, ProfileEntry defaultProfile){
+        if(profile == null || profile.isHidePlayersEnabled().isNull())
+            return defaultProfile.isHidePlayersEnabled().getValue(false);
+        
+        return profile.isHidePlayersEnabled().getValue(false);
+    }
+    
+    private static boolean resolveExtraPlayersEnabled(ProfileEntry profile, ProfileEntry defaultProfile){
+        if(profile == null || profile.isExtraPlayersEnabled().isNull())
+            return defaultProfile.isExtraPlayersEnabled().getValue(false);
+        
+        return profile.isExtraPlayersEnabled().getValue(false);
+    }
+    
+    private static Integer resolveExtraPlayersCount(ProfileEntry profile, ProfileEntry defaultProfile){
+        if(profile == null || profile.getExtraPlayersCount() == null)
+            return defaultProfile.getExtraPlayersCount() == null ? 0 : defaultProfile.getExtraPlayersCount();
+        
+        return profile.getExtraPlayersCount();
+    }
+    
+}

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

@@ -0,0 +1,58 @@
+/*
+ * 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.
+ *
+ */
+
+package ch.andre601.advancedserverlist.core.profiles.profile;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.spongepowered.configurate.ConfigurationNode;
+import org.spongepowered.configurate.serialize.SerializationException;
+import org.spongepowered.configurate.serialize.TypeSerializer;
+
+import java.lang.reflect.Type;
+
+public class ProfileSerializer implements TypeSerializer<ProfileEntry>{
+    public static final ProfileSerializer INSTANCE = new ProfileSerializer();
+    
+    @Override
+    public ProfileEntry deserialize(Type type, ConfigurationNode node){
+        return ProfileEntry.Builder.resolve(node).build();
+    }
+    
+    @Override
+    public void serialize(Type type, @Nullable ProfileEntry profile, ConfigurationNode node) throws SerializationException{
+        if(profile == null){
+            node.raw(null);
+            return;
+        }
+        
+        node.node("motd").set(profile.getMOTD());
+        node.node("playerCount", "hover").set(profile.getPlayers());
+        node.node("playerCount", "text").set(profile.getPlayerCountText());
+        node.node("favicon").set(profile.getFavicon());
+        node.node("playerCount", "hidePlayers").set(profile.isHidePlayersEnabled());
+        node.node("playerCount", "extraPlayers", "enabled").set(profile.isExtraPlayersEnabled());
+        node.node("playerCount", "extraPlayers", "amount").set(profile.getExtraPlayersCount());
+    }
+}

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

@@ -1,14 +1,26 @@
 #
 # Used for when AdvancedServerList doesn't have a cached player to use for ${player name}
 #
+# Defaults to 'Anonymous' when not present.
+#
 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?
 #
 # When set to true will AdvancedServerList not load any players from the cache.data file (if present) nor save any to it.
 # Placeholders that rely on the player being cached (such as ${player isWhitelisted}) will not work while this option is enabled.
 #
+# Defaults to false when not present.
+#
 disable_cache: false
 
 #
@@ -17,4 +29,6 @@ disable_cache: false
 # When set to true will AdvancedServerList check for a new version on modrinth.com every 12 hours and inform you in the
 # console about whether it found any new update or not.
 #
+# Defaults to false when not present.
+#
 check_updates: true

core/src/main/resources/profiles/default.yml

@@ -16,25 +16,54 @@ priority: 0
 #  - '{playerVersion} < 759'
 
 #
-# Set the MOTDs that should be displayed.
+# Option that allows you to define multiple profiles to use.
+# Each entry supports the same options as the server list profile does. Whenever an option is not present, or set to
+# an empty value (If supported) would the option in the file be used (if present).
+# This allows you to f.e. randomize the MOTD while keeping other options the same, without copy-pasting the same options.
+#
+# A profile will be selected randomly.
+#
+# Remove this option or set it to profiles: [] to use the global options of this file.
+#
+# Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#profiles
+#
+#profiles:
+#  - motd:
+#      - '<aqua>Line 1'
+#      - '<aqua>Line 2'
+#    favicon: ''
+#    playerCount:
+#      hidePlayers: false
+#      hover:
+#        - '<green>Line 1'
+#        - '<green>Line 2'
+#        - '<green>Line 3'
+#      text: ''
+#      extraPlayers:
+#        enabled: false
+#        amount: 0
+
+#
+# Set the default (Global) MOTD used by this server list profile.
 # Supports HEX colors for 1.16+ servers including gradients using MiniMessage's <gradient:color:color> format.
 # 
-# Remove this option or set it to motds: [] to not alter the MOTD.
+# Remove this option or set it to motd: [] to not alter the MOTD.
 #
 # Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#motds
 #
-motds:
-  - |-
-    <grey>Line 1
-    <grey>Line 2
+motd:
+  - '<grey>Line 1'
+  - '<grey>Line 2'
 
 #
-# Allows you to set a favicon for this server list profile.
+# Allows you to set a global (Default) favicon for this server list profile.
 # You can use one of three possible options:
 #   1. A file name matching a PNG file located in the 'favicons' folder (Needs to end with .png)
 #   2. A URL pointing to a valid Image
 #   3. ${player name} to display the player's head as favicon. Uses https://mc-heads.net for this
 #
+# Remove this option or set to favicon: '' to not replace the Favicon.
+#
 # Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#favicon
 #
 favicon: ''
@@ -51,12 +80,15 @@ playerCount:
   #
   # Note that when this is enabled will all other options, except for 'extraPlayers', be ignored.
   #
+  # Defaults to false when not present.
+  #
   # Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#hideplayers
   #
   hidePlayers: false
   #
   # Sets the text displayed when hovering over the player count.
-  # You can set this to 'hover: []' or remove the option to not modify the hover text.
+  #
+  # Remove this option or set it to hover: [] to not modify the player samples on the player count.
   #
   # Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#hover
   #
@@ -70,7 +102,7 @@ playerCount:
   # Note that when used, the Ping icon will display as 'outdated server'/'outdated client'.
   # This is nothing that can be fixed or avoided and would require changes from Mojang.
   #
-  # You can set this to 'count: ''' or remove the option to not modify the player count text.
+  # Remove this option or set it to text: '' to not modify the player count text.
   #
   # Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#text
   #

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

@@ -0,0 +1,292 @@
+/*
+ * 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.
+ *
+ */
+
+package ch.andre601.advancedserverlist.test;
+
+import com.unascribed.flexver.FlexVerComparator;
+import org.junit.Test;
+
+public class FlexVerTests{
+    
+    private final String baseVersion = "1.0.0";
+    private final String versionMinor = "1.0.1";
+    private final String versionMajor = "1.1.0";
+    private final String versionBoth = "1.1.1";
+    
+    private final String versionBeta = "1.0.0-b1";
+    private final String versionBetaMinor = "1.0.1-b1";
+    private final String versionBetaMajor = "1.1.0-b1";
+    private final String versionBetaBoth = "1.1.1-b1";
+    
+    private final String versionBeta2 = "1.0.0-b2";
+    private final String versionBeta2Minor = "1.0.1-b2";
+    private final String versionBeta2Major = "1.1.0-b2";
+    private final String versionBeta2Both = "1.1.1-b2";
+    
+    @Test
+    public void testFlexVerChecks(){
+        System.out.println("START: Version comparison Tests");
+        
+        compareBaseVersion();
+        compareMinorVersion();
+        compareMajorVersion();
+        compareBothVersion();
+        
+        compareBetaVersion();
+        compareBetaMinorVersion();
+        compareBetaMajorVersion();
+        compareBetaBothVersion();
+        
+        compareBeta2Version();
+        compareBeta2MinorVersion();
+        compareBeta2MajorVersion();
+        compareBeta2BothVersion();
+        
+        System.out.println("END: Version comparison Tests");
+    }
+    
+    private void compareBaseVersion(){
+        System.out.println("┌────────────────────────────────┐");
+        System.out.println("│ Normal Version                 │");
+        System.out.println("│                                │");
+        compare(baseVersion, "=", baseVersion, 0);
+        compare(baseVersion, "<", versionMinor, -1);
+        compare(baseVersion, "<", versionMajor, -1);
+        compare(baseVersion, "<", versionBoth, -1);
+        compare(baseVersion, ">", versionBeta, 1);
+        compare(baseVersion, "<", versionBetaMinor, -1);
+        compare(baseVersion, "<", versionBetaMajor, -1);
+        compare(baseVersion, "<", versionBetaBoth, -1);
+        compare(baseVersion, ">", versionBeta2, 1);
+        compare(baseVersion, "<", versionBeta2Minor, -1);
+        compare(baseVersion, "<", versionBeta2Major, -1);
+        compare(baseVersion, "<", versionBeta2Both, -1);
+        System.out.println("├────────────────────────────────┤");
+    }
+    
+    private void compareMinorVersion(){
+        System.out.println("│ Minor Version                  │");
+        System.out.println("│                                │");
+        compare(versionMinor, ">", baseVersion, 1);
+        compare(versionMinor, "=", versionMinor, 0);
+        compare(versionMinor, "<", versionMajor, -1);
+        compare(versionMinor, "<", versionBoth, -1);
+        compare(versionMinor, ">", versionBeta, 1);
+        compare(versionMinor, ">", versionBetaMinor, 1);
+        compare(versionMinor, "<", versionBetaMajor, -1);
+        compare(versionMinor, "<", versionBetaBoth, -1);
+        compare(versionMinor, ">", versionBeta2, 1);
+        compare(versionMinor, ">", versionBeta2Minor, 1);
+        compare(versionMinor, "<", versionBeta2Major, -1);
+        compare(versionMinor, "<", versionBeta2Both, -1);
+        System.out.println("├────────────────────────────────┤");
+    }
+    
+    private void compareMajorVersion(){
+        System.out.println("│ Major Version                  │");
+        System.out.println("│                                │");
+        compare(versionMajor, ">", baseVersion, 1);
+        compare(versionMajor, ">", versionMinor, 1);
+        compare(versionMajor, "=", versionMajor, 0);
+        compare(versionMajor, "<", versionBoth, -1);
+        compare(versionMajor, ">", versionBeta, 1);
+        compare(versionMajor, ">", versionBetaMinor, 1);
+        compare(versionMajor, ">", versionBetaMajor, 1);
+        compare(versionMajor, "<", versionBetaBoth, -1);
+        compare(versionMajor, ">", versionBeta2, 1);
+        compare(versionMajor, ">", versionBeta2Minor, 1);
+        compare(versionMajor, ">", versionBeta2Major, 1);
+        compare(versionMajor, "<", versionBeta2Both, -1);
+        System.out.println("├────────────────────────────────┤");
+    }
+    
+    private void compareBothVersion(){
+        System.out.println("│ Major + Minor Version          │");
+        System.out.println("│                                │");
+        compare(versionBoth, ">", baseVersion, 1);
+        compare(versionBoth, ">", versionMinor, 1);
+        compare(versionBoth, ">", versionMajor, 1);
+        compare(versionBoth, "=", versionBoth, 0);
+        compare(versionBoth, ">", versionBeta, 1);
+        compare(versionBoth, ">", versionBetaMinor, 1);
+        compare(versionBoth, ">", versionBetaMajor, 1);
+        compare(versionBoth, ">", versionBetaBoth, 1);
+        compare(versionBoth, ">", versionBeta2, 1);
+        compare(versionBoth, ">", versionBeta2Minor, 1);
+        compare(versionBoth, ">", versionBeta2Major, 1);
+        compare(versionBoth, ">", versionBeta2Both, 1);
+        System.out.println("├────────────────────────────────┤");
+    }
+    
+    private void compareBetaVersion(){
+        System.out.println("│ Beta Version                   │");
+        System.out.println("│                                │");
+        compare(versionBeta, "<", baseVersion, -1);
+        compare(versionBeta, "<", versionMinor, -1);
+        compare(versionBeta, "<", versionMajor, -1);
+        compare(versionBeta, "<", versionBoth, -1);
+        compare(versionBeta, "=", versionBeta, 0);
+        compare(versionBeta, "<", versionBetaMinor, -1);
+        compare(versionBeta, "<", versionBetaMajor, -1);
+        compare(versionBeta, "<", versionBetaBoth, -1);
+        compare(versionBeta, "<", versionBeta2, -1);
+        compare(versionBeta, "<", versionBeta2Minor, -1);
+        compare(versionBeta, "<", versionBeta2Major, -1);
+        compare(versionBeta, "<", versionBeta2Both, -1);
+        System.out.println("├────────────────────────────────┤");
+    }
+    
+    private void compareBetaMinorVersion(){
+        System.out.println("│ Beta Version Minor             │");
+        System.out.println("│                                │");
+        compare(versionBetaMinor, ">", baseVersion, 1);
+        compare(versionBetaMinor, "<", versionMinor, -1);
+        compare(versionBetaMinor, "<", versionMajor, -1);
+        compare(versionBetaMinor, "<", versionBoth, -1);
+        compare(versionBetaMinor, ">", versionBeta, 1);
+        compare(versionBetaMinor, "=", versionBetaMinor, 0);
+        compare(versionBetaMinor, "<", versionBetaMajor, -1);
+        compare(versionBetaMinor, "<", versionBetaBoth, -1);
+        compare(versionBetaMinor, ">", versionBeta2, 1);
+        compare(versionBetaMinor, "<", versionBeta2Minor, -1);
+        compare(versionBetaMinor, "<", versionBeta2Major, -1);
+        compare(versionBetaMinor, "<", versionBeta2Both, -1);
+        System.out.println("├────────────────────────────────┤");
+    }
+    
+    private void compareBetaMajorVersion(){
+        System.out.println("│ Beta Version Major             │");
+        System.out.println("│                                │");
+        compare(versionBetaMajor, ">", baseVersion, 1);
+        compare(versionBetaMajor, ">", versionMinor, 1);
+        compare(versionBetaMajor, "<", versionMajor, -1);
+        compare(versionBetaMajor, "<", versionBoth, -1);
+        compare(versionBetaMajor, ">", versionBeta, 1);
+        compare(versionBetaMajor, ">", versionBetaMinor, 1);
+        compare(versionBetaMajor, "=", versionBetaMajor, 0);
+        compare(versionBetaMajor, "<", versionBetaBoth, -1);
+        compare(versionBetaMajor, ">", versionBeta2, 1);
+        compare(versionBetaMajor, ">", versionBeta2Minor, 1);
+        compare(versionBetaMajor, "<", versionBeta2Major, -1);
+        compare(versionBetaMajor, "<", versionBeta2Both, -1);
+        System.out.println("├────────────────────────────────┤");
+    }
+    
+    private void compareBetaBothVersion(){
+        System.out.println("│ Beta Version Major + Minor     │");
+        System.out.println("│                                │");
+        compare(versionBetaBoth, ">", baseVersion, 1);
+        compare(versionBetaBoth, ">", versionMinor, 1);
+        compare(versionBetaBoth, ">", versionMajor, 1);
+        compare(versionBetaBoth, "<", versionBoth, -1);
+        compare(versionBetaBoth, ">", versionBeta, 1);
+        compare(versionBetaBoth, ">", versionBetaMinor, 1);
+        compare(versionBetaBoth, ">", versionBetaMajor, 1);
+        compare(versionBetaBoth, "=", versionBetaBoth, 0);
+        compare(versionBetaBoth, ">", versionBeta2, 1);
+        compare(versionBetaBoth, ">", versionBeta2Minor, 1);
+        compare(versionBetaBoth, ">", versionBeta2Major, 1);
+        compare(versionBetaBoth, "<", versionBeta2Both, -1);
+        System.out.println("├────────────────────────────────┤");
+    }
+    
+    private void compareBeta2Version(){
+        System.out.println("│ Beta Version 2                 │");
+        System.out.println("│                                │");
+        compare(versionBeta2, "<", baseVersion, -1);
+        compare(versionBeta2, "<", versionMinor, -1);
+        compare(versionBeta2, "<", versionMajor, -1);
+        compare(versionBeta2, "<", versionBoth, -1);
+        compare(versionBeta2, ">", versionBeta, 1);
+        compare(versionBeta2, "<", versionBetaMinor, -1);
+        compare(versionBeta2, "<", versionBetaMajor, -1);
+        compare(versionBeta2, "<", versionBetaBoth, -1);
+        compare(versionBeta2, "=", versionBeta2, 0);
+        compare(versionBeta2, "<", versionBeta2Minor, -1);
+        compare(versionBeta2, "<", versionBeta2Major, -1);
+        compare(versionBeta2, "<", versionBeta2Both, -1);
+        System.out.println("├────────────────────────────────┤");
+    }
+    
+    private void compareBeta2MinorVersion(){
+        System.out.println("│ Beta Version 2 Minor           │");
+        System.out.println("│                                │");
+        compare(versionBeta2Minor, ">", baseVersion, 1);
+        compare(versionBeta2Minor, "<", versionMinor, -1);
+        compare(versionBeta2Minor, "<", versionMajor, -1);
+        compare(versionBeta2Minor, "<", versionBoth, -1);
+        compare(versionBeta2Minor, ">", versionBeta, 1);
+        compare(versionBeta2Minor, ">", versionBetaMinor, 1);
+        compare(versionBeta2Minor, "<", versionBetaMajor, -1);
+        compare(versionBeta2Minor, "<", versionBetaBoth, -1);
+        compare(versionBeta2Minor, ">", versionBeta2, 1);
+        compare(versionBeta2Minor, "=", versionBeta2Minor, 0);
+        compare(versionBeta2Minor, "<", versionBeta2Major, -1);
+        compare(versionBeta2Minor, "<", versionBeta2Both, -1);
+        System.out.println("├────────────────────────────────┤");
+    }
+    
+    private void compareBeta2MajorVersion(){
+        System.out.println("│ Beta Version 2 Major           │");
+        System.out.println("│                                │");
+        compare(versionBeta2Major, ">", baseVersion, 1);
+        compare(versionBeta2Major, ">", versionMinor, 1);
+        compare(versionBeta2Major, "<", versionMajor, -1);
+        compare(versionBeta2Major, "<", versionBoth, -1);
+        compare(versionBeta2Major, ">", versionBeta, 1);
+        compare(versionBeta2Major, ">", versionBetaMinor, 1);
+        compare(versionBeta2Major, ">", versionBetaMajor, 1);
+        compare(versionBeta2Major, "<", versionBetaBoth, -1);
+        compare(versionBeta2Major, ">", versionBeta2, 1);
+        compare(versionBeta2Major, ">", versionBeta2Minor, 1);
+        compare(versionBeta2Major, "=", versionBeta2Major, 0);
+        compare(versionBeta2Major, "<", versionBeta2Both, -1);
+        System.out.println("├────────────────────────────────┤");
+    }
+    
+    private void compareBeta2BothVersion(){
+        System.out.println("│ Beta Version 2 Major + Minor   │");
+        System.out.println("│                                │");
+        compare(versionBeta2Both, ">", baseVersion, 1);
+        compare(versionBeta2Both, ">", versionMinor, 1);
+        compare(versionBeta2Both, ">", versionMajor, 1);
+        compare(versionBeta2Both, "<", versionBoth, -1);
+        compare(versionBeta2Both, ">", versionBeta, 1);
+        compare(versionBeta2Both, ">", versionBetaMinor, 1);
+        compare(versionBeta2Both, ">", versionBetaMajor, 1);
+        compare(versionBeta2Both, ">", versionBetaBoth, 1);
+        compare(versionBeta2Both, ">", versionBeta2, 1);
+        compare(versionBeta2Both, ">", versionBeta2Minor, 1);
+        compare(versionBeta2Both, ">", versionBeta2Major, 1);
+        compare(versionBeta2Both, "=", versionBeta2Both, 0);
+        System.out.println("└────────────────────────────────┘");
+    }
+    
+    private void compare(String version1, String comparator, String version2, int expected){
+        String expression = version1 + " " + comparator + " " + version2 + "?";
+        
+        System.out.printf("│ %-24s %5b │\n", expression, FlexVerComparator.compare(version1, version2) == expected);
+    }
+}

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
@@ -67,18 +67,7 @@ public class PaperCore extends JavaPlugin implements ServerCore<CachedServerIcon
                 Class.forName("com.destroystokyo.paper.PaperConfig");
                 enable();
             }catch(ClassNotFoundException ex1){
-                getPluginLogger().warn("======================================== WARNING ========================================");
-                getPluginLogger().warn("");
-                getPluginLogger().warn("You are using the PaperMC version of AdvancedServerList on a SpigotMC server.");
-                getPluginLogger().warn("The PaperMC version is ONLY compatible with PaperMC itself due to it using exclusive");
-                getPluginLogger().warn("methods and events not available within SpigotMC.");
-                getPluginLogger().warn("");
-                getPluginLogger().warn("To avoid any exceptions and errors will AdvancedServerList disable itself now.");
-                getPluginLogger().warn("Please stop your server and either switch to PaperMC or use the Spigot version");
-                getPluginLogger().warn("of AdvancedServerList.");
-                getPluginLogger().warn("");
-                getPluginLogger().warn("======================================== WARNING ========================================");
-                
+                printSpigotWarning();
                 getServer().getPluginManager().disablePlugin(this);
             }
         }
@@ -186,4 +175,21 @@ public class PaperCore extends JavaPlugin implements ServerCore<CachedServerIcon
     private void enable(){
         this.core = new AdvancedServerList(this);
     }
+    
+    private void printSpigotWarning(){
+        getPluginLogger().warn("======================================== WARNING ========================================");
+        getPluginLogger().warn("");
+        getPluginLogger().warn("You are using the Paper version of AdvancedServerList on a SpigotMC server.");
+        getPluginLogger().warn("The Paper version is ONLY compatible with Paper itself due to it using exclusive");
+        getPluginLogger().warn("methods and events not available within SpigotMC.");
+        getPluginLogger().warn("");
+        getPluginLogger().warn("To avoid any exceptions and errors will AdvancedServerList disable itself now.");
+        getPluginLogger().warn("Please stop your server and either switch to Paper or use the Spigot version");
+        getPluginLogger().warn("of AdvancedServerList.");
+        getPluginLogger().warn("");
+        getPluginLogger().warn("Paper can be downloaded here:");
+        getPluginLogger().warn("https://papermc.io/downloads");
+        getPluginLogger().warn("");
+        getPluginLogger().warn("======================================== WARNING ========================================");
+    }
 }

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
@@ -52,4 +52,9 @@ public class PaperLogger implements PluginLogger{
     public void warn(String msg, Throwable throwable){
         logger.log(Level.WARNING, msg, throwable);
     }
+    
+    @Override
+    public void warn(String msg, Throwable throwable, Object... args){
+        logger.log(Level.WARNING, String.format(msg, args), throwable);
+    }
 }

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.9.0</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>
@@ -21,10 +46,10 @@
 
     <modules>
         <module>core</module>
-        <module>velocity</module>
         <module>bungeecord</module>
         <module>paper</module>
         <module>spigot</module>
+        <module>velocity</module>
     </modules>
 
 </project>

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
@@ -52,4 +52,9 @@ public class SpigotLogger implements PluginLogger{
     public void warn(String msg, Throwable throwable){
         logger.log(Level.WARNING, msg, throwable);
     }
+    
+    @Override
+    public void warn(String msg, Throwable throwable, Object... args){
+        logger.log(Level.WARNING, String.format(msg, args), throwable);
+    }
 }

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
@@ -50,4 +50,9 @@ public class VelocityLogger implements PluginLogger{
     public void warn(String msg, Throwable throwable){
         logger.warn(msg, throwable);
     }
+    
+    @Override
+    public void warn(String msg, Throwable throwable, Object... args){
+        logger.warn(String.format(msg, args), throwable);
+    }
 }