Create unified EventHandler

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 PingEvent(BungeeCordCore plugin){
 
     @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/src/main/java/ch/andre601/advancedserverlist/core/check/UpdateChecker.java

@@ -173,7 +173,9 @@ private void printUpdateBanner(String version, String versionId){
     }
 
     public static class ModrinthVersion{
+        @SuppressWarnings("FieldMayBeFinal")
         private String id;
+        @SuppressWarnings("FieldMayBeFinal")
         private String versionNumber;
 
         public ModrinthVersion(String id, String versionNumber){