Version 1.0.3

- Fix HEX color issues on SpigotMC servers
- Fix rare edge case where exception is thrown during config creation
- Add safety check for PaperMC version being used on SpigotMC

Author: Andre601

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/logging/BungeeLogger.java

@@ -39,8 +39,8 @@ public BungeeLogger(Logger logger){
     }
 
     @Override
-    public void info(String msg){
-        logger.info(msg);
+    public void info(String msg, Object... args){
+        logger.info(String.format(msg, args));
     }
 
     @Override

core/pom.xml

@@ -68,6 +68,12 @@
 
     <build>
         <finalName>AdvancedServerList-Core-${plugin.version}</finalName>
+        <resources>
+            <resource>
+                <filtering>true</filtering>
+                <directory>${project.basedir}/src/main/resources</directory>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

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

@@ -33,6 +33,8 @@
 import ch.andre601.advancedserverlist.core.profiles.players.PlayerHandler;
 import ch.andre601.advancedserverlist.core.profiles.replacer.Placeholders;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.net.InetSocketAddress;
@@ -46,6 +48,8 @@ public class AdvancedServerList{
     private final CommandHandler commandHandler;
     private final PlayerHandler playerHandler;
 
+    private String version;
+    
     public AdvancedServerList(PluginCore plugin){
         this.plugin = plugin;
         this.fileHandler = new FileHandler(this);
@@ -113,9 +117,15 @@ public PlayerHandler getPlayerHandler(){
         return playerHandler;
     }
 
+    public String getVersion(){
+        return version;
+    }
+    
     private void load(){
         printBanner();
-        getPluginLogger().info("Starting AdvancedServerList...");
+        resolveVersion();
+        
+        getPluginLogger().info("Starting AdvancedServerList v%s...", version);
 
         getPluginLogger().info("Proxy: " + plugin.getPlatformName() + " " + plugin.getPlatformVersion());
 
@@ -165,4 +175,16 @@ private void printBanner(){
         getPluginLogger().info("/_/    \\_\\_____/|______|");
         getPluginLogger().info("");
     }
+    
+    private void resolveVersion(){
+        try(InputStream is = getClass().getResourceAsStream("/version.properties")){
+            Properties properties = new Properties();
+            
+            properties.load(is);
+            
+            version = properties.getProperty("version");
+        }catch(IOException ex){
+            version = "UNKNOWN";
+        }
+    }
 }

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

@@ -69,10 +69,16 @@ public List<ServerListProfile> getProfiles(){
 
     public boolean loadConfig(){
         logger.info("Loading config.yml...");
+        File folder = config.toFile().getParentFile();
+        if(!folder.exists() && !folder.mkdirs()){
+            logger.warn("Couldn't create folder for plugin. Is it missing Write permissions?");
+            return false;
+        }
+        
         if(!config.toFile().exists()){
             try(InputStream stream = plugin.getClass().getResourceAsStream("/config.yml")){
                 if(stream == null){
-                    logger.warn("Cannot retrieve config.yml from Plugin.");
+                    logger.warn("Cannot retrieve config.yml from plugin.");
                     return false;
                 }
 

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

@@ -27,7 +27,7 @@
 
 public interface PluginLogger{
 
-    void info(String msg);
+    void info(String msg, Object... args);
 
     void warn(String msg);
 

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/players/PlayerHandler.java

@@ -74,6 +74,9 @@ public void load(){
             if(parts.length < 2 || parts[0].isEmpty() || parts[1].isEmpty())
                 continue;
 
+            if(players.containsKey(parts[0]))
+                continue;
+            
             players.add(parts[0], parts[1]);
         }
 
@@ -100,6 +103,9 @@ public void save(){
     }
 
     public void addPlayer(String name, String ip){
+        if(players.containsKey(name))
+            return;
+        
         players.add(name, ip);
     }
 

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/replacer/EntryList.java

@@ -38,4 +38,12 @@ public class EntryList<K, V> extends ArrayList<Map.Entry<K, V>>{
     public void add(K key, V value){
         add(new AbstractMap.SimpleEntry<>(key, value));
     }
+    
+    public boolean containsKey(K key){
+        for(Map.Entry<K, V> entry : this){
+            if(entry.getKey() == key)
+                return true;
+        }
+        return false;
+    }
 }

core/src/main/resources/version.properties

@@ -0,0 +1,26 @@
+#
+# 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.
+#
+#
+
+version=${plugin.version}

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

@@ -46,11 +46,36 @@ public class PaperCore extends JavaPlugin implements PluginCore{
 
     @Override
     public void onEnable(){
-        this.core = new AdvancedServerList(this);
+        try{
+            Class.forName("io.papermc.paper.configuration.ConfigurationLoaders");
+            this.core = new AdvancedServerList(this);
+        }catch(ClassNotFoundException ex){
+            try{
+                Class.forName("com.destroystokyo.paper.PaperConfig");
+                this.core = new AdvancedServerList(this);
+            }catch(ClassNotFoundException ex1){
+                getPluginLogger().warn("======================================== WARNING ========================================");
+                getPluginLogger().warn("");
+                getPluginLogger().warn("You are using the PaperMC version of AdvancedServerList on a SpigotMC server.");
+                getPluginLogger().warn("The PaperMC version is ONLY compatible with PaperMC itself due to it using exclusive");
+                getPluginLogger().warn("methods and events not available within SpigotMC.");
+                getPluginLogger().warn("");
+                getPluginLogger().warn("To avoid any exceptions and errors will AdvancedServerList disable itself now.");
+                getPluginLogger().warn("Please stop your server and either switch to PaperMC or use the Spigot version");
+                getPluginLogger().warn("of AdvancedServerList.");
+                getPluginLogger().warn("");
+                getPluginLogger().warn("======================================== WARNING ========================================");
+                
+                getServer().getPluginManager().disablePlugin(this);
+            }
+        }
     }
 
     @Override
     public void onDisable(){
+        if(getCore() == null)
+            return; // This is always the case when the plugin is used on a Spigot server (See above try-catch blocks).
+        
         getCore().disable();
     }
 

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

@@ -105,13 +105,8 @@ private List<PlayerProfile> getPlayers(List<String> lines, Map<String, Object> r
         lines.forEach(line -> players.add(Bukkit.createProfile(UUID.randomUUID(), ComponentParser.text(line)
             .replacements(replacements)
             .function(text -> {
-                plugin.getPluginLogger().info("Before: " + text);
-                if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI")){
-                    String after = PlaceholderAPI.setPlaceholders(player, text);
-                    
-                    plugin.getPluginLogger().info("After: " + after);
-                    return after;
-                }
+                if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
+                    return PlaceholderAPI.setPlaceholders(player, text);
 
                 return text;
             })