Bump version

Add option to disable Cache

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,62 @@
+name: Bug Report
+description: Report an issue with the plugin
+
+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)]
+        - You're using a supported Proxy/Server version. As of right now is only 1.19.x supported.
+        - The issue happens with just AdvancedServerList installed.
+  - type: dropdown
+    attributes:
+      label: Platform
+      description: On what platform do you use the plugin?
+      options:
+        - BungeeCord
+        - Other (Please specify)
+        - Paper
+        - Purpur
+        - Spigot
+        - Velocity
+        - Waterfall
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Other platform
+      description: |-
+        Please provide the name of the platform (Proxy/Server) you use, if you selected `Other (Please specify)` in the above section.
+        Leave empty otherwise.
+      placeholder: SomeProxy
+  - type: textarea
+    attributes:
+      label: What happened?
+      description: |-
+        Give a detailed description of what exactly happened.
+        You can provide screenshots to further explain the issues.
+        When sharing errors, make sure to use a site such as https://paste.helpch.at to do so.
+      placeholder: When I do ... does ... happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: Provide a detailed step-by-step explanation on how to reproduce this issue.
+      placeholder: |-
+        1. Do this
+        2. ...
+        3. Profit!
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Server List Profiles
+      description: |-
+        **Optional**
+        Provide any Server List Profiles you use, if you believe those to be the cause of the issue.
+        This text field will automatically render the text as YAML code.
+      render: yaml

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+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://github.com/Andre601/AdvancedServerList/wiki

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,34 @@
+name: Feature Request
+description: Suggest a new feature for the plugin
+
+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)]
+        - You're using a supported Proxy/Server version. As of right now is only 1.19.x supported.
+        - The Feature you suggest hasn't been suggested before.
+  - type: dropdown
+    attributes:
+      label: Platforms
+      description: What platforms should this feature be usable on
+      multiple: true
+      options:
+        - Proxy (BungeeCord, Waterfall, ...)
+        - Proxy (Velocity)
+        - Server (Spigot, Paper, ...)
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Feature
+      description: |-
+        Give a detailed description of what exactly should be added and/or changed in AdvancedServerList.
+        You can provide screenshots to further explain the idea.
+        When sharing code snippets, make sure to use a site such as https://paste.helpch.at to do so.
+      placeholder: AdvancedServerList should get ... because ...
+    validations:
+      required: true

.github/assets/MODRINTH.md

@@ -0,0 +1,93 @@
+# AdvancedServerList
+AdvancedServerList is a plugin that allowys you to customize your server's MOTD, favicon, Player count text and player count hover displayed in a player's multiplayer server list based on conditions and priorities.
+
+## Supported Platforms
+
+<a href="https://www.spigotmc.org" target="_blank">
+  <img src="https://raw.githubusercontent.com/intergrav/devins-badges/v2/assets/minimal/supported/spigot_vector.svg" width="64" alt="platform-spigot" />
+</a>
+<a href="https://papermc.io" target="_blank">
+  <img src="https://raw.githubusercontent.com/intergrav/devins-badges/v2/assets/minimal/supported/paper_vector.svg" width="64" alt="platform-" />
+</a>
+<a href="https://www.spigotmc.org" target="_blank">
+  <img src="https://raw.githubusercontent.com/intergrav/devins-badges/v2/assets/minimal/supported/bungeecord_vector.svg" width="64" alt="platform-" />
+</a>
+<a href="https://www.papermc.io" target="_blank">
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/waterfall_vector.svg" width="64" alt="platform-" />
+</a>
+<a href="https://velocitypowered.com" target="_blank">
+  <img src="https://raw.githubusercontent.com/intergrav/devins-badges/v2/assets/minimal/supported/velocity_vector.svg" width="64" alt="platform-" />
+</a>
+
+## What is a Server List Profile?
+A Server List Profile refers to a YAML file located in the plugin's `profiles` directory.  
+It allows you to configure specific aspects of the server display in the MC-Client's multiplayer server list, such as the MOTD, player count text, player count hover or Favicon.
+
+> [*Read More*][profiles]
+### Conditions
+Thanks to conditions can you determine when a profile should be displayed in the player’s server list, to allow displaying specific text (i.e. a warning when they are using an outdated version).
+
+When multiple profiles exist that have valid conditions will the one with the highest priority (Higher number = higher priority) be selected. Having no conditions makes the profile automatically return true.
+
+> [*Read More*][conditions]
+### Placeholders
+Placeholders can be used within conditions to further customize them. They can also be used in any other text option (motd, playerCount and players) to display their respective values.
+The format is `${<target> <identifier>}` which was adopted from BungeeTabListPlus. Depending on what platform you use the plugin on are only specific placeholders available.
+
+When using the SpigotMC/PaperMC version can you also use placeholders from [PlaceholderAPI][placeholderapi] using its `%<identifier>_<values>%` placeholder format. PlaceholderAPI needs to be installed for that.
+
+> [*Read More*][placeholders]
+### Formatting
+The plugin uses the MiniMessage format for a consistent, easy way of formatting your text.
+Only certain options are usable for each option. As an example does motd support HEX colours and gradients, while the other options only support default colour codes.
+
+> [*Read More*][minimessage]
+## Dependencies
+
+| Dependency       | Platforms     | Required? |
+| ---------------- | ------------- | --------- |
+| [ProtocolLib]    | Spigot        | Yes       |
+| [PlaceholderAPI] | Spigot, Paper | No        |
+
+## Statistics
+
+This plugin sends statistics to [bStats] to display.  
+You can disable this in the global bStats config file located in `/plugins/bstats/`
+
+- [BungeeCord][bstats-bungee]
+- [Paper/Spigot][bstats-spigot]
+- [Velocity][bstats-velocity]
+
+## Screenshots
+
+<a href="https://modrinth.com/plugin/advancedserverlist/gallery" target="_blank">
+  <img src="https://raw.githubusercontent.com/intergrav/devins-badges/v2/assets/cozy/documentation/modrinth-gallery_vector.svg" width="208" alt="check-out-the-gallery" />
+</a>
+
+## Support
+<a href="https://discord.gg/6dazXp6" target="_blank">
+  <img src="https://raw.githubusercontent.com/intergrav/devins-badges/v2/assets/minimal/social/discord-singular_vector.svg" width="64" alt="chat-with-the-community-discord" />
+</a>
+<a href="https://app.revolt.chat/invite/74TpERXA" target="_blank">
+  <img src="https://raw.githubusercontent.com/intergrav/devins-badges/v2/assets/minimal/social/revolt-singular_vector.svg" width="64" alt="chat-with-the-community-revolt" />
+</a>
+
+<!-- Links -->
+[profiles]: https://github.com/Andre601/AdvancedServerList/wiki/Profiles
+[conditions]: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#conditions
+[placeholders]: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#placeholders
+[minimessage]: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#minimessage
+
+[placeholderapi]: https://www.spigotmc.org/resources/6245/
+
+[modrinth]: https://modrinth.com/plugin/advancedserverlist
+
+[protocollib]: https://www.spigotmc.org/resources/1997/
+[placeholderapi]: https://www.spigotmc.org/resources/6245/
+
+[bstats]: https://bstats.org
+[bstats-bungee]: https://bstats.org/plugin/bungeecord/AdvancedServerList/15585
+[bstats-spigot]: https://bstats.org/plugin/bukkit/AdvancedServerList/15584
+[bstats-velocity]: https://bstats.org/plugin/velocity/AdvancedServerList/15587
+
+[gallery]: https://modrinth.com/mod/advancedserverlist/gallery

.github/workflows/release.yml

@@ -55,15 +55,19 @@ jobs:
     strategy:
       matrix:
         include:
-          - directory: bungeecord
+          - platforms: BungeeCord, Waterfall
+            directory: bungeecord
             loaders: |
               bungeecord
               waterfall
-          - directory: paper
+          - platforms: Paper
+            directory: paper
             loaders: paper
-          - directory: spigot
+          - platforms: Spigot
+            directory: spigot
             loaders: spigot
-          - directory: velocity
+          - platforms: Velocity
+            directory: velocity
             loaders: velocity
     runs-on: ubuntu-latest
     steps:
@@ -81,7 +85,7 @@ jobs:
     - name: Upload AdvancedServerList (${{ matrix.loaders }}) to GitHub and Modrinth
       uses: Kir-Antipov/mc-publish@v3.2
       with:
-        name: ${{ github.event.release.name }}
+        name: ${{ github.event.release.tag_name }} (${{ matrix.platforms }})
         version: ${{ steps.github-release.outputs.version }}
         version-type: release
         files: ${{ matrix.directory}}/target/AdvancedServerList-*.jar

README.md

@@ -1,7 +1,27 @@
 # AdvancedServerList
-![platform] ![tested]
+<a href="https://modrinth.com/plugin/advancedserverlist" target="_blank">
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/cozy/available/modrinth_vector.svg" height="64" align="right" alt="download-on-modrinth" />
+</a>
 
-AdvancedServerList is a plugin made for SpigotMC, PaperMC, BungeeCord/Waterfall and Velocity. It allows you to create server list profiles to display based on priority and conditions.
+AdvancedServerList is a plugin that allowys you to customize your server's MOTD, favicon, Player count text and player count hover displayed in a player's multiplayer server list based on conditions and priorities.
+
+## Supported Platforms
+
+<a href="https://www.spigotmc.org" target="_blank">
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/spigot_vector.svg" height="64" alt="platform-spigot" />
+</a>
+<a href="https://papermc.io" target="_blank">
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/paper_vector.svg" height="64" alt="platform-" />
+</a>
+<a href="https://www.spigotmc.org" target="_blank">
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/bungeecord_vector.svg" height="64" alt="platform-" />
+</a>
+<a href="https://www.papermc.io" target="_blank">
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/waterfall_vector.svg" height="64" alt="platform-" />
+</a>
+<a href="https://velocitypowered.com" target="_blank">
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/velocity_vector.svg" height="64" alt="platform-" />
+</a>
 
 ## What is a Server List Profile?
 A Server List Profile refers to a YAML file located in the plugin's `profiles` directory.  
@@ -30,11 +50,6 @@ Only certain options are usable for each option. As an example does motd support
 
 > [*Read More*][minimessage]
 
-## Downloads
-AdvancedServerList can be downloaded from the following places:
-
-[![dl-modrinth]][modrinth] [![dl-spigot]][spigot] [![dl-hangar]][hangar]
-
 ## Dependencies
 
 | Dependency       | Platforms     | Required? |
@@ -53,8 +68,17 @@ You can disable this in the global bStats config file located in `/plugins/bstat
 
 ## Screenshots
 
-Please see the [Gallery Tab][gallery] for some previews.  
-If you have any own screenshots, feel free to share them with me. I may add them to the Gallery if they are good.
+<a href="https://modrinth.com/plugin/advancedserverlist/gallery" target="_blank">
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/cozy/documentation/modrinth-gallery_vector.svg" height="64" alt="check-out-the-gallery" />
+</a>
+
+## Support
+<a href="https://discord.gg/6dazXp6" target="_blank">
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/social/discord-singular_vector.svg" height="64" alt="chat-with-the-community-discord" />
+</a>
+<a href="https://app.revolt.chat/invite/74TpERXA" target="_blank">
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/social/revolt-singular_vector.svg" height="64" alt="chat-with-the-community-revolt" />
+</a>
 
 <!-- Links -->
 [profiles]: https://github.com/Andre601/AdvancedServerList/wiki/Profiles
@@ -65,8 +89,6 @@ If you have any own screenshots, feel free to share them with me. I may add them
 [placeholderapi]: https://www.spigotmc.org/resources/6245/
 
 [modrinth]: https://modrinth.com/plugin/advancedserverlist
-[spigot]: https://www.spigotmc.org/resources/102910/
-[hangar]: https://hangar.benndorf.dev/Andre_601/AdvancedServerList
 
 [protocollib]: https://www.spigotmc.org/resources/1997/
 [placeholderapi]: https://www.spigotmc.org/resources/6245/
@@ -77,14 +99,3 @@ If you have any own screenshots, feel free to share them with me. I may add them
 [bstats-velocity]: https://bstats.org/plugin/velocity/AdvancedServerList/15587
 
 [gallery]: https://modrinth.com/mod/advancedserverlist/gallery
-
-<!-- Badges -->
-[platform]: https://img.shields.io/badge/Platforms-Spigot%20%7C%20Paper%20%7C%20BungeeCord%20%7C%20Velocity-blue?style=for-the-badge&logo=data:image/svg%2bxml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0IiBmaWxsPSJ3aGl0ZSI+PHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBkPSJNMTEuMDYzIDEuNDU2YTEuNzUgMS43NSAwIDAxMS44NzQgMGw4LjM4MyA1LjMxNmExLjc1IDEuNzUgMCAwMTAgMi45NTZsLTguMzgzIDUuMzE2YTEuNzUgMS43NSAwIDAxLTEuODc0IDBMMi42OCA5LjcyOGExLjc1IDEuNzUgMCAwMTAtMi45NTZsOC4zODMtNS4zMTZ6bTEuMDcxIDEuMjY3YS4yNS4yNSAwIDAwLS4yNjggMEwzLjQ4MyA4LjAzOWEuMjUuMjUgMCAwMDAgLjQyMmw4LjM4MyA1LjMxNmEuMjUuMjUgMCAwMC4yNjggMGw4LjM4My01LjMxNmEuMjUuMjUgMCAwMDAtLjQyMmwtOC4zODMtNS4zMTZ6Ij48L3BhdGg+PHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBkPSJNMS44NjcgMTIuMzI0YS43NS43NSAwIDAxMS4wMzUtLjIzMmw4Ljk2NCA1LjY4NWEuMjUuMjUgMCAwMC4yNjggMGw4Ljk2NC01LjY4NWEuNzUuNzUgMCAwMS44MDQgMS4yNjdsLTguOTY1IDUuNjg1YTEuNzUgMS43NSAwIDAxLTEuODc0IDBsLTguOTY1LTUuNjg1YS43NS43NSAwIDAxLS4yMzEtMS4wMzV6Ij48L3BhdGg+PHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBkPSJNMS44NjcgMTYuMzI0YS43NS43NSAwIDAxMS4wMzUtLjIzMmw4Ljk2NCA1LjY4NWEuMjUuMjUgMCAwMC4yNjggMGw4Ljk2NC01LjY4NWEuNzUuNzUgMCAwMS44MDQgMS4yNjdsLTguOTY1IDUuNjg1YTEuNzUgMS43NSAwIDAxLTEuODc0IDBsLTguOTY1LTUuNjg1YS43NS43NSAwIDAxLS4yMzEtMS4wMzV6Ij48L3BhdGg+PC9zdmc+
-
-[tested]: https://img.shields.io/badge/Tested%20Versions-1.19%20%7C%201.19.1%20%7C%201.19.2-blue?style=for-the-badge&logo=image/svg%2bxml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0IiBmaWxsPSJ3aGl0ZSI+PHBhdGggZD0iTTE3LjI4IDkuMjhhLjc1Ljc1IDAgMDAtMS4wNi0xLjA2bC01Ljk3IDUuOTctMi40Ny0yLjQ3YS43NS43NSAwIDAwLTEuMDYgMS4wNmwzIDNhLjc1Ljc1IDAgMDAxLjA2IDBsNi41LTYuNXoiPjwvcGF0aD48cGF0aCBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0zLjc1IDJBMS43NSAxLjc1IDAgMDAyIDMuNzV2MTYuNWMwIC45NjYuNzg0IDEuNzUgMS43NSAxLjc1aDE2LjVBMS43NSAxLjc1IDAgMDAyMiAyMC4yNVYzLjc1QTEuNzUgMS43NSAwIDAwMjAuMjUgMkgzLjc1ek0zLjUgMy43NWEuMjUuMjUgMCAwMS4yNS0uMjVoMTYuNWEuMjUuMjUgMCAwMS4yNS4yNXYxNi41YS4yNS4yNSAwIDAxLS4yNS4yNUgzLjc1YS4yNS4yNSAwIDAxLS4yNS0uMjVWMy43NXoiPjwvcGF0aD48L3N2Zz4=
-
-[dl-modrinth]: https://img.shields.io/badge/Modrinth-30b27b?style=for-the-badge&logo=data:image/svg%2bxml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbDpzcGFjZT0icHJlc2VydmUiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgc3Ryb2tlLW1pdGVybGltaXQ9IjEuNSIgY2xpcC1ydWxlPSJldmVub2RkIiB2aWV3Qm94PSIwIDAgNjggNjgiPjxwYXRoIGZpbGw9Im5vbmUiIGQ9Ik0uMDUgMGg2NnY2NmgtNjZ6Ii8+PGNsaXBQYXRoIGlkPSJhIj48cGF0aCBkPSJNLjA1IDBoNjZ2NjZoLTY2eiIvPjwvY2xpcFBhdGg+PGcgY2xpcC1wYXRoPSJ1cmwoI2EpIj48Y2xpcFBhdGggaWQ9ImIiPjxjaXJjbGUgY3g9IjMzLjA1IiBjeT0iMzMiIHI9IjMzIi8+PC9jbGlwUGF0aD48ZyBjbGlwLXBhdGg9InVybCgjYikiPjxjbGlwUGF0aCBpZD0iYyI+PHBhdGggZD0iTTgzLjA1LTE3aC0xMDBWODNoMTAwVi0xN1pNMjkuMDUxIDMyLjI5NWwuMDc3IDEuNzU3IDguODI5IDMyLjk2MyA3Ljg0NC0yLjEwMi04LjU5Ny0zMi4wOTRMNDMuMDA5LS4xMTNsLTcuOTk3LTEuNDEtNS45NjEgMzMuODE4WiIvPjwvY2xpcFBhdGg+PGcgY2xpcC1wYXRoPSJ1cmwoI2MpIj48cGF0aCBmaWxsPSIjRkZGIiBkPSJNMzMuMDUgMGMxOC4yMDYgMCAzMi45ODggMTQuNzg3IDMyLjk4OCAzM1M1MS4yNTYgNjYgMzMuMDUgNjZDMTQuODQzIDY2IC4wNjEgNTEuMjEzLjA2MSAzM1MxNC44NDMgMCAzMy4wNSAwWm0wIDljMTMuMjQgMCAyMy45ODggMTAuNzU1IDIzLjk4OCAyNFM0Ni4yOSA1NyAzMy4wNSA1N0MxOS44MDkgNTcgOS4wNjEgNDYuMjQ1IDkuMDYxIDMzUzE5LjgwOSA5IDMzLjA1IDlaIi8+PC9nPjxjbGlwUGF0aCBpZD0iZCI+PHBhdGggZD0iTS0xNi45NS0xN3Y0Nmg1MGwxLjM2OC4yNDFMODIuMDUgNDYuNTc4bC0yLjczNyA3LjUxN0wzMi4zNDQgMzdILTE2Ljk1djQ2aDEwMFYtMTdoLTEwMFoiLz48L2NsaXBQYXRoPjxnIGNsaXAtcGF0aD0idXJsKCNkKSI+PHBhdGggZmlsbD0iI0ZGRiIgZD0iTTMzLjA1LTE3YzI3LjU5NSAwIDUwIDIyLjQwNCA1MCA1MHMtMjIuNDA1IDUwLTUwIDUwYy0yNy41OTYgMC01MC0yMi40MDQtNTAtNTBzMjIuNDA0LTUwIDUwLTUwWm0wIDljMjIuNjI4IDAgNDEgMTguMzcxIDQxIDQxcy0xOC4zNzIgNDEtNDEgNDFjLTIyLjYyOSAwLTQxLTE4LjM3MS00MS00MXMxOC4zNzEtNDEgNDEtNDFaIi8+PC9nPjxjbGlwUGF0aCBpZD0iZSI+PHBhdGggZD0iTTMzLjA1LTE3YzI3LjU5NSAwIDUwIDIyLjQwNCA1MCA1MHMtMjIuNDA1IDUwLTUwIDUwYy0yNy41OTYgMC01MC0yMi40MDQtNTAtNTBzMjIuNDA0LTUwIDUwLTUwWm0wIDM5LjU0OWM1Ljc2NyAwIDEwLjQ1IDQuNjgzIDEwLjQ1IDEwLjQ1MSAwIDUuNzY4LTQuNjgzIDEwLjQ1MS0xMC40NSAxMC40NTEtNS43NjggMC0xMC40NTEtNC42ODMtMTAuNDUxLTEwLjQ1MSAwLTUuNzY4IDQuNjgzLTEwLjQ1MSAxMC40NTEtMTAuNDUxWiIvPjwvY2xpcFBhdGg+PGcgY2xpcC1wYXRoPSJ1cmwoI2UpIj48cGF0aCBmaWxsPSJub25lIiBzdHJva2U9IiNGRkYiIHN0cm9rZS13aWR0aD0iOSIgZD0ibTMzLjA1IDMzLTQ0LjgyOSAyNS44ODIiLz48L2c+PGNsaXBQYXRoIGlkPSJmIj48cGF0aCBkPSJNMzMuMDUtMTdjMjcuNTk1IDAgNTAgMjIuNDA0IDUwIDUwcy0yMi40MDUgNTAtNTAgNTBjLTI3LjU5NiAwLTUwLTIyLjQwNC01MC01MHMyMi40MDQtNTAgNTAtNTBabTAgMjUuMzZjMTMuNTk5IDAgMjQuNjQgMTEuMDQxIDI0LjY0IDI0LjY0UzQ2LjY0OSA1Ny42NCAzMy4wNSA1Ny42NEMxOS40NSA1Ny42NCA4LjQwOSA0Ni41OTkgOC40MDkgMzNTMTkuNDUgOC4zNiAzMy4wNSA4LjM2WiIvPjwvY2xpcFBhdGg+PGcgY2xpcC1wYXRoPSJ1cmwoI2YpIj48cGF0aCBmaWxsPSJub25lIiBzdHJva2U9IiNGRkYiIHN0cm9rZS13aWR0aD0iOSIgZD0ibTMzLjA1IDMzIDUwLTEzLjM5NyIvPjwvZz48cGF0aCBmaWxsPSIjRkZGIiBkPSJNMjAuMjkzIDM1Ljc0NiAxOC4wNSAyOGw4LTkgMTEtMyA0IDQtNiA2LTQgMS0zIDQgMS4xMiA0LjI0IDMuMTEyIDMuMDkgNC45NjQtLjU5OCAyLjg2Ni0yLjk2NCA4LjE5Ni0yLjE5NiAxLjQ2NCA1LjQ2NC04LjA5OCA4LjAyNkwyOS44OCA0OC40OWwtNS41ODctNS44MTUtNC02LjkyOVoiLz48L2c+PC9nPjwvc3ZnPg==
-
-[dl-spigot]: https://img.shields.io/badge/Spigot-ed8106?style=for-the-badge&logo=data:image/svg%2bxml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1MTIgNTEyIiBmaWxsPSIjRkZGIj48cGF0aCBkPSJNNDE2IDQ4MGMwIDE3LjYyIDE0LjM4IDMyIDMyIDMyczMyLTE0LjM4IDMyLTMycy0zMi02NC0zMi02NFM0MTYgNDYyLjQgNDE2IDQ4MHpNMzUyIDE5MmgtMzguNTRDMjk3LjcgMTc4LjUgMjc3LjkgMTY4LjkgMjU2IDE2NFYxMTYuNUwyMjQgMTEzTDE5MiAxMTYuNVYxNjRDMTcwLjEgMTY5IDE1MC4zIDE3OC42IDEzNC41IDE5MkgxNkM3LjEyNSAxOTIgMCAxOTkuMSAwIDIwOHY5NkMwIDMxMi45IDcuMTI1IDMyMCAxNiAzMjBoOTIuNzhDMTI5LjQgMzU3LjggMTczIDM4NCAyMjQgMzg0czk0LjU5LTI2LjI1IDExNS4yLTY0SDM1MmMxNy42MiAwIDMyIDE0LjI5IDMyIDMxLjkxUzM5OC40IDM4NCA0MTYgMzg0aDY0YzE3LjYyIDAgMzItMTQuMzggMzItMzJDNTEyIDI2My42IDQ0MC40IDE5MiAzNTIgMTkyek04MS42MyA5NS44OEwyMjQgODAuODhsMTQyLjQgMTVDMzc1LjkgOTYuODggMzg0IDg5LjEyIDM4NCA3OS4xMlY0OC44OWMwLTEwLTguMTI1LTE3Ljc0LTE3LjYyLTE2Ljc0TDI1NiA0My43NVYxNkMyNTYgNy4xMjUgMjQ4LjkgMCAyNDAgMGgtMzJDMTk5LjEgMCAxOTIgNy4xMjUgMTkyIDE2djI3Ljc1TDgxLjYzIDMyLjE0QzcyLjEzIDMxLjE0IDY0IDM4Ljg5IDY0IDQ4Ljg5Vjc5LjEyQzY0IDg5LjEyIDcyLjEzIDk2Ljg4IDgxLjYzIDk1Ljg4eiIvPjwvc3ZnPg==
-
-[dl-hangar]: https://img.shields.io/badge/Hangar%20(Beta)-444?style=for-the-badge&logo=data:image/svg%2bxml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNDEgMjI0LjUiPjxkZWZzPjxzdHlsZT4uYXtmaWxsOm5vbmU7fS5iLC5se2ZpbGw6I2ZmZjt9LmIsLmMsLmQsLmUsLmYsLmcsLmgsLmksLmp7ZmlsbC1ydWxlOmV2ZW5vZGQ7fS5je2ZpbGw6I2ZhMDt9LmR7ZmlsbDojYWFhO30uZXtmaWxsOiM1NWY7fS5me2ZpbGw6IzVmNTt9Lmd7ZmlsbDojNjdjYmRmO30uaHtmaWxsOiNmNTU7fS5pe2ZpbGw6I2Y1Zjt9Lmp7ZmlsbDojZmY1O30ua3tmaWxsOiM0NDQ7fTwvc3R5bGU+PC9kZWZzPjxyZWN0IGNsYXNzPSJhIiB4PSIyMS4yIiB5PSIxMy42IiB3aWR0aD0iMjE0LjciIGhlaWdodD0iMTk5Ljk0Ii8+PHBhdGggY2xhc3M9ImIiIGQ9Ik01NTAuOCwzOTkuNSwzOTEuMiw0NzUuMyw0NzIuNSw2MjRsMTU5LjYtNzUuOEw1NTAuOCwzOTkuNVoiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0zOTEuMiAtMzk5LjUpIi8+PHBhdGggY2xhc3M9ImMiIGQ9Ik01NTcsNDAxLjYsMzkzLjQsNDY5LjVsNzIuOCwxNTIuNEw2MjkuOSw1NTRaIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtMzkxLjIgLTM5OS41KSIvPjxwYXRoIGNsYXNzPSJkIiBkPSJNNTYzLjIsNDA0LDM5NS45LDQ2My44bDY0LjIsMTU1LjgsMTY3LjMtNTkuOFoiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0zOTEuMiAtMzk5LjUpIi8+PHBhdGggY2xhc3M9ImUiIGQ9Ik01NjkuMiw0MDYuNiwzOTguOCw0NTguMmw1NS4zLDE1OC43LDE3MC40LTUxLjZMNTY5LjIsNDA2LjZaIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtMzkxLjIgLTM5OS41KSIvPjxwYXRoIGNsYXNzPSJmIiBkPSJNNTc1LDQwOS42LDQwMiw0NTIuOGw0Ni4zLDE2MS4xLDE3My4xLTQzLjFaIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtMzkxLjIgLTM5OS41KSIvPjxwYXRoIGNsYXNzPSJnIiBkPSJNNTgxLjEsNDEyLjVsLTE3NS41LDM1TDQ0My4yLDYxMWwxNzUuNS0zNUw1ODEuMSw0MTIuNVoiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0zOTEuMiAtMzk5LjUpIi8+PHBhdGggY2xhc3M9ImgiIGQ9Ik01ODYuMSw0MTYuMyw0MDkuMiw0NDIuNGwyOCwxNjQuOCwxNzYuOS0yNi4xLTI4LTE2NC44WiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTM5MS4yIC0zOTkuNSkiLz48cGF0aCBjbGFzcz0iaSIgZD0iTTU5MS40LDQyMC4xLDQxMy4yLDQzNy41bDE4LjcsMTY2TDYxMC4xLDU4Niw1OTEuNCw0MjAuMVoiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0zOTEuMiAtMzk5LjUpIi8+PHBhdGggY2xhc3M9ImoiIGQ9Ik01OTYuNCw0MjQuMWwtMTc4LjksOC43LDkuNCwxNjYuNiwxNzguOS04LjctOS40LTE2Ni42WiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTM5MS4yIC0zOTkuNSkiLz48cmVjdCBjbGFzcz0iayIgeD0iMzAuOSIgeT0iMjguOCIgd2lkdGg9IjE3OS4yIiBoZWlnaHQ9IjE2Ni44OCIvPjxwYXRoIGNsYXNzPSJsIiBkPSJNNTU0LjcsNTAyLjdjLTkuNy0zLjYtMjQsMTAuMi0zMSwzMS40YTgzLjksODMuOSwwLDAsMC0zLjUsMzUuOWwtNC41LTEuOWMtOC42LTI2LjctMy44LTU1LjksMTEuMS03N1oiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0zOTEuMiAtMzk5LjUpIi8+PHBhdGggY2xhc3M9ImwiIGQ9Ik01NjEsNTQ4LjNsLTMzLjItMTMuN2M2LjEtMTguNSwxNy40LTI5LjYsMjQuNy0yOS42YTcuOCw3LjgsMCwwLDEsMi4yLjRsLjYuM2MyLjYsMS4yLDEwLjUsOCw1LjcsNDIuNiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTM5MS4yIC0zOTkuNSkiLz48cGF0aCBjbGFzcz0ibCIgZD0iTTU0OS4xLDQ2Ni4yYTczLjQsNzMuNCwwLDAsMC0yNS44LDIzLjRjLTE0LjYsMjEuMi0xOS42LDQ5LjktMTIsNzYuN2E4Mi4yLDgyLjIsMCwwLDAsMy4zLDkuNWwtNDQuNS0xOC40Yy0xNi44LTQxLjItMS40LTkwLjMsMzQuNS0xMDkuN1oiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0zOTEuMiAtMzk5LjUpIi8+PC9zdmc+Cg==

bungeecord/pom.xml

@@ -103,7 +103,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.4.1</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <relocations>

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

@@ -83,6 +83,9 @@ public class BungeeCordCore extends Plugin implements ProxyCore<Favicon, ServerP
     
     @Override
     public void clearFaviconCache(){
+        if(faviconHandler == null)
+            return;
+    
         faviconHandler.clearCache();
     }
     

core/pom.xml

@@ -89,7 +89,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.4.1</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <filters>

core/src/main/java/ch/andre601/advancedserverlist/core/commands/CommandHandler.java

@@ -62,7 +62,7 @@ public class CommandHandler{
                 }
                 
                 if(core.getFileHandler().reloadProfiles()){
-                    sender.sendMsg("%s <green>Loaded <grey>%s Profile(s)</grey>!", prefix, core.getFileHandler().getProfiles());
+                    sender.sendMsg("%s <green>Loaded <grey>%d Profile(s)</grey>!", prefix, core.getFileHandler().getProfiles().size());
                 }else{
                     sender.sendMsg("%s <red>Cannot load Profiles!", errorPrefix);
                 }

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

@@ -156,4 +156,8 @@ public class FileHandler{
     public String getString(String def, Object... path){
         return node.node(path).getString(def);
     }
+    
+    public boolean getBoolean(Object... path){
+        return node.node(path).getBoolean();
+    }
 }

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

@@ -52,7 +52,7 @@ public class ProfileManager{
     
     public ServerListProfile getProfile(){
         for(ServerListProfile profile : core.getFileHandler().getProfiles()){
-            if(profile.getMotd().isEmpty() && profile.getPlayers().isEmpty() && profile.getPlayerCount().isEmpty())
+            if(profile.isInvalid())
                 continue;
             
             if(profile.evalConditions(replacements))

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

@@ -106,6 +106,13 @@ public class ServerListProfile{
         return true;
     }
     
+    public boolean isInvalid(){
+        return getMotd().isEmpty() &&
+            getPlayers().isEmpty() &&
+            (getPlayerCount().isEmpty() && !shouldHidePlayers()) &&
+            getFavicon().isEmpty();
+    }
+    
     private List<Expression> createExpressions(List<String> list, PluginLogger logger) {
         if(list.isEmpty())
             return Collections.emptyList();

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

@@ -70,22 +70,21 @@ public class Expression{
             char next = (i == (chars.length - 1)) ? '\0' : chars[i + 1];
             
             Operator tmp = Operator.getOperand(c, next);
-            if(tmp == Operator.UNKNOWN){
-                if(foundOperator){
-                    right.append(c);
-                }else{
-                    left.append(c);
-                }
+            if(tmp != Operator.UNKNOWN && !foundOperator){
+                operator = tmp;
+                foundOperator = true;
+                
+                if(tmp.hasSecond())
+                    i++; // Skip next character if operator has 2
+                
                 continue;
             }
             
             if(foundOperator){
-                result = ExpressionResult.INVALID_DOUBLE_OPERATOR;
-                return;
+                right.append(c);
+            }else{
+                left.append(c);
             }
-            
-            operator = tmp;
-            foundOperator = true;
         }
         
         if(left.isEmpty() || right.isEmpty()){
@@ -194,7 +193,6 @@ public class Expression{
         VALID(null),
         
         INVALID_NO_EXPRESSION  ("Received empty condition which isn't allowed!"),
-        INVALID_DOUBLE_OPERATOR("Condition contained two operands."),
         INVALID_EMPTY_PARTS    ("Received condition with either left or right part being empty.");
         
         private final String message;

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/players/PlayerHandler.java

@@ -33,7 +33,6 @@ import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
 import java.util.List;
 import java.util.Map;
 import java.util.StringJoiner;
@@ -54,6 +53,12 @@ public class PlayerHandler{
             core.getPlugin().getPluginLogger().info("No cache.data present. Skipping...");
             return;
         }
+        
+        if(core.getFileHandler().getBoolean("disable_cache")){
+            core.getPlugin().getPluginLogger().info("Cache disabled. Skipping player loading...");
+            return;
+        }
+        
         List<String> lines;
         try{
             lines = Files.readAllLines(cache);
@@ -86,6 +91,11 @@ public class PlayerHandler{
             core.getPlugin().getPluginLogger().info("No data to save. Skipping...");
             return;
         }
+    
+        if(core.getFileHandler().getBoolean("disable_cache")){
+            core.getPlugin().getPluginLogger().info("Cache disabled. Skipping player saving...");
+            return;
+        }
         
         StringJoiner joiner = new StringJoiner("\n");
         for(Map.Entry<String, String> entry : players){
@@ -93,7 +103,7 @@ public class PlayerHandler{
         }
         
         try{
-            BufferedWriter writer = Files.newBufferedWriter(cache, StandardCharsets.UTF_8, StandardOpenOption.WRITE);
+            BufferedWriter writer = Files.newBufferedWriter(cache, StandardCharsets.UTF_8);
             
             writer.write(joiner.toString());
             writer.close();
@@ -105,13 +115,16 @@ public class PlayerHandler{
     }
     
     public void addPlayer(String name, String ip){
-        if(players.containsKey(name))
+        if(players.containsKey(name) || core.getFileHandler().getBoolean("disable_cache"))
             return;
         
         players.add(name, ip);
     }
     
     public String getPlayerByIp(String ip){
+        if(core.getFileHandler().getBoolean("disable_cache"))
+            core.getFileHandler().getString("Anonymous", "unknown_player");
+        
         for(Map.Entry<String, String> entry : players){
             if(entry.getValue().equals(ip))
                 return entry.getKey();

core/src/main/resources/config.yml

@@ -1,4 +1,12 @@
 #
 # Used for when AdvancedServerList doesn't have a cached player to use for ${player name}
 #
-unknown_player: "Anonymous"
+unknown_player: "Anonymous"
+
+#
+# Should the Caching of players be disabled?
+#
+# When set to true will AdvancedServerList not load any players from the cache.data file (if present) nor save any to it.
+# Placeholders that rely on the player being cached (such as ${player isWhitelisted}) will not work while this option is enabled.
+#
+disable_cache: false

paper/pom.xml

@@ -101,7 +101,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.4.1</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <relocations>

paper/src/main/java/ch/andre601/advancedserverlist/paper/PaperCore.java

@@ -117,6 +117,9 @@ public class PaperCore extends JavaPlugin implements ServerCore<CachedServerIcon
     
     @Override
     public void clearFaviconCache(){
+        if(faviconHandler == null)
+            return;
+        
         faviconHandler.clearCache();
     }
     

pom.xml

@@ -12,7 +12,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         
-        <plugin.version>1.6.0</plugin.version>
+        <plugin.version>1.6.4</plugin.version>
         <plugin.description>Create multiple Server lists based on conditions.</plugin.description>
         
         <maven.compiler.source>16</maven.compiler.source>

spigot/pom.xml

@@ -116,7 +116,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.4.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <relocations>

spigot/src/main/java/ch/andre601/advancedserverlist/spigot/SpigotCore.java

@@ -102,6 +102,9 @@ public class SpigotCore extends JavaPlugin implements ServerCore<WrappedServerPi
     
     @Override
     public void clearFaviconCache(){
+        if(faviconHandler == null)
+            return;
+    
         faviconHandler.clearCache();
     }
     

velocity/pom.xml

@@ -88,7 +88,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.4.1</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <relocations>

velocity/src/main/java/ch/andre601/advancedserverlist/velocity/VelocityCore.java

@@ -107,6 +107,9 @@ public class VelocityCore implements ProxyCore<Favicon, ServerPing.SamplePlayer>
     
     @Override
     public void clearFaviconCache(){
+        if(faviconHandler == null)
+            return;
+    
         faviconHandler.clearCache();
     }