Upload center_text_example.jpg

Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/388

.forgejo/workflows/deploy_wiki.yml

@@ -16,8 +16,6 @@ on:
 jobs:
   deployWiki:
     runs-on: codeberg-tiny
-    container:
-      image: ghcr.io/catthehacker/ubuntu:act-latest
     steps:
       - name: "Checkout Source Repository"
         uses: https://code.forgejo.org/actions/checkout@v4

.forgejo/workflows/pr_preview.yml

@@ -16,12 +16,11 @@ on:
 
 env:
   BRANCH_NAME: "${{ github.event.repository.name }}/${{ github.event.pull_request.number }}"
+  RUN_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_number }}"
 
 jobs:
   createPreview:
     runs-on: codeberg-tiny
-    container:
-      image: ghcr.io/catthehacker/ubuntu:act-latest
     steps:
       #
       # Finding and updating comment in Pull request.
@@ -93,7 +92,7 @@ jobs:
             |---------|----------------------------------------------------------------------------------------------------------|
             | Commit  | ${{ github.event.pull_request.head.sha }}                                                                |
             | Preview | https://preview.andre601.ch/@${{ github.event.repository.name }}~${{ github.event.pull_request.number }} |
-            | Logs    | ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}                      |
+            | Logs    | ${{ env.RUN_URL }}                                                                                       |
           comment-id: "${{ steps.comment.outputs.comment-id }}"
           issue-number: "${{ github.event.pull_request.number }}"
           token: "${{ secrets.BOT_TOKEN }}"
@@ -107,10 +106,10 @@ jobs:
 
             Pull request Preview failed! Check the logs for details.
 
-            | Name    | Link                                                                                |
-            |---------|-------------------------------------------------------------------------------------|
-            | Commit  | ${{ github.event.pull_request.head.sha }}                                           |
-            | Logs    | ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} |
+            | Name    | Link                                      |
+            |---------|-------------------------------------------|
+            | Commit  | ${{ github.event.pull_request.head.sha }} |
+            | Logs    | ${{ RUN_URL }}                            |
           comment-id: "${{ steps.comment.outputs.comment-id }}"
           issue-number: "${{ github.event.pull_request.number }}"
           token: "${{ secrets.BOT_TOKEN }}"

.woodpecker/publish_assets.yml

@@ -5,20 +5,22 @@ when:
 steps:
   - name: "Build Jar and Upload"
     image: maven:3.9.9-eclipse-temurin-21
-    secrets:
-      - modrinth_api_token
-      - hangar_api_token
-      - discord_webhook_url
     environment:
       CODEBERG_API_TOKEN:
         from_secret: cb_token
+      MODRINTH_API_TOKEN:
+        from_secret: modrinth_api_token
+      HANGAR_API_TOKEN:
+        from_secret: hangar_api_token
+      DISCORD_WEBHOOK_URL:
+        from_secret: discord_webhook_url
     commands:
       - mvn clean install
       - cd version-uploader/target
       - mv VersionUploader.jar ../../
       - cd ../../
       - java -jar VersionUploader.jar --all
-  - name: "Upload Jars to Codeber"
+  - name: "Upload Jars to Codeberg"
     image: woodpeckerci/plugin-gitea-release
     settings:
       base_url: https://codeberg.org

README.md

@@ -86,6 +86,9 @@ Below can you find a collection of videos made for my plugin. If you made a vide
 <details><summary>Click to show/hide Videos</summary>
 <p>
 
+English Video by KasaiSora  
+[![video thumbnail](https://img.youtube.com/vi/9cU0uUWHOO0/0.jpg)](https://youtube.com/watch?v=9cU0uUWHOO0)
+
 Spanish Video by Ajneb97  
 [![video thumbnail](https://img.youtube.com/vi/rIbljm_4HVI/0.jpg)](https://youtube.com/watch?v=rIbljm_4HVI)
 

core/pom.xml

@@ -77,9 +77,11 @@
         <dependency>
             <groupId>ch.andre601</groupId>
             <artifactId>expressionparser</artifactId>
-            <version>1.4.3</version>
+            <version>1.5.0</version>
             <scope>compile</scope>
         </dependency>
+        
+        <!-- Configuration -->
         <dependency>
             <groupId>org.spongepowered</groupId>
             <artifactId>configurate-yaml</artifactId>
@@ -129,7 +131,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>33.3.1-jre</version>
+            <version>33.4.0-jre</version>
             <scope>provided</scope>
         </dependency>
         
@@ -137,7 +139,7 @@
         <dependency>
             <groupId>net.william278</groupId>
             <artifactId>papiproxybridge</artifactId>
-            <version>1.7.1</version>
+            <version>1.7.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -157,7 +159,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.11.3</version>
+            <version>5.11.4</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -168,6 +170,16 @@
             <resource>
                 <filtering>true</filtering>
                 <directory>${project.basedir}/src/main/resources</directory>
+                <excludes>
+                    <exclude>char-widths.json.gz</exclude>
+                </excludes>
+            </resource>
+            <resource>
+                <filtering>false</filtering>
+                <directory>${project.basedir}/src/main/resources</directory>
+                <includes>
+                    <include>char-widths.json.gz</include>
+                </includes>
             </resource>
         </resources>
         <plugins>

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

@@ -32,6 +32,7 @@ import ch.andre601.advancedserverlist.core.commands.CommandHandler;
 import ch.andre601.advancedserverlist.core.compat.maintenance.MaintenancePlaceholder;
 import ch.andre601.advancedserverlist.core.file.FileHandler;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
+import ch.andre601.advancedserverlist.core.parsing.TextCenterUtil;
 import ch.andre601.advancedserverlist.core.profiles.conditions.ProfileConditionParser;
 import ch.andre601.advancedserverlist.core.profiles.handlers.PlayerHandler;
 
@@ -47,6 +48,8 @@ public class AdvancedServerList<F>{
     private final FileHandler fileHandler;
     private final CommandHandler commandHandler;
     private final PlayerHandler playerHandler;
+    private final TextCenterUtil textCenterUtil;
+    
     private static final AdvancedServerListAPI api = AdvancedServerListAPI.get();
     private final ProfileConditionParser parser = ProfileConditionParser.create();
     
@@ -59,6 +62,7 @@ public class AdvancedServerList<F>{
         this.fileHandler = new FileHandler(this);
         this.commandHandler = new CommandHandler(this);
         this.playerHandler = new PlayerHandler(this);
+        this.textCenterUtil = new TextCenterUtil(this);
         
         plugin.getPluginLogger().info("Registering internal Placeholders...");
         
@@ -110,6 +114,10 @@ public class AdvancedServerList<F>{
         return updateChecker;
     }
     
+    public TextCenterUtil getTextCenterUtil(){
+        return textCenterUtil;
+    }
+    
     public void disable(){
         getPlugin().getPluginLogger().info("Saving playercache.json file...");
         getPlayerHandler().save();

core/src/main/java/ch/andre601/advancedserverlist/core/events/PingEventHandler.java

@@ -36,6 +36,10 @@ import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
 import ch.andre601.advancedserverlist.core.profiles.profile.ProfileManager;
 import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.JoinConfiguration;
+
+import java.util.List;
 
 public class PingEventHandler{
     
@@ -138,14 +142,18 @@ public class PingEventHandler{
         GenericServer finalServer = event.createGenericServer(online, max, host);
         
         if(ProfileManager.checkOption(entry.motd()) && ignoreMaintenance(event, "motd")){
-            logger.debug(PingEventHandler.class, "'motd' option present. Applying '%s'...", String.join("\\n", entry.motd()));
+            logger.debug(PingEventHandler.class, "'motd' option present. Applying ['%s']...", String.join("', '", entry.motd()));
             
-            event.setMotd(
-                ComponentParser.list(entry.motd())
+            List<Component> motd = entry.motd().stream()
+                .map(line -> ComponentParser.text(line)
                     .modifyText(text -> StringReplacer.replace(text, player, finalServer))
                     .modifyText(text -> event.parsePAPIPlaceholders(text, player))
+                    .modifyText(text -> plugin.getCore().getTextCenterUtil().getCenteredText(text))
                     .toComponent()
-            );
+                )
+                .toList();
+            
+            event.setMotd(Component.join(JoinConfiguration.separator(Component.newline()), motd));
         }
         
         boolean hidePlayers = ProfileManager.checkOption(entry.hidePlayersEnabled());

core/src/main/java/ch/andre601/advancedserverlist/core/migration/minimotd/MiniMOTDConfigMigrator.java

@@ -110,14 +110,14 @@ public class MiniMOTDConfigMigrator{
         if(config.iconEnabled()){
             if(config.motds().size() == 1){
                 MiniMOTDConfig.Motd motd = config.motds().get(0);
-                if(!motd.icon().isEmpty() && !motd.icon().equalsIgnoreCase("random")){
+                if(!motd.icon().isEmpty()){
                     profileBuilder.favicon(motd.icon());
                 }
             }else
             if(config.motds().size() > 1){
                 for(int i = 0; i < config.motds().size(); i++){
                     MiniMOTDConfig.Motd motd = config.motds().get(i);
-                    if(!motd.icon().isEmpty() && !motd.icon().equalsIgnoreCase("random")){
+                    if(!motd.icon().isEmpty()){
                         profilesBuilders.get(i).favicon(motd.icon());
                     }
                 }

core/src/main/java/ch/andre601/advancedserverlist/core/migration/serverlistplus/SLPConfigMigrator.java

@@ -59,14 +59,43 @@ public class SLPConfigMigrator{
         "(?<end>#[a-fA-F0-9]{6})" +   // Ending color
         "%" +
         "(?<text>.+?)" +              // Text
-        "%gradient%");
+        "%gradient%"
+    );
     
     private static final Map<String, String> STATIC_REPLACEMENTS = Map.of(
         "%player%", "${player name}",
         "%uuid%", "${player uuid}",
         "%_uuid_%", "${player uuid}",
         "%online%", "${server playersOnline}",
-        "%max%", "${server playersMax}");
+        "%max%", "${server playersMax}"
+    );
+    private static final Map<String, String> COLOR_TO_MINIMESSAGE_TAG = new HashMap<>(){{
+        // Color Codes.
+        put("a", "<green>");
+        put("b", "<aqua>");
+        put("c", "<red>");
+        put("d", "<light_purple>");
+        put("e", "<yellow>");
+        put("f", "<white>");
+        put("0", "<black>");
+        put("1", "<dark_blue>");
+        put("2", "<dark_green>");
+        put("3", "<dark_aqua>");
+        put("4", "<dark_red>");
+        put("5", "<dark_purple>");
+        put("6", "<gold>");
+        put("7", "<grey>");
+        put("8", "<dark_grey>");
+        put("9", "<blue>");
+        
+        // Formatting Codes
+        put("k", "<obfuscated>");
+        put("l", "<bold>");
+        put("m", "<strikethrough>");
+        put("n", "<underlined>");
+        put("o", "<italic>");
+        put("r", "<reset>");
+    }};
     
     public static int migrate(AdvancedServerList<?> core, CmdSender sender){
         ServerListPlusCore slpCore = ServerListPlusCore.getInstance();
@@ -194,9 +223,7 @@ public class SLPConfigMigrator{
             
             if(type == Type.PERSONALIZED){
                 node.node("condition")
-                    .set("${player name} != \"" +
-                        core.getFileHandler().getString("Anonymous", "unknownPlayer", "name") +
-                        "\"");
+                    .set("${player name} != \"" + core.getFileHandler().getString("Anonymous", "unknownPlayer", "name") + "\"");
             }else
             if(type == Type.BANNED){
                 node.node("condition")
@@ -372,32 +399,11 @@ public class SLPConfigMigrator{
         if(colorCodeMatcher.find()){
             builder.setLength(0);
             do{
-                String color = colorCodeMatcher.group("color").toLowerCase(Locale.ROOT); 
-                switch(color){
-                    case "a" -> colorCodeMatcher.appendReplacement(builder, "<green>");
-                    case "b" -> colorCodeMatcher.appendReplacement(builder, "<aqua>");
-                    case "c" -> colorCodeMatcher.appendReplacement(builder, "<red>");
-                    case "d" -> colorCodeMatcher.appendReplacement(builder, "<light_purple>");
-                    case "e" -> colorCodeMatcher.appendReplacement(builder, "<yellow>");
-                    case "f" -> colorCodeMatcher.appendReplacement(builder, "<white>");
-                    case "k" -> colorCodeMatcher.appendReplacement(builder, "<obfuscated>");
-                    case "l" -> colorCodeMatcher.appendReplacement(builder, "<bold>");
-                    case "m" -> colorCodeMatcher.appendReplacement(builder, "<strikethrough>");
-                    case "n" -> colorCodeMatcher.appendReplacement(builder, "<underlined>");
-                    case "o" -> colorCodeMatcher.appendReplacement(builder, "<italic>");
-                    case "r" -> colorCodeMatcher.appendReplacement(builder, "<reset>");
-                    case "0" -> colorCodeMatcher.appendReplacement(builder, "<black>");
-                    case "1" -> colorCodeMatcher.appendReplacement(builder, "<dark_blue>");
-                    case "2" -> colorCodeMatcher.appendReplacement(builder, "<dark_green>");
-                    case "3" -> colorCodeMatcher.appendReplacement(builder, "<dark_aqua>");
-                    case "4" -> colorCodeMatcher.appendReplacement(builder, "<dark_red>");
-                    case "5" -> colorCodeMatcher.appendReplacement(builder, "<dark_purple>");
-                    case "6" -> colorCodeMatcher.appendReplacement(builder, "<gold>");
-                    case "7" -> colorCodeMatcher.appendReplacement(builder, "<grey>");
-                    case "8" -> colorCodeMatcher.appendReplacement(builder, "<dark_grey>");
-                    case "9" -> colorCodeMatcher.appendReplacement(builder, "<blue>");
-                    // This one shouldn't be reachable given the pattern, but you never know...
-                    default -> colorCodeMatcher.appendReplacement(builder, "&" + color);
+                for(Map.Entry<String, String> colorCodes : COLOR_TO_MINIMESSAGE_TAG.entrySet()){
+                    if(!colorCodeMatcher.group("color").equalsIgnoreCase(colorCodes.getKey()))
+                        continue;
+                    
+                    colorCodeMatcher.appendReplacement(builder, colorCodes.getValue());
                 }
             }while(colorCodeMatcher.find());
             

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

@@ -29,7 +29,6 @@ import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 
-import java.util.List;
 import java.util.function.Function;
 
 public class ComponentParser{
@@ -52,10 +51,6 @@ public class ComponentParser{
         return new ComponentParser(text);
     }
     
-    public static ComponentParser list(List<String> lines){
-        return new ComponentParser(String.join("\n", lines));
-    }
-    
     public ComponentParser modifyText(Function<String, String> function){
         this.text = function.apply(text);
         return this;

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

@@ -0,0 +1,136 @@
+package ch.andre601.advancedserverlist.core.parsing;
+
+import ch.andre601.advancedserverlist.core.AdvancedServerList;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import net.kyori.adventure.text.flattener.ComponentFlattener;
+import net.kyori.adventure.text.flattener.FlattenerListener;
+import net.kyori.adventure.text.format.Style;
+import net.kyori.adventure.text.format.TextDecoration;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.zip.GZIPInputStream;
+
+public class TextCenterUtil{
+    private final ComponentFlattener COMPONENT_FLATTENER = ComponentFlattener.textOnly();
+    
+    private final double MAX_WIDTH = 270.0; // Max width of the MOTD
+    private final int SPACE_WIDTH = 4;
+    
+    private final Map<String, FontInfo> charWidths;
+    
+    public TextCenterUtil(AdvancedServerList<?> plugin){
+        charWidths = loadFontWidths(plugin);
+    }
+    
+    public String getCenteredText(String text){
+        if(!text.toLowerCase(Locale.ROOT).startsWith("<center>"))
+            return text;
+        
+        if(getDefault() == null)
+            return text;
+        
+        text = text.substring("<center>".length());
+        TextFlattenerListener listener = new TextFlattenerListener(this);
+        
+        COMPONENT_FLATTENER.flatten(ComponentParser.text(text).toComponent(), listener);
+        
+        double width = listener.getWidth();
+        if(width >= MAX_WIDTH)
+            return text;
+        
+        return createSpaces(width) + text;
+    }
+    
+    private double getCharWidth(int codePoint, boolean isBold, String fontName){
+        FontInfo font = charWidths.getOrDefault(fontName, getDefault());
+        if(font == null)
+            return -1.0;
+        
+        int index = Arrays.binarySearch(font.codePoints, codePoint);
+        if(index < 0){
+            return isBold ? 7.0 : 6.0;
+        }else{
+            return isBold ? font.advanceBf[index] : font.advance[index];
+        }
+    }
+    
+    private FontInfo getDefault(){
+        return charWidths.get("minecraft:default");
+    }
+    
+    private String createSpaces(double length){
+        double remainder = MAX_WIDTH - length;
+        int padding = (int)Math.max(0, Math.floor(remainder / 2.0) - 1);
+        
+        return " ".repeat(Math.floorDiv(padding, SPACE_WIDTH));
+    }
+    
+    private Map<String, FontInfo> loadFontWidths(AdvancedServerList<?> plugin){
+        try(InputStream stream = plugin.getClass().getResourceAsStream("/char-widths.json.gz")){
+            if(stream == null){
+                plugin.getPlugin().getPluginLogger().warn("Internal char-widths.json.gz couldn't be retrieved.");
+                plugin.getPlugin().getPluginLogger().warn("The <center> Placeholder won't work.");
+                return new HashMap<>();
+            }
+            
+            GZIPInputStream gzipStream = new GZIPInputStream(stream);
+            BufferedReader reader = new BufferedReader(new InputStreamReader(gzipStream));
+            
+            return new Gson().fromJson(reader, new TypeToken<Map<String, FontInfo>>(){}.getType());
+        }catch(IOException ex){
+            plugin.getPlugin().getPluginLogger().warn("Encountered IOException while loading font widths.");
+            plugin.getPlugin().getPluginLogger().warn("The <center> Placeholder won't work.");
+            plugin.getPlugin().getPluginLogger().warn("Cause: %s", ex.getMessage());
+            return new HashMap<>();
+        }
+    }
+    
+    private static class TextFlattenerListener implements FlattenerListener{
+        private double width = 0.0;
+        private boolean isBold = false;
+        private String font = "minecraft:default";
+        
+        private final TextCenterUtil instance;
+        
+        public TextFlattenerListener(TextCenterUtil instance){
+            this.instance = instance;
+        }
+        
+        @Override
+        public void pushStyle(@NotNull Style style){
+            if(style.hasDecoration(TextDecoration.BOLD))
+                isBold = true;
+            
+            if(style.font() != null)
+                font = style.font().asString();
+        }
+        
+        @Override
+        public void component(@NotNull String text){
+            for(int i = 0; i < text.length(); i++){
+                width += instance.getCharWidth(text.codePointAt(i), isBold, font);
+            }
+        }
+        
+        @Override
+        public void popStyle(@NotNull Style style){
+            if(style.hasDecoration(TextDecoration.BOLD))
+                isBold = false;
+        }
+        
+        public double getWidth(){
+            return width;
+        }
+    }
+    
+    private record FontInfo(int[] codePoints, float[] advance, float[] advanceBf){}
+}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/ServerListProfile.java

@@ -56,7 +56,7 @@ public record ServerListProfile(int priority, String condition, ProfileEntry def
             for(ParseWarnCollector.Context context : collector.getWarnings()){
                 logger.warn("  - At position %s:", context.position() == -1 ? "Unknown" : context.position());
                 logger.warn("    %s", condition);
-                logger.warn(" ".repeat(context.position() + 4) + "^");
+                logger.warn(" ".repeat(context.position() + 3) + "^");
                 logger.warn("    -> %s", context.message());
             }
         }

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/placeholders/tokens/CustomExpressionTokenizer.java

@@ -76,7 +76,14 @@ public class CustomExpressionTokenizer{
                 }
             }
             
-            collector.appendWarningFormatted(position.getIndex(), "Illegal Token '%c'.", text.charAt(position.getIndex()));
+            if(position.getIndex() >= text.length()){
+                collector.appendWarningFormatted(
+                    "Current index position (%d) is larger or equal to Text length (%d) for condition '%s'",
+                    position.getIndex(), text.length(), text
+                );
+            }else{
+                collector.appendWarningFormatted(position.getIndex(), "Illegal Token '%c'.", text.charAt(position.getIndex()));
+            }
             break;
         }
         

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

@@ -72,6 +72,9 @@ public class StringReplacer{
         boolean identified = false;
         boolean invalid = true;
         
+        int placeholderStart = position.getIndex() - 1;
+        int valueStart = position.getIndex() - 1;
+        
         char[] chars = input.substring(index).toCharArray();
         for(final char c : chars){
             index++;
@@ -83,6 +86,7 @@ public class StringReplacer{
             
             if(c == ' ' && !identified){
                 identified = true;
+                valueStart = index + 1;
                 continue;
             }
             
@@ -98,10 +102,6 @@ public class StringReplacer{
         
         StringBuilder raw = new StringBuilder();
         
-        // Condition parsing needs one extra increase of index... for some reason
-        if(collector != null)
-            index++;
-        
         position.setIndex(index);
         
         if(invalid){
@@ -126,7 +126,7 @@ public class StringReplacer{
             raw.append('}');
             
             if(collector != null)
-                collector.appendWarningFormatted(index, "Placeholder '%s' does not have any available PlaceholderProvider", raw.toString());
+                collector.appendWarningFormatted(placeholderStart, "Placeholder '%s' does not have any available PlaceholderProvider", raw.toString());
             
             return raw.toString();
         }
@@ -141,7 +141,7 @@ public class StringReplacer{
             raw.append('}');
             
             if(collector != null)
-                collector.appendWarningFormatted(index, "Placeholder '%s' has an invalid value String '%s'", raw.toString(), valuesStr);
+                collector.appendWarningFormatted(valueStart, "Placeholder '%s' has an invalid value String '%s'", raw.toString(), valuesStr);
             
             return raw.toString();
         }

core/src/main/resources/profiles/default.yml

@@ -58,12 +58,17 @@ motd:
 # This option supports three types of inputs:
 #
 #   1. Name, including .png extension, pointing to an image located in the plugin's favicons folder.
-#   2. URL pointing to an image.*
-#   3. Player name, UUID or placeholders returning one of these.*
+#   2. "random" to display a random PNG from the favicons folder.
+#   3. URL pointing to an image.
+#   4. Player name, UUID or placeholders returning one of these.
 #      https://mc-heads.net will be used to retrieve an image of the provided name/UUID.
 #
-# * These images are loaded asynchronously, meaning they may not yet be "ready" when AdvancedServerList is done with
-#   the event, requiring a refresh of the server list by the player to have it shown.
+# Note on favicons not showing:
+#   AdvancedServerList has to create a Favicon object for the Proxy/Server to use which takes time to do so.
+#   To not delay the Proxy/Server from being displayed (increase the loading time on the player end) is this creation
+#   done asynchronously for URL/Player name/UUID. This has the downside that the Proxy/Server may be done handling the
+#   ping before the Favicon is created, causing none to be displayed.
+#   Note that this won't happen with local favicons, as those are created during the plugin's startup.
 #
 # Any images above or below 64x64 pixels will be automatically resized to these dimensions.
 #

docs/.overrides/main.html

@@ -0,0 +1,7 @@
+{% extends "base.html" %}
+
+{% block announce %}
+  <span class="twemoji">{% include ".icons/material/party-popper.svg" %}</span>
+  Celebrating <a href="https://andre601.ch/blog/2024/12-13-history-of-asl/" target="_blank" rel="nofollow">25,000 downloads!</a> Thank you!
+  <span class="twemoji">{% include ".icons/material/party-popper.svg" %}</span>
+{% endblock %}

docs/.snippets/links.md

@@ -0,0 +1,10 @@
+[discord]: https://discord.gg/MyPTjpsgGH
+
+[placeholderapi]: https://hangar.papermc.io/HelpChat/PlaceholderAPI
+[viaversion]: https://hangar.papermc.io/ViaVersion/ViaVersion
+[papiproxybridge]: https://hangar.papermc.io/William278/PAPIProxyBridge
+[maintenance]: https://hangar.papermc.io/kennytv/Maintenance
+
+[modrinth]: https://modrinth.com/plugin/advancedserverlist
+[hangar]: https://hangar.papermc.io/Andre_601/AdvancedServerList
+[codeberg]: https://codeberg.org/Andre601/AdvancedServerList

docs/addons/banplugins.md

@@ -1,9 +1,12 @@
+---
+icon: octicons/stop-24
+---
 # BanPlugins Addon
 
 The BanPlugins Addon was made to provide placeholders for different punishment plugins to use in AdvancedServerList.
 
 /// info
-The BanPlugins Addon is available in downloads of AdvancedServerList on [:simple-modrinth: Modrinth](https://modrinth.com/plugin/advancedserverlist) and on [Releases on :simple-codeberg: Codeberg](https://codeberg.org/Andre601/AdvancedServerList/releases).
+The BanPlugins Addon is available in downloads of AdvancedServerList on [:simple-modrinth: Modrinth](https://modrinth.com/plugin/advancedserverlist) and in [Releases on :simple-codeberg: Codeberg](https://codeberg.org/Andre601/AdvancedServerList/releases).
 ///
 
 ## Placeholders

docs/api/changelog.md

@@ -17,7 +17,7 @@ They are ordered newest to oldest.
 
 ### :octicons-plus-circle-24:{ .changelog-added title="Added" } Added { #v4.0.0-added }
 
-- New setter methods added to [`ProfileEntry.Builder`][profilentry.builder] class:
+- New setter methods added to [`ProfileEntry.Builder`][profileentry.builder] class:
     - [`onlinePlayersCount(String)`][onlinePlayersCount]
     - [`onlinePlayersEnabled(NullBool)`][onlinePlayersEnabled]
 

docs/api/index.md

@@ -11,7 +11,7 @@ AdvancedServerList offers an API that other plugins can use to add their own pla
 Add the following to your `pom.xml`, `build.gradle` or `build.gradle.kts` depending on what you use:
 
 /// tab | :simple-apachemaven: Maven 
-```xml title="pom.xml"
+```xml { data-md-component="api-version" title="pom.xml" }
 <repositories>
   <repository>
     <id>codeberg</id>
@@ -51,7 +51,7 @@ Add the following to your `pom.xml`, `build.gradle` or `build.gradle.kts` depend
 ///
 
 /// tab | :simple-gradle: Gradle
-```groovy title="build.gradle"
+```groovy { data-md-component="api-version" title="build.gradle" }
 repositorories {
     maven { url = 'https://codeberg.org/api/packages/Andre601/maven/' }
 }
@@ -68,7 +68,7 @@ dependencies {
 ///
 
 /// tab | :simple-gradle: Gradle (KTS)
-```kotlin title="build.gradle.kts"
+```kotlin { data-md-component="api-version" title="build.gradle.kts" }
 repositories {
     maven("https://codeberg.org/api/packages/Andre601/maven/")
 }
@@ -96,11 +96,11 @@ To add your own placeholders, follow these steps:
 
 You should first create a new class and make it extend the abstract [`PlaceholderProvider`][placeholderprovider]. This class includes a constructor and a method you need to add, so do that:
 
-```java
+```java { .annotate title="Creating PlaceholderProvider class" }
 public class MyPlaceholders extends PlaceholderProvider {
     
     public MyPlaceholders(String identifier) {
-        super(identifier);
+        super(identifier); // (1)
     }
     
     @Override
@@ -110,14 +110,12 @@ public class MyPlaceholders extends PlaceholderProvider {
 }
 ```
 
-/// tip
-You can replace the Constructor with a String argument with a no-args constructor and set the identifier directly in the `super`:
-```java
-public MyPlaceholders() {
-    super("myplaceholders");
-}
-```
-///
+1.  It is recommended to replace this constructor with a no-args Constructor and have the placeholder name set in the `super` directly:  
+    ```java
+        public MyPlaceholders() {
+            super("myplaceholders");
+        }
+    ```
 
 The [`parsePlaceholder(String, GenericPlayer, GenericServer)`][parseplaceholder] method is used by AdvancedServerList to replace a matching placeholder with a value.  
 What you return is completely up to you. Just keep in mind that returning `null` will be treated as an invalid placeholder by AdvancedServerList, resulting in the placeholder being returned as-is without any changes.
@@ -128,7 +126,7 @@ What you return is completely up to you. Just keep in mind that returning `null`
 /// details | Example of final class
     type: example
 
-```java
+```java title="MyPlaceholders.java"
 public class MyPlaceholders extends PlaceholderProvider {
     
     public MyPlaceholders() {

docs/assets/js/repo-stats.js

@@ -4,7 +4,7 @@ document$.subscribe(async () => {
 
     const repo_stats = document.querySelector('[data-md-component="source"] .md-source__repository');
     
-    function loadCodebergInfo(data) {
+    async function loadCodebergInfo(data) {
         const facts = document.createElement("ul");
         facts.className = "md-source__facts";
         
@@ -28,22 +28,36 @@ document$.subscribe(async () => {
         repo_stats.appendChild(facts);
     }
     
-    function loadApiInfo(data) {
+    async function loadApiInfo(data) {
+        const codeBlocks = document.querySelectorAll('[data-md-component="api-version"] pre code')
+        if (codeBlocks === null)
+            return;
+        
         const version = data["version"];
-        const versionToken = '{apiVersion}';
-        const codeBlocks = document.querySelectorAll('.md-content pre code');
-        for(const codeBlock of codeBlocks) {
-            codeBlock.innerHTML = codeBlock.innerHTML.replace(new RegExp(versionToken, 'g'), version.substring(1));
-        }
+        const regex = new RegExp('{apiVersion}', 'g');
+        codeBlocks.forEach((codeBlock) => {
+            var walker = document.createTreeWalker(codeBlock, NodeFilter.SHOW_TEXT);
+            var node;
+            while (node = walker.nextNode()) {
+                node.nodeValue = node.nodeValue.replace(regex, version.substring(1));
+            }
+        });
     }
     
-    function loadPluginVersion(data) {
+    async function loadPluginVersion(data) {
+        const entries = document.querySelectorAll('code[data-md-component="plugin-version"]');
+        if(entries === null)
+            return;
+        
         const version = data["version"];
-        const versionToken = '{version}'
-        const entries = document.querySelectorAll('.md-content code');
-        for(const entry of entries) {
-            entry.innerHTML = entry.innerHTML.replace(new RegExp(versionToken, 'g'), version.substring(1));
-        }
+        const regex = new RegExp('{version}', 'g');
+        entries.forEach((entry) => {
+            var walker = document.createTreeWalker(entry, NodeFilter.SHOW_TEXT);
+            var node;
+            while (node = walker.nextNode()) {
+                node.nodeValue = node.nodeValue.replace(regex, version.substring(1));
+            }
+        })
     }
     
     async function fetchApiInfo() {

docs/assets/stylesheets/custom.css

@@ -44,4 +44,11 @@
 
 .md-source__repository .md-source__facts {
     animation: facts .25s ease-in;
+}
+
+.md-nav--secondary li.md-nav__item > .md-nav__link {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    display: block;
 }

docs/examples/index.md

@@ -10,7 +10,7 @@ icon: octicons/list-unordered-24
 
 This page lists some examples you may want to use for your proxy or server.
 
-Feel free to suggest additional examples in the `advancedserverlist` category on the [M.O.S.S. Discord Server](https://discord.gg/MyPTjpsgGH){ target="_blank" rel="nofollow" }.
+Feel free to suggest additional examples in the `advancedserverlist` category on the [M.O.S.S. Discord Server][discord]{ target="_blank" rel="nofollow" }.
 
 ## Table of Contents
 

docs/getting-started/index.md

@@ -5,7 +5,7 @@ icon: octicons/milestone-24
 # Getting Started
 
 This page will explain how to set up AdvancedServerList and make it work for your server.  
-The guide is designed to be as easy to understand as possible. If you still have problems or questions, join the [M.O.S.S Discord Server](https://discord.gg/MyPTjpsgGH){ target="_blank" rel="nofollow" } for more help.
+The guide is designed to be as easy to understand as possible. If you still have problems or questions, join the [M.O.S.S Discord Server][discord]{ target="_blank" rel="nofollow" } for more help.
 
 ## 1. Download the plugin { #download-the-plugin }
 
@@ -109,10 +109,6 @@ The plugin also supports these additional plugins. They are all optional.
 
 </div>
 
-[placeholderapi]: https://hangar.papermc.io/HelpChat/PlaceholderAPI
-[viaversion]: https://hangar.papermc.io/ViaVersion/ViaVersion
-[papiproxybridge]: https://hangar.papermc.io/William278/PAPIProxyBridge
-[maintenance]: https://hangar.papermc.io/kennytv/Maintenance
 [addon]: ../addons/banplugins.md
 
 ## 2. Installation { #installation }
@@ -120,11 +116,11 @@ The plugin also supports these additional plugins. They are all optional.
 Installing the plugin is as simple as moving the jar file into the `plugins` folder. Just make sure to download the right version of AdvancedServerList for the right platform.  
 Here is a quick table showing the jar file name with the platforms it is made for:
 
-| Jar file name                                 | Platforms             |
-|-----------------------------------------------|-----------------------|
-| `AdvancedServerList-Paper-{version}.jar`      | Paper                 |
-| `AdvancedServerList-BungeeCord-{version}.jar` | BungeeCord, Waterfall |
-| `AdvancedServerList-Velocity-{version}.jar`   | Velocity              |
+| Jar file name                                                                       | Platforms             |
+|-------------------------------------------------------------------------------------|-----------------------|
+| `AdvancedServerList-Paper-{version}.jar`{ data-md-component="plugin-version" }      | Paper                 |
+| `AdvancedServerList-BungeeCord-{version}.jar`{ data-md-component="plugin-version" } | BungeeCord, Waterfall |
+| `AdvancedServerList-Velocity-{version}.jar`{ data-md-component="plugin-version" }   | Velocity              |
 
 After you added it to your plugins folder - alongside any other dependency you may want - (re)start your server or proxy to enable the plugin.  
 If everything goes well should AdvancedServerList create a folder named `AdvancedServerList` (`advancedserverlist` on Velocity) with additional files and folders inside of it.
@@ -214,12 +210,17 @@ motd:
 # This option supports three types of inputs:
 #
 #   1. Name, including .png extension, pointing to an image located in the plugin's favicons folder.
-#   2. URL pointing to an image.*
-#   3. Player name, UUID or placeholders returning one of these.*
+#   2. "random" to display a random PNG from the favicons folder.
+#   3. URL pointing to an image.
+#   4. Player name, UUID or placeholders returning one of these.
 #      https://mc-heads.net will be used to retrieve an image of the provided name/UUID.
 #
-# * These images are loaded asynchronously, meaning they may not yet be "ready" when AdvancedServerList is done with
-#   the event, requiring a refresh of the server list by the player to have it shown.
+# Note on favicons not showing:
+#   AdvancedServerList has to create a Favicon object for the Proxy/Server to use which takes time to do so.
+#   To not delay the Proxy/Server from being displayed (increase the loading time on the player end) is this creation
+#   done asynchronously for URL/Player name/UUID. This has the downside that the Proxy/Server may be done handling the
+#   ping before the Favicon is created, causing none to be displayed.
+#   Note that this won't happen with local favicons, as those are created during the plugin's startup.
 #
 # Any images above or below 64x64 pixels will be automatically resized to these dimensions.
 #
@@ -290,6 +291,7 @@ playerCount:
     enabled: false
     #
     # Set the number that should be added to the online player count to then use as the new max player count.
+    # Placeholders resolving to numbers can be used here.
     #
     # Example: Setting this to 1 will result in ${server playersMax} displaying 11 while 10 players are online,
     #          9 when 8 are online and so on.
@@ -318,12 +320,37 @@ playerCount:
     enabled: false
     #
     # Set the number that should be used as the new max players count.
+    # Placeholders resolving to numbers can be used here.
     #
     # If not present, defaults to 0.
     #
     # Read more: https://asl.andre601.ch/profiles/#maxplayers-amount
     #
     amount: 0
+  #
+  # The onlinePlayers feature allows to set a number to use as the online player count to display.
+  #
+  # Read more: https://asl.andre601.ch/profiles/#onlineplayers
+  #
+  onlinePlayers:
+    #
+    # Set whether the onlinePlayers feature should be enabled or not.
+    # When set to true, the max player count will be set to the 'amount' value.
+    #
+    # If not present, defaults to false.
+    #
+    # Read more: https://asl.andre601.ch/profiles/#onlineplayers-enabled
+    #
+    enabled: false
+    #
+    # Set the number that should be used as the new online players count.
+    # Placeholders resolving to numbers can be used here.
+    #
+    # If not present, defaults to current online player count.
+    #
+    # Read more: https://asl.andre601.ch/profiles/#onlineplayers-amount
+    #
+    amount: 0
 ```
 ///
 

docs/getting-started/tutorials.md

@@ -0,0 +1,37 @@
+---
+icon: octicons/project-roadmap-24
+---
+
+# Tutorials
+
+This page lists tutorials made by the community of AdvancedServerList.  
+Be aware that any info shown may be outdated.
+
+Can't find a tutorial that exists? Join the [M.O.S.S. Discord][discord]{ target="_blank" rel="nofollow" } and suggest it in `#asl-support` to be added.
+
+## Video Tutorials
+
+Below is a collection of video tutorials made.
+
+/// note
+For privacy reasons are only thumbnails of the videos displayed, as otherwise sensitive data would be sent via embedding the videos themself.  
+you can click the image to be sent to the actual video.
+///
+
+### KasaiSora
+
+**Video Language:** :flag_gb: English
+
+[![thumbnail](https://img.youtube.com/vi/9cU0uUWHOO0/0.jpg)](https://youtube.com/watch?v=9cU0uUWHOO0){ target="_blank" rel="nofollow" }
+
+### Ajneb97
+
+**Video Language:** :flag_es: Spanish
+
+[![thumbnail](https://img.youtube.com/vi/rIbljm_4HVI/0.jpg)](https://youtube.com/watch?v=rIbljm_4HVI){ target="_blank" rel="nofollow" }
+
+## Text Tutorials
+
+Text-based tutorials (Forum Posts, Blog Posts, etc).
+
+*No entries yet*

docs/migration/index.md

@@ -11,13 +11,13 @@ These pages may include important information about the migration process and wh
 
 <div class="grid cards" markdown>
 
--   [**MiniMOTD**](minimotd.md)
+-   [**MiniMOTD**](plugins/minimotd.md)
     
     ----
     
     Migrate from the Plugin [MiniMOTD](https://github.com/jpenilla/MiniMOTD){ target="_blank" rel="nofollow" }
 
--   [**ServerListPlus**](serverlistplus.md)
+-   [**ServerListPlus**](plugins/serverlistplus.md)
     
     ----
     
@@ -32,31 +32,31 @@ These guides are only for the Server List Profile files, as the config.yml gets
 
 <div class="grid cards" markdown>
 
--   [**v3.8.0 to v3.9.0**](v3_8_0-to-v3_9_0.md)
+-   [**v3.8.0 to v3.9.0**](versions/v3.8.0-to-v3.9.0.md)
     
     ----
     
     Migrate from version 3.8.0 to 3.9.0.
 
--   [**v3.7.0 to v3.8.0**](v3_7_0-to-v3_8_0.md)
+-   [**v3.7.0 to v3.8.0**](versions/v3.7.0-to-v3.8.0.md)
 
     ----
     
     Migrating from version 3.7.0 to 3.8.0.
 
--   [**< v3.7.0 to v3.7.0**](pre-v3_7_0-to-v3_7_0.md)
+-   [**< v3.7.0 to v3.7.0**](versions/pre-v3.7.0-to-v3.7.0.md)
     
     ----
     
     Migrate from any version prior to 3.7.0 to 3.7.0 or newer.
 
--   [**v1.9.0 to v1.10.0**](v1_9_0-to-v1_10_0.md)
+-   [**v1.9.0 to v1.10.0**](versions/v1.9.0-to-v1.10.0.md)
     
     ----
     
     Migrate from version 1.9.0 to 1.10.0.
 
--   [**v1.5.3 to v1.6.0**](v1_5_3-to-v1_6_0.md)
+-   [**v1.5.3 to v1.6.0**](versions/v1.5.3-to-v1.6.0.md)
     
     ----
     

docs/migration/plugins/minimotd.md

@@ -11,14 +11,14 @@ Version `4.10.0` added support for migrating your existing `main.conf` configura
 
 ## How to Migrate
 
-Execute the command [`/asl migrate minimotd`](../commands/index.md#migrate) to start the migration process. Make sure the `main.conf` file is present in `/plugins/MiniMOTD/` (`minimotd-velocity` on Velocity).
+Execute the command [`/asl migrate minimotd`](../../commands/index.md#migrate) to start the migration process. Make sure the `main.conf` file is present in `/plugins/MiniMOTD/` (`minimotd-velocity` on Velocity).
 
 ## Example
 
 Below can you find a full example of a `main.conf` file and the corresponding migrated files from AdvancedServerList:
 
 /// tab | :octicons-file-code-24: main.conf
-```lighty
+```ruby
 icon-enabled=true
 motd-enabled=true
 motds=[

docs/migration/plugins/serverlistplus.md

@@ -48,7 +48,7 @@ The following Favicon options get converted into an equivalent one:
 
 ## How to Migrate
 
-Execute the command [`/asl migrate serverlistplus`](../commands/index.md#migrate) to start the migration process. Make sure that ServerListPlus is present and enabled.
+Execute the command [`/asl migrate serverlistplus`](../../commands/index.md#migrate) to start the migration process. Make sure that ServerListPlus is present and enabled.
 
 ## Example
 

docs/migration/versions/pre-v3.7.0-to-v3.7.0.md

@@ -5,7 +5,7 @@ icon: octicons/arrow-right-24
 # < v3.7.0 to v3.7.0
 
 Version 3.7.0 of AdvancedServerList brought significant changes to its conditions system.  
-Namely, the `conditions` option is now deprecated and planned for removal in a future release of the Plugin, and the new [`condition`](../profiles/index.md#condition) option should now be used instead.
+Namely, the `conditions` option is now deprecated and planned for removal in a future release of the Plugin, and the new [`condition`](../../profiles/index.md#condition) option should now be used instead.
 
 ## Migration
 

docs/placeholderapi/index.md

@@ -6,8 +6,6 @@ icon: material/percent
 
 AdvancedServerList provides support for [PlaceholderAPI] placeholders to be used, while also providing its own set of placeholders.
 
-[placeholderapi]: https://hangar.papermc.io/HelpChat/PlaceholderAPI
-
 ## Own placeholders
 
 The below listed placeholders can be used through PlaceholderAPI in other plugins.  

docs/profiles/index.md

@@ -91,6 +91,8 @@ motd:
 
 ## Motd
 
+<!-- admo:tip Start a line with <code>&lt;center&gt;</code> to have it centered. -->
+
 The `motd` option allows you to alter the "Message of the day" that is being displayed on a server in the multiplayer screen.  
 Please see the [Formatting](formatting.md) for all supported formatting options.
 
@@ -119,15 +121,27 @@ motd:
 
 The `favicon` option can be used to define an image to display in the server list.
 
-The Value can be one of three possible options, each being checked for in order:
+The Value can be one of the following:
 
-- A URL pointing to an image file. The URL needs to start with `https://` to work.
-- The keyword `random`. Setting this will have the plugin randomly select an existing PNG file from its `favicons` folder.
-- A filename matching an existing PNG file in the plugin's `favicons` folder. The `.png` extension needs to be included.
-- A player name or UUID, or a [placeholder](placeholders.md) that resolves into one.
+- A URL pointing to a Image file. The URL needs to start with `https://` for it to work.
+- A filename matching a pre-existing file in the `favicons` folder of the Plugin.
+    - Only PNG files are supported for now and the provided filename needs to end with `.png`
+    - `random` can be used to have the plugin select a random image from the Favicons folder.
+- A player name or UUID.
+    - `${player name}`, `${player uuid}` or any [placeholder](placeholders.md) that resolves into a player name/UUID can be used.
+    - Uses [mc-heads.net](https://mc-heads.net) to resolve the Player Name/UUID.
 
-Note that for the name/UUID, the site https://mc-heads.net is being used.  
-Use the URL option with the `${player uuid}` placeholder if you want to use another service.
+/// details | Why is the favicon from URL/Placeholder not showing?
+    type: question
+
+AdvancedServerList has to create a Favicon instance to use, as the Proxy/Server doesn't directly use PNG images.  
+This action takes time, so to not unnecessarely delay the Pinged Proxy/Server from showing is this done asynchrnously.  
+This has the issue that the Proxy/Server may be done with handling the Ping before AdvancedServerList is done creating the Favicon, resulting in no favicon being displayed.
+
+This issue is only present for when using either a URL or a Player name/uuid and not for local favicons, as those are created when the plugin loads.
+
+Favicons *should* display on the second ping, if pinged within the configured favicon cache time (Default: 1 minute).
+///
 
 /// details | Example
     type: example

mkdocs.yml

@@ -68,6 +68,18 @@ extra:
 plugins:
   - search
   - glightbox
+  - redirects:
+      redirect_maps:
+        # Plugin Migration Pages
+        'migration/minimotd.md': 'migration/plugins/minimotd.md'
+        'migration/serverlistplus.md': 'migration/plugins/serverlistplus.md'
+        #
+        # Version Migration Pages
+        'migration/v3_8_0-to-v3_9_0.md': 'migration/versions/v3.8.0-to-v3.9.0.md'
+        'migration/v3_7_0-to-v3_8_0.md': 'migration/versions/v3.7.0-to-v3.8.0.md'
+        'migration/pre-v3_7_0-to-v3_7_0.md': 'migration/versions/pre-v3.7.0-to-v3.7.0.md'
+        'migration/v1_9_0-to-v1_10_0.md': 'migration/versions/v1.9.0-to-v1.10.0.md'
+        'migration/v1_5_3-to-v1_6_0.md': 'migration/versions/v1.5.3-to-v1.6.0.md'
   - pagenav-generator
 
 markdown_extensions:
@@ -84,6 +96,8 @@ markdown_extensions:
   - pymdownx.superfences:
   - pymdownx.snippets:
       base_path: docs/.snippets
+      auto_append:
+        - links.md
   - pymdownx.blocks.admonition:
       types:
         - note
@@ -108,7 +122,9 @@ hooks:
 
 nav:
   - Home: index.md
-  - Getting Started: getting-started/index.md
+  - Getting Started:
+    - getting-started/index.md
+    - Tutorials: getting-started/tutorials.md
   - Commands: commands/index.md
   - Profiles:
     - profiles/index.md
@@ -119,14 +135,14 @@ nav:
   - Migration:
     - migration/index.md
     - Other Plugins:
-      - MiniMOTD: migration/minimotd.md
-      - ServerListPlus: migration/serverlistplus.md
+      - MiniMOTD: migration/plugins/minimotd.md
+      - ServerListPlus: migration/plugins/serverlistplus.md
     - AdvancedServerList:
-      - v3.8.0 to v3.9.0: migration/v3_8_0-to-v3_9_0.md
-      - v3.7.0 to v3.8.0: migration/v3_7_0-to-v3_8_0.md
-      - '< v3.7.0 to v3.7.0': migration/pre-v3_7_0-to-v3_7_0.md
-      - v1.9.0 to v1.10.0: migration/v1_9_0-to-v1_10_0.md
-      - v1.5.3 to v1.6.0: migration/v1_5_3-to-v1_6_0.md
+      - v3.8.0 to v3.9.0: migration/versions/v3.8.0-to-v3.9.0.md
+      - v3.7.0 to v3.8.0: migration/versions/v3.7.0-to-v3.8.0.md
+      - '< v3.7.0 to v3.7.0': migration/versions/pre-v3.7.0-to-v3.7.0.md
+      - v1.9.0 to v1.10.0: migration/versions/v1.9.0-to-v1.10.0.md
+      - v1.5.3 to v1.6.0: migration/versions/v1.5.3-to-v1.6.0.md
   - API:
     - api/index.md
     - Changelog: api/changelog.md

paper/pom.xml

@@ -99,7 +99,7 @@
         <dependency>
             <groupId>com.viaversion</groupId>
             <artifactId>viaversion-api</artifactId>
-            <version>5.1.1</version>
+            <version>5.2.0</version>
             <scope>provided</scope>
         </dependency>
 
@@ -118,6 +118,16 @@
             <resource>
                 <filtering>true</filtering>
                 <directory>${project.basedir}/src/main/resources</directory>
+                <excludes>
+                    <exclude>char-widths.json.gz</exclude>
+                </excludes>
+            </resource>
+            <resource>
+                <filtering>false</filtering>
+                <directory>${project.basedir}/src/main/resources</directory>
+                <includes>
+                    <include>char-widths.json.gz</include>
+                </includes>
             </resource>
         </resources>
         <plugins>

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

@@ -67,18 +67,6 @@ public class PaperCore extends JavaPlugin implements PluginCore<CachedServerIcon
     
     @Override
     public void onEnable(){
-        try{
-            Class.forName("io.papermc.paper.configuration.ConfigurationLoaders");
-        }catch(ClassNotFoundException ignored){
-            try{
-                // Above class only exists since 1.19+. This is a fallback to see if an older version is used.
-                Class.forName("com.destroystokyo.paper.PaperConfig");
-            }catch(ClassNotFoundException ex){
-                printNoPaperWarning();
-                return;
-            }
-        }
-        
         this.core = AdvancedServerList.init(this, new PaperPlayerPlaceholders(), new PaperServerPlaceholders(this));
         
         if(getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
@@ -225,27 +213,6 @@ public class PaperCore extends JavaPlugin implements PluginCore<CachedServerIcon
         return players.size();
     }
     
-    private void printNoPaperWarning(){
-        getPluginLogger().warn("======================================================================================");
-        getPluginLogger().warn("THIS SERVER DOES NOT USE PAPER OR A COMPATIBLE FORK!");
-        getPluginLogger().warn("");
-        getPluginLogger().warn("AdvancedServerList 3.6.0 has dropped support for Spigot-based servers.");
-        getPluginLogger().warn("This means that only servers using Paper or a Paper-compatible fork may work.");
-        getPluginLogger().warn("");
-        getPluginLogger().warn("Reasons for this removal:");
-        getPluginLogger().warn("  - Reliance on a different plugin for core functionalities.");
-        getPluginLogger().warn("  - Bad dependency loading limited to MavenCentral only.");
-        getPluginLogger().warn("");
-        getPluginLogger().warn("Please consider switching to Paper or one of the Paper-compatible forks to benefit");
-        getPluginLogger().warn("from overall performance improvements amongst other things.");
-        getPluginLogger().warn("");
-        getPluginLogger().warn("Disabling AdvancedServerList. If you believe this is an error, report it on");
-        getPluginLogger().warn("Codeberg: https://codeberg.org/Andre601/AdvancedServerList");
-        getPluginLogger().warn("======================================================================================");
-        
-        Bukkit.getPluginManager().disablePlugin(this);
-    }
-    
     private String getNewVersion(){
         ServerBuildInfo info = ServerBuildInfo.buildInfo();
         

paper/src/main/java/ch/andre601/advancedserverlist/paper/listeners/LoadEvent.java

@@ -48,5 +48,20 @@ public class LoadEvent implements Listener{
         
         // Load currently loaded worlds into the WorldCache
         Bukkit.getWorlds().forEach(world -> plugin.getWorldCache().addWorld(world));
+        
+        // Print a warning if server load was after a reload.
+        if(event.getType() != ServerLoadEvent.LoadType.RELOAD)
+            return;
+        
+        plugin.getPluginLogger().warn("======================================================================================");
+        plugin.getPluginLogger().warn("SERVER RELOAD DETECTED!");
+        plugin.getPluginLogger().warn("");
+        plugin.getPluginLogger().warn("A server reload has been detected by AdvancedServerList, meaning either the /reload");
+        plugin.getPluginLogger().warn("command or Bukkit.reload() was executed.");
+        plugin.getPluginLogger().warn("");
+        plugin.getPluginLogger().warn("YOU WILL GET NO SUPPORT FOR THE PLUGIN FOR ANY ISSUES YOU ENCOUNTER AFTER A SERVER");
+        plugin.getPluginLogger().warn("RELOAD!");
+        plugin.getPluginLogger().warn("ALWAYS RESTART YOUR SERVER. NEVER RELOAD IT!");
+        plugin.getPluginLogger().warn("======================================================================================");
     }
 }

paper/src/main/java/ch/andre601/advancedserverlist/paper/objects/placeholders/PAPIPlaceholders.java

@@ -46,6 +46,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
+import java.util.stream.Collectors;
 
 public class PAPIPlaceholders extends PlaceholderExpansion{
     
@@ -114,9 +115,9 @@ public class PAPIPlaceholders extends PlaceholderExpansion{
         
         BukkitServer finalServer = new PaperServerImpl(plugin.getWorldCache().worlds(), online, max, host);
         return switch(identifier.toLowerCase(Locale.ROOT)){
-            case "motd" -> getOption(entry.motd(), pl, player, finalServer);
+            case "motd" -> getOption(entry.motd(), pl, player, finalServer, true);
             case "favicon" -> getOption(entry.favicon(), pl, player, finalServer);
-            case "playercount_hover" -> getOption(entry.players(), pl, player, finalServer);
+            case "playercount_hover" -> getOption(entry.players(), pl, player, finalServer, false);
             case "playercount_text" -> getOption(entry.playerCountText(), pl, player, finalServer);
             case "playercount_extraplayers" -> extraPlayers == null ? "null" : String.valueOf(extraPlayers);
             case "playercount_maxplayers" -> maxPlayers == null ? "null" : String.valueOf(maxPlayers);
@@ -136,14 +137,23 @@ public class PAPIPlaceholders extends PlaceholderExpansion{
     }
     
     private String getOption(String str, Player pl, BukkitPlayer player, BukkitServer server){
-        return getOption(Collections.singletonList(str), pl, player, server);
+        return getOption(Collections.singletonList(str), pl, player, server, false);
     }
     
-    private String getOption(List<String> list, Player pl, BukkitPlayer player, BukkitServer server){
-        return ComponentParser.list(list)
-            .modifyText(text -> StringReplacer.replace(text, player, server))
-            .modifyText(text -> PlaceholderAPI.setPlaceholders(pl, text))
-            .toString();
+    private String getOption(List<String> list, Player pl, BukkitPlayer player, BukkitServer server, boolean isMotd){
+        return list.stream()
+            .map(line -> ComponentParser.text(line)
+                .modifyText(text -> StringReplacer.replace(text, player, server))
+                .modifyText(text -> PlaceholderAPI.setPlaceholders(pl, text))
+                .modifyText(text -> {
+                    if(isMotd)
+                        return plugin.getCore().getTextCenterUtil().getCenteredText(text);
+                    
+                    return text;
+                })
+                .toString()
+            )
+            .collect(Collectors.joining("\n"));
     }
     
     private Integer parseNumberOption(String option, Player pl, BukkitPlayer player, BukkitServer server){

paper/src/main/resources/paper-plugin.yml

@@ -5,7 +5,7 @@ description: '${plugin.description}'
 
 main: 'ch.andre601.advancedserverlist.paper.PaperCore'
 
-api-version: '1.19'
+api-version: '1.20'
 
 folia-supported: true
 
@@ -24,15 +24,6 @@ dependencies:
       load: BEFORE
       required: false
 
-# The below stuff is NOT used by Paper plugin.
-commands:
-  advancedserverlist:
-    description: 'Main command of AdvancedServerList'
-    usage: '/<command> [help|reload]'
-    aliases:
-      - 'asl'
-    permission: 'advancedserverlist.admin'
-
 # This is actually supported(?)
 permissions:
   advancedserverlist.*:

paper/src/main/resources/plugin.yml

@@ -1,58 +0,0 @@
-#
-# This file is kept for Folia support.
-#
-
-name: 'AdvancedServerList'
-author: 'Andre_601'
-version: '${plugin.version}'
-description: '${plugin.description}'
-
-main: 'ch.andre601.advancedserverlist.paper.PaperCore'
-
-api-version: '1.19'
-
-folia-supported: true
-
-libraries:
-  - 'org.spongepowered:configurate-yaml:4.1.2'
-  - 'net.kyori:adventure-text-serializer-legacy:4.12.0'
-  - 'com.squareup.okhttp3:okhttp:4.10.0'
-
-softdepend:
-  - 'PlaceholderAPI'
-  - 'Maintenance'
-
-commands:
-  advancedserverlist:
-    description: 'Main command of AdvancedServerList'
-    usage: '/<command> [help|reload|clearCache]'
-    aliases:
-      - 'asl'
-    permission: 'advancedserverlist.admin'
-
-permissions:
-  advancedserverlist.*:
-    description: 'Grants access to all permissions'
-    default: op
-    children:
-      - 'advancedserverlist.admin'
-  advancedserverlist.admin:
-    description: 'Grants access to all permissions'
-    default: op
-    children:
-      - 'advancedserverlist.command.*'
-  advancedserverlist.command.*:
-    description: 'Grants access to all commands'
-    default: op
-    children:
-      - 'advancedserverlist.command.help'
-      - 'advancedserverlist.command.reload'
-  advancedserverlist.command.help:
-    description: 'Grants access to /asl help'
-    default: op
-  advancedserverlist.command.reload:
-    description: 'Grants access to /asl reload'
-    default: op
-  advancedserverlist.command.clearcache:
-    description: 'Clears the Player and Favicon cache'
-    default: op

pom.xml

@@ -37,7 +37,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         
-        <plugin.version>5.1.0</plugin.version>
+        <plugin.version>5.2.0</plugin.version>
         <plugin.description>Create multiple Server lists based on conditions.</plugin.description>
         
         <api.version>4.0.0</api.version>

requirements.txt

@@ -1,3 +1,4 @@
-mkdocs-material==9.5.47
+mkdocs-material==9.5.49
 mkdocs-glightbox==0.4.0
+mkdocs-redirects==1.2.2
 git+https://github.com/Andre601/mkdocs-pagenav-generator

version-uploader/pom.xml

@@ -52,7 +52,7 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.5.12</version>
+            <version>1.5.14</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

version-uploader/src/main/java/ch/andre601/advancedserverlist/versionuploader/hangar/HangarVersionUploader.java

@@ -130,7 +130,7 @@ public class HangarVersionUploader{
                 Platform.VELOCITY, velocityDependencies
             ),
             Map.of(
-                Platform.PAPER, List.of("1.20.x", "1.21"),
+                Platform.PAPER, List.of("1.20.x", "1.21.x"),
                 Platform.WATERFALL, List.of("1.19.x", "1.20.x", "1.21"),
                 Platform.VELOCITY, Collections.singletonList("3.2")
             ),

version-uploader/src/main/java/ch/andre601/advancedserverlist/versionuploader/modrinth/ModrinthVersionUploader.java

@@ -55,7 +55,8 @@ public class ModrinthVersionUploader{
         PlatformInfo.VELOCITY
     );
     private final List<String> versions = List.of(
-        "1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6", "1.21"
+        "1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6",
+        "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4"
     );
     
     private final ModrinthAPI api;