Use Function instead of Consumer

Author: Andre601

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

@@ -119,6 +119,13 @@ private void load(){
 
         getPluginLogger().info("Proxy: " + plugin.getPlatformName() + " " + plugin.getPlatformVersion());
 
+        if(getFileHandler().loadConfig()){
+            getPluginLogger().info("Successfully loaded config.yml!");
+        }else{
+            getPluginLogger().warn("Unable to load config.yml! Check previous lines for errors.");
+            return;
+        }
+        
         if(getFileHandler().loadProfiles()){
             getPluginLogger().info("Successfully loaded " + getFileHandler().getProfiles().size() + " profiles!");
         }else{

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

@@ -43,16 +43,23 @@ public void handle(CmdSender sender, String[] args){
                 sender.sendMsg();
                 sender.sendMsg("<aqua>/asl help <grey>- Shows this help.");
                 sender.sendMsg();
-                sender.sendMsg("<aqua>/asl reload <grey>- Reloads the profiles.");
+                sender.sendMsg("<aqua>/asl reload <grey>- Reloads the config and profiles.");
             }else{
                 sender.sendMsg("<red>You do not have the permissions to execute this command!");
             }
         }else
         if(args[0].equalsIgnoreCase("reload")){
             if(sender.hasPermission("advancedserverlist.command.reload")){
+                sender.sendMsg("<grey>Reloading config.yml...");
+                if(core.getFileHandler().reloadConfig()){
+                    sender.sendMsg("<green>Successfully reloaded <grey>config.yml</grey>!");
+                }else{
+                    sender.sendMsg("<red>Error while reloading the config.yml.");
+                }
+                
                 sender.sendMsg("<grey>Reloading Profiles...");
                 if(core.getFileHandler().reloadProfiles()){
-                    sender.sendMsg("<green>Successfully loaded %d Profiles!", core.getFileHandler().getProfiles().size());
+                    sender.sendMsg("<green>Successfully loaded <grey>%d</grey> Profiles!", core.getFileHandler().getProfiles().size());
                 }else{
                     sender.sendMsg("<red>Error while reloading Profiles. No profiles have been loaded.");
                 }

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

@@ -32,7 +32,7 @@
 
 import java.util.List;
 import java.util.Map;
-import java.util.function.Consumer;
+import java.util.function.Function;
 
 public class ComponentParser{
 
@@ -46,7 +46,7 @@ public class ComponentParser{
         replacer = new StringReplacer();
     }
 
-    private final String text;
+    private String text;
 
     private ComponentParser(String text){
         this.text = text;
@@ -65,8 +65,8 @@ public ComponentParser replacements(Map<String, Object> replacements){
         return this;
     }
 
-    public ComponentParser consumer(Consumer<String> consumer){
-        consumer.accept(text);
+    public ComponentParser function(Function<String, String> function){
+        this.text = function.apply(text);
         return this;
     }
 

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

@@ -109,6 +109,6 @@ public String getPlayerByIp(String ip){
                 return entry.getKey();
         }
 
-        return core.getFileHandler().getString("Anonamous", "unknown_player");
+        return core.getFileHandler().getString("Anonymous", "unknown_player");
     }
 }

core/src/main/resources/config.yml

@@ -1 +1,4 @@
-unknown_player: "Anonamous"
+#
+# Used for when AdvancedServerList doesn't have a cached player to use for ${player name}
+#
+unknown_player: "Anonymous"

paper/pom.xml

@@ -77,6 +77,7 @@
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
             <version>2.11.1</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 

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

@@ -29,6 +29,7 @@
 import ch.andre601.advancedserverlist.core.interfaces.PluginCore;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 import ch.andre601.advancedserverlist.paper.commands.CmdAdvancedServerList;
+import ch.andre601.advancedserverlist.paper.events.JoinEvent;
 import ch.andre601.advancedserverlist.paper.events.PingEvent;
 import ch.andre601.advancedserverlist.paper.logging.PaperLogger;
 import org.bstats.bukkit.Metrics;
@@ -64,6 +65,7 @@ public void loadCommands(){
 
     @Override
     public void loadEvents(){
+        new JoinEvent(this);
         new PingEvent(this);
     }
 

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

@@ -38,6 +38,7 @@ public class JoinEvent implements Listener{
 
     public JoinEvent(PaperCore plugin){
         this.plugin = plugin;
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
     }
 
     @EventHandler

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

@@ -70,19 +70,23 @@ public void onServerPing(PaperServerListPingEvent event){
         if(!profile.getMotd().isEmpty()){
             event.motd(ComponentParser.list(profile.getMotd())
                 .replacements(replacements)
-                .consumer(text -> {
+                .function(text -> {
                     if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
-                        PlaceholderAPI.setPlaceholders(player, text);
+                        return PlaceholderAPI.setPlaceholders(player, text);
+                    
+                    return text;
                 })
                 .toComponent());
         }
 
         if(!profile.getPlayerCount().isEmpty()){
             event.setVersion(ComponentParser.text(profile.getPlayerCount())
                 .replacements(replacements)
-                .consumer(text -> {
+                .function(text -> {
                     if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
-                        PlaceholderAPI.setPlaceholders(player, text);
+                        return PlaceholderAPI.setPlaceholders(player, text);
+    
+                    return text;
                 })
                 .toString());
             event.setProtocolVersion(-1);
@@ -100,9 +104,16 @@ private List<PlayerProfile> getPlayers(List<String> lines, Map<String, Object> r
         List<PlayerProfile> players = new ArrayList<>();
         lines.forEach(line -> players.add(Bukkit.createProfile(UUID.randomUUID(), ComponentParser.text(line)
             .replacements(replacements)
-            .consumer(text -> {
-                if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
-                    PlaceholderAPI.setPlaceholders(player, text);
+            .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;
+                }
+    
+                return text;
             })
             .toString())));
 

paper/src/main/resources/plugin.yml

@@ -5,6 +5,11 @@ description: '${plugin.description}'
 
 main: 'ch.andre601.advancedserverlist.paper.PaperCore'
 
+api-version: 1.19
+
+softdepend:
+  - 'PlaceholderAPI'
+
 commands: 
   advancedserverlist:
     description: 'Main command of AdvancedServerList'