Merge pull request #9 from Andre601/feature/favicon-support

Add Favicon support for Server list profiles.
Add assets
2026-11-05 09:00:15 -05:00 · 2022-08-21 23:32:46 +02:00 · 2022-08-21 23:30:59 +02:00 · 2022-08-21 23:28:11 +02:00 · 2022-08-21 01:31:20 +02:00 · 2022-08-20 23:53:32 +02:00
41 changed files with 1305 additions and 379 deletions
@@ -0,0 +1,50 @@
+version: 2
+updates:
+  - package-ecosystem: maven
+    directory: "/bungeecord"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - 'Type: Update Dependency'
+      - 'Target: BungeeCord'
+  - package-ecosystem: maven
+    directory: "/core"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - 'Type: Update Dependency'
+      - 'Target: Core'
+  - package-ecosystem: maven
+    directory: "/paper"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - 'Type: Update Dependency'
+      - 'Target: PaperMC'
+  - package-ecosystem: maven
+    directory: "/spigot"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - 'Type: Update Dependency'
+      - 'Target: Spigot'
+  - package-ecosystem: maven
+    directory: "/velocity"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - 'Type: Update Dependency'
+      - 'Target: Velocity'
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - 'Type: Update Dependency'
+      - 'Target: GitHub Action'
@@ -1,59 +1,69 @@
-<!-- Badges -->
-[platforms]: https://img.shields.io/badge/Platforms-Spigot%20%7C%20PaperMC%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-blue?style=for-the-badge&logo=image/svg%2bxml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0IiBmaWxsPSJ3aGl0ZSI+PHBhdGggZD0iTTE3LjI4IDkuMjhhLjc1Ljc1IDAgMDAtMS4wNi0xLjA2bC01Ljk3IDUuOTctMi40Ny0yLjQ3YS43NS43NSAwIDAwLTEuMDYgMS4wNmwzIDNhLjc1Ljc1IDAgMDAxLjA2IDBsNi41LTYuNXoiPjwvcGF0aD48cGF0aCBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0zLjc1IDJBMS43NSAxLjc1IDAgMDAyIDMuNzV2MTYuNWMwIC45NjYuNzg0IDEuNzUgMS43NSAxLjc1aDE2LjVBMS43NSAxLjc1IDAgMDAyMiAyMC4yNVYzLjc1QTEuNzUgMS43NSAwIDAwMjAuMjUgMkgzLjc1ek0zLjUgMy43NWEuMjUuMjUgMCAwMS4yNS0uMjVoMTYuNWEuMjUuMjUgMCAwMS4yNS4yNXYxNi41YS4yNS4yNSAwIDAxLS4yNS4yNUgzLjc1YS4yNS4yNSAwIDAxLS4yNS0uMjVWMy43NXoiPjwvcGF0aD48L3N2Zz4=
-
-[download modrinth]: https://img.shields.io/badge/Modrinth%20(Coming%20Soon)-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==
-[download spigot]: https://img.shields.io/badge/Spigot-ed8106?style=for-the-badge&logo=data:image/svg%2bxml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1MTIgNTEyIiBmaWxsPSIjRkZGIj48cGF0aCBkPSJNNDE2IDQ4MGMwIDE3LjYyIDE0LjM4IDMyIDMyIDMyczMyLTE0LjM4IDMyLTMycy0zMi02NC0zMi02NFM0MTYgNDYyLjQgNDE2IDQ4MHpNMzUyIDE5MmgtMzguNTRDMjk3LjcgMTc4LjUgMjc3LjkgMTY4LjkgMjU2IDE2NFYxMTYuNUwyMjQgMTEzTDE5MiAxMTYuNVYxNjRDMTcwLjEgMTY5IDE1MC4zIDE3OC42IDEzNC41IDE5MkgxNkM3LjEyNSAxOTIgMCAxOTkuMSAwIDIwOHY5NkMwIDMxMi45IDcuMTI1IDMyMCAxNiAzMjBoOTIuNzhDMTI5LjQgMzU3LjggMTczIDM4NCAyMjQgMzg0czk0LjU5LTI2LjI1IDExNS4yLTY0SDM1MmMxNy42MiAwIDMyIDE0LjI5IDMyIDMxLjkxUzM5OC40IDM4NCA0MTYgMzg0aDY0YzE3LjYyIDAgMzItMTQuMzggMzItMzJDNTEyIDI2My42IDQ0MC40IDE5MiAzNTIgMTkyek04MS42MyA5NS44OEwyMjQgODAuODhsMTQyLjQgMTVDMzc1LjkgOTYuODggMzg0IDg5LjEyIDM4NCA3OS4xMlY0OC44OWMwLTEwLTguMTI1LTE3Ljc0LTE3LjYyLTE2Ljc0TDI1NiA0My43NVYxNkMyNTYgNy4xMjUgMjQ4LjkgMCAyNDAgMGgtMzJDMTk5LjEgMCAxOTIgNy4xMjUgMTkyIDE2djI3Ljc1TDgxLjYzIDMyLjE0QzcyLjEzIDMxLjE0IDY0IDM4Ljg5IDY0IDQ4Ljg5Vjc5LjEyQzY0IDg5LjEyIDcyLjEzIDk2Ljg4IDgxLjYzIDk1Ljg4eiIvPjwvc3ZnPg==
-[download 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==
-[download github]: https://img.shields.io/badge/GitHub-000?style=for-the-badge&logo=github
-
-<!-- Wiki links -->
-[wiki]: https://github.com/Andre601/AdvancedServerList/wiki
-[minimessage]: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#minimessage
-[placeholders]: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#placeholders
-
-<!-- Download links -->
-[modrinth]: https://modrinth.com
-[spigot]: https://www.spigotmc.org/resources/102910/
-[hangar]: https://hangar.benndorf.dev/Andre_601/AdvancedServerList
-[github]: https://github.com/Andre601/AdvancedServerList/releases
-
-<!-- Stats -->
-[stats-spigot]: https://bstats.org/plugin/bukkit/AdvancedServerList/15584
-[stats-bungeecord]: https://bstats.org/plugin/bungeecord/AdvancedServerList/15585
-[stats-velocity]: https://bstats.org/plugin/velocity/AdvancedServerList/15587
-
-<!-- Other -->
-[license]: https://github.com/Andre601/AdvancedServerList/blob/master/LICENSE
-
 # AdvancedServerList
+![platform] ![tested]

-![platforms] ![tested]
+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 server and proxy plugin that allows you to create custom MOTDs and more in your server list with priority and conditions.
+## What is a Server List Profile?
+A Server List Profile is a YAML file located in the plugin’s profiles folder having a priority, conditions (Optional), MOTD, Player count text, hover for player count and hiding the player count completely (Changing it to `???`)
+
+> [*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]

 ## Downloads
+AdvancedServerList can be downloaded from the following places:

-You can download AdvancedServerList on the following locations:
+[![dl-modrinth]][modrinth] [![dl-spigot]][spigot] [![dl-hangar]][hangar]

-[![download modrinth]][modrinth] [![download spigot]][spigot] [![download hangar]][hangar] [![download github]][github]
+## Screenshots
+Here are screenshots showing the plugin in action. Do you have your own screenshots that you would like to share? Let me know and I may add them here with proper credit.

-## Features
+![showcase]

- Create multiple profiles with
-  - Priority (Higher number = Higher Priority).
-  - Conditions for displaying the profile.
-  - Custom MOTD.
-  - Custom Player count text.
-  - Custom hover for the player count hover.
-  - MiniMessage formatting for MOTD, player count and player count hover [[Read More][minimessage]]
- Placeholder support [[Read More][placeholders]]
+![features]

-## Links
+<!-- 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

- [Wiki][wiki]
- Statistics
-  - [Spigot/PaperMC][stats-spigot]
-  - [BungeeCord][stats-bungeecord]
-  - [Velocity][stats-velocity]
- [License][license]
+[placeholderapi]: https://www.spigotmc.org/resources/6245/
+
+[modrinth]: https://modrinth.com/mod/advancedserverlist
+[spigot]: https://www.spigotmc.org/resources/102910/
+[hangar]: https://hangar.benndorf.dev/Andre_601/AdvancedServerList
+
+<!-- images -->
+[showcase]: https://cdn.discordapp.com/attachments/417019799365746690/990379003250626580/unknown.png
+[features]: https://cdn.discordapp.com/attachments/990389158944055366/1004042735973568522/2022-08-02_17.03.40.jpg
+
+<!-- Badges -->
+[platform]: https://img.shields.io/badge/Platforms-Spigot%20%7C%20PaperMC%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==
@@ -75,7 +75,7 @@
        <dependency>
            <groupId>net.kyori</groupId>
            <artifactId>adventure-platform-bungeecord</artifactId>
-            <version>4.1.0</version>
+            <version>4.1.2</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
@@ -109,7 +109,7 @@
                    <relocations>
                        <relocation>
                            <pattern>org.spongepowered.configurate</pattern>
-                            <shadedPattern>ch.andre601.advancedserverlist.velocity.depends.configurate</shadedPattern>
+                            <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.configurate</shadedPattern>
                        </relocation>
                        <relocation>
                            <pattern>net.kyori.adventure</pattern>
@@ -0,0 +1,37 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 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.bungeecord;
+
+import ch.andre601.advancedserverlist.core.profiles.players.GenericPlayer;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+
+public class BungeePlayer extends GenericPlayer<ProxiedPlayer>{
+    
+    public BungeePlayer(String name, int protocol){
+        this.name = name;
+        this.protocol = protocol;
+    }
+}
@@ -26,11 +26,17 @@
 package ch.andre601.advancedserverlist.bungeecord.events;

 import ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
+import ch.andre601.advancedserverlist.bungeecord.BungeePlayer;
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import ch.andre601.advancedserverlist.core.profiles.ProfileManager;
 import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
+import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
+import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
+import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.PlayerPlaceholders;
+import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.ServerPlaceholders;
 import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer;
+import net.md_5.bungee.api.Favicon;
 import net.md_5.bungee.api.ServerPing;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.event.ProxyPingEvent;
@@ -38,8 +44,8 @@ import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
 import net.md_5.bungee.event.EventPriority;

+import java.awt.image.BufferedImage;
 import java.net.InetSocketAddress;
-import java.util.Map;

 public class PingEvent implements Listener{
    
@@ -57,30 +63,57 @@ public class PingEvent implements Listener{
        if(protocol == null)
            return;
    
-        InetSocketAddress address = (InetSocketAddress)event.getConnection().getSocketAddress();
-        Map<String, Object> replacements = plugin.getCore()
-            .loadPlaceholders(protocol.getProtocol(), ping.getPlayers().getOnline(), ping.getPlayers().getMax(), address);
+        String playerName = plugin.getCore().getPlayerHandler().getPlayerByIp(
+            ((InetSocketAddress)event.getConnection().getSocketAddress()).getHostString()
+        );
+        InetSocketAddress host = event.getConnection().getVirtualHost();
+        
+        int online = ping.getPlayers().getOnline();
+        int max = ping.getPlayers().getMax();
+    
+        PlayerPlaceholders playerPlaceholders = new PlayerPlaceholders(new BungeePlayer(playerName, protocol.getProtocol()));
+        ServerPlaceholders serverPlaceholders = new ServerPlaceholders(online, max, host == null ? null : host.getHostString());
        
        ServerListProfile profile = ProfileManager.get(plugin.getCore())
-            .replacements(replacements)
+            .replacements(playerPlaceholders)
+            .replacements(serverPlaceholders)
            .getProfile();
        
        if(profile == null)
            return;
        
+        if(profile.getXMore() >= 0){
+            max = online + profile.getXMore();
+            ping.getPlayers().setMax(max);
+        }
+        
+        serverPlaceholders = new ServerPlaceholders(online, max, host == null ? null : host.getHostString());
+        
        if(!profile.getMotd().isEmpty()){
            TextComponent component = new TextComponent(BungeeComponentSerializer.get().serialize(
                ComponentParser.list(profile.getMotd())
-                    .replacements(replacements)
+                    .replacements(playerPlaceholders)
+                    .replacements(serverPlaceholders)
                    .toComponent()
            ));
            
            ping.setDescriptionComponent(component);
        }
        
+        if(profile.shouldHidePlayers()){
+            ping.setPlayers(null);
+            
+            ping.setFavicon(ping.getFaviconObject());
+            ping.setVersion(protocol);
+            
+            event.setResponse(ping);
+            return;
+        }
+        
        if(!profile.getPlayerCount().isEmpty()){
            protocol.setName(ComponentParser.text(profile.getPlayerCount())
-                .replacements(replacements)
+                .replacements(playerPlaceholders)
+                .replacements(serverPlaceholders)
                .toString()
            );
            protocol.setProtocol(-1);
@@ -88,17 +121,35 @@ public class PingEvent implements Listener{
        
        if(!profile.getPlayers().isEmpty()){
            String players = ComponentParser.list(profile.getPlayers())
-                .replacements(replacements)
+                .replacements(playerPlaceholders)
+                .replacements(serverPlaceholders)
                .toString();
            
            ServerPing.PlayerInfo[] playerInfos = AdvancedServerList.getPlayers(ServerPing.PlayerInfo.class, players)
                .toArray(new ServerPing.PlayerInfo[0]);
+            
            if(playerInfos.length > 0)
                ping.getPlayers().setSample(playerInfos);
-            
        }
        
-        ping.setFavicon(ping.getFaviconObject());
+        if(!profile.getFavicon().isEmpty()){
+            String favName = StringReplacer.replace(profile.getFavicon(), playerPlaceholders.getReplacements());
+            
+            BufferedImage img = new FaviconHandler(plugin.getCore(), favName).get().getAsBufferedImage();
+            if(img == null){
+                plugin.getPluginLogger().warn("Could not obtain valid Favicon to use.");
+                ping.setFavicon(ping.getFaviconObject());
+            }else{
+                try{
+                    Favicon favicon = Favicon.create(img);
+                    ping.setFavicon(favicon);
+                }catch(Exception ex){
+                    plugin.getPluginLogger().warn("Unable to override Favicon. Reason: %s", ex.getMessage());
+                    ping.setFavicon(ping.getFaviconObject());
+                }
+            }
+        }
+        
        ping.setVersion(protocol);
        
        event.setResponse(ping);
@@ -44,8 +44,8 @@ public class BungeeLogger implements PluginLogger{
    }
    
    @Override
-    public void warn(String msg){
-        logger.warning(msg);
+    public void warn(String msg, Object... args){
+        logger.warning(String.format(msg, args));
    }
    
    @Override
@@ -47,22 +47,28 @@
        <dependency>
            <groupId>org.spongepowered</groupId>
            <artifactId>configurate-yaml</artifactId>
-            <version>${plugin.depend.configurate}</version>
+            <version>4.1.2</version>
        </dependency>
        <dependency>
            <groupId>net.kyori</groupId>
            <artifactId>adventure-api</artifactId>
-            <version>${plugin.depend.kyori-adventure}</version>
+            <version>4.11.0</version>
        </dependency>
        <dependency>
            <groupId>net.kyori</groupId>
            <artifactId>adventure-text-minimessage</artifactId>
-            <version>${plugin.depend.kyori-minimessage}</version>
+            <version>4.11.0</version>
        </dependency>
        <dependency>
            <groupId>net.kyori</groupId>
            <artifactId>adventure-text-serializer-legacy</artifactId>
-            <version>${plugin.depend.kyori-legacy}</version>
+            <version>4.11.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+            <version>1.3.3</version>
+            <scope>compile</scope>
        </dependency>
    </dependencies>

@@ -86,6 +92,12 @@
                <version>3.3.0</version>
                <configuration>
                    <minimizeJar>true</minimizeJar>
+                    <relocations>
+                        <relocation>
+                            <pattern>com.github.benmanes</pattern>
+                            <shadedPattern>ch.andre601.advancedserverlist.core.depends.caffeine</shadedPattern>
+                        </relocation>
+                    </relocations>
                    <filters>
                        <filter>
                            <artifact>*:*</artifact>
@@ -29,15 +29,12 @@ import ch.andre601.advancedserverlist.core.commands.CommandHandler;
 import ch.andre601.advancedserverlist.core.file.FileHandler;
 import ch.andre601.advancedserverlist.core.interfaces.PluginCore;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
-import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import ch.andre601.advancedserverlist.core.profiles.players.PlayerHandler;
-import ch.andre601.advancedserverlist.core.profiles.replacer.Placeholders;

 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
-import java.net.InetSocketAddress;
 import java.nio.file.Path;
 import java.util.*;

@@ -69,9 +66,7 @@ public class AdvancedServerList{
            constructor.setAccessible(true);
            
            for(String line : lines){
-                players.add(constructor.newInstance(
-                    ComponentParser.text(line).toString(), UUID.randomUUID()
-                ));
+                players.add(constructor.newInstance(line, UUID.randomUUID()));
            }
            
            return players;
@@ -80,17 +75,6 @@ public class AdvancedServerList{
        }
    }
    
-    public Map<String, Object> loadPlaceholders(int protocol, int online, int max, InetSocketAddress ip){
-        Map<String, Object> replacements = new HashMap<>();
-        
-        replacements.put(Placeholders.PLAYER_PROTOCOL, protocol);
-        replacements.put(Placeholders.PLAYERS_ONLINE, online);
-        replacements.put(Placeholders.PLAYERS_MAX, max);
-        replacements.put(Placeholders.PLAYER_NAME, getPlayerHandler().getPlayerByIp(ip.getHostString()));
-        
-        return replacements;
-    }
-    
    public void disable(){
        getPluginLogger().info("Saving cache.data file...");
        getPlayerHandler().save();
@@ -127,7 +111,7 @@ public class AdvancedServerList{
        
        getPluginLogger().info("Starting AdvancedServerList v%s...", version);
        
-        getPluginLogger().info("Proxy: " + plugin.getPlatformName() + " " + plugin.getPlatformVersion());
+        getPluginLogger().info("Platform: " + plugin.getPlatformName() + " " + plugin.getPlatformVersion());
        
        if(getFileHandler().loadConfig()){
            getPluginLogger().info("Successfully loaded config.yml!");
@@ -143,6 +127,9 @@ public class AdvancedServerList{
            return;
        }
        
+        if(!getPath().resolve("favicons").toFile().exists() && getPath().resolve("favicons").toFile().mkdirs())
+            getPluginLogger().info("Successfully created favicons folder.");
+        
        getPluginLogger().info("Loading Commands...");
        plugin.loadCommands();
        getPluginLogger().info("Commands loaded!");
@@ -130,7 +130,7 @@ public class FileHandler{
            if(tmp == null)
                continue;
            
-            profiles.add(new ServerListProfile(tmp));
+            profiles.add(new ServerListProfile(tmp, logger));
            logger.info("Loaded " + file.getName());
        }
        
@@ -29,7 +29,7 @@ public interface PluginLogger{
    
    void info(String msg, Object... args);
    
-    void warn(String msg);
+    void warn(String msg, Object... args);
    
    void warn(String msg, Throwable throwable);
 }
@@ -26,6 +26,7 @@
 package ch.andre601.advancedserverlist.core.parsing;

 import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
+import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.Placeholders;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
@@ -38,12 +39,10 @@ public class ComponentParser{
    
    private static final MiniMessage mm;
    private static final LegacyComponentSerializer legacy;
-    private static final StringReplacer replacer;
    
    static {
        mm = MiniMessage.miniMessage();
        legacy = LegacyComponentSerializer.legacySection();
-        replacer = new StringReplacer();
    }
    
    private String text;
@@ -60,18 +59,18 @@ public class ComponentParser{
        return new ComponentParser(String.join("\n", lines));
    }
    
-    public ComponentParser replacements(Map<String, Object> replacements){
-        replacements.forEach(replacer::add);
+    public ComponentParser replacements(Placeholders placeholders){
+        text = StringReplacer.replace(text, placeholders.getReplacements());
        return this;
    }
    
-    public ComponentParser function(Function<String, String> function){
+    public ComponentParser modifyText(Function<String, String> function){
        this.text = function.apply(text);
        return this;
    }
    
    public Component toComponent(){
-        return mm.deserialize(replacer.replace(text));
+        return mm.deserialize(text);
    }
    
    @Override
@@ -1,139 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022 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;
-
-import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
-import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-public class ConditionsHolder{
-    
-    private final List<String> expressions = new ArrayList<>();
-    private final StringReplacer replacer = new StringReplacer();
-    
-    public ConditionsHolder(List<String> expressions){
-        if(expressions != null && !expressions.isEmpty())
-            this.expressions.addAll(expressions);
-    }
-    
-    public void replace(String from, Object to){
-        replacer.add(from, to);
-    }
-    
-    public boolean eval(PluginLogger logger){
-        if(expressions.isEmpty())
-            return true;
-        
-        for(String expression : expressions){
-            if(!parseExpression(expression, logger))
-                return false;
-        }
-        
-        return true;
-    }
-    
-    private boolean parseExpression(String expression, PluginLogger logger){
-        if(expression == null || expression.isEmpty())
-            return true;
-    
-        String newExpression = replacer.replace(expression);
-        
-        char[] chars = newExpression.toCharArray();
-    
-        StringBuilder left = new StringBuilder();
-        StringBuilder operator = new StringBuilder();
-        StringBuilder right = new StringBuilder();
-    
-        boolean operatorFound = false;
-    
-        for(int i = 0; i < chars.length; i++){
-            char c = chars[i];
-        
-            if(c == ' ')
-                continue;
-        
-            if((c != '<' && c != '>' && c != '=' && c != '!') || i + 1 >= chars.length){
-                if(operatorFound){
-                    right.append(c);
-                    continue;
-                }
-            
-                left.append(c);
-                continue;
-            }
-        
-            if(operatorFound){
-                logger.warn("Encountered second operator in condition! AdvancedServerList currently only supports one operator!");
-                return false;
-            }
-        
-            operatorFound = true;
-        
-            char next = chars[i + 1];
-            if(c == '!' && next != '='){
-                logger.warn("Invalid condition found. Expected '!=' but found '!" + next + "' in condition " + newExpression);
-                return false;
-            }
-        
-            operator.append(c);
-            i++;
-        
-            if(c == '!' || ((c == '<' || c == '>') && next == '=')){
-                operator.append(next);
-            }
-        }
-    
-        if(left.isEmpty() || operator.isEmpty() || right.isEmpty()){
-            logger.warn("Failed to evaluate condition. One part of the expression was empty!");
-            return false;
-        }
-    
-        int leftInt = tryParse(left.toString());
-        int rightInt = tryParse(right.toString());
-    
-        return switch(operator.toString().toLowerCase(Locale.ROOT)){
-            case ">" -> leftInt > rightInt;
-            case ">=" -> leftInt >= rightInt;
-            case "=" -> left.toString().equals(right.toString());
-            case "!=" -> !left.toString().equals(right.toString());
-            case "<" -> leftInt < rightInt;
-            case "<=" -> leftInt <= rightInt;
-            default -> false;
-        };
-    
-    }
-    
-    private int tryParse(String value){
-        try{
-            return Integer.parseInt(value);
-        }catch(NumberFormatException ex){
-            return value.length();
-        }
-    }
-}
@@ -26,7 +26,7 @@
 package ch.andre601.advancedserverlist.core.profiles;

 import ch.andre601.advancedserverlist.core.AdvancedServerList;
-import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
+import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.Placeholders;

 import java.util.HashMap;
 import java.util.Map;
@@ -35,7 +35,7 @@ public class ProfileManager{
    
    private final AdvancedServerList core;
    
-    private Map<String, Object> replacements = new HashMap<>();
+    private final Map<String, Object> replacements = new HashMap<>();
    
    private ProfileManager(AdvancedServerList core){
        this.core = core;
@@ -45,8 +45,8 @@ public class ProfileManager{
        return new ProfileManager(core);
    }
    
-    public ProfileManager replacements(Map<String, Object> replacements){
-        this.replacements = replacements;
+    public ProfileManager replacements(Placeholders placeholders){
+        this.replacements.putAll(placeholders.getReplacements());
        return this;
    }
    
@@ -54,10 +54,8 @@ public class ProfileManager{
        for(ServerListProfile profile : core.getFileHandler().getProfiles()){
            if(profile.getMotd().isEmpty() && profile.getPlayers().isEmpty() && profile.getPlayerCount().isEmpty())
                continue;
-    
-            ConditionsHolder conditions = profile.getConditions();
-            replacements.forEach(conditions::replace);
-            if(conditions.eval(core.getPluginLogger()))
+            
+            if(profile.evalConditions(replacements))
                return profile;
        }
        
@@ -25,32 +25,38 @@

 package ch.andre601.advancedserverlist.core.profiles;

+import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
+import ch.andre601.advancedserverlist.core.profiles.conditions.Expression;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;

+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;

 public class ServerListProfile{
    
-    private final ConditionsHolder conditions;
    private final int priority;
+    private final List<Expression> expressions;
    
    private final List<String> motd;
    private final List<String> players;
    private final String playerCount;
+    private final String favicon;
+    private final boolean hidePlayers;
+    private final int xMore;
    
-    public ServerListProfile(ConfigurationNode node){
-        this.conditions = new ConditionsHolder(getList(node, "conditions", false));
+    public ServerListProfile(ConfigurationNode node, PluginLogger logger){
        this.priority = node.node("priority").getInt();
+        this.expressions = createExpressions(getList(node, "conditions", false), logger);
        
        this.motd = getList(node, "motd", true);
        this.players = getList(node, "players", false);
        this.playerCount = node.node("playerCount").getString("");
-    }
-    
-    public ConditionsHolder getConditions(){
-        return conditions;
+        this.favicon = node.node("favicon").getString("");
+        this.hidePlayers = node.node("hidePlayers").getBoolean();
+        this.xMore = node.node("xMore").getInt(-1);
    }
    
    public int getPriority(){
@@ -69,6 +75,50 @@ public class ServerListProfile{
        return playerCount;
    }
    
+    public String getFavicon(){
+        return favicon;
+    }
+    
+    public boolean shouldHidePlayers(){
+        return hidePlayers;
+    }
+    
+    public int getXMore(){
+        return xMore;
+    }
+    
+    public boolean evalConditions(Map<String, Object> replacements){
+        if(expressions.isEmpty())
+            return true;
+        
+        for(Expression expression : expressions){
+            if(!expression.evaluate(replacements)){
+                return false;
+            }
+        }
+        
+        return true;
+    }
+    
+    private List<Expression> createExpressions(List<String> list, PluginLogger logger) {
+        if(list.isEmpty())
+            return Collections.emptyList();
+        
+        List<Expression> expressions = new ArrayList<>();
+        for(String str : list){
+            Expression expression = new Expression(str);
+            
+            if(expression.getResult() != Expression.ExpressionResult.VALID){
+                logger.warn("Detected Invalid condition '%s'! Cause: %s", str, expression.getResult().getMessage());
+                continue;
+            }
+            
+            expressions.add(expression);
+        }
+        
+        return expressions;
+    }
+    
    private List<String> getList(ConfigurationNode node, String key, boolean trim){
        List<String> list;
        try{
@@ -0,0 +1,223 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 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.replacer.StringReplacer;
+
+import java.util.Map;
+import java.util.function.Function;
+
+public class Expression{
+    
+    private ExpressionResult result = ExpressionResult.VALID;
+    
+    private String left;
+    private Operator operator = Operator.UNKNOWN;
+    private String right;
+    
+    public Expression(String expression){
+        resolveExpression(expression);
+    }
+    
+    public boolean evaluate(Map<String, Object> replacements){
+        String newLeft = StringReplacer.replace(left, replacements).trim();
+        String newRight = StringReplacer.replace(right, replacements).trim();
+        
+        return operator.evaluate(newLeft, newRight);
+    }
+    
+    public ExpressionResult getResult(){
+        return result;
+    }
+    
+    private void resolveExpression(String expression){
+        if(expression == null || expression.isEmpty()){
+            result = ExpressionResult.INVALID_NO_EXPRESSION;
+            return;
+        }
+        
+        char[] chars = expression.toCharArray();
+        
+        StringBuilder left = new StringBuilder();
+        StringBuilder right = 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){
+                if(foundOperator){
+                    right.append(c);
+                }else{
+                    left.append(c);
+                }
+                continue;
+            }
+            
+            if(foundOperator){
+                result = ExpressionResult.INVALID_DOUBLE_OPERATOR;
+                return;
+            }
+            
+            operator = tmp;
+            foundOperator = true;
+        }
+        
+        if(left.isEmpty() || right.isEmpty()){
+            result = ExpressionResult.INVALID_EMPTY_PARTS;
+            return;
+        }
+        
+        this.left = left.toString();
+        this.right = right.toString();
+    }
+    
+    public enum Operator{
+        LESS_THAN('<', '\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);
+            }
+        },
+        NOT_EQUAL('!', '='){
+            @Override
+            public boolean evaluate(String left, String right){
+                return !left.equals(right);
+            }
+        },
+        GREATER_THAN('>', '\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 != '=') || 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{
+            @Override
+            public String getMessage(){
+                return null;
+            }
+        },
+        
+        INVALID_NO_EXPRESSION{
+            @Override
+            public String getMessage(){
+                return "Received empty condition which isn't allowed!";
+            }
+        },
+        INVALID_DOUBLE_OPERATOR{
+            @Override
+            public String getMessage(){
+                return "Condition contained two operands.";
+            }
+        },
+        INVALID_EMPTY_PARTS{
+            @Override
+            public String getMessage(){
+                return "Received condition with either left or right part being empty.";
+            }
+        };
+        
+        public abstract String getMessage();
+    }
+}
@@ -0,0 +1,51 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 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.favicon;
+
+import ch.andre601.advancedserverlist.core.AdvancedServerList;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+
+import java.util.concurrent.TimeUnit;
+
+public class FaviconHandler{
+    
+    private final Cache<String, GenericFavicon> favicons = Caffeine.newBuilder()
+        .expireAfterWrite(5, TimeUnit.MINUTES)
+        .build();
+    
+    private final AdvancedServerList core;
+    private final String input;
+    
+    public FaviconHandler(AdvancedServerList core, String input){
+        this.core = core;
+        this.input = input;
+    }
+    
+    public GenericFavicon get(){
+        return favicons.get(input, k -> new GenericFavicon(core, input));
+    }
+}
@@ -0,0 +1,141 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 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.favicon;
+
+import ch.andre601.advancedserverlist.core.AdvancedServerList;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.*;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Locale;
+
+public class GenericFavicon{
+    
+    private final AdvancedServerList core;
+    private final String input;
+    private final BufferedImage image;
+    
+    private byte[] bytes = null;
+    
+    public GenericFavicon(AdvancedServerList core, String input){
+        this.core = core;
+        this.input = input;
+        this.image = resolve();
+    }
+    
+    public byte[] getAsByteArray(){
+        if(bytes != null && bytes.length > 0)
+            return bytes;
+        
+        if(image == null){
+            this.core.getPluginLogger().warn("Cannot convert Favicon BufferedImage to Byte array. BufferedImage was null.");
+            return null;
+        }
+        
+        try{
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            ImageIO.setUseCache(false);
+            ImageIO.write(image, "PNG", baos);
+            
+            return (bytes = baos.toByteArray());
+        }catch(IOException ex){
+            this.core.getPluginLogger().warn("Cannot convert Favicon BufferedImage to Byte array. %s", ex.getMessage());
+            return null;
+        }
+    }
+    
+    public BufferedImage getAsBufferedImage(){
+        return image;
+    }
+    
+    private BufferedImage resolve(){
+        InputStream stream;
+        
+        if(input.toLowerCase(Locale.ROOT).startsWith("https://")){
+            stream = getFromUrl(input);
+        }else
+        if(input.toLowerCase(Locale.ROOT).endsWith(".png")){
+            File folder = core.getPath().resolve("favicons").toFile();
+            if(!folder.exists()){
+                this.core.getPluginLogger().warn("Cannot get Favicon for profile. Favicons folder is not present.");
+                return null;
+            }
+            
+            File file = new File(folder, input);
+            
+            try{
+                stream = new FileInputStream(file);
+            }catch(FileNotFoundException ex){
+                this.core.getPluginLogger().warn("Unable to create Favicon data. %s", ex.getMessage());
+                return null;
+            }
+        }else{
+            stream = getFromUrl("https://mc-heads.net/avatar/" + input + "/64");
+        }
+        
+        if(stream == null){
+            this.core.getPluginLogger().warn("Unable to get Data for Favicon. InputStream was null.");
+            return null;
+        }
+        
+        try{
+            BufferedImage original = ImageIO.read(stream);
+            if(original == null)
+                return null;
+            
+            BufferedImage favicon = new BufferedImage(64, 64, BufferedImage.TYPE_INT_ARGB);
+            Graphics2D img = favicon.createGraphics();
+            
+            // We use this to resize the image to 64x64 pixels.
+            img.drawImage(original, 0, 0, 64, 64, null);
+            img.dispose();
+            
+            return favicon;
+        }catch(IOException ex){
+            this.core.getPluginLogger().warn("Cannot resize favicon into 64x64. %s", ex.getMessage());
+            return null;
+        }
+    }
+    
+    private InputStream getFromUrl(String url){
+        try{
+            URL avatarUrl = new URL(url);
+            URLConnection connection = avatarUrl.openConnection();
+            connection.setRequestProperty("User-Agent", "AdvancedServerList/" + core.getVersion());
+            connection.connect();
+            
+            return connection.getInputStream();
+        }catch(IOException ex){
+            this.core.getPluginLogger().warn("Unable to connect to URL %s! %s", url, ex.getMessage());
+            return null;
+        }
+    }
+    
+    
+}
@@ -0,0 +1,72 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 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.players;
+
+import java.util.UUID;
+
+public abstract class GenericPlayer<T>{
+    
+    protected T player = null;
+    protected String name = null;
+    protected String version = null;
+    protected int protocol = -1;
+    protected boolean playedBefore = false;
+    protected boolean banned = false;
+    protected boolean whitelisted = false;
+    protected UUID uuid = null;
+    
+    public T getPlayer(){
+        return player;
+    }
+    
+    public String getName(){
+        return name;
+    }
+    
+    public int getProtocol(){
+        return protocol;
+    }
+    
+    public String getVersion(){
+        return version;
+    }
+    
+    public boolean hasPlayedBefore(){
+        return playedBefore;
+    }
+    
+    public boolean isBanned(){
+        return banned;
+    }
+    
+    public boolean isWhitelisted(){
+        return whitelisted;
+    }
+    
+    public UUID getUniqueId(){
+        return uuid;
+    }
+}
@@ -28,13 +28,12 @@ package ch.andre601.advancedserverlist.core.profiles.players;
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.profiles.replacer.EntryList;

-import java.io.ByteArrayInputStream;
+import java.io.BufferedWriter;
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
+import java.nio.file.StandardOpenOption;
 import java.util.List;
 import java.util.Map;
 import java.util.StringJoiner;
@@ -55,7 +54,6 @@ public class PlayerHandler{
            core.getPluginLogger().info("No cache.data present. Skipping...");
            return;
        }
-        
        List<String> lines;
        try{
            lines = Files.readAllLines(cache);
@@ -93,10 +91,14 @@ public class PlayerHandler{
        for(Map.Entry<String, String> entry : players){
            joiner.add(entry.getKey() + "=" + entry.getValue());
        }
-    
-        try(InputStream stream = new ByteArrayInputStream(joiner.toString().getBytes(StandardCharsets.UTF_8))){
-            Files.copy(stream, cache, StandardCopyOption.REPLACE_EXISTING);
-            core.getPluginLogger().info("Saved cache.data file.");
+        
+        try{
+            BufferedWriter writer = Files.newBufferedWriter(cache, StandardCharsets.UTF_8, StandardOpenOption.WRITE);
+            
+            writer.write(joiner.toString());
+            writer.close();
+            
+            core.getPluginLogger().info("Successfully saved cache.data file.");
        }catch(IOException ex){
            core.getPluginLogger().warn("Cannot save player data to cache.data file!", ex);
        }
@@ -41,7 +41,7 @@ public class EntryList<K, V> extends ArrayList<Map.Entry<K, V>>{
    
    public boolean containsKey(K key){
        for(Map.Entry<K, V> entry : this){
-            if(entry.getKey() == key)
+            if(entry.getKey().equals(key))
                return true;
        }
        return false;
@@ -25,42 +25,14 @@

 package ch.andre601.advancedserverlist.core.profiles.replacer;

-import java.util.Iterator;
 import java.util.Map;

-/*
- * Original by Imo van den Berge (aka Bergerkiller: https://github.com/Bergerkiller)
- *
- * Original Source: https://github.com/bergerhealer/BKCommonLib/blob/master/src/main/java/com/bergerkiller/bukkit/common/StringReplaceBundle.java
- */
 public class StringReplacer{
    
-    private final EntryList<String, Object> entries = new EntryList<>();
-    
-    public void add(String from, Object to){
-        if(from == null || to == null)
-            return;
-        
-        entries.add(from, to);
-    }
-    
-    public Object get(String from){
-        Iterator<Map.Entry<String, Object>> iterator = entries.iterator();
-        Map.Entry<String, Object> entry;
-        while(iterator.hasNext()){
-            entry = iterator.next();
-            if(entry.getKey().equals(from)){
-                iterator.remove();
-                return entry.getValue();
-            }
-        }
-        return null;
-    }
-    
-    public String replace(String input){
+    public static String replace(String input, Map<String, Object> replacements){
        StringBuilder output = new StringBuilder(input);
        int index;
-        for(Map.Entry<String, Object> entry : entries){
+        for(Map.Entry<String, Object> entry : replacements.entrySet()){
            index = 0;
            while((index = output.indexOf(entry.getKey(), index)) != -1){
                output.replace(index, index + entry.getKey().length(), String.valueOf(entry.getValue()));
@@ -23,14 +23,11 @@
 *
 */

-package ch.andre601.advancedserverlist.core.profiles.replacer;
+package ch.andre601.advancedserverlist.core.profiles.replacer.placeholders;

-public class Placeholders{
+import java.util.Map;
+
+public interface Placeholders{
    
-    public static final String PLAYERS_ONLINE = "${players online}";
-    public static final String PLAYERS_MAX    = "${players max}";
-    
-    public static final String PLAYER_NAME     = "${player name}";
-    public static final String PLAYER_PROTOCOL = "${player protocol}";
-    public static final String PLAYER_VERSION  = "${player version}";
+    Map<String, Object> getReplacements();
 }
@@ -0,0 +1,57 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 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.replacer.placeholders;
+
+import ch.andre601.advancedserverlist.core.profiles.players.GenericPlayer;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class PlayerPlaceholders implements Placeholders{
+    
+    private final Map<String, Object> replacements = new HashMap<>();
+    
+    public PlayerPlaceholders(GenericPlayer<?> player){
+        this.replacements.put("${player name}", player.getName());
+        this.replacements.put("${player protocol}", player.getProtocol());
+        
+        if(player.getVersion() != null)
+            this.replacements.put("${player version}", player.getVersion());
+        
+        if(player.getPlayer() == null)
+            return;
+        
+        this.replacements.put("${player hasPlayedBefore}", player.hasPlayedBefore());
+        this.replacements.put("${player isBanned}", player.isBanned());
+        this.replacements.put("${player isWhitelisted}", player.isWhitelisted());
+        this.replacements.put("${player uuid}", player.getUniqueId());
+    }
+    
+    @Override
+    public Map<String, Object> getReplacements(){
+        return replacements;
+    }
+}
@@ -0,0 +1,47 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 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.replacer.placeholders;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ServerPlaceholders implements Placeholders{
+    
+    private final Map<String, Object> replacements = new HashMap<>();
+    
+    public ServerPlaceholders(int online, int max, String host){
+        this.replacements.put("${server playersOnline}", online);
+        this.replacements.put("${server playersMax}", max);
+        
+        if(host != null)
+            this.replacements.put("${server host}", host);
+    }
+    
+    @Override
+    public Map<String, Object> getReplacements(){
+        return this.replacements;
+    }
+}
@@ -17,29 +17,73 @@ priority: 0

 #
 # Set the MOTD that should be displayed.
-# Can be removed or set to "motd: []" to not alter the MOTD.
+# Supports HEX colors for 1.16+ servers including gradients using MiniMessage's <gradient:color:color> format.
+# 
+# Remove this option or set it to motd: [] to not alter the MOTD.
 #
 # Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#motd
 #
 motd:
-  - 'Line 1'
-  - 'Line 2'
+  - '<grey>Line 1'
+  - '<grey>Line 2'
+
+#
+# Sets if players should be hidden.
+# When set to true will the player count be replaced with ???
+# Additionally will the options 'players' and 'playerCount' be ignored by the plugin.
+#
+# Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#hideplayers
+#
+hidePlayers: false

 #
 # Set the hover text that usually displays online players.
-# Can be removed or set to "players: []" to not alter the player list.
+# Only normal colours such as <grey> or <aqua> are supported.
+#
+# Remove this option or set it to players: [] to not alter the hover text.
 #
 # Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#players
 #
 players:
-  - 'Line 1'
-  - 'Line 2'
-  - 'Line 3'
+  - '<grey>Line 1'
+  - '<grey>Line 2'
+  - '<grey>Line 3'

 #
 # Set the text that usually shows online players and max that can join.
-# Can be removed or set to "playerCount: ''" to not alter the player count text.
+# Only normal colours such as <grey> or <aqua> are supported.
+#
+# Remove this option or set it to playerCount: '' to not alter the player count text.
 #
 # Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#playercount
 #
-playerCount: 'Text'
+playerCount: '<grey>Text'
+
+#
+# Allows you to override the default Favicon used by the Server/Proxy.
+# You can provide three specific inputs:
+# - A valid URL pointing to a PNG file.
+# - ${player name} for a per-player avatar being displayed (Uses mc-heads.net)
+# - Image file name (i.e. example.png) for a file in the "favicons" folder.
+#
+# NOTE:
+# - The favicon will be cached for 5 minutes to avoid spam and rate limits.
+# - BungeeCord/Waterfall may report issues that the plugin takes a long time to process.
+#   This is something I cannot really get improved without help.
+#
+# Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#favicon
+#
+favicon: ''
+
+#
+# When set to 0 or higher will alter the max player count to the online count + xMore.
+# Example: With 20 online players would 'xMore: 1' show 20/21 and 'xMore: 0' show 20/20
+#
+# Note that this will also manipulate the ${server playersMax} placeholder when used
+# in motd, players or playerCount.
+#
+# Remove this option or set it to -1 to not alter the max player count.
+#
+# Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#xmore
+#
+xMore: -1
@@ -76,7 +76,7 @@
        <dependency>
            <groupId>me.clip</groupId>
            <artifactId>placeholderapi</artifactId>
-            <version>2.11.1</version>
+            <version>2.11.2</version>
            <scope>provided</scope>
        </dependency>
    </dependencies>
@@ -0,0 +1,47 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 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.paper;
+
+import ch.andre601.advancedserverlist.core.profiles.players.GenericPlayer;
+import org.bukkit.OfflinePlayer;
+
+public class PaperPlayer extends GenericPlayer<OfflinePlayer>{
+    
+    public PaperPlayer(OfflinePlayer player, String name, int protocol){
+        this.player = player;
+        
+        this.name = player == null ? name : player.getName();
+        this.protocol = protocol;
+        
+        if(player == null)
+            return;
+        
+        this.playedBefore = player.hasPlayedBefore();
+        this.banned = player.isBanned();
+        this.whitelisted = player.isWhitelisted();
+        this.uuid = player.getUniqueId();
+    }
+}
@@ -28,7 +28,13 @@ package ch.andre601.advancedserverlist.paper.events;
 import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import ch.andre601.advancedserverlist.core.profiles.ProfileManager;
 import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
+import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
+import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
+import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.Placeholders;
+import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.PlayerPlaceholders;
+import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.ServerPlaceholders;
 import ch.andre601.advancedserverlist.paper.PaperCore;
+import ch.andre601.advancedserverlist.paper.PaperPlayer;
 import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
 import com.destroystokyo.paper.profile.PlayerProfile;
 import me.clip.placeholderapi.PlaceholderAPI;
@@ -36,12 +42,11 @@ import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
+import org.bukkit.util.CachedServerIcon;

+import java.awt.image.BufferedImage;
 import java.net.InetSocketAddress;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;

 public class PingEvent implements Listener{
    
@@ -55,36 +60,56 @@ public class PingEvent implements Listener{
    @EventHandler
    public void onServerPing(PaperServerListPingEvent event){
        InetSocketAddress address = event.getClient().getAddress();
-        Map<String, Object> replacements = plugin.getCore()
-            .loadPlaceholders(event.getClient().getProtocolVersion(), event.getNumPlayers(), event.getMaxPlayers(), address);
+        InetSocketAddress host = event.getClient().getVirtualHost();
+    
+        PaperPlayer player = resolvePlayer(address, event.getClient().getProtocolVersion());
+        
+        int online = event.getNumPlayers();
+        int max = event.getMaxPlayers();
+        
+        PlayerPlaceholders playerPlaceholders = new PlayerPlaceholders(player);
+        ServerPlaceholders serverPlaceholders = new ServerPlaceholders(online, max,  host == null ? null : host.getHostString());
        
        ServerListProfile profile = ProfileManager.get(plugin.getCore())
-            .replacements(replacements)
+            .replacements(playerPlaceholders)
+            .replacements(serverPlaceholders)
            .getProfile();
        
        if(profile == null)
            return;
        
-        OfflinePlayer player = resolvePlayer(address);
+        if(profile.getXMore() >= 0){
+            max = online + profile.getXMore();
+            event.setMaxPlayers(max);
+        }
+        
+        serverPlaceholders = new ServerPlaceholders(online, max,  host == null ? null : host.getHostString());
        
        if(!profile.getMotd().isEmpty()){
            event.motd(ComponentParser.list(profile.getMotd())
-                .replacements(replacements)
-                .function(text -> {
+                .replacements(playerPlaceholders)
+                .replacements(serverPlaceholders)
+                .modifyText(text -> {
                    if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
-                        return PlaceholderAPI.setPlaceholders(player, text);
+                        return PlaceholderAPI.setPlaceholders(player.getPlayer(), text);
                    
                    return text;
                })
                .toComponent());
        }
        
+        if(profile.shouldHidePlayers()){
+            event.setHidePlayers(true);
+            return;
+        }
+        
        if(!profile.getPlayerCount().isEmpty()){
            event.setVersion(ComponentParser.text(profile.getPlayerCount())
-                .replacements(replacements)
-                .function(text -> {
+                .replacements(playerPlaceholders)
+                .replacements(serverPlaceholders)
+                .modifyText(text -> {
                    if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
-                        return PlaceholderAPI.setPlaceholders(player, text);
+                        return PlaceholderAPI.setPlaceholders(player.getPlayer(), text);
    
                    return text;
                })
@@ -94,17 +119,35 @@ public class PingEvent implements Listener{
        
        if(!profile.getPlayers().isEmpty()){
            event.getPlayerSample().clear();
-            event.getPlayerSample().addAll(getPlayers(profile.getPlayers(), replacements, player));
+            
+            event.getPlayerSample().addAll(getPlayers(profile.getPlayers(), playerPlaceholders, serverPlaceholders, player.getPlayer()));
        }
        
-        event.setServerIcon(event.getServerIcon());
+        if(!profile.getFavicon().isEmpty()){
+            String favName = StringReplacer.replace(profile.getFavicon(), playerPlaceholders.getReplacements());
+            
+            BufferedImage img = new FaviconHandler(plugin.getCore(), favName).get().getAsBufferedImage();
+            if(img == null){
+                plugin.getPluginLogger().warn("Could not obtain valid Favicon to use.");
+                event.setServerIcon(event.getServerIcon());
+            }else{
+                try{
+                    CachedServerIcon favicon = Bukkit.loadServerIcon(img);
+                    event.setServerIcon(favicon);
+                }catch(Exception ex){
+                    plugin.getPluginLogger().warn("Unable to override Favicon. Reason: %s", ex.getMessage());
+                    event.setServerIcon(event.getServerIcon());
+                }
+            }
+        }
    }
    
-    private List<PlayerProfile> getPlayers(List<String> lines, Map<String, Object> replacements, OfflinePlayer player){
+    private List<PlayerProfile> getPlayers(List<String> lines, Placeholders playerPlaceholders, Placeholders serverPlaceholders, OfflinePlayer player){
        List<PlayerProfile> players = new ArrayList<>();
        lines.forEach(line -> players.add(Bukkit.createProfile(UUID.randomUUID(), ComponentParser.text(line)
-            .replacements(replacements)
-            .function(text -> {
+            .replacements(playerPlaceholders)
+            .replacements(serverPlaceholders)
+            .modifyText(text -> {
                if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
                    return PlaceholderAPI.setPlaceholders(player, text);
    
@@ -115,16 +158,16 @@ public class PingEvent implements Listener{
        return players;
    }
    
-    private OfflinePlayer resolvePlayer(InetSocketAddress address){
+    private PaperPlayer resolvePlayer(InetSocketAddress address, int protocol){
        String playerName = plugin.getCore().getPlayerHandler().getPlayerByIp(address.getHostString());
        OfflinePlayer player = Bukkit.getPlayerExact(playerName);
        
        if(player == null){
            player = Bukkit.getOfflinePlayer(playerName);
            
-            return player.hasPlayedBefore() ? player : null;
+            return new PaperPlayer(player.hasPlayedBefore() ? player : null, playerName, protocol);
        }
        
-        return player;
+        return new PaperPlayer(player, playerName, protocol);
    }
 }
@@ -44,8 +44,8 @@ public class PaperLogger implements PluginLogger{
    }
    
    @Override
-    public void warn(String msg){
-        logger.warning(msg);
+    public void warn(String msg, Object... args){
+        logger.warning(String.format(msg, args));
    }
    
    @Override
@@ -12,20 +12,9 @@
    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        
-        <plugin.version>1.0.3</plugin.version>
+        <plugin.version>1.5.0</plugin.version>
        <plugin.description>Create multiple Server lists based on conditions.</plugin.description>
        
-        <plugin.depend.mc>1.19-R0.1-SNAPSHOT</plugin.depend.mc>
-        <plugin.depend.velocity>3.1.1-SNAPSHOT</plugin.depend.velocity>
-        
-        <plugin.depend.configurate>4.1.2</plugin.depend.configurate>
-        
-        <plugin.depend.kyori-adventure>4.11.0</plugin.depend.kyori-adventure>
-        <plugin.depend.kyori-minimessage>4.11.0</plugin.depend.kyori-minimessage>
-        <plugin.depend.kyori-legacy>4.11.0</plugin.depend.kyori-legacy>
-        <plugin.depend.kyori-platform-bungeecord>4.1.0</plugin.depend.kyori-platform-bungeecord>
-        <plugin.depend.kyori-platform-bukkit>4.1.1</plugin.depend.kyori-platform-bukkit>
-        
        <maven.compiler.source>16</maven.compiler.source>
        <maven.compiler.target>16</maven.compiler.target>
    </properties>
@@ -68,13 +68,13 @@
        <dependency>
            <groupId>org.spigotmc</groupId>
            <artifactId>spigot-api</artifactId>
-            <version>${plugin.depend.mc}</version>
+            <version>1.19-R0.1-SNAPSHOT</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>net.kyori</groupId>
            <artifactId>adventure-platform-bukkit</artifactId>
-            <version>${plugin.depend.kyori-platform-bukkit}</version>
+            <version>4.1.2</version>
        </dependency>
        <dependency>
            <groupId>com.comphenix.protocol</groupId>
@@ -91,7 +91,7 @@
        <dependency>
            <groupId>me.clip</groupId>
            <artifactId>placeholderapi</artifactId>
-            <version>2.11.1</version>
+            <version>2.11.2</version>
            <scope>provided</scope>
        </dependency>
    </dependencies>
@@ -0,0 +1,47 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 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.spigot;
+
+import ch.andre601.advancedserverlist.core.profiles.players.GenericPlayer;
+import org.bukkit.OfflinePlayer;
+
+public class SpigotPlayer extends GenericPlayer<OfflinePlayer>{
+    
+    public SpigotPlayer(OfflinePlayer player, String name, int protocol){
+        this.player = player;
+        
+        this.name = player == null ? name : player.getName();
+        this.protocol = protocol;
+        
+        if(player == null)
+            return;
+        
+        this.playedBefore = player.hasPlayedBefore();
+        this.banned = player.isBanned();
+        this.whitelisted = player.isWhitelisted();
+        this.uuid = player.getUniqueId();
+    }
+}
@@ -28,7 +28,12 @@ package ch.andre601.advancedserverlist.spigot.events;
 import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import ch.andre601.advancedserverlist.core.profiles.ProfileManager;
 import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
+import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
+import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
+import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.PlayerPlaceholders;
+import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.ServerPlaceholders;
 import ch.andre601.advancedserverlist.spigot.SpigotCore;
+import ch.andre601.advancedserverlist.spigot.SpigotPlayer;
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolManager;
 import com.comphenix.protocol.events.ListenerPriority;
@@ -51,6 +56,8 @@ public class PingEvent implements Listener{
    private final SpigotCore plugin;
    private final ProtocolManager protocolManager;
    
+    private final Map<String, String> hostAddresses = new HashMap<>();
+    
    public PingEvent(SpigotCore plugin, ProtocolManager protocolManager){
        this.plugin = plugin;
        this.protocolManager = protocolManager;
@@ -59,6 +66,19 @@ public class PingEvent implements Listener{
    }
    
    private void loadPacketListener(SpigotCore spigotPlugin){
+        protocolManager.addPacketListener(new PacketAdapter(spigotPlugin, ListenerPriority.LOW, PacketType.Handshake.Client.SET_PROTOCOL){
+            @Override
+            public void onPacketReceiving(PacketEvent event){
+                InetSocketAddress address = event.getPlayer().getAddress();
+                if(address == null)
+                    return;
+                
+                String host = event.getPacket().getStrings().read(0);
+                
+                hostAddresses.put(address.getHostString(), host);
+            }
+        });
+        
        protocolManager.addPacketListener(new PacketAdapter(spigotPlugin, ListenerPriority.LOW, PacketType.Status.Server.SERVER_INFO){
            @Override
            public void onPacketSending(PacketEvent event){
@@ -66,25 +86,37 @@ public class PingEvent implements Listener{
                InetSocketAddress address = event.getPlayer().getAddress();
                if(address == null)
                    return;
+    
+                SpigotPlayer player = resolvePlayer(address, ping.getVersionProtocol());
                
-                Map<String, Object> replacements = spigotPlugin.getCore()
-                    .loadPlaceholders(ping.getVersionProtocol(), ping.getPlayersOnline(), ping.getPlayersMaximum(), address);
+                int online = ping.getPlayersOnline();
+                int max = ping.getPlayersMaximum();
+                
+                PlayerPlaceholders playerPlaceholders = new PlayerPlaceholders(player);
+                ServerPlaceholders serverPlaceholders = new ServerPlaceholders(online, max, hostAddresses.get(address.getHostString()));
                
                ServerListProfile profile = ProfileManager.get(spigotPlugin.getCore())
-                    .replacements(replacements)
+                    .replacements(playerPlaceholders)
+                    .replacements(serverPlaceholders)
                    .getProfile();
                
                if(profile == null)
                    return;
                
-                OfflinePlayer player = resolvePlayer(address);
+                if(profile.getXMore() >= 0){
+                    max = online + profile.getXMore();
+                    ping.setPlayersMaximum(max);
+                }
+                
+                serverPlaceholders = new ServerPlaceholders(online, max, hostAddresses.get(address.getHostString()));
                
                if(!profile.getMotd().isEmpty()){
                    Component component = ComponentParser.list(profile.getMotd())
-                        .replacements(replacements)
-                        .function(text -> {
+                        .replacements(playerPlaceholders)
+                        .replacements(serverPlaceholders)
+                        .modifyText(text -> {
                            if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
-                                return PlaceholderAPI.setPlaceholders(player, text);
+                                return PlaceholderAPI.setPlaceholders(player.getPlayer(), text);
                            
                            return text;
                        })
@@ -92,12 +124,18 @@ public class PingEvent implements Listener{
                    ping.setMotD(AdventureComponentConverter.fromComponent(component));
                }
                
+                if(profile.shouldHidePlayers()){
+                    ping.setPlayersVisible(false);
+                    return;
+                }
+                
                if(!profile.getPlayerCount().isEmpty()){
                    ping.setVersionName(ComponentParser.text(profile.getPlayerCount())
-                        .replacements(replacements)
-                        .function(text -> {
+                        .replacements(playerPlaceholders)
+                        .replacements(serverPlaceholders)
+                        .modifyText(text -> {
                            if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
-                                return PlaceholderAPI.setPlaceholders(player, text);
+                                return PlaceholderAPI.setPlaceholders(player.getPlayer(), text);
    
                            return text;
                        })
@@ -109,16 +147,35 @@ public class PingEvent implements Listener{
                if(!profile.getPlayers().isEmpty()){
                    ping.setPlayers(getFakePlayers(
                        ComponentParser.list(profile.getPlayers())
-                            .replacements(replacements)
-                            .function(text -> {
+                            .replacements(playerPlaceholders)
+                            .replacements(serverPlaceholders)
+                            .modifyText(text -> {
                                if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
-                                    return PlaceholderAPI.setPlaceholders(player, text);
+                                    return PlaceholderAPI.setPlaceholders(player.getPlayer(), text);
    
                                return text;
                            })
                            .toString()
                    ));
                }
+                
+                if(!profile.getFavicon().isEmpty()){
+                    String favName = StringReplacer.replace(profile.getFavicon(), playerPlaceholders.getReplacements());
+                    
+                    byte[] bytes = new FaviconHandler(spigotPlugin.getCore(), favName).get().getAsByteArray();
+                    if(bytes == null){
+                        spigotPlugin.getPluginLogger().warn("Could not obtain valid Favicon to use.");
+                        ping.setFavicon(ping.getFavicon());
+                    }else{
+                        try{
+                            WrappedServerPing.CompressedImage favicon = WrappedServerPing.CompressedImage.fromPng(bytes);
+                            ping.setFavicon(favicon);
+                        }catch(Exception ex){
+                            spigotPlugin.getPluginLogger().warn("Unable to override Favicon. Reason: %s", ex.getMessage());
+                            ping.setFavicon(ping.getFavicon());
+                        }
+                    }
+                }
            }
        });
    }
@@ -134,7 +191,7 @@ public class PingEvent implements Listener{
        return profiles;
    }
    
-    private OfflinePlayer resolvePlayer(InetSocketAddress address){
+    private SpigotPlayer resolvePlayer(InetSocketAddress address, int protocol){
        String playerName = plugin.getCore().getPlayerHandler().getPlayerByIp(address.getHostString());
        OfflinePlayer player = Bukkit.getPlayerExact(playerName);
        
@@ -142,9 +199,9 @@ public class PingEvent implements Listener{
            //noinspection deprecation
            player = Bukkit.getOfflinePlayer(playerName);
            
-            return player.hasPlayedBefore() ? player : null;
+            return new SpigotPlayer(player.hasPlayedBefore() ? player : null, playerName, protocol);
        }
        
-        return player;
+        return new SpigotPlayer(player, playerName, protocol);
    }
 }
@@ -44,8 +44,8 @@ public class SpigotLogger implements PluginLogger{
    }
    
    @Override
-    public void warn(String msg){
-        logger.warning(msg);
+    public void warn(String msg, Object... args){
+        logger.warning(String.format(msg, args));
    }
    
    @Override
@@ -8,11 +8,11 @@ main: 'ch.andre601.advancedserverlist.spigot.SpigotCore'
 api-version: 1.19

 libraries:
-  - 'org.spongepowered:configurate-yaml:${plugin.depend.configurate}'
-  - 'net.kyori:adventure-api:${plugin.depend.kyori-adventure}'
-  - 'net.kyori:adventure-text-minimessage:${plugin.depend.kyori-minimessage}'
-  - 'net.kyori:adventure-text-serializer-legacy:${plugin.depend.kyori-legacy}'
-  - 'net.kyori:adventure-platform-bukkit:${plugin.depend.kyori-platform-bukkit}'
+  - 'org.spongepowered:configurate-yaml:4.1.2'
+  - 'net.kyori:adventure-api:4.11.0'
+  - 'net.kyori:adventure-text-minimessage:4.11.0'
+  - 'net.kyori:adventure-text-serializer-legacy:4.11.0'
+  - 'net.kyori:adventure-platform-bukkit:4.1.2'

 softdepend:
  - 'ProtocolLib'
@@ -35,6 +35,8 @@
    <modelVersion>4.0.0</modelVersion>

    <artifactId>velocity</artifactId>
+    <packaging>jar</packaging>
+    <version>${plugin.version}</version>

    <properties>
        <maven.compiler.source>16</maven.compiler.source>
@@ -0,0 +1,39 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 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.velocity;
+
+import ch.andre601.advancedserverlist.core.profiles.players.GenericPlayer;
+import com.velocitypowered.api.network.ProtocolVersion;
+import com.velocitypowered.api.proxy.Player;
+
+public class VelocityPlayer extends GenericPlayer<Player>{
+    
+    public VelocityPlayer(String name, int protocol){
+        this.name = name;
+        this.protocol = protocol;
+        this.version = ProtocolVersion.getProtocolVersion(protocol).getVersionIntroducedIn();
+    }
+}
@@ -29,17 +29,21 @@ import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import ch.andre601.advancedserverlist.core.profiles.ProfileManager;
 import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
-import ch.andre601.advancedserverlist.core.profiles.replacer.Placeholders;
+import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
+import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
+import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.PlayerPlaceholders;
+import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.ServerPlaceholders;
 import ch.andre601.advancedserverlist.velocity.VelocityCore;
+import ch.andre601.advancedserverlist.velocity.VelocityPlayer;
 import com.velocitypowered.api.event.PostOrder;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.proxy.ProxyPingEvent;
-import com.velocitypowered.api.network.ProtocolVersion;
 import com.velocitypowered.api.proxy.server.ServerPing;
+import com.velocitypowered.api.util.Favicon;

+import java.awt.image.BufferedImage;
 import java.net.InetSocketAddress;
 import java.util.List;
-import java.util.Map;

 public class PingEvent{
    
@@ -58,40 +62,62 @@ public class PingEvent{
            return;
    
        ServerPing.Builder builder = ping.asBuilder();
-        InetSocketAddress address = event.getConnection().getRemoteAddress();
+        String playerName = plugin.getCore().getPlayerHandler().getPlayerByIp(event.getConnection().getRemoteAddress().getHostString());
+        InetSocketAddress host = event.getConnection().getVirtualHost().orElse(null);
        
-        Map<String, Object> replacements = plugin.getCore()
-            .loadPlaceholders(protocol.getProtocol(), builder.getOnlinePlayers(), builder.getMaximumPlayers(), address);
-        replacements.put(Placeholders.PLAYER_VERSION, ProtocolVersion.getProtocolVersion(protocol.getProtocol()));
+        int online = builder.getOnlinePlayers();
+        int max = builder.getMaximumPlayers();
+        
+        PlayerPlaceholders playerPlaceholders = new PlayerPlaceholders(new VelocityPlayer(playerName, protocol.getProtocol()));
+        ServerPlaceholders serverPlaceholders = new ServerPlaceholders(online, max, host == null ? null : host.getHostString());
        
        ServerListProfile profile = ProfileManager.get(plugin.getCore())
-            .replacements(replacements)
+            .replacements(playerPlaceholders)
+            .replacements(serverPlaceholders)
            .getProfile();
        
        if(profile == null)
            return;
        
+        if(profile.getXMore() >= 0){
+            max = online + profile.getXMore();
+            builder.maximumPlayers(max);
+        }
+        
+        serverPlaceholders = new ServerPlaceholders(online, max, host == null ? null : host.getHostString());
+        
        if(!profile.getMotd().isEmpty()){
            List<String> motd = profile.getMotd();
            builder.description(ComponentParser.list(motd)
-                .replacements(replacements)
+                .replacements(playerPlaceholders)
+                .replacements(serverPlaceholders)
                .toComponent()
            );
        }
        
+        if(profile.shouldHidePlayers()){
+            builder.nullPlayers();
+            
+            event.setPing(builder.build());
+            return;
+        }
+        
        if(!profile.getPlayerCount().isEmpty()){
            builder.version(new ServerPing.Version(
                -1, 
                ComponentParser.text(profile.getPlayerCount())
-                    .replacements(replacements)
+                    .replacements(playerPlaceholders)
+                    .replacements(serverPlaceholders)
                    .toString()
            ));
        }
        
        if(!profile.getPlayers().isEmpty()){
            String players = ComponentParser.list(profile.getPlayers())
-                .replacements(replacements)
+                .replacements(playerPlaceholders)
+                .replacements(serverPlaceholders)
                .toString();
+            
            ServerPing.SamplePlayer[] playerSamples = AdvancedServerList.getPlayers(ServerPing.SamplePlayer.class, players)
                .toArray(new ServerPing.SamplePlayer[0]);
            
@@ -99,6 +125,21 @@ public class PingEvent{
                builder.clearSamplePlayers().samplePlayers(playerSamples);
        }
        
+        if(!profile.getFavicon().isEmpty()){
+            String favName = StringReplacer.replace(profile.getFavicon(), playerPlaceholders.getReplacements());
+            
+            BufferedImage img = new FaviconHandler(plugin.getCore(), favName).get().getAsBufferedImage();
+            if(img == null){
+                plugin.getPluginLogger().warn("Could not obtain valid Favicon to use.");
+            }else{
+                try{
+                    Favicon favicon = Favicon.create(img);
+                    builder.favicon(favicon);
+                }catch(Exception ex){
+                    plugin.getPluginLogger().warn("Unable to override Favicon. Reason: %s", ex.getMessage());}
+            }
+        }
+        
        event.setPing(builder.build());
    }
 }
@@ -38,12 +38,12 @@ public class VelocityLogger implements PluginLogger{
    
    @Override
    public void info(String msg, Object... args){
-        logger.info(msg, args);
+        logger.info(String.format(msg, args));
    }
    
    @Override
-    public void warn(String msg){
-        logger.warn(msg);
+    public void warn(String msg, Object... args){
+        logger.warn(String.format(msg, args));
    }
    
    @Override
Author	SHA1	Message	Date
Andre_601	0d84335db9	Merge pull request #9 from Andre601/feature/favicon-support Add Favicon support for Server list profiles.	2022-08-21 23:32:46 +02:00
Andre601	50f878e39c	Add assets	2022-08-21 23:30:59 +02:00
Andre601	b88ee87c96	Add notes to favicon setting	2022-08-21 23:28:11 +02:00
Andre601	a5f6e689f0	Shade in Caffeine	2022-08-21 01:31:20 +02:00
Andre601	dd0bc8a43a	Cache the bytes array	2022-08-20 23:53:32 +02:00
Andre601	563362504f	Use some kind of caching... I guess?	2022-08-20 23:43:55 +02:00
Andre601	bd95be080e	Add missing profile comments	2022-08-18 16:11:04 +02:00
Andre601	2d02d48d3c	Add Favicon support for Server list profiles.	2022-08-18 16:05:00 +02:00
Andre_601	15f7b5def3	Update README.md	2022-08-18 00:02:49 +02:00
Andre_601	f37813d5b7	Merge pull request #8 from Andre601/feature/xMore-option Add xMore profile option	2022-08-17 21:26:17 +02:00
Andre601	93c2dda56b	Add xMore profile option	2022-08-17 21:19:38 +02:00
Andre601	55f5132b37	Add oneMore profile option.	2022-08-17 13:55:25 +02:00
Andre_601	f1e48c2a9c	Update README.md	2022-08-14 22:08:18 +02:00
Andre_601	de01db4c12	Update README.md	2022-08-12 00:51:51 +02:00
Andre_601	eefb2b44dd	Doesn't work	2022-08-12 00:39:16 +02:00
Andre_601	799d06dee1	Add files via upload	2022-08-12 00:38:19 +02:00
Andre_601	b9338a43e0	Create tmp	2022-08-12 00:38:03 +02:00
Andre601	c89c5f0b49	Make naming bit more consistent	2022-08-04 22:06:39 +02:00
Andre601	1fac910ca1	Keep BufferedWriter at default cache size	2022-08-04 22:04:13 +02:00
Andre601	69061f1a75	Bump version	2022-08-04 22:01:30 +02:00
Andre_601	0d93dcf00d	Merge pull request #6 from Andre601/feature/better-placeholder-handling Better placeholder handling (Hopefully)	2022-08-04 22:00:09 +02:00
Andre601	bb2828e47d	Use a BufferedWriter for cache file saving.	2022-08-04 21:58:06 +02:00
Andre601	cdcc872f3a	Improve a bit	2022-08-04 20:57:39 +02:00
Andre601	f9192001ba	Better placeholder handling (Hopefully)	2022-08-04 18:23:17 +02:00
Andre_601	0bd92862db	Update README.md	2022-08-04 14:52:19 +02:00
Andre_601	773fbb55c3	Update README.md	2022-08-04 14:50:59 +02:00
Andre_601	ad4c69a269	Merge pull request #5 from Andre601/dependabot/maven/spigot/me.clip-placeholderapi-2.11.2 Bump placeholderapi from 2.11.1 to 2.11.2 in /spigot	2022-08-04 13:24:42 +02:00
Andre_601	b7a2599178	Merge pull request #4 from Andre601/dependabot/maven/paper/me.clip-placeholderapi-2.11.2 Bump placeholderapi from 2.11.1 to 2.11.2 in /paper	2022-08-04 13:24:21 +02:00
dependabot[bot]	bd279d3673	Bump placeholderapi from 2.11.1 to 2.11.2 in /spigot Bumps placeholderapi from 2.11.1 to 2.11.2. --- updated-dependencies: - dependency-name: me.clip:placeholderapi dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-08-04 11:21:00 +00:00
dependabot[bot]	5882372ce6	Bump placeholderapi from 2.11.1 to 2.11.2 in /paper Bumps placeholderapi from 2.11.1 to 2.11.2. --- updated-dependencies: - dependency-name: me.clip:placeholderapi dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2022-08-04 11:20:29 +00:00
Andre_601	55d74f1abe	Create dependabot.yml	2022-08-04 13:17:50 +02:00
Andre_601	0056a0e958	Delete dependabot.yml	2022-08-04 13:15:04 +02:00
Andre_601	06396a1622	Create dependabot.yml	2022-08-03 22:57:29 +02:00
Andre601	8d7df60398	Update dependencies	2022-08-03 22:43:36 +02:00
Andre_601	6392929298	Merge pull request #3 from Andre601/feature/further-condition-improvements Further improvements of condition parsing	2022-08-03 13:37:03 +02:00
Andre601	0f7fb9b180	Better message	2022-08-02 23:00:54 +02:00
Andre601	4b24da8409	Further improve condition handling	2022-08-02 22:59:08 +02:00
Andre_601	afc32da0c3	Update README.md	2022-08-02 02:59:50 +02:00
Andre_601	6aaa169a86	Merge pull request #2 from Andre601/feature/improved-condition-parsing Better condition parsing	2022-08-02 01:44:00 +02:00
Andre601	091a97076e	Fix inverted check and add hidePlayers option	2022-08-02 01:43:37 +02:00
Andre601	d79733cafc	Pushing changes recommended by @bergerkiller and @bbayu123	2022-08-02 00:56:54 +02:00
Andre601	99793f5c8a	Get rid of ConditionsHolder in favour of Expression	2022-08-01 23:41:07 +02:00
Andre601	8d3cd980cf	Move ConditionsHolder and Expression to own folder	2022-08-01 23:25:17 +02:00
Andre601	3e40ad34ab	Better condition parsing	2022-08-01 23:18:33 +02:00
Andre601	356bc09c09	Version 1.1.0 - Add ${server host} placeholder to show the pinged server address - Improved Placeholders class - Improved StringReplacer to have a static method instead of constantly making new instances. - Update default.yml with better examples and descriptions.	2022-07-27 16:28:00 +02:00