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

.gitea/assets/MODRINTH.md

@@ -80,7 +80,7 @@ Spanish Video by Ajneb97
 </a>
 
 ## Support
-<a href="https://discord.gg/6dazXp6" target="_blank">
+<a href="https://discord.gg/MyPTjpsgGH" target="_blank">
   <img src="https://wsrv.nl/?url=https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact-minimal/social/discord-singular_vector.svg&w=64" alt="discord" title="Join my Discord Server">
 </a>
 <a href="https://app.revolt.chat/invite/74TpERXA" target="_blank">

.gitea/pull_request_template.yml

@@ -0,0 +1,37 @@
+name: Pull Request
+description: Create a new Pull request
+
+body:
+  - type: markdown
+    attributes:
+      value: |-
+        Thank you for creating a Pull request!
+
+        Please be sure to fill out this template with all requested information to ensure it being valid and not being closed unmerged.
+  - type: dropdown
+    attributes:
+      label: Type
+      description: What kind of Pull request is this?
+      options:
+        - Enhancement
+        - Bugfix
+        - Documentation
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Breaking Change?
+      description: |-
+        Is this a breaking change?
+        A breaking change means that it becomes incompatible with previous server/proxy versions or plugin versions.
+      options:
+        - Yes
+        - No
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Description
+      description: Provide a detailed description of what this Pull request is doing. Link any issues this Pull request may fix/close.
+    validations:
+      required: true

.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` channel.
-    url: https://discord.gg/6dazXp6
-  - name: Wiki
-    about: Check the Wiki for explanations about the features and examples.
-    url: https://docs.andre601.ch/AdvancedServerList

.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@v4
-      - 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

@@ -0,0 +1,63 @@
+when:
+  - event: pull_request
+    path:
+      include: ['.woodpecker/pr_preview.yml', 'requirements.txt', 'mkdocs.yml', 'docs/**']
+
+variables:
+  setup_git: &setup_git
+    - apk add git
+    - git config --global user.email "andre_601-bot@noreply.codeberg.org"
+    - git config --global user.name "ASL Docs Builder"
+
+steps:
+  cloneTargetRepo:
+    image: alpine:3.18.4
+    commands:
+      - chmod -R a+w .
+      - <<: *setup_git
+      - git clone https://codeberg.org/Andre601/preview.git site
+      - chmod -R a+w site
+      - cd site
+      - 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:
+      pip_install_file: requirements.txt
+  commitAndPush:
+    image: alpine:3.18.4
+    secrets:
+      - bot_token
+    commands:
+      - <<: *setup_git
+      - mv preview-domains site/.domains
+      - cd site
+      - 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} 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:
+      - status: ['success']
+    settings:
+      gitea_address: https://codeberg.org
+      gitea_token:
+        from_secret: BOT_TOKEN
+      comment: |-
+        Pull request Preview ready!
+
+        | 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:
+      - status: ['failure']
+    settings:
+      gitea_address: https://codeberg.org
+      gitea_token:
+        from_secret: BOT_TOKEN
+      comment: |-
+        Issue while creating Pull request preview.
+        Please check the CI logs for any reasons: ${CI_PIPELINE_URL}

.woodpecker/publish_assets.yml

@@ -6,12 +6,12 @@ steps:
   createFiles:
     image: maven:3.9.6-eclipse-temurin-17
     secrets:
-      - source: cb_token
-        target: codeberg_api_token
-      - source: modrinth_api_token
-        target: modrinth_api_token
-      - source: hangar_api_token
-        target: hangar_api_token
+      - modrinth_api_token
+      - hangar_api_token
+      - discord_webhook_url
+    environment:
+      CODEBERG_API_TOKEN:
+        from_secret: cb_token
     commands:
       # Create the jar files.
       - mvn clean install
@@ -31,4 +31,14 @@ steps:
         - "velocity/target/AdvancedServerList-*.jar"
         - "addons/banplugins/target/AdvancedServerList-*.jar"
       api_key:
-        from_secret: CB_TOKEN
+        from_secret: cb_token
+  postOnMastodon:
+    image: woodpeckerci/plugin-mastodon-post
+    when:
+      - status: ['success']
+    settings:
+      server_url: https://blobfox.coffee
+      access_token:
+        from_secret: mastodon_token
+      status: '${CI_COMMIT_TAG} of #AdvancedServerList has been released and can be found on Modrinth (https://modrinth.com/plugin/AdvancedServerList), Hangar (https://hangar.papermc.io/Andre_601/AdvancedServerList) and Codeberg (https://codeberg.org/Andre601/AdvancedServerList).'
+      visibility: public

.woodpecker/publish_docs.yml

@@ -1,13 +1,13 @@
 when:
-  - branch: master
+  - branch: '${CI_REPO_DEFAULT_BRANCH}'
     event: push
     path:
-      include: ['requirements.txt', 'mkdocs.yml', 'docs/**']
+      include: ['.woodpecker/publish_docs.yml', 'requirements.txt', 'mkdocs.yml', 'docs/**']
 
 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:
@@ -16,7 +16,7 @@ steps:
     commands:
       - chmod -R a+w .
       - <<: *setup_git
-      - git clone -b pages https://codeberg.org/Andre601/AdvancedServerList.git site
+      - git clone -b pages https://codeberg.org/Andre601/asl-docs site
       - chmod -R a+w site
   buildDocs:
     image: woodpeckerci/plugin-mkdocs:latest
@@ -25,12 +25,12 @@ steps:
   commitAndPush:
     image: alpine:3.18.4
     secrets:
-      - cb_token
+      - bot_token
     commands:
       - <<: *setup_git
       - mv domains site/.domains
       - cd site
-      - git remote set-url origin https://$CB_TOKEN@codeberg.org/Andre601/AdvancedServerList.git
+      - git remote set-url origin https://$BOT_TOKEN@codeberg.org/Andre601/asl-docs.git
       - git add --all
       - git commit -m "Update AdvancedServerList Docs ($( env TZ=Europe/Zurich date +"%d.%m.%Y %Z" )) [SKIP CI]"
       - git push

README.md

@@ -8,11 +8,9 @@ AdvancedServerList is a plugin that allows you to customize your server's MOTD,
   <img src="https://cdn.jsdelivr.net/gh/Andre601/devins-badges@13e0142/assets/compact/available/modrinth_vector.svg" height="46" alt="modrinth" title="Available on Modrinth">
 </a>
 <br>
-<!--
 <a href="https://hangar.papermc.io/Andre_601/AdvancedServerList" target="_blank">
   <img src="https://cdn.jsdelivr.net/gh/Andre601/devins-badges@13e0142/assets/compact/available/hangar_vector.svg" height="46" alt="hangar" title="Available on Hangar">
 </a>
--->
 
 ## Supported Platforms
 
@@ -90,8 +88,8 @@ You can disable this in the global bStats config file located in `/plugins/bstat
 
 ## Support
 
-<a href="https://discord.gg/6dazXp6" 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">
+<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 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">

addons/banplugins/pom.xml

@@ -54,6 +54,10 @@
             <id>papermc</id>
             <url>https://papermc.io/repo/repository/maven-public/</url>
         </repository>
+        <repository>
+            <id>libertybans</id>
+            <url>https://mvn-repo.arim.space/affero-gpl3/</url>
+        </repository>
     </repositories>
     
     <dependencies>
@@ -78,6 +82,12 @@
             <version>1.20-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.velocitypowered</groupId>
+            <artifactId>velocity-api</artifactId>
+            <version>3.3.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
         
         <!-- Plugin APIs -->
         <dependency>
@@ -86,6 +96,12 @@
             <version>v2.3.0</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>space.arim.libertybans</groupId>
+            <artifactId>bans-api</artifactId>
+            <version>1.1.0-RC1</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>ch.andre601.asl-api</groupId>
             <artifactId>api</artifactId>
@@ -106,7 +122,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.12.1</version>
+                <version>3.13.0</version>
             </plugin>
         </plugins>
     </build>

addons/banplugins/src/main/java/ch/andre601/advancedserverlist/banplugins/bungeecord/BungeeCordBanPlugins.java

@@ -27,13 +27,15 @@ package ch.andre601.advancedserverlist.banplugins.bungeecord;
 
 import ch.andre601.advancedserverlist.api.PlaceholderProvider;
 import ch.andre601.advancedserverlist.banplugins.placeholders.AdvancedBanPlaceholders;
+import ch.andre601.advancedserverlist.banplugins.placeholders.LibertyBansPlaceholders;
 
 import java.util.HashMap;
 import java.util.Map;
 
 public enum BungeeCordBanPlugins{
     
-    ADVANCED_BAN("AdvancedBan", new AdvancedBanPlaceholders());
+    ADVANCED_BAN("AdvancedBan", new AdvancedBanPlaceholders()),
+    LIBERTY_BANS("LibertyBans", new LibertyBansPlaceholders());
     
     private final String plugin;
     private final PlaceholderProvider placeholderProvider;

addons/banplugins/src/main/java/ch/andre601/advancedserverlist/banplugins/bungeecord/BungeeCordBanPluginsAddon.java

@@ -25,8 +25,8 @@
 
 package ch.andre601.advancedserverlist.banplugins.bungeecord;
 
-import ch.andre601.advancedserverlist.api.PlaceholderProvider;
 import ch.andre601.advancedserverlist.api.AdvancedServerListAPI;
+import ch.andre601.advancedserverlist.api.PlaceholderProvider;
 import net.md_5.bungee.api.plugin.Plugin;
 
 import java.util.Map;

addons/banplugins/src/main/java/ch/andre601/advancedserverlist/banplugins/paper/PaperBanPlugins.java

@@ -27,13 +27,15 @@ package ch.andre601.advancedserverlist.banplugins.paper;
 
 import ch.andre601.advancedserverlist.api.PlaceholderProvider;
 import ch.andre601.advancedserverlist.banplugins.placeholders.AdvancedBanPlaceholders;
+import ch.andre601.advancedserverlist.banplugins.placeholders.LibertyBansPlaceholders;
 
 import java.util.HashMap;
 import java.util.Map;
 
 public enum PaperBanPlugins{
     
-    ADVANCED_BAN("AdvancedBan", new AdvancedBanPlaceholders());
+    ADVANCED_BAN("AdvancedBan", new AdvancedBanPlaceholders()),
+    LIBERTY_BANS("LibertyBans", new LibertyBansPlaceholders());
     
     private final String plugin;
     private final PlaceholderProvider placeholderProvider;

addons/banplugins/src/main/java/ch/andre601/advancedserverlist/banplugins/placeholders/AdvancedBanPlaceholders.java

@@ -25,12 +25,10 @@
 
 package ch.andre601.advancedserverlist.banplugins.placeholders;
 
-import ch.andre601.advancedserverlist.banplugins.providers.AdvancedBanProvider;
 import ch.andre601.advancedserverlist.api.PlaceholderProvider;
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
-
-import java.util.Arrays;
+import ch.andre601.advancedserverlist.banplugins.providers.AdvancedBanProvider;
 
 public class AdvancedBanPlaceholders extends PlaceholderProvider{
     
@@ -42,9 +40,9 @@ public class AdvancedBanPlaceholders extends PlaceholderProvider{
     
     @Override
     public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
-        String[] args = placeholder.split("\\s");
+        String[] args = placeholder.split("\\s", 2);
         
-        return switch(placeholder) {
+        return switch(args[0]) {
             // Mute-related placeholders
             case "isMuted" -> String.valueOf(provider.muted(player));
             case "muteReason" -> provider.muteReason(player);
@@ -52,9 +50,6 @@ public class AdvancedBanPlaceholders extends PlaceholderProvider{
                 if(args.length == 1)
                     yield provider.muteDuration(player);
                 
-                if(args.length > 2)
-                    yield null;
-                
                 boolean fromStart = Boolean.getBoolean(args[1]);
                 yield provider.muteDuration(player, fromStart);
             }
@@ -62,9 +57,7 @@ public class AdvancedBanPlaceholders extends PlaceholderProvider{
                 if(args.length == 1)
                     yield provider.muteExpirationDate(player);
                 
-                String pattern = String.join(" ", Arrays.copyOfRange(args, 1, args.length));
-                
-                yield provider.banExpirationDate(player, pattern);
+                yield provider.banExpirationDate(player, args[1]);
             }
             
             // Ban-related placeholders
@@ -74,9 +67,6 @@ public class AdvancedBanPlaceholders extends PlaceholderProvider{
                 if(args.length == 1)
                     yield provider.banDuration(player);
                 
-                if(args.length > 2)
-                    yield null;
-                
                 boolean fromStart = Boolean.getBoolean(args[1]);
                 yield provider.banDuration(player, fromStart);
             }
@@ -84,9 +74,7 @@ public class AdvancedBanPlaceholders extends PlaceholderProvider{
                 if(args.length == 1)
                     yield provider.banExpirationDate(player);
                 
-                String pattern = String.join(" ", Arrays.copyOfRange(args, 1, args.length));
-                
-                yield provider.banExpirationDate(player, pattern);
+                yield provider.banExpirationDate(player, args[1]);
             }
             
             // Unknown/Invalid placeholder.

addons/banplugins/src/main/java/ch/andre601/advancedserverlist/banplugins/placeholders/LibertyBansPlaceholders.java

@@ -0,0 +1,70 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.banplugins.placeholders;
+
+import ch.andre601.advancedserverlist.api.PlaceholderProvider;
+import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
+import ch.andre601.advancedserverlist.api.objects.GenericServer;
+import ch.andre601.advancedserverlist.banplugins.providers.LibertyBansProvider;
+
+public class LibertyBansPlaceholders extends PlaceholderProvider{
+    
+    private final LibertyBansProvider provider = LibertyBansProvider.create();
+    
+    public LibertyBansPlaceholders(){
+        super("libertybans");
+    }
+    
+    @Override
+    public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
+        String[] args = placeholder.split("\\s", 2);
+        
+        return switch(args[0]){
+            // Mute-related placeholders
+            case "isMuted" -> String.valueOf(provider.muted(player));
+            case "muteReason" -> provider.muteReason(player);
+            case "muteExpiration" -> {
+                if(args.length == 1)
+                    yield provider.muteExpirationDate(player);
+                
+                yield provider.muteExpirationDate(player, args[1]);
+            }
+            
+            // Ban-related placeholders
+            case "isBanned" -> String.valueOf(provider.banned(player));
+            case "banReason" -> provider.banReason(player);
+            case "banExpiration" -> {
+                if(args.length == 1)
+                    yield provider.banExpirationDate(player);
+                
+                yield provider.banExpirationDate(player,  args[1]);
+            }
+            
+            // Unknown/Invalid placeholder
+            default -> null;
+        };
+    }
+}

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

@@ -105,8 +105,7 @@ public class AdvancedBanProvider implements PunishmentProvider{
         if(end < 0L)
             return "never";
         
-        Date date = new Date(end);
-        return new SimpleDateFormat(pattern).format(date);
+        return this.returnDate(pattern, end);
     }
     
     @Override
@@ -119,8 +118,7 @@ public class AdvancedBanProvider implements PunishmentProvider{
         if(end < 0L)
             return "never";
         
-        Date date = new Date(end);
-        return new SimpleDateFormat(pattern).format(date);
+        return this.returnDate(pattern, end);
     }
     
     public String muteDuration(GenericPlayer player, boolean fromStart){

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

@@ -0,0 +1,136 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.banplugins.providers;
+
+import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
+import space.arim.libertybans.api.LibertyBans;
+import space.arim.libertybans.api.PunishmentType;
+import space.arim.libertybans.api.punish.Punishment;
+import space.arim.libertybans.api.user.KnownAccount;
+import space.arim.omnibus.Omnibus;
+import space.arim.omnibus.OmnibusProvider;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.UUID;
+
+public class LibertyBansProvider implements PunishmentProvider{
+    private final LibertyBans libertyBans;
+    
+    private LibertyBansProvider(LibertyBans libertyBans){
+        this.libertyBans = libertyBans;
+    }
+    
+    public static LibertyBansProvider create(){
+        Omnibus omnibus = OmnibusProvider.getOmnibus();
+        LibertyBans libertyBans = omnibus.getRegistry().getProvider(LibertyBans.class).orElseThrow();
+        
+        return new LibertyBansProvider(libertyBans);
+    }
+    
+    @Override
+    public boolean muted(GenericPlayer player){
+        return punishment(player.getUUID(), PunishmentType.MUTE) != null;
+    }
+    
+    @Override
+    public boolean banned(GenericPlayer player){
+        return punishment(player.getUUID(), PunishmentType.BAN) != null;
+    }
+    
+    @Override
+    public String muteReason(GenericPlayer player){
+        Punishment mute = punishment(player.getUUID(), PunishmentType.MUTE);
+        if(mute == null)
+            return null;
+        
+        return mute.getReason();
+    }
+    
+    @Override
+    public String banReason(GenericPlayer player){
+        Punishment ban = punishment(player.getUUID(), PunishmentType.BAN);
+        if(ban == null)
+            return null;
+        
+        return ban.getReason();
+    }
+    
+    @Override
+    public String muteDuration(GenericPlayer player){
+        return null;
+    }
+    
+    @Override
+    public String banDuration(GenericPlayer player){
+        return null;
+    }
+    
+    @Override
+    public String muteExpirationDate(GenericPlayer player, String pattern){
+        Punishment mute = punishment(player.getUUID(), PunishmentType.MUTE);
+        if(mute == null)
+            return null;
+        
+        if(mute.isPermanent())
+            return "never";
+        
+        return this.returnDate(pattern, mute.getEndDate().toEpochMilli());
+    }
+    
+    @Override
+    public String banExpirationDate(GenericPlayer player, String pattern){
+        Punishment ban = punishment(player.getUUID(), PunishmentType.BAN);
+        if(ban == null)
+            return null;
+        
+        if(ban.isPermanent())
+            return "never";
+        
+        return this.returnDate(pattern, ban.getEndDate().toEpochMilli());
+    }
+    
+    private Punishment punishment(UUID uuid, PunishmentType type){
+        List<? extends KnownAccount> accounts = libertyBans.getAccountSupervisor()
+            .findAccountsMatching(uuid)
+            .join();
+        
+        if(accounts.isEmpty())
+            return null;
+        
+        KnownAccount sorted = Collections.max(accounts, Comparator.comparing(KnownAccount::recorded));
+        
+        return libertyBans.getSelector()
+            .selectionByApplicabilityBuilder(sorted.uuid(), sorted.address())
+            .type(type)
+            .build()
+            .getFirstSpecificPunishment()
+            .toCompletableFuture()
+            .join()
+            .orElse(null);
+    }
+}

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

@@ -27,7 +27,8 @@ package ch.andre601.advancedserverlist.banplugins.providers;
 
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 
-import java.time.format.DateTimeFormatter;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 public interface PunishmentProvider{
     
@@ -55,4 +56,13 @@ public interface PunishmentProvider{
     
     String banExpirationDate(GenericPlayer player, String pattern);
     
+    default String returnDate(String pattern, long end){
+        Date date = new Date(end);
+        try{
+            return new SimpleDateFormat(pattern).format(date);
+        }catch(IllegalArgumentException ex){
+            return new SimpleDateFormat("dd, MMM yyyy HH:mm:ss").format(date);
+        }
+    }
+    
 }

addons/banplugins/src/main/java/ch/andre601/advancedserverlist/banplugins/velocity/VelocityBanPlugins.java

@@ -23,27 +23,34 @@
  *
  */
 
-package ch.andre601.advancedserverlist.core.profiles.conditions.expressions;
+package ch.andre601.advancedserverlist.banplugins.velocity;
 
-public interface ToBooleanExpression extends Expression{
+import ch.andre601.advancedserverlist.api.PlaceholderProvider;
+import ch.andre601.advancedserverlist.banplugins.paper.PaperBanPlugins;
+import ch.andre601.advancedserverlist.banplugins.placeholders.LibertyBansPlaceholders;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum VelocityBanPlugins{
     
-    boolean evaluate();
+    LIBERTY_BANS("libertybans", new LibertyBansPlaceholders());
     
-    static ToBooleanExpression literal(boolean value){
-        return new ConstantToBooleanExpression(value);
+    private final String plugin;
+    private final PlaceholderProvider placeholderProvider;
+    
+    VelocityBanPlugins(String plugin, PlaceholderProvider placeholderProvider){
+        this.plugin = plugin;
+        this.placeholderProvider = placeholderProvider;
     }
     
-    class ConstantToBooleanExpression implements ToBooleanExpression{
+    public static Map<String, PlaceholderProvider> getBanPlugins(){
+        Map<String, PlaceholderProvider> content = new HashMap<>();
         
-        private final boolean value;
-        
-        public ConstantToBooleanExpression(boolean value){
-            this.value = value;
+        for(VelocityBanPlugins velocityBanPlugins : VelocityBanPlugins.values()){
+            content.put(velocityBanPlugins.plugin, velocityBanPlugins.placeholderProvider);
         }
         
-        @Override
-        public boolean evaluate(){
-            return value;
-        }
+        return content;
     }
 }

addons/banplugins/src/main/java/ch/andre601/advancedserverlist/banplugins/velocity/VelocityBanPluginsAddon.java

@@ -0,0 +1,82 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.banplugins.velocity;
+
+import ch.andre601.advancedserverlist.api.AdvancedServerListAPI;
+import ch.andre601.advancedserverlist.api.PlaceholderProvider;
+import com.google.inject.Inject;
+import com.velocitypowered.api.event.Subscribe;
+import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
+import net.md_5.bungee.api.ProxyServer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+
+public class VelocityBanPluginsAddon{
+    
+    private final Logger logger = LoggerFactory.getLogger("ASLBanPluginsAddon");
+    
+    private final ProxyServer proxy;
+    
+    @Inject
+    public VelocityBanPluginsAddon(ProxyServer proxy){
+        this.proxy = proxy;
+    }
+    
+    @Subscribe
+    public void init(ProxyInitializeEvent event){
+        if(proxy.getPluginManager().getPlugin("advancedserverlist") == null){
+            logger.warn("AdvancedServerList is not enabled. This plugin requires it to function!");
+            return;
+        }
+        
+        int loadedPlaceholders = loadPlaceholderProviders();
+        if(loadedPlaceholders == 0){
+            logger.warn("No compatible Ban plugin was found to register placeholders for.");
+        }else{
+            logger.info("Loaded {} Placeholder Set(s) for AdvancedServerList!", loadedPlaceholders);
+        }
+    }
+    
+    private int loadPlaceholderProviders(){
+        int loaded = 0;
+        Map<String, PlaceholderProvider> banPlugins = VelocityBanPlugins.getBanPlugins();
+        AdvancedServerListAPI api = AdvancedServerListAPI.get();
+        
+        for(Map.Entry<String, PlaceholderProvider> entry : banPlugins.entrySet()){
+            if(proxy.getPluginManager().getPlugin(entry.getKey()) != null){
+                logger.info("Registering placeholders for {}...", entry.getKey());
+                api.addPlaceholderProvider(entry.getValue());
+                logger.info("Placeholder successfully registered!");
+                
+                loaded++;
+            }
+        }
+        
+        return loaded;
+    }
+}

addons/banplugins/src/main/resources/bungee.yml

@@ -6,5 +6,6 @@ description: 'AdvancedBan Add-on for AdvancedServerList to add placeholders to u
 softDepends:
   - AdvancedServerList
   - AdvancedBan
+  - LibertyBans
 
 main: 'ch.andre601.advancedserverlist.banplugins.bungeecord.BungeeCordBanPluginsAddon'

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

@@ -12,5 +12,8 @@ dependencies:
       required: false
       load: BEFORE
     AdvancedBans:
+      required: false
+      load: BEFORE
+    LibertyBans:
       required: false
       load: BEFORE

addons/banplugins/src/main/resources/velocity-plugin.json

@@ -0,0 +1,20 @@
+{
+  "id": "aslbanpluginsaddon",
+  "name": "ASLBanPluginsAddon",
+  "version": "${plugin.version}",
+  "description": "${plugin.description}",
+  "authors": [
+    "Andre_601"
+  ],
+  "dependencies": [
+    {
+      "id": "advancedserverlist",
+      "optional": true
+    },
+    {
+      "id": "libertybans",
+      "optional": true
+    }
+  ],
+  "main": "ch.andre601.advancedserverlist.banplugins.velocity.VelocityBanPluginsAddon"
+}

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>
@@ -64,6 +73,8 @@
             <version>${api.version}</version>
             <scope>compile</scope>
         </dependency>
+        
+        <!-- BungeeCord API -->
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>
@@ -78,34 +89,56 @@
             <type>javadoc</type>
             <scope>provided</scope>
         </dependency>
+        
+        <!-- Adventure Library. Needs to be shaded in -->
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-api</artifactId>
-            <version>4.15.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.15.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 -->
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bungeecord</artifactId>
             <version>3.0.2</version>
             <scope>compile</scope>
         </dependency>
+        
+        <!-- Configurate -->
         <dependency>
             <groupId>org.spongepowered</groupId>
             <artifactId>configurate-yaml</artifactId>
-            <version>4.1.2</version>
+            <version>${dependency.configurate-yaml}</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <!-- Plugins -->
+        <dependency>
+            <groupId>com.github.LeonMangler</groupId>
+            <artifactId>PremiumVanishAPI</artifactId>
+            <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>
@@ -122,33 +155,30 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.12.1</version>
+                <version>3.13.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.1</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>
                             <artifact>*:*</artifact>
                             <excludes>
                                 <exclude>META-INF/*.SF</exclude>
+                                <exclude>META-INF/*.DSA</exclude>
                                 <exclude>META-INF/*.RSA</exclude>
                             </excludes>
                         </filter>

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

@@ -29,28 +29,56 @@ import ch.andre601.advancedserverlist.bungeecord.commands.CmdAdvancedServerList;
 import ch.andre601.advancedserverlist.bungeecord.listeners.JoinEvent;
 import ch.andre601.advancedserverlist.bungeecord.listeners.PingEvent;
 import ch.andre601.advancedserverlist.bungeecord.logging.BungeeLogger;
-import ch.andre601.advancedserverlist.bungeecord.objects.BungeePlayerPlaceholders;
-import ch.andre601.advancedserverlist.bungeecord.objects.BungeeServerPlaceholders;
+import ch.andre601.advancedserverlist.bungeecord.objects.placeholders.BungeePlayerPlaceholders;
+import ch.andre601.advancedserverlist.bungeecord.objects.placeholders.BungeeServerPlaceholders;
 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;
+import net.md_5.bungee.api.config.ServerInfo;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Plugin;
 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(){
-        this.core = AdvancedServerList.init(this, BungeePlayerPlaceholders.init(), BungeeServerPlaceholders.init());
+        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));
     }
     
     @Override
@@ -77,12 +105,17 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
         
     }
     
+    @Override
+    public void loadFaviconHandler(AdvancedServerList<Favicon> core){
+        faviconHandler = new FaviconHandler<>(core);
+    }
+    
     @Override
     public void clearFaviconCache(){
         if(faviconHandler == null)
             return;
     
-        faviconHandler.clearCache();
+        faviconHandler.cleanCache();
     }
     
     @Override
@@ -122,4 +155,59 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
     public String getLoader(){
         return "bungeecord";
     }
+    
+    @Override
+    public Favicon createFavicon(BufferedImage image) throws IllegalArgumentException{
+        return Favicon.create(image);
+    }
+    
+    public BungeeAudiences getAudiences(){
+        return audiences;
+    }
+    
+    public int getOnlinePlayers(ServerInfo server){
+        List<ProxiedPlayer> players = new ArrayList<>(server == null ? getProxy().getPlayers() : server.getPlayers());
+        
+        // Exclude players when PremiumVanish is enabled and player is hidden.
+        if(getProxy().getPluginManager().getPlugin("PremiumVanish") != null){
+            players.removeIf(BungeeVanishAPI::isInvisible);
+        }
+        
+        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/java/ch/andre601/advancedserverlist/bungeecord/commands/CmdAdvancedServerList.java

@@ -33,16 +33,14 @@ import net.md_5.bungee.api.plugin.Command;
 public class CmdAdvancedServerList extends Command{
     
     private final BungeeCordCore plugin;
-    private final BungeeAudiences audiences;
     
     public CmdAdvancedServerList(BungeeCordCore plugin){
         super("advancedserverlist", "advancedserverlist.command.asl", "asl");
         this.plugin = plugin;
-        this.audiences = BungeeAudiences.create(plugin);
     }
     
     @Override
     public void execute(CommandSender sender, String[] args){
-        plugin.getCore().getCommandHandler().handle(new BungeeCmdSender(sender, audiences), args);
+        plugin.getCore().getCommandHandler().handle(new BungeeCmdSender(sender, plugin.getAudiences()), args);
     }
 }

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

@@ -25,12 +25,12 @@
 
 package ch.andre601.advancedserverlist.bungeecord.listeners;
 
+import ch.andre601.advancedserverlist.api.events.GenericServerListEvent;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
 import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
 import ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
-import ch.andre601.advancedserverlist.bungeecord.objects.BungeePlayerImpl;
-import ch.andre601.advancedserverlist.api.events.GenericServerListEvent;
-import ch.andre601.advancedserverlist.bungeecord.objects.BungeeProxyImpl;
+import ch.andre601.advancedserverlist.bungeecord.objects.impl.BungeePlayerImpl;
+import ch.andre601.advancedserverlist.bungeecord.objects.impl.BungeeProxyImpl;
 import ch.andre601.advancedserverlist.core.events.PingEventHandler;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
@@ -46,7 +46,6 @@ import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.ProxyPingEvent;
 
-import java.awt.image.BufferedImage;
 import java.net.InetSocketAddress;
 import java.util.List;
 import java.util.Map;
@@ -143,12 +142,12 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
     
     @Override
     public int getProtocolVersion(){
-        return this.protocol.getProtocol();
+        return event.getConnection().getVersion();
     }
     
     @Override
     public int getOnlinePlayers(){
-        return ping.getPlayers().getOnline();
+        return plugin.getOnlinePlayers(null);
     }
     
     @Override
@@ -205,9 +204,4 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
         
         return new BungeeProxyImpl(servers, playersOnline, playersMax, host);
     }
-    
-    @Override
-    public Favicon createFavicon(BufferedImage image) throws IllegalArgumentException{
-        return Favicon.create(image);
-    }
 }

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

@@ -26,6 +26,7 @@
 package ch.andre601.advancedserverlist.bungeecord.listeners;
 
 import ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
+import ch.andre601.advancedserverlist.bungeecord.commands.BungeeCmdSender;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.PostLoginEvent;
 import net.md_5.bungee.api.plugin.Listener;
@@ -34,7 +35,6 @@ import net.md_5.bungee.event.EventHandler;
 import java.net.InetSocketAddress;
 
 public class JoinEvent implements Listener{
-    
     private final BungeeCordCore plugin;
     
     public JoinEvent(BungeeCordCore plugin){
@@ -48,5 +48,14 @@ public class JoinEvent implements Listener{
         ProxiedPlayer player = event.getPlayer();
         
         plugin.getCore().getPlayerHandler().addPlayer(address.getHostString(), player.getName(), player.getUniqueId());
+        
+        if(player.hasPermission("advancedserverlist.admin") || player.hasPermission("advancedserverlist.updatecheck")){
+            if(plugin.getAudiences() == null || plugin.getCore().getUpdateChecker() == null)
+                return;
+            
+            BungeeCmdSender sender = new BungeeCmdSender(player, plugin.getAudiences());
+            
+            plugin.getCore().getUpdateChecker().performeCachedUpdateCheck(sender);
+        }
     }
 }

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

@@ -25,12 +25,13 @@
 
 package ch.andre601.advancedserverlist.bungeecord.listeners;
 
+import ch.andre601.advancedserverlist.api.bungeecord.events.PostServerListSetEvent;
+import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
 import ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
 import ch.andre601.advancedserverlist.core.events.PingEventHandler;
 import net.md_5.bungee.api.event.ProxyPingEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
-import net.md_5.bungee.event.EventPriority;
 
 public class PingEvent implements Listener{
     
@@ -41,8 +42,10 @@ public class PingEvent implements Listener{
         plugin.getProxy().getPluginManager().registerListener(plugin, this);
     }
     
-    @EventHandler(priority = EventPriority.LOW)
+    @EventHandler(priority = 90) // Maintenance has Event Priority 80, so we need to be AFTER it.
     public void onProxyPing(ProxyPingEvent event){
-        PingEventHandler.handleEvent(new BungeeEventWrapper(plugin, event));
+        ProfileEntry entry = PingEventHandler.handleEvent(new BungeeEventWrapper(plugin, event));
+        
+        plugin.getProxy().getPluginManager().callEvent(new PostServerListSetEvent(entry));
     }
 }

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/objects/impl/BungeePlayerImpl.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022-2023 Andre_601
+ * Copyright (c) 2022-2024 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,7 @@
  *
  */
 
-package ch.andre601.advancedserverlist.bungeecord.objects;
+package ch.andre601.advancedserverlist.bungeecord.objects.impl;
 
 import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
 import ch.andre601.advancedserverlist.core.profiles.players.GenericPlayerImpl;
@@ -31,8 +31,8 @@ import ch.andre601.advancedserverlist.core.profiles.players.GenericPlayerImpl;
 public class BungeePlayerImpl extends GenericPlayerImpl{
     
     public BungeePlayerImpl(CachedPlayer player, int protocol){
-        this.name = player.getName();
+        this.name = player.name();
         this.protocol = protocol;
-        this.uuid = player.getUuid();
+        this.uuid = player.uuid();
     }
 }

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/objects/impl/BungeeProxyImpl.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022-2023 Andre_601
+ * Copyright (c) 2022-2024 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,7 @@
  *
  */
 
-package ch.andre601.advancedserverlist.bungeecord.objects;
+package ch.andre601.advancedserverlist.bungeecord.objects.impl;
 
 import ch.andre601.advancedserverlist.api.bungeecord.objects.BungeeProxy;
 import net.md_5.bungee.api.config.ServerInfo;

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/objects/placeholders/BungeePlayerPlaceholders.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022-2023 Andre_601
+ * Copyright (c) 2022-2024 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,7 @@
  *
  */
 
-package ch.andre601.advancedserverlist.bungeecord.objects;
+package ch.andre601.advancedserverlist.bungeecord.objects.placeholders;
 
 import ch.andre601.advancedserverlist.api.PlaceholderProvider;
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/objects/placeholders/BungeeServerPlaceholders.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022-2023 Andre_601
+ * Copyright (c) 2022-2024 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,24 +23,28 @@
  *
  */
 
-package ch.andre601.advancedserverlist.bungeecord.objects;
+package ch.andre601.advancedserverlist.bungeecord.objects.placeholders;
 
 import ch.andre601.advancedserverlist.api.PlaceholderProvider;
 import ch.andre601.advancedserverlist.api.bungeecord.objects.BungeeProxy;
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
+import ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
 import net.md_5.bungee.api.config.ServerInfo;
 
 import java.net.InetSocketAddress;
 
 public class BungeeServerPlaceholders extends PlaceholderProvider{
     
-    private BungeeServerPlaceholders(){
+    private final BungeeCordCore plugin;
+    
+    private BungeeServerPlaceholders(BungeeCordCore plugin){
         super("server");
+        this.plugin = plugin;
     }
     
-    public static BungeeServerPlaceholders init(){
-        return new BungeeServerPlaceholders();
+    public static BungeeServerPlaceholders init(BungeeCordCore plugin){
+        return new BungeeServerPlaceholders(plugin);
     }
     
     @Override
@@ -64,7 +68,7 @@ public class BungeeServerPlaceholders extends PlaceholderProvider{
                         if(info == null)
                             continue;
                         
-                        players += info.getPlayers().size();
+                        players += plugin.getOnlinePlayers(info);
                     }
                     
                     yield String.valueOf(players);

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

@@ -41,7 +41,7 @@
     <properties>
         <maven.compiler.source>16</maven.compiler.source>
         <maven.compiler.target>16</maven.compiler.target>
-        <plugin.config.version>3</plugin.config.version>
+        <plugin.config.version>5</plugin.config.version>
     </properties>
     
     <repositories>
@@ -57,6 +57,10 @@
             <id>sonatype</id>
             <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
         </repository>
+        <repository>
+            <id>codeberg</id>
+            <url>https://codeberg.org/api/packages/Andre601/maven/</url>
+        </repository>
     </repositories>
     
     <dependencies>
@@ -66,6 +70,12 @@
             <version>${api.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>ch.andre601</groupId>
+            <artifactId>expressionparser</artifactId>
+            <version>1.4.2</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>org.spongepowered</groupId>
             <artifactId>configurate-yaml</artifactId>
@@ -77,21 +87,23 @@
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-api</artifactId>
-            <version>4.15.0</version>
+            <version>4.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.15.0</version>
+            <version>4.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-serializer-legacy</artifactId>
-            <version>4.15.0</version>
+            <version>4.16.0</version>
             <scope>provided</scope>
         </dependency>
+        
+        <!-- Misc -->
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
@@ -107,7 +119,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>33.0.0-jre</version>
+            <version>33.1.0-jre</version>
             <scope>provided</scope>
         </dependency>
         
@@ -146,12 +158,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.12.1</version>
+                <version>3.13.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.5.3</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <filters>
@@ -159,6 +171,7 @@
                             <artifact>*:*</artifact>
                             <excludes>
                                 <exclude>META-INF/*.SF</exclude>
+                                <exclude>META-INF/*.DSA</exclude>
                                 <exclude>META-INF/*.RSA</exclude>
                             </excludes>
                         </filter>
@@ -168,6 +181,10 @@
                             <pattern>com.unascribed</pattern>
                             <shadedPattern>ch.andre601.advancedserverlist.core.depends.flexver</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>ch.andre601.expressionparser</pattern>
+                            <shadedPattern>ch.andre601.advancedserverlist.core.depends.expressionparser</shadedPattern>
+                        </relocation>
                     </relocations>
                 </configuration>
                 <executions>

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

@@ -31,12 +31,11 @@ import ch.andre601.advancedserverlist.core.check.UpdateChecker;
 import ch.andre601.advancedserverlist.core.commands.CommandHandler;
 import ch.andre601.advancedserverlist.core.file.FileHandler;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ExpressionEngine;
+import ch.andre601.advancedserverlist.core.profiles.conditions.ProfileConditionParser;
 import ch.andre601.advancedserverlist.core.profiles.players.PlayerHandler;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Properties;
@@ -47,8 +46,8 @@ public class AdvancedServerList<F>{
     private final FileHandler fileHandler;
     private final CommandHandler commandHandler;
     private final PlayerHandler playerHandler;
-    private final AdvancedServerListAPI api = AdvancedServerListAPI.get();
-    private final ExpressionEngine expressionEngine = new ExpressionEngine();
+    private static final AdvancedServerListAPI api = AdvancedServerListAPI.get();
+    private final ProfileConditionParser parser = ProfileConditionParser.create();
     
     private UpdateChecker updateChecker;
     
@@ -60,7 +59,7 @@ public class AdvancedServerList<F>{
         this.commandHandler = new CommandHandler(this);
         this.playerHandler = new PlayerHandler(this);
         
-        placeholders.forEach(this.api::addPlaceholderProvider);
+        placeholders.forEach(AdvancedServerList.getApi()::addPlaceholderProvider);
         
         load();
     }
@@ -89,12 +88,16 @@ public class AdvancedServerList<F>{
         return version;
     }
     
-    public AdvancedServerListAPI getApi(){
+    public static AdvancedServerListAPI getApi(){
         return api;
     }
     
-    public ExpressionEngine getExpressionEngine(){
-        return expressionEngine;
+    public ProfileConditionParser getParser(){
+        return parser;
+    }
+    
+    public UpdateChecker getUpdateChecker(){
+        return updateChecker;
     }
     
     public void disable(){
@@ -148,9 +151,7 @@ public class AdvancedServerList<F>{
             return;
         }
         
-        Path folder = getPlugin().getFolderPath().resolve("favicons");
-        if(!folder.toFile().exists() && folder.toFile().mkdirs())
-            getPlugin().getPluginLogger().info("Successfully created favicons folder.");
+        getPlugin().loadFaviconHandler(this);
     
         getPlugin().getPluginLogger().info("Loading Commands...");
         plugin.loadCommands();

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

@@ -27,6 +27,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 com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -62,6 +63,8 @@ public class UpdateChecker{
     
     private final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(new UpdateCheckThread());
     
+    private final VersionCache cache = new VersionCache();
+    
     private final AdvancedServerList<?> core;
     private final PluginLogger logger;
     private final String loader;
@@ -74,6 +77,31 @@ public class UpdateChecker{
         startUpdateChecker();
     }
     
+    public void performeCachedUpdateCheck(CmdSender sender){
+        ModrinthVersion version = cache.get(() -> {
+            try{
+                return performUpdateCheck().join();
+            }catch(Exception ex){
+                return null;
+            }
+        });
+        
+        if(version == null)
+            return;
+        
+        int result = version.compare(core.getVersion());
+        if(result == -1){
+            sender.sendPrefixedMsg("<green>A new version of AdvancedServerList is available!");
+            sender.sendPrefixedMsg("<green>Your version: <white>%s", core.getVersion());
+            sender.sendPrefixedMsg("<green>Modrinth: <white>%s", version.versionNumber());
+            sender.sendPrefixedMsg("<click:open_url:'https://modrinth.com/plugin/advancedserverlist/version/%s'><green>[<white>Download Page</white>]</click>", version.id());
+        }else
+        if(result == 1){
+            sender.sendPrefixedMsg("Your version (<white>%s</white>) seems newer than the latest release on Modrinth (<white>%s</white>)", core.getVersion(), version.versionNumber);
+            sender.sendPrefixedMsg("Are you running a dev-build?");
+        }
+    }
+    
     public void disable(){
         executor.shutdown();
         try{
@@ -144,22 +172,22 @@ public class UpdateChecker{
     }
     
     private void printUpdateBanner(ModrinthVersion version){
-        logger.info("==================================================================");
-        logger.info("You are running an outdated version of AdvancedServerList!");
-        logger.info("");
-        logger.info("Your version: %s", core.getVersion());
-        logger.info("Modrinth:     %s", version.versionNumber());
-        logger.info("");
+        logger.warn("==================================================================");
+        logger.warn("You are running an outdated version of AdvancedServerList!");
+        logger.warn("");
+        logger.warn("Your version: %s", core.getVersion());
+        logger.warn("Modrinth:     %s", version.versionNumber());
+        logger.warn("");
         
         if(!version.isRelease()){
-            logger.info("WARNING!");
-            logger.info("This is a %s version and may contain breaking changes and/or bugs!", version.versionType());
-            logger.info("");
+            logger.warn("WARNING!");
+            logger.warn("This is a %s version and may contain breaking changes and/or bugs!", version.versionType());
+            logger.warn("");
         }
         
-        logger.info("Download the latest version from here:");
-        logger.info("https://modrinth.com/plugin/advancedserverlist/version/%s", version.id());
-        logger.info("==================================================================");
+        logger.warn("Download the latest version from here:");
+        logger.warn("https://modrinth.com/plugin/advancedserverlist/version/%s", version.id());
+        logger.warn("==================================================================");
     }
     
     public record ModrinthVersion(String id, String versionNumber, String versionType){

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

@@ -23,27 +23,26 @@
  *
  */
 
-package ch.andre601.advancedserverlist.core.profiles.conditions.expressions;
+package ch.andre601.advancedserverlist.core.check;
 
-public interface ToStringExpression extends Expression{
+import java.util.function.Supplier;
+
+public class VersionCache{
     
-    String evaluate();
+    private CachedValue cachedValue = null;
     
-    static ToStringExpression literal(String value){
-        return new ConstantToStringExpression(value);
+    public VersionCache(){}
+    
+    public UpdateChecker.ModrinthVersion get(Supplier<UpdateChecker.ModrinthVersion> supplier){
+        if(cachedValue == null || cachedValue.hasExpired())
+            cachedValue = new CachedValue(System.currentTimeMillis(), supplier.get());
+        
+        return cachedValue.version();
     }
     
-    class ConstantToStringExpression implements ToStringExpression{
-        
-        private final String value;
-        
-        private ConstantToStringExpression(String value){
-            this.value = value;
-        }
-        
-        @Override
-        public String evaluate(){
-            return value;
+    private record CachedValue(long timestamp, UpdateChecker.ModrinthVersion version){
+        public boolean hasExpired(){
+            return (timestamp < 0L) || System.currentTimeMillis() - timestamp >= 300_000L;
         }
     }
 }

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

@@ -27,7 +27,10 @@ package ch.andre601.advancedserverlist.core.compat.papi;
 
 import net.william278.papiproxybridge.api.PlaceholderAPI;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;

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

@@ -30,10 +30,10 @@ import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
 import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
 import ch.andre601.advancedserverlist.core.compat.maintenance.MaintenanceUtil;
+import ch.andre601.advancedserverlist.core.compat.papi.PAPIUtil;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
-import ch.andre601.advancedserverlist.core.compat.papi.PAPIUtil;
 import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
 import ch.andre601.advancedserverlist.core.profiles.profile.ProfileManager;
@@ -44,11 +44,11 @@ public class PingEventHandler{
     private static PAPIUtil papiUtil = null;
     private static MaintenanceUtil maintenanceUtil = null;
     
-    public static <F, P extends GenericPlayer> void handleEvent(GenericEventWrapper<F, P> event){
+    public static <F, P extends GenericPlayer> ProfileEntry handleEvent(GenericEventWrapper<F, P> event){
         event.getPlugin().getPluginLogger().debug(PingEventHandler.class, "Received ping event. Handling it...");
-        if(event.isInvalidProtocol() || event.isMaintenanceModeActive()){
-            event.getPlugin().getPluginLogger().debug(PingEventHandler.class, "Not handling event. Either protocol was invalid of Maintenance is enabled.");
-            return;
+        if(event.isInvalidProtocol()){
+            event.getPlugin().getPluginLogger().debug(PingEventHandler.class, "Not handling event. Protocol was invalid.");
+            return null;
         }
         
         PluginCore<F> plugin = event.getPlugin();
@@ -70,7 +70,7 @@ public class PingEventHandler{
         
         if(profile == null){
             logger.debugWarn(PingEventHandler.class, "Server List Profile couldn't be resolved properly. Cancelling event handling...");
-            return;
+            return null;
         }
         
         logger.debug(PingEventHandler.class, "Received valid Server List Profile. Calling PreServerListSetEvent...");
@@ -78,7 +78,7 @@ public class PingEventHandler{
         GenericServerListEvent e = event.callEvent(ProfileManager.merge(profile));
         if(e == null || e.isCancelled()){
             logger.debug(PingEventHandler.class, "PreServerListSetEvent was cancelled. Stopping ping handling...");
-            return;
+            return null;
         }
         
         logger.debug(PingEventHandler.class, "PreServerListSetEvent completed. Proceeding with ping handling...");
@@ -86,12 +86,12 @@ public class PingEventHandler{
         ProfileEntry entry = e.getEntry();
         if(entry.isInvalid()){
             logger.debugWarn(PingEventHandler.class, "No valid ProfileEntry retrieved. Cancelling ping handling...");
-            return;
+            return null;
         }
         
         boolean extraPlayers = ProfileManager.checkOption(entry.extraPlayersEnabled());
         
-        if(extraPlayers){
+        if(extraPlayers && ignoreMaintenance(event, "extraPlayers")){
             max = online + (entry.extraPlayersCount() == null ? 0 : entry.extraPlayersCount());
             
             logger.debug(PingEventHandler.class, "Extra Players enabled. Applying '%d' as max player count...", max);
@@ -99,7 +99,7 @@ public class PingEventHandler{
             event.setMaxPlayers(max);
         }
         
-        if(ProfileManager.checkOption(entry.maxPlayersEnabled()) && !extraPlayers){
+        if(ProfileManager.checkOption(entry.maxPlayersEnabled()) && !extraPlayers && ignoreMaintenance(event, "maxPlayers")){
             max = (entry.maxPlayersCount() == null) ? 0 : entry.maxPlayersCount();
             
             logger.debug(PingEventHandler.class, "Max Players enabled. Applying '%d' as max player count...", max);
@@ -109,7 +109,7 @@ public class PingEventHandler{
         
         GenericServer finalServer = event.createGenericServer(online, max, host);
         
-        if(ProfileManager.checkOption(entry.motd())){
+        if(ProfileManager.checkOption(entry.motd()) && ignoreMaintenance(event, "motd")){
             logger.debug(PingEventHandler.class, "MOTD set. Applying '%s'...", String.join("\\n", entry.motd()));
             
             event.setMotd(
@@ -122,13 +122,13 @@ public class PingEventHandler{
         
         boolean hidePlayers = ProfileManager.checkOption(entry.hidePlayersEnabled());
         
-        if(hidePlayers){
+        if(hidePlayers && ignoreMaintenance(event, "hidePlayers")){
             logger.debug(PingEventHandler.class, "Hide Players enabled. Hiding player count...");
             
             event.hidePlayers();
         }
         
-        if(ProfileManager.checkOption(entry.playerCountText()) && !hidePlayers){
+        if(ProfileManager.checkOption(entry.playerCountText()) && !hidePlayers && ignoreMaintenance(event, "playerCountText")){
             logger.debug(PingEventHandler.class, "Player Count Text set. Applying '%s'...", entry.playerCountText());
             
             event.setPlayerCount(
@@ -139,40 +139,34 @@ public class PingEventHandler{
             );
         }
         
-        if(ProfileManager.checkOption(entry.players()) && !hidePlayers){
+        if(ProfileManager.checkOption(entry.players()) && !hidePlayers && ignoreMaintenance(event, "playerCountHover")){
             logger.debug(PingEventHandler.class, "Player Count Hover set. Applying '%s'...", String.join("\\n", entry.players()));
             
             event.setPlayers(entry.players(), player, server);
         }
         
-        if(ProfileManager.checkOption(entry.favicon())){
+        if(ProfileManager.checkOption(entry.favicon()) && ignoreMaintenance(event, "favicon")){
             logger.debug(PingEventHandler.class, "Favicon set. Resolving '%s'...", entry.favicon());
             
-            String favicon = StringReplacer.replace(entry.favicon(), player, server);
+            String faviconString = StringReplacer.replace(entry.favicon(), player, server);
             
-            F fav = plugin.getFaviconHandler().getFavicon(favicon, image -> {
-                try{
-                    logger.debug(PingEventHandler.class, "Converting BufferedImage to Server or Proxy Favicon instance...");
-                    return event.createFavicon(image);
-                }catch(Exception ex){
-                    plugin.getPluginLogger().warn("Encountered an Exception while creating Favicon!", ex);
-                    return null;
-                }
-            });
+            F favicon = plugin.getFaviconHandler().getFavicon(faviconString);
             
-            if(fav == null){
+            if(favicon == null){
                 logger.debugWarn(PingEventHandler.class, "Favicon was invalid or not yet resolved! Using default favicon of Server/Proxy...");
                 
                 event.setDefaultFavicon();
             }else{
                 logger.debug(PingEventHandler.class, "Applying favicon...");
                 
-                event.setFavicon(fav);
+                event.setFavicon(favicon);
             }
         }
         
         logger.debug(PingEventHandler.class, "Event handling completed. Updating Ping data...");
         event.updateEvent();
+        
+        return entry;
     }
     
     public static PAPIUtil getPAPIUtil(){
@@ -188,4 +182,11 @@ public class PingEventHandler{
         
         return (maintenanceUtil = new MaintenanceUtil());
     }
+    
+    private static <F, P extends GenericPlayer> boolean ignoreMaintenance(GenericEventWrapper<F, P> event, String option){
+        if(!event.isMaintenanceModeActive())
+            return true;
+        
+        return !event.getPlugin().getCore().getFileHandler().getBool(true, "disableDuringMaintenance", option);
+    }
 }

core/src/main/java/ch/andre601/advancedserverlist/core/file/ConfigMigrator.java

@@ -46,18 +46,46 @@ public class ConfigMigrator{
     public static ConfigurationTransformation.Versioned create(){
         return ConfigurationTransformation.versionedBuilder()
             .versionKey("configVersion")
-            .addVersion(LATEST, twoToThree())
+            .addVersion(LATEST, fourToFive())
+            .addVersion(4, threeToFour())
+            .addVersion(3, twoToThree())
             .addVersion(2, oneToTwo())
             .build();
     }
     
+    public static ConfigurationTransformation fourToFive(){
+        return ConfigurationTransformation.builder()
+            .addAction(NodePath.path(), (path, value) -> {
+                value.node("disableDuringMaintenance", "motd").set(true);
+                value.node("disableDuringMaintenance", "favicon").set(true);
+                value.node("disableDuringMaintenance", "hidePlayers").set(true);
+                value.node("disableDuringMaintenance", "playerCountText").set(true);
+                value.node("disableDuringMaintenance", "playerCountHover").set(true);
+                value.node("disableDuringMaintenance", "extraPlayers").set(true);
+                value.node("disableDuringMaintenance", "maxPlayers").set(true);
+                
+                return null;
+            })
+            .build();
+    }
+    
+    public static ConfigurationTransformation threeToFour(){
+        return ConfigurationTransformation.builder()
+            .addAction(NodePath.path(), (path, value) -> {
+                value.node("faviconCacheTime").set(1);
+                
+                return null;
+            })
+            .build();
+    }
+    
     public static ConfigurationTransformation twoToThree(){
         return ConfigurationTransformation.builder()
-            .addAction(NodePath.path(), ((path, value) -> {
+            .addAction(NodePath.path(), (path, value) -> {
                 value.node("debug").set(false);
                 
                 return null;
-            }))
+            })
             .build();
     }
     

core/src/main/java/ch/andre601/advancedserverlist/core/file/FileHandler.java

@@ -25,10 +25,10 @@
 
 package ch.andre601.advancedserverlist.core.file;
 
+import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
-import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
 import ch.andre601.advancedserverlist.core.profiles.profile.ProfileSerializer;
 import org.spongepowered.configurate.ConfigurateException;
 import org.spongepowered.configurate.ConfigurationNode;
@@ -187,8 +187,17 @@ public class FileHandler{
         return node.node(path).getString(def);
     }
     
+    public boolean getBool(boolean def, Object... path){
+        return node.node(path).getBoolean(def);
+    }
+    
     public boolean getBoolean(Object... path){
-        return node.node(path).getBoolean();
+        return getBool(false, path);
+    }
+    
+    public long getLong(long def, long limit, Object... path){
+        long value = node.node(path).getLong(def);
+        return Math.max(value, limit);
     }
     
     public boolean isOldConfig(){

core/src/main/java/ch/andre601/advancedserverlist/core/interfaces/core/PluginCore.java

@@ -29,6 +29,7 @@ import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
 
+import java.awt.image.BufferedImage;
 import java.nio.file.Path;
 
 public interface PluginCore<F>{
@@ -39,6 +40,8 @@ public interface PluginCore<F>{
     
     void loadMetrics();
     
+    void loadFaviconHandler(AdvancedServerList<F> core);
+    
     void clearFaviconCache();
     
     AdvancedServerList<F> getCore();
@@ -55,7 +58,12 @@ public interface PluginCore<F>{
     
     String getLoader();
     
+    F createFavicon(BufferedImage image) throws Exception;
+    
     default boolean isDebugEnabled(){
+        if(getCore() == null)
+            return false;
+        
         return getCore().getFileHandler().getBoolean("debug");
     }
 }

core/src/main/java/ch/andre601/advancedserverlist/core/interfaces/events/GenericEventWrapper.java

@@ -25,15 +25,14 @@
 
 package ch.andre601.advancedserverlist.core.interfaces.events;
 
+import ch.andre601.advancedserverlist.api.events.GenericServerListEvent;
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
 import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
-import ch.andre601.advancedserverlist.api.events.GenericServerListEvent;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
 import net.kyori.adventure.text.Component;
 
-import java.awt.image.BufferedImage;
 import java.net.InetSocketAddress;
 import java.util.List;
 
@@ -79,8 +78,6 @@ public interface GenericEventWrapper<F, P extends GenericPlayer>{
     
     GenericServer createGenericServer(int playersOnline, int playersMax, String host);
     
-    F createFavicon(BufferedImage image) throws Exception;
-    
     default String resolveHost(InetSocketAddress address){
         return address == null ? null : address.getHostString();
     }

core/src/main/java/ch/andre601/advancedserverlist/core/objects/CachedPlayer.java

@@ -27,28 +27,4 @@ package ch.andre601.advancedserverlist.core.objects;
 
 import java.util.UUID;
 
-@SuppressWarnings("FieldMayBeFinal")
-public class CachedPlayer{
-    
-    private String ip;
-    private String name;
-    private UUID uuid;
-    
-    public CachedPlayer(String ip, String name, UUID uuid){
-        this.ip = ip;
-        this.name = name;
-        this.uuid = uuid;
-    }
-    
-    public String getIp(){
-        return ip;
-    }
-    
-    public String getName(){
-        return name;
-    }
-    
-    public UUID getUuid(){
-        return uuid;
-    }
-}
+public record CachedPlayer(String ip, String name, UUID uuid){}

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

@@ -29,9 +29,8 @@ import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
 import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ExpressionEngine;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ExpressionsWarnHelper;
-import ch.andre601.advancedserverlist.core.profiles.conditions.templates.ExpressionTemplate;
+import ch.andre601.advancedserverlist.core.profiles.conditions.ProfileConditionParser;
+import ch.andre601.expressionparser.ParseWarnCollector;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 
@@ -39,24 +38,30 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-public record ServerListProfile(int priority, String condition, ProfileEntry defaultProfile, List<ProfileEntry> profiles){
+public record ServerListProfile(int priority, String condition, ProfileEntry defaultProfile, List<ProfileEntry> profiles, String file){
     private static final Random random = new Random();
     
-    public boolean evalConditions(ExpressionEngine expressionEngine, PluginLogger logger, GenericPlayer player, GenericServer server){
+    public boolean evalConditions(ProfileConditionParser parser, PluginLogger logger, GenericPlayer player, GenericServer server){
         if(condition == null || condition.isEmpty())
             return true;
         
-        ExpressionsWarnHelper warnHelper = new ExpressionsWarnHelper(condition);
-        ExpressionTemplate template = expressionEngine.compile(condition, player, server, warnHelper);
+        ParseWarnCollector collector = new ParseWarnCollector(condition);
         
-        if(warnHelper.hasWarnings()){
-            warnHelper.printWarnings(logger);
+        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);
             
-            if(template == null)
-                return false;
+            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() + 5) + "^");
+                logger.warn("    -> %s", context.message());
+                
+            }
         }
         
-        return template.instantiateWithBooleanResult().evaluate();
+        return result;
     }
     
     public ProfileEntry getRandomProfile(){
@@ -151,7 +156,7 @@ public record ServerListProfile(int priority, String condition, ProfileEntry def
         }
         
         public ServerListProfile build(){
-            return new ServerListProfile(this.priority, this.condition, this.defaultProfile, this.profiles);
+            return new ServerListProfile(this.priority, this.condition, this.defaultProfile, this.profiles, this.fileName);
         }
     }
 }

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

@@ -1,107 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions;
-
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToBooleanExpression;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToDoubleExpression;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToStringExpression;
-import ch.andre601.advancedserverlist.core.profiles.conditions.templates.AbstractUnaryToBooleanExpression;
-import ch.andre601.advancedserverlist.core.profiles.conditions.templates.AbstractUnaryToDoubleExpression;
-import ch.andre601.advancedserverlist.core.profiles.conditions.templates.AbstractUnaryToStringExpression;
-
-import java.text.NumberFormat;
-import java.text.ParseException;
-import java.util.Locale;
-
-public class Conversions{
-    
-    private final static NumberFormat NUMBER_FORMAT;
-    
-    static {
-        NUMBER_FORMAT = NumberFormat.getNumberInstance(Locale.ROOT);
-        NUMBER_FORMAT.setGroupingUsed(false);
-    }
-    
-    public static ToBooleanExpression toBoolean(ToDoubleExpression expression){
-        return new AbstractUnaryToBooleanExpression<>(expression) {
-            @Override
-            public boolean evaluate(){
-                return delegate.evaluate() != 0;
-            }
-        };
-    }
-    
-    public static ToBooleanExpression toBoolean(ToStringExpression expression){
-        return new AbstractUnaryToBooleanExpression<>(expression) {
-            @Override
-            public boolean evaluate(){
-                return Boolean.parseBoolean(delegate.evaluate());
-            }
-        };
-    }
-    
-    public static ToDoubleExpression toDouble(ToBooleanExpression expression){
-        return new AbstractUnaryToDoubleExpression<>(expression) {
-            @Override
-            public double evaluate(){
-                return delegate.evaluate() ? 1 : 0;
-            }
-        };
-    }
-    
-    public static ToDoubleExpression toDouble(ToStringExpression expression){
-        return new AbstractUnaryToDoubleExpression<>(expression) {
-            @Override
-            public double evaluate(){
-                String result = delegate.evaluate();
-                try{
-                    return NUMBER_FORMAT.parse(result).doubleValue();
-                }catch(ParseException | NumberFormatException ex){
-                    return 0;
-                }
-            }
-        };
-    }
-    
-    public static ToStringExpression toString(ToBooleanExpression expression){
-        return new AbstractUnaryToStringExpression<>(expression) {
-            @Override
-            public String evaluate(){
-                return Boolean.toString(delegate.evaluate());
-            }
-        };
-    }
-    
-    public static ToStringExpression toString(ToDoubleExpression expression){
-        return new AbstractUnaryToStringExpression<>(expression) {
-            @Override
-            public String evaluate(){
-                double result = delegate.evaluate();
-                return result == (int)result ? Integer.toString((int)result) : Double.toString(result);
-            }
-        };
-    }
-}

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

@@ -1,226 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2023 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions;
-
-import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
-import ch.andre601.advancedserverlist.api.objects.GenericServer;
-import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
-
-public class Expression{
-    
-    private final ExpressionResult result;
-    
-    private final String left;
-    private final Operator operator;
-    private final String right;
-    
-    private Expression(ExpressionResult result, String left, Operator operator, String right){
-        this.result = result;
-        this.left = left;
-        this.operator = operator;
-        this.right = right;
-    }
-    
-    public static Expression createInvalid(ExpressionResult result){
-        return new Expression(result, null, Operator.UNKNOWN, null);
-    }
-    
-    public static Expression resolve(String expression){
-        Operator operator = Operator.UNKNOWN;
-        
-        if(expression == null || expression.isEmpty()){
-            return Expression.createInvalid(ExpressionResult.INVALID_NO_EXPRESSION);
-        }
-        
-        char[] chars = expression.toCharArray();
-        
-        StringBuilder leftBuilder = new StringBuilder();
-        StringBuilder rightBuilder = new StringBuilder();
-        
-        boolean foundOperator = false;
-        
-        for(int i = 0; i < chars.length; i++){
-            char c = chars[i];
-            char next = (i == (chars.length - 1)) ? '\0' : chars[i + 1];
-            
-            Operator tmp = Operator.getOperand(c, next);
-            if(tmp != Operator.UNKNOWN && !foundOperator){
-                operator = tmp;
-                foundOperator = true;
-                
-                if(tmp.hasSecond())
-                    i++; // Skip next character if operator has 2
-                
-                continue;
-            }
-            
-            if(foundOperator){
-                rightBuilder.append(c);
-            }else{
-                leftBuilder.append(c);
-            }
-        }
-        
-        if(leftBuilder.isEmpty() || rightBuilder.isEmpty()){
-            return Expression.createInvalid(ExpressionResult.INVALID_EMPTY_PARTS);
-        }
-        
-        return new Expression(ExpressionResult.VALID, leftBuilder.toString().trim(), operator, rightBuilder.toString().trim());
-    }
-    
-    public boolean evaluate(GenericPlayer player, GenericServer server){
-        String newLeft = StringReplacer.replace(left, player, server);
-        String newRight = StringReplacer.replace(right, player, server);
-        
-        return operator.evaluate(newLeft, newRight);
-    }
-    
-    public ExpressionResult getResult(){
-        return result;
-    }
-    
-    public enum Operator{
-        LESS('<', '\0'){
-            @Override
-            public boolean evaluate(String left, String right){
-                int leftInt = Operator.getInt(left);
-                int rightInt = Operator.getInt(right);
-                
-                return leftInt < rightInt;
-            }
-        },
-        LESS_OR_EQUAL('<', '='){
-            @Override
-            public boolean evaluate(String left, String right){
-                int leftInt = Operator.getInt(left);
-                int rightInt = Operator.getInt(right);
-                
-                return leftInt <= rightInt;
-            }
-        },
-        EQUAL('=', '\0'){
-            @Override
-            public boolean evaluate(String left, String right){
-                return left.equals(right);
-            }
-        },
-        EQUALS_IGNORE_CASE('~', '='){
-            @Override
-            public boolean evaluate(String left, String right){
-                return left.equalsIgnoreCase(right);
-            }
-        },
-        NOT_EQUAL('!', '='){
-            @Override
-            public boolean evaluate(String left, String right){
-                return !left.equals(right);
-            }
-        },
-        NOT_EQUAL_IGNORE_CASE('!', '~'){
-            @Override
-            public boolean evaluate(String left, String right){
-                return !left.equalsIgnoreCase(right);
-            }
-        },
-        GREATER('>', '\0'){
-            @Override
-            public boolean evaluate(String left, String right){
-                int leftInt = Operator.getInt(left);
-                int rightInt = Operator.getInt(right);
-                
-                return leftInt > rightInt;
-            }
-        },
-        GREATER_OR_EQUAL('>', '='){
-            @Override
-            public boolean evaluate(String left, String right){
-                int leftInt = Operator.getInt(left);
-                int rightInt = Operator.getInt(right);
-                
-                return leftInt >= rightInt;
-            }
-        },
-        
-        UNKNOWN('\0', '\0'){
-            @Override
-            public boolean evaluate(String left, String right){
-                return false;
-            }
-        };
-        
-        private static final Operator[] VALUES = values();
-        
-        private final char first;
-        private final char second;
-        
-        Operator(char first, char second){
-            this.first = first;
-            this.second = second;
-        }
-        
-        public static Operator getOperand(char first, char second){
-            for(Operator operator : VALUES){
-                if(operator.first == first){
-                    if((!operator.hasSecond() && second != '=' && second != '~') || operator.second == second)
-                        return operator;
-                }
-            }
-            
-            return Operator.UNKNOWN;
-        }
-        
-        public boolean hasSecond(){
-            return second != '\0';
-        }
-        
-        public abstract boolean evaluate(String left, String right);
-    
-        private static int getInt(String text){
-            try{
-                return Integer.parseInt(text);
-            }catch(NumberFormatException ex){
-                return text.length();
-            }
-        }
-    }
-    
-    public enum ExpressionResult{
-        VALID(null),
-        
-        INVALID_NO_EXPRESSION("Received empty condition which isn't allowed!"),
-        INVALID_EMPTY_PARTS  ("Received condition with either left or right part being empty.");
-        
-        private final String message;
-        
-        ExpressionResult(String message){
-            this.message = message;
-        }
-        
-        public String getMessage(){
-            return message;
-        }
-    }
-}

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

@@ -0,0 +1,82 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.core.profiles.conditions;
+
+import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
+import ch.andre601.advancedserverlist.api.objects.GenericServer;
+import ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.reader.PlaceholderTokenReader;
+import ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.reader.PlaceholderValueReader;
+import ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.tokens.CustomExpressionTokenizer;
+import ch.andre601.expressionparser.ExpressionParserEngine;
+import ch.andre601.expressionparser.ParseWarnCollector;
+import ch.andre601.expressionparser.operator.Operator;
+import ch.andre601.expressionparser.parsers.ExpressionTemplateParser;
+import ch.andre601.expressionparser.parsers.ValueReader;
+import ch.andre601.expressionparser.templates.ExpressionTemplate;
+import ch.andre601.expressionparser.tokens.Token;
+import ch.andre601.expressionparser.tokens.readers.TokenReader;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+
+import java.util.List;
+
+public class ProfileConditionParser implements ExpressionParserEngine{
+    
+    private final CustomExpressionTokenizer tokenizer;
+    private final ExpressionTemplateParser parser;
+    
+    private ProfileConditionParser(List<TokenReader> tokenReaders, ImmutableMap<Token, Operator> operators, ImmutableList<ValueReader> valueReaders){
+        this.tokenizer = new CustomExpressionTokenizer(tokenReaders);
+        this.parser = new ExpressionTemplateParser(operators, valueReaders);
+    }
+    
+    public static ProfileConditionParser create(){
+        return new ProfileConditionParserBuilder().addDefaults()
+            .addTokenReader(new PlaceholderTokenReader(-20))
+            .addValueReader(new PlaceholderValueReader())
+            .build();
+    }
+    
+    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
+    public ExpressionTemplate compile(String s, ParseWarnCollector parseWarnCollector){
+        return null;
+    }
+    
+    private static class ProfileConditionParserBuilder extends ExpressionParserEngine.Builder<ProfileConditionParser>{
+        @Override
+        public ProfileConditionParser build(){
+            return new ProfileConditionParser(this.getTokenReaders(), ImmutableMap.copyOf(this.getOperators()), ImmutableList.copyOf(this.getValueReaders()));
+        }
+    }
+}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/expressions/Expression.java

@@ -1,28 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.expressions;
-
-public interface Expression{}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/expressions/ExpressionEngine.java

@@ -1,177 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.expressions;
-
-import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
-import ch.andre601.advancedserverlist.api.objects.GenericServer;
-import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
-import ch.andre601.advancedserverlist.core.profiles.conditions.ExpressionTokenizer;
-import ch.andre601.advancedserverlist.core.profiles.conditions.operators.ListOperator;
-import ch.andre601.advancedserverlist.core.profiles.conditions.operators.Operator;
-import ch.andre601.advancedserverlist.core.profiles.conditions.parsers.*;
-import ch.andre601.advancedserverlist.core.profiles.conditions.templates.ExpressionTemplate;
-import ch.andre601.advancedserverlist.core.profiles.conditions.templates.ExpressionTemplates;
-import ch.andre601.advancedserverlist.core.profiles.conditions.tokens.BooleanToken;
-import ch.andre601.advancedserverlist.core.profiles.conditions.tokens.DefaultTokens;
-import ch.andre601.advancedserverlist.core.profiles.conditions.tokens.Token;
-import ch.andre601.advancedserverlist.core.profiles.conditions.tokens.readers.*;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class ExpressionEngine{
-    
-    private final ExpressionTokenizer tokenizer;
-    private final ExpressionTemplateParser templateParser;
-    
-    public ExpressionEngine(){
-        Options options = new Options.Builder()
-            .withDefaultTokenReaders()
-            .withDefaultOperators()
-            .withDefaultValueReaders()
-            .build();
-        
-        this.tokenizer = new ExpressionTokenizer(options.tokenReaders);
-        this.templateParser = new ExpressionTemplateParser(options.operators, options.valueReaders);
-    }
-    
-    public ExpressionTemplate compile(String expression, GenericPlayer player, GenericServer server, ExpressionsWarnHelper warnHelper){
-        return templateParser.parse(tokenizer.parse(expression, player, server, warnHelper), warnHelper);
-    }
-    
-    public static class Options{
-        
-        private final List<TokenReader> tokenReaders;
-        private final ImmutableMap<Token, Operator> operators;
-        private final ImmutableList<ValueReader> valueReaders;
-        
-        private Options(List<TokenReader> tokenReaders, ImmutableMap<Token, Operator> operators, ImmutableList<ValueReader> valueReaders){
-            this.tokenReaders = tokenReaders;
-            this.operators = operators;
-            this.valueReaders = valueReaders;
-        }
-        
-        public static class Builder{
-            private final List<TokenReader> tokenReaders = new ArrayList<>();
-            private final Map<Token, Operator> operators = new HashMap<>();
-            private final List<ValueReader> valueReaders = new ArrayList<>();
-            
-            public Builder(){}
-            
-            public Builder withDefaultTokenReaders(){
-                return this
-                    .tokenReader(new PatternTokenReader(BooleanToken.FALSE, "false"))
-                    .tokenReader(new PatternTokenReader(BooleanToken.TRUE, "true"))
-                    .tokenReader(new PatternTokenReader(DefaultTokens.AND, "and"))
-                    .tokenReader(new PatternTokenReader(DefaultTokens.AND, "&&"))
-                    .tokenReader(new PatternTokenReader(DefaultTokens.OR, "or"))
-                    .tokenReader(new PatternTokenReader(DefaultTokens.OR, "||"))
-                    .tokenReader(new PatternTokenReader(DefaultTokens.EQUAL, "=="))
-                    .tokenReader(new PatternTokenReader(DefaultTokens.EQUAL_IGNORE_CASE, "=~"))
-                    .tokenReader(new PatternTokenReader(DefaultTokens.EQUAL, "="))
-                    .tokenReader(new PatternTokenReader(DefaultTokens.EQUAL_IGNORE_CASE, "~"))
-                    .tokenReader(new PatternTokenReader(DefaultTokens.NOT_EQUAL, "!="))
-                    .tokenReader(new PatternTokenReader(DefaultTokens.NOT_EQUAL_IGNORE_CASE, "!~"))
-                    .tokenReader(new PatternTokenReader(DefaultTokens.STARTS_WITH, "|-"))
-                    .tokenReader(new PatternTokenReader(DefaultTokens.ENDS_WITH, "-|"))
-                    .tokenReader(new PatternTokenReader(DefaultTokens.CONTAINS, "<_"))
-                    .tokenReader(new PatternTokenReader(DefaultTokens.GREATER_OR_EQUAL_THAN, ">="))
-                    .tokenReader(new PatternTokenReader(DefaultTokens.LESSER_OR_EQUAL_THAN, "<="))
-                    .tokenReader(new PatternTokenReader(DefaultTokens.OPENING_PARENTHESIS, "("))
-                    .tokenReader(new PatternTokenReader(DefaultTokens.CLOSING_PARENTHESIS, ")"))
-                    .tokenReader(new PatternTokenReader(DefaultTokens.NEGATION, "!"))
-                    .tokenReader(new PatternTokenReader(DefaultTokens.GREATER_THAN, ">"))
-                    .tokenReader(new PatternTokenReader(DefaultTokens.LESSER_THAN, "<"))
-                    .tokenReader(new PatternTokenReader(DefaultTokens.CONCAT_STRING, "."))
-                    .tokenReader(new PatternTokenReader(DefaultTokens.ADD, "+"))
-                    .tokenReader(new PatternTokenReader(DefaultTokens.SUB, "-"))
-                    .tokenReader(new PatternTokenReader(DefaultTokens.MULT, "*"))
-                    .tokenReader(new PatternTokenReader(DefaultTokens.DIV, "/"))
-                    .tokenReader(new QuotedLiteralTokenReader(-10, '\"'))
-                    .tokenReader(new QuotedLiteralTokenReader(-10, '\''))
-                    .tokenReader(new PlaceholderTokenReader(-20))
-                    .tokenReader(new NumberTokenReader(-50))
-                    .tokenReader(new NonQuotedLiteralTokenReader(-100));
-            }
-            
-            public Builder withDefaultOperators(){
-                return this
-                    .operator(DefaultTokens.AND, ListOperator.of(100, ExpressionTemplates::and))
-                    .operator(DefaultTokens.OR, ListOperator.of(50, ExpressionTemplates::or))
-                    .operator(DefaultTokens.EQUAL, Operator.of(25, ExpressionTemplates::equal))
-                    .operator(DefaultTokens.NOT_EQUAL, Operator.of(25, ExpressionTemplates::notEqual))
-                    .operator(DefaultTokens.EQUAL_IGNORE_CASE, Operator.of(25, ExpressionTemplates::equalIgnoreCase))
-                    .operator(DefaultTokens.NOT_EQUAL_IGNORE_CASE, Operator.of(25, ExpressionTemplates::notEqualIgnoreCase))
-                    .operator(DefaultTokens.STARTS_WITH, Operator.of(25, ExpressionTemplates::startsWith))
-                    .operator(DefaultTokens.ENDS_WITH, Operator.of(25, ExpressionTemplates::endsWith))
-                    .operator(DefaultTokens.CONTAINS, Operator.of(25, ExpressionTemplates::contains))
-                    .operator(DefaultTokens.GREATER_THAN, Operator.of(25, ExpressionTemplates::greater))
-                    .operator(DefaultTokens.GREATER_OR_EQUAL_THAN, Operator.of(25, ExpressionTemplates::greaterOrEqual))
-                    .operator(DefaultTokens.LESSER_THAN, Operator.of(25, ExpressionTemplates::less))
-                    .operator(DefaultTokens.LESSER_OR_EQUAL_THAN, Operator.of(25, ExpressionTemplates::lessOrEqual))
-                    .operator(DefaultTokens.CONCAT_STRING, ListOperator.of(10, ExpressionTemplates::concat))
-                    .operator(DefaultTokens.ADD, ListOperator.of(4, ExpressionTemplates::sum))
-                    .operator(DefaultTokens.SUB, Operator.of(3, ExpressionTemplates::sub))
-                    .operator(DefaultTokens.MULT, ListOperator.of(2, ExpressionTemplates::product))
-                    .operator(DefaultTokens.DIV, Operator.of(1, ExpressionTemplates::div));
-            }
-            
-            public Builder withDefaultValueReaders(){
-                return this
-                    .valueReader(new BooleanConstantReader())
-                    .valueReader(new NumberConstantReader())
-                    .valueReader(new StringConstantReader())
-                    .valueReader(new NegatedExpressionReader(DefaultTokens.NEGATION))
-                    .valueReader(new ParenthesisedExpressionReader(DefaultTokens.OPENING_PARENTHESIS, DefaultTokens.CLOSING_PARENTHESIS))
-                    .valueReader(new PlaceholderReader())
-                    .valueReader(new NegatedNumberReader(DefaultTokens.SUB));
-            }
-            
-            public Builder tokenReader(TokenReader tokenReader){
-                this.tokenReaders.add(tokenReader);
-                return this;
-            }
-            
-            public Builder operator(Token token, Operator operator){
-                this.operators.put(token, operator);
-                return this;
-            }
-            
-            public Builder valueReader(ValueReader valueReader){
-                this.valueReaders.add(valueReader);
-                return this;
-            }
-            
-            public Options build(){
-                return new Options(this.tokenReaders, ImmutableMap.copyOf(operators), ImmutableList.copyOf(valueReaders));
-            }
-        }
-    }
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/expressions/Expressions.java

@@ -1,238 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.expressions;
-
-import ch.andre601.advancedserverlist.core.profiles.conditions.templates.*;
-
-import java.util.Collection;
-
-public class Expressions{
-    
-    public static ToBooleanExpression negate(ToBooleanExpression expression){
-        return new AbstractUnaryToBooleanExpression<>(expression){
-            @Override
-            public boolean evaluate(){
-                return !delegate.evaluate();
-            }
-        };
-    }
-    
-    public static ToBooleanExpression and(Collection<ToBooleanExpression> operands){
-        return new AbstractToBooleanExpression<>(operands){
-            @Override
-            public boolean evaluate(){
-                for(ToBooleanExpression operand : operands){
-                    if(!operand.evaluate())
-                        return false;
-                }
-                
-                return true;
-            }
-        };
-    }
-    
-    public static ToBooleanExpression or(Collection<ToBooleanExpression> operands){
-        return new AbstractToBooleanExpression<>(operands){
-            @Override
-            public boolean evaluate(){
-                for(ToBooleanExpression operand : operands){
-                    if(operand.evaluate())
-                        return true;
-                }
-                
-                return false;
-            }
-        };
-    }
-    
-    public static ToStringExpression concat(Collection<ToStringExpression> operands){
-        return new AbstractToStringExpression<>(operands){
-            @Override
-            public String evaluate(){
-                StringBuilder result = new StringBuilder();
-                for(ToStringExpression operand : operands){
-                    result.append(operand.evaluate());
-                }
-                
-                return result.toString();
-            }
-        };
-    }
-    
-    public static ToBooleanExpression equal(ToStringExpression a, ToStringExpression b){
-        return new AbstractBinaryToBooleanExpression<>(a, b){
-            @Override
-            public boolean evaluate(){
-                return a.evaluate().equals(b.evaluate());
-            }
-        };
-    }
-    
-    public static ToBooleanExpression notEqual(ToStringExpression a, ToStringExpression b){
-        return new AbstractBinaryToBooleanExpression<>(a, b){
-            @Override
-            public boolean evaluate(){
-                return !a.evaluate().equals(b.evaluate());
-            }
-        };
-    }
-    
-    public static ToBooleanExpression equalIgnoreCase(ToStringExpression a, ToStringExpression b){
-        return new AbstractBinaryToBooleanExpression<>(a, b){
-            @Override
-            public boolean evaluate(){
-                return a.evaluate().equalsIgnoreCase(b.evaluate());
-            }
-        };
-    }
-    
-    public static ToBooleanExpression notEqualIgnoreCase(ToStringExpression a, ToStringExpression b){
-        return new AbstractBinaryToBooleanExpression<>(a, b){
-            @Override
-            public boolean evaluate(){
-                return !a.evaluate().equalsIgnoreCase(b.evaluate());
-            }
-        };
-    }
-    
-    public static ToBooleanExpression startsWith(ToStringExpression a, ToStringExpression b){
-        return new AbstractBinaryToBooleanExpression<>(a, b){
-            @Override
-            public boolean evaluate(){
-                return a.evaluate().startsWith(b.evaluate());
-            }
-        };
-    }
-    
-    public static ToBooleanExpression endsWith(ToStringExpression a, ToStringExpression b){
-        return new AbstractBinaryToBooleanExpression<>(a, b){
-            @Override
-            public boolean evaluate(){
-                return a.evaluate().endsWith(b.evaluate());
-            }
-        };
-    }
-    
-    public static ToBooleanExpression contains(ToStringExpression a, ToStringExpression b){
-        return new AbstractBinaryToBooleanExpression<>(a, b){
-            @Override
-            public boolean evaluate(){
-                return a.evaluate().contains(b.evaluate());
-            }
-        };
-    }
-    
-    public static ToBooleanExpression greaterThan(ToDoubleExpression a, ToDoubleExpression b){
-        return new AbstractBinaryToBooleanExpression<>(a, b){
-            @Override
-            public boolean evaluate(){
-                return a.evaluate() > b.evaluate();
-            }
-        };
-    }
-    
-    public static ToBooleanExpression greaterOrEqualThan(ToDoubleExpression a, ToDoubleExpression b){
-        return new AbstractBinaryToBooleanExpression<>(a, b){
-            @Override
-            public boolean evaluate(){
-                return a.evaluate() >= b.evaluate();
-            }
-        };
-    }
-    
-    public static ToBooleanExpression lessThan(ToDoubleExpression a, ToDoubleExpression b){
-        return new AbstractBinaryToBooleanExpression<>(a, b){
-            @Override
-            public boolean evaluate(){
-                return a.evaluate() < b.evaluate();
-            }
-        };
-    }
-    
-    public static ToBooleanExpression lessOrEqualThan(ToDoubleExpression a, ToDoubleExpression b){
-        return new AbstractBinaryToBooleanExpression<>(a, b){
-            @Override
-            public boolean evaluate(){
-                return a.evaluate() <= b.evaluate();
-            }
-        };
-    }
-    
-    public static ToDoubleExpression sum(Collection<ToDoubleExpression> operands){
-        return new AbstractToDoubleExpression<>(operands){
-            @Override
-            public double evaluate(){
-                double result = 0;
-                for(ToDoubleExpression operand : operands){
-                    result += operand.evaluate();
-                }
-                
-                return result;
-            }
-        };
-    }
-    
-    public static ToDoubleExpression product(Collection<ToDoubleExpression> operands){
-        return new AbstractToDoubleExpression<>(operands){
-            @Override
-            public double evaluate(){
-                double result = 1;
-                for(ToDoubleExpression operand : operands){
-                    result *= operand.evaluate();
-                }
-                
-                return result;
-            }
-        };
-    }
-    
-    public static ToDoubleExpression sub(ToDoubleExpression a, ToDoubleExpression b){
-        return new AbstractBinaryToDoubleExpression<>(a, b){
-            @Override
-            public double evaluate(){
-                return a.evaluate() - b.evaluate();
-            }
-        };
-    }
-    
-    public static ToDoubleExpression div(ToDoubleExpression a, ToDoubleExpression b){
-        return new AbstractBinaryToDoubleExpression<>(a, b){
-            @Override
-            public double evaluate(){
-                return a.evaluate() / b.evaluate();
-            }
-        };
-    }
-    
-    public static ToDoubleExpression negateNumber(ToDoubleExpression a){
-        return new AbstractUnaryToDoubleExpression<>(a){
-            @Override
-            public double evaluate(){
-                return -delegate.evaluate();
-            }
-        };
-    }
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/expressions/ExpressionsWarnHelper.java

@@ -1,62 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.expressions;
-
-import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ExpressionsWarnHelper{
-    
-    private final String expression;
-    private final List<Context> warnings = new ArrayList<>();
-    
-    public ExpressionsWarnHelper(String expression){
-        this.expression = expression;
-    }
-    
-    public void appendWarning(int position, String warning, Object... args){
-        warnings.add(new Context(position, String.format(warning, args)));
-    }
-    
-    public boolean hasWarnings(){
-        return !warnings.isEmpty();
-    }
-    
-    public void printWarnings(PluginLogger logger){
-        logger.warn("Encountered %d issue(s) while parsing expression '%s'", warnings.size(), expression);
-        for(Context warning : warnings){
-            if(warning.position() > -1){
-                logger.warn(" - At Position %d: %s", warning.position(), warning.message());
-            }else{
-                logger.warn(" - Cause: %s", warning.message());
-            }
-        }
-    }
-    
-    public record Context(int position, String message){}
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/expressions/ToDoubleExpression.java

@@ -1,49 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.expressions;
-
-public interface ToDoubleExpression extends Expression{
-    
-    double evaluate();
-    
-    static ToDoubleExpression literal(double value){
-        return new ConstantToDoubleExpression(value);
-    }
-    
-    class ConstantToDoubleExpression implements ToDoubleExpression{
-        
-        private final double value;
-        
-        public ConstantToDoubleExpression(double value){
-            this.value = value;
-        }
-        
-        @Override
-        public double evaluate(){
-            return value;
-        }
-    }
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/operators/ListOperator.java

@@ -1,56 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.operators;
-
-import ch.andre601.advancedserverlist.core.profiles.conditions.templates.ExpressionTemplate;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.function.Function;
-
-public abstract class ListOperator extends Operator{
-    
-    public ListOperator(int priority){
-        super(priority);
-    }
-    
-    public static ListOperator of(int priority, Function<Collection<ExpressionTemplate>, ExpressionTemplate> function){
-        return new ListOperator(priority){
-            @Override
-            public ExpressionTemplate createTemplate(List<ExpressionTemplate> operands){
-                return function.apply(operands);
-            }
-        };
-    }
-    
-    @Override
-    public ExpressionTemplate createTemplate(ExpressionTemplate a, ExpressionTemplate b){
-        return createTemplate(Arrays.asList(a, b));
-    }
-    
-    public abstract ExpressionTemplate createTemplate(List<ExpressionTemplate> operands);
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/operators/Operator.java

@@ -1,54 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.operators;
-
-import ch.andre601.advancedserverlist.core.profiles.conditions.templates.ExpressionTemplate;
-
-import java.util.function.BiFunction;
-
-public abstract class Operator{
-    
-    private final int priority;
-    
-    public Operator(int priority){
-        this.priority = priority;
-    }
-    
-    public static Operator of(int priority, BiFunction<ExpressionTemplate, ExpressionTemplate, ExpressionTemplate> function){
-        return new Operator(priority){
-            @Override
-            public ExpressionTemplate createTemplate(ExpressionTemplate a, ExpressionTemplate b){
-                return function.apply(a, b);
-            }
-        };
-    }
-    
-    public int getPriority(){
-        return priority;
-    }
-    
-    public abstract ExpressionTemplate createTemplate(ExpressionTemplate a, ExpressionTemplate b);
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/parsers/BooleanConstantReader.java

@@ -1,45 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.parsers;
-
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ExpressionsWarnHelper;
-import ch.andre601.advancedserverlist.core.profiles.conditions.templates.ConstantExpressionTemplate;
-import ch.andre601.advancedserverlist.core.profiles.conditions.templates.ExpressionTemplate;
-import ch.andre601.advancedserverlist.core.profiles.conditions.tokens.BooleanToken;
-import ch.andre601.advancedserverlist.core.profiles.conditions.tokens.Token;
-
-import java.util.List;
-
-public class BooleanConstantReader extends ValueReader{
-    
-    @Override
-    public ExpressionTemplate read(ExpressionTemplateParser parser, List<Token> tokenList, ExpressionsWarnHelper warnHelper){
-        if(tokenList.get(0) instanceof BooleanToken){
-            return ConstantExpressionTemplate.of(((BooleanToken)tokenList.remove(0)).getValue());
-        }
-        return null;
-    }
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/parsers/ExpressionTemplateParser.java

@@ -1,137 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.parsers;
-
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ExpressionsWarnHelper;
-import ch.andre601.advancedserverlist.core.profiles.conditions.operators.ListOperator;
-import ch.andre601.advancedserverlist.core.profiles.conditions.operators.Operator;
-import ch.andre601.advancedserverlist.core.profiles.conditions.templates.ExpressionTemplate;
-import ch.andre601.advancedserverlist.core.profiles.conditions.templates.ExpressionTemplates;
-import ch.andre601.advancedserverlist.core.profiles.conditions.tokens.Token;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ExpressionTemplateParser{
-    
-    private final ImmutableMap<Token, Operator> operators;
-    private final ImmutableList<ValueReader> valueReaders;
-    
-    public ExpressionTemplateParser(ImmutableMap<Token, Operator> operators, ImmutableList<ValueReader> valueReaders){
-        this.operators = operators;
-        this.valueReaders = valueReaders;
-    }
-    
-    public ExpressionTemplate parse(List<Token> tokenList, ExpressionsWarnHelper warnHelper){
-        List<ExpressionTemplate> parts = new ArrayList<>();
-        List<Operator> operators = new ArrayList<>();
-        
-        try{
-            parts.add(read(tokenList, warnHelper));
-        }catch(IllegalArgumentException ex){
-            warnHelper.appendWarning(-1, ex.getMessage());
-            return null;
-        }
-        
-        while(!tokenList.isEmpty()){
-            Token token = tokenList.remove(0);
-            Operator operator = this.operators.get(token);
-            if(operator == null){
-                warnHelper.appendWarning(-1, "Received \"%s\" but expected OPERATOR.", token);
-                return null;
-            }
-            
-            operators.add(operator);
-            if(tokenList.isEmpty()){
-                warnHelper.appendWarning(-1, "Received unexpected end of input.");
-                return null;
-            }
-            
-            try{
-                parts.add(read(tokenList, warnHelper));
-            }catch(IllegalArgumentException ex){
-                warnHelper.appendWarning(-1, ex.getMessage());
-                return null;
-            }
-        }
-        
-        while(!operators.isEmpty()){
-            Operator operator = operators.get(0);
-            int lowest = operator.getPriority();
-            int start = 0;
-            int end = 1;
-            for(int i = 1; i < operators.size(); i++){
-                operator = operators.get(i);
-                if(operator.getPriority() < lowest){
-                    lowest = operator.getPriority();
-                    start = i;
-                    end = i + 1;
-                }else
-                if(operator.getPriority() > lowest){
-                    break;
-                }else{
-                    end++;
-                }
-            }
-            
-            operator = operators.get(start);
-            
-            ExpressionTemplate replacement;
-            if(start + 1 == end){
-                replacement = operator.createTemplate(parts.get(start), parts.get(end));
-            }else
-            if(operator instanceof ListOperator listOperator){
-                replacement = listOperator.createTemplate(new ArrayList<>(parts.subList(start, end + 1)));
-            }else{
-                List<ExpressionTemplate> conditions = new ArrayList<>(end - start);
-                for(int i = start; i < end; i++)
-                    conditions.add(operators.get(i).createTemplate(parts.get(i), parts.get(i + 1)));
-                
-                replacement = ExpressionTemplates.and(conditions);
-            }
-            
-            for(int i = start; i < end; i++){
-                parts.remove(start);
-                operators.remove(start);
-            }
-            parts.set(start, replacement);
-        }
-        
-        return parts.get(0);
-    }
-    
-    ExpressionTemplate read(List<Token> tokenList, ExpressionsWarnHelper warnHelper){
-        for(ValueReader valueReader : valueReaders){
-            ExpressionTemplate template = valueReader.read(this, tokenList, warnHelper);
-            if(template != null)
-                return template;
-        }
-        
-        throw new IllegalArgumentException("Invalid Expression. Expected literal but got token \"" + tokenList.get(0).toString() + "\"");
-    }
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/parsers/NegatedExpressionReader.java

@@ -1,52 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.parsers;
-
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ExpressionsWarnHelper;
-import ch.andre601.advancedserverlist.core.profiles.conditions.templates.ExpressionTemplate;
-import ch.andre601.advancedserverlist.core.profiles.conditions.templates.ExpressionTemplates;
-import ch.andre601.advancedserverlist.core.profiles.conditions.tokens.Token;
-
-import java.util.List;
-
-public class NegatedExpressionReader extends ValueReader{
-    
-    private final Token tokenNegation;
-    
-    public NegatedExpressionReader(Token tokenNegation){
-        this.tokenNegation = tokenNegation;
-    }
-    
-    @Override
-    public ExpressionTemplate read(ExpressionTemplateParser parser, List<Token> tokenList, ExpressionsWarnHelper warnHelper){
-        if(tokenList.get(0) == tokenNegation){
-            tokenList.remove(0);
-            return ExpressionTemplates.negate(parser.read(tokenList, warnHelper));
-        }
-        
-        return null;
-    }
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/parsers/NegatedNumberReader.java

@@ -1,52 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.parsers;
-
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ExpressionsWarnHelper;
-import ch.andre601.advancedserverlist.core.profiles.conditions.templates.ExpressionTemplate;
-import ch.andre601.advancedserverlist.core.profiles.conditions.templates.ExpressionTemplates;
-import ch.andre601.advancedserverlist.core.profiles.conditions.tokens.Token;
-
-import java.util.List;
-
-public class NegatedNumberReader extends ValueReader{
-    
-    private final Token tokenNegation;
-    
-    public NegatedNumberReader(Token tokenNegation){
-        this.tokenNegation = tokenNegation;
-    }
-    
-    @Override
-    public ExpressionTemplate read(ExpressionTemplateParser parser, List<Token> tokenList, ExpressionsWarnHelper warnHelper){
-        if(tokenList.get(0) == tokenNegation){
-            tokenList.remove(0);
-            return ExpressionTemplates.negateNumber(parser.read(tokenList, warnHelper));
-        }
-        
-        return null;
-    }
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/parsers/NumberConstantReader.java

@@ -1,44 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.parsers;
-
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ExpressionsWarnHelper;
-import ch.andre601.advancedserverlist.core.profiles.conditions.templates.ConstantExpressionTemplate;
-import ch.andre601.advancedserverlist.core.profiles.conditions.templates.ExpressionTemplate;
-import ch.andre601.advancedserverlist.core.profiles.conditions.tokens.NumberToken;
-import ch.andre601.advancedserverlist.core.profiles.conditions.tokens.Token;
-
-import java.util.List;
-
-public class NumberConstantReader extends ValueReader{
-    @Override
-    public ExpressionTemplate read(ExpressionTemplateParser parser, List<Token> tokenList, ExpressionsWarnHelper warnHelper){
-        if(tokenList.get(0) instanceof NumberToken){
-            return ConstantExpressionTemplate.of(((NumberToken)tokenList.remove(0)).getValue());
-        }
-        return null;
-    }
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/parsers/ParenthesisedExpressionReader.java

@@ -1,72 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.parsers;
-
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ExpressionsWarnHelper;
-import ch.andre601.advancedserverlist.core.profiles.conditions.templates.ExpressionTemplate;
-import ch.andre601.advancedserverlist.core.profiles.conditions.tokens.Token;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ParenthesisedExpressionReader extends ValueReader{
-    
-    private final Token openingParenthesis;
-    private final Token closingParenthesis;
-    
-    public ParenthesisedExpressionReader(Token openingParenthesis, Token closingParenthesis){
-        this.openingParenthesis = openingParenthesis;
-        this.closingParenthesis = closingParenthesis;
-    }
-    
-    @Override
-    public ExpressionTemplate read(ExpressionTemplateParser parser, List<Token> tokenList, ExpressionsWarnHelper warnHelper){
-        if(tokenList.get(0) == openingParenthesis){
-            int index = 0;
-            int cnt = 1;
-            do {
-                index += 1;
-                if(tokenList.size() <= index)
-                    return null;
-                
-                Token token = tokenList.get(index);
-                if(token == openingParenthesis){
-                    cnt++;
-                }else
-                if(token == closingParenthesis){
-                    cnt--;
-                }
-            }while(cnt != 0);
-            
-            ExpressionTemplate result = parser.parse(new ArrayList<>(tokenList.subList(1, index)), warnHelper);
-            tokenList.subList(0, index + 1).clear();
-            
-            return result;
-        }
-        
-        return null;
-    }
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/parsers/StringConstantReader.java

@@ -1,45 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.parsers;
-
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ExpressionsWarnHelper;
-import ch.andre601.advancedserverlist.core.profiles.conditions.templates.ConstantExpressionTemplate;
-import ch.andre601.advancedserverlist.core.profiles.conditions.templates.ExpressionTemplate;
-import ch.andre601.advancedserverlist.core.profiles.conditions.tokens.StringToken;
-import ch.andre601.advancedserverlist.core.profiles.conditions.tokens.Token;
-
-import java.util.List;
-
-public class StringConstantReader extends ValueReader{
-    @Override
-    public ExpressionTemplate read(ExpressionTemplateParser parser, List<Token> tokenList, ExpressionsWarnHelper warnHelper){
-        if(tokenList.get(0) instanceof StringToken){
-            return ConstantExpressionTemplate.of(((StringToken)tokenList.remove(0)).getValue());
-        }
-        
-        return null;
-    }
-}

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

@@ -1,73 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.placeholders;
-
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToBooleanExpression;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToDoubleExpression;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToStringExpression;
-import ch.andre601.advancedserverlist.core.profiles.conditions.templates.ExpressionTemplate;
-
-public interface Placeholder extends ExpressionTemplate{
-    
-    static LiteralPlaceholderValue of(String value){
-        double doubleValue;
-        try{
-            doubleValue = Double.parseDouble(value);
-        }catch(NumberFormatException ex){
-            doubleValue = value.length();
-        }
-        
-        return new LiteralPlaceholderValue(value, doubleValue, Boolean.parseBoolean(value));
-    }
-    
-    class LiteralPlaceholderValue implements Placeholder{
-        
-        private final String stringValue;
-        private final double doubleValue;
-        private final boolean booleanValue;
-        
-        public LiteralPlaceholderValue(String stringValue, double doubleValue, boolean booleanValue){
-            this.stringValue = stringValue;
-            this.doubleValue = doubleValue;
-            this.booleanValue = booleanValue;
-        }
-        
-        @Override
-        public ToStringExpression instantiateWithStringResult(){
-            return ToStringExpression.literal(stringValue);
-        }
-        
-        @Override
-        public ToDoubleExpression instantiateWithDoubleResult(){
-            return ToDoubleExpression.literal(doubleValue);
-        }
-        
-        @Override
-        public ToBooleanExpression instantiateWithBooleanResult(){
-            return ToBooleanExpression.literal(booleanValue);
-        }
-    }
-}

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

@@ -1,117 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.placeholders;
-
-import ch.andre601.advancedserverlist.api.AdvancedServerListAPI;
-import ch.andre601.advancedserverlist.api.PlaceholderProvider;
-import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
-import ch.andre601.advancedserverlist.api.objects.GenericServer;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ExpressionsWarnHelper;
-
-import java.text.ParsePosition;
-
-public class PlaceholderParser{
-    
-    public static Placeholder parse(String text, ParsePosition position, GenericPlayer player, GenericServer server, ExpressionsWarnHelper warnHelper){
-        AdvancedServerListAPI api = AdvancedServerListAPI.get();
-        int index = position.getIndex();
-        
-        StringBuilder identifier = new StringBuilder();
-        StringBuilder values = new StringBuilder();
-        
-        boolean identified = false;
-        boolean invalid = true;
-        
-        char[] chars = text.substring(index).toCharArray();
-        for(final char c : chars){
-            index++;
-            if(c == '}'){
-                invalid = false;
-                break;
-            }
-            
-            if(c == ' ' && !identified){
-                identified = true;
-                continue;
-            }
-            
-            if(identified){
-                values.append(c);
-            }else{
-                identifier.append(c);
-            }
-        }
-        
-        String identifierStr = identifier.toString();
-        String valuesStr = values.toString();
-        
-        StringBuilder raw = new StringBuilder();
-        
-        position.setIndex(index + 1);
-        
-        if(invalid){
-            raw.append("${").append(identifierStr);
-            
-            if(identified)
-                raw.append(' ').append(valuesStr);
-            
-            warnHelper.appendWarning(index, "Placeholder '%s' does not have a closing bracket (}).",raw.toString());
-            
-            return Placeholder.of(raw.toString());
-        }
-        
-        PlaceholderProvider provider = api.retrievePlaceholderProvider(identifierStr);
-        if(provider == null){
-            raw.append("${").append(identifierStr);
-            
-            if(identified)
-                raw.append(' ').append(valuesStr);
-            
-            
-            raw.append('}');
-            
-            warnHelper.appendWarning(index, "Placeholder '%s' does not have an available PlaceholderProvider.", raw.toString());
-            
-            return Placeholder.of(raw.toString());
-        }
-        
-        String replacement = provider.parsePlaceholder(valuesStr, player, server);
-        if(replacement == null){
-            raw.append("${").append(identifierStr);
-            
-            if(identified)
-                raw.append(' ').append(valuesStr);
-            
-            raw.append('}');
-            
-            warnHelper.appendWarning(index, "Placeholder '%s' returned a null value.", raw.toString());
-            
-            return Placeholder.of(raw.toString());
-        }
-        
-        return Placeholder.of(replacement);
-    }
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/placeholders/reader/CustomTokenReader.java

@@ -23,26 +23,26 @@
  *
  */
 
-package ch.andre601.advancedserverlist.core.profiles.conditions.tokens.readers;
+package ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.reader;
 
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ExpressionsWarnHelper;
-import ch.andre601.advancedserverlist.core.profiles.conditions.tokens.Token;
+import ch.andre601.expressionparser.ParseWarnCollector;
+import ch.andre601.expressionparser.tokens.Token;
+import ch.andre601.expressionparser.tokens.readers.TokenReader;
 
 import java.text.ParsePosition;
 
-public abstract class TokenReader{
+public abstract class CustomTokenReader extends TokenReader{
     
-    private final int priority;
-    
-    public TokenReader(int priority){
-        this.priority = priority;
+    public CustomTokenReader(int priority){
+        super(priority);
     }
     
-    public int getPriority(){
-        return priority;
+    @Override
+    public Token read(String text, ParsePosition position, ParseWarnCollector collector){
+        return null;
     }
     
-    public abstract Token read(String text, ParsePosition position, GenericPlayer player, GenericServer server, ExpressionsWarnHelper warnHelper);
+    public abstract Token read(String text, ParsePosition position, GenericPlayer player, GenericServer server, ParseWarnCollector collector);
 }

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/placeholders/reader/PlaceholderTokenReader.java

@@ -23,28 +23,28 @@
  *
  */
 
-package ch.andre601.advancedserverlist.core.profiles.conditions.tokens.readers;
+package ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.reader;
 
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ExpressionsWarnHelper;
-import ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.PlaceholderParser;
-import ch.andre601.advancedserverlist.core.profiles.conditions.tokens.PlaceholderToken;
-import ch.andre601.advancedserverlist.core.profiles.conditions.tokens.Token;
+import ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.tokens.PlaceholderToken;
+import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
+import ch.andre601.expressionparser.ParseWarnCollector;
+import ch.andre601.expressionparser.tokens.Token;
 
 import java.text.ParsePosition;
 
-public class PlaceholderTokenReader extends TokenReader{
+public class PlaceholderTokenReader extends CustomTokenReader{
     
     public PlaceholderTokenReader(int priority){
         super(priority);
     }
     
     @Override
-    public Token read(String text, ParsePosition position, GenericPlayer player, GenericServer server, ExpressionsWarnHelper warnHelper){
+    public Token read(String text, ParsePosition position, GenericPlayer player, GenericServer server, ParseWarnCollector collector){
         if(position.getIndex() + 1 < text.length() && text.charAt(position.getIndex()) == '$' && text.charAt(position.getIndex() + 1) == '{'){
             position.setIndex(position.getIndex() + 2);
-            return new PlaceholderToken(PlaceholderParser.parse(text, position, player, server, warnHelper));
+            return new PlaceholderToken(StringReplacer.parsePlaceholder(text, position, player, server, collector));
         }
         return null;
     }

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/placeholders/reader/PlaceholderValueReader.java

@@ -23,20 +23,22 @@
  *
  */
 
-package ch.andre601.advancedserverlist.core.profiles.conditions.parsers;
+package ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.reader;
 
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ExpressionsWarnHelper;
-import ch.andre601.advancedserverlist.core.profiles.conditions.templates.ExpressionTemplate;
-import ch.andre601.advancedserverlist.core.profiles.conditions.tokens.PlaceholderToken;
-import ch.andre601.advancedserverlist.core.profiles.conditions.tokens.Token;
+import ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.tokens.PlaceholderToken;
+import ch.andre601.expressionparser.ParseWarnCollector;
+import ch.andre601.expressionparser.parsers.ExpressionTemplateParser;
+import ch.andre601.expressionparser.parsers.ValueReader;
+import ch.andre601.expressionparser.templates.ExpressionTemplate;
+import ch.andre601.expressionparser.tokens.Token;
 
 import java.util.List;
 
-public class PlaceholderReader extends ValueReader{
+public class PlaceholderValueReader extends ValueReader{
     @Override
-    public ExpressionTemplate read(ExpressionTemplateParser parser, List<Token> tokenList, ExpressionsWarnHelper warnHelper){
-        if(tokenList.get(0) instanceof PlaceholderToken){
-            PlaceholderToken token = (PlaceholderToken)tokenList.remove(0);
+    public ExpressionTemplate read(ExpressionTemplateParser parser, List<Token> tokens, ParseWarnCollector collector){
+        if(tokens.get(0) instanceof PlaceholderToken){
+            PlaceholderToken token = (PlaceholderToken)tokens.remove(0);
             return token.getValue();
         }
         return null;

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

@@ -23,14 +23,14 @@
  *
  */
 
-package ch.andre601.advancedserverlist.core.profiles.conditions;
+package ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.tokens;
 
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
-import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ExpressionsWarnHelper;
-import ch.andre601.advancedserverlist.core.profiles.conditions.tokens.Token;
-import ch.andre601.advancedserverlist.core.profiles.conditions.tokens.readers.TokenReader;
+import ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.reader.CustomTokenReader;
+import ch.andre601.expressionparser.ParseWarnCollector;
+import ch.andre601.expressionparser.tokens.Token;
+import ch.andre601.expressionparser.tokens.readers.TokenReader;
 import com.google.common.collect.Ordering;
 
 import java.text.ParsePosition;
@@ -38,39 +38,45 @@ import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
 
-public class ExpressionTokenizer{
+public class CustomExpressionTokenizer{
     
     private static final Ordering<TokenReader> TOKEN_READER_ORDERING = Ordering.from(Comparator.comparingInt(TokenReader::getPriority)).reverse();
     
     private final List<TokenReader> tokenReaders;
     
-    public ExpressionTokenizer(Iterable<TokenReader> tokenReaders){
+    public CustomExpressionTokenizer(Iterable<TokenReader> tokenReaders){
         this.tokenReaders = TOKEN_READER_ORDERING.immutableSortedCopy(tokenReaders);
     }
     
-    public List<Token> parse(String text, GenericPlayer player, GenericServer server, ExpressionsWarnHelper warnHelper){
+    public List<Token> parse(String text, GenericPlayer player, GenericServer server, ParseWarnCollector collector){
         ParsePosition position = new ParsePosition(0);
         
         List<Token> tokens = new LinkedList<>();
         
         next_token:
         while(true){
-            while(position.getIndex() < text.length() && Character.isWhitespace(text.charAt(position.getIndex()))){
+            while(position.getIndex() < text.length() && Character.isWhitespace(text.charAt(position.getIndex())))
                 position.setIndex(position.getIndex() + 1);
-            }
             
             if(position.getIndex() >= text.length())
                 break;
             
             for(TokenReader tokenReader : tokenReaders){
                 Token token;
-                if(null != (token = tokenReader.read(text, position, player, server, warnHelper))){
-                    tokens.add(token);
-                    continue next_token;
+                if(tokenReader instanceof CustomTokenReader customTokenReader){
+                    if(null != (token = customTokenReader.read(text, position, player, server, collector))){
+                        tokens.add(token);
+                        continue next_token;
+                    }
+                }else{
+                    if(null != (token = tokenReader.read(text, position, collector))){
+                        tokens.add(token);
+                        continue next_token;
+                    }
                 }
             }
             
-            warnHelper.appendWarning(position.getIndex(), "Illegal token '%c'.");
+            collector.appendWarningFormatted(position.getIndex(), "Illegal Token '%c'.", text.charAt(position.getIndex()));
             break;
         }
         

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

@@ -0,0 +1,81 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.tokens;
+
+import ch.andre601.expressionparser.expressions.ToBooleanExpression;
+import ch.andre601.expressionparser.expressions.ToDoubleExpression;
+import ch.andre601.expressionparser.expressions.ToStringExpression;
+import ch.andre601.expressionparser.templates.ExpressionTemplate;
+import ch.andre601.expressionparser.tokens.Token;
+
+public class PlaceholderToken extends Token{
+    
+    private final Placeholder value;
+    
+    public PlaceholderToken(Placeholder value){
+        super("PLACEHOLDER");
+        this.value = value;
+    }
+    
+    public Placeholder getValue(){
+        return value;
+    }
+    
+    public static class Placeholder implements ExpressionTemplate{
+        
+        private final ToBooleanExpression toBooleanExpression;
+        private final ToDoubleExpression toDoubleExpression;
+        private final ToStringExpression toStringExpression;
+        
+        public Placeholder(String value){
+            double doubleValue;
+            try{
+                doubleValue = Double.parseDouble(value);
+            }catch(NumberFormatException ex){
+                doubleValue = value.length();
+            }
+            
+            this.toBooleanExpression = ToBooleanExpression.literal(Boolean.parseBoolean(value));
+            this.toDoubleExpression = ToDoubleExpression.literal(doubleValue);
+            this.toStringExpression = ToStringExpression.literal(value);
+        }
+        
+        @Override
+        public ToBooleanExpression returnBooleanExpression(){
+            return toBooleanExpression;
+        }
+        
+        @Override
+        public ToDoubleExpression returnDoubleExpression(){
+            return toDoubleExpression;
+        }
+        
+        @Override
+        public ToStringExpression returnStringExpression(){
+            return toStringExpression;
+        }
+    }
+}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/templates/AbstractBinaryToBooleanExpression.java

@@ -1,40 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.templates;
-
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.Expression;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToBooleanExpression;
-
-public abstract class AbstractBinaryToBooleanExpression<T extends Expression> implements ToBooleanExpression{
-    
-    protected final T a;
-    protected final T b;
-    
-    public AbstractBinaryToBooleanExpression(T a, T b){
-        this.a = a;
-        this.b = b;
-    }
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/templates/AbstractBinaryToDoubleExpression.java

@@ -1,40 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.templates;
-
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.Expression;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToDoubleExpression;
-
-public abstract class AbstractBinaryToDoubleExpression<T extends Expression> implements ToDoubleExpression{
-    
-    protected final T a;
-    protected final T b;
-    
-    public AbstractBinaryToDoubleExpression(T a, T b){
-        this.a = a;
-        this.b = b;
-    }
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/templates/AbstractBooleanExpressionTemplate.java

@@ -1,43 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.templates;
-
-import ch.andre601.advancedserverlist.core.profiles.conditions.Conversions;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToDoubleExpression;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToStringExpression;
-
-public abstract class AbstractBooleanExpressionTemplate implements ExpressionTemplate{
-    
-    @Override
-    public ToStringExpression instantiateWithStringResult(){
-        return Conversions.toString(instantiateWithBooleanResult());
-    }
-    
-    @Override
-    public ToDoubleExpression instantiateWithDoubleResult(){
-        return Conversions.toDouble(instantiateWithBooleanResult());
-    }
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/templates/AbstractDoubleExpressionTemplate.java

@@ -1,43 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.templates;
-
-import ch.andre601.advancedserverlist.core.profiles.conditions.Conversions;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToBooleanExpression;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToStringExpression;
-
-public abstract class AbstractDoubleExpressionTemplate implements ExpressionTemplate{
-    
-    @Override
-    public ToStringExpression instantiateWithStringResult(){
-        return Conversions.toString(instantiateWithDoubleResult());
-    }
-    
-    @Override
-    public ToBooleanExpression instantiateWithBooleanResult(){
-        return Conversions.toBoolean(instantiateWithDoubleResult());
-    }
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/templates/AbstractStringExpressionTemplate.java

@@ -1,43 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.templates;
-
-import ch.andre601.advancedserverlist.core.profiles.conditions.Conversions;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToBooleanExpression;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToDoubleExpression;
-
-public abstract class AbstractStringExpressionTemplate implements ExpressionTemplate{
-    
-    @Override
-    public ToDoubleExpression instantiateWithDoubleResult(){
-        return Conversions.toDouble(instantiateWithStringResult());
-    }
-    
-    @Override
-    public ToBooleanExpression instantiateWithBooleanResult(){
-        return Conversions.toBoolean(instantiateWithStringResult());
-    }
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/templates/AbstractToBooleanExpression.java

@@ -1,40 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.templates;
-
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.Expression;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToBooleanExpression;
-
-import java.util.Collection;
-
-public abstract class AbstractToBooleanExpression<T extends Expression> implements ToBooleanExpression{
-    
-    protected final Collection<T> operands;
-    
-    public AbstractToBooleanExpression(Collection<T> operands){
-        this.operands = operands;
-    }
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/templates/AbstractToDoubleExpression.java

@@ -1,40 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.templates;
-
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.Expression;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToDoubleExpression;
-
-import java.util.Collection;
-
-public abstract class AbstractToDoubleExpression<T extends Expression> implements ToDoubleExpression{
-    
-    protected final Collection<T> operands;
-    
-    public AbstractToDoubleExpression(Collection<T> operands){
-        this.operands = operands;
-    }
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/templates/AbstractToStringExpression.java

@@ -1,40 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.templates;
-
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.Expression;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToStringExpression;
-
-import java.util.Collection;
-
-public abstract class AbstractToStringExpression<T extends Expression> implements ToStringExpression{
-    
-    protected Collection<T> operands;
-    
-    public AbstractToStringExpression(Collection<T> operands){
-        this.operands = operands;
-    }
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/templates/AbstractUnaryToBooleanExpression.java

@@ -1,38 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.templates;
-
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.Expression;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToBooleanExpression;
-
-public abstract class AbstractUnaryToBooleanExpression<T extends Expression> implements ToBooleanExpression{
-    
-    protected final T delegate;
-    
-    public AbstractUnaryToBooleanExpression(T delegate){
-        this.delegate = delegate;
-    }
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/templates/AbstractUnaryToDoubleExpression.java

@@ -1,38 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.templates;
-
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.Expression;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToDoubleExpression;
-
-public abstract class AbstractUnaryToDoubleExpression<T extends Expression> implements ToDoubleExpression{
-    
-    protected final T delegate;
-    
-    public AbstractUnaryToDoubleExpression(T delegate){
-        this.delegate = delegate;
-    }
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/templates/AbstractUnaryToStringExpression.java

@@ -1,38 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.templates;
-
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.Expression;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToStringExpression;
-
-public abstract class AbstractUnaryToStringExpression<T extends Expression> implements ToStringExpression{
-    
-    protected final T delegate;
-    
-    public AbstractUnaryToStringExpression(T delegate){
-        this.delegate = delegate;
-    }
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/templates/ConstantExpressionTemplate.java

@@ -1,77 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.templates;
-
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToBooleanExpression;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToDoubleExpression;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToStringExpression;
-
-public class ConstantExpressionTemplate implements ExpressionTemplate{
-    
-    private final ToStringExpression stringExpression;
-    private final ToDoubleExpression doubleExpression;
-    private final ToBooleanExpression booleanExpression;
-    
-    private ConstantExpressionTemplate(String stringValue, double doubleValue, boolean booleanValue){
-        this.stringExpression = ToStringExpression.literal(stringValue);
-        this.doubleExpression = ToDoubleExpression.literal(doubleValue);
-        this.booleanExpression = ToBooleanExpression.literal(booleanValue);
-    }
-    
-    public static ConstantExpressionTemplate of(String stringValue){
-        double doubleValue;
-        try{
-            doubleValue = Double.parseDouble(stringValue);
-        }catch(NumberFormatException ex){
-            doubleValue = stringValue.length();
-        }
-        return new ConstantExpressionTemplate(stringValue, doubleValue, Boolean.parseBoolean(stringValue));
-    }
-    
-    public static ConstantExpressionTemplate of(double doubleValue){
-        return new ConstantExpressionTemplate(((int)doubleValue) == doubleValue ? Integer.toString((int)doubleValue) : Double.toString(doubleValue), doubleValue, doubleValue != 0);
-    }
-    
-    public static ConstantExpressionTemplate of(boolean booleanValue){
-        return new ConstantExpressionTemplate(Boolean.toString(booleanValue), booleanValue ? 1 : 0, booleanValue);
-    }
-    
-    
-    @Override
-    public ToStringExpression instantiateWithStringResult(){
-        return stringExpression;
-    }
-    
-    @Override
-    public ToDoubleExpression instantiateWithDoubleResult(){
-        return doubleExpression;
-    }
-    
-    @Override
-    public ToBooleanExpression instantiateWithBooleanResult(){
-        return booleanExpression;
-    }
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/templates/ExpressionTemplate.java

@@ -1,39 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.templates;
-
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToBooleanExpression;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToDoubleExpression;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToStringExpression;
-
-public interface ExpressionTemplate{
-    
-    ToStringExpression instantiateWithStringResult();
-    
-    ToDoubleExpression instantiateWithDoubleResult();
-    
-    ToBooleanExpression instantiateWithBooleanResult();
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/templates/ExpressionTemplates.java

@@ -1,422 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.templates;
-
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.Expressions;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToBooleanExpression;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToDoubleExpression;
-import ch.andre601.advancedserverlist.core.profiles.conditions.expressions.ToStringExpression;
-
-import java.util.Collection;
-
-public class ExpressionTemplates{
-    
-    public static ExpressionTemplate negate(ExpressionTemplate template){
-        return new Negation(template);
-    }
-    
-    public static ExpressionTemplate and(Collection<ExpressionTemplate> operands){
-        return new And(operands);
-    }
-    
-    public static ExpressionTemplate or(Collection<ExpressionTemplate> operands){
-        return new Or(operands);
-    }
-    
-    public static ExpressionTemplate concat(Collection<ExpressionTemplate> operands){
-        return new Concatenate(operands);
-    }
-    
-    public static ExpressionTemplate equal(ExpressionTemplate a, ExpressionTemplate b){
-        return new Equal(a, b);
-    }
-    
-    public static ExpressionTemplate notEqual(ExpressionTemplate a, ExpressionTemplate b){
-        return new NotEqual(a, b);
-    }
-    
-    public static ExpressionTemplate equalIgnoreCase(ExpressionTemplate a, ExpressionTemplate b){
-        return new EqualIgnoreCase(a, b);
-    }
-    
-    public static ExpressionTemplate notEqualIgnoreCase(ExpressionTemplate a, ExpressionTemplate b){
-        return new NotEqualIgnoreCase(a, b);
-    }
-    
-    public static ExpressionTemplate startsWith(ExpressionTemplate a, ExpressionTemplate b){
-        return new StartsWith(a, b);
-    }
-    
-    public static ExpressionTemplate endsWith(ExpressionTemplate a, ExpressionTemplate b){
-        return new EndsWith(a, b);
-    }
-    
-    public static ExpressionTemplate contains(ExpressionTemplate a, ExpressionTemplate b){
-        return new Contains(a, b);
-    }
-    
-    public static ExpressionTemplate greater(ExpressionTemplate a, ExpressionTemplate b){
-        return new Greater(a, b);
-    }
-    
-    public static ExpressionTemplate greaterOrEqual(ExpressionTemplate a, ExpressionTemplate b){
-        return new GreaterOrEqual(a, b);
-    }
-    
-    public static ExpressionTemplate less(ExpressionTemplate a, ExpressionTemplate b){
-        return new Less(a, b);
-    }
-    
-    public static ExpressionTemplate lessOrEqual(ExpressionTemplate a, ExpressionTemplate b){
-        return new LessOrEqual(a, b);
-    }
-    
-    public static ExpressionTemplate sum(Collection<ExpressionTemplate> operands){
-        return new Sum(operands);
-    }
-    
-    public static ExpressionTemplate product(Collection<ExpressionTemplate> operands){
-        return new Product(operands);
-    }
-    
-    public static ExpressionTemplate sub(ExpressionTemplate a, ExpressionTemplate b){
-        return new Sub(a, b);
-    }
-    
-    public static ExpressionTemplate div(ExpressionTemplate a, ExpressionTemplate b){
-        return new Div(a, b);
-    }
-    
-    public static ExpressionTemplate negateNumber(ExpressionTemplate template){
-        return new NegationNumber(template);
-    }
-    
-    private static class Negation extends AbstractBooleanExpressionTemplate{
-        
-        private final ExpressionTemplate template;
-        
-        Negation(ExpressionTemplate template){
-            this.template = template;
-        }
-        
-        @Override
-        public ToBooleanExpression instantiateWithBooleanResult(){
-            return Expressions.negate(template.instantiateWithBooleanResult());
-        }
-    }
-    
-    private static class And extends AbstractBooleanExpressionTemplate{
-        
-        private final Collection<ExpressionTemplate> operands;
-        
-        And(Collection<ExpressionTemplate> operands){
-            this.operands = operands;
-        }
-        
-        @Override
-        public ToBooleanExpression instantiateWithBooleanResult(){
-            return Expressions.and(operands.stream().map(ExpressionTemplate::instantiateWithBooleanResult).toList());
-        }
-    }
-    
-    private static class Or extends AbstractBooleanExpressionTemplate{
-        
-        private final Collection<ExpressionTemplate> operands;
-        
-        Or(Collection<ExpressionTemplate> operands){
-            this.operands = operands;
-        }
-        
-        @Override
-        public ToBooleanExpression instantiateWithBooleanResult(){
-            return Expressions.or(operands.stream().map(ExpressionTemplate::instantiateWithBooleanResult).toList());
-        }
-    }
-    
-    private static class Concatenate extends AbstractStringExpressionTemplate{
-        
-        private final Collection<ExpressionTemplate> operands;
-        
-        Concatenate(Collection<ExpressionTemplate> operands){
-            this.operands = operands;
-        }
-        
-        @Override
-        public ToStringExpression instantiateWithStringResult(){
-            return Expressions.concat(operands.stream().map(ExpressionTemplate::instantiateWithStringResult).toList());
-        }
-    }
-    
-    private static class Equal extends AbstractBooleanExpressionTemplate{
-        
-        private final ExpressionTemplate a;
-        private final ExpressionTemplate b;
-        
-        Equal(ExpressionTemplate a, ExpressionTemplate b){
-            this.a = a;
-            this.b = b;
-        }
-        
-        @Override
-        public ToBooleanExpression instantiateWithBooleanResult(){
-            return Expressions.equal(a.instantiateWithStringResult(), b.instantiateWithStringResult());
-        }
-    }
-    
-    private static class NotEqual extends AbstractBooleanExpressionTemplate{
-        
-        private final ExpressionTemplate a;
-        private final ExpressionTemplate b;
-        
-        NotEqual(ExpressionTemplate a, ExpressionTemplate b){
-            this.a = a;
-            this.b = b;
-        }
-        
-        @Override
-        public ToBooleanExpression instantiateWithBooleanResult(){
-            return Expressions.notEqual(a.instantiateWithStringResult(), b.instantiateWithStringResult());
-        }
-    }
-    
-    private static class EqualIgnoreCase extends AbstractBooleanExpressionTemplate{
-        
-        private final ExpressionTemplate a;
-        private final ExpressionTemplate b;
-        
-        EqualIgnoreCase(ExpressionTemplate a, ExpressionTemplate b){
-            this.a = a;
-            this.b = b;
-        }
-        
-        @Override
-        public ToBooleanExpression instantiateWithBooleanResult(){
-            return Expressions.equalIgnoreCase(a.instantiateWithStringResult(), b.instantiateWithStringResult());
-        }
-    }
-    
-    private static class NotEqualIgnoreCase extends AbstractBooleanExpressionTemplate{
-        
-        private final ExpressionTemplate a;
-        private final ExpressionTemplate b;
-        
-        NotEqualIgnoreCase(ExpressionTemplate a, ExpressionTemplate b){
-            this.a = a;
-            this.b = b;
-        }
-        
-        @Override
-        public ToBooleanExpression instantiateWithBooleanResult(){
-            return Expressions.notEqualIgnoreCase(a.instantiateWithStringResult(), b.instantiateWithStringResult());
-        }
-    }
-    
-    private static class StartsWith extends AbstractBooleanExpressionTemplate{
-        
-        private final ExpressionTemplate a;
-        private final ExpressionTemplate b;
-        
-        private StartsWith(ExpressionTemplate a, ExpressionTemplate b){
-            this.a = a;
-            this.b = b;
-        }
-        
-        @Override
-        public ToBooleanExpression instantiateWithBooleanResult(){
-            return Expressions.startsWith(a.instantiateWithStringResult(), b.instantiateWithStringResult());
-        }
-    }
-    
-    private static class EndsWith extends AbstractBooleanExpressionTemplate{
-        
-        private final ExpressionTemplate a;
-        private final ExpressionTemplate b;
-        
-        private EndsWith(ExpressionTemplate a, ExpressionTemplate b){
-            this.a = a;
-            this.b = b;
-        }
-        
-        @Override
-        public ToBooleanExpression instantiateWithBooleanResult(){
-            return Expressions.endsWith(a.instantiateWithStringResult(), b.instantiateWithStringResult());
-        }
-    }
-    
-    private static class Contains extends AbstractBooleanExpressionTemplate{
-        
-        private final ExpressionTemplate a;
-        private final ExpressionTemplate b;
-        
-        private Contains(ExpressionTemplate a, ExpressionTemplate b){
-            this.a = a;
-            this.b = b;
-        }
-        
-        @Override
-        public ToBooleanExpression instantiateWithBooleanResult(){
-            return Expressions.contains(a.instantiateWithStringResult(), b.instantiateWithStringResult());
-        }
-    }
-    
-    private static class Greater extends AbstractBooleanExpressionTemplate{
-        
-        private final ExpressionTemplate a;
-        private final ExpressionTemplate b;
-        
-        Greater(ExpressionTemplate a, ExpressionTemplate b){
-            this.a = a;
-            this.b = b;
-        }
-        
-        @Override
-        public ToBooleanExpression instantiateWithBooleanResult(){
-            return Expressions.greaterThan(a.instantiateWithDoubleResult(), b.instantiateWithDoubleResult());
-        }
-    }
-    
-    private static class GreaterOrEqual extends AbstractBooleanExpressionTemplate{
-        
-        private final ExpressionTemplate a;
-        private final ExpressionTemplate b;
-        
-        GreaterOrEqual(ExpressionTemplate a, ExpressionTemplate b){
-            this.a = a;
-            this.b = b;
-        }
-        
-        @Override
-        public ToBooleanExpression instantiateWithBooleanResult(){
-            return Expressions.greaterOrEqualThan(a.instantiateWithDoubleResult(), b.instantiateWithDoubleResult());
-        }
-    }
-    
-    private static class Less extends AbstractBooleanExpressionTemplate{
-        
-        private final ExpressionTemplate a;
-        private final ExpressionTemplate b;
-        
-        Less(ExpressionTemplate a, ExpressionTemplate b){
-            this.a = a;
-            this.b = b;
-        }
-        
-        @Override
-        public ToBooleanExpression instantiateWithBooleanResult(){
-            return Expressions.lessThan(a.instantiateWithDoubleResult(), b.instantiateWithDoubleResult());
-        }
-    }
-    
-    private static class LessOrEqual extends AbstractBooleanExpressionTemplate{
-        
-        private final ExpressionTemplate a;
-        private final ExpressionTemplate b;
-        
-        LessOrEqual(ExpressionTemplate a, ExpressionTemplate b){
-            this.a = a;
-            this.b = b;
-        }
-        
-        @Override
-        public ToBooleanExpression instantiateWithBooleanResult(){
-            return Expressions.lessOrEqualThan(a.instantiateWithDoubleResult(), b.instantiateWithDoubleResult());
-        }
-    }
-    
-    private static class Sum extends AbstractDoubleExpressionTemplate{
-        
-        private final Collection<ExpressionTemplate> operands;
-        
-        Sum(Collection<ExpressionTemplate> operands){
-            this.operands = operands;
-        }
-        
-        @Override
-        public ToDoubleExpression instantiateWithDoubleResult(){
-            return Expressions.sum(operands.stream().map(ExpressionTemplate::instantiateWithDoubleResult).toList());
-        }
-    }
-    
-    private static class Product extends AbstractDoubleExpressionTemplate{
-        
-        private final Collection<ExpressionTemplate> operands;
-        
-        Product(Collection<ExpressionTemplate> operands){
-            this.operands = operands;
-        }
-        
-        @Override
-        public ToDoubleExpression instantiateWithDoubleResult(){
-            return Expressions.product(operands.stream().map(ExpressionTemplate::instantiateWithDoubleResult).toList());
-        }
-    }
-    
-    private static class Sub extends AbstractDoubleExpressionTemplate{
-        
-        private final ExpressionTemplate a;
-        private final ExpressionTemplate b;
-        
-        Sub(ExpressionTemplate a, ExpressionTemplate b){
-            this.a = a;
-            this.b = b;
-        }
-        
-        @Override
-        public ToDoubleExpression instantiateWithDoubleResult(){
-            return Expressions.sub(a.instantiateWithDoubleResult(), b.instantiateWithDoubleResult());
-        }
-    }
-    
-    private static class Div extends AbstractDoubleExpressionTemplate{
-        
-        private final ExpressionTemplate a;
-        private final ExpressionTemplate b;
-        
-        Div(ExpressionTemplate a, ExpressionTemplate b){
-            this.a = a;
-            this.b = b;
-        }
-        
-        @Override
-        public ToDoubleExpression instantiateWithDoubleResult(){
-            return Expressions.div(a.instantiateWithDoubleResult(), b.instantiateWithDoubleResult());
-        }
-    }
-    
-    private static class NegationNumber extends AbstractDoubleExpressionTemplate{
-        
-        private final ExpressionTemplate template;
-        
-        NegationNumber(ExpressionTemplate template){
-            this.template = template;
-        }
-        
-        @Override
-        public ToDoubleExpression instantiateWithDoubleResult(){
-            return Expressions.negateNumber(template.instantiateWithDoubleResult());
-        }
-    }
-}

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

@@ -1,42 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.tokens;
-
-public class BooleanToken extends Token{
-    
-    public static final BooleanToken TRUE = new BooleanToken(true);
-    public static final BooleanToken FALSE = new BooleanToken(false);
-    private final boolean value;
-    
-    public BooleanToken(boolean value){
-        super("BOOLEAN(" + value + ")");
-        this.value = value;
-    }
-    
-    public boolean getValue(){
-        return value;
-    }
-}

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

@@ -1,50 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.tokens;
-
-public class DefaultTokens{
-    public static final Token AND = new Token("AND");
-    public static final Token OR = new Token("OR");
-    public static final Token OPENING_PARENTHESIS = new Token("OPENING_PARENTHESIS");
-    public static final Token CLOSING_PARENTHESIS = new Token("CLOSING_PARENTHESIS");
-    public static final Token EQUAL = new Token("EQUAL");
-    public static final Token NOT_EQUAL = new Token("NOT_EQUAL");
-    public static final Token EQUAL_IGNORE_CASE = new Token("EQUAL_IGNORE_CASE");
-    public static final Token NOT_EQUAL_IGNORE_CASE = new Token("NOT_EQUAL_IGNORE_CASE");
-    public static final Token STARTS_WITH = new Token("STARTS_WITH");
-    public static final Token ENDS_WITH = new Token("ENDS_WITH");
-    public static final Token CONTAINS = new Token("CONTAINS");
-    public static final Token NEGATION = new Token("NEGATION");
-    public static final Token GREATER_THAN = new Token("GREATER_THAN");
-    public static final Token GREATER_OR_EQUAL_THAN = new Token("GREATER_OR_EQUAL_THAN");
-    public static final Token LESSER_THAN = new Token("LESSER_THAN");
-    public static final Token LESSER_OR_EQUAL_THAN = new Token("LESSER_OR_EQUAL_THAN");
-    public static final Token CONCAT_STRING = new Token("CONCAT_STRING");
-    public static final Token ADD = new Token("ADD");
-    public static final Token SUB = new Token("SUB");
-    public static final Token MULT = new Token("MULT");
-    public static final Token DIV = new Token("DIV");
-}

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

@@ -1,40 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.tokens;
-
-public class NumberToken extends Token{
-    
-    private final double value;
-    
-    public NumberToken(double value){
-        super("NUMBER(" + value + ")");
-        this.value = value;
-    }
-    
-    public double getValue(){
-        return value;
-    }
-}

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

@@ -1,42 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2024 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.core.profiles.conditions.tokens;
-
-import ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.Placeholder;
-
-public class PlaceholderToken extends Token{
-    
-    private final Placeholder value;
-    
-    public PlaceholderToken(Placeholder value){
-        super("PLACEHOLDER");
-        this.value = value;
-    }
-    
-    public Placeholder getValue(){
-        return value;
-    }
-}