Add better Version check (+ tests)

Implement system for multiple profiles in profiles

.github/workflows/prerelease.yml

@@ -0,0 +1,106 @@
+#
+# Big thank you to @Kir-Antipov for providing this workflow file.
+# Check out his mc-publish action here: https://github.com/Kir-Antipov/mc-publish
+#
+
+name: Publish Assets
+
+on:
+  release:
+    types:
+    - published
+    - prereleased
+
+jobs:
+  buildJars:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK 1.16
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: '16'
+        cache: 'maven'
+    - name: Build Jar files
+      run: mvn clean install
+    - name: Save BungeeCord Jar file
+      uses: actions/upload-artifact@v3
+      with:
+        name: asl-bungeecord
+        path: bungeecord/target/AdvancedServerList-*.jar
+        if-no-files-found: error
+        retention-days: 1
+    - name: Save Paper Jar file
+      uses: actions/upload-artifact@v3
+      with:
+        name: asl-paper
+        path: paper/target/AdvancedServerList-*.jar
+        if-no-files-found: error
+        retention-days: 1
+    - name: Save Spigot Jar file
+      uses: actions/upload-artifact@v3
+      with:
+        name: asl-spigot
+        path: spigot/target/AdvancedServerList-*.jar
+        if-no-files-found: error
+        retention-days: 1
+    - name: Save Velocity Jar file
+      uses: actions/upload-artifact@v3
+      with:
+        name: asl-velocity
+        path: velocity/target/AdvancedServerList-*.jar
+        if-no-files-found: error
+        retention-days: 1
+  publish:
+    needs: [buildJars]
+    strategy:
+      matrix:
+        include:
+          - platforms: BungeeCord, Waterfall
+            directory: bungeecord
+            loaders: |
+              bungeecord
+              waterfall
+          - platforms: Paper
+            directory: paper
+            loaders: paper
+          - platforms: Spigot
+            directory: spigot
+            loaders: spigot
+          - platforms: Velocity
+            directory: velocity
+            loaders: velocity
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Get Jar files
+      uses: actions/download-artifact@v3
+      with:
+        name: asl-${{ matrix.directory }}
+        path: ${{ matrix.directory }}/target
+    - name: Get Version
+      id: github-release
+      run: |
+        version=$(echo ${{ github.event.release.tag_name }} | cut -d'v' -f2)
+        echo "PLUGIN_RELEASE=$version" >> $GITHUB_OUTPUT
+    - name: Upload AdvancedServerList (${{ matrix.loaders }}) to GitHub and Modrinth
+      uses: Kir-Antipov/mc-publish@v3.2
+      with:
+        name: ${{ github.event.release.tag_name }} (${{ matrix.platforms }}) BETA
+        version: ${{ steps.github-release.outputs.PLUGIN_RELEASE }}
+        version-type: beta
+        files: ${{ matrix.directory}}/target/AdvancedServerList-*.jar
+        files-secondary: ""
+        loaders: ${{ matrix.loaders }}
+        version-resolver: releases
+        game-versions: |
+          1.19
+          1.19.1
+          1.19.2
+          1.19.3
+        java: 16
+        modrinth-id: xss83sOY
+        modrinth-featured: false
+        modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+        github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -7,7 +7,9 @@ name: Publish Assets
 
 on:
   release:
-    types: [published]
+    types:
+    - published
+    - released
 
 jobs:
   buildJars:
@@ -81,12 +83,12 @@ jobs:
       id: github-release
       run: |
         version=$(echo ${{ github.event.release.tag_name }} | cut -d'v' -f2)
-        echo "::set-output name=version::$version"
+        echo "PLUGIN_RELEASE=$version" >> $GITHUB_OUTPUT
     - name: Upload AdvancedServerList (${{ matrix.loaders }}) to GitHub and Modrinth
       uses: Kir-Antipov/mc-publish@v3.2
       with:
         name: ${{ github.event.release.tag_name }} (${{ matrix.platforms }})
-        version: ${{ steps.github-release.outputs.version }}
+        version: ${{ steps.github-release.outputs.PLUGIN_RELEASE }}
         version-type: release
         files: ${{ matrix.directory}}/target/AdvancedServerList-*.jar
         files-secondary: ""
@@ -96,6 +98,7 @@ jobs:
           1.19
           1.19.1
           1.19.2
+          1.19.3
         java: 16
         modrinth-id: xss83sOY
         modrinth-featured: false

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

@@ -0,0 +1,156 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 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.bungeecord.events;
+
+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.profiles.players.GenericPlayer;
+import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.PlayerPlaceholders;
+import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.ServerPlaceholders;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer;
+import net.md_5.bungee.api.Favicon;
+import net.md_5.bungee.api.ServerPing;
+import net.md_5.bungee.api.chat.TextComponent;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.event.ProxyPingEvent;
+
+import java.awt.image.BufferedImage;
+import java.net.InetSocketAddress;
+import java.util.List;
+
+public class BungeeEventWrapper implements GenericEventWrapper<ProxiedPlayer, Favicon>{
+    
+    private final BungeeCordCore plugin;
+    private final ProxyPingEvent event;
+    private final ServerPing.Protocol protocol;
+    private final ServerPing ping;
+    
+    public BungeeEventWrapper(BungeeCordCore plugin, ProxyPingEvent event){
+        this.plugin = plugin;
+        this.event = event;
+        this.protocol = event.getResponse().getVersion();
+        this.ping = event.getResponse();
+    }
+    
+    @Override
+    public void setMaxPlayers(int maxPlayers){
+        ping.getPlayers().setMax(maxPlayers);
+    }
+    
+    @Override
+    public void setMotd(Component component){
+        ping.setDescriptionComponent(new TextComponent(BungeeComponentSerializer.get().serialize(component)));
+    }
+    
+    @Override
+    public void hidePlayers(){
+        ping.setPlayers(null);
+    }
+    
+    @Override
+    public void setPlayerCount(String name){
+        protocol.setName(name);
+        protocol.setProtocol(-1);
+    }
+    
+    @Override
+    public void setPlayers(List<String> players, GenericPlayer<ProxiedPlayer> player, PlayerPlaceholders playerPlaceholders, ServerPlaceholders serverPlaceholders){
+        ServerPing.PlayerInfo[] playerInfos = plugin.createPlayers(players, playerPlaceholders, serverPlaceholders)
+            .toArray(new ServerPing.PlayerInfo[0]);
+        
+        if(playerInfos.length > 0)
+            ping.getPlayers().setSample(playerInfos);
+    }
+    
+    @Override
+    public void setFavicon(Favicon favicon){
+        ping.setFavicon(favicon);
+    }
+    
+    @Override
+    public void setDefaultFavicon(){
+        ping.setFavicon(ping.getFaviconObject());
+    }
+    
+    @Override
+    public void updateEvent(){
+        this.ping.setVersion(this.protocol);
+        this.event.setResponse(this.ping);
+    }
+    
+    @Override
+    public boolean isInvalidProtocol(){
+        return protocol == null;
+    }
+    
+    @Override
+    public int getProtocolVersion(){
+        return this.protocol.getProtocol();
+    }
+    
+    @Override
+    public int getOnlinePlayers(){
+        return ping.getPlayers().getOnline();
+    }
+    
+    @Override
+    public int getMaxPlayers(){
+        return ping.getPlayers().getMax();
+    }
+    
+    @Override
+    public String getPlayerIP(){
+        return ((InetSocketAddress)event.getConnection().getSocketAddress()).getHostString();
+    }
+    
+    @Override
+    public String parsePAPIPlaceholders(String text, GenericPlayer<ProxiedPlayer> player){
+        return text;
+    }
+    
+    @Override
+    public String getVirtualHost(){
+        return this.resolveHost(event.getConnection().getVirtualHost());
+    }
+    
+    @Override
+    public PluginCore<Favicon> getPlugin(){
+        return plugin;
+    }
+    
+    @Override
+    public GenericPlayer<ProxiedPlayer> createPlayer(String name, int protocol){
+        return new BungeePlayer(name, protocol);
+    }
+    
+    @Override
+    public Favicon createFavicon(BufferedImage image) throws IllegalArgumentException{
+        return Favicon.create(image);
+    }
+}

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

@@ -26,24 +26,12 @@
 package ch.andre601.advancedserverlist.bungeecord.events;
 
 import ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
-import ch.andre601.advancedserverlist.bungeecord.BungeePlayer;
-import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
-import ch.andre601.advancedserverlist.core.profiles.ProfileManager;
-import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
-import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
-import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.PlayerPlaceholders;
-import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.ServerPlaceholders;
-import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer;
-import net.md_5.bungee.api.Favicon;
-import net.md_5.bungee.api.ServerPing;
-import net.md_5.bungee.api.chat.TextComponent;
+import ch.andre601.advancedserverlist.core.events.PingEventHandler;
 import net.md_5.bungee.api.event.ProxyPingEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
 import net.md_5.bungee.event.EventPriority;
 
-import java.net.InetSocketAddress;
-
 public class PingEvent implements Listener{
     
     private final BungeeCordCore plugin;
@@ -55,91 +43,6 @@ public class PingEvent implements Listener{
     
     @EventHandler(priority = EventPriority.LOW)
     public void onProxyPing(ProxyPingEvent event){
-        ServerPing ping = event.getResponse();
-        ServerPing.Protocol protocol = ping.getVersion();
-        if(protocol == null)
-            return;
-    
-        String playerName = plugin.getCore().getPlayerHandler().getPlayerByIp(
-            ((InetSocketAddress)event.getConnection().getSocketAddress()).getHostString()
-        );
-        InetSocketAddress host = event.getConnection().getVirtualHost();
-        
-        int online = ping.getPlayers().getOnline();
-        int max = ping.getPlayers().getMax();
-    
-        PlayerPlaceholders playerPlaceholders = new PlayerPlaceholders(new BungeePlayer(playerName, protocol.getProtocol()));
-        ServerPlaceholders serverPlaceholders = new ServerPlaceholders(online, max, host == null ? null : host.getHostString());
-        
-        ServerListProfile profile = ProfileManager.get(plugin.getCore())
-            .replacements(playerPlaceholders)
-            .replacements(serverPlaceholders)
-            .getProfile();
-        
-        if(profile == null)
-            return;
-        
-        if(profile.isExtraPlayersEnabled()){
-            max = online + profile.getExtraPlayers();
-            ping.getPlayers().setMax(max);
-        }
-        
-        serverPlaceholders = new ServerPlaceholders(online, max, host == null ? null : host.getHostString());
-        
-        if(!profile.getMotd().isEmpty()){
-            TextComponent component = new TextComponent(BungeeComponentSerializer.get().serialize(
-                ComponentParser.list(profile.getMotd())
-                    .replacements(playerPlaceholders)
-                    .replacements(serverPlaceholders)
-                    .toComponent()
-            ));
-            
-            ping.setDescriptionComponent(component);
-        }
-        
-        if(profile.shouldHidePlayers()){
-            ping.setPlayers(null);
-        }
-        
-        if(!profile.getPlayerCount().isEmpty() && !profile.shouldHidePlayers()){
-            protocol.setName(ComponentParser.text(profile.getPlayerCount())
-                .replacements(playerPlaceholders)
-                .replacements(serverPlaceholders)
-                .toString()
-            );
-            protocol.setProtocol(-1);
-        }
-        
-        if(!profile.getPlayers().isEmpty() && !profile.shouldHidePlayers()){
-            ServerPing.PlayerInfo[] playerInfos = plugin.createPlayers(profile.getPlayers(), playerPlaceholders, serverPlaceholders)
-                .toArray(new ServerPing.PlayerInfo[0]);
-            
-            if(playerInfos.length > 0)
-                ping.getPlayers().setSample(playerInfos);
-        }
-        
-        if(!profile.getFavicon().isEmpty()){
-            String favName = StringReplacer.replace(profile.getFavicon(), playerPlaceholders.getReplacements());
-            
-            Favicon favicon = plugin.getFaviconHandler().getFavicon(favName, image -> {
-                try{
-                    return Favicon.create(image);
-                }catch(Exception ex){
-                    plugin.getPluginLogger().warn("Unable to create Favicon. %s", ex.getMessage());
-                    return null;
-                }
-            });
-            
-            if(favicon == null){
-                plugin.getPluginLogger().warn("Could not obtain valid Favicon to use.");
-                ping.setFavicon(ping.getFaviconObject());
-            }else{
-                ping.setFavicon(favicon);
-            }
-        }
-        
-        ping.setVersion(protocol);
-        
-        event.setResponse(ping);
+        PingEventHandler.handleEvent(new BungeeEventWrapper(plugin, event));
     }
 }

core/pom.xml

@@ -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.9.1</version>
+            <version>2.10</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/check/UpdateChecker.java

@@ -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);
@@ -144,6 +147,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,25 +164,37 @@ 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("==================================================================");
     }
     
     public static class ModrinthVersion{
+        @SuppressWarnings("FieldMayBeFinal")
         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(){
@@ -189,26 +205,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/events/PingEventHandler.java

@@ -0,0 +1,127 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 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.events;
+
+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.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;
+import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.PlayerPlaceholders;
+import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.ServerPlaceholders;
+
+public class PingEventHandler{
+    
+    public static <P, F> void handleEvent(GenericEventWrapper<P, F> event){
+        if(event.isInvalidProtocol())
+            return;
+        
+        PluginCore<F> plugin = event.getPlugin();
+    
+        GenericPlayer<P> player = event.createPlayer(
+            plugin.getCore().getPlayerHandler().getPlayerByIp(event.getPlayerIP()),
+            event.getProtocolVersion()
+        );
+        String host = event.getVirtualHost();
+        
+        int online = event.getOnlinePlayers();
+        int max = event.getMaxPlayers();
+    
+        PlayerPlaceholders playerPlaceholders = new PlayerPlaceholders(player);
+        ServerPlaceholders serverPlaceholders = new ServerPlaceholders(online, max, host);
+    
+        ServerListProfile profile = ProfileManager.get(plugin.getCore())
+            .replacements(playerPlaceholders)
+            .replacements(serverPlaceholders)
+            .getProfile();
+        
+        if(profile == null)
+            return;
+    
+        ProfileEntry entry = ProfileManager.merge(profile);
+        
+        if(entry.isExtraPlayersEnabled() != null && entry.isExtraPlayersEnabled()){
+            max = online + (entry.getExtraPlayersCount() == null ? 0 : entry.getExtraPlayersCount());
+            event.setMaxPlayers(max);
+        }
+        
+        serverPlaceholders = new ServerPlaceholders(online, max, host);
+        
+        if(!entry.getMOTD().isEmpty()){
+            event.setMotd(
+                ComponentParser.list(entry.getMOTD())
+                    .replacements(playerPlaceholders)
+                    .replacements(serverPlaceholders)
+                    .modifyText(text -> event.parsePAPIPlaceholders(text, player))
+                    .toComponent()
+            );
+        }
+        
+        boolean hidePlayers = entry.isHidePlayersEnabled() != null && entry.isHidePlayersEnabled();
+        
+        if(hidePlayers){
+            event.hidePlayers();
+        }
+        
+        if(!entry.getPlayerCountText().isEmpty() && !hidePlayers){
+            event.setPlayerCount(
+                ComponentParser.text(entry.getPlayerCountText())
+                    .replacements(playerPlaceholders)
+                    .replacements(serverPlaceholders)
+                    .modifyText(text -> event.parsePAPIPlaceholders(text, player))
+                    .toString()
+            );
+        }
+        
+        if(!entry.getPlayers().isEmpty() && !hidePlayers){
+            event.setPlayers(entry.getPlayers(), player, playerPlaceholders, serverPlaceholders);
+        }
+        
+        if(!entry.getFavicon().isEmpty()){
+            String favicon = StringReplacer.replace(entry.getFavicon(), playerPlaceholders.getReplacements());
+            
+            F fav = plugin.getFaviconHandler().getFavicon(favicon, image -> {
+                try{
+                    return event.createFavicon(image);
+                }catch(Exception ex){
+                    plugin.getPluginLogger().warn("Encountered an Exception while creating Favicon!", ex);
+                    return null;
+                }
+            });
+            
+            if(fav == null){
+                event.setDefaultFavicon();
+            }else{
+                event.setFavicon(fav);
+            }
+        }
+        
+        event.updateEvent();
+    }
+}

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

@@ -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(new ServerListProfile(tmp, logger));
+            profiles.add(ServerListProfile.Builder.resolve(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/events/GenericEventWrapper.java

@@ -0,0 +1,79 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 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.interfaces.events;
+
+import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
+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;
+import net.kyori.adventure.text.Component;
+
+import java.awt.image.BufferedImage;
+import java.net.InetSocketAddress;
+import java.util.List;
+
+public interface GenericEventWrapper<P, F>{
+    
+    void setMaxPlayers(int maxPlayers);
+    
+    void setMotd(Component component);
+    
+    void hidePlayers();
+    
+    void setPlayerCount(String name);
+    
+    void setPlayers(List<String> players, GenericPlayer<P> player, PlayerPlaceholders playerPlaceholders, ServerPlaceholders serverPlaceholders);
+    
+    void setFavicon(F favicon);
+    
+    void setDefaultFavicon();
+    
+    void updateEvent();
+    
+    boolean isInvalidProtocol();
+    
+    int getProtocolVersion();
+    
+    int getOnlinePlayers();
+    
+    int getMaxPlayers();
+    
+    String getPlayerIP();
+    
+    String parsePAPIPlaceholders(String text, GenericPlayer<P> player);
+    
+    String getVirtualHost();
+    
+    PluginCore<F> getPlugin();
+    
+    GenericPlayer<P> createPlayer(String name, int protocol);
+    
+    F createFavicon(BufferedImage image) throws Exception;
+    
+    default String resolveHost(InetSocketAddress address){
+        return address == null ? null : address.getHostString();
+    }
+}

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

@@ -1,64 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022 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;
-
-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{
-    
-    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.isInvalid())
-                continue;
-            
-            if(profile.evalConditions(replacements))
-                return profile;
-        }
-        
-        return null;
-    }
-}

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

@@ -27,125 +27,152 @@ 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.ArrayList;
-import java.util.Collections;
 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<String> motd;
-    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;
     
-    public ServerListProfile(ConfigurationNode node, PluginLogger logger){
-        this.priority = node.node("priority").getInt();
-        this.expressions = createExpressions(getList(node, false, "conditions"), logger);
-        
-        this.motd = getList(node, true, "motd");
-        this.players = getList(node, false, "playerCount", "hover");
-        this.playerCount = node.node("playerCount", "text").getString("");
-        this.favicon = node.node("favicon").getString("");
-        this.hidePlayers = node.node("playerCount", "hidePlayers").getBoolean();
-        this.extraPlayersEnabled = node.node("playerCount", "extraPlayers", "enabled").getBoolean();
-        this.extraPlayers = node.node("playerCount", "extraPlayers", "amount").getInt();
+    private final Random random = new Random();
+    
+    public ServerListProfile(int priority, List<Expression> expressions, List<ProfileEntry> profiles, ProfileEntry defaultProfile){
+        this.priority = priority;
+        this.expressions = expressions;
+        this.profiles = profiles;
+        this.defaultProfile = defaultProfile;
     }
     
     public int getPriority(){
         return priority;
     }
     
-    public List<String> getMotd(){
-        return motd;
-    }
-    
-    public List<String> getPlayers(){
-        return players;
-    }
-    
-    public String getPlayerCount(){
-        return playerCount;
-    }
-    
-    public String getFavicon(){
-        return favicon;
-    }
-    
-    public boolean shouldHidePlayers(){
-        return hidePlayers;
-    }
-    
-    public boolean isExtraPlayersEnabled(){
-        return extraPlayersEnabled;
-    }
-    
-    public int getExtraPlayers(){
-        return extraPlayers;
-    }
-    
-    public boolean evalConditions(Map<String, Object> replacements){
+    public boolean evaluateConditions(Map<String, Object> replacements){
         if(expressions.isEmpty())
             return true;
         
         for(Expression expression : expressions){
-            if(!expression.evaluate(replacements)){
+            if(!expression.evaluate(replacements))
                 return false;
-            }
         }
         
         return true;
     }
     
-    public boolean isInvalid(){
-        return getMotd().isEmpty() &&
-            getPlayers().isEmpty() &&
-            (getPlayerCount().isEmpty() && !shouldHidePlayers()) &&
-            getFavicon().isEmpty();
+    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()));
+        }
     }
     
-    private List<Expression> createExpressions(List<String> list, PluginLogger logger) {
-        if(list.isEmpty())
-            return Collections.emptyList();
+    public ProfileEntry getDefaultProfile(){
+        return defaultProfile;
+    }
+    
+    /*
+     * Returns true if the Profile...
+     * ...doesn't have any valid MOTD set AND
+     * ...doesn't have any player hover set AND
+     * ...doesn't have a player count text set and hidePlayers is false AND
+     * ...doesn't have a favicon set.
+     */
+    public boolean isInvalidProfile(){
+        boolean profilesValid = false;
         
-        List<Expression> expressions = new ArrayList<>();
-        for(String str : list){
-            Expression expression = new Expression(str);
-            
-            if(expression.getResult() != Expression.ExpressionResult.VALID){
-                logger.warn("Detected Invalid condition '%s'! Cause: %s", str, expression.getResult().getMessage());
+        for(ProfileEntry profile : profiles){
+            if(profile.isInvalidProfile())
                 continue;
+            
+            profilesValid = true;
+            break;
+        }
+    
+        return !profilesValid && defaultProfile.isInvalidProfile();
+    }
+    
+    public static class Builder{
+        
+        private final ConfigurationNode node;
+        private final int priority;
+        private final List<Expression> expressions = new ArrayList<>();
+        
+        private final PluginLogger logger;
+        
+        private List<ProfileEntry> profiles = new ArrayList<>();
+        private ProfileEntry defaultProfile = ProfileEntry.empty();
+        
+        private Builder(ConfigurationNode node, PluginLogger logger){
+            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)
+                .resolveExpressions()
+                .resolveProfiles()
+                .resolveDefaultProfile();
+        }
+        
+        private Builder resolveExpressions(){
+            List<String> temp;
+            try{
+                temp = node.node("conditions").getList(String.class);
+            }catch(SerializationException ex){
+                return this;
             }
             
-            expressions.add(expression);
+            if(temp == null || temp.isEmpty())
+                return this;
+            
+            for(String str : temp){
+                Expression expr = new Expression(str);
+                
+                if(expr.getResult() != Expression.ExpressionResult.VALID){
+                    logger.warn("Found invalid expression in condition '%s'! Reason: %s", str, expr.getResult().getMessage());
+                    continue;
+                }
+                
+                this.expressions.add(expr);
+            }
+            
+            return this;
         }
         
-        return expressions;
-    }
-    
-    private List<String> getList(ConfigurationNode node, boolean trim, Object... path){
-        List<String> list;
-        try{
-            list = node.node(path).getList(String.class);
-        }catch(SerializationException ex){
-            return Collections.emptyList();
+        private Builder resolveProfiles(){
+            try{
+                this.profiles = node.node("profiles").getList(ProfileEntry.class);
+            }catch(SerializationException ignored){}
+            
+            return this;
         }
         
-        if(list == null)
-            return Collections.emptyList();
+        private Builder resolveDefaultProfile(){
+            try{
+                this.defaultProfile = node.get(ProfileEntry.class);
+            }catch(SerializationException ignored){}
+            return this;
+        }
         
-        if(trim && list.size() > 2)
-            return list.subList(0, 2);
-        
-        return list;
+        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

@@ -192,8 +192,8 @@ public class Expression{
     public enum ExpressionResult{
         VALID(null),
         
-        INVALID_NO_EXPRESSION  ("Received empty condition which isn't allowed!"),
-        INVALID_EMPTY_PARTS    ("Received condition with either left or right part being empty.");
+        INVALID_NO_EXPRESSION("Received empty condition which isn't allowed!"),
+        INVALID_EMPTY_PARTS  ("Received condition with either left or right part being empty.");
         
         private final String message;
         

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

@@ -0,0 +1,193 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 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.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 Boolean hidePlayersEnabled;
+    private final Boolean extraPlayersEnabled;
+    private final Integer extraPlayersCount;
+    
+    public ProfileEntry(List<String> motd, List<String> players,
+                        String playerCountText, String favicon, Boolean hidePlayersEnabled,
+                        Boolean 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(), "", "",
+            false, 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 Boolean isHidePlayersEnabled(){
+        return hidePlayersEnabled;
+    }
+    
+    public Boolean isExtraPlayersEnabled(){
+        return extraPlayersEnabled;
+    }
+    
+    public Integer getExtraPlayersCount(){
+        return extraPlayersCount;
+    }
+    
+    public boolean isInvalidProfile(){
+        return getMOTD().isEmpty() &&
+            getPlayers().isEmpty() &&
+            (getPlayerCountText().isEmpty() && !isHidePlayersEnabled()) &&
+            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 Boolean hidePlayersEnabled = false;
+        private Boolean extraPlayersEnabled = 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 = null;
+                return this;
+            }
+            
+            this.hidePlayersEnabled = node.node("playerCount", "hidePlayers").getBoolean();
+            return this;
+        }
+        
+        public Builder resolveExtraPlayersEnabled(){
+            if(node.node("playerCount", "extraPlayers", "enabled").virtual()){
+                this.extraPlayersEnabled = null;
+                return this;
+            }
+            
+            this.extraPlayersEnabled = 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,136 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 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.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, isHidePlayersEnabled, 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() == null)
+            return defaultProfile.isHidePlayersEnabled();
+        
+        return profile.isHidePlayersEnabled();
+    }
+    
+    private static Boolean resolveExtraPlayersEnabled(ProfileEntry profile, ProfileEntry defaultProfile){
+        if(profile == null || profile.isExtraPlayersEnabled() == null)
+            return defaultProfile.isExtraPlayersEnabled();
+        
+        return profile.isExtraPlayersEnabled();
+    }
+    
+    private static Integer resolveExtraPlayersCount(ProfileEntry profile, ProfileEntry defaultProfile){
+        if(profile == null || profile.getExtraPlayersCount() == null)
+            return 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 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/resources/config.yml

@@ -1,6 +1,8 @@
 #
 # Used for when AdvancedServerList doesn't have a cached player to use for ${player name}
 #
+# Defaults to 'Anonymous' when not present.
+#
 unknown_player: "Anonymous"
 
 #
@@ -9,6 +11,8 @@ unknown_player: "Anonymous"
 # 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 +21,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,24 +16,54 @@ priority: 0
 #  - '{playerVersion} < 759'
 
 #
-# Set the MOTD 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 motd: [] to not alter the MOTD.
 #
-# Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#motd
+# Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#motds
 #
 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: ''
@@ -50,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
   #
@@ -69,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/test/java/ch/andre601/advancedserverlist/test/FlexVerTests.java

@@ -0,0 +1,292 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 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/src/main/java/ch/andre601/advancedserverlist/paper/events/PaperEventWrapper.java

@@ -0,0 +1,160 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 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.paper.events;
+
+import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
+import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
+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;
+import ch.andre601.advancedserverlist.paper.PaperCore;
+import ch.andre601.advancedserverlist.paper.PaperPlayer;
+import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
+import me.clip.placeholderapi.PlaceholderAPI;
+import net.kyori.adventure.text.Component;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.util.CachedServerIcon;
+
+import java.awt.image.BufferedImage;
+import java.util.List;
+
+public class PaperEventWrapper implements GenericEventWrapper<OfflinePlayer, CachedServerIcon>{
+    
+    private final PaperCore plugin;
+    private final PaperServerListPingEvent event;
+    
+    public PaperEventWrapper(PaperCore plugin, PaperServerListPingEvent event){
+        this.plugin = plugin;
+        this.event = event;
+    }
+    
+    @Override
+    public void setMaxPlayers(int maxPlayers){
+        event.setMaxPlayers(maxPlayers);
+    }
+    
+    @Override
+    public void setMotd(Component component){
+        event.motd(component);
+    }
+    
+    @Override
+    public void hidePlayers(){
+        event.setHidePlayers(true);
+    }
+    
+    @Override
+    public void setPlayerCount(String name){
+        event.setVersion(name);
+        event.setProtocolVersion(-1);
+    }
+    
+    @Override
+    public void setPlayers(List<String> players, GenericPlayer<OfflinePlayer> player, PlayerPlaceholders playerPlaceholders, ServerPlaceholders serverPlaceholders){
+        event.getPlayerSample().clear();
+        
+        event.getPlayerSample().addAll(
+            plugin.createPlayers(players, player.getPlayer(), playerPlaceholders, serverPlaceholders)
+        );
+    }
+    
+    @Override
+    public void setFavicon(CachedServerIcon favicon){
+        event.setServerIcon(favicon);
+    }
+    
+    @Override
+    public void setDefaultFavicon(){
+        event.setServerIcon(event.getServerIcon());
+    }
+    
+    // Not used in Paper
+    @Override
+    public void updateEvent(){}
+    
+    // Not used in Paper
+    @Override
+    public boolean isInvalidProtocol(){
+        return false;
+    }
+    
+    @Override
+    public int getProtocolVersion(){
+        return event.getClient().getProtocolVersion();
+    }
+    
+    @Override
+    public int getOnlinePlayers(){
+        return event.getNumPlayers();
+    }
+    
+    @Override
+    public int getMaxPlayers(){
+        return event.getMaxPlayers();
+    }
+    
+    @Override
+    public String getPlayerIP(){
+        return event.getClient().getAddress().getHostString();
+    }
+    
+    @Override
+    public String parsePAPIPlaceholders(String text, GenericPlayer<OfflinePlayer> player){
+        if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
+            return PlaceholderAPI.setPlaceholders(player.getPlayer(), text);
+        
+        return text;
+    }
+    
+    @Override
+    public String getVirtualHost(){
+        return this.resolveHost(event.getClient().getVirtualHost());
+    }
+    
+    @Override
+    public PluginCore<CachedServerIcon> getPlugin(){
+        return plugin;
+    }
+    
+    @Override
+    public GenericPlayer<OfflinePlayer> createPlayer(String name, int protocol){
+        OfflinePlayer player = Bukkit.getPlayerExact(name);
+        
+        if(player == null){
+            player = Bukkit.getOfflinePlayer(name);
+            
+            return new PaperPlayer(player.hasPlayedBefore() ? player : null, name, protocol);
+        }
+        
+        return new PaperPlayer(player, name, protocol);
+    }
+    
+    @Override
+    public CachedServerIcon createFavicon(BufferedImage image) throws Exception{
+        return Bukkit.loadServerIcon(image);
+    }
+}

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

@@ -25,23 +25,11 @@
 
 package ch.andre601.advancedserverlist.paper.events;
 
-import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
-import ch.andre601.advancedserverlist.core.profiles.ProfileManager;
-import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
-import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
-import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.PlayerPlaceholders;
-import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.ServerPlaceholders;
+import ch.andre601.advancedserverlist.core.events.PingEventHandler;
 import ch.andre601.advancedserverlist.paper.PaperCore;
-import ch.andre601.advancedserverlist.paper.PaperPlayer;
 import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
-import me.clip.placeholderapi.PlaceholderAPI;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
-import org.bukkit.util.CachedServerIcon;
-
-import java.net.InetSocketAddress;
 
 public class PingEvent implements Listener{
     
@@ -54,101 +42,6 @@ public class PingEvent implements Listener{
     
     @EventHandler
     public void onServerPing(PaperServerListPingEvent event){
-        InetSocketAddress address = event.getClient().getAddress();
-        InetSocketAddress host = event.getClient().getVirtualHost();
-    
-        PaperPlayer player = resolvePlayer(address, event.getClient().getProtocolVersion());
-        
-        int online = event.getNumPlayers();
-        int max = event.getMaxPlayers();
-        
-        PlayerPlaceholders playerPlaceholders = new PlayerPlaceholders(player);
-        ServerPlaceholders serverPlaceholders = new ServerPlaceholders(online, max,  host == null ? null : host.getHostString());
-        
-        ServerListProfile profile = ProfileManager.get(plugin.getCore())
-            .replacements(playerPlaceholders)
-            .replacements(serverPlaceholders)
-            .getProfile();
-        
-        if(profile == null)
-            return;
-    
-        if(profile.isExtraPlayersEnabled()){
-            max = online + profile.getExtraPlayers();
-            event.setMaxPlayers(max);
-        }
-        
-        serverPlaceholders = new ServerPlaceholders(online, max,  host == null ? null : host.getHostString());
-        
-        if(!profile.getMotd().isEmpty()){
-            event.motd(ComponentParser.list(profile.getMotd())
-                .replacements(playerPlaceholders)
-                .replacements(serverPlaceholders)
-                .modifyText(text -> {
-                    if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
-                        return PlaceholderAPI.setPlaceholders(player.getPlayer(), text);
-                    
-                    return text;
-                })
-                .toComponent());
-        }
-        
-        if(profile.shouldHidePlayers()){
-            event.setHidePlayers(true);
-        }
-        
-        if(!profile.getPlayerCount().isEmpty() && !profile.shouldHidePlayers()){
-            event.setVersion(ComponentParser.text(profile.getPlayerCount())
-                .replacements(playerPlaceholders)
-                .replacements(serverPlaceholders)
-                .modifyText(text -> {
-                    if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
-                        return PlaceholderAPI.setPlaceholders(player.getPlayer(), text);
-    
-                    return text;
-                })
-                .toString());
-            event.setProtocolVersion(-1);
-        }
-        
-        if(!profile.getPlayers().isEmpty() && !profile.shouldHidePlayers()){
-            event.getPlayerSample().clear();
-            
-            event.getPlayerSample().addAll(
-                plugin.createPlayers(profile.getPlayers(), player.getPlayer(), playerPlaceholders, serverPlaceholders)
-            );
-        }
-        
-        if(!profile.getFavicon().isEmpty()){
-            String favName = StringReplacer.replace(profile.getFavicon(), playerPlaceholders.getReplacements());
-            
-            CachedServerIcon favicon = plugin.getFaviconHandler().getFavicon(favName, image -> {
-                try{
-                    return Bukkit.loadServerIcon(image);
-                }catch(Exception ex){
-                    return null;
-                }
-            });
-            
-            if(favicon == null){
-                plugin.getPluginLogger().warn("Could not obtain valid Favicon to use.");
-                event.setServerIcon(event.getServerIcon());
-            }else{
-                event.setServerIcon(favicon);
-            }
-        }
-    }
-    
-    private PaperPlayer resolvePlayer(InetSocketAddress address, int protocol){
-        String playerName = plugin.getCore().getPlayerHandler().getPlayerByIp(address.getHostString());
-        OfflinePlayer player = Bukkit.getPlayerExact(playerName);
-        
-        if(player == null){
-            player = Bukkit.getOfflinePlayer(playerName);
-            
-            return new PaperPlayer(player.hasPlayedBefore() ? player : null, playerName, protocol);
-        }
-        
-        return new PaperPlayer(player, playerName, protocol);
+        PingEventHandler.handleEvent(new PaperEventWrapper(plugin, event));
     }
 }

pom.xml

@@ -12,7 +12,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         
-        <plugin.version>1.7.0</plugin.version>
+        <plugin.version>1.10.1</plugin.version>
         <plugin.description>Create multiple Server lists based on conditions.</plugin.description>
         
         <maven.compiler.source>16</maven.compiler.source>
@@ -21,10 +21,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

@@ -74,7 +74,7 @@
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-bukkit</artifactId>
-            <version>4.1.2</version>
+            <version>4.2.0</version>
         </dependency>
         <dependency>
             <groupId>com.comphenix.protocol</groupId>

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

@@ -25,25 +25,13 @@
 
 package ch.andre601.advancedserverlist.spigot.events;
 
-import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
-import ch.andre601.advancedserverlist.core.profiles.ProfileManager;
-import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
-import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
-import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.PlayerPlaceholders;
-import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.ServerPlaceholders;
+import ch.andre601.advancedserverlist.core.events.PingEventHandler;
 import ch.andre601.advancedserverlist.spigot.SpigotCore;
-import ch.andre601.advancedserverlist.spigot.SpigotPlayer;
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolManager;
 import com.comphenix.protocol.events.ListenerPriority;
 import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketEvent;
-import com.comphenix.protocol.wrappers.AdventureComponentConverter;
-import com.comphenix.protocol.wrappers.WrappedServerPing;
-import me.clip.placeholderapi.PlaceholderAPI;
-import net.kyori.adventure.text.Component;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.event.Listener;
 
 import java.net.InetSocketAddress;
@@ -52,13 +40,11 @@ import java.util.Map;
 
 public class PingEvent implements Listener{
     
-    private final SpigotCore plugin;
     private final ProtocolManager protocolManager;
     
     private final Map<String, String> hostAddresses = new HashMap<>();
     
     public PingEvent(SpigotCore plugin, ProtocolManager protocolManager){
-        this.plugin = plugin;
         this.protocolManager = protocolManager;
         
         loadPacketListener(plugin);
@@ -81,106 +67,8 @@ public class PingEvent implements Listener{
         protocolManager.addPacketListener(new PacketAdapter(spigotPlugin, ListenerPriority.LOW, PacketType.Status.Server.SERVER_INFO){
             @Override
             public void onPacketSending(PacketEvent event){
-                WrappedServerPing ping = event.getPacket().getServerPings().read(0);
-                InetSocketAddress address = event.getPlayer().getAddress();
-                if(address == null)
-                    return;
-    
-                SpigotPlayer player = resolvePlayer(address, ping.getVersionProtocol());
-                
-                int online = ping.getPlayersOnline();
-                int max = ping.getPlayersMaximum();
-                
-                PlayerPlaceholders playerPlaceholders = new PlayerPlaceholders(player);
-                ServerPlaceholders serverPlaceholders = new ServerPlaceholders(online, max, hostAddresses.get(address.getHostString()));
-                
-                ServerListProfile profile = ProfileManager.get(spigotPlugin.getCore())
-                    .replacements(playerPlaceholders)
-                    .replacements(serverPlaceholders)
-                    .getProfile();
-                
-                if(profile == null)
-                    return;
-    
-                if(profile.isExtraPlayersEnabled()){
-                    max = online + profile.getExtraPlayers();
-                    ping.setPlayersMaximum(max);
-                }
-                
-                serverPlaceholders = new ServerPlaceholders(online, max, hostAddresses.get(address.getHostString()));
-                
-                if(!profile.getMotd().isEmpty()){
-                    Component component = ComponentParser.list(profile.getMotd())
-                        .replacements(playerPlaceholders)
-                        .replacements(serverPlaceholders)
-                        .modifyText(text -> {
-                            if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
-                                return PlaceholderAPI.setPlaceholders(player.getPlayer(), text);
-                            
-                            return text;
-                        })
-                        .toComponent();
-                    ping.setMotD(AdventureComponentConverter.fromComponent(component));
-                }
-                
-                if(profile.shouldHidePlayers()){
-                    ping.setPlayersVisible(false);
-                }
-                
-                if(!profile.getPlayerCount().isEmpty() && !profile.shouldHidePlayers()){
-                    ping.setVersionName(ComponentParser.text(profile.getPlayerCount())
-                        .replacements(playerPlaceholders)
-                        .replacements(serverPlaceholders)
-                        .modifyText(text -> {
-                            if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
-                                return PlaceholderAPI.setPlaceholders(player.getPlayer(), text);
-    
-                            return text;
-                        })
-                        .toString()
-                    );
-                    ping.setVersionProtocol(-1);
-                }
-                
-                if(!profile.getPlayers().isEmpty() && !profile.shouldHidePlayers()){
-                    ping.setPlayers(
-                        spigotPlugin.createPlayers(profile.getPlayers(), player.getPlayer(), playerPlaceholders, serverPlaceholders)
-                    );
-                }
-                
-                if(!profile.getFavicon().isEmpty()){
-                    String favName = StringReplacer.replace(profile.getFavicon(), playerPlaceholders.getReplacements());
-    
-                    WrappedServerPing.CompressedImage favicon = spigotPlugin.getFaviconHandler().getFavicon(favName, image -> {
-                        try{
-                            return WrappedServerPing.CompressedImage.fromPng(image);
-                        }catch(Exception ex){
-                            return null;
-                        }
-                    });
-                    
-                    if(favicon == null){
-                        spigotPlugin.getPluginLogger().warn("Could not obtain valid Favicon to use.");
-                        ping.setFavicon(ping.getFavicon());
-                    }else{
-                        ping.setFavicon(favicon);
-                    }
-                }
+                PingEventHandler.handleEvent(new ProtocolLibEventWrapper(spigotPlugin, event, hostAddresses));
             }
         });
     }
-    
-    private SpigotPlayer resolvePlayer(InetSocketAddress address, int protocol){
-        String playerName = plugin.getCore().getPlayerHandler().getPlayerByIp(address.getHostString());
-        OfflinePlayer player = Bukkit.getPlayerExact(playerName);
-        
-        if(player == null){
-            //noinspection deprecation
-            player = Bukkit.getOfflinePlayer(playerName);
-            
-            return new SpigotPlayer(player.hasPlayedBefore() ? player : null, playerName, protocol);
-        }
-        
-        return new SpigotPlayer(player, playerName, protocol);
-    }
 }

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

@@ -0,0 +1,170 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 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.spigot.events;
+
+import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
+import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
+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;
+import ch.andre601.advancedserverlist.spigot.SpigotCore;
+import ch.andre601.advancedserverlist.spigot.SpigotPlayer;
+import com.comphenix.protocol.events.PacketEvent;
+import com.comphenix.protocol.wrappers.AdventureComponentConverter;
+import com.comphenix.protocol.wrappers.WrappedServerPing;
+import me.clip.placeholderapi.PlaceholderAPI;
+import net.kyori.adventure.text.Component;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+
+import java.awt.image.BufferedImage;
+import java.util.List;
+import java.util.Map;
+
+public class ProtocolLibEventWrapper implements GenericEventWrapper<OfflinePlayer, WrappedServerPing.CompressedImage>{
+    
+    private final SpigotCore plugin;
+    private final PacketEvent event;
+    private final WrappedServerPing ping;
+    
+    private final Map<String, String> hostAddresses;
+    
+    public ProtocolLibEventWrapper(SpigotCore plugin, PacketEvent event, Map<String, String> hostAddresses){
+        this.plugin = plugin;
+        this.event = event;
+        this.ping = event.getPacket().getServerPings().read(0);
+        
+        this.hostAddresses = hostAddresses;
+    }
+    
+    @Override
+    public void setMaxPlayers(int maxPlayers){
+        ping.setPlayersMaximum(maxPlayers);
+    }
+    
+    @Override
+    public void setMotd(Component component){
+        ping.setMotD(AdventureComponentConverter.fromComponent(component));
+    }
+    
+    @Override
+    public void hidePlayers(){
+        ping.setPlayersVisible(false);
+    }
+    
+    @Override
+    public void setPlayerCount(String name){
+        ping.setVersionName(name);
+        ping.setVersionProtocol(-1);
+    }
+    
+    @Override
+    public void setPlayers(List<String> players, GenericPlayer<OfflinePlayer> player, PlayerPlaceholders playerPlaceholders, ServerPlaceholders serverPlaceholders){
+        ping.setPlayers(
+            plugin.createPlayers(players, player.getPlayer(), playerPlaceholders, serverPlaceholders)
+        );
+    }
+    
+    @Override
+    public void setFavicon(WrappedServerPing.CompressedImage favicon){
+        ping.setFavicon(favicon);
+    }
+    
+    @Override
+    public void setDefaultFavicon(){
+        ping.setFavicon(ping.getFavicon());
+    }
+    
+    // Not used in ProtocolLib
+    @Override
+    public void updateEvent(){}
+    
+    @Override
+    public boolean isInvalidProtocol(){
+        return event.getPlayer().getAddress() == null;
+    }
+    
+    @Override
+    public int getProtocolVersion(){
+        return ping.getVersionProtocol();
+    }
+    
+    @Override
+    public int getOnlinePlayers(){
+        return ping.getPlayersOnline();
+    }
+    
+    @Override
+    public int getMaxPlayers(){
+        return ping.getPlayersMaximum();
+    }
+    
+    @Override
+    public String getPlayerIP(){
+        return event.getPlayer().getAddress() == null ? "UNKNOWN" : event.getPlayer().getAddress().getHostString();
+    }
+    
+    @Override
+    public String parsePAPIPlaceholders(String text, GenericPlayer<OfflinePlayer> player){
+        if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
+            return PlaceholderAPI.setPlaceholders(player.getPlayer(), text);
+        
+        return text;
+    }
+    
+    @Override
+    public String getVirtualHost(){
+        String host = this.resolveHost(event.getPlayer().getAddress());
+        if(host == null)
+            return null;
+        
+        return hostAddresses.get(host);
+    }
+    
+    @Override
+    public PluginCore<WrappedServerPing.CompressedImage> getPlugin(){
+        return plugin;
+    }
+    
+    @Override
+    public GenericPlayer<OfflinePlayer> createPlayer(String name, int protocol){
+        OfflinePlayer player = Bukkit.getPlayerExact(name);
+        
+        if(player == null){
+            //noinspection deprecation
+            player = Bukkit.getOfflinePlayer(name);
+            
+            return new SpigotPlayer(player.hasPlayedBefore() ? player : null, name, protocol);
+        }
+        
+        return new SpigotPlayer(player, name, protocol);
+    }
+    
+    @Override
+    public WrappedServerPing.CompressedImage createFavicon(BufferedImage image) throws Exception{
+        return WrappedServerPing.CompressedImage.fromPng(image);
+    }
+}

spigot/src/main/resources/plugin.yml

@@ -9,10 +9,10 @@ api-version: 1.19
 
 libraries:
   - 'org.spongepowered:configurate-yaml:4.1.2'
-  - 'net.kyori:adventure-api:4.11.0'
-  - 'net.kyori:adventure-text-minimessage:4.11.0'
-  - 'net.kyori:adventure-text-serializer-legacy:4.11.0'
-  - 'net.kyori:adventure-platform-bukkit:4.1.2'
+  - 'net.kyori:adventure-api:4.12.0'
+  - 'net.kyori:adventure-text-minimessage:4.12.0'
+  - 'net.kyori:adventure-text-serializer-legacy:4.12.0'
+  - 'net.kyori:adventure-platform-bukkit:4.2.0'
   - 'com.squareup.okhttp3:okhttp:4.10.0'
 
 softdepend:

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

@@ -25,22 +25,11 @@
 
 package ch.andre601.advancedserverlist.velocity.events;
 
-import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
-import ch.andre601.advancedserverlist.core.profiles.ProfileManager;
-import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
-import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
-import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.PlayerPlaceholders;
-import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.ServerPlaceholders;
+import ch.andre601.advancedserverlist.core.events.PingEventHandler;
 import ch.andre601.advancedserverlist.velocity.VelocityCore;
-import ch.andre601.advancedserverlist.velocity.VelocityPlayer;
 import com.velocitypowered.api.event.PostOrder;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.proxy.ProxyPingEvent;
-import com.velocitypowered.api.proxy.server.ServerPing;
-import com.velocitypowered.api.util.Favicon;
-
-import java.net.InetSocketAddress;
-import java.util.List;
 
 public class PingEvent{
     
@@ -53,85 +42,6 @@ public class PingEvent{
     
     @Subscribe(order = PostOrder.EARLY)
     public void onProxyPing(ProxyPingEvent event){
-        ServerPing ping = event.getPing();
-        ServerPing.Version protocol = ping.getVersion();
-        if(protocol == null)
-            return;
-    
-        ServerPing.Builder builder = ping.asBuilder();
-        String playerName = plugin.getCore().getPlayerHandler().getPlayerByIp(event.getConnection().getRemoteAddress().getHostString());
-        InetSocketAddress host = event.getConnection().getVirtualHost().orElse(null);
-        
-        int online = builder.getOnlinePlayers();
-        int max = builder.getMaximumPlayers();
-        
-        PlayerPlaceholders playerPlaceholders = new PlayerPlaceholders(new VelocityPlayer(playerName, protocol.getProtocol()));
-        ServerPlaceholders serverPlaceholders = new ServerPlaceholders(online, max, host == null ? null : host.getHostString());
-        
-        ServerListProfile profile = ProfileManager.get(plugin.getCore())
-            .replacements(playerPlaceholders)
-            .replacements(serverPlaceholders)
-            .getProfile();
-        
-        if(profile == null)
-            return;
-    
-        if(profile.isExtraPlayersEnabled()){
-            max = online + profile.getExtraPlayers();
-            builder.maximumPlayers(max);
-        }
-        
-        serverPlaceholders = new ServerPlaceholders(online, max, host == null ? null : host.getHostString());
-        
-        if(!profile.getMotd().isEmpty()){
-            List<String> motd = profile.getMotd();
-            builder.description(ComponentParser.list(motd)
-                .replacements(playerPlaceholders)
-                .replacements(serverPlaceholders)
-                .toComponent()
-            );
-        }
-        
-        if(profile.shouldHidePlayers()){
-            builder.nullPlayers();
-        }
-        
-        if(!profile.getPlayerCount().isEmpty() && !profile.shouldHidePlayers()){
-            builder.version(new ServerPing.Version(
-                -1, 
-                ComponentParser.text(profile.getPlayerCount())
-                    .replacements(playerPlaceholders)
-                    .replacements(serverPlaceholders)
-                    .toString()
-            ));
-        }
-        
-        if(!profile.getPlayers().isEmpty() && !profile.shouldHidePlayers()){
-            ServerPing.SamplePlayer[] playerSamples = plugin.createPlayers(profile.getPlayers(), playerPlaceholders, serverPlaceholders)
-                .toArray(new ServerPing.SamplePlayer[0]);
-            
-            if(playerSamples.length > 0)
-                builder.clearSamplePlayers().samplePlayers(playerSamples);
-        }
-        
-        if(!profile.getFavicon().isEmpty()){
-            String favName = StringReplacer.replace(profile.getFavicon(), playerPlaceholders.getReplacements());
-            
-            Favicon favicon = plugin.getFaviconHandler().getFavicon(favName, image -> {
-                try{
-                    return Favicon.create(image);
-                }catch(Exception ex){
-                    return null;
-                }
-            });
-            
-            if(favicon == null){
-                plugin.getPluginLogger().warn("Could not obtain valid Favicon to use.");
-            }else{
-                builder.favicon(favicon);
-            }
-        }
-        
-        event.setPing(builder.build());
+        PingEventHandler.handleEvent(new VelocityEventWrapper(plugin, event));
     }
 }

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

@@ -0,0 +1,150 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 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.velocity.events;
+
+import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
+import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
+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;
+import ch.andre601.advancedserverlist.velocity.VelocityCore;
+import ch.andre601.advancedserverlist.velocity.VelocityPlayer;
+import com.velocitypowered.api.event.proxy.ProxyPingEvent;
+import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.server.ServerPing;
+import com.velocitypowered.api.util.Favicon;
+import net.kyori.adventure.text.Component;
+
+import java.awt.image.BufferedImage;
+import java.util.List;
+
+public class VelocityEventWrapper implements GenericEventWrapper<Player, Favicon>{
+    
+    private final VelocityCore plugin;
+    private final ProxyPingEvent event;
+    private final ServerPing.Builder builder;
+    private final ServerPing.Version protocol;
+    
+    public VelocityEventWrapper(VelocityCore plugin, ProxyPingEvent event){
+        this.plugin = plugin;
+        this.event = event;
+        this.builder = event.getPing().asBuilder();
+        this.protocol = event.getPing().getVersion();
+    }
+    
+    @Override
+    public void setMaxPlayers(int maxPlayers){
+        builder.maximumPlayers(maxPlayers);
+    }
+    
+    @Override
+    public void setMotd(Component component){
+        builder.description(component);
+    }
+    
+    @Override
+    public void hidePlayers(){
+        builder.nullPlayers();
+    }
+    
+    @Override
+    public void setPlayerCount(String name){
+        builder.version(new ServerPing.Version(-1, name));
+    }
+    
+    @Override
+    public void setPlayers(List<String> players, GenericPlayer<Player> player, PlayerPlaceholders playerPlaceholders, ServerPlaceholders serverPlaceholders){
+        ServerPing.SamplePlayer[] playerSamples = plugin.createPlayers(players, playerPlaceholders, serverPlaceholders)
+            .toArray(new ServerPing.SamplePlayer[0]);
+        
+        if(playerSamples.length > 0)
+            builder.clearSamplePlayers().samplePlayers(playerSamples);
+    }
+    
+    @Override
+    public void setFavicon(Favicon favicon){
+        builder.favicon(favicon);
+    }
+    
+    // Not used in Velocity
+    @Override
+    public void setDefaultFavicon(){}
+    
+    @Override
+    public void updateEvent(){
+        event.setPing(builder.build());
+    }
+    
+    @Override
+    public boolean isInvalidProtocol(){
+        return protocol == null;
+    }
+    
+    @Override
+    public int getProtocolVersion(){
+        return protocol.getProtocol();
+    }
+    
+    @Override
+    public int getOnlinePlayers(){
+        return builder.getOnlinePlayers();
+    }
+    
+    @Override
+    public int getMaxPlayers(){
+        return builder.getMaximumPlayers();
+    }
+    
+    @Override
+    public String getPlayerIP(){
+        return event.getConnection().getRemoteAddress().getHostString();
+    }
+    
+    @Override
+    public String parsePAPIPlaceholders(String text, GenericPlayer<Player> player){
+        return text;
+    }
+    
+    @Override
+    public String getVirtualHost(){
+        return this.resolveHost(event.getConnection().getVirtualHost().orElse(null));
+    }
+    
+    @Override
+    public PluginCore<Favicon> getPlugin(){
+        return plugin;
+    }
+    
+    @Override
+    public GenericPlayer<Player> createPlayer(String name, int protocol){
+        return new VelocityPlayer(name, protocol);
+    }
+    
+    @Override
+    public Favicon createFavicon(BufferedImage image){
+        return Favicon.create(image);
+    }
+}