Merge pull request #36 from Andre601/feature/unified-eventhandler

Create unified EventHandler
Merge pull request #35 from Andre601/dependabot/maven/core/com.google.code.gson-gson-2.10
2026-11-05 17:02:34 -05:00 · 2022-12-08 21:56:48 +01:00 · 2022-12-08 16:43:13 +01:00 · 2022-12-08 16:42:23 +01:00 · 2022-12-07 21:19:23 +01:00 · 2022-12-07 16:28:39 +01:00
28 changed files with 1200 additions and 446 deletions
@@ -4,19 +4,19 @@ AdvancedServerList is a plugin that allowys you to customize your server's MOTD,
 ## Supported Platforms

 <a href="https://www.spigotmc.org" target="_blank">
-  <img src="https://raw.githubusercontent.com/intergrav/devins-badges/v2/assets/minimal/supported/spigot_vector.svg" width="64" alt="platform-spigot" />
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/spigot_vector.svg" width="64" alt="platform-spigot" title="Tested on Spigot">
 </a>
 <a href="https://papermc.io" target="_blank">
-  <img src="https://raw.githubusercontent.com/intergrav/devins-badges/v2/assets/minimal/supported/paper_vector.svg" width="64" alt="platform-" />
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/paper_vector.svg" width="64" alt="platform-paper" title="Tested on Paper">
 </a>
 <a href="https://www.spigotmc.org" target="_blank">
-  <img src="https://raw.githubusercontent.com/intergrav/devins-badges/v2/assets/minimal/supported/bungeecord_vector.svg" width="64" alt="platform-" />
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/bungeecord_vector.svg" width="64" alt="platform-bungeecord" title="Tested on BungeeCord">
 </a>
 <a href="https://www.papermc.io" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/waterfall_vector.svg" width="64" alt="platform-" />
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/waterfall_vector.svg" width="64" alt="platform-waterfall" title="Tested on Waterfall">
 </a>
 <a href="https://velocitypowered.com" target="_blank">
-  <img src="https://raw.githubusercontent.com/intergrav/devins-badges/v2/assets/minimal/supported/velocity_vector.svg" width="64" alt="platform-" />
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/velocity_vector.svg" width="64" alt="platform-velocity" title="Tested on Velocity">
 </a>

 ## What is a Server List Profile?
@@ -61,15 +61,18 @@ You can disable this in the global bStats config file located in `/plugins/bstat
 ## Screenshots

 <a href="https://modrinth.com/plugin/advancedserverlist/gallery" target="_blank">
-  <img src="https://raw.githubusercontent.com/intergrav/devins-badges/v2/assets/cozy/documentation/modrinth-gallery_vector.svg" width="208" alt="check-out-the-gallery" />
+  <img src="https://raw.githubusercontent.com/intergrav/devins-badges/v2/assets/cozy/documentation/modrinth-gallery_vector.svg" width="208" alt="gallery" title="Check out the Gallery">
 </a>

 ## Support
 <a href="https://discord.gg/6dazXp6" target="_blank">
-  <img src="https://raw.githubusercontent.com/intergrav/devins-badges/v2/assets/minimal/social/discord-singular_vector.svg" width="64" alt="chat-with-the-community-discord" />
+  <img src="https://raw.githubusercontent.com/intergrav/devins-badges/v2/assets/minimal/social/discord-singular_vector.svg" width="64" alt="discord" title="Join my Discord Server">
 </a>
 <a href="https://app.revolt.chat/invite/74TpERXA" target="_blank">
-  <img src="https://raw.githubusercontent.com/intergrav/devins-badges/v2/assets/minimal/social/revolt-singular_vector.svg" width="64" alt="chat-with-the-community-revolt" />
+  <img src="https://raw.githubusercontent.com/intergrav/devins-badges/v2/assets/minimal/social/revolt-singular_vector.svg" width="64" alt="revolt" title="Join my Revolt Server">
+</a>
+<a href="https://blobfox.coffee/@andre_601" target="_blank">
+  <img src="https://raw.githubusercontent.com/intergrav/devins-badges/v2/assets/minimal/social/mastodon-singular_vector.svg" width="64" alt="revolt" title="Chat with me on Mastodon">
 </a>

 <!-- Links -->
@@ -81,12 +81,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: ""
@@ -1,6 +1,6 @@
 # AdvancedServerList
 <a href="https://modrinth.com/plugin/advancedserverlist" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/cozy/available/modrinth_vector.svg" height="64" align="right" alt="download-on-modrinth" />
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/cozy/available/modrinth_vector.svg" height="64" align="right" alt="modrinth" title="Available on Modrinth">
 </a>

 AdvancedServerList is a plugin that allowys you to customize your server's MOTD, favicon, Player count text and player count hover displayed in a player's multiplayer server list based on conditions and priorities.
@@ -8,19 +8,19 @@ AdvancedServerList is a plugin that allowys you to customize your server's MOTD,
 ## Supported Platforms

 <a href="https://www.spigotmc.org" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/spigot_vector.svg" height="64" alt="platform-spigot" />
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/spigot_vector.svg" height="64" alt="platform-spigot" title="Tested on Spigot">
 </a>
 <a href="https://papermc.io" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/paper_vector.svg" height="64" alt="platform-" />
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/paper_vector.svg" height="64" alt="platform-paper" title="Tested on Paper">
 </a>
 <a href="https://www.spigotmc.org" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/bungeecord_vector.svg" height="64" alt="platform-" />
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/bungeecord_vector.svg" height="64" alt="platform-bungeecord" title="Tested on BungeeCord">
 </a>
 <a href="https://www.papermc.io" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/waterfall_vector.svg" height="64" alt="platform-" />
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/waterfall_vector.svg" height="64" alt="platform-waterfall" title="Tested on Waterfall">
 </a>
 <a href="https://velocitypowered.com" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/velocity_vector.svg" height="64" alt="platform-" />
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/velocity_vector.svg" height="64" alt="platform-velocity" title="Tested on Velocity">
 </a>

 ## What is a Server List Profile?
@@ -69,15 +69,18 @@ You can disable this in the global bStats config file located in `/plugins/bstat
 ## Screenshots

 <a href="https://modrinth.com/plugin/advancedserverlist/gallery" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/cozy/documentation/modrinth-gallery_vector.svg" height="64" alt="check-out-the-gallery" />
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/cozy/documentation/modrinth-gallery_vector.svg" height="64" alt="gallery" title="Check out the Gallery">
 </a>

 ## Support
 <a href="https://discord.gg/6dazXp6" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/social/discord-singular_vector.svg" height="64" alt="chat-with-the-community-discord" />
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/social/discord-singular_vector.svg" height="64" alt="discord" title="Join my Discord Server">
 </a>
 <a href="https://app.revolt.chat/invite/74TpERXA" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/social/revolt-singular_vector.svg" height="64" alt="chat-with-the-community-revolt" />
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/social/revolt-singular_vector.svg" height="64" alt="revolt" title="Join my Revolt Server">
+</a>
+<a href="https://blobfox.coffee/@andre_601" target="_blank">
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/social/mastodon-singular_vector.svg" height="64" alt="mastodon" title="Chat with me on Mastodon">
 </a>

 <!-- Links -->
@@ -123,6 +123,10 @@
                            <pattern>com.github.benmanes.caffeine</pattern>
                            <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.caffeine</shadedPattern>
                        </relocation>
+                        <relocation>
+                            <pattern>okhttp3</pattern>
+                            <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.okhttp3</shadedPattern>
+                        </relocation>
                    </relocations>
                    <filters>
                        <filter>
@@ -30,8 +30,8 @@ import ch.andre601.advancedserverlist.bungeecord.events.JoinEvent;
 import ch.andre601.advancedserverlist.bungeecord.events.PingEvent;
 import ch.andre601.advancedserverlist.bungeecord.logging.BungeeLogger;
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
-import ch.andre601.advancedserverlist.core.interfaces.core.ProxyCore;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
+import ch.andre601.advancedserverlist.core.interfaces.core.ProxyCore;
 import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
 import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.Placeholders;
@@ -122,6 +122,11 @@ public class BungeeCordCore extends Plugin implements ProxyCore<Favicon, ServerP
        return getProxy().getVersion();
    }
    
+    @Override
+    public String getLoader(){
+        return "bungeecord";
+    }
+    
    @Override
    public List<ServerPing.PlayerInfo> createPlayers(List<String> lines, Placeholders... placeholders){
        List<ServerPing.PlayerInfo> players = new ArrayList<>(lines.size());
@@ -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);
+    }
+}
@@ -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));
    }
 }
@@ -52,24 +52,34 @@
        <dependency>
            <groupId>net.kyori</groupId>
            <artifactId>adventure-api</artifactId>
-            <version>4.11.0</version>
+            <version>4.12.0</version>
        </dependency>
        <dependency>
            <groupId>net.kyori</groupId>
            <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.11.0</version>
+            <version>4.12.0</version>
        </dependency>
        <dependency>
            <groupId>net.kyori</groupId>
            <artifactId>adventure-text-serializer-legacy</artifactId>
-            <version>4.11.0</version>
+            <version>4.12.0</version>
        </dependency>
        <dependency>
            <groupId>com.github.ben-manes.caffeine</groupId>
            <artifactId>caffeine</artifactId>
-            <version>3.1.1</version>
+            <version>3.1.2</version>
            <scope>compile</scope>
        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.10</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.10.0</version>
+        </dependency>
    </dependencies>

    <build>
@@ -25,6 +25,7 @@

 package ch.andre601.advancedserverlist.core;

+import ch.andre601.advancedserverlist.core.check.UpdateChecker;
 import ch.andre601.advancedserverlist.core.commands.CommandHandler;
 import ch.andre601.advancedserverlist.core.file.FileHandler;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
@@ -33,7 +34,7 @@ import ch.andre601.advancedserverlist.core.profiles.players.PlayerHandler;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Path;
-import java.util.*;
+import java.util.Properties;

 public class AdvancedServerList{
    
@@ -42,6 +43,8 @@ public class AdvancedServerList{
    private final CommandHandler commandHandler;
    private final PlayerHandler playerHandler;
    
+    private UpdateChecker updateChecker;
+    
    private String version;
    
    public AdvancedServerList(PluginCore<?> plugin){
@@ -76,6 +79,12 @@ public class AdvancedServerList{
    public void disable(){
        getPlugin().getPluginLogger().info("Saving cache.data file...");
        getPlayerHandler().save();
+        
+        if(updateChecker != null){
+            getPlugin().getPluginLogger().info("Disabling Update Checker...");
+            updateChecker.disable();
+        }
+        
        getPlugin().getPluginLogger().info("AdvancedServerList disabled!");
    }
    
@@ -88,7 +97,6 @@ public class AdvancedServerList{
        resolveVersion();
    
        getPlugin().getPluginLogger().info("Starting AdvancedServerList v%s...", version);
-    
        getPlugin().getPluginLogger().info("Platform: " + plugin.getPlatformName() + " " + plugin.getPlatformVersion());
        
        if(getFileHandler().loadConfig()){
@@ -125,6 +133,9 @@ public class AdvancedServerList{
        getPlugin().getPluginLogger().info("Metrics loaded!");
    
        getPlugin().getPluginLogger().info("AdvancedServerList is ready!");
+        
+        if(getFileHandler().getBoolean("check_updates"))
+            this.updateChecker = new UpdateChecker(this);
    }
    
    private void printBanner(){
@@ -0,0 +1,37 @@
+/*
+ * 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.check;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.concurrent.ThreadFactory;
+
+public class UpdateCheckThread implements ThreadFactory{
+    @Override
+    public Thread newThread(@NotNull Runnable r){
+        return new Thread(r, "AdvancedServerList Update-Thread");
+    }
+}
@@ -0,0 +1,216 @@
+/*
+ * 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.check;
+
+import ch.andre601.advancedserverlist.core.AdvancedServerList;
+import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
+import com.google.gson.FieldNamingPolicy;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonSyntaxException;
+import io.leangen.geantyref.TypeToken;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.*;
+
+public class UpdateChecker{
+    
+    private final String url = "https://api.modrinth.com/v2/project/advancedserverlist/version?loaders=[\"%s\"]";
+    private final OkHttpClient client = new OkHttpClient();
+    
+    private final AdvancedServerList core;
+    private final PluginLogger logger;
+    private final String loader;
+    
+    private final Type listType = new TypeToken<ArrayList<ModrinthVersion>>(){}.getType();
+    private final Gson gson = new GsonBuilder()
+        .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
+        .setPrettyPrinting()
+        .setLenient()
+        .create();
+    
+    private final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(new UpdateCheckThread());
+    
+    public UpdateChecker(AdvancedServerList core){
+        this.core = core;
+        this.logger = core.getPlugin().getPluginLogger();
+        this.loader = core.getPlugin().getLoader();
+        
+        startUpdateChecker();
+    }
+    
+    public void startUpdateChecker(){
+        executor.scheduleAtFixedRate(() -> {
+            logger.info("Checking for a new update...");
+            checkUpdate().whenComplete((version, throwable) -> {
+                if(version == null || throwable != null){
+                    logger.warn("Failed to look for any updates. See previous messages for reasons.");
+                    return;
+                }
+        
+                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 0 -> logger.info("No new update found. You're running the latest version!");
+                    case 1 -> printUpdateBanner(version.getVersionNumber(), version.getId());
+                }
+            });
+        }, 0L, 12L, TimeUnit.HOURS);
+    }
+    
+    public void disable(){
+        executor.shutdown();
+        try{
+            if(!executor.awaitTermination(1, TimeUnit.SECONDS)){
+                executor.shutdownNow();
+                if(!executor.awaitTermination(1, TimeUnit.SECONDS))
+                    logger.warn("Scheduler didn't terminate in time!");
+            }
+        }catch(InterruptedException ex){
+            executor.shutdownNow();
+            Thread.currentThread().interrupt();
+        }
+    }
+    
+    private CompletableFuture<ModrinthVersion> checkUpdate(){
+        return CompletableFuture.supplyAsync(() -> {
+            PluginLogger logger = core.getPlugin().getPluginLogger();
+            if(core.getVersion().equals("UNKNOWN")){
+                logger.warn("Cannot perform Update check! Plugin version couldn't be parsed.");
+                return null;
+            }
+            
+            Request request = new Request.Builder()
+                .url(String.format(url, loader))
+                .header("User-Agent", "AdvancedServerList-" + loader + "/" + core.getVersion())
+                .build();
+            
+            try(Response response = client.newCall(request).execute()){
+                if(!response.isSuccessful()){
+                    logger.warn("Encountered a non-successful response from Modrinth! Code: %d", response.code());
+                    return null;
+                }
+    
+                ResponseBody body = response.body();
+                if(body == null){
+                    logger.warn("Received an empty Response body from Modrinth!");
+                    return null;
+                }
+                
+                String responseString = body.string();
+                if(responseString.isEmpty()){
+                    logger.warn("Received an empty Response body from Modrinth!");
+                    return null;
+                }
+                
+                List<ModrinthVersion> list = gson.fromJson(responseString, listType);
+                if(list == null || list.isEmpty()){
+                    logger.warn("Couldn't convert JSON Array into a valid list.");
+                    return null;
+                }
+                
+                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;
+                }
+                
+                return version;
+            }catch(JsonSyntaxException ex){
+                logger.warn("Encountered invalid JSON from Response body!", ex);
+                return null;
+            }catch(IOException ex){
+                logger.warn("Encountered Exception while checking for an update!", ex);
+                return null;
+            }
+        });
+    }
+    
+    private void printUpdateBanner(String version, String versionId){
+        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("");
+        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;
+        
+        public ModrinthVersion(String id, String versionNumber){
+            this.id = id;
+            this.versionNumber = versionNumber;
+        }
+    
+        public String getId(){
+            return id;
+        }
+    
+        public String getVersionNumber(){
+            return versionNumber;
+        }
+        
+        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;
+        }
+    }
+}
@@ -0,0 +1,122 @@
+/*
+ * 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.events.GenericEventWrapper;
+import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
+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.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;
+        
+        if(profile.isExtraPlayersEnabled()){
+            max = online + profile.getExtraPlayers();
+            event.setMaxPlayers(max);
+        }
+        
+        serverPlaceholders = new ServerPlaceholders(online, max, host);
+        
+        if(!profile.getMotd().isEmpty()){
+            event.setMotd(
+                ComponentParser.list(profile.getMotd())
+                    .replacements(playerPlaceholders)
+                    .replacements(serverPlaceholders)
+                    .modifyText(text -> event.parsePAPIPlaceholders(text, player))
+                    .toComponent()
+            );
+        }
+        
+        if(profile.shouldHidePlayers()){
+            event.hidePlayers();
+        }
+        
+        if(!profile.getPlayerCount().isEmpty() && !profile.shouldHidePlayers()){
+            event.setPlayerCount(
+                ComponentParser.text(profile.getPlayerCount())
+                    .replacements(playerPlaceholders)
+                    .replacements(serverPlaceholders)
+                    .modifyText(text -> event.parsePAPIPlaceholders(text, player))
+                    .toString()
+            );
+        }
+        
+        if(!profile.getPlayers().isEmpty() && !profile.shouldHidePlayers()){
+            event.setPlayers(profile.getPlayers(), player, playerPlaceholders, serverPlaceholders);
+        }
+        
+        if(!profile.getFavicon().isEmpty()){
+            String favicon = StringReplacer.replace(profile.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();
+    }
+}
@@ -52,4 +52,6 @@ public interface PluginCore<F>{
    String getPlatformName();
    
    String getPlatformVersion();
+    
+    String getLoader();
 }
@@ -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();
+    }
+}
@@ -9,4 +9,12 @@ 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.
 #
-disable_cache: false
+disable_cache: false
+
+#
+# Should AdvancedServerList check for new versions?
+#
+# 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.
+#
+check_updates: true
@@ -156,8 +156,9 @@ public class PaperCore extends JavaPlugin implements ServerCore<CachedServerIcon
        return getServer().getVersion();
    }
    
-    private void enable(){
-        this.core = new AdvancedServerList(this);
+    @Override
+    public String getLoader(){
+        return "paper";
    }
    
    @Override
@@ -181,4 +182,8 @@ public class PaperCore extends JavaPlugin implements ServerCore<CachedServerIcon
        
        return players;
    }
+    
+    private void enable(){
+        this.core = new AdvancedServerList(this);
+    }
 }
@@ -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);
+    }
+}
@@ -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));
    }
 }
@@ -7,6 +7,9 @@ main: 'ch.andre601.advancedserverlist.paper.PaperCore'

 api-version: 1.19

+libraries:
+  - 'com.squareup.okhttp3:okhttp:4.10.0'
+
 softdepend:
  - 'PlaceholderAPI'

@@ -12,7 +12,7 @@
    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        
-        <plugin.version>1.6.4</plugin.version>
+        <plugin.version>1.8.0</plugin.version>
        <plugin.description>Create multiple Server lists based on conditions.</plugin.description>
        
        <maven.compiler.source>16</maven.compiler.source>
@@ -141,6 +141,11 @@ public class SpigotCore extends JavaPlugin implements ServerCore<WrappedServerPi
        return getServer().getVersion();
    }
    
+    @Override
+    public String getLoader(){
+        return "spigot";
+    }
+    
    @Override
    public List<WrappedGameProfile> createPlayers(List<String> lines, OfflinePlayer player, Placeholders... placeholders){
        List<WrappedGameProfile> players = new ArrayList<>(lines.size());
@@ -25,39 +25,26 @@

 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;
-import java.util.*;
+import java.util.HashMap;
+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);
@@ -80,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);
-    }
 }
@@ -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);
+    }
+}
@@ -13,6 +13,7 @@ libraries:
  - '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'
+  - 'com.squareup.okhttp3:okhttp:4.10.0'

 softdepend:
  - 'ProtocolLib'
@@ -104,6 +104,10 @@
                            <pattern>com.github.benmanes.caffeine</pattern>
                            <shadedPattern>ch.andre601.advancedserverlist.velocity.depends.caffeine</shadedPattern>
                        </relocation>
+                        <relocation>
+                            <pattern>okhttp3</pattern>
+                            <shadedPattern>ch.andre601.advancedserverlist.velocity.depends.okhttp3</shadedPattern>
+                        </relocation>
                    </relocations>
                    <filters>
                        <filter>
@@ -26,8 +26,8 @@
 package ch.andre601.advancedserverlist.velocity;

 import ch.andre601.advancedserverlist.core.AdvancedServerList;
-import ch.andre601.advancedserverlist.core.interfaces.core.ProxyCore;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
+import ch.andre601.advancedserverlist.core.interfaces.core.ProxyCore;
 import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
 import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.Placeholders;
@@ -162,6 +162,11 @@ public class VelocityCore implements ProxyCore<Favicon, ServerPing.SamplePlayer>
        return getProxy().getVersion().getVersion();
    }
    
+    @Override
+    public String getLoader(){
+        return "velocity";
+    }
+    
    public ProxyServer getProxy(){
        return proxy;
    }
@@ -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));
    }
 }
@@ -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);
+    }
+}
Author	SHA1	Message	Date
Andre_601	c8acb4d90a	Merge pull request #36 from Andre601/feature/unified-eventhandler Create unified EventHandler	2022-12-08 21:56:48 +01:00
Andre_601	5575243a79	Merge pull request #35 from Andre601/dependabot/maven/core/com.google.code.gson-gson-2.10 Bump gson from 2.9.1 to 2.10 in /core	2022-12-08 16:43:13 +01:00
Andre601	4cd4aeb12a	Move Favicon creation and logging to PingEventHandler	2022-12-08 16:42:23 +01:00
Andre601	5922b2235e	Bump version	2022-12-07 21:19:23 +01:00
Andre601	2fcef08f5a	Wrap up (no pun intended) remaining platform events	2022-12-07 16:28:39 +01:00
Andre601	30c28b07a4	Smaller changes	2022-12-06 21:32:16 +01:00
Andre601	08b4f1029c	Make Protocol and ServerPing final	2022-12-06 21:27:09 +01:00
Andre601	f5051022aa	Create unified EventHandler	2022-12-06 21:24:43 +01:00
dependabot[bot]	fe51e78764	Bump gson from 2.9.1 to 2.10 in /core Bumps [gson](https://github.com/google/gson) from 2.9.1 to 2.10. - [Release notes](https://github.com/google/gson/releases) - [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/gson/compare/gson-parent-2.9.1...gson-parent-2.10) --- updated-dependencies: - dependency-name: com.google.code.gson:gson dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-12-06 15:11:07 +00:00
Andre_601	5b2d9d910f	Use env variables	2022-12-06 14:17:34 +01:00
Andre_601	6f06c47de7	Merge pull request #34 from Andre601/feature/update-checker Add Update Checker	2022-12-06 14:03:25 +01:00
Andre601	ad3ba0c8b3	Update config description	2022-12-06 00:49:52 +01:00
Andre601	12d8d930dd	Use a ScheduledExecutorService instead of Timer	2022-12-06 00:26:55 +01:00
Andre601	9a30a6b679	Add info line	2022-12-06 00:01:24 +01:00
Andre601	b82cf69d43	Simplify more.	2022-12-05 23:58:05 +01:00
Andre601	fb6d93b455	Init timer only when UpdateChecker is used.	2022-12-05 23:55:54 +01:00
Andre601	a1276da68f	Fix exceptions	2022-12-05 23:13:21 +01:00
Andre601	25c053d495	Use timer class from Java	2022-12-05 22:24:19 +01:00
Andre601	39c1fb5452	Better version comparison.	2022-12-05 21:26:24 +01:00
Andre601	48edebc043	Add config option	2022-12-03 20:29:45 +01:00
Andre601	3a672378ff	Add Update Checker	2022-12-03 20:23:21 +01:00
Andre_601	9db9f2be7f	Merge pull request #33 from Andre601/dependabot/maven/core/net.kyori-adventure-api-4.12.0 Bump adventure-api from 4.11.0 to 4.12.0 in /core	2022-11-28 16:31:53 +01:00
Andre_601	2cf47e351b	Merge pull request #32 from Andre601/dependabot/maven/core/net.kyori-adventure-text-minimessage-4.12.0 Bump adventure-text-minimessage from 4.11.0 to 4.12.0 in /core	2022-11-28 16:31:39 +01:00
Andre_601	36abdb83cd	Merge pull request #31 from Andre601/dependabot/maven/core/net.kyori-adventure-text-serializer-legacy-4.12.0 Bump adventure-text-serializer-legacy from 4.11.0 to 4.12.0 in /core	2022-11-28 16:31:21 +01:00
dependabot[bot]	ad950bf330	Bump adventure-api from 4.11.0 to 4.12.0 in /core Bumps [adventure-api](https://github.com/KyoriPowered/adventure) from 4.11.0 to 4.12.0. - [Release notes](https://github.com/KyoriPowered/adventure/releases) - [Commits](https://github.com/KyoriPowered/adventure/compare/v4.11.0...v4.12.0) --- updated-dependencies: - dependency-name: net.kyori:adventure-api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-11-28 15:12:17 +00:00
dependabot[bot]	143753d309	Bump adventure-text-minimessage from 4.11.0 to 4.12.0 in /core Bumps [adventure-text-minimessage](https://github.com/KyoriPowered/adventure) from 4.11.0 to 4.12.0. - [Release notes](https://github.com/KyoriPowered/adventure/releases) - [Commits](https://github.com/KyoriPowered/adventure/compare/v4.11.0...v4.12.0) --- updated-dependencies: - dependency-name: net.kyori:adventure-text-minimessage dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-11-28 15:12:10 +00:00
dependabot[bot]	0c37c21650	Bump adventure-text-serializer-legacy from 4.11.0 to 4.12.0 in /core Bumps [adventure-text-serializer-legacy](https://github.com/KyoriPowered/adventure) from 4.11.0 to 4.12.0. - [Release notes](https://github.com/KyoriPowered/adventure/releases) - [Commits](https://github.com/KyoriPowered/adventure/compare/v4.11.0...v4.12.0) --- updated-dependencies: - dependency-name: net.kyori:adventure-text-serializer-legacy dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-11-28 15:12:04 +00:00
Andre_601	40a6b4f059	Merge pull request #30 from Andre601/dependabot/maven/core/com.github.ben-manes.caffeine-caffeine-3.1.2 Bump caffeine from 3.1.1 to 3.1.2 in /core	2022-11-24 16:24:36 +01:00
dependabot[bot]	965e87d71b	Bump caffeine from 3.1.1 to 3.1.2 in /core Bumps [caffeine](https://github.com/ben-manes/caffeine) from 3.1.1 to 3.1.2. - [Release notes](https://github.com/ben-manes/caffeine/releases) - [Commits](https://github.com/ben-manes/caffeine/compare/v3.1.1...v3.1.2) --- updated-dependencies: - dependency-name: com.github.ben-manes.caffeine:caffeine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-11-24 15:08:34 +00:00
Andre_601	202a22f33a	Update README.md	2022-11-21 15:20:02 +01:00
Andre_601	a4b2a6c350	Update MODRINTH.md	2022-11-21 15:03:28 +01:00