Merge pull request #11 from Andre601/feature/improved-favicon-handling

Better Favicon handling

README.md

@@ -4,7 +4,8 @@
 AdvancedServerList is a plugin made for SpigotMC, PaperMC, BungeeCord/Waterfall and Velocity. It allows you to create server list profiles to display based on priority and conditions.
 
 ## What is a Server List Profile?
-A Server List Profile is a YAML file located in the plugin’s profiles folder having a priority, conditions (Optional), MOTD, Player count text, hover for player count and hiding the player count completely (Changing it to `???`)
+A Server List Profile refers to a YAML file located in the plugin's `profiles` directory.  
+It allows you to configure specific aspects of the server display in the MC-Client's multiplayer server list, such as the MOTD, player count text, player count hover or Favicon.
 
 > [*Read More*][profiles]
 
@@ -34,6 +35,15 @@ AdvancedServerList can be downloaded from the following places:
 
 [![dl-modrinth]][modrinth] [![dl-spigot]][spigot] [![dl-hangar]][hangar]
 
+## Statistics
+
+This plugin sends statistics to [bStats] to display.  
+You can disable this in the `config.yml` by setting `send_statistics` to `false`.
+
+- [BungeeCord][bstats-bungee]
+- [Paper/Spigot][bstats-spigot]
+- [Velocity][bstats-velocity]
+
 ## Screenshots
 Here are screenshots showing the plugin in action. Do you have your own screenshots that you would like to share? Let me know and I may add them here with proper credit.
 
@@ -53,12 +63,17 @@ Here are screenshots showing the plugin in action. Do you have your own screensh
 [spigot]: https://www.spigotmc.org/resources/102910/
 [hangar]: https://hangar.benndorf.dev/Andre_601/AdvancedServerList
 
+[bstats]: https://bstats.org
+[bstats-bungee]: https://bstats.org/plugin/bungeecord/AdvancedServerList/15585
+[bstats-spigot]: https://bstats.org/plugin/bukkit/AdvancedServerList/15584
+[bstats-velocity]: https://bstats.org/plugin/velocity/AdvancedServerList/15587
+
 <!-- images -->
 [showcase]: https://cdn.discordapp.com/attachments/417019799365746690/990379003250626580/unknown.png
 [features]: https://cdn.discordapp.com/attachments/990389158944055366/1004042735973568522/2022-08-02_17.03.40.jpg
 
 <!-- Badges -->
-[platform]: https://img.shields.io/badge/Platforms-Spigot%20%7C%20PaperMC%20%7C%20BungeeCord%20%7C%20Velocity-blue?style=for-the-badge&logo=data:image/svg%2bxml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0IiBmaWxsPSJ3aGl0ZSI+PHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBkPSJNMTEuMDYzIDEuNDU2YTEuNzUgMS43NSAwIDAxMS44NzQgMGw4LjM4MyA1LjMxNmExLjc1IDEuNzUgMCAwMTAgMi45NTZsLTguMzgzIDUuMzE2YTEuNzUgMS43NSAwIDAxLTEuODc0IDBMMi42OCA5LjcyOGExLjc1IDEuNzUgMCAwMTAtMi45NTZsOC4zODMtNS4zMTZ6bTEuMDcxIDEuMjY3YS4yNS4yNSAwIDAwLS4yNjggMEwzLjQ4MyA4LjAzOWEuMjUuMjUgMCAwMDAgLjQyMmw4LjM4MyA1LjMxNmEuMjUuMjUgMCAwMC4yNjggMGw4LjM4My01LjMxNmEuMjUuMjUgMCAwMDAtLjQyMmwtOC4zODMtNS4zMTZ6Ij48L3BhdGg+PHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBkPSJNMS44NjcgMTIuMzI0YS43NS43NSAwIDAxMS4wMzUtLjIzMmw4Ljk2NCA1LjY4NWEuMjUuMjUgMCAwMC4yNjggMGw4Ljk2NC01LjY4NWEuNzUuNzUgMCAwMS44MDQgMS4yNjdsLTguOTY1IDUuNjg1YTEuNzUgMS43NSAwIDAxLTEuODc0IDBsLTguOTY1LTUuNjg1YS43NS43NSAwIDAxLS4yMzEtMS4wMzV6Ij48L3BhdGg+PHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBkPSJNMS44NjcgMTYuMzI0YS43NS43NSAwIDAxMS4wMzUtLjIzMmw4Ljk2NCA1LjY4NWEuMjUuMjUgMCAwMC4yNjggMGw4Ljk2NC01LjY4NWEuNzUuNzUgMCAwMS44MDQgMS4yNjdsLTguOTY1IDUuNjg1YTEuNzUgMS43NSAwIDAxLTEuODc0IDBsLTguOTY1LTUuNjg1YS43NS43NSAwIDAxLS4yMzEtMS4wMzV6Ij48L3BhdGg+PC9zdmc+
+[platform]: https://img.shields.io/badge/Platforms-Spigot%20%7C%20Paper%20%7C%20BungeeCord%20%7C%20Velocity-blue?style=for-the-badge&logo=data:image/svg%2bxml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0IiBmaWxsPSJ3aGl0ZSI+PHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBkPSJNMTEuMDYzIDEuNDU2YTEuNzUgMS43NSAwIDAxMS44NzQgMGw4LjM4MyA1LjMxNmExLjc1IDEuNzUgMCAwMTAgMi45NTZsLTguMzgzIDUuMzE2YTEuNzUgMS43NSAwIDAxLTEuODc0IDBMMi42OCA5LjcyOGExLjc1IDEuNzUgMCAwMTAtMi45NTZsOC4zODMtNS4zMTZ6bTEuMDcxIDEuMjY3YS4yNS4yNSAwIDAwLS4yNjggMEwzLjQ4MyA4LjAzOWEuMjUuMjUgMCAwMDAgLjQyMmw4LjM4MyA1LjMxNmEuMjUuMjUgMCAwMC4yNjggMGw4LjM4My01LjMxNmEuMjUuMjUgMCAwMDAtLjQyMmwtOC4zODMtNS4zMTZ6Ij48L3BhdGg+PHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBkPSJNMS44NjcgMTIuMzI0YS43NS43NSAwIDAxMS4wMzUtLjIzMmw4Ljk2NCA1LjY4NWEuMjUuMjUgMCAwMC4yNjggMGw4Ljk2NC01LjY4NWEuNzUuNzUgMCAwMS44MDQgMS4yNjdsLTguOTY1IDUuNjg1YTEuNzUgMS43NSAwIDAxLTEuODc0IDBsLTguOTY1LTUuNjg1YS43NS43NSAwIDAxLS4yMzEtMS4wMzV6Ij48L3BhdGg+PHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBkPSJNMS44NjcgMTYuMzI0YS43NS43NSAwIDAxMS4wMzUtLjIzMmw4Ljk2NCA1LjY4NWEuMjUuMjUgMCAwMC4yNjggMGw4Ljk2NC01LjY4NWEuNzUuNzUgMCAwMS44MDQgMS4yNjdsLTguOTY1IDUuNjg1YTEuNzUgMS43NSAwIDAxLTEuODc0IDBsLTguOTY1LTUuNjg1YS43NS43NSAwIDAxLS4yMzEtMS4wMzV6Ij48L3BhdGg+PC9zdmc+
 
 [tested]: https://img.shields.io/badge/Tested%20Versions-1.19%20%7C%201.19.1%20%7C%201.19.2-blue?style=for-the-badge&logo=image/svg%2bxml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0IiBmaWxsPSJ3aGl0ZSI+PHBhdGggZD0iTTE3LjI4IDkuMjhhLjc1Ljc1IDAgMDAtMS4wNi0xLjA2bC01Ljk3IDUuOTctMi40Ny0yLjQ3YS43NS43NSAwIDAwLTEuMDYgMS4wNmwzIDNhLjc1Ljc1IDAgMDAxLjA2IDBsNi41LTYuNXoiPjwvcGF0aD48cGF0aCBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0zLjc1IDJBMS43NSAxLjc1IDAgMDAyIDMuNzV2MTYuNWMwIC45NjYuNzg0IDEuNzUgMS43NSAxLjc1aDE2LjVBMS43NSAxLjc1IDAgMDAyMiAyMC4yNVYzLjc1QTEuNzUgMS43NSAwIDAwMjAuMjUgMkgzLjc1ek0zLjUgMy43NWEuMjUuMjUgMCAwMS4yNS0uMjVoMTYuNWEuMjUuMjUgMCAwMS4yNS4yNXYxNi41YS4yNS4yNSAwIDAxLS4yNS4yNUgzLjc1YS4yNS4yNSAwIDAxLS4yNS0uMjVWMy43NXoiPjwvcGF0aD48L3N2Zz4=
 

bungeecord/pom.xml

@@ -105,20 +105,24 @@
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>3.3.0</version>
                 <configuration>
-                    <minimizeJar>true</minimizeJar>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
                     <relocations>
                         <relocation>
                             <pattern>org.spongepowered.configurate</pattern>
                             <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.configurate</shadedPattern>
                         </relocation>
                         <relocation>
-                            <pattern>net.kyori.adventure</pattern>
-                            <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.adventure</shadedPattern>
+                            <pattern>net.kyori</pattern>
+                            <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.kyori</shadedPattern>
                         </relocation>
                         <relocation>
                             <pattern>org.bstats</pattern>
                             <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.bstats</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>com.github.benmanes.caffeine</pattern>
+                            <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.caffeine</shadedPattern>
+                        </relocation>
                     </relocations>
                     <filters>
                         <filter>

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

@@ -32,6 +32,8 @@ import ch.andre601.advancedserverlist.bungeecord.logging.BungeeLogger;
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginCore;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
+import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
+import net.md_5.bungee.api.Favicon;
 import net.md_5.bungee.api.plugin.Plugin;
 import org.bstats.bungeecord.Metrics;
 import org.bstats.charts.SimplePie;
@@ -41,11 +43,13 @@ import java.nio.file.Path;
 public class BungeeCordCore extends Plugin implements PluginCore{
     
     private AdvancedServerList core;
+    private FaviconHandler<Favicon> faviconHandler;
     private final PluginLogger logger = new BungeeLogger(getLogger());
     
     @Override
     public void onEnable(){
         this.core = new AdvancedServerList(this);
+        this.faviconHandler = new FaviconHandler<>(core);
     }
     
     @Override
@@ -72,6 +76,11 @@ public class BungeeCordCore extends Plugin implements PluginCore{
         
     }
     
+    @Override
+    public void clearFaviconCache(){
+        faviconHandler.clearCache();
+    }
+    
     @Override
     public AdvancedServerList getCore(){
         return core;
@@ -96,4 +105,8 @@ public class BungeeCordCore extends Plugin implements PluginCore{
     public String getPlatformVersion(){
         return getProxy().getVersion();
     }
+    
+    public FaviconHandler<Favicon> getFaviconHandler(){
+        return faviconHandler;
+    }
 }

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

@@ -31,7 +31,6 @@ import ch.andre601.advancedserverlist.core.AdvancedServerList;
 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.favicon.FaviconHandler;
 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;
@@ -44,7 +43,6 @@ import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
 import net.md_5.bungee.event.EventPriority;
 
-import java.awt.image.BufferedImage;
 import java.net.InetSocketAddress;
 
 public class PingEvent implements Listener{
@@ -135,18 +133,19 @@ public class PingEvent implements Listener{
         if(!profile.getFavicon().isEmpty()){
             String favName = StringReplacer.replace(profile.getFavicon(), playerPlaceholders.getReplacements());
             
-            BufferedImage img = new FaviconHandler(plugin.getCore(), favName).get().getAsBufferedImage();
-            if(img == null){
+            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.");
                 ping.setFavicon(ping.getFaviconObject());
             }else{
-                try{
-                    Favicon favicon = Favicon.create(img);
-                    ping.setFavicon(favicon);
-                }catch(Exception ex){
-                    plugin.getPluginLogger().warn("Unable to override Favicon. Reason: %s", ex.getMessage());
-                    ping.setFavicon(ping.getFaviconObject());
-                }
+                ping.setFavicon(favicon);
             }
         }
         

core/pom.xml

@@ -67,7 +67,7 @@
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
-            <version>1.3.3</version>
+            <version>3.1.1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
@@ -91,13 +91,7 @@
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>3.3.0</version>
                 <configuration>
-                    <minimizeJar>true</minimizeJar>
-                    <relocations>
-                        <relocation>
-                            <pattern>com.github.benmanes</pattern>
-                            <shadedPattern>ch.andre601.advancedserverlist.core.depends.caffeine</shadedPattern>
-                        </relocation>
-                    </relocations>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
                     <filters>
                         <filter>
                             <artifact>*:*</artifact>

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

@@ -81,6 +81,10 @@ public class AdvancedServerList{
         getPluginLogger().info("AdvancedServerList disabled!");
     }
     
+    public void clearFaviconCache(){
+        plugin.clearFaviconCache();
+    }
+    
     public PluginLogger getPluginLogger(){
         return plugin.getPluginLogger();
     }

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

@@ -64,6 +64,10 @@ public class CommandHandler{
                     sender.sendMsg("<red>Error while reloading Profiles. No profiles have been loaded.");
                 }
                 
+                sender.sendMsg("<grey>Clearing Favicon cache...");
+                core.clearFaviconCache();
+                sender.sendMsg("<green>Successfully cleared Favicon cache!");
+                
                 sender.sendMsg("<green>Reload complete!");
             }
         }else{

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

@@ -25,8 +25,6 @@
 
 package ch.andre601.advancedserverlist.core.interfaces;
 
-import net.kyori.adventure.text.format.NamedTextColor;
-
 public interface CmdSender{
     
     boolean hasPermission(String permission);

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

@@ -37,6 +37,8 @@ public interface PluginCore{
     
     void loadMetrics();
     
+    void clearFaviconCache();
+    
     AdvancedServerList getCore();
     
     Path getPath();

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

@@ -32,7 +32,6 @@ import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 
 import java.util.List;
-import java.util.Map;
 import java.util.function.Function;
 
 public class ComponentParser{

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

@@ -28,7 +28,6 @@ package ch.andre601.advancedserverlist.core.profiles.conditions;
 import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
 
 import java.util.Map;
-import java.util.function.Function;
 
 public class Expression{
     

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

@@ -29,23 +29,110 @@ import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Locale;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
 
-public class FaviconHandler{
+public class FaviconHandler<T>{
     
-    private final Cache<String, GenericFavicon> favicons = Caffeine.newBuilder()
+    private final Cache<String, T> favicons = Caffeine.newBuilder()
         .expireAfterWrite(5, TimeUnit.MINUTES)
         .build();
     
     private final AdvancedServerList core;
-    private final String input;
     
-    public FaviconHandler(AdvancedServerList core, String input){
+    public FaviconHandler(AdvancedServerList core){
         this.core = core;
-        this.input = input;
     }
     
-    public GenericFavicon get(){
-        return favicons.get(input, k -> new GenericFavicon(core, input));
+    public T getFavicon(String input, Function<BufferedImage, T> function){
+        return favicons.get(input, k -> {
+            BufferedImage image = resolveImage(core, input);
+            if(image == null)
+                return null;
+            
+            return function.apply(image);
+        });
+    }
+    
+    public void clearCache(){
+        favicons.invalidateAll();
+    }
+    
+    private BufferedImage resolveImage(AdvancedServerList core, String input){
+        InputStream stream;
+        
+        if(input.toLowerCase(Locale.ROOT).startsWith("https://")){
+            stream = getFromUrl(core, input);
+        }else
+        if(input.toLowerCase(Locale.ROOT).endsWith(".png")){
+            File folder = core.getPath().resolve("favicons").toFile();
+            if(!folder.exists()){
+                core.getPluginLogger().warn("Cannot get Favicon %s from favicons folder. Folder doesn't exist!", input);
+                return null;
+            }
+            
+            File file = new File(folder, input);
+            
+            try{
+                stream = new FileInputStream(file);
+            }catch(IOException ex){
+                core.getPluginLogger().warn("Cannot create Favicon from File %s.", input);
+                core.getPluginLogger().warn("Cause: %s", ex.getMessage());
+                return null;
+            }
+        }else{
+            stream = getFromUrl(core, "https://mc-heads.net/avatar/" + input + "/64");
+        }
+        
+        if(stream == null){
+            core.getPluginLogger().warn("Cannot create Favicon. InputStream was null.");
+            return null;
+        }
+        
+        try{
+            BufferedImage original = ImageIO.read(stream);
+            if(original == null){
+                core.getPluginLogger().warn("Cannot create Favicon. Unable to create BufferedImage.");
+                return null;
+            }
+            
+            BufferedImage favicon = new BufferedImage(64, 64, BufferedImage.TYPE_INT_ARGB);
+            Graphics2D img = favicon.createGraphics();
+            
+            // Resize original image to 64x64 and apply to favicon.
+            img.drawImage(original, 0, 0, 64, 64, null);
+            img.dispose();
+            
+            return favicon;
+        }catch(IOException ex){
+            core.getPluginLogger().warn("Unable to create Favicon. Encountered IOException during creation.");
+            core.getPluginLogger().warn("Cause: %s", ex.getMessage());
+            return null;
+        }
+    }
+    
+    private InputStream getFromUrl(AdvancedServerList core, String url){
+        try{
+            URL faviconUrl = new URL(url);
+            URLConnection connection = faviconUrl.openConnection();
+            connection.setRequestProperty("User-Agent", "AdvancedServerList/" + core.getVersion());
+            connection.connect();
+            
+            return connection.getInputStream();
+        }catch(IOException ex){
+            core.getPluginLogger().warn("Error while connecting to %s for Favicon creation.", url);
+            core.getPluginLogger().warn("Cause: %s", ex.getMessage());
+            return null;
+        }
     }
 }

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

@@ -1,141 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.favicon;
-
-import ch.andre601.advancedserverlist.core.AdvancedServerList;
-
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.*;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Locale;
-
-public class GenericFavicon{
-    
-    private final AdvancedServerList core;
-    private final String input;
-    private final BufferedImage image;
-    
-    private byte[] bytes = null;
-    
-    public GenericFavicon(AdvancedServerList core, String input){
-        this.core = core;
-        this.input = input;
-        this.image = resolve();
-    }
-    
-    public byte[] getAsByteArray(){
-        if(bytes != null && bytes.length > 0)
-            return bytes;
-        
-        if(image == null){
-            this.core.getPluginLogger().warn("Cannot convert Favicon BufferedImage to Byte array. BufferedImage was null.");
-            return null;
-        }
-        
-        try{
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            ImageIO.setUseCache(false);
-            ImageIO.write(image, "PNG", baos);
-            
-            return (bytes = baos.toByteArray());
-        }catch(IOException ex){
-            this.core.getPluginLogger().warn("Cannot convert Favicon BufferedImage to Byte array. %s", ex.getMessage());
-            return null;
-        }
-    }
-    
-    public BufferedImage getAsBufferedImage(){
-        return image;
-    }
-    
-    private BufferedImage resolve(){
-        InputStream stream;
-        
-        if(input.toLowerCase(Locale.ROOT).startsWith("https://")){
-            stream = getFromUrl(input);
-        }else
-        if(input.toLowerCase(Locale.ROOT).endsWith(".png")){
-            File folder = core.getPath().resolve("favicons").toFile();
-            if(!folder.exists()){
-                this.core.getPluginLogger().warn("Cannot get Favicon for profile. Favicons folder is not present.");
-                return null;
-            }
-            
-            File file = new File(folder, input);
-            
-            try{
-                stream = new FileInputStream(file);
-            }catch(FileNotFoundException ex){
-                this.core.getPluginLogger().warn("Unable to create Favicon data. %s", ex.getMessage());
-                return null;
-            }
-        }else{
-            stream = getFromUrl("https://mc-heads.net/avatar/" + input + "/64");
-        }
-        
-        if(stream == null){
-            this.core.getPluginLogger().warn("Unable to get Data for Favicon. InputStream was null.");
-            return null;
-        }
-        
-        try{
-            BufferedImage original = ImageIO.read(stream);
-            if(original == null)
-                return null;
-            
-            BufferedImage favicon = new BufferedImage(64, 64, BufferedImage.TYPE_INT_ARGB);
-            Graphics2D img = favicon.createGraphics();
-            
-            // We use this to resize the image to 64x64 pixels.
-            img.drawImage(original, 0, 0, 64, 64, null);
-            img.dispose();
-            
-            return favicon;
-        }catch(IOException ex){
-            this.core.getPluginLogger().warn("Cannot resize favicon into 64x64. %s", ex.getMessage());
-            return null;
-        }
-    }
-    
-    private InputStream getFromUrl(String url){
-        try{
-            URL avatarUrl = new URL(url);
-            URLConnection connection = avatarUrl.openConnection();
-            connection.setRequestProperty("User-Agent", "AdvancedServerList/" + core.getVersion());
-            connection.connect();
-            
-            return connection.getInputStream();
-        }catch(IOException ex){
-            this.core.getPluginLogger().warn("Unable to connect to URL %s! %s", url, ex.getMessage());
-            return null;
-        }
-    }
-    
-    
-}

paper/pom.xml

@@ -82,7 +82,7 @@
     </dependencies>
     
     <build>
-        <finalName>AdvancedServerList-PaperMC-${plugin.version}</finalName>
+        <finalName>AdvancedServerList-Paper-${plugin.version}</finalName>
         <resources>
             <resource>
                 <filtering>true</filtering>
@@ -103,7 +103,7 @@
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>3.3.0</version>
                 <configuration>
-                    <minimizeJar>true</minimizeJar>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
                     <relocations>
                         <relocation>
                             <pattern>org.spongepowered.configurate</pattern>
@@ -111,7 +111,11 @@
                         </relocation>
                         <relocation>
                             <pattern>org.bstats</pattern>
-                            <shadedPattern>ch.andre601.advancedserverlist.spigot.depends.bstats</shadedPattern>
+                            <shadedPattern>ch.andre601.advancedserverlist.paper.depends.bstats</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>com.github.benmanes.caffeine</pattern>
+                            <shadedPattern>ch.andre601.advancedserverlist.paper.depends.caffeine</shadedPattern>
                         </relocation>
                     </relocations>
                     <filters>

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

@@ -28,6 +28,7 @@ package ch.andre601.advancedserverlist.paper;
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginCore;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
+import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
 import ch.andre601.advancedserverlist.paper.commands.CmdAdvancedServerList;
 import ch.andre601.advancedserverlist.paper.events.JoinEvent;
 import ch.andre601.advancedserverlist.paper.events.PingEvent;
@@ -36,23 +37,26 @@ import org.bstats.bukkit.Metrics;
 import org.bstats.charts.SimplePie;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.util.CachedServerIcon;
 
 import java.nio.file.Path;
 
 public class PaperCore extends JavaPlugin implements PluginCore{
     
     private final PluginLogger logger = new PaperLogger(getLogger());
+    
     private AdvancedServerList core;
+    private FaviconHandler<CachedServerIcon> faviconHandler;
     
     @Override
     public void onEnable(){
         try{
             Class.forName("io.papermc.paper.configuration.ConfigurationLoaders");
-            this.core = new AdvancedServerList(this);
+            enable();
         }catch(ClassNotFoundException ex){
             try{
                 Class.forName("com.destroystokyo.paper.PaperConfig");
-                this.core = new AdvancedServerList(this);
+                enable();
             }catch(ClassNotFoundException ex1){
                 getPluginLogger().warn("======================================== WARNING ========================================");
                 getPluginLogger().warn("");
@@ -102,6 +106,11 @@ public class PaperCore extends JavaPlugin implements PluginCore{
         ));
     }
     
+    @Override
+    public void clearFaviconCache(){
+        faviconHandler.clearCache();
+    }
+    
     @Override
     public AdvancedServerList getCore(){
         return core;
@@ -126,4 +135,13 @@ public class PaperCore extends JavaPlugin implements PluginCore{
     public String getPlatformVersion(){
         return getServer().getVersion();
     }
+    
+    public FaviconHandler<CachedServerIcon> getFaviconHandler(){
+        return faviconHandler;
+    }
+    
+    private void enable(){
+        this.core = new AdvancedServerList(this);
+        this.faviconHandler = new FaviconHandler<>(core);
+    }
 }

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

@@ -28,7 +28,6 @@ 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.favicon.FaviconHandler;
 import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
 import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.Placeholders;
 import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.PlayerPlaceholders;
@@ -44,9 +43,10 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.util.CachedServerIcon;
 
-import java.awt.image.BufferedImage;
 import java.net.InetSocketAddress;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
 
 public class PingEvent implements Listener{
     
@@ -126,18 +126,19 @@ public class PingEvent implements Listener{
         if(!profile.getFavicon().isEmpty()){
             String favName = StringReplacer.replace(profile.getFavicon(), playerPlaceholders.getReplacements());
             
-            BufferedImage img = new FaviconHandler(plugin.getCore(), favName).get().getAsBufferedImage();
-            if(img == null){
+            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{
-                try{
-                    CachedServerIcon favicon = Bukkit.loadServerIcon(img);
-                    event.setServerIcon(favicon);
-                }catch(Exception ex){
-                    plugin.getPluginLogger().warn("Unable to override Favicon. Reason: %s", ex.getMessage());
-                    event.setServerIcon(event.getServerIcon());
-                }
+                event.setServerIcon(favicon);
             }
         }
     }

pom.xml

@@ -12,7 +12,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         
-        <plugin.version>1.5.0</plugin.version>
+        <plugin.version>1.5.1</plugin.version>
         <plugin.description>Create multiple Server lists based on conditions.</plugin.description>
         
         <maven.compiler.source>16</maven.compiler.source>

spigot/pom.xml

@@ -118,11 +118,15 @@
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>3.3.0</version>
                 <configuration>
-                    <minimizeJar>true</minimizeJar>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
                     <relocations>
                         <relocation>
                             <pattern>org.bstats</pattern>
-                            <shadedPattern>ch.andre601.advancedserverlist.paper.depends.bstats</shadedPattern>
+                            <shadedPattern>ch.andre601.advancedserverlist.spigot.depends.bstats</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>com.github.benmanes.caffeine</pattern>
+                            <shadedPattern>ch.andre601.advancedserverlist.spigot.depends.caffeine</shadedPattern>
                         </relocation>
                     </relocations>
                     <filters>

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

@@ -28,9 +28,11 @@ package ch.andre601.advancedserverlist.spigot;
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginCore;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
+import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
 import ch.andre601.advancedserverlist.spigot.commands.CmdAdvancedServerList;
 import ch.andre601.advancedserverlist.spigot.events.LoadEvent;
 import ch.andre601.advancedserverlist.spigot.logging.SpigotLogger;
+import com.comphenix.protocol.wrappers.WrappedServerPing;
 import org.bstats.bukkit.Metrics;
 import org.bstats.charts.SimplePie;
 import org.bukkit.command.PluginCommand;
@@ -40,9 +42,11 @@ import java.nio.file.Path;
 
 public class SpigotCore extends JavaPlugin implements PluginCore{
     
-    private AdvancedServerList core;
     private final PluginLogger logger = new SpigotLogger(getLogger());
     
+    private AdvancedServerList core;
+    FaviconHandler<WrappedServerPing.CompressedImage> faviconHandler;
+    
     @Override
     public void onEnable(){
         try{
@@ -59,6 +63,7 @@ public class SpigotCore extends JavaPlugin implements PluginCore{
         }
         
         this.core = new AdvancedServerList(this);
+        this.faviconHandler = new FaviconHandler<>(core);
     }
     
     @Override
@@ -88,6 +93,11 @@ public class SpigotCore extends JavaPlugin implements PluginCore{
         ));
     }
     
+    @Override
+    public void clearFaviconCache(){
+        faviconHandler.clearCache();
+    }
+    
     @Override
     public AdvancedServerList getCore(){
         return core;
@@ -113,6 +123,10 @@ public class SpigotCore extends JavaPlugin implements PluginCore{
         return getServer().getVersion();
     }
     
+    public FaviconHandler<WrappedServerPing.CompressedImage> getFaviconHandler(){
+        return faviconHandler;
+    }
+    
     private void printPaperInfo(){
         getPluginLogger().warn("======================================================================================");
         getPluginLogger().warn("You are using the Spigot version of AdvancedServerList on a PaperMC server.");

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

@@ -28,7 +28,6 @@ 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.favicon.FaviconHandler;
 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;
@@ -161,19 +160,20 @@ public class PingEvent implements Listener{
                 
                 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;
+                        }
+                    });
                     
-                    byte[] bytes = new FaviconHandler(spigotPlugin.getCore(), favName).get().getAsByteArray();
-                    if(bytes == null){
+                    if(favicon == null){
                         spigotPlugin.getPluginLogger().warn("Could not obtain valid Favicon to use.");
                         ping.setFavicon(ping.getFavicon());
                     }else{
-                        try{
-                            WrappedServerPing.CompressedImage favicon = WrappedServerPing.CompressedImage.fromPng(bytes);
-                            ping.setFavicon(favicon);
-                        }catch(Exception ex){
-                            spigotPlugin.getPluginLogger().warn("Unable to override Favicon. Reason: %s", ex.getMessage());
-                            ping.setFavicon(ping.getFavicon());
-                        }
+                        ping.setFavicon(favicon);
                     }
                 }
             }

velocity/pom.xml

@@ -90,7 +90,7 @@
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>3.3.0</version>
                 <configuration>
-                    <minimizeJar>true</minimizeJar>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
                     <relocations>
                         <relocation>
                             <pattern>org.spongepowered.configurate</pattern>
@@ -100,6 +100,10 @@
                             <pattern>org.bstats</pattern>
                             <shadedPattern>ch.andre601.advancedserverlist.velocity.depends.bstats</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>com.github.benmanes.caffeine</pattern>
+                            <shadedPattern>ch.andre601.advancedserverlist.velocity.depends.caffeine</shadedPattern>
+                        </relocation>
                     </relocations>
                     <filters>
                         <filter>

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

@@ -28,6 +28,7 @@ package ch.andre601.advancedserverlist.velocity;
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginCore;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
+import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
 import ch.andre601.advancedserverlist.velocity.commands.CmdAdvancedServerList;
 import ch.andre601.advancedserverlist.velocity.events.JoinEvent;
 import ch.andre601.advancedserverlist.velocity.events.PingEvent;
@@ -39,6 +40,7 @@ import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
 import com.velocitypowered.api.event.proxy.ProxyShutdownEvent;
 import com.velocitypowered.api.plugin.annotation.DataDirectory;
 import com.velocitypowered.api.proxy.ProxyServer;
+import com.velocitypowered.api.util.Favicon;
 import org.bstats.charts.SimplePie;
 import org.bstats.velocity.Metrics;
 import org.slf4j.LoggerFactory;
@@ -53,6 +55,7 @@ public class VelocityCore implements PluginCore{
     private final Metrics.Factory metrics;
     
     private AdvancedServerList core;
+    private FaviconHandler<Favicon> faviconHandler;
     
     @Inject
     public VelocityCore(ProxyServer proxy, @DataDirectory Path path, Metrics.Factory metrics){
@@ -66,6 +69,7 @@ public class VelocityCore implements PluginCore{
     @Subscribe
     public void init(ProxyInitializeEvent event){
         this.core = new AdvancedServerList(this);
+        this.faviconHandler = new FaviconHandler<>(core);
     }
     
     @Subscribe
@@ -96,6 +100,11 @@ public class VelocityCore implements PluginCore{
         ));
     }
     
+    @Override
+    public void clearFaviconCache(){
+        faviconHandler.clearCache();
+    }
+    
     @Override
     public AdvancedServerList getCore(){
         return core;
@@ -124,4 +133,8 @@ public class VelocityCore implements PluginCore{
     public ProxyServer getProxy(){
         return proxy;
     }
+    
+    public FaviconHandler<Favicon> getFaviconHandler(){
+        return faviconHandler;
+    }
 }

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

@@ -29,7 +29,6 @@ import ch.andre601.advancedserverlist.core.AdvancedServerList;
 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.favicon.FaviconHandler;
 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;
@@ -41,7 +40,6 @@ import com.velocitypowered.api.event.proxy.ProxyPingEvent;
 import com.velocitypowered.api.proxy.server.ServerPing;
 import com.velocitypowered.api.util.Favicon;
 
-import java.awt.image.BufferedImage;
 import java.net.InetSocketAddress;
 import java.util.List;
 
@@ -128,15 +126,18 @@ public class PingEvent{
         if(!profile.getFavicon().isEmpty()){
             String favName = StringReplacer.replace(profile.getFavicon(), playerPlaceholders.getReplacements());
             
-            BufferedImage img = new FaviconHandler(plugin.getCore(), favName).get().getAsBufferedImage();
-            if(img == null){
+            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{
-                try{
-                    Favicon favicon = Favicon.create(img);
-                    builder.favicon(favicon);
-                }catch(Exception ex){
-                    plugin.getPluginLogger().warn("Unable to override Favicon. Reason: %s", ex.getMessage());}
+                builder.favicon(favicon);
             }
         }