Possible fix for IndexOutOfBoundsException in condition parsing.

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

.forgejo/workflows/deploy_wiki.yml

@@ -0,0 +1,43 @@
+name: "Deploy Wiki"
+
+on:
+  push:
+    branches:
+      - master
+    tags-ignore:
+      - "**"
+    paths:
+      - ".forgejo/workflows/deploy_wiki.yml"
+      - "docs/**"
+      - "domains"
+      - "mkdocs.yml"
+      - "requirements.txt"
+
+jobs:
+  deployWiki:
+    runs-on: codeberg-tiny
+    steps:
+      - name: "Checkout Source Repository"
+        uses: https://code.forgejo.org/actions/checkout@v4
+        with:
+          token: "${{ secrets.BOT_TOKEN }}"
+      - name: "Checkout Target Repository"
+        run: "git clone -b pages https://codeberg.org/Andre601/asl-docs site"
+      - name: "Setup Python 3.x"
+        uses: https://code.forgejo.org/actions/setup-python@v5
+        with:
+          python-version: 3.x
+      - name: "Install Dependencies"
+        run: "pip install -r requirements.txt"
+      - name: "Build Website"
+        run: "mkdocs build"
+      - name: "Commit and Push"
+        run: |
+          git config --global user.email "andre_601-bot@noreply.codeberg.org"
+          git config --global user.name "ASL Wiki Builder"
+          mv domains site/.domains
+          cd site
+          git remote set-url origin https://${{ secrets.BOT_TOKEN }}@codeberg.org/Andre601/asl-docs
+          git add --all
+          git commit -m "Update Wiki ($( env TZ=Europe/Zurich date +"%d.%m.%Y %Z" ))"
+          git push

.forgejo/workflows/pr_preview.yml

@@ -0,0 +1,115 @@
+name: Pull Request Preview
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - reopened
+      - synchronize
+    paths:
+      - ".forgejo/workflows/pr_preview.yml"
+      - "docs/**"
+      - "mkdocs.yml"
+      - "preview_domains"
+      - "requirements.txt"
+  workflow_dispatch:
+
+env:
+  BRANCH_NAME: "${{ github.event.repository.name }}/${{ github.event.pull_request.number }}"
+
+jobs:
+  createPreview:
+    runs-on: codeberg-tiny
+    steps:
+      #
+      # Finding and updating comment in Pull request.
+      # If not found, have one created instead.
+      #
+      - name: "Find Comment"
+        id: find-comment
+        uses: https://github.com/peter-evans/find-comment@v3
+        with:
+          issue-number: "${{ github.event.pull_request.number }}"
+          comment-author: "Andre_601-Bot"
+      - name: "Create or update Comment"
+        id: comment
+        uses: https://github.com/peter-evans/create-or-update-comment@v4
+        with:
+          body: |-
+            ## Pull request Preview
+
+            Creating Preview for Pull request. Please wait...
+          comment-id: "${{ steps.find-comment.outputs.comment-id }}"
+          issue-number: "${{ github.event.pull_request.number }}"
+          token: "${{ secrets.BOT_TOKEN }}"
+          edit-mode: replace
+      #
+      # Setup source and target repository.
+      # Build website and push.
+      #
+      - name: "Checkout Source Repository"
+        uses: https://code.forgejo.org/actions/checkout@v4
+        with:
+          token: ${{ secrets.BOT_TOKEN }}
+          fetch-depth: 0
+          ref: "${{ github.event.pull_request.head.sha }}"
+      - name: "Checkout Target Repository"
+        run: |
+          git clone https://codeberg.org/Andre601/preview site
+          cd site
+          git switch ${{ env.BRANCH_NAME }} 2>/dev/null || git switch -c ${{ env.BRANCH_NAME }}
+      - name: "Setup Python 3.x"
+        uses: https://code.forgejo.org/actions/setup-python@v5
+        with:
+          python-version: 3.x
+      - name: "Install Dependencies"
+        run: "pip install -r requirements.txt"
+      - name: "Build Website"
+        run: "mkdocs build"
+      - name: "Commit and Push"
+        run: |
+          git config --global user.email "andre_601-bot@noreply.codeberg.org"
+          git config --global user.name "PR Docs Preview Builder"
+          mv preview_domains site/.domains
+          cd site
+          git remote add upstream https://${{ secrets.BOT_TOKEN }}@codeberg.org/Andre601/preview.git
+          git add --all
+          git commit -m "Update Preview for ${{ env.BRANCH_NAME }} ($( env TZ=Europe/Zurich date +"%d.%m.%Y %Z" ))"
+          git push --set-upstream upstream ${{ env.BRANCH_NAME }} -f
+      #
+      # Update comment on success or failure.
+      #
+      - name: "Comment Success"
+        uses: https://github.com/peter-evans/create-or-update-comment@v4
+        with:
+          body: |-
+            ## Pull request Preview
+
+            Pull request Preview created successfully!
+
+            | Name    | Link                                                                                                     |
+            |---------|----------------------------------------------------------------------------------------------------------|
+            | 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 }}                      |
+          comment-id: "${{ steps.comment.outputs.comment-id }}"
+          issue-number: "${{ github.event.pull_request.number }}"
+          token: "${{ secrets.BOT_TOKEN }}"
+          edit-mode: replace
+      - name: "Comment Failure"
+        if: ${{ failure() }}
+        uses: https://github.com/peter-evans/create-or-update-comment@v4
+        with:
+          body: |-
+            ## Pull request Preview
+
+            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 }} |
+          comment-id: "${{ steps.comment.outputs.comment-id }}"
+          issue-number: "${{ github.event.pull_request.number }}"
+          token: "${{ secrets.BOT_TOKEN }}"
+          edit-mode: replace

.gitea/assets/MODRINTH.md

@@ -98,6 +98,6 @@ Spanish Video by Ajneb97
   <img src="https://wsrv.nl/?url=https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/social/revolt-singular_vector.svg&h=48" alt="revolt" title="Join my Revolt Server">
 </a>
 <br>
-<a href="https://blobfox.coffee/@andre_601" target="_blank">
+<a href="https://swiss.social/@andre_601" target="_blank">
   <img src="https://wsrv.nl/?url=https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/social/mastodon-singular_vector.svg&h=48" alt="revolt" title="Chat with me on Mastodon">
 </a>

.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)
 
@@ -108,6 +111,6 @@ Spanish Video by Ajneb97
   <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/social/revolt-singular_vector.svg" height="48" alt="revolt" title="Join my Revolt Server">
 </a>
 <br>
-<a href="https://blobfox.coffee/@andre_601" target="_blank">
+<a href="https://swiss.social/@andre_601" target="_blank">
   <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/social/mastodon-singular_vector.svg" height="48" alt="revolt" title="Chat with me on Mastodon">
 </a>

SECURITY.md

@@ -0,0 +1,60 @@
+# Supported Versions
+
+To ensure proper safety and support are only certain versions and Platforms of AdvancedServerList maintained and supported.
+
+## Supported Plugin Versions
+
+| Major Version | Supported |
+|---------------|-----------|
+| v5            | Yes       |
+| v4            | Yes*      |
+| v3            | Yes**     |
+| v2            | No        |
+| v1            | No        |
+
+\*Only receives support but no updates or bug fixes.  
+\*\*Support ends at the end of 2024.
+
+## Supported Server/Proxy Versions
+
+| Server/Proxy Version* | Supported |
+|-----------------------|-----------|
+| 1.21.x                | Yes       |
+| 1.20.x                | Yes       |
+| 1.19.x                | No        |
+| 1.18.x                | No        |
+| 1.17.x                | No        |
+| 1.16.x                | No        |
+| 1.15.x                | No        |
+| 1.14.x                | No        |
+| 1.13.x                | No        |
+| 1.12.x                | No        |
+| 1.11.x                | No        |
+| 1.10.x                | No        |
+| 1.19.x                | No        |
+| 1.8.x                 | No        |
+
+\*Only the latest patch version is actively supported should "Supported" have "Yes".
+
+## Supported Platforms
+
+### Servers
+
+| Server | Supported |
+|--------|-----------|
+| Spigot | No        |
+| Paper  | Yes       |
+| Purpur | Yes*      |
+| Mohist | No        |
+
+\*Support hasn't actively been tested, but should work without issues.
+
+### Proxies
+
+| Proxy      | Supported |
+|------------|-----------|
+| BungeeCord | Yes**     |
+| Waterfall  | Yes**     |
+| Velocity   | Yes       |
+
+\*\*Platform version of this plugin is maintenance only, not receiving any bug fixes for major breaking changes anymore.

addons/banplugins/src/main/java/ch/andre601/advancedserverlist/banplugins/providers/AdvancedBanProvider.java

@@ -31,32 +31,10 @@ import com.google.common.primitives.UnsignedLongs;
 import me.leoko.advancedban.manager.PunishmentManager;
 import me.leoko.advancedban.utils.Punishment;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.UUID;
 
 public class AdvancedBanProvider implements PunishmentProvider{
     
-    private static PunishmentManager getAPI(){
-        return PunishmentManager.get();
-    }
-    
-    private static String noDashesUUID(UUID uuid){
-        return hexString(uuid.getMostSignificantBits()) + hexString(uuid.getLeastSignificantBits());
-    }
-    
-    private static Punishment mute(GenericPlayer player){
-        return getAPI().getMute(noDashesUUID(player.getUUID()));
-    }
-    
-    private static Punishment ban(GenericPlayer player){
-        return getAPI().getBan(noDashesUUID(player.getUUID()));
-    }
-    
-    private static String hexString(long unsigned){
-        return Strings.padStart(UnsignedLongs.toString(unsigned, 16), 16, '0');
-    }
-    
     @Override
     public String muted(GenericPlayer player){
         return String.valueOf(getAPI().isMuted(noDashesUUID(player.getUUID())));
@@ -136,4 +114,24 @@ public class AdvancedBanProvider implements PunishmentProvider{
         
         return ban.getDuration(fromStart);
     }
+    
+    private PunishmentManager getAPI(){
+        return PunishmentManager.get();
+    }
+    
+    private String noDashesUUID(UUID uuid){
+        return hexString(uuid.getMostSignificantBits()) + hexString(uuid.getLeastSignificantBits());
+    }
+    
+    private Punishment mute(GenericPlayer player){
+        return getAPI().getMute(noDashesUUID(player.getUUID()));
+    }
+    
+    private Punishment ban(GenericPlayer player){
+        return getAPI().getBan(noDashesUUID(player.getUUID()));
+    }
+    
+    private String hexString(long unsigned){
+        return Strings.padStart(UnsignedLongs.toString(unsigned, 16), 16, '0');
+    }
 }

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/listeners/BungeeEventWrapper.java

@@ -107,6 +107,7 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
         for(int i = 0; i < players.length; i++){
             String parsed = ComponentParser.text(lines.get(i))
                 .modifyText(text -> StringReplacer.replace(text, player, server))
+                .modifyText(text -> parsePAPIPlaceholders(text, player))
                 .toString();
             
             ServerPing.PlayerInfo pi = new ServerPing.PlayerInfo(parsed, UUID.randomUUID());

core/pom.xml

@@ -77,7 +77,7 @@
         <dependency>
             <groupId>ch.andre601</groupId>
             <artifactId>expressionparser</artifactId>
-            <version>1.4.3</version>
+            <version>1.5.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -137,7 +137,7 @@
         <dependency>
             <groupId>net.william278</groupId>
             <artifactId>papiproxybridge</artifactId>
-            <version>1.6.2</version>
+            <version>1.7.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -157,7 +157,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.11.1</version>
+            <version>5.11.3</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

core/src/main/java/ch/andre601/advancedserverlist/core/check/UpdateChecker.java

@@ -28,7 +28,7 @@ package ch.andre601.advancedserverlist.core.check;
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
-import ch.andre601.advancedserverlist.core.objects.CacheUtil;
+import ch.andre601.advancedserverlist.core.objects.ValueCache;
 import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -59,7 +59,7 @@ public class UpdateChecker{
     
     private final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(new UpdateCheckThread());
     
-    private final CacheUtil<CompletableFuture<ModrinthVersion>> cache = new CacheUtil<>(Duration.ofMinutes(5));
+    private final ValueCache<CompletableFuture<ModrinthVersion>> cache = new ValueCache<>(Duration.ofMinutes(5));
     
     private final AdvancedServerList<?> core;
     private final PluginLogger logger;

core/src/main/java/ch/andre601/advancedserverlist/core/compat/papi/PAPIUtil.java

@@ -25,22 +25,24 @@
 
 package ch.andre601.advancedserverlist.core.compat.papi;
 
-import ch.andre601.advancedserverlist.core.objects.CacheUtil;
+import ch.andre601.advancedserverlist.core.objects.ValueCache;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 import net.william278.papiproxybridge.api.PlaceholderAPI;
 
 import java.time.Duration;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.CompletionException;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 
 public class PAPIUtil{
     
     private static PAPIUtil instance;
     
-    private final CacheUtil<String> cache = new CacheUtil<>(Duration.ofSeconds(5));
+    private final ValueCache<CompletableFuture<Set<String>>> serversCache = new ValueCache<>(Duration.ofSeconds(10));
+    private final Cache<UUID, CompletableFuture<String>> textCache = CacheBuilder.newBuilder()
+        .expireAfterWrite(Duration.ofSeconds(10))
+        .build();
     private final PlaceholderAPI papi;
     
     private PAPIUtil(){
@@ -66,24 +68,11 @@ public class PAPIUtil{
     }
     
     public String getServer(){
-        return cache.get(() -> {
-            List<String> servers;
-            
-            try{
-                Set<String> value = papi.getServers().getNow(null);
-                if(value == null)
-                    return null;
-                
-                servers = List.copyOf(value);
-            }catch(CancellationException | CompletionException ex){
-                return null;
-            }
-            
-            if(servers == null || servers.isEmpty())
-                return null;
-            
-            return servers.get(0);
-        });
+        Set<String> values = serversCache.get(papi::getServers).getNow(Collections.emptySet());
+        if(values.isEmpty())
+            return null;
+        
+        return List.copyOf(values).get(0);
     }
     
     public <P> P getPlayer(Collection<P> players){
@@ -95,8 +84,8 @@ public class PAPIUtil{
     
     public String parse(String text, UUID carrier, UUID player){
         try{
-            return papi.formatPlaceholders(text, carrier, player).getNow(text);
-        }catch(IllegalArgumentException | CancellationException | CompletionException ex){
+            return textCache.get(player, () -> papi.formatPlaceholders(text, carrier, player)).getNow(text);
+        }catch(ExecutionException ex){
             return text;
         }
     }

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/objects/ValueCache.java

@@ -28,12 +28,12 @@ package ch.andre601.advancedserverlist.core.objects;
 import java.time.Duration;
 import java.util.function.Supplier;
 
-public class CacheUtil<T>{
+public class ValueCache<T>{
     
     private final Duration duration;
     private CacheValue<T> cache = null;
     
-    public CacheUtil(Duration duration){
+    public ValueCache(Duration duration){
         this.duration = duration;
     }
     

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/handlers/FaviconHandler.java

@@ -42,9 +42,8 @@ import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
+import java.util.List;
+import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Stream;
 
@@ -57,6 +56,7 @@ public class FaviconHandler<F>{
     
     private final Map<String, F> localFavicons = new HashMap<>();
     private final HttpClient client = HttpClient.newHttpClient();
+    private final Random random = new Random();
     
     public FaviconHandler(AdvancedServerList<F> core){
         this.core = core;
@@ -77,6 +77,11 @@ public class FaviconHandler<F>{
             }
         }
         
+        if(input.equalsIgnoreCase("random")){
+            logger.debug(FaviconHandler.class, "Input matches 'random'. Returning random Favicon...");
+            return getRandomized();
+        }
+        
         if(localFavicons.containsKey(input.toLowerCase(Locale.ROOT))){
             logger.debug(FaviconHandler.class, "Input matches local favicon Image. Returning it...");
             return localFavicons.get(input.toLowerCase(Locale.ROOT));
@@ -101,6 +106,9 @@ public class FaviconHandler<F>{
             logger.debug(FaviconHandler.class, "Resolving URL '%s'...", input);
             return CompletableFuture.supplyAsync(() -> fromURL(core, input), this.faviconThreadPool);
         }else
+        if(input.equalsIgnoreCase("random")){
+            return CompletableFuture.completedFuture(getRandomized());
+        }else
         if(input.toLowerCase(Locale.ROOT).endsWith(".png")){
             logger.debug(FaviconHandler.class, "Resolving image file '%s'...", input);
             return CompletableFuture.completedFuture(localFavicons.get(input.toLowerCase(Locale.ROOT)));
@@ -110,6 +118,22 @@ public class FaviconHandler<F>{
         }
     }
     
+    private F getRandomized(){
+        logger.debug(FaviconHandler.class, "Obtaining random Favicon...");
+        if(localFavicons.isEmpty())
+            return null;
+        
+        List<F> faviconList = List.copyOf(localFavicons.values());
+        
+        // Don't use Random for just one entry.
+        if(faviconList.size() == 1)
+            return faviconList.get(0);
+        
+        synchronized(random){
+            return faviconList.get(random.nextInt(faviconList.size()));
+        }
+    }
+    
     private void loadLocalFavicons(){
         this.localFavicons.clear();
         

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,6 @@
+{% extends "base.html" %}
+
+{% block announce %}
+  <span class="twemoji">{% include ".icons/octicons/info-24.svg" %}</span>
+  <b>NEW:</b> Added a <a href="{{ base_url | url }}/getting-started/tutorials">Tutorial Section</a> to the Wiki!
+{% 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,7 +1,14 @@
+---
+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 in [Releases on :simple-codeberg: Codeberg](https://codeberg.org/Andre601/AdvancedServerList/releases).
+///
+
 ## Placeholders
 
 /// tab | AdvancedBan

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/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/minimotd.md

@@ -18,7 +18,7 @@ Execute the command [`/asl migrate minimotd`](../commands/index.md#migrate) to s
 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
-```conf
+```lighty
 icon-enabled=true
 motd-enabled=true
 motds=[

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

@@ -119,14 +119,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.
-- A PNG filename, including `.png` file extension, matching a PNG file in the `favicons` folder.
-- 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
@@ -356,7 +369,7 @@ You can use placeholders that resolve into numbers for this option.
 /// details | Example
     type: example
 
-```yaml title="YAML file
+```yaml title="YAML file"
 priority: 0
 
 # Hides the MOTD for demonstration purposes

mkdocs.yml

@@ -84,6 +84,8 @@ markdown_extensions:
   - pymdownx.superfences:
   - pymdownx.snippets:
       base_path: docs/.snippets
+      auto_append:
+        - links.md
   - pymdownx.blocks.admonition:
       types:
         - note
@@ -108,7 +110,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

paper/pom.xml

@@ -99,7 +99,7 @@
         <dependency>
             <groupId>com.viaversion</groupId>
             <artifactId>viaversion-api</artifactId>
-            <version>5.0.3</version>
+            <version>5.2.0</version>
             <scope>provided</scope>
         </dependency>
 

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

@@ -48,5 +48,22 @@ 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("AdvancedServerList has detected your server has been reloaded using the /reload");
+        plugin.getPluginLogger().warn("command or the Bukkit.reload() method call.");
+        plugin.getPluginLogger().warn("");
+        plugin.getPluginLogger().warn("DO NOT RELOAD THE SERVER. ALWAYS RESTART IT!");
+        plugin.getPluginLogger().warn("");
+        plugin.getPluginLogger().warn("Plugins may not work as expected when reloading a server, causing breaking issues.");
+        plugin.getPluginLogger().warn("AdvancedServerList *should* work, but any support for issues with it will be denied if");
+        plugin.getPluginLogger().warn("a server reload was detected!");
+        plugin.getPluginLogger().warn("======================================================================================");
     }
 }

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

@@ -205,12 +205,7 @@ public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon,
         for(String line : lines){
             String parsed = ComponentParser.text(line)
                 .modifyText(text -> StringReplacer.replace(text, player, server))
-                .modifyText(text -> {
-                    if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
-                        return PlaceholderAPI.setPlaceholders(player.getPlayer(), text);
-                    
-                    return text;
-                })
+                .modifyText(text -> parsePAPIPlaceholders(text, player))
                 .toString();
             
             playerList.add(function.apply(parsed));

pom.xml

@@ -37,7 +37,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         
-        <plugin.version>5.0.3</plugin.version>
+        <plugin.version>5.1.2</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,3 @@
-mkdocs-material==9.5.39
+mkdocs-material==9.5.48
 mkdocs-glightbox==0.4.0
 git+https://github.com/Andre601/mkdocs-pagenav-generator

velocity/src/main/java/ch/andre601/advancedserverlist/velocity/listeners/VelocityEventWrapper.java

@@ -109,6 +109,7 @@ public class VelocityEventWrapper implements GenericEventWrapper<Favicon, Veloci
         for(int i = 0; i < players.length; i++){
             String parsed = ComponentParser.text(lines.get(i))
                 .modifyText(text -> StringReplacer.replace(text, player, server))
+                .modifyText(text -> parsePAPIPlaceholders(text, player))
                 .toString();
             
             players[i] = new ServerPing.SamplePlayer(parsed, UUID.randomUUID());

version-uploader/pom.xml

@@ -52,13 +52,13 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.5.8</version>
+            <version>1.5.12</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents.client5</groupId>
             <artifactId>httpclient5</artifactId>
-            <version>5.4</version>
+            <version>5.4.1</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;