Merge pull request 'Update dependency com.google.guava:guava to v33.8.0' (#636) from renovate/all-minor-patch into master

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

.forgejo/workflows/deploy_wiki.yml

@@ -22,7 +22,7 @@ jobs:
         with:
           token: "${{ secrets.BOT_TOKEN }}"
       - name: "Setup Python 3.x"
-        uses: https://code.forgejo.org/actions/setup-python@v6
+        uses: https://code.forgejo.org/actions/setup-python@v7
         with:
           python-version: 3.x
       - name: "Install Dependencies"

.forgejo/workflows/pr_preview.yml

@@ -60,7 +60,7 @@ jobs:
           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@v6
+        uses: https://code.forgejo.org/actions/setup-python@v7
         with:
           python-version: 3.x
       - name: "Install Dependencies"

.gitea/ISSUE_TEMPLATE/bug_report.yml

@@ -16,13 +16,14 @@ body:
       label: Platform
       description: On what platform do you use the plugin?
       options:
-        - BungeeCord
-        - Other (Please specify)
         - Paper
         - Purpur
-        - Spigot
+        - Folia
         - Velocity
-        - Waterfall
+        - Other (Please specify)
+        - Spigot (DISCONTINUED)
+        - BungeeCord (DISCONTINUED)
+        - Waterfall (DISCONTINUED)
     validations:
       required: true
   - type: input
@@ -32,6 +33,35 @@ body:
         Please provide the name of the platform (Proxy/Server) you use, if you selected `Other (Please specify)` in the above section.
         Leave empty otherwise.
       placeholder: SomeProxy
+  - type: input
+    attributes:
+      label: Server/Proxy version
+      description: |-
+        Provide the Version of your Server/Proxy.  
+        For Paper and its forks, run `/version` and for Velocity run `/velocity info`
+      placeholder: This server is running Paper version ...
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Plugin version
+      description: |-
+        Provide the Version of the Plugin.  
+        On Paper and its forks, run `/version AdvancedServerList` and on Velocity, run `/velocity plugins` and find the AdvancedServerList entry.
+      placeholder: 5.9.0
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Logs
+      description: |-
+        Provide Logs from your Server/Proxy, uploaded to [mclo.gs](https://mclo.gs).
+
+        **DO NOT SKIP THIS!**  
+        Skipping this by writing "Not needed", "private", etc. will get your issue closed without warning!
+      placeholder: 'https://mclo.gs/...'
+    validations:
+      required: true
   - type: textarea
     attributes:
       label: What happened?
@@ -49,7 +79,7 @@ body:
       placeholder: |-
         1. Do this
         2. ...
-        3. Profit!
+        3. Prof-... Bug!
     validations:
       required: true
   - type: textarea

.woodpecker/publish_assets.yml

@@ -4,7 +4,7 @@ when:
 
 steps:
   - name: "Build Jar and Upload"
-    image: maven:3.9.16-eclipse-temurin-25
+    image: maven:3.10.0-eclipse-temurin-25
     environment:
       CODEBERG_API_TOKEN:
         from_secret: cb_token
@@ -54,7 +54,7 @@ steps:
       identifier: andre601.ch
       app_password:
         from_secret: bluesky_app_password
-      languages: english
+      languages: en-US
       text: |-
         #AdvancedServerList was updated to ${CI_COMMIT_TAG} and can be downloaded from #Modrinth, #Hangar and #Codeberg!
 

addons/banplugins/pom.xml

@@ -71,7 +71,7 @@
         <dependency>
             <groupId>com.velocitypowered</groupId>
             <artifactId>velocity-api</artifactId>
-            <version>3.4.0</version>
+            <version>4.3.1</version>
             <scope>provided</scope>
         </dependency>
         
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>space.arim.libertybans</groupId>
             <artifactId>bans-api</artifactId>
-            <version>1.1.3</version>
+            <version>1.1.4</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

addons/luckperms/pom.xml

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

core/pom.xml

@@ -121,7 +121,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.14.0</version>
+            <version>2.15.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -133,7 +133,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>33.6.0-jre</version>
+            <version>33.8.0-jre</version>
             <scope>provided</scope>
         </dependency>
         
@@ -161,7 +161,7 @@
         <dependency>
             <groupId>org.jspecify</groupId>
             <artifactId>jspecify</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.1</version>
         </dependency>
         
         <!-- Plugins -->
@@ -221,7 +221,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.15.0</version>
+                <version>3.16.0</version>
                 <configuration>
                     <compilerArgs>
                         <arg>-parameters</arg>

docs/.overrides/main.html

@@ -1,5 +1,5 @@
 {% extends "base.html" %}
 
 {% block announce %}
-  <span data-md-component="download-countdown"></span>
+  <span class="rainbow"><span class="balloon twemoji">{% include ".icons/material/balloon.svg" %}</span> <b>100 THOUSAND downloads</b> on <a class="modrinth" href="https://modrinth.com/plugin/advancedserverlist" target="_blank" rel="nofollow"><span class="twemoji">{% include ".icons/simple/modrinth.svg" %}</span> <b>Modrinth!</b></a> <span class="balloon2 twemoji">{% include ".icons/material/balloon.svg" %}</span><br><b>THANK YOU!</b></span>
 {% endblock %}

docs/assets/js/download-countdown.js

@@ -1,49 +0,0 @@
-document$.subscribe(async () => {
-    const count = document.querySelector('[data-md-component="download-countdown"]');
-
-    async function applyCount(downloads) {
-        const remaining = 100_000 - downloads;
-        const formatted = new Intl.NumberFormat().format(remaining);
-
-        var link = document.createElement('a');
-        var linkText = document.createTextNode("Soon at 100k downloads...");
-
-        if (remaining <= 0) {
-            count.className = "rainbow";
-            count.innerText = "Thank you for 100 THOUSAND downloads!";
-            return;
-        } else if (remaining == 1) {
-            linkText = document.createTextNode("1 download remaining...");
-        } else {
-            linkText = document.createTextNode(`${formatted} downloads remaining...`)
-        }
-
-        link.appendChild(linkText);
-        link.title = "Visit Modrinth";
-        link.href = "https://modrinth.com/plugin/advancedserverlist";
-        link.target = "_blank";
-        link.rel = "nofollow";
-
-        count.appendChild(link);
-    }
-
-    async function fetchDownloads() {
-        const data = await fetch('https://api.modrinth.com/v3/project/advancedserverlist')
-            .then(_ => _.json());
-        
-        const downloads = data.downloads
-
-        if (downloads != null) {
-            __md_set("__downloads_count", downloads, sessionStorage);
-            applyCount(downloads)
-        }
-        
-    }
-
-    const cached = __md_get("__downloads_count", sessionStorage);
-    if (cached != null) {
-        applyCount(cached);
-    } else {
-        fetchDownloads();
-    }
-})

docs/assets/stylesheets/custom.css

@@ -100,6 +100,42 @@
     }
 }
 
+@keyframes balloon2 {
+    0% {
+        transform: translate(0rem, 0rem) rotate(0deg) scale(2);
+    }
+    10% {
+        transform: translate(0.02rem, -0.04rem) rotate(5deg) scale(1.75);
+    }
+    20% {
+        transform: translate(-0.09rem, 0.08rem) rotate(-1deg) scale(2);
+    }
+    30% {
+        transform: translate(0.05rem, -0.06rem) rotate(3deg) scale(2.2);
+    }
+    40% {
+        transform: translate(-0.03rem, -0.09rem) rotate(-1.5deg) scale(1.85);
+    }
+    50% {
+        transform: translate(0.04rem, 0.1rem) rotate(1deg) scale(2);
+    }
+    60% {
+        transform: translate(-0.5rem, -0.04rem) rotate(-2deg) scale(1.95);
+    }
+    70% {
+        transform: translate(0.06rem, 0.02rem) rotate(1.25deg) scale(2.05);
+    }
+    80% {
+        transform: translate(-0.01rem, -0.03rem) rotate(-3deg) scale(2);
+    }
+    90% {
+        transform: translate(0.02rem, 0.07rem) rotate(0.5deg) scale(2.15);
+    }
+    100% {
+        transform: translate(0rem, 0rem) rotate(0deg) scale(2);
+    }
+}
+
 @keyframes rainbow {
     0% {
         color: #ff6b6b;
@@ -141,6 +177,14 @@
     animation: 20s ease-in-out infinite balloon;
 }
 
+.balloon2 {
+    animation: 19s ease-in-out infinite balloon2;
+}
+
 .rainbow {
     animation: 10s ease-in-out infinite rainbow;
+}
+
+a.modrinth {
+    color: #1bd96a;
 }

docs/getting-started/index.md

@@ -124,7 +124,6 @@ Here is a quick table showing the jar file name with the platforms it is made fo
 | 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.  

paper/pom.xml

@@ -100,7 +100,7 @@
         <dependency>
             <groupId>com.viaversion</groupId>
             <artifactId>viaversion-api</artifactId>
-            <version>5.10.0</version>
+            <version>5.12.2</version>
             <scope>provided</scope>
         </dependency>
 

pom.xml

@@ -41,7 +41,7 @@
         
         <project.build.build_id/>
         
-        <plugin.version>5.9.0</plugin.version>
+        <plugin.version>5.9.1</plugin.version>
         <plugin.description>Create multiple Server lists based on conditions.</plugin.description>
         
         <api.version>4.1.1</api.version>
@@ -54,11 +54,11 @@
         <!-- Configurate version -->
         <dependency.configurate-yaml>4.2.0</dependency.configurate-yaml>
         <!-- Cloud versions -->
-        <dependency.cloud-annotations>2.0.0</dependency.cloud-annotations>
+        <dependency.cloud-annotations>2.1.0</dependency.cloud-annotations>
         <dependency.cloud-bungee>2.0.0-beta.17</dependency.cloud-bungee>
-        <dependency.cloud-paper>2.0.0-beta.17</dependency.cloud-paper>
-        <dependency.cloud-velocity>2.0.0-beta.17</dependency.cloud-velocity>
-        <dependency.cloud-minecraft-extras>2.0.0-beta.17</dependency.cloud-minecraft-extras>
+        <dependency.cloud-paper>2.0.1</dependency.cloud-paper>
+        <dependency.cloud-velocity>2.0.1</dependency.cloud-velocity>
+        <dependency.cloud-minecraft-extras>2.0.1</dependency.cloud-minecraft-extras>
     </properties>
     
     <profiles>
@@ -96,7 +96,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.15.0</version>
+                    <version>3.16.0</version>
                     <configuration>
                         <compilerArgs>
                             <arg>-parameters</arg>

properdocs.yml

@@ -55,7 +55,6 @@ extra_css:
 
 extra_javascript:
   - assets/js/repo-stats.js
-  - assets/js/download-countdown.js
 
 extra:
   social:

requirements.txt

@@ -1,6 +1,6 @@
 properdocs==1.6.7
-mkdocs-material==9.7.6
-mkdocs-glightbox==0.5.2
+mkdocs-material==9.8.0
+mkdocs-glightbox==0.5.3
 mkdocs-redirects==1.2.3
 git+https://github.com/Andre601/mkdocs-pagenav-generator
 mkdocs-macros-plugin==1.5.0

velocity/pom.xml

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

version-uploader/pom.xml

@@ -46,25 +46,25 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.14.0</version>
+            <version>2.15.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.5.37</version>
+            <version>1.6.6</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents.client5</groupId>
             <artifactId>httpclient5</artifactId>
-            <version>5.6.2</version>
+            <version>5.6.5</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp-jvm</artifactId>
-            <version>5.4.0</version>
+            <version>5.5.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -93,7 +93,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.15.0</version>
+                <version>3.16.0</version>
                 <configuration>
                     <release>16</release>
                 </configuration>
@@ -101,7 +101,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.5.1</version>
                 <configuration>
                     <archive>
                         <manifest>