Bump version

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

.gitea/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: API Support
+    about: For API support, please create an issue in the `asl-api` repository.
+    url: https://codeberg.org/Andre601/asl-api
+  - name: Discord Server
+    about: Please ask questions in the `#asl-support` channel on the M.O.S.S. Discord Server.
+    url: https://discord.gg/MyPTjpsgGH
+  - name: Wiki
+    about: Check the Wiki for explanations about the features and examples.
+    url: https://asl.andre601.ch

.github/FUNDING.yml

@@ -1,2 +0,0 @@
-patreon: andre_601
-ko_fi: andre_601

.github/ISSUE_TEMPLATE/api_support.yml

@@ -1,41 +0,0 @@
-name: API support
-description: Ask for help with the API.
-
-body:
-  - type: markdown
-    attributes:
-      value: |-
-        ## Before opening
-        Please make sure you've checked the following things first:
-        
-        - You're using the latest release of AdvancedServerList [[Download from Modrinth](https://modrinth.com/plugin/advancedserverlist)] and the right API version.
-        - You're using a supported Proxy/Server version. As of right now is only 1.19+ supported.
-        - The Feature you suggest hasn't been suggested before.
-  - type: dropdown
-    attributes:
-      label: Platforms
-      description: On what platform(s) are you using the API?
-      multiple: true
-      options:
-        - Proxy (BungeeCord, Waterfall, ...)
-        - Proxy (Velocity)
-        - Server (Spigot, Paper, ...)
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Description
-      description: |-
-        Give a detailed description of what exactly you try to do, what steps you did and what you need help with.
-      placeholder: I tried to...
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Code
-      description: |-
-        Provide code-snippets to help us better understand what you tried.
-        The code is automatically parsed as Java Code.
-      render: java
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Discord Server
-    about: Ask questions about the plugin in the `advancedserverlist` category of the M.O.S.S. Discord.
-    url: https://discord.gg/MyPTjpsgGH
-  - name: Wiki
-    about: Check the Wiki for explanations about the features and examples.
-    url: https://asl.andre601.ch

.github/labeler.yml

@@ -1,14 +0,0 @@
-"Target: All":
-  - all: ["bukkit/**", "bungeecord/**", "core/**", "velocity/**"]
-
-"Target: Bukkit":
-  - all: ["bukkit/**", "!bungeecord/**", "!core/**", "!velocity/**"]
-
-"Target: BungeeCord":
-  - all: ["!bukkit/**", "bungeecord/**", "!core/**", "!velocity/**"]
-
-"Target: Core":
-  - all: ["!bukkit/**", "!bungeecord/**", "core/**", "!velocity/**"]
-
-"Target: Velocity":
-  - all: ["!bukkit/**", "!bungeecord/**", "!core/**", "velocity/**"]

.github/workflows/docs-deploy.yml

@@ -1,49 +0,0 @@
-name: 'Deploy Site (Push)'
-
-on:
-  workflow_dispatch:
-
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-
-concurrency:
-  group: "pages"
-  cancel-in-progress: false
-
-env:
-  GITHUB_REPO_INSTANCE: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.x
-      - name: Create/Get Cache
-        uses: actions/cache@v4
-        with:
-          key: ${{ github.ref }}
-          path: .cache
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip setuptools
-          python -m pip install -r requirements.txt
-      - name: Build docs
-        run: mkdocs build
-      - name: Configure GitHub Pages
-        uses: actions/configure-pages@v5
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: 'site/'
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4

.woodpecker/pr_preview.yml

@@ -6,7 +6,7 @@ when:
 variables:
   setup_git: &setup_git
     - apk add git
-    - git config --global user.email "andre@andre601.ch"
+    - git config --global user.email "andre_601-bot@noreply.codeberg.org"
     - git config --global user.name "ASL Docs Builder"
 
 steps:
@@ -15,10 +15,10 @@ steps:
     commands:
       - chmod -R a+w .
       - <<: *setup_git
-      - git clone https://codeberg.org/Andre601/asl-docs.git site
+      - git clone https://codeberg.org/Andre601/preview.git site
       - chmod -R a+w site
       - cd site
-      - git switch pr-${CI_COMMIT_PULL_REQUEST} 2>/dev/null || git switch -c pr-${CI_COMMIT_PULL_REQUEST}
+      - git switch ${CI_REPO_NAME,,}-pr-${CI_COMMIT_PULL_REQUEST} 2>/dev/null || git switch -c ${CI_REPO_NAME,,}-pr-${CI_COMMIT_PULL_REQUEST}
   buildDocs:
     image: woodpeckerci/plugin-mkdocs:latest
     settings:
@@ -29,12 +29,12 @@ steps:
       - bot_token
     commands:
       - <<: *setup_git
-      - mv domains site/.domains
+      - mv preview-domains site/.domains
       - cd site
-      - git remote add upstream https://$BOT_TOKEN@codeberg.org/Andre601/asl-docs.git
+      - git remote add upstream https://$BOT_TOKEN@codeberg.org/Andre601/preview.git
       - git add --all
-      - git commit -m "Update Preview for PR ${CI_COMMIT_PULL_REQUEST} ($( env TZ=Europe/Zurich date +"%d.%m.%Y %Z" )) [SKIP CI]"
-      - git push --set-upstream upstream pr-${CI_COMMIT_PULL_REQUEST} -f
+      - git commit -m "Update Preview for PR ${CI_COMMIT_PULL_REQUEST} in Repository ${CI_REPO_NAME} ($( env TZ=Europe/Zurich date +"%d.%m.%Y %Z" )) [SKIP CI]"
+      - git push --set-upstream upstream ${CI_REPO_NAME,,}-pr-${CI_COMMIT_PULL_REQUEST} -f
   commentOnSuccess:
     image: mcs94/gitea-comment
     when:
@@ -46,10 +46,10 @@ steps:
       comment: |-
         Pull request Preview ready!
 
-        | Name   | Value                                                 |
-        |--------|-------------------------------------------------------|
-        | Commit | ${CI_COMMIT_SHA}                                      |
-        | Link   | https://asl.andre601.ch/@pr-${CI_COMMIT_PULL_REQUEST} |
+        | Name   | Value                                                                       |
+        |--------|-----------------------------------------------------------------------------|
+        | Commit | ${CI_COMMIT_SHA}                                                            |
+        | Link   | https://preview.andre601.ch/@${CI_REPO_NAME,,}-pr-${CI_COMMIT_PULL_REQUEST} |
   commentOnFailure:
     image: mcs94/gitea-comment
     when:

.woodpecker/publish_docs.yml

@@ -7,7 +7,7 @@ when:
 variables:
   setup_git: &setup_git
     - apk add git
-    - git config --global user.email "github@andre601.ch"
+    - git config --global user.email "andre_601-bot@noreply.codeberg.org"
     - git config --global user.name "ASL Docs Builder"
 
 steps:

README.md

@@ -89,7 +89,7 @@ You can disable this in the global bStats config file located in `/plugins/bstat
 ## Support
 
 <a href="https://discord.gg/MyPTjpsgGH" target="_blank">
-  <img src="https://cdn.jsdelivr.net/gh/Andre601/devins-badges@13e0142/assets/compact-minimal/social/discord-singular_vector.svg" height="64" alt="discord" title="Join my Discord Server">
+  <img src="https://cdn.jsdelivr.net/gh/Andre601/devins-badges@13e0142/assets/compact-minimal/social/discord-singular_vector.svg" height="64" alt="discord" title="Join the M.O.S.S. Discord Server">
 </a>
 <a href="https://app.revolt.chat/invite/74TpERXA" target="_blank">
   <img src="https://cdn.jsdelivr.net/gh/Andre601/devins-badges@13e0142/assets/compact-minimal/social/revolt-singular_vector.svg" height="64" alt="revolt" title="Join my Revolt Server">

bungeecord/pom.xml

@@ -42,6 +42,11 @@
     <properties>
         <maven.compiler.source>16</maven.compiler.source>
         <maven.compiler.target>16</maven.compiler.target>
+        
+        <dependency.adventure-api>4.16.0</dependency.adventure-api>
+        <dependency.adventure-text-minimessage>4.16.0</dependency.adventure-text-minimessage>
+        <dependency.adventure-platform-bungeecord>4.3.2</dependency.adventure-platform-bungeecord>
+        <dependency.configurate-yaml>4.1.2</dependency.configurate-yaml>
     </properties>
     
     <repositories>
@@ -49,6 +54,10 @@
             <id>sonatype</id>
             <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
         </repository>
+        <repository>
+            <id>sonatype-snapshots</id>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+        </repository>
     </repositories>
     
     <dependencies>
@@ -85,20 +94,20 @@
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-api</artifactId>
-            <version>4.16.0</version>
-            <scope>compile</scope>
+            <version>${dependency.adventure-api}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.16.0</version>
-            <scope>compile</scope>
+            <version>${dependency.adventure-text-minimessage}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-bungeecord</artifactId>
-            <version>4.3.2</version>
-            <scope>compile</scope>
+            <version>${dependency.adventure-platform-bungeecord}</version>
+            <scope>provided</scope>
         </dependency>
         
         <!-- Metrics -->
@@ -113,8 +122,8 @@
         <dependency>
             <groupId>org.spongepowered</groupId>
             <artifactId>configurate-yaml</artifactId>
-            <version>4.1.2</version>
-            <scope>compile</scope>
+            <version>${dependency.configurate-yaml}</version>
+            <scope>provided</scope>
         </dependency>
         
         <!-- Plugins -->
@@ -124,6 +133,14 @@
             <version>2.9.0-4</version>
             <scope>provided</scope>
         </dependency>
+        
+        <!-- Other -->
+        <dependency>
+            <groupId>com.alessiodp.libby</groupId>
+            <artifactId>libby-bungee</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -143,22 +160,18 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.2</version>
+                <version>3.5.3</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <relocations>
-                        <relocation>
-                            <pattern>org.spongepowered.configurate</pattern>
-                            <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.configurate</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>net.kyori</pattern>
-                            <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.kyori</shadedPattern>
-                        </relocation>
                         <relocation>
                             <pattern>org.bstats</pattern>
                             <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.bstats</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>net.byteflux.libby</pattern>
+                            <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.libby</shadedPattern>
+                        </relocation>
                     </relocations>
                     <filters>
                         <filter>

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/BungeeCordCore.java

@@ -35,6 +35,8 @@ import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
+import com.alessiodp.libby.BungeeLibraryManager;
+import com.alessiodp.libby.Library;
 import de.myzelyam.api.vanish.BungeeVanishAPI;
 import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
 import net.md_5.bungee.api.Favicon;
@@ -45,19 +47,36 @@ import org.bstats.bungeecord.Metrics;
 import org.bstats.charts.SimplePie;
 
 import java.awt.image.BufferedImage;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 
 public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
     
+    private boolean successfulLoad = false;
+    
     private AdvancedServerList<Favicon> core;
     private FaviconHandler<Favicon> faviconHandler = null;
     private BungeeAudiences audiences = null;
     private final PluginLogger logger = new BungeeLogger(this);
     
+    @Override
+    public void onLoad(){
+        successfulLoad = loadLibs();
+    }
+    
     @Override
     public void onEnable(){
+        if(!successfulLoad){
+            logger.warn("There were issues during the plugins Loading-phase! Please see the console for possible reasons.");
+            logger.warn("The plugin won't be enabled to prevent additional problems.");
+            return;
+        }
+        
         this.audiences = BungeeAudiences.create(this);
         this.core = AdvancedServerList.init(this, BungeePlayerPlaceholders.init(), BungeeServerPlaceholders.init(this));
     }
@@ -156,4 +175,39 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
         
         return players.size();
     }
+    
+    private boolean loadLibs(){
+        BungeeLibraryManager libraryManager = new BungeeLibraryManager(this);
+        libraryManager.addRepository("https://repo.papermc.io/repository/maven-public");
+        
+        try(InputStream stream = getClass().getResourceAsStream("/dependencies.maven")){
+            if(stream == null){
+                logger.warn("Received null InputStream while trying to resolve dependencies!");
+                return false;
+            }
+            try(InputStreamReader streamReader = new InputStreamReader(stream); 
+                BufferedReader reader = new BufferedReader(streamReader)){
+                String line;
+                while((line = reader.readLine()) != null){
+                    String[] dependency = line.split(":", 3);
+                    if(dependency.length < 3)
+                        continue;
+                    
+                    Library library = Library.builder()
+                        .groupId(dependency[0])
+                        .artifactId(dependency[1])
+                        .version(dependency[2])
+                        .resolveTransitiveDependencies(true)
+                        .build();
+                    
+                    libraryManager.loadLibrary(library);
+                }
+                
+                return true;
+            }
+        }catch(IOException ex){
+            logger.warn("Encountered IOException while trying to resolve dependencies.", ex);
+            return false;
+        }
+    }
 }

bungeecord/src/main/resources/dependencies.maven

@@ -0,0 +1,4 @@
+net{}kyori:adventure-api:${dependency.adventure-api}
+net{}kyori:adventure-text-minimessage:${dependency.adventure-text-minimessage}
+net{}kyori:adventure-platform-bungeecord:${dependency.adventure-platform-bungeecord}
+org{}spongepowered:configurate-yaml:${dependency.configurate-yaml}

core/pom.xml

@@ -73,7 +73,7 @@
         <dependency>
             <groupId>ch.andre601</groupId>
             <artifactId>expressionparser</artifactId>
-            <version>1.3.0</version>
+            <version>1.4.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -163,7 +163,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.2</version>
+                <version>3.5.3</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <filters>

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

@@ -31,7 +31,6 @@ import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 import ch.andre601.advancedserverlist.core.profiles.conditions.ProfileConditionParser;
 import ch.andre601.expressionparser.ParseWarnCollector;
-import ch.andre601.expressionparser.templates.ExpressionTemplate;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 
@@ -47,7 +46,8 @@ public record ServerListProfile(int priority, String condition, ProfileEntry def
             return true;
         
         ParseWarnCollector collector = new ParseWarnCollector(condition);
-        ExpressionTemplate template = parser.compile(condition, player, server, collector);
+        
+        boolean result = parser.evaluate(condition, player, server, collector);
         
         if(collector.hasWarnings()){
             logger.warn("Encountered %d Error(s) while parsing condition for file '%s':", collector.getWarnings().size(), file);
@@ -61,10 +61,7 @@ public record ServerListProfile(int priority, String condition, ProfileEntry def
             }
         }
         
-        if(template == null)
-            return false;
-        
-        return template.returnBooleanExpression().evaluate();
+        return result;
     }
     
     public ProfileEntry getRandomProfile(){

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/ProfileConditionParser.java

@@ -60,8 +60,12 @@ public class ProfileConditionParser implements ExpressionParserEngine{
             .build();
     }
     
-    public ExpressionTemplate compile(String text, GenericPlayer player, GenericServer server, ParseWarnCollector collector){
-        return parser.parse(tokenizer.parse(text, player, server, collector), collector);
+    public boolean evaluate(String text, GenericPlayer player, GenericServer server, ParseWarnCollector collector){
+        ExpressionTemplate result = parser.parse(tokenizer.parse(text, player, server, collector), collector);
+        if(result == null)
+            return false;
+        
+        return result.returnBooleanExpression().evaluate();
     }
     
     @Override

core/src/test/java/ch/andre601/advancedserverlist/test/ExpressionParserTests.java

@@ -27,7 +27,6 @@ package ch.andre601.advancedserverlist.test;
 
 import ch.andre601.advancedserverlist.core.profiles.conditions.ProfileConditionParser;
 import ch.andre601.expressionparser.ParseWarnCollector;
-import ch.andre601.expressionparser.templates.ExpressionTemplate;
 import org.junit.jupiter.api.Test;
 
 import java.util.Map;
@@ -46,15 +45,9 @@ public class ExpressionParserTests{
             logger.info("TEST[expression=\"%s\", expected=%b]", values.getKey(), values.getValue());
             
             ParseWarnCollector collector = new ParseWarnCollector(values.getKey());
-            ExpressionTemplate template = parser.compile(values.getKey(), null, null, collector);
-            boolean result;
-            if(template == null){
-                result = false;
-            }else{
-                result = template.returnBooleanExpression().evaluate();
-            }
+            boolean result = parser.evaluate(values.getKey(), null, null, collector);
             
-            logger.info("Result (output, isExpected): " + result + ", " + (result == values.getValue()));
+            logger.info("Result (Output, Expected?): %b, %b", result, (result == values.getValue()));
             assertEquals(result, values.getValue());
         }
     }

paper/pom.xml

@@ -92,7 +92,7 @@
         <dependency>
             <groupId>com.viaversion</groupId>
             <artifactId>viaversion-api</artifactId>
-            <version>4.9.3</version>
+            <version>4.10.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -117,7 +117,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.2</version>
+                <version>3.5.3</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <relocations>

pom.xml

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

preview-domains

@@ -0,0 +1 @@
+preview.andre601.ch

renovate.json

@@ -9,7 +9,8 @@
     {
       "description": "Use Jitpack registry for AdvancedBan",
       "matchPackageNames": [
-        "com.github.DevLeoko:AdvancedBan"
+        "com.github.DevLeoko:AdvancedBan",
+        "com.github.LeonMangler:PremiumVanishAPI"
       ],
       "registryUrls": [
         "https://jitpack.io"

requirements.txt

@@ -1,3 +1,3 @@
-mkdocs-material==9.5.17
+mkdocs-material==9.5.20
 mkdocs-glightbox==0.3.7
 git+https://github.com/Andre601/mkdocs-pagenav-generator

velocity/pom.xml

@@ -114,7 +114,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.2</version>
+                <version>3.5.3</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <relocations>

version-uploader/pom.xml

@@ -52,7 +52,7 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.5.4</version>
+            <version>1.5.6</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -101,7 +101,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.4.1</version>
                 <configuration>
                     <archive>
                         <manifest>
@@ -115,7 +115,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.2</version>
+                <version>3.5.3</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                 </configuration>