Make naming bit more consistent

Better placeholder handling (Hopefully)

.github/dependabot.yml

@@ -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'

README.md

@@ -1,11 +1,10 @@
 <!-- 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=
+[tested]: https://img.shields.io/badge/Tested%20Versions-1.19%20%7C%201.19.1-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
@@ -16,7 +15,6 @@
 [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
@@ -36,7 +34,7 @@ AdvancedServerList is a server and proxy plugin that allows you to create custom
 
 You can download AdvancedServerList on the following locations:
 
-[![download modrinth]][modrinth] [![download spigot]][spigot] [![download hangar]][hangar] [![download github]][github]
+[![download modrinth]][modrinth] [![download spigot]][spigot] [![download hangar]][hangar]
 
 ## Features
 

bungeecord/pom.xml

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

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

@@ -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;
+    }
+}

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/events/BungeeEventInfo.java

@@ -0,0 +1,38 @@
+/*
+ * 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.events;
+
+import ch.andre601.advancedserverlist.core.generics.GenericEventInfo;
+import net.md_5.bungee.api.ServerPing;
+
+public class BungeeEventInfo extends GenericEventInfo{
+    
+    public BungeeEventInfo(ServerPing ping, String host){
+        this.playersOnline = ping.getPlayers().getOnline();
+        this.playersMax = ping.getPlayers().getMax();
+        this.host = host;
+    }
+}

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

@@ -26,11 +26,13 @@
 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.replacer.Placeholders;
+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.ServerPing;
 import net.md_5.bungee.api.chat.TextComponent;
@@ -60,16 +62,15 @@ public class PingEvent implements Listener{
     
         InetSocketAddress address = (InetSocketAddress)event.getConnection().getSocketAddress();
         InetSocketAddress host = event.getConnection().getVirtualHost();
-        Map<String, Object> replacements = Placeholders.get(plugin.getCore())
-            .withProtocol(protocol.getProtocol())
-            .withPlayersOnline(ping.getPlayers().getOnline())
-            .withPlayersMax(ping.getPlayers().getMax())
-            .withPlayerName(address)
-            .withHostAddress(host)
-            .getReplacements();
+    
+        PlayerPlaceholders playerPlaceholders = new PlayerPlaceholders(
+            new BungeePlayer(plugin.getCore().getPlayerHandler().getPlayerByIp(address.getHostString()), protocol.getProtocol())
+        );
+        ServerPlaceholders serverPlaceholders = new ServerPlaceholders(new BungeeEventInfo(ping, host == null ? null : host.getHostString()));
         
         ServerListProfile profile = ProfileManager.get(plugin.getCore())
-            .replacements(replacements)
+            .replacements(playerPlaceholders)
+            .replacements(serverPlaceholders)
             .getProfile();
         
         if(profile == null)
@@ -78,7 +79,8 @@ public class PingEvent implements Listener{
         if(!profile.getMotd().isEmpty()){
             TextComponent component = new TextComponent(BungeeComponentSerializer.get().serialize(
                 ComponentParser.list(profile.getMotd())
-                    .replacements(replacements)
+                    .replacements(playerPlaceholders)
+                    .replacements(serverPlaceholders)
                     .toComponent()
             ));
             
@@ -97,7 +99,8 @@ public class PingEvent implements Listener{
         
         if(!profile.getPlayerCount().isEmpty()){
             protocol.setName(ComponentParser.text(profile.getPlayerCount())
-                .replacements(replacements)
+                .replacements(playerPlaceholders)
+                .replacements(serverPlaceholders)
                 .toString()
             );
             protocol.setProtocol(-1);
@@ -105,7 +108,8 @@ 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)

core/pom.xml

@@ -47,22 +47,22 @@
         <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>
     </dependencies>
 

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

@@ -29,7 +29,9 @@ 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.profiles.players.GenericPlayer;
 import ch.andre601.advancedserverlist.core.profiles.players.PlayerHandler;
+import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.PlayerPlaceholders;
 
 import java.io.IOException;
 import java.io.InputStream;

core/src/main/java/ch/andre601/advancedserverlist/core/generics/GenericEventInfo.java

@@ -0,0 +1,45 @@
+/*
+ * 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.generics;
+
+public abstract class GenericEventInfo{
+    
+    protected int playersOnline = -1;
+    protected int playersMax = -1;
+    protected String host = null;
+    
+    public int getPlayersOnline(){
+        return playersOnline;
+    }
+    
+    public int getPlayersMax(){
+        return playersMax;
+    }
+    
+    public String getHost(){
+        return host;
+    }
+}

core/src/main/java/ch/andre601/advancedserverlist/core/parsing/ComponentParser.java

@@ -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;
@@ -58,8 +59,8 @@ public class ComponentParser{
         return new ComponentParser(String.join("\n", lines));
     }
     
-    public ComponentParser replacements(Map<String, Object> replacements){
-        text = StringReplacer.replace(text, replacements);
+    public ComponentParser replacements(Placeholders placeholders){
+        text = StringReplacer.replace(text, placeholders.getReplacements());
         return this;
     }
     

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

@@ -26,6 +26,7 @@
 package ch.andre601.advancedserverlist.core.profiles;
 
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
+import ch.andre601.advancedserverlist.core.profiles.replacer.placeholders.Placeholders;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -34,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;
@@ -44,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;
     }
     

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

@@ -28,6 +28,7 @@ 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{
     

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

@@ -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;
+    }
+}

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

@@ -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.FileWriter;
 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.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,15 @@ 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{
+            FileWriter file = new FileWriter(cache.toFile(), StandardCharsets.UTF_8, false);
+            BufferedWriter writer = new BufferedWriter(file);
+            
+            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);
         }

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/replacer/EntryList.java

@@ -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;

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/replacer/Placeholders.java

@@ -1,93 +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.replacer;
-
-import ch.andre601.advancedserverlist.core.AdvancedServerList;
-
-import java.net.InetSocketAddress;
-import java.util.HashMap;
-import java.util.Map;
-
-public class Placeholders{
-    
-    private final AdvancedServerList core;
-    private final Map<String, Object> replacements;
-    
-    public Placeholders(AdvancedServerList core){
-        this.core = core;
-        this.replacements = new HashMap<>();
-    }
-    
-    public static Placeholders get(AdvancedServerList core){
-        return new Placeholders(core);
-    }
-    
-    
-    public Placeholders withProtocol(int protocol){
-        this.replacements.put("${player protocol}", protocol);
-        return this;
-    }
-    
-    public Placeholders withPlayersOnline(int online){
-        this.replacements.put("${players online}", online);
-        return this;
-    }
-    
-    public Placeholders withPlayersMax(int max){
-        this.replacements.put("${players max}", max);
-        return this;
-    }
-    
-    public Placeholders withPlayerName(InetSocketAddress playerAddress){
-        if(playerAddress != null) 
-            this.replacements.put("${player name}", core.getPlayerHandler().getPlayerByIp(playerAddress.getHostString()));
-        
-        return this;
-    }
-    
-    public Placeholders withHostAddress(InetSocketAddress hostAddress){
-        if(hostAddress != null)
-            this.replacements.put("${server host}", hostAddress.getHostString());
-        
-        return this;
-    }
-    
-    public Placeholders withHostAddress(String hostAddress){
-        if(hostAddress != null) 
-            this.replacements.put("${server host}", hostAddress);
-        
-        return this;
-    }
-    
-    public Placeholders withPlayerVersion(String version){
-        this.replacements.put("${player version}", version);
-        return this;
-    }
-    
-    public Map<String, Object> getReplacements(){
-        return replacements;
-    }
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/replacer/placeholders/Placeholders.java

@@ -0,0 +1,33 @@
+/*
+ * 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.Map;
+
+public interface Placeholders{
+    
+    Map<String, Object> getReplacements();
+}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/replacer/placeholders/PlayerPlaceholders.java

@@ -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;
+    }
+}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/replacer/placeholders/ServerPlaceholders.java

@@ -0,0 +1,49 @@
+/*
+ * 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.generics.GenericEventInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ServerPlaceholders implements Placeholders{
+    
+    private final Map<String, Object> replacements = new HashMap<>();
+    
+    public ServerPlaceholders(GenericEventInfo info){
+        this.replacements.put("${server playersOnline}", info.getPlayersOnline());
+        this.replacements.put("${server playersMax}", info.getPlayersMax());
+        
+        if(info.getHost() != null)
+            this.replacements.put("${server host}", info.getHost());
+    }
+    
+    @Override
+    public Map<String, Object> getReplacements(){
+        return this.replacements;
+    }
+}

paper/pom.xml

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

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

@@ -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();
+    }
+}

paper/src/main/java/ch/andre601/advancedserverlist/paper/events/PaperEventInfo.java

@@ -0,0 +1,38 @@
+/*
+ * 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.events;
+
+import ch.andre601.advancedserverlist.core.generics.GenericEventInfo;
+import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
+
+public class PaperEventInfo extends GenericEventInfo{
+    
+    public PaperEventInfo(PaperServerListPingEvent event, String host){
+        this.playersOnline = event.getNumPlayers();
+        this.playersMax = event.getMaxPlayers();
+        this.host = host;
+    }
+}

paper/src/main/java/ch/andre601/advancedserverlist/paper/events/PingEvent.java

@@ -28,8 +28,11 @@ 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.replacer.Placeholders;
+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;
@@ -39,10 +42,7 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
 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{
     
@@ -57,29 +57,27 @@ public class PingEvent implements Listener{
     public void onServerPing(PaperServerListPingEvent event){
         InetSocketAddress address = event.getClient().getAddress();
         InetSocketAddress host = event.getClient().getVirtualHost();
-        Map<String, Object> replacements = Placeholders.get(plugin.getCore())
-            .withProtocol(event.getClient().getProtocolVersion())
-            .withPlayersOnline(event.getNumPlayers())
-            .withPlayersMax(event.getMaxPlayers())
-            .withPlayerName(address)
-            .withHostAddress(host)
-            .getReplacements();
+    
+        PaperPlayer player = resolvePlayer(address, event.getClient().getProtocolVersion());
+        
+        PlayerPlaceholders playerPlaceholders = new PlayerPlaceholders(player);
+        ServerPlaceholders serverPlaceholders = new ServerPlaceholders(new PaperEventInfo(event, 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.getMotd().isEmpty()){
             event.motd(ComponentParser.list(profile.getMotd())
-                .replacements(replacements)
+                .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;
                 })
@@ -93,10 +91,11 @@ public class PingEvent implements Listener{
         
         if(!profile.getPlayerCount().isEmpty()){
             event.setVersion(ComponentParser.text(profile.getPlayerCount())
-                .replacements(replacements)
+                .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;
                 })
@@ -106,16 +105,18 @@ 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());
     }
     
-    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)
+            .replacements(playerPlaceholders)
+            .replacements(serverPlaceholders)
             .modifyText(text -> {
                 if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
                     return PlaceholderAPI.setPlaceholders(player, text);
@@ -127,16 +128,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);
     }
 }

pom.xml

@@ -12,20 +12,9 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         
-        <plugin.version>1.2.0</plugin.version>
+        <plugin.version>1.2.2</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>

spigot/pom.xml

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

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

@@ -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();
+    }
+}

spigot/src/main/java/ch/andre601/advancedserverlist/spigot/events/PingEvent.java

@@ -28,8 +28,10 @@ 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.replacer.Placeholders;
+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;
@@ -82,32 +84,27 @@ public class PingEvent implements Listener{
                 InetSocketAddress address = event.getPlayer().getAddress();
                 if(address == null)
                     return;
-                
-                Map<String, Object> replacements = Placeholders.get(spigotPlugin.getCore())
-                    .withProtocol(ping.getVersionProtocol())
-                    .withPlayersOnline(ping.getPlayersOnline())
-                    .withPlayersMax(ping.getPlayersMaximum())
-                    .withPlayerName(address)
-                    .withHostAddress(hostAddresses.get(address.getHostString()))
-                    .getReplacements();
     
-                spigotPlugin.getPluginLogger().info(hostAddresses.get(address.getHostString()));
+                SpigotPlayer player = resolvePlayer(address, ping.getVersionProtocol());
+                
+                PlayerPlaceholders playerPlaceholders = new PlayerPlaceholders(player);
+                ServerPlaceholders serverPlaceholders = new ServerPlaceholders(new ProtocolLibEventInfo(ping, 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.getMotd().isEmpty()){
                     Component component = ComponentParser.list(profile.getMotd())
-                        .replacements(replacements)
+                        .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;
                         })
@@ -122,10 +119,11 @@ public class PingEvent implements Listener{
                 
                 if(!profile.getPlayerCount().isEmpty()){
                     ping.setVersionName(ComponentParser.text(profile.getPlayerCount())
-                        .replacements(replacements)
+                        .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;
                         })
@@ -137,10 +135,11 @@ public class PingEvent implements Listener{
                 if(!profile.getPlayers().isEmpty()){
                     ping.setPlayers(getFakePlayers(
                         ComponentParser.list(profile.getPlayers())
-                            .replacements(replacements)
+                            .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;
                             })
@@ -162,7 +161,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);
         
@@ -170,9 +169,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);
     }
 }

spigot/src/main/java/ch/andre601/advancedserverlist/spigot/events/ProtocolLibEventInfo.java

@@ -0,0 +1,38 @@
+/*
+ * 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.events;
+
+import ch.andre601.advancedserverlist.core.generics.GenericEventInfo;
+import com.comphenix.protocol.wrappers.WrappedServerPing;
+
+public class ProtocolLibEventInfo extends GenericEventInfo{
+    
+    public ProtocolLibEventInfo(WrappedServerPing ping, String host){
+        this.playersOnline = ping.getPlayersOnline();
+        this.playersMax = ping.getPlayersMaximum();
+        this.host = host;
+    }
+}

velocity/pom.xml

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

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

@@ -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();
+    }
+}

velocity/src/main/java/ch/andre601/advancedserverlist/velocity/events/PingEvent.java

@@ -29,8 +29,10 @@ 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.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;
@@ -61,17 +63,14 @@ public class PingEvent{
         InetSocketAddress address = event.getConnection().getRemoteAddress();
         InetSocketAddress host = event.getConnection().getVirtualHost().orElse(null);
         
-        Map<String, Object> replacements = Placeholders.get(plugin.getCore())
-            .withProtocol(protocol.getProtocol())
-            .withPlayersOnline(builder.getOnlinePlayers())
-            .withPlayersMax(builder.getMaximumPlayers())
-            .withPlayerName(address)
-            .withHostAddress(host)
-            .withPlayerVersion(ProtocolVersion.getProtocolVersion(protocol.getProtocol()).toString())
-            .getReplacements();
+        PlayerPlaceholders playerPlaceholders = new PlayerPlaceholders(
+            new VelocityPlayer(plugin.getCore().getPlayerHandler().getPlayerByIp(address.getHostString()), protocol.getProtocol())
+        );
+        ServerPlaceholders serverPlaceholders = new ServerPlaceholders(new VelocityEventInfo(builder, host == null ? null : host.getHostString()));
         
         ServerListProfile profile = ProfileManager.get(plugin.getCore())
-            .replacements(replacements)
+            .replacements(playerPlaceholders)
+            .replacements(serverPlaceholders)
             .getProfile();
         
         if(profile == null)
@@ -80,7 +79,8 @@ public class PingEvent{
         if(!profile.getMotd().isEmpty()){
             List<String> motd = profile.getMotd();
             builder.description(ComponentParser.list(motd)
-                .replacements(replacements)
+                .replacements(playerPlaceholders)
+                .replacements(serverPlaceholders)
                 .toComponent()
             );
         }
@@ -96,14 +96,16 @@ public class PingEvent{
             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)

velocity/src/main/java/ch/andre601/advancedserverlist/velocity/events/VelocityEventInfo.java

@@ -0,0 +1,38 @@
+/*
+ * 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.events;
+
+import ch.andre601.advancedserverlist.core.generics.GenericEventInfo;
+import com.velocitypowered.api.proxy.server.ServerPing;
+
+public class VelocityEventInfo extends GenericEventInfo{
+    
+    public VelocityEventInfo(ServerPing.Builder builder, String host){
+        this.playersOnline = builder.getOnlinePlayers();
+        this.playersMax = builder.getMaximumPlayers();
+        this.host = host;
+    }
+}