Bump version

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

.forgejo/workflows/deploy_wiki.yml

@@ -10,7 +10,7 @@ on:
       - ".forgejo/workflows/deploy_wiki.yml"
       - "docs/**"
       - "domains"
-      - "mkdocs.yml"
+      - "properdocs.yml"
       - "requirements.txt"
 
 jobs:
@@ -30,7 +30,7 @@ jobs:
       - name: "Install Dependencies"
         run: "pip install -r requirements.txt"
       - name: "Build Website"
-        run: "mkdocs build"
+        run: "properdocs build"
       - name: "Commit and Push"
         run: |
           git config --global user.email "andre_601-bot@noreply.codeberg.org"

.forgejo/workflows/pr_preview.yml

@@ -9,7 +9,7 @@ on:
     paths:
       - ".forgejo/workflows/pr_preview.yml"
       - "docs/**"
-      - "mkdocs.yml"
+      - "properdocs.yml"
       - "preview_domains"
       - "requirements.txt"
   workflow_dispatch:
@@ -66,7 +66,7 @@ jobs:
       - name: "Install Dependencies"
         run: "pip install -r requirements.txt"
       - name: "Build Website"
-        run: "mkdocs build"
+        run: "properdocs build"
       - name: "Commit and Push"
         run: |
           git config --global user.email "andre_601-bot@noreply.codeberg.org"

.woodpecker/publish_assets.yml

@@ -4,7 +4,7 @@ when:
 
 steps:
   - name: "Build Jar and Upload"
-    image: maven:3.9.12-eclipse-temurin-21
+    image: maven:3.9.14-eclipse-temurin-21
     environment:
       CODEBERG_API_TOKEN:
         from_secret: cb_token

addons/banplugins/pom.xml

@@ -85,7 +85,7 @@
         <dependency>
             <groupId>com.velocitypowered</groupId>
             <artifactId>velocity-api</artifactId>
-            <version>3.3.0-SNAPSHOT</version>
+            <version>3.4.0</version>
             <scope>provided</scope>
         </dependency>
         

addons/luckperms/pom.xml

@@ -81,7 +81,7 @@
         <dependency>
             <groupId>com.velocitypowered</groupId>
             <artifactId>velocity-api</artifactId>
-            <version>3.3.0-SNAPSHOT</version>
+            <version>3.4.0</version>
             <scope>provided</scope>
         </dependency>
 
@@ -95,7 +95,7 @@
         <dependency>
             <groupId>net.luckperms</groupId>
             <artifactId>api</artifactId>
-            <version>5.4</version>
+            <version>5.5</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

bungeecord/pom.xml

@@ -110,7 +110,7 @@
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bungeecord</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.1</version>
             <scope>compile</scope>
         </dependency>
         
@@ -132,13 +132,13 @@
         <dependency>
             <groupId>org.sayandev</groupId>
             <artifactId>sayanvanish-api</artifactId>
-            <version>1.7.2</version>
+            <version>1.7.3</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.sayandev</groupId>
             <artifactId>sayanvanish-proxy-bungeecord</artifactId>
-            <version>1.7.2</version>
+            <version>1.7.3</version>
             <scope>provided</scope>
         </dependency>
         
@@ -169,7 +169,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.6.1</version>
+                <version>3.6.2</version>
                 <executions>
                     <execution>
                         <phase>package</phase>

core/pom.xml

@@ -186,7 +186,7 @@
         <dependency>
             <groupId>io.github.miniplaceholders</groupId>
             <artifactId>miniplaceholders-api</artifactId>
-            <version>3.0.1</version>
+            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
         
@@ -194,7 +194,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.14.1</version>
+            <version>5.14.3</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -221,7 +221,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.14.1</version>
+                <version>3.15.0</version>
                 <configuration>
                     <compilerArgs>
                         <arg>-parameters</arg>

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

@@ -266,6 +266,7 @@ public class AdvancedServerList<F>{
                             Permission.permission("advancedserverlist.command.profiles.set")
                         )
                     )
+                    .meta(CommandHandler.COMMAND_TYPE, CommandType.Type.ALL)
             );
         }
         

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

@@ -40,7 +40,7 @@ public class PAPIUtil{
     private static PAPIUtil instance;
     
     private final ValueCache<CompletableFuture<Set<String>>> serversCache = new ValueCache<>(Duration.ofSeconds(10));
-    private final Cache<UUID, CompletableFuture<String>> textCache = CacheBuilder.newBuilder()
+    private final Cache<CacheKey, CompletableFuture<String>> textCache = CacheBuilder.newBuilder()
         .expireAfterWrite(Duration.ofSeconds(10))
         .build();
     private final PlaceholderAPI papi;
@@ -84,9 +84,11 @@ public class PAPIUtil{
     
     public String parse(String text, UUID carrier, UUID player){
         try{
-            return textCache.get(player, () -> papi.formatPlaceholders(text, carrier, player)).getNow(text);
+            return textCache.get(new CacheKey(player, text), () -> papi.formatPlaceholders(text, carrier, player)).getNow(text);
         }catch(ExecutionException ex){
             return text;
         }
     }
+    
+    private record CacheKey(UUID uuid, String text){}
 }

core/src/main/java/ch/andre601/advancedserverlist/core/placeholders/DatePlaceholder.java

@@ -61,7 +61,7 @@ public class DatePlaceholder extends PlaceholderProvider{
         
         String targetDateStr = args[1];
         String format = "dd/MM/yyyy";
-        if(args.length > 3){
+        if(args.length > 2){
             format = format(Arrays.copyOfRange(args, 2, args.length));
         }
         

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

@@ -220,7 +220,11 @@ public class FaviconHandler<F>{
             
             logger.success("Loaded <white>%s</white> local Favicon(s).", localFavicons.size());
         }catch(IOException ex){
-            logger.warn("Encountered IOException while loading local favicons.", ex);
+            if(core.fileHandler().getBool(false, "debug")){
+                logger.warn("Encountered IOException while loading local favicons.", ex);
+            }else{
+                logger.warn("Encountered IOException while loading local favicons. Reason: %s", ex.getMessage());
+            }
         }
     }
     
@@ -236,9 +240,17 @@ public class FaviconHandler<F>{
             
             localFavicons.put(path.getFileName().toString().toLowerCase(Locale.ROOT), new FaviconPair<>(image, favicon));
         }catch(IOException ex){
-            logger.warn("Encountered IOException while creating a Favicon from '%s'.", ex, path.getFileName().toString());
+            if(core.fileHandler().getBool(false, "debug")){
+                logger.warn("Encountered IOException while creating a Favicon from '%s'.", ex, path.getFileName().toString());
+            }else{
+                logger.warn("Encountered IOException while creating a Favicon from '%s'. Reason: %s", path.getFileName().toString(), ex.getMessage());
+            }
         }catch(Exception ex){
-            logger.warn("Encountered an Exceotion while creating a Favicon from '%s'.", ex, path.getFileName().toString());
+            if(core.fileHandler().getBool(false, "debug")){
+                logger.warn("Encountered Exception while creating a Favicon from '%s'.", ex, path.getFileName().toString());
+            }else{
+                logger.warn("Encountered Exception while creating a Favicon from '%s'. Reason: %s", path.getFileName().toString(), ex.getMessage());
+            }
         }
     }
     
@@ -253,14 +265,29 @@ public class FaviconHandler<F>{
             try(InputStream stream = client.send(request, HttpResponse.BodyHandlers.ofInputStream()).body()){
                 return createBufferedImage(stream);
             }catch(IOException ex){
-                logger.warn("Encountered IOException while performing a web request for '%s'.", ex, url);
+                if(core.fileHandler().getBool(false, "debug")){
+                    logger.warn("Encountered IOException while performing a web request for '%s'.", ex, url);
+                }else{
+                    logger.warn("Encountered IOException while performing a web request for '%'. Reason: %s", url, ex.getMessage());
+                }
+                
                 return null;
             }catch(InterruptedException ex){
-                logger.warn("Encountered an InterruptedException while performing a web request for '%s'.", ex, url);
+                if(core.fileHandler().getBool(false, "debug")){
+                    logger.warn("Encountered an InterruptedException while performing a web request for '%s'.", ex, url);
+                }else{
+                    logger.warn("Encountered an InterruptedException while performing a web request for '%s'. Reason: %s", url, ex.getMessage());
+                }
+                
                 return null;
             }
         }catch(URISyntaxException ex){
-            logger.warn("Received URISyntaxException for URL '%s'", ex, url);
+            if(core.fileHandler().getBool(false, "debug")){
+                logger.warn("Encountered an URISyntaxException while performing a web request for '%s'.", ex, url);
+            }else{
+                logger.warn("Encountered an URISyntaxException while performing a web request for '%s'. Reason: %s", url, ex.getMessage());
+            }
+                
             return null;
         }
     }
@@ -320,7 +347,11 @@ public class FaviconHandler<F>{
         try{
             return core.plugin().createFavicon(image);
         }catch(Exception ex){
-            logger.warn("Encountered an Exception while trying to create a Favicon instance.", ex);
+            if(core.fileHandler().getBool(false, "debug")){
+                logger.warn("Encountered an Exception while trying to create a Favicon instance.", ex);
+            }else{
+                logger.warn("Encountered an Exception while trying to create a Favicon instance. Reason: %s", ex.getMessage());
+            }
             return null;
         }
     }

docs/getting-started/index.md

@@ -90,7 +90,7 @@ The plugin also supports these additional plugins. They are all optional.
     **Supported on:**  
     <!-- icon:all -->
 
--   [**BanPlugins Addon**][addon]
+-   [**BanPlugins Addon**][banplugins-addon]
     
     ----
     
@@ -98,11 +98,23 @@ The plugin also supports these additional plugins. They are all optional.
     
     ----
 
+    **Supported on:**  
+    <!-- icon:all -->
+
+-   [**LuckPerms Addon**][luckperms-addon]
+    
+    ----
+
+    Official Add-on for AdvancedServerList that adds placeholders for LuckPerms.
+
+    ----
+
     **Supported on:**  
     <!-- icon:all -->
 ///
 
-[addon]: ../addons/first-party/banplugins.md
+[banplugins-addon]: ../addons/first-party/banplugins.md
+[luckperms-addon]: ../addons/first-party/luckperms.md
 
 ## 2. Installation { #installation }
 

docs/profiles/placeholders.md

@@ -128,4 +128,14 @@ Placeholders from PlaceholderAPI Expansions can be used in AdvancedServerList us
 PlaceholderAPI placeholders can be used both on the Server (Paper) and on the proxy (BungeeCord, Velocity) version of AdvancedServerList.  
 However, the Proxy version requires the usage of [PAPIProxyBridge] to function properly.
 
-Placeholders can also not be used within the [`condition`](options/condition.md) option of a Server List Profile.
+Placeholders can also not be used within the [`condition`](options/condition.md) option of a Server List Profile.
+
+## MiniPlaceholders
+
+/// info | New since `v5.7.0`
+///
+
+Placeholders provided through [MiniPlaceholders](https://modrinth.com/plugin/miniplaceholders) are supported for all text options except [`condition`](options/condition.md).
+
+Note that due to various limitations, only the `global` placeholders/tags - meaning ones that do not require a player - will work.  
+Support also only works for Paper and Velocity.

paper/pom.xml

@@ -86,7 +86,7 @@
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.1</version>
             <scope>compile</scope>
         </dependency>
 
@@ -94,13 +94,13 @@
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
-            <version>2.11.7</version>
+            <version>2.12.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.viaversion</groupId>
             <artifactId>viaversion-api</artifactId>
-            <version>5.6.0</version>
+            <version>5.7.2</version>
             <scope>provided</scope>
         </dependency>
 
@@ -141,7 +141,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.6.1</version>
+                <version>3.6.2</version>
                 <executions>
                     <execution>
                         <phase>package</phase>

pom.xml

@@ -41,7 +41,7 @@
         
         <project.build.build_id/>
         
-        <plugin.version>5.7.0</plugin.version>
+        <plugin.version>5.7.3</plugin.version>
         <plugin.description>Create multiple Server lists based on conditions.</plugin.description>
         
         <api.version>4.1.1</api.version>
@@ -57,7 +57,7 @@
         <dependency.cloud-annotations>2.0.0</dependency.cloud-annotations>
         <dependency.cloud-bungee>2.0.0-beta.14</dependency.cloud-bungee>
         <dependency.cloud-paper>2.0.0-beta.14</dependency.cloud-paper>
-        <dependency.cloud-velocity>2.0.0-beta.13</dependency.cloud-velocity>
+        <dependency.cloud-velocity>2.0.0-beta.14</dependency.cloud-velocity>
         <dependency.cloud-minecraft-extras>2.0.0-beta.14</dependency.cloud-minecraft-extras>
     </properties>
     
@@ -85,8 +85,8 @@
             <url>https://codeberg.org/api/packages/Andre601/maven/</url>
         </repository>
         <repository>
-            <id>sonatype-snapshots</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+            <id>alessiodp-snapshots</id>
+            <url>https://repo.alessiodp.com/snapshots/</url>
         </repository>
     </repositories>
     
@@ -96,7 +96,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.14.1</version>
+                    <version>3.15.0</version>
                     <configuration>
                         <compilerArgs>
                             <arg>-parameters</arg>

requirements.txt

@@ -1,4 +1,5 @@
-mkdocs-material==9.7.1
+properdocs==1.6.6
+mkdocs-material==9.7.6
 mkdocs-glightbox==0.5.2
 mkdocs-redirects==1.2.2
 git+https://github.com/Andre601/mkdocs-pagenav-generator

velocity/pom.xml

@@ -73,7 +73,7 @@
         <dependency>
             <groupId>com.velocitypowered</groupId>
             <artifactId>velocity-api</artifactId>
-            <version>3.4.0-SNAPSHOT</version>
+            <version>3.4.0</version>
             <scope>provided</scope>
         </dependency>
         
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-velocity</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.1</version>
             <scope>compile</scope>
         </dependency>
         
@@ -103,13 +103,13 @@
         <dependency>
             <groupId>org.sayandev</groupId>
             <artifactId>sayanvanish-api</artifactId>
-            <version>1.7.2</version>
+            <version>1.7.3</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.sayandev</groupId>
             <artifactId>sayanvanish-proxy-velocity</artifactId>
-            <version>1.7.2</version>
+            <version>1.7.3</version>
             <scope>provided</scope>
         </dependency>
         
@@ -140,7 +140,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.6.1</version>
+                <version>3.6.2</version>
                 <executions>
                     <execution>
                         <phase>package</phase>

version-uploader/pom.xml

@@ -52,13 +52,13 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.5.22</version>
+            <version>1.5.32</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents.client5</groupId>
             <artifactId>httpclient5</artifactId>
-            <version>5.5.1</version>
+            <version>5.6</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -93,7 +93,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.14.1</version>
+                <version>3.15.0</version>
                 <configuration>
                     <release>16</release>
                 </configuration>
@@ -115,7 +115,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.6.1</version>
+                <version>3.6.2</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                 </configuration>