Compare commits

...
168 Commits
Author SHA1 Message Date
Andre601 3f224504a1 Bump version to 5.7.1 2026-01-01 20:36:18 +01:00
Andre601 437e155a46 Fix NPE for '/asl profiles set' command due to no CommandType meta being added. 2026-01-01 17:59:11 +01:00
Andre601 8275069315 Merge pull request 'Update dependency com.viaversion:viaversion-api to v5.7.0' (#536) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/536
2025-12-30 13:07:38 +01:00
Andre601's Bot bd564a8638 Update dependency com.viaversion:viaversion-api to v5.7.0 2025-12-30 12:02:26 +00:00
Andre601 591279f70b Merge pull request 'Update dependency ch.qos.logback:logback-classic to v1.5.23' (#535) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/535
2025-12-22 13:15:18 +01:00
Andre601's Bot 80e84aa41b Update dependency ch.qos.logback:logback-classic to v1.5.23 2025-12-22 12:11:31 +00:00
Andre601 9024c4dc71 Merge pull request 'Update all non-major dependencies to v1.7.3' (#534) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/534
2025-12-21 13:10:53 +01:00
Andre601's Bot bb0f389016 Update all non-major dependencies to v1.7.3 2025-12-21 12:02:21 +00:00
Andre601 f8f8a45b1a Merge pull request 'Update all non-major dependencies' (#533) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/533
2025-12-20 13:54:48 +01:00
Andre601's Bot 0bae24bb66 Update all non-major dependencies 2025-12-20 12:02:32 +00:00
Andre601 2158caebe6 Fix bad cloud versions 2025-12-19 22:24:04 +01:00
Andre601 f9ea253da3 Add MiniPlaceholders as optional dependency 2025-12-19 22:06:03 +01:00
Andre601 7c53ddf4f4 Fix wrong value for dateFormat.parse 2025-12-19 21:56:16 +01:00
Andre601 8bcc88d620 Bump version to 5.7.0 2025-12-19 21:38:17 +01:00
Andre601 78b687587d Merge pull request 'Add bluesky Post step to publish_assets.yml' (#385) from feature/bluesky-poster into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/385
2025-12-19 21:36:53 +01:00
Andre601 168fe364b0 Looooooots of changes 2025-12-19 21:18:31 +01:00
Andre601 cd3f54dba6 Merge pull request 'Update all non-major dependencies' (#532) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/532
2025-12-18 13:08:30 +01:00
Andre601's Bot 79f15b2467 Update all non-major dependencies 2025-12-18 12:03:21 +00:00
Andre601 ade8ad5a33 Merge pull request 'Update all non-major dependencies' (#531) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/531
2025-12-14 21:25:07 +01:00
Andre601's Bot 6e343f1516 Update all non-major dependencies 2025-12-13 12:03:22 +00:00
Andre601 fee436fda6 Update links in default.yml 2025-12-09 23:59:37 +01:00
Andre601 27d4f5acd0 Merge pull request 'Update https://code.forgejo.org/actions/checkout action to v6' (#527) from renovate/https-code.forgejo.org-actions-checkout-6.x into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/527
2025-11-21 13:16:03 +01:00
Andre601's Bot e18c70d446 Update https://code.forgejo.org/actions/checkout action to v6 2025-11-21 12:02:31 +00:00
Andre601 0ca3ec62a9 Merge pull request 'Update dependency com.squareup.okhttp3:okhttp-jvm to v5.3.2' (#526) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/526
2025-11-19 13:21:06 +01:00
Andre601's Bot 461ae5d0aa Update dependency com.squareup.okhttp3:okhttp-jvm to v5.3.2 2025-11-19 12:06:53 +00:00
Andre601 5696a9417b Merge pull request 'Update dependency com.squareup.okhttp3:okhttp-jvm to v5.3.1' (#523) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/523
2025-11-17 13:16:39 +01:00
Andre601's Bot 0705101cd6 Update dependency com.squareup.okhttp3:okhttp-jvm to v5.3.1 2025-11-17 12:04:39 +00:00
Andre601 69ad3554cf Merge pull request 'Update dependency org.apache.maven.plugins:maven-jar-plugin to v3.5.0' (#522) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/522
2025-11-15 13:46:38 +01:00
Andre601's Bot 7f1de13dcc Update dependency org.apache.maven.plugins:maven-jar-plugin to v3.5.0 2025-11-15 12:02:40 +00:00
Andre601 c3e16eec31 Merge pull request 'Update dependency mkdocs-macros-plugin to v1.5.0' (#521) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/521
2025-11-14 13:06:21 +01:00
Andre601's Bot 207970a90b Update dependency mkdocs-macros-plugin to v1.5.0 2025-11-14 12:02:26 +00:00
Andre601 2628dbab56 Merge pull request 'Update all non-major dependencies' (#520) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/520
2025-11-11 13:13:53 +01:00
Andre601's Bot 3da9f8b400 Update all non-major dependencies 2025-11-11 12:02:48 +00:00
Andre601 ffd0a8c364 Merge pull request 'Update all non-major dependencies to v1.7.2' (#519) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/519
2025-11-06 15:17:34 +01:00
Andre601's Bot d9a7b244f9 Update all non-major dependencies to v1.7.2 2025-11-06 14:01:26 +00:00
Andre601 f1fb5ef6ea Merge pull request 'Update dependency me.clip:placeholderapi to v2.11.7' (#518) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/518
2025-11-03 13:23:37 +01:00
Andre601's Bot d3406aad1c Update dependency me.clip:placeholderapi to v2.11.7 2025-11-03 12:02:22 +00:00
Andre601 650bcc3235 Merge pull request 'Update dependency mkdocs-material to v9.6.23' (#517) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/517
2025-11-02 13:25:54 +01:00
Andre601's Bot 0cd91c63bb Update dependency mkdocs-material to v9.6.23 2025-11-02 12:02:33 +00:00
Andre601 e95a4634ec Merge pull request 'Update dependency org.junit.jupiter:junit-jupiter-engine to v5.14.1' (#516) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/516
2025-11-01 13:03:15 +01:00
Andre601's Bot d0293ae15e Update dependency org.junit.jupiter:junit-jupiter-engine to v5.14.1 2025-11-01 12:02:21 +00:00
Andre601 f5c6185b96 Merge pull request 'Update dependency com.squareup.okhttp3:okhttp-jvm to v5.3.0' (#515) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/515
2025-10-31 13:10:21 +01:00
Andre601's Bot 61981db3cc Update dependency com.squareup.okhttp3:okhttp-jvm to v5.3.0 2025-10-31 12:03:05 +00:00
Andre601 52804adfdf Merge pull request 'Update all non-major dependencies to v1.7.1' (#514) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/514
2025-10-28 13:06:10 +01:00
Andre601's Bot 4b185be8a4 Update all non-major dependencies to v1.7.1 2025-10-28 12:03:01 +00:00
Andre601 46ac4ef5c1 Merge pull request 'Update dependency mkdocs-macros-plugin to v1.4.1' (#513) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/513
2025-10-26 13:44:51 +01:00
Andre601's Bot 00e2a8ebee Update dependency mkdocs-macros-plugin to v1.4.1 2025-10-26 12:03:57 +00:00
Andre601 c523da7477 Merge pull request 'Update dependency mkdocs-glightbox to v0.5.2' (#512) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/512
2025-10-24 14:06:11 +02:00
Andre601's Bot 01e586fa5e Update dependency mkdocs-glightbox to v0.5.2 2025-10-24 12:04:10 +00:00
Andre601 9322819538 Merge pull request 'Update dependency ch.qos.logback:logback-classic to v1.5.20' (#511) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/511
2025-10-20 14:37:17 +02:00
Andre601's Bot 7ef4a9a61b Update dependency ch.qos.logback:logback-classic to v1.5.20 2025-10-20 12:02:54 +00:00
Andre601 af2da61500 Merge pull request 'Update dependency mkdocs-material to v9.6.22' (#510) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/510
2025-10-15 14:05:25 +02:00
Andre601's Bot 23d0626250 Update dependency mkdocs-material to v9.6.22 2025-10-15 12:02:21 +00:00
Andre601 74dfdb3022 Add profiles edit command 2025-10-14 03:07:19 +02:00
Andre601 4a589619bd Merge pull request 'Update dependency com.viaversion:viaversion-api to v5.5.1' (#509) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/509
2025-10-13 15:19:37 +02:00
Andre601's Bot 9bdd519246 Update dependency com.viaversion:viaversion-api to v5.5.1 2025-10-13 12:05:43 +00:00
Andre601 cf4e08fe3e Merge pull request 'Update dependency org.incendo:cloud-minecraft-extras to v2.0.0-beta.13' (#508) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/508
2025-10-12 14:11:01 +02:00
Andre601's Bot 70bbb15c60 Update dependency org.incendo:cloud-minecraft-extras to v2.0.0-beta.13 2025-10-12 12:02:33 +00:00
Andre601 ee8e00f3a2 Merge pull request 'Update dependency com.squareup.okhttp3:okhttp-jvm to v5.2.1' (#507) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/507
2025-10-10 14:37:51 +02:00
Andre601's Bot 0280668f9b Update dependency com.squareup.okhttp3:okhttp-jvm to v5.2.1 2025-10-10 12:07:09 +00:00
Andre601 e959f478a0 Merge pull request 'Update dependency com.squareup.okhttp3:okhttp-jvm to v5.2.0' (#505) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/505
2025-10-08 14:03:52 +02:00
Andre601's Bot f024b2c763 Update dependency com.squareup.okhttp3:okhttp-jvm to v5.2.0 2025-10-08 12:02:40 +00:00
Andre601 c0665b450e Merge pull request 'Update all non-major dependencies' (#504) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/504
2025-10-07 15:25:22 +02:00
Andre601's Bot e50ed552b9 Update all non-major dependencies 2025-10-07 12:02:48 +00:00
Andre601 1601e41e9c Merge pull request 'Update https://github.com/peter-evans/create-or-update-comment action to v5' (#503) from renovate/https-github.com-peter-evans-create-or-update-comment-5.x into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/503
2025-10-03 14:04:33 +02:00
Andre601 f8b80f9e14 Merge pull request 'Update dependency com.viaversion:viaversion-api to v5.5.0' (#502) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/502
2025-10-03 14:03:52 +02:00
Andre601's Bot 22bfe2be00 Update https://github.com/peter-evans/create-or-update-comment action to v5 2025-10-03 12:02:31 +00:00
Andre601's Bot 7e9c6b909c Update dependency com.viaversion:viaversion-api to v5.5.0 2025-10-03 12:02:26 +00:00
Andre601 93ecdd736f Merge pull request 'Bump checkout action to v5' (#501) from feat/update-checkout-action into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/501
2025-10-02 15:54:08 +02:00
Andre601 abfbaf4498 Bump checkout action to v5 2025-10-02 15:53:12 +02:00
Andre601 ce3b80b05c Bump checkout action to v5 2025-10-02 15:52:46 +02:00
Andre601 9e3a77ad7d Merge pull request 'Update https://github.com/peter-evans/find-comment action to v4' (#500) from renovate/https-github.com-peter-evans-find-comment-4.x into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/500
2025-10-02 14:28:01 +02:00
Andre601's Bot cdc2115cb3 Update https://github.com/peter-evans/find-comment action to v4 2025-10-02 12:02:16 +00:00
Andre601 5173f61c6c Merge pull request 'Update all non-major dependencies' (#499) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/499
2025-10-01 14:09:07 +02:00
Andre601's Bot 8b12cb2402 Update all non-major dependencies 2025-10-01 12:02:30 +00:00
Andre601 3ab48396af Merge pull request 'Update dependency org.junit.jupiter:junit-jupiter-engine to v5.14.0' (#497) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/497
2025-09-30 14:56:02 +02:00
Andre601's Bot 00b34c8b47 Update dependency org.junit.jupiter:junit-jupiter-engine to v5.14.0 2025-09-30 12:04:24 +00:00
Andre601 b06274638e Merge pull request 'Update dependency org.apache.httpcomponents.client5:httpclient5 to v5.5.1' (#496) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/496
2025-09-28 14:13:04 +02:00
Andre601's Bot cd3b2fe0b4 Update dependency org.apache.httpcomponents.client5:httpclient5 to v5.5.1 2025-09-28 12:02:24 +00:00
Andre601 51d8ae6c42 Merge pull request 'Update dependency net.md-5:bungeecord-api to v1.21-R0.4' (#495) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/495
2025-09-27 14:07:19 +02:00
Andre601's Bot 1545be4709 Update dependency net.md-5:bungeecord-api to v1.21-R0.4 2025-09-27 12:02:43 +00:00
Andre601 7693e72728 Merge pull request 'Update dependency mkdocs-macros-plugin to v1.4.0' (#494) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/494
2025-09-23 14:07:14 +02:00
Andre601's Bot b879110379 Update dependency mkdocs-macros-plugin to v1.4.0 2025-09-23 12:02:24 +00:00
Andre601 80900089bb Merge pull request 'Update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.14.1' (#493) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/493
2025-09-22 14:04:44 +02:00
Andre601's Bot df776f4e1c Update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.14.1 2025-09-22 12:02:19 +00:00
Andre601 72afff8315 Merge pull request 'Update dependency com.google.guava:guava to v33.5.0-jre' (#492) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/492
2025-09-18 14:10:37 +02:00
Andre601's Bot 307384d1e1 Update dependency com.google.guava:guava to v33.5.0-jre 2025-09-18 12:03:10 +00:00
Andre601 84f31fad53 Merge pull request 'Update dependency mkdocs-material to v9.6.20' (#490) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/490
2025-09-15 14:36:25 +02:00
Andre601's Bot fe0774303a Update dependency mkdocs-material to v9.6.20 2025-09-15 12:05:20 +00:00
Andre601 563173679b Merge pull request 'Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.6.1' (#489) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/489
2025-09-13 14:14:06 +02:00
Andre601's Bot 6e96e06109 Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.6.1 2025-09-13 12:02:50 +00:00
Andre601 dae25fd00a Merge pull request 'Update dependency space.arim.libertybans:bans-api to v1.1.2' (#488) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/488
2025-09-12 14:43:02 +02:00
Andre601's Bot d2ca0cfae5 Update dependency space.arim.libertybans:bans-api to v1.1.2 2025-09-12 12:02:50 +00:00
Andre601 afaae368ac Merge pull request 'Update dependency com.google.code.gson:gson to v2.13.2' (#487) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/487
2025-09-11 15:00:19 +02:00
Andre601's Bot 522ce7f932 Update dependency com.google.code.gson:gson to v2.13.2 2025-09-11 12:02:07 +00:00
Andre601 3f3d460f2f Merge pull request 'Update dependency mkdocs-material to v9.6.19' (#486) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/486
2025-09-08 14:06:06 +02:00
Andre601's Bot 3a03899688 Update dependency mkdocs-material to v9.6.19 2025-09-08 12:02:12 +00:00
Andre601 e6d4264525 Merge pull request 'Update dependency mkdocs-glightbox to v0.5.1' (#485) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/485
2025-09-05 14:37:00 +02:00
Andre601's Bot 61466074fd Update dependency mkdocs-glightbox to v0.5.1 2025-09-05 12:02:34 +00:00
Andre601 4516157ddf Merge pull request 'Update https://code.forgejo.org/actions/setup-python action to v6' (#483) from renovate/https-code.forgejo.org-actions-setup-python-6.x into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/483
2025-09-04 15:42:23 +02:00
Andre601 82c65bf13c Merge pull request 'Update dependency mkdocs-glightbox to v0.5.0' (#482) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/482
2025-09-04 15:41:29 +02:00
Andre601's Bot 3c6e73671d Update https://code.forgejo.org/actions/setup-python action to v6 2025-09-04 12:02:27 +00:00
Andre601's Bot c91a2c0d4e Update dependency mkdocs-glightbox to v0.5.0 2025-09-04 12:02:07 +00:00
Andre601 66b10656c3 Update PlaceholderAPI link 2025-09-03 21:53:10 +02:00
Andre601 b82a0ff0d9 Update PlaceholderAPI link 2025-09-03 21:48:17 +02:00
Andre601 2e02af5a67 Merge pull request 'Update dependency mkdocs-material to v9.6.18' (#480) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/480
2025-08-22 14:32:26 +02:00
Andre601's Bot 5626b38390 Update dependency mkdocs-material to v9.6.18 2025-08-22 12:03:34 +00:00
Andre601 415456447c Merge pull request 'Update dependency mkdocs-material to v9.6.17' (#479) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/479
2025-08-16 16:43:33 +02:00
Andre601's Bot c555a3c648 Update dependency mkdocs-material to v9.6.17 2025-08-16 12:02:07 +00:00
Andre601 9ec0c1c4ce Merge pull request 'Update dependency mkdocs-macros-plugin to v1.3.9' (#477) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/477
2025-08-13 20:07:50 +02:00
Andre601 d3eb43db39 Revert Checkout to v4 2025-08-13 20:07:45 +02:00
Andre601 b4b4f6a9fc Merge branch 'master' into renovate/all-minor-patch 2025-08-13 20:03:53 +02:00
Andre601 3217eee02b Revert Checkout to v4 2025-08-13 20:02:54 +02:00
Andre601 ea68fca70b Merge branch 'master' into renovate/all-minor-patch 2025-08-13 20:01:08 +02:00
Andre601 a8ceb88b67 Fix missing env in RUN_URL 2025-08-13 20:00:56 +02:00
Andre601's Bot 19d6ce28c4 Update dependency mkdocs-macros-plugin to v1.3.9 2025-08-13 12:02:11 +00:00
Andre601 05e61794a1 Merge pull request 'Update https://code.forgejo.org/actions/checkout action to v5' (#476) from renovate/https-code.forgejo.org-actions-checkout-5.x into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/476
2025-08-12 15:30:45 +02:00
Andre601's Bot 46e062eb8f Update https://code.forgejo.org/actions/checkout action to v5 2025-08-12 12:02:44 +00:00
Andre601 2196456dd4 Rename faviconStrategy to faviconResizeStrategy for clarity 2025-08-10 13:39:51 +02:00
Andre601 bfd1e2e2ad Add note about updating local favicons 2025-08-10 13:29:30 +02:00
Andre601 21af6df510 Merge pull request 'Update all non-major dependencies to v4.24.0' (#475) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/475
2025-07-31 14:18:42 +02:00
Andre601's Bot 713062d1b4 Update all non-major dependencies to v4.24.0 2025-07-31 12:03:06 +00:00
Andre601 673a134ab1 Merge pull request 'Update Docs banner' (#474) from feature/update-banner into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/474
2025-07-30 23:17:07 +02:00
Andre601 c777772a90 ❇️ Sparke up the banner ❇️ 2025-07-30 23:05:14 +02:00
Andre601 a43a9f8f19 docs/.overrides/main.html aktualisiert 2025-07-30 22:10:52 +02:00
Andre601 d4a416f85e Merge pull request 'Update dependency net.kyori:adventure-platform-bungeecord to v4.4.1' (#473) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/473
2025-07-30 14:05:15 +02:00
Andre601's Bot bc26ceae55 Update dependency net.kyori:adventure-platform-bungeecord to v4.4.1 2025-07-30 12:02:25 +00:00
Andre601 3d19a6688c Merge pull request 'Update dependency mkdocs-material to v9.6.16' (#472) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/472
2025-07-27 14:32:57 +02:00
Andre601's Bot 03a8258ddc Update dependency mkdocs-material to v9.6.16 2025-07-27 12:03:25 +00:00
Andre601 6df5015b0d Merge pull request 'Update dependency com.viaversion:viaversion-api to v5.4.2' (#471) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/471
2025-07-24 15:42:01 +02:00
Andre601's Bot f1f8aaaad2 Update dependency com.viaversion:viaversion-api to v5.4.2 2025-07-24 12:02:08 +00:00
Andre601 151f5494fc Bumb version to 5.7.0-b2 2025-07-22 23:40:13 +02:00
Andre601 f997fa0a89 Use interfaces instead of Abstract classes 2025-07-22 23:39:16 +02:00
Andre601 2f1549eb8a Merge pull request 'Fix Dialog Support on Paper' (#468) from fix/paper-dialog-support into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/468
2025-07-22 23:27:47 +02:00
Andre601 77dba75c17 Use callback instead of event 2025-07-21 15:38:57 +02:00
Andre601 dfa72cb852 Merge pull request 'Update dependency org.junit.jupiter:junit-jupiter-engine to v5.13.4' (#469) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/469
2025-07-21 14:05:12 +02:00
Andre601's Bot dc0cf6ebfc Update dependency org.junit.jupiter:junit-jupiter-engine to v5.13.4 2025-07-21 12:02:16 +00:00
Andre601 2c520e53c0 Fix Dialog Support on Paper 2025-07-20 23:42:16 +02:00
Andre601 356cca9ba0 Merge pull request 'Update maven Docker tag to v3.9.11' (#467) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/467
2025-07-18 18:43:57 +02:00
Andre601's Bot 4e7b17a601 Update maven Docker tag to v3.9.11 2025-07-18 12:04:19 +00:00
Andre601 033f4bd6ab Make it a beta 2025-07-16 20:54:36 +02:00
Andre601 13edca3c4c Bump version 2025-07-16 20:53:56 +02:00
Andre601 a626dc5b28 Merge pull request 'Implement dialog-based profiles editing.' (#466) from feature/dialog-based-editing into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/466
2025-07-16 20:52:03 +02:00
Andre601 7a60024bd0 Merge branch 'master' into feature/dialog-based-editing 2025-07-16 20:51:51 +02:00
Andre601 cedb1e5748 Update Version uploader 2025-07-16 20:51:22 +02:00
Andre601 8b0fb99bc5 Use CommandPostprocessor for CommandType handling 2025-07-16 20:46:27 +02:00
Andre601 31202a930a Change cancel to a Back button. 2025-07-13 23:17:26 +02:00
Andre601 a105e3186b Create Builder class for Dialog building 2025-07-13 20:33:38 +02:00
Andre601 e2df79c428 Implement dialog-based profiles editing. 2025-07-12 22:23:36 +02:00
Andre601 01ecce170c Merge pull request 'Update dependency org.incendo:cloud-minecraft-extras to v2.0.0-beta.11' (#465) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/465
2025-07-12 14:04:26 +02:00
Andre601's Bot 3bb171cecf Update dependency org.incendo:cloud-minecraft-extras to v2.0.0-beta.11 2025-07-12 12:02:09 +00:00
Andre601 f54bbe26e1 Merge pull request 'Update dependency net.william278:papiproxybridge to v1.8.4' (#464) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/464
2025-07-09 14:16:53 +02:00
Andre601's Bot ddede7abef Update dependency net.william278:papiproxybridge to v1.8.4 2025-07-09 12:02:15 +00:00
Andre601 2c6467f176 Merge pull request 'Update dependency com.squareup.okhttp3:okhttp-jvm to v5.1.0' (#463) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/463
2025-07-08 14:05:49 +02:00
Andre601's Bot 8b92f8fc4d Update dependency com.squareup.okhttp3:okhttp-jvm to v5.1.0 2025-07-08 12:02:15 +00:00
Andre601 7bf6d8de0f Merge pull request 'Update dependency net.william278:papiproxybridge to v1.8.3' (#462) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/462
2025-07-06 14:10:34 +02:00
Andre601's Bot 844a88d381 Update dependency net.william278:papiproxybridge to v1.8.3 2025-07-06 12:02:23 +00:00
Andre601 fcea4e90e3 Merge pull request 'Update all non-major dependencies' (#461) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/461
2025-07-05 16:26:05 +02:00
Andre601's Bot 6a97debdf7 Update all non-major dependencies 2025-07-05 12:03:08 +00:00
Andre601 07fa6cf0ec Fix OkHttp version change + method renamings 2025-07-05 00:21:24 +02:00
Andre601 367f0f3501 Merge pull request 'Update dependency com.squareup.okhttp3:okhttp to v5' (#460) from renovate/major-okhttp-monorepo into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/460
2025-07-04 14:06:52 +02:00
Andre601 16dcaef825 Merge branch 'master' into renovate/major-okhttp-monorepo 2025-07-04 14:06:38 +02:00
Andre601 f780372fda Merge pull request 'Update dependency space.arim.libertybans:bans-api to v1.1.1' (#459) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/459
2025-07-04 14:06:13 +02:00
Andre601's Bot a8f8c0d770 Update dependency com.squareup.okhttp3:okhttp to v5 2025-07-04 12:02:29 +00:00
Andre601's Bot 70e06afaf0 Update dependency space.arim.libertybans:bans-api to v1.1.1 2025-07-04 12:02:20 +00:00
Andre601 13e087eddd Merge pull request 'Update all non-major dependencies' (#458) from renovate/all-minor-patch into master
Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/458
2025-07-01 14:04:14 +02:00
Andre601's Bot 31af916f04 Update all non-major dependencies 2025-07-01 12:02:18 +00:00
Andre601 db06de243f Add bluesky Post step to publish_assets.yml 2024-12-17 16:27:40 +00:00
97 changed files with 1772 additions and 515 deletions

No files matched your search

+2 -2
View File
@@ -18,13 +18,13 @@ jobs:
runs-on: codeberg-tiny
steps:
- name: "Checkout Source Repository"
uses: https://code.forgejo.org/actions/checkout@v4
uses: https://code.forgejo.org/actions/checkout@v6
with:
token: "${{ secrets.BOT_TOKEN }}"
- name: "Checkout Target Repository"
run: "git clone -b pages https://codeberg.org/Andre601/asl-docs site"
- name: "Setup Python 3.x"
uses: https://code.forgejo.org/actions/setup-python@v5
uses: https://code.forgejo.org/actions/setup-python@v6
with:
python-version: 3.x
- name: "Install Dependencies"
+7 -7
View File
@@ -28,13 +28,13 @@ jobs:
#
- name: "Find Comment"
id: find-comment
uses: https://github.com/peter-evans/find-comment@v3
uses: https://github.com/peter-evans/find-comment@v4
with:
issue-number: "${{ github.event.pull_request.number }}"
comment-author: "Andre_601-Bot"
- name: "Create or update Comment"
id: comment
uses: https://github.com/peter-evans/create-or-update-comment@v4
uses: https://github.com/peter-evans/create-or-update-comment@v5
with:
body: |-
## Pull request Preview
@@ -49,7 +49,7 @@ jobs:
# Build website and push.
#
- name: "Checkout Source Repository"
uses: https://code.forgejo.org/actions/checkout@v4
uses: https://code.forgejo.org/actions/checkout@v6
with:
token: ${{ secrets.BOT_TOKEN }}
fetch-depth: 0
@@ -60,7 +60,7 @@ jobs:
cd site
git switch ${{ env.BRANCH_NAME }} 2>/dev/null || git switch -c ${{ env.BRANCH_NAME }}
- name: "Setup Python 3.x"
uses: https://code.forgejo.org/actions/setup-python@v5
uses: https://code.forgejo.org/actions/setup-python@v6
with:
python-version: 3.x
- name: "Install Dependencies"
@@ -81,7 +81,7 @@ jobs:
# Update comment on success or failure.
#
- name: "Comment Success"
uses: https://github.com/peter-evans/create-or-update-comment@v4
uses: https://github.com/peter-evans/create-or-update-comment@v5
with:
body: |-
## Pull request Preview
@@ -99,7 +99,7 @@ jobs:
edit-mode: replace
- name: "Comment Failure"
if: ${{ failure() }}
uses: https://github.com/peter-evans/create-or-update-comment@v4
uses: https://github.com/peter-evans/create-or-update-comment@v5
with:
body: |-
## Pull request Preview
@@ -109,7 +109,7 @@ jobs:
| Name | Link |
|---------|-------------------------------------------|
| Commit | ${{ github.event.pull_request.head.sha }} |
| Logs | ${{ RUN_URL }} |
| Logs | ${{ env.RUN_URL }} |
comment-id: "${{ steps.comment.outputs.comment-id }}"
issue-number: "${{ github.event.pull_request.number }}"
token: "${{ secrets.BOT_TOKEN }}"
+18 -2
View File
@@ -4,7 +4,7 @@ when:
steps:
- name: "Build Jar and Upload"
image: maven:3.9.10-eclipse-temurin-21
image: maven:3.9.12-eclipse-temurin-21
environment:
CODEBERG_API_TOKEN:
from_secret: cb_token
@@ -29,6 +29,7 @@ steps:
- "paper/target/AdvancedServerList-*.jar"
- "velocity/target/AdvancedServerList-*.jar"
- "addons/banplugins/target/AdvancedServerList-*.jar"
- "addons/luckperms/target/AdvancedServerList-*.jar"
api_key:
from_secret: cb_token
- name: "Create Post on Mastodon"
@@ -45,4 +46,19 @@ steps:
Modrinth - https://modrinth.com/plugin/advancedserverlist
Hangar - https://hangar.papermc.io/Andre_601/AdvancedServerList
Codeberg - https://codeberg.org/Andre601/AdvancedServerList
visibility: public
visibility: public
- name: "Create Post on Bluesky"
image: woodpeckerci/plugin-bluesky-post
when:
- status: ["success"]
settings:
identifier: andre601.ch
app_password:
from_secret: bluesky_app_password
languages: english
text: |-
#AdvancedServerList was updated to ${CI_COMMIT_TAG} and can be downloaded from #Modrinth, #Hangar and #Codeberg!
Modrinth - https://modrinth.com/plugin/advancedserverlist
Hangar - https://hangar.papermc.io/Andre_601/AdvancedServerList
Codeberg - https://codeberg.org/Andre601/AdvancedServerList
+1 -1
View File
@@ -63,7 +63,7 @@ AdvancedServerList soft-depends on the following plugins, meaning their inclusio
| Plugin | Supported Platforms |
|-------------------------------------------------------------------------|----------------------------------------|
| [PlaceholderAPI](https://hangar.papermc.io/HelpChat/PlaceholderAPI) | Paper |
| [PlaceholderAPI](https://modrinth.com/plugin/PlaceholderAPI) | Paper |
| [ViaVersion](https://hangar.papermc.io/ViaVersion/ViaVersion) | Paper |
| [PAPIProxyBridge](https://hangar.papermc.io/William278/PAPIProxyBridge) | BungeeCord, Waterfall, Velocity |
| [Maintenance](https://hangar.papermc.io/kennytv/Maintenance) | Paper, BungeeCord, Waterfall, Velocity |
+3 -3
View File
@@ -65,14 +65,14 @@
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-api</artifactId>
<version>1.21-R0.3</version>
<version>1.21-R0.4</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-api</artifactId>
<version>1.21-R0.3</version>
<version>1.21-R0.4</version>
<type>javadoc</type>
<scope>provided</scope>
</dependency>
@@ -99,7 +99,7 @@
<dependency>
<groupId>space.arim.libertybans</groupId>
<artifactId>bans-api</artifactId>
<version>1.1.0</version>
<version>1.1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
+112
View File
@@ -0,0 +1,112 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ MIT License
~
~ Copyright (c) 2022-2024 Andre_601
~
~ Permission is hereby granted, free of charge, to any person obtaining a copy
~ of this software and associated documentation files (the "Software"), to deal
~ in the Software without restriction, including without limitation the rights
~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
~ copies of the Software, and to permit persons to whom the Software is
~ furnished to do so, subject to the following conditions:
~
~ The above copyright notice and this permission notice shall be included in all
~ copies or substantial portions of the Software.
~
~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
~ SOFTWARE.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>parent</artifactId>
<groupId>ch.andre601.advancedserverlist</groupId>
<version>parent</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>luckperms</artifactId>
<packaging>jar</packaging>
<version>${plugin.version}</version>
<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<repositories>
<repository>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</repository>
<repository>
<id>papermc</id>
<url>https://repo.papermc.io/repository/maven-public/</url>
</repository>
</repositories>
<dependencies>
<!-- Proxy/Server -->
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-api</artifactId>
<version>1.21-R0.4</version>
<type>jar</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-api</artifactId>
<version>1.21-R0.4</version>
<type>javadoc</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.21-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.velocitypowered</groupId>
<artifactId>velocity-api</artifactId>
<version>3.3.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- Plugin APIs -->
<dependency>
<groupId>ch.andre601.asl-api</groupId>
<artifactId>api</artifactId>
<version>${api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.luckperms</groupId>
<artifactId>api</artifactId>
<version>5.5</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<finalName>AdvancedServerList-LuckPerms-Addon-${plugin.version}${project.build.build_id}</finalName>
<resources>
<resource>
<filtering>true</filtering>
<directory>src/main/resources</directory>
</resource>
</resources>
</build>
</project>
@@ -0,0 +1,39 @@
package ch.andre601.advancedserverlist.luckperms.bungee;
import ch.andre601.advancedserverlist.api.AdvancedServerListAPI;
import ch.andre601.advancedserverlist.api.exceptions.InvalidPlaceholderProviderException;
import ch.andre601.advancedserverlist.luckperms.placeholders.LuckPermsPlaceholder;
import net.luckperms.api.LuckPerms;
import net.luckperms.api.LuckPermsProvider;
import net.md_5.bungee.api.plugin.Plugin;
public class LuckPermsAddon extends Plugin{
@Override
public void onEnable(){
if(getProxy().getPluginManager().getPlugin("AdvancedServerList") == null){
getLogger().warning("AdvancedServerList not found. This plugin is required.");
return;
}
if(getProxy().getPluginManager().getPlugin("LuckPerms") == null){
getLogger().warning("LuckPerms not found. This plugin is required.");
return;
}
LuckPerms luckPerms;
try{
luckPerms = LuckPermsProvider.get();
}catch(IllegalStateException ex){
getLogger().severe("Unable to obtain LuckPerms API instance! The Plugin won't work.");
return;
}
getLogger().info("Registering LuckPerms Placeholders...");
try{
AdvancedServerListAPI.get().addPlaceholderProvider(new LuckPermsPlaceholder(luckPerms));
getLogger().info("Successfully registered Placeholder!");
}catch(InvalidPlaceholderProviderException ex){
getLogger().warning("Couldn't register Placeholder. The plugin won't work.");
}
}
}
@@ -0,0 +1,44 @@
package ch.andre601.advancedserverlist.luckperms.paper;
import ch.andre601.advancedserverlist.api.AdvancedServerListAPI;
import ch.andre601.advancedserverlist.api.exceptions.InvalidPlaceholderProviderException;
import ch.andre601.advancedserverlist.luckperms.placeholders.LuckPermsPlaceholder;
import net.luckperms.api.LuckPerms;
import net.luckperms.api.LuckPermsProvider;
import org.bukkit.plugin.java.JavaPlugin;
public class LuckPermsAddon extends JavaPlugin{
@Override
public void onEnable(){
if(!this.getServer().getPluginManager().isPluginEnabled("AdvancedServerList")){
this.getSLF4JLogger().warn("AdvancedServerList not enabled. This plugin is required!");
this.getServer().getPluginManager().disablePlugin(this);
return;
}
if(!this.getServer().getPluginManager().isPluginEnabled("LuckPerms")){
this.getSLF4JLogger().warn("LuckPerms not enabled. This plugin is required!");
this.getServer().getPluginManager().disablePlugin(this);
return;
}
LuckPerms luckPerms;
try{
luckPerms = LuckPermsProvider.get();
}catch(IllegalStateException ex){
this.getSLF4JLogger().error("Unable to obtain LuckPerms API instance! Disabling plugin...");
this.getServer().getPluginManager().disablePlugin(this);
return;
}
this.getSLF4JLogger().info("Registering LuckPerms Placeholder...");
try{
AdvancedServerListAPI.get().addPlaceholderProvider(new LuckPermsPlaceholder(luckPerms));
this.getSLF4JLogger().info("Successfully registered Placeholder!");
}catch(InvalidPlaceholderProviderException ex){
this.getSLF4JLogger().warn("Couldn't register Placeholder. Disabling Plugin...");
this.getServer().getPluginManager().disablePlugin(this);
}
}
}
@@ -0,0 +1,66 @@
package ch.andre601.advancedserverlist.luckperms.placeholders;
import ch.andre601.advancedserverlist.api.PlaceholderProvider;
import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
import ch.andre601.advancedserverlist.api.objects.GenericServer;
import net.luckperms.api.LuckPerms;
import net.luckperms.api.model.user.User;
import org.jspecify.annotations.NonNull;
import org.jspecify.annotations.Nullable;
import java.util.HashMap;
import java.util.UUID;
public class LuckPermsPlaceholder extends PlaceholderProvider{
private final LuckPerms luckPerms;
private final HashMap<UUID, CacheValue> cache = new HashMap<>();
public LuckPermsPlaceholder(LuckPerms luckPerms){
super("luckperms");
this.luckPerms = luckPerms;
}
@Override
public @Nullable String parsePlaceholder(@NonNull String placholder, @NonNull GenericPlayer player, @NonNull GenericServer server){
if(luckPerms == null)
return "ERR: LuckPerms not available.";
CacheValue cacheValue = cache.get(player.getUUID());
User user;
if(cacheValue == null || cacheValue.expired()){
// Can cause lag if on main thread.
// But the alternative would be a lot more annoying and error-prone.
user = luckPerms.getUserManager().loadUser(player.getUUID()).join();
cache.put(player.getUUID(), new CacheValue(System.currentTimeMillis(), user));
}else{
user = cacheValue.user();
}
if(user == null)
return "ERR: Player not found.";
String[] parts = placholder.split("\\s+");
if(parts.length == 1)
return "ERR: Missing argument for placeholder " + parts[0] + ".";
return switch(parts[0]){
case "hasGroup" -> String.valueOf(
user.getCachedData().getPermissionData().checkPermission("group." + parts[1])
);
case "hasPermission" -> String.valueOf(
user.getCachedData().getPermissionData().checkPermission(parts[1]).asBoolean()
);
case "primaryGroup" -> user.getPrimaryGroup();
default -> null;
};
}
private record CacheValue(long timestamp, User user){
public boolean expired(){
// Expired if current timestamp minus old one is more than 60k milliseconds (1 minute)
return (timestamp < 0L) || System.currentTimeMillis() - timestamp >= 60_000;
}
}
}
@@ -0,0 +1,53 @@
package ch.andre601.advancedserverlist.luckperms.velocity;
import ch.andre601.advancedserverlist.api.AdvancedServerListAPI;
import ch.andre601.advancedserverlist.api.exceptions.InvalidPlaceholderProviderException;
import ch.andre601.advancedserverlist.luckperms.placeholders.LuckPermsPlaceholder;
import com.google.inject.Inject;
import com.velocitypowered.api.event.Subscribe;
import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
import com.velocitypowered.api.proxy.ProxyServer;
import net.luckperms.api.LuckPerms;
import net.luckperms.api.LuckPermsProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class LuckPermsAddon{
private final ProxyServer proxy;
private final Logger logger = LoggerFactory.getLogger("ASLLuckPermsAddon");
@Inject
public LuckPermsAddon(ProxyServer proxy){
this.proxy = proxy;
}
@Subscribe
public void init(ProxyInitializeEvent event){
if(!proxy.getPluginManager().isLoaded("advancedserverlist")){
logger.warn("AdvancedServerList is not enabled. This plugin is required.");
return;
}
if(!proxy.getPluginManager().isLoaded("luckperms")){
logger.warn("LuckPerms is not enabled. This plugin is required.");
return;
}
LuckPerms luckPerms;
try{
luckPerms = LuckPermsProvider.get();
}catch(IllegalStateException ex){
logger.warn("Unable to obtain LuckPerms API instance. The plugin won't work.");
return;
}
logger.info("Registering LuckPerms Placeholder...");
try{
AdvancedServerListAPI.get().addPlaceholderProvider(new LuckPermsPlaceholder(luckPerms));
logger.info("Successfully registered Placeholder!");
}catch(InvalidPlaceholderProviderException ex){
logger.warn("Unable to register LuckPerms Placeholder! The plugin won't work.");
}
}
}
@@ -0,0 +1,10 @@
name: 'ASLLuckPermsAddon'
author: 'Andre_601'
version: '${plugin.version}'
description: 'LuckPerms Add-on for AdvancedServerList to add placeholders to use.'
softDepends:
- AdvancedServerList
- LuckPerms
main: 'ch.andre601.advancedserverlist.luckperms.bungee.LuckPermsAddon'
@@ -0,0 +1,16 @@
name: 'ASLLuckPermsAddon'
author: 'Andre_601'
version: '${plugin.version}'
main: 'ch.andre601.advancedserverlist.luckperms.paper.LuckPermsAddon'
api-version: '1.19'
dependencies:
server:
AdvancedServerList:
required: false
load: BEFORE
LuckPerms:
required: false
load: BEFORE
@@ -0,0 +1,20 @@
{
"id": "aslluckpermsaddon",
"name": "ASLLuckPermsAddon",
"version": "${plugin.version}",
"description": "LuckPerms Add-on for AdvancedServerList to add placeholders to use.",
"authors": [
"Andre_601"
],
"dependencies": [
{
"id": "advancedserverlist",
"optional": true
},
{
"id": "luckperms",
"optional": true
}
],
"main": "ch.andre601.advancedserverlist.luckperms.velocity.LuckPermsAddon"
}
+3 -3
View File
@@ -132,13 +132,13 @@
<dependency>
<groupId>org.sayandev</groupId>
<artifactId>sayanvanish-api</artifactId>
<version>1.6.5</version>
<version>1.7.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.sayandev</groupId>
<artifactId>sayanvanish-proxy-bungeecord</artifactId>
<version>1.6.5</version>
<version>1.7.3</version>
<scope>provided</scope>
</dependency>
@@ -169,7 +169,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.6.0</version>
<version>3.6.1</version>
<executions>
<execution>
<phase>package</phase>
@@ -36,6 +36,9 @@ import ch.andre601.advancedserverlist.core.AdvancedServerList;
import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
import ch.andre601.advancedserverlist.core.interfaces.dialogs.IDialog;
import ch.andre601.advancedserverlist.core.interfaces.dialogs.IDialogList;
import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
import ch.andre601.advancedserverlist.core.profiles.handlers.FaviconHandler;
import com.alessiodp.libby.BungeeLibraryManager;
import com.alessiodp.libby.Library;
@@ -96,8 +99,12 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
this.audiences = BungeeAudiences.create(this);
this.handler = new BungeeCommandManagerInterface(this);
this.core = AdvancedServerList.init(this,
BungeePlayerPlaceholders.init(), BungeeServerPlaceholders.init(this), BungeeProxyPlaceholders.init(this));
this.core = AdvancedServerList.init(
this,
BungeePlayerPlaceholders.init(),
BungeeServerPlaceholders.init(this),
BungeeProxyPlaceholders.init(this)
);
}
@Override
@@ -116,7 +123,7 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
@Override
public void loadMetrics(){
new Metrics(this, 15585).addCustomChart(new SimplePie("profiles",
() -> String.valueOf(core.getFileHandler().getProfiles().size())
() -> String.valueOf(core.fileHandler().profiles().size())
));
}
@@ -157,22 +164,22 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
}
@Override
public AdvancedServerList<Favicon> getCore(){
public AdvancedServerList<Favicon> core(){
return core;
}
@Override
public Path getFolderPath(){
public Path folderPath(){
return getDataFolder().toPath();
}
@Override
public PluginLogger getPluginLogger(){
public PluginLogger pluginLogger(){
return logger;
}
@Override
public FaviconHandler<Favicon> getFaviconHandler(){
public FaviconHandler<Favicon> faviconHandler(){
if(faviconHandler == null)
faviconHandler = new FaviconHandler<>(core);
@@ -180,17 +187,17 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
}
@Override
public CommandManager<CmdSender> getCommandManager(){
public CommandManager<CmdSender> commandManager(){
return handler.commandHandler();
}
@Override
public String getPlatformInfo(){
public String platformInfo(){
return getProxy().getName() + " " + getProxy().getVersion();
}
@Override
public String getLoader(){
public String loader(){
return "bungeecord";
}
@@ -199,16 +206,31 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
return getProxy().getPluginManager().getPlugin(plugin) != null;
}
@Override
public boolean isDialogsSupported(){
return false;
}
@Override
public Favicon createFavicon(BufferedImage image) throws IllegalArgumentException{
return Favicon.create(image);
}
public BungeeAudiences getAudiences(){
@Override
public IDialogList.IDialogListBuilder createDialogListBuilder(String title){
return null;
}
@Override
public IDialog.IDialogBuilder createDialogBuilder(String title, ServerListProfile profile, int profilesPosition){
return null;
}
public BungeeAudiences audiences(){
return audiences;
}
public int getOnlinePlayers(ServerInfo server){
public int onlinePlayers(ServerInfo server){
List<ProxiedPlayer> players = new ArrayList<>(server == null ? getProxy().getPlayers() : server.getPlayers());
// Exclude players when PremiumVanish is enabled and player is hidden.
@@ -222,7 +244,7 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
return players.size();
}
public Map<String, ServerPing> getFetchedServers(){
public Map<String, ServerPing> fetchedServers(){
return fetchedServers;
}
@@ -53,7 +53,7 @@ public class BungeeCommandManagerInterface implements CommandManagerInterface<Co
@Override
public SenderMapper<CommandSender, CmdSender> senderMapper(){
return SenderMapper.create(
cmdSender -> new BungeeCmdSender(cmdSender, plugin.getAudiences()),
cmdSender -> new BungeeCmdSender(cmdSender, plugin.audiences()),
sender -> ((BungeeCmdSender)sender).sender()
);
}
@@ -75,17 +75,17 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
}
@Override
public void setMaxPlayers(int maxPlayers){
public void maxPlayers(int maxPlayers){
ping.getPlayers().setMax(maxPlayers);
}
@Override
public void setOnlinePlayers(int onlinePlayers){
public void onlinePlayers(int onlinePlayers){
ping.getPlayers().setOnline(onlinePlayers);
}
@Override
public void setMotd(Component component){
public void motd(Component component){
ping.setDescriptionComponent(new TextComponent(BungeeComponentSerializer.get().serialize(component)));
}
@@ -95,13 +95,13 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
}
@Override
public void setPlayerCount(String name){
public void playerCount(String name){
protocol.setName(name);
protocol.setProtocol(-1);
}
@Override
public void setPlayers(List<String> lines, BungeePlayerImpl player, GenericServer server){
public void players(List<String> lines, BungeePlayerImpl player, GenericServer server){
ServerPing.PlayerInfo[] players = new ServerPing.PlayerInfo[lines.size()];
for(int i = 0; i < players.length; i++){
@@ -119,17 +119,17 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
}
@Override
public void setPlayersHidden(){
public void playersHidden(){
ping.getPlayers().setSample(new ServerPing.PlayerInfo[0]);
}
@Override
public void setFavicon(Favicon favicon){
public void favicon(Favicon favicon){
ping.setFavicon(favicon);
}
@Override
public void setDefaultFavicon(){
public void defaultFavicon(){
ping.setFavicon(ping.getFaviconObject());
}
@@ -153,22 +153,22 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
}
@Override
public int getProtocolVersion(){
public int protocolVersion(){
return event.getConnection().getVersion();
}
@Override
public int getOnlinePlayers(){
return plugin.getOnlinePlayers(null);
public int onlinePlayers(){
return plugin.onlinePlayers(null);
}
@Override
public int getMaxPlayers(){
public int maxPlayers(){
return ping.getPlayers().getMax();
}
@Override
public String getPlayerIP(){
public String playerIP(){
return ((InetSocketAddress)event.getConnection().getSocketAddress()).getHostString();
}
@@ -196,12 +196,12 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
}
@Override
public String getVirtualHost(){
public String virtualHost(){
return this.resolveHost(event.getConnection().getVirtualHost());
}
@Override
public PluginCore<Favicon> getPlugin(){
public PluginCore<Favicon> plugin(){
return plugin;
}
@@ -211,7 +211,7 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
}
@Override
public GenericServer createGenericServer(int playersOnline, int playersMax, String host){
public GenericServer createServer(int playersOnline, int playersMax, String host){
Map<String, ServerInfo> servers = plugin.getProxy().getServers();
return new BungeeProxyImpl(servers, playersOnline, playersMax, host);
@@ -47,15 +47,15 @@ public class PlayerJoinEventListener implements Listener{
InetSocketAddress address = (InetSocketAddress)event.getPlayer().getPendingConnection().getSocketAddress();
ProxiedPlayer player = event.getPlayer();
plugin.getCore().getPlayerHandler().addPlayer(address.getHostString(), player.getName(), player.getUniqueId());
plugin.core().playerHandler().addPlayer(address.getHostString(), player.getName(), player.getUniqueId());
if(player.hasPermission("advancedserverlist.admin") || player.hasPermission("advancedserverlist.updatecheck")){
if(plugin.getAudiences() == null || plugin.getCore().getUpdateChecker() == null)
if(plugin.audiences() == null || plugin.core().updateChecker() == null)
return;
BungeeCmdSender sender = new BungeeCmdSender(player, plugin.getAudiences());
BungeeCmdSender sender = new BungeeCmdSender(player, plugin.audiences());
plugin.getCore().getUpdateChecker().performCachedUpdateCheck(sender);
plugin.core().updateChecker().performCachedUpdateCheck(sender);
}
}
}
@@ -27,9 +27,11 @@ package ch.andre601.advancedserverlist.bungeecord.objects.impl;
import ch.andre601.advancedserverlist.api.bungeecord.objects.BungeePlayer;
import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
import org.jspecify.annotations.NullMarked;
import java.util.UUID;
@NullMarked
public record BungeePlayerImpl(CachedPlayer player, int protocol) implements BungeePlayer{
@Override
@@ -27,12 +27,13 @@ package ch.andre601.advancedserverlist.bungeecord.objects.impl;
import ch.andre601.advancedserverlist.api.bungeecord.objects.BungeeProxy;
import net.md_5.bungee.api.config.ServerInfo;
import org.jspecify.annotations.NonNull;
import java.util.Map;
public record BungeeProxyImpl(Map<String, ServerInfo> servers, int playersOnline, int playersMax, String host) implements BungeeProxy{
@Override
public Map<String, ServerInfo> getServers(){
public @NonNull Map<String, ServerInfo> getServers(){
return servers;
}
@@ -28,9 +28,12 @@ package ch.andre601.advancedserverlist.bungeecord.objects.placeholders;
import ch.andre601.advancedserverlist.api.PlaceholderProvider;
import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
import ch.andre601.advancedserverlist.api.objects.GenericServer;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;
import java.util.Locale;
@NullMarked
public class BungeePlayerPlaceholders extends PlaceholderProvider{
private BungeePlayerPlaceholders(){
@@ -42,7 +45,7 @@ public class BungeePlayerPlaceholders extends PlaceholderProvider{
}
@Override
public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
public @Nullable String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
return switch(placeholder.toLowerCase(Locale.ROOT)){
case "name" -> player.getName();
case "protocol" -> String.valueOf(player.getProtocol());
@@ -9,7 +9,10 @@ import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer;
import net.md_5.bungee.api.ServerPing;
import net.md_5.bungee.api.chat.BaseComponent;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;
@NullMarked
public class BungeeProxyPlaceholders extends PlaceholderProvider{
private final BungeeCordCore plugin;
@@ -25,12 +28,12 @@ public class BungeeProxyPlaceholders extends PlaceholderProvider{
}
@Override
public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
public @Nullable String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
String[] args = placeholder.split("\\s", 2);
if(args.length < 2)
return null;
ServerPing ping = plugin.getFetchedServers().get(args[1]);
ServerPing ping = plugin.fetchedServers().get(args[1]);
return switch(args[0]){
case "status" -> ping == null ? "offline" : "online";
@@ -31,9 +31,12 @@ import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
import ch.andre601.advancedserverlist.api.objects.GenericServer;
import ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
import net.md_5.bungee.api.config.ServerInfo;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;
import java.net.InetSocketAddress;
@NullMarked
public class BungeeServerPlaceholders extends PlaceholderProvider{
private final BungeeCordCore plugin;
@@ -48,7 +51,7 @@ public class BungeeServerPlaceholders extends PlaceholderProvider{
}
@Override
public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
public @Nullable String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
if(!(server instanceof BungeeProxy proxy))
return null;
@@ -68,7 +71,7 @@ public class BungeeServerPlaceholders extends PlaceholderProvider{
if(info == null)
continue;
players += plugin.getOnlinePlayers(info);
players += plugin.onlinePlayers(info);
}
yield String.valueOf(players);
@@ -87,7 +90,7 @@ public class BungeeServerPlaceholders extends PlaceholderProvider{
if(args.length > 2)
yield "";
if(args.length == 2 && args[1] != null && !args[1].isEmpty()){
if(args.length == 2 && !args[1].isEmpty()){
ServerInfo info = proxy.getServers().get(args[1]);
if(info == null)
yield "";
+13 -7
View File
@@ -43,7 +43,7 @@
<maven.compiler.target>21</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<plugin.config.version>9</plugin.config.version>
<plugin.config.version>10</plugin.config.version>
</properties>
<repositories>
@@ -79,7 +79,7 @@
<dependency>
<groupId>ch.andre601</groupId>
<artifactId>expressionparser</artifactId>
<version>1.6.0</version>
<version>1.6.1</version>
<scope>compile</scope>
</dependency>
@@ -121,7 +121,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.13.1</version>
<version>2.13.2</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -133,7 +133,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.4.8-jre</version>
<version>33.5.0-jre</version>
<scope>provided</scope>
</dependency>
@@ -168,7 +168,7 @@
<dependency>
<groupId>net.william278</groupId>
<artifactId>papiproxybridge</artifactId>
<version>1.8.1</version>
<version>1.8.4</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -183,12 +183,18 @@
<version>3.5.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.github.miniplaceholders</groupId>
<artifactId>miniplaceholders-api</artifactId>
<version>3.1.0</version>
<scope>provided</scope>
</dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.13.2</version>
<version>5.14.1</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -215,7 +221,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
<configuration>
<compilerArgs>
<arg>-parameters</arg>
@@ -29,12 +29,14 @@ import ch.andre601.advancedserverlist.api.AdvancedServerListAPI;
import ch.andre601.advancedserverlist.api.PlaceholderProvider;
import ch.andre601.advancedserverlist.core.check.UpdateChecker;
import ch.andre601.advancedserverlist.core.commands.CommandHandler;
import ch.andre601.advancedserverlist.core.commands.CommandTypePostprocessor;
import ch.andre601.advancedserverlist.core.compat.maintenance.MaintenancePlaceholder;
import ch.andre601.advancedserverlist.core.file.FileHandler;
import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
import ch.andre601.advancedserverlist.core.interfaces.commands.CommandType;
import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
import ch.andre601.advancedserverlist.core.parsing.TextCenterUtil;
import ch.andre601.advancedserverlist.core.placeholders.DatePlaceholder;
import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
import ch.andre601.advancedserverlist.core.profiles.conditions.ProfileConditionParser;
import ch.andre601.advancedserverlist.core.profiles.handlers.PlayerHandler;
@@ -53,6 +55,7 @@ import org.incendo.cloud.suggestion.SuggestionProvider;
import java.io.IOException;
import java.io.InputStream;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Properties;
@@ -60,7 +63,10 @@ import java.util.Properties;
public class AdvancedServerList<F>{
public static <F> AdvancedServerList<F> init(PluginCore<F> plugin, PlaceholderProvider... placeholders){
return new AdvancedServerList<>(plugin, Arrays.asList(placeholders));
List<PlaceholderProvider> providers = new ArrayList<>(Arrays.asList(placeholders));
providers.add(new DatePlaceholder());
return new AdvancedServerList<>(plugin, providers);
}
private final PluginCore<F> plugin;
@@ -81,7 +87,7 @@ public class AdvancedServerList<F>{
this.playerHandler = new PlayerHandler(this);
this.textCenterUtil = new TextCenterUtil(this);
plugin.getPluginLogger().info("Registering internal Placeholders...");
plugin.pluginLogger().info("Registering internal Placeholders...");
placeholders.forEach(this::addPlaceholder);
@@ -90,52 +96,52 @@ public class AdvancedServerList<F>{
}
resolveVersion();
getPlugin().getPluginLogger().info("Starting <white>AdvancedServerList v%s</white>...", version);
plugin().pluginLogger().info("Starting <white>AdvancedServerList v%s</white>...", version);
load();
}
public static AdvancedServerListAPI getApi(){
public static AdvancedServerListAPI api(){
return api;
}
public PluginCore<F> getPlugin(){
public PluginCore<F> plugin(){
return plugin;
}
public FileHandler getFileHandler(){
public FileHandler fileHandler(){
return fileHandler;
}
public PlayerHandler getPlayerHandler(){
public PlayerHandler playerHandler(){
return playerHandler;
}
public String getVersion(){
public String version(){
return version;
}
public ProfileConditionParser getParser(){
public ProfileConditionParser parser(){
return parser;
}
public UpdateChecker getUpdateChecker(){
public UpdateChecker updateChecker(){
return updateChecker;
}
public TextCenterUtil getTextCenterUtil(){
public TextCenterUtil textCenterUtil(){
return textCenterUtil;
}
public void disable(){
getPlugin().getPluginLogger().info("[-] Saving <white>playercache.json</white> file...");
getPlayerHandler().save();
plugin().pluginLogger().info("[-] Saving <white>playercache.json</white> file...");
playerHandler().save();
if(updateChecker != null){
getPlugin().getPluginLogger().info("[-] Disabling Update Checker...");
plugin().pluginLogger().info("[-] Disabling Update Checker...");
updateChecker.disable();
}
getPlugin().getPluginLogger().success("AdvancedServerList disabled!");
plugin().pluginLogger().success("AdvancedServerList disabled!");
}
public void clearFaviconCache(){
@@ -143,69 +149,69 @@ public class AdvancedServerList<F>{
}
public void clearPlayerCache(){
getPlayerHandler().clearCache();
playerHandler().clearCache();
}
private void load(){
if(!getFileHandler().loadConfig()){
getPlugin().getPluginLogger().failure("Unable to load <white>config.yml</white>! Check previous lines for errors.");
if(!fileHandler().loadConfig()){
plugin().pluginLogger().failure("Unable to load <white>config.yml</white>! Check previous lines for errors.");
return;
}
if(getFileHandler().isOldConfig()){
getPlugin().getPluginLogger().info("[-] Detected old <white>config.yml</white>. Attempting to migrate...");
if(getFileHandler().migrateConfig()){
getPlugin().getPluginLogger().success("Migration completed successfully!");
if(fileHandler().isOldConfig()){
plugin().pluginLogger().info("[-] Detected old <white>config.yml</white>. Attempting to migrate...");
if(fileHandler().migrateConfig()){
plugin().pluginLogger().success("Migration completed successfully!");
}else{
getPlugin().getPluginLogger().failure("Couldn't migrate <white>config.yml</white>! Check previous lines for errors.");
plugin().pluginLogger().failure("Couldn't migrate <white>config.yml</white>! Check previous lines for errors.");
return;
}
}
if(getFileHandler().getBool(true, "printBanner")){
if(fileHandler().getBool(true, "printBanner")){
printBanner();
}
getPlugin().getPluginLogger().info("Platform: <white>%s</white>", plugin.getPlatformInfo());
getPlugin().getPluginLogger().info("");
plugin().pluginLogger().info("Platform: <white>%s</white>", plugin.platformInfo());
plugin().pluginLogger().info("");
if(getFileHandler().loadProfiles()){
getPlugin().getPluginLogger().success("Successfully loaded <white>%d</white> profile(s)!", getFileHandler().getProfiles().size());
if(fileHandler().loadProfiles()){
plugin().pluginLogger().success("Successfully loaded <white>%d</white> profile(s)!", fileHandler().profiles().size());
}else{
getPlugin().getPluginLogger().failure("Unable to load profiles! Check previous lines for errors.");
plugin().pluginLogger().failure("Unable to load profiles! Check previous lines for errors.");
return;
}
loadCommands();
plugin.loadEvents();
getPlayerHandler().load();
playerHandler().load();
plugin.loadMetrics();
plugin.startScheduler();
getPlugin().getPluginLogger().success("<green>AdvancedServerList is ready!");
plugin().pluginLogger().success("<green>AdvancedServerList is ready!");
if(getFileHandler().getBoolean("checkUpdates"))
if(fileHandler().getBoolean("checkUpdates"))
this.updateChecker = new UpdateChecker(this);
}
private void printBanner(){
getPlugin().getPluginLogger().info("<#3b90ff> __ _______ ___");
getPlugin().getPluginLogger().info("<#3b90ff> /\\ \\ / ____|_| | |");
getPlugin().getPluginLogger().info("<#3b90ff> / \\ \\ | (_(___ | | |");
getPlugin().getPluginLogger().info("<#3b90ff> / /\\ \\ \\ \\___ \\ \\| | |");
getPlugin().getPluginLogger().info("<#3b90ff> / ____ \\ \\ ____) | | |_|____");
getPlugin().getPluginLogger().info("<#3b90ff>/_/_/ \\_\\_\\_____/_/|______|_|");
getPlugin().getPluginLogger().info("");
plugin().pluginLogger().info("<#3b90ff> __ _______ ___");
plugin().pluginLogger().info("<#3b90ff> /\\ \\ / ____|_| | |");
plugin().pluginLogger().info("<#3b90ff> / \\ \\ | (_(___ | | |");
plugin().pluginLogger().info("<#3b90ff> / /\\ \\ \\ \\___ \\ \\| | |");
plugin().pluginLogger().info("<#3b90ff> / ____ \\ \\ ____) | | |_|____");
plugin().pluginLogger().info("<#3b90ff>/_/_/ \\_\\_\\_____/_/|______|_|");
plugin().pluginLogger().info("");
seasonalText();
}
private void resolveVersion(){
try(InputStream is = getClass().getResourceAsStream("/version.properties")){
try(InputStream stream = getClass().getResourceAsStream("/version.properties")){
Properties properties = new Properties();
properties.load(is);
properties.load(stream);
version = properties.getProperty("version");
}catch(IOException ex){
@@ -214,15 +220,16 @@ public class AdvancedServerList<F>{
}
private void addPlaceholder(PlaceholderProvider placeholderProvider){
AdvancedServerList.getApi().addPlaceholderProvider(placeholderProvider);
AdvancedServerList.api().addPlaceholderProvider(placeholderProvider);
}
private void loadCommands(){
getPlugin().loadFaviconHandler(this);
plugin().loadFaviconHandler(this);
CommandManager<CmdSender> commandManager = plugin.getCommandManager();
CommandManager<CmdSender> commandManager = plugin().commandManager();
commandManager.parameterInjectorRegistry().registerInjector(AdvancedServerList.class, ParameterInjector.constantInjector(this));
commandManager.registerCommandPostProcessor(new CommandTypePostprocessor());
AnnotationParser<CmdSender> annotationParser = new AnnotationParser<>(commandManager, CmdSender.class);
annotationParser.registerBuilderModifier(
@@ -241,7 +248,7 @@ public class AdvancedServerList<F>{
StringParser.stringParser(),
Description.of("The profile to edit."),
SuggestionProvider.suggesting(
getFileHandler().getProfiles().stream()
fileHandler().profiles().stream()
.map(ServerListProfile::file)
.map(Suggestion::suggestion)
.toList()
@@ -259,10 +266,11 @@ public class AdvancedServerList<F>{
Permission.permission("advancedserverlist.command.profiles.set")
)
)
.meta(CommandHandler.COMMAND_TYPE, CommandType.Type.ALL)
);
}
getPlugin().getPluginLogger().success("Loaded Command <white>/advancedserverlist</white>!");
plugin().pluginLogger().success("Loaded Command <white>/advancedserverlist</white>!");
}
private ParserDescriptor<CmdSender, ?> descriptor(String option){
@@ -295,34 +303,34 @@ public class AdvancedServerList<F>{
switch(date.getMonth()){
case JANUARY -> {
if(date.getDayOfMonth() == 1){
getPlugin().getPluginLogger().info("Happy new Year!");
getPlugin().getPluginLogger().info("");
plugin().pluginLogger().info("Happy new Year!");
plugin().pluginLogger().info("");
}
}
case JUNE -> {
getPlugin().getPluginLogger().info("Happy Pride Month!");
getPlugin().getPluginLogger().info("");
plugin().pluginLogger().info("Happy Pride Month!");
plugin().pluginLogger().info("");
}
case AUGUST -> {
if(date.getDayOfMonth() == 1){
getPlugin().getPluginLogger().info("Happy Birthday Switzerland!");
getPlugin().getPluginLogger().info("");
plugin().pluginLogger().info("Happy Birthday Switzerland!");
plugin().pluginLogger().info("");
}
}
case OCTOBER -> {
if(date.getDayOfMonth() == 31){
getPlugin().getPluginLogger().info("Happy Halloween!");
getPlugin().getPluginLogger().info("");
plugin().pluginLogger().info("Happy Halloween!");
plugin().pluginLogger().info("");
}
}
case DECEMBER -> {
if(date.getDayOfMonth() == 13){
getPlugin().getPluginLogger().info("Happy Birthday Andre_601!");
getPlugin().getPluginLogger().info("");
plugin().pluginLogger().info("Happy Birthday Andre_601!");
plugin().pluginLogger().info("");
}else
if(date.getDayOfMonth() > 23 && date.getDayOfMonth() < 27){
getPlugin().getPluginLogger().info("Merry Christmas!");
getPlugin().getPluginLogger().info("");
plugin().pluginLogger().info("Merry Christmas!");
plugin().pluginLogger().info("");
}
}
}
@@ -68,8 +68,8 @@ public class UpdateChecker{
public UpdateChecker(AdvancedServerList<?> core){
this.core = core;
this.logger = core.getPlugin().getPluginLogger();
this.loader = core.getPlugin().getLoader();
this.logger = core.plugin().pluginLogger();
this.loader = core.plugin().loader();
this.client = HttpClient.newBuilder().executor(Executors.newSingleThreadExecutor(new UpdateCheckThread())).build();
startUpdateChecker();
@@ -88,10 +88,10 @@ public class UpdateChecker{
if(version == null)
return;
int result = version.compare(core.getVersion());
int result = version.compare(core.version());
if(result == -1){
sender.sendPrefixedMsg("<green>A new Version of AdvancedServerList is available!");
sender.sendPrefixedMsg("<green>Your version: <white>%s", core.getVersion());
sender.sendPrefixedMsg("<green>Your version: <white>%s", core.version());
sender.sendPrefixedMsg("<green>Version on Modrinth: <white>%s", version.versionNumber());
sender.sendPrefixedMsg(
"<click:open_url:'https://modrinth.com/plugin/advancedserverlist/version/%s'>" +
@@ -103,7 +103,7 @@ public class UpdateChecker{
if(result == 1){
sender.sendPrefixedMsg(
"Your version (<white>%</white>) is newer than what is available on Modrinth (<white>%s</white>).",
core.getVersion(),
core.version(),
version.versionNumber()
);
sender.sendPrefixedMsg("Are you using a Development Version?");
@@ -137,14 +137,14 @@ public class UpdateChecker{
logger.debug(UpdateChecker.class, "Comparing versions...");
int result = version.compare(core.getVersion());
int result = version.compare(core.version());
switch(result){
case -1 -> printUpdateBanner(version);
case 0 -> logger.success("You are running the latest version!");
case 1 -> {
logger.info(
"[?] Your version (<white>%s</white>) is newer than what is available on Modrint (<white>%s</white>).",
core.getVersion(),
core.version(),
version.versionNumber()
);
logger.info(" Are you using a Development Version?");
@@ -163,7 +163,7 @@ public class UpdateChecker{
logger.debug(UpdateChecker.class, "Checking '%s' for updates...", finalUrl);
if(core.getVersion().equals("UNKNOWN")){
if(core.version().equals("UNKNOWN")){
logger.warn("Cannot perform update check. Plugin version is 'UNKNOWN'!");
return CompletableFuture.completedFuture(null);
}
@@ -173,7 +173,7 @@ public class UpdateChecker{
request = HttpRequest.newBuilder()
.uri(new URI(finalUrl))
.timeout(Duration.ofSeconds(5))
.header("User-Agent", "AdvancedServerList-" + loader + "/" + core.getVersion())
.header("User-Agent", "AdvancedServerList-" + loader + "/" + core.version())
.build();
}catch(URISyntaxException ex){
logger.warn("Cannot perform update check. URL '%s' is not a valid URI.", ex, finalUrl);
@@ -193,7 +193,7 @@ public class UpdateChecker{
logger.warn("=======================================================================");
logger.warn("You are running an outdated version of AdvancedServerList!");
logger.warn("");
logger.warn("Your version: <white>%s</white>", core.getVersion());
logger.warn("Your version: <white>%s</white>", core.version());
logger.warn("Modrinth: <white>%s</white>", version.versionNumber());
logger.warn("");
@@ -29,6 +29,8 @@ import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
import ch.andre601.advancedserverlist.core.AdvancedServerList;
import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
import ch.andre601.advancedserverlist.core.interfaces.commands.CommandType;
import ch.andre601.advancedserverlist.core.interfaces.dialogs.IDialog;
import ch.andre601.advancedserverlist.core.interfaces.dialogs.IDialogList;
import ch.andre601.advancedserverlist.core.migration.minimotd.MiniMOTDConfigMigrator;
import ch.andre601.advancedserverlist.core.migration.serverlistplus.SLPConfigMigrator;
import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
@@ -315,51 +317,7 @@ public class CommandHandler{
}
}
Path path = core.getPlugin().getFolderPath().resolve("profiles").resolve(profileName(profile));
if(!Files.exists(path)){
sender.sendErrorMsg("<red>No file with name</red> %s <red>found!", profile);
return;
}
YamlConfigurationLoader loader = YamlConfigurationLoader.builder()
.path(path)
.indent(2)
.nodeStyle(NodeStyle.BLOCK)
.defaultOptions(opt -> opt.serializers(optBuilder -> optBuilder.register(ProfileEntry.class, ProfileSerializer.INSTANCE)))
.build();
ConfigurationNode node;
try{
node = loader.load();
}catch(IOException ex){
sender.sendErrorMsg("<red>Encountered an IOException while trying to load file</red> %s<red>.", profile);
sender.sendErrorMsg("<red>Check console for details.");
core.getPlugin().getPluginLogger().warn("Encountered IOException while loading file <white>%s.yml</white>", profile);
return;
}
if(node == null){
sender.sendErrorMsg("<red>Unable to load file</red> %s<red>.", profile);
return;
}
try{
node.node("priority").set(priority);
node.node("condition").set(condition);
node.node("profiles").setList(ProfileEntry.class, slp.profiles());
node.set(ProfileEntry.class, builder.build());
}catch(SerializationException ex){
sender.sendErrorMsg("<red>Encountered a SerializationException while updating</red> %s<red>!", profile);
sender.sendErrorMsg("<red>Check console for details.");
core.getPlugin().getPluginLogger().warn("Encountered SerializationException while updating <white>%s</white>", profile);
return;
}
try{
loader.save(node);
if(core.fileHandler().saveProfile(profileName(profile), priority, condition, slp.profiles(), builder.build())){
if(sender.isPlayer()){
sender.sendPrefixedMsg(
"<green>Successfully updated <white>[<grey><hover:show_text:\"%s\">%s</hover></grey>]</white>!",
@@ -389,16 +347,16 @@ public class CommandHandler{
sender.sendPrefixedMsg(
"<green>Use <white><click:suggest_command:/asl reload>/asl reload</click></white> to apply changes."
);
}catch(IOException ex){
}else{
sender.sendErrorMsg("<red>Encountered an IOException while trying to save file</red> %s<red>.", profile);
sender.sendErrorMsg("<red>Check console for details.");
core.getPlugin().getPluginLogger().warn("Encountered IOException while saving file <white>%s.yml</white>", profile);
core.plugin().pluginLogger().warn("Encountered IOException while saving file <white>%s.yml</white>", profile);
}
}
private static ServerListProfile profile(AdvancedServerList<?> core, String name){
return core.getFileHandler().getProfiles().stream()
return core.fileHandler().profiles().stream()
.filter(p -> p.file().equalsIgnoreCase(profileName(name)))
.findFirst()
.orElse(null);
@@ -424,20 +382,13 @@ public class CommandHandler{
}
private static String getOptionValue(Object obj){
if(obj == null){
return "";
}else
if(obj instanceof Boolean bool){
return Boolean.toString(bool);
}else
if(obj instanceof Integer integer){
return Integer.toString(integer);
}else
if(obj instanceof String str){
return str;
}else{
return obj.toString();
}
return switch(obj){
case null -> "";
case Boolean bool -> Boolean.toString(bool);
case Integer integer -> Integer.toString(integer);
case String str -> str;
default -> obj.toString();
};
}
private final CommandManager<CmdSender> commandManager;
@@ -473,15 +424,15 @@ public class CommandHandler{
public void reload(CmdSender sender, AdvancedServerList<?> core){
sender.sendPrefixedMsg("Reloading plugin...");
if(core.getFileHandler().reloadConfig()){
if(core.fileHandler().reloadConfig()){
sender.sendPrefixedMsg("<green>Reloaded </green>config.yml<green>!");
}else{
sender.sendErrorMsg("<red>Error while reloading </red>config.yml<red>.");
sender.sendErrorMsg("<red>Check console for details.");
}
if(core.getFileHandler().reloadProfiles()){
sender.sendPrefixedMsg("<green>(Re)loaded </green>%d<green> Profile(s)!", core.getFileHandler().getProfiles().size());
if(core.fileHandler().reloadProfiles()){
sender.sendPrefixedMsg("<green>(Re)loaded </green>%d<green> Profile(s)!", core.fileHandler().profiles().size());
}else{
sender.sendErrorMsg("<red>Error while (re)loading profiles.");
sender.sendErrorMsg("<red>Check console for details.");
@@ -516,7 +467,7 @@ public class CommandHandler{
@NonNull @Argument(description = "The plugin to migrate from.") Plugin plugin
){
if(plugin == Plugin.SERVERLISTPLUS){
if(!core.getPlugin().isPluginEnabled("ServerListPlus")){
if(!core.plugin().isPluginEnabled("ServerListPlus")){
sender.sendErrorMsg("<red>ServerListPlus is not enabled.");
sender.sendErrorMsg("<red>The plugin is required for the migration to work.");
return;
@@ -559,7 +510,7 @@ public class CommandHandler{
sender.sendPrefixedMsg("Available Profiles");
sender.sendMsg("<dark_grey>│");
List<ServerListProfile> profiles = core.getFileHandler().getProfiles().stream()
List<ServerListProfile> profiles = core.fileHandler().profiles().stream()
.sorted(Comparator.comparingInt(ServerListProfile::priority).reversed())
.toList();
@@ -598,11 +549,6 @@ public class CommandHandler{
AdvancedServerList<?> core,
@NonNull @Argument(description = "Name of the profile to view.", suggestions = "profiles") String profile
){
if(!sender.isPlayer()){
sender.sendErrorMsg("<red>This command can only be executed by Players!");
return;
}
if(profile.isEmpty()){
sender.sendErrorMsg("<red>Insufficient arguments.");
sender.sendErrorMsg("<red>Please provide a proper profile name.");
@@ -749,7 +695,7 @@ public class CommandHandler{
String fileName = profileName(name);
if(core.getFileHandler().createFile(fileName)){
if(core.fileHandler().createFile(fileName)){
sender.sendPrefixedMsg("<green>Successfully created </green>%s<green>!", fileName);
sender.sendPrefixedMsg("<green>Use <white><click:suggest_command:/asl reload>/asl reload</click></white> to load the file.");
}else{
@@ -790,7 +736,7 @@ public class CommandHandler{
return;
}
Path profilePath = core.getPlugin().getFolderPath().resolve("profiles").resolve(copyName);
Path profilePath = core.plugin().folderPath().resolve("profiles").resolve(copyName);
if(!Files.exists(profilePath)){
try{
Files.createFile(profilePath);
@@ -798,7 +744,7 @@ public class CommandHandler{
sender.sendErrorMsg("<red>Encountered IOException while creating file </red>%s<red>.", copyName);
sender.sendErrorMsg("<red>Check console for details.");
core.getPlugin().getPluginLogger().warn("Encountered IOException while creating file <white>%s</white>", ex, copyName);
core.plugin().pluginLogger().warn("Encountered IOException while creating file <white>%s</white>", ex, copyName);
return;
}
}
@@ -817,12 +763,7 @@ public class CommandHandler{
sender.sendErrorMsg("<red>There was an IOException while loading file </red>%s<red>!", copyName);
sender.sendErrorMsg("<red>Check console for details.");
core.getPlugin().getPluginLogger().warn("Encountered IOException while loading file <white>%s</white>", ex, copyName);
return;
}
if(node == null){
sender.sendErrorMsg("<red>Cannot create ConfigurationNode for file </red>%s<red>", copyName);
core.plugin().pluginLogger().warn("Encountered IOException while loading file <white>%s</white>", ex, copyName);
return;
}
@@ -837,7 +778,7 @@ public class CommandHandler{
sender.sendErrorMsg("<red>There was a SerializationException while copying values from </red>%s<red>.", profile);
sender.sendErrorMsg("<red>Check console for details.");
core.getPlugin().getPluginLogger().warn("Encountered IOException while copying data from <white>%s</white> to <white>%s</white>.", ex, profileName, copyName);
core.plugin().pluginLogger().warn("Encountered IOException while copying data from <white>%s</white> to <white>%s</white>.", ex, profileName, copyName);
return;
}
@@ -849,10 +790,52 @@ public class CommandHandler{
sender.sendErrorMsg("<red>There was an IOException while loading file </red>%s<red>!", copyName);
sender.sendErrorMsg("<red>Check console for details.");
core.getPlugin().getPluginLogger().warn("Encountered IOException while loading file <white>%s</white>", ex, copyName);
core.plugin().pluginLogger().warn("Encountered IOException while loading file <white>%s</white>", ex, copyName);
}
}
@Command("profiles edit <profile>")
@CommandDescription("Opens a Dialog to edit a profile.")
@Permission({"advancedserverlist.admin", "advancedserverlist.command.profiles", "advancedserverlist.command.profiles.edit"})
@CommandType(CommandType.Type.PLAYER_ONLY)
public void edit(
CmdSender sender,
AdvancedServerList<?> core,
@NonNull @Argument(description = "Name of the profile to edit.", suggestions = "profiles") String profile
){
if(!core.plugin().isDialogsSupported()){
sender.sendErrorMsg("This command requires the new Dialog feature to be available!");
return;
}
ServerListProfile slp = profile(core, profile);
if(slp == null){
sender.sendErrorMsg("No profile with name <white>%s</white> found.", profile);
return;
}
IDialogList.IDialogListBuilder listBuilder = core.plugin().createDialogListBuilder(slp.file());
String warning = """
<gold><b>WARNING!</b></gold>
Dialog-based profile editing is currently an <i>experimental feature</i>!
Please create backups first before using it and report any bugs and/or glitches you may find.""";
listBuilder.appendBody(warning);
listBuilder.appendDialog(
createDialog(core, "Main Settings", warning, slp, slp.defaultProfile(), slp.priority(), slp.condition(), -1)
);
for(int i = 0; i < slp.profiles().size(); i++){
listBuilder.appendDialog(
createDialog(core, "Profiles <aqua>#" + (i + 1), warning, slp, slp.profiles().get(i), -1, null, i)
);
}
listBuilder.build().show(sender);
}
@Suggestions("help")
public List<String> helpQueries(CommandContext<CmdSender> context){
return this.commandManager.createHelpHandler()
@@ -872,7 +855,7 @@ public class CommandHandler{
@Suggestions("profiles")
public List<String> profilesSuggestions(CommandInput input, AdvancedServerList<?> core){
String name = input.readString();
List<String> profiles = core.getFileHandler().getProfiles().stream()
List<String> profiles = core.fileHandler().profiles().stream()
.map(profile -> profile.file().substring(0, profile.file().lastIndexOf('.')))
.toList();
if(name.isEmpty())
@@ -932,6 +915,40 @@ public class CommandHandler{
);
}
private IDialog<?> createDialog(
AdvancedServerList<?> core,
String title,
String warning,
ServerListProfile slp,
ProfileEntry entry,
int priority,
String condition,
int index
){
IDialog.IDialogBuilder builder = core.plugin().createDialogBuilder(title, slp, index);
builder.appendBody(warning);
if(index < 0){
builder.appendNumberRange("priority", "Priority", priority)
.appendTextInput("condition", "Condition", condition, 100);
}
builder.appendTextbox("motd", "MOTD", entry.motd(), 100, 2)
.appendTextInput("favicon", "Favicon", entry.favicon(), 100)
.appendBoolean("hidePlayers", "Hide Player Count", entry.hidePlayersEnabled())
.appendBoolean("hidePlayersHover", "Hide Player Count Hover", entry.hidePlayersHoverEnabled())
.appendTextbox("hover", "Player Count Hover", entry.players(), 200, 10)
.appendTextInput("text", "Player Count Text", entry.playerCountText(), 100)
.appendBoolean("extraPlayersEnabled", "Enable Extra Players", entry.extraPlayersEnabled())
.appendTextInput("extraPlayersCount", "Extra Players Count", entry.extraPlayersCount(), 100)
.appendBoolean("maxPlayersEnabled", "Enable Max Players", entry.maxPlayersEnabled())
.appendTextInput("maxPlayersCount", "Max Players Count", entry.maxPlayersCount(), 100)
.appendBoolean("onlinePlayersEnabled", "Enable Online Players", entry.onlinePlayersEnabled())
.appendTextInput("onlinePlayersCount", "Online Players Count", entry.onlinePlayersCount(), 100);
return builder.build();
}
public enum Plugin {
SERVERLISTPLUS,
MINIMOTD
@@ -0,0 +1,22 @@
package ch.andre601.advancedserverlist.core.commands;
import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
import ch.andre601.advancedserverlist.core.interfaces.commands.CommandType;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.incendo.cloud.execution.postprocessor.CommandPostprocessingContext;
import org.incendo.cloud.execution.postprocessor.CommandPostprocessor;
import org.incendo.cloud.services.type.ConsumerService;
public class CommandTypePostprocessor implements CommandPostprocessor<CmdSender>{
@Override
public void accept(@NonNull CommandPostprocessingContext<CmdSender> context){
CmdSender sender = context.commandContext().sender();
CommandType.Type type = context.commandContext().command().commandMeta().get(CommandHandler.COMMAND_TYPE);
if(type == CommandType.Type.ALL || (type == CommandType.Type.PLAYER_ONLY && sender.isPlayer()))
return;
sender.sendErrorMsg("<red>This command can only be executed by players!");
ConsumerService.interrupt();
}
}
@@ -145,7 +145,7 @@ public class ProfileOptionsSender{
builder.append(displayName);
if(option != null && !option.isEmpty())
if(option != null && !option.isEmpty() && file != null && !file.isEmpty())
builder.append("</click>");
if(hover != null && !hover.isEmpty())
@@ -159,7 +159,7 @@ public class ProfileOptionsSender{
}
}
enum ColorName{
public enum ColorName{
RED,
GREEN,
AQUA;
@@ -4,7 +4,10 @@ import ch.andre601.advancedserverlist.api.PlaceholderProvider;
import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
import ch.andre601.advancedserverlist.api.objects.GenericServer;
import ch.andre601.advancedserverlist.core.AdvancedServerList;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;
@NullMarked
public class MaintenancePlaceholder extends PlaceholderProvider{
private final AdvancedServerList<?> plugin;
@@ -15,8 +18,8 @@ public class MaintenancePlaceholder extends PlaceholderProvider{
this.plugin = plugin;
}
@Override
public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
if(!placeholder.equals("maintenanceEnabled") || !plugin.getPlugin().isPluginEnabled("Maintenance"))
public @Nullable String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
if(!placeholder.equals("maintenanceEnabled") || !plugin.plugin().isPluginEnabled("Maintenance"))
return null;
return String.valueOf(MaintenanceUtil.get().isMaintenanceEnabled());
@@ -0,0 +1,11 @@
package ch.andre601.advancedserverlist.core.compat.miniplaceholders;
import io.github.miniplaceholders.api.MiniPlaceholders;
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
public class MiniPlaceholdersUtil{
public static TagResolver tagResolvers(){
return MiniPlaceholders.globalPlaceholders();
}
}
@@ -72,14 +72,14 @@ public class PAPIUtil{
if(values.isEmpty())
return null;
return List.copyOf(values).get(0);
return List.copyOf(values).getFirst();
}
public <P> P getPlayer(Collection<P> players){
if(players.isEmpty())
return null;
return List.copyOf(players).get(0);
return List.copyOf(players).getFirst();
}
public String parse(String text, UUID carrier, UUID player){
@@ -44,28 +44,28 @@ import java.util.List;
public class PingEventHandler{
public static <F, P extends GenericPlayer> ProfileEntry handleEvent(GenericEventWrapper<F, P> event){
event.getPlugin().getPluginLogger().debug(PingEventHandler.class, "Received ping event. Handling it...");
event.plugin().pluginLogger().debug(PingEventHandler.class, "Received ping event. Handling it...");
if(event.isInvalidProtocol()){
event.getPlugin().getPluginLogger().debug(PingEventHandler.class, "Not handling event. Protocol was invalid.");
event.plugin().pluginLogger().debug(PingEventHandler.class, "Not handling event. Protocol was invalid.");
return null;
}
PluginCore<F> plugin = event.getPlugin();
String host = event.getVirtualHost();
PluginLogger logger = plugin.getPluginLogger();
PluginCore<F> plugin = event.plugin();
String host = event.virtualHost();
PluginLogger logger = plugin.pluginLogger();
logger.debug(PingEventHandler.class, "Protocol valid. Continue handling...");
int online = event.getOnlinePlayers();
int max = event.getMaxPlayers();
int online = event.onlinePlayers();
int max = event.maxPlayers();
P player = event.createPlayer(
plugin.getCore().getPlayerHandler().getCachedPlayer(event.getPlayerIP()),
event.getProtocolVersion()
plugin.core().playerHandler().getCachedPlayer(event.playerIP()),
event.protocolVersion()
);
GenericServer server = event.createGenericServer(online, max, host);
GenericServer server = event.createServer(online, max, host);
ServerListProfile profile = ProfileManager.resolveProfile(plugin.getCore(), player, server);
ServerListProfile profile = ProfileManager.resolveProfile(plugin.core(), player, server);
if(profile == null){
logger.debugWarn(PingEventHandler.class, "Server List Profile couldn't be resolved properly. Cancelling event handling...");
@@ -93,11 +93,12 @@ public class PingEventHandler{
String onlinePlayers = ComponentParser.text(entry.onlinePlayersCount())
.modifyText(text -> StringReplacer.replace(text, player, server))
.modifyText(text -> event.parsePAPIPlaceholders(text, player))
.applyMMTags(event.plugin())
.toString();
try{
online = onlinePlayers == null ? online : Integer.parseInt(onlinePlayers);
event.setOnlinePlayers(online);
event.onlinePlayers(online);
}catch(NumberFormatException ex){
logger.warn("Option 'playerCount -> onlinePlayers -> amount' is not a valid Number!");
}
@@ -110,13 +111,14 @@ public class PingEventHandler{
String extraPlayers = ComponentParser.text(entry.extraPlayersCount())
.modifyText(text -> StringReplacer.replace(text, player, server))
.modifyText(text -> event.parsePAPIPlaceholders(text, player))
.applyMMTags(event.plugin())
.toString();
try{
max = online + (extraPlayers == null ? 0 : Integer.parseInt(extraPlayers));
logger.debug(PingEventHandler.class, "'playerCount -> extraPlayers -> amount' is a valid number. Applying it...");
event.setMaxPlayers(max);
event.maxPlayers(max);
}catch(NumberFormatException ex){
logger.warn("Option 'playerCount -> extraPlayers -> amount' is not a valid Number!");
}
@@ -127,19 +129,20 @@ public class PingEventHandler{
String maxPlayers = ComponentParser.text(entry.maxPlayersCount())
.modifyText(text -> StringReplacer.replace(text, player, server))
.modifyText(text -> event.parsePAPIPlaceholders(text, player))
.applyMMTags(event.plugin())
.toString();
try{
max = maxPlayers == null ? 0 : Integer.parseInt(maxPlayers);
logger.debug(PingEventHandler.class, "'playerCount -> maxPlayers -> amount' is a valid number. Applying it...");
event.setMaxPlayers(max);
event.maxPlayers(max);
}catch(NumberFormatException ex){
logger.warn("Option 'playerCount -> maxPlayers -> amount' is not a valid Number!");
}
}
GenericServer finalServer = event.createGenericServer(online, max, host);
GenericServer finalServer = event.createServer(online, max, host);
if(ProfileManager.checkOption(entry.motd()) && ignoreMaintenance(event, "motd")){
logger.debug(PingEventHandler.class, "'motd' option present. Applying ['%s']...", String.join("', '", entry.motd()));
@@ -148,12 +151,13 @@ public class PingEventHandler{
.map(line -> ComponentParser.text(line)
.modifyText(text -> StringReplacer.replace(text, player, finalServer))
.modifyText(text -> event.parsePAPIPlaceholders(text, player))
.modifyText(text -> plugin.getCore().getTextCenterUtil().getCenteredText(text))
.modifyText(text -> plugin.core().textCenterUtil().getCenteredText(text))
.applyMMTags(event.plugin())
.toComponent()
)
.toList();
event.setMotd(Component.join(JoinConfiguration.separator(Component.newline()), motd));
event.motd(Component.join(JoinConfiguration.separator(Component.newline()), motd));
}
boolean hidePlayers = ProfileManager.checkOption(entry.hidePlayersEnabled());
@@ -167,10 +171,11 @@ public class PingEventHandler{
if(ProfileManager.checkOption(entry.playerCountText()) && !hidePlayers && ignoreMaintenance(event, "playerCountText")){
logger.debug(PingEventHandler.class, "'playerCount -> text' option set. Applying '%s'...", entry.playerCountText());
event.setPlayerCount(
event.playerCount(
ComponentParser.text(entry.playerCountText())
.modifyText(text -> StringReplacer.replace(text, player, finalServer))
.modifyText(text -> event.parsePAPIPlaceholders(text, player))
.applyMMTags(event.plugin())
.toString()
);
}
@@ -178,13 +183,13 @@ public class PingEventHandler{
boolean hidePlayersHover = ProfileManager.checkOption(entry.hidePlayersHoverEnabled());
if(hidePlayersHover){
logger.debug(PingEventHandler.class, "'playerCount -> hidePlayersHover' option set. Hiding Player Hover...");
event.setPlayersHidden();
event.playersHidden();
}
if(ProfileManager.checkOption(entry.players()) && !hidePlayers && !hidePlayersHover && ignoreMaintenance(event, "playerCountHover")){
logger.debug(PingEventHandler.class, "'playerCount -> hover' option set. Applying ['%s']...", String.join("', '", entry.players()));
event.setPlayers(entry.players(), player, server);
event.players(entry.players(), player, server);
}
if(ProfileManager.checkOption(entry.favicon()) && ignoreMaintenance(event, "favicon")){
@@ -195,16 +200,16 @@ public class PingEventHandler{
.modify(text -> event.parsePAPIPlaceholders(text, player))
.asString();
F favicon = plugin.getFaviconHandler().favicon(faviconString);
F favicon = plugin.faviconHandler().favicon(faviconString);
if(favicon == null){
logger.debugWarn(PingEventHandler.class, "Favicon was invalid or not yet resolved! Using default favicon of Server/Proxy...");
event.setDefaultFavicon();
event.defaultFavicon();
}else{
logger.debug(PingEventHandler.class, "Applying favicon...");
event.setFavicon(favicon);
event.favicon(favicon);
}
}
@@ -218,6 +223,6 @@ public class PingEventHandler{
if(!event.isMaintenanceModeActive())
return true;
return !event.getPlugin().getCore().getFileHandler().getBool(true, "disableDuringMaintenance", option);
return !event.plugin().core().fileHandler().getBool(true, "disableDuringMaintenance", option);
}
}
@@ -46,7 +46,8 @@ public class ConfigMigrator{
public static ConfigurationTransformation.Versioned create(){
return ConfigurationTransformation.versionedBuilder()
.versionKey("configVersion")
.addVersion(LATEST, eightToNine())
.addVersion(LATEST, nineToTen())
.addVersion(9, eightToNine())
.addVersion(8, sevenToEight())
.addVersion(7, sixToSeven())
.addVersion(6, fiveToSix())
@@ -57,6 +58,12 @@ public class ConfigMigrator{
.build();
}
public static ConfigurationTransformation nineToTen(){
return ConfigurationTransformation.builder()
.addAction(NodePath.path("faviconStrategy"), TransformAction.rename("faviconResizeStrategy"))
.build();
}
public static ConfigurationTransformation eightToNine(){
return ConfigurationTransformation.builder()
.addAction(NodePath.path(), (path, value) -> {
@@ -32,6 +32,7 @@ import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
import ch.andre601.advancedserverlist.core.profiles.profile.ProfileSerializer;
import org.spongepowered.configurate.ConfigurateException;
import org.spongepowered.configurate.ConfigurationNode;
import org.spongepowered.configurate.serialize.SerializationException;
import org.spongepowered.configurate.yaml.NodeStyle;
import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
@@ -46,6 +47,7 @@ import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Locale;
public class FileHandler{
@@ -61,18 +63,27 @@ public class FileHandler{
public FileHandler(AdvancedServerList<?> core){
this.plugin = core;
this.logger = core.getPlugin().getPluginLogger();
this.logger = core.plugin().pluginLogger();
this.config = core.getPlugin().getFolderPath().resolve("config.yml");
this.profilesFolder = core.getPlugin().getFolderPath().resolve("profiles");
this.config = core.plugin().folderPath().resolve("config.yml");
this.profilesFolder = core.plugin().folderPath().resolve("profiles");
}
public List<ServerListProfile> getProfiles(){
public List<ServerListProfile> profiles(){
return profiles;
}
public ServerListProfile profile(String file){
for(ServerListProfile profile : profiles){
if(profile.file().equalsIgnoreCase(file))
return profile;
}
return null;
}
public boolean loadConfig(){
File folder = plugin.getPlugin().getFolderPath().toFile();
File folder = plugin.plugin().folderPath().toFile();
if(!folder.exists() && !folder.mkdirs()){
logger.warn("Couldn't create folder for plugin. Is it missing Write permissions?");
return false;
@@ -106,6 +117,48 @@ public class FileHandler{
}
}
public boolean saveProfile(String file, int priority, String condition, List<ProfileEntry> profiles, ProfileEntry defaultProfile){
String filename = file.toLowerCase(Locale.ROOT);
Path filePath = profilesFolder.resolve(filename.endsWith(".yml") ? filename : filename + ".yml");
if(!Files.exists(filePath)){
logger.warn("Cannot find profile with file name '<white>%s</white>'", filename);
return false;
}
YamlConfigurationLoader loader = YamlConfigurationLoader.builder()
.defaultOptions(opts -> opts.serializers(build -> build.register(ProfileEntry.class, ProfileSerializer.INSTANCE)))
.path(filePath)
.nodeStyle(NodeStyle.BLOCK)
.build();
ConfigurationNode node;
try{
node = loader.load();
}catch(IOException ex){
logger.warn("Encountered an IOException while loading file '<white>%s</white>'", ex, filename);
return false;
}
if(node == null)
return false;
try{
node.node("priority").set(priority);
node.node("condition").set(condition);
node.node("profiles").setList(ProfileEntry.class, profiles);
node.set(ProfileEntry.class, defaultProfile);
loader.save(node);
return true;
}catch(SerializationException ex){
logger.warn("Encountered a SerializationException while saving file '<white>%s</white>'", ex, filename);
return false;
}catch(IOException ex){
logger.warn("Encountered an IOException while saving file '<white>%s</white>'", ex, filename);
return false;
}
}
public boolean createFile(String name){
if(Files.notExists(profilesFolder) && profilesFolder.toFile().mkdirs()){
logger.debugSuccess(FileHandler.class, "Successfully created profiles folder.");
@@ -219,7 +272,7 @@ public class FileHandler{
private boolean makeBackup(){
logger.info("[-] Making backup of old config.yml...");
File backups = plugin.getPlugin().getFolderPath().resolve("backups").toFile();
File backups = plugin.plugin().folderPath().resolve("backups").toFile();
if(!backups.exists() && !backups.mkdirs()){
logger.failure("Cannot create backups folder for migration!");
return false;
@@ -26,8 +26,11 @@
package ch.andre601.advancedserverlist.core.interfaces.core;
import ch.andre601.advancedserverlist.core.AdvancedServerList;
import ch.andre601.advancedserverlist.core.interfaces.dialogs.IDialog;
import ch.andre601.advancedserverlist.core.interfaces.dialogs.IDialogList;
import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
import ch.andre601.advancedserverlist.core.profiles.handlers.FaviconHandler;
import org.incendo.cloud.CommandManager;
@@ -48,28 +51,34 @@ public interface PluginCore<F>{
void startScheduler();
AdvancedServerList<F> getCore();
AdvancedServerList<F> core();
Path getFolderPath();
Path folderPath();
PluginLogger getPluginLogger();
PluginLogger pluginLogger();
FaviconHandler<F> getFaviconHandler();
FaviconHandler<F> faviconHandler();
CommandManager<CmdSender> getCommandManager();
CommandManager<CmdSender> commandManager();
String getPlatformInfo();
String platformInfo();
String getLoader();
String loader();
boolean isPluginEnabled(String plugin);
boolean isDialogsSupported();
F createFavicon(BufferedImage image) throws Exception;
IDialogList.IDialogListBuilder createDialogListBuilder(String title);
IDialog.IDialogBuilder createDialogBuilder(String title, ServerListProfile profile, int profilesPosition);
default boolean isDebugEnabled(){
if(getCore() == null)
if(core() == null)
return false;
return getCore().getFileHandler().getBoolean("debug");
return core().fileHandler().getBoolean("debug");
}
}
@@ -0,0 +1,23 @@
package ch.andre601.advancedserverlist.core.interfaces.dialogs;
import ch.andre601.advancedserverlist.api.objects.NullBool;
import java.util.List;
public interface IDialog<T>{
T createDialog();
interface IDialogBuilder{
IDialogBuilder appendBody(String body);
IDialogBuilder appendTextInput(String key, String title, String initValue, int maxLength);
IDialogBuilder appendTextbox(String key, String title, List<String> initValue, int maxLength, int rows);
IDialogBuilder appendNumberRange(String key, String title, int initValue);
IDialogBuilder appendBoolean(String key, String title, NullBool initValue);
IDialog<?> build();
}
}
@@ -0,0 +1,16 @@
package ch.andre601.advancedserverlist.core.interfaces.dialogs;
import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
public interface IDialogList{
void show(CmdSender sender);
interface IDialogListBuilder{
IDialogListBuilder appendBody(String body);
IDialogListBuilder appendDialog(IDialog<?> dialog);
IDialogList build();
}
}
@@ -40,23 +40,23 @@ public interface GenericEventWrapper<F, P extends GenericPlayer>{
GenericServerListEvent callEvent(ProfileEntry entry);
void setMaxPlayers(int maxPlayers);
void maxPlayers(int maxPlayers);
void setOnlinePlayers(int onlinePlayers);
void onlinePlayers(int onlinePlayers);
void setMotd(Component component);
void motd(Component component);
void hidePlayers();
void setPlayerCount(String name);
void playerCount(String name);
void setPlayers(List<String> players, P player, GenericServer server);
void players(List<String> players, P player, GenericServer server);
void setPlayersHidden();
void playersHidden();
void setFavicon(F favicon);
void favicon(F favicon);
void setDefaultFavicon();
void defaultFavicon();
void updateEvent();
@@ -64,23 +64,23 @@ public interface GenericEventWrapper<F, P extends GenericPlayer>{
boolean isMaintenanceModeActive();
int getProtocolVersion();
int protocolVersion();
int getOnlinePlayers();
int onlinePlayers();
int getMaxPlayers();
int maxPlayers();
String getPlayerIP();
String playerIP();
String parsePAPIPlaceholders(String text, P player);
String getVirtualHost();
String virtualHost();
PluginCore<F> getPlugin();
PluginCore<F> plugin();
P createPlayer(CachedPlayer player, int protocol);
GenericServer createGenericServer(int playersOnline, int playersMax, String host);
GenericServer createServer(int playersOnline, int playersMax, String host);
default String resolveHost(InetSocketAddress address){
return address == null ? null : address.getHostString();
@@ -49,12 +49,14 @@ import java.util.List;
public class MiniMOTDConfigMigrator{
public static boolean migrate(AdvancedServerList<?> core, CmdSender sender){
core.getPlugin().downloadLibrary("org.spongepowered", "configurate-hocon", "4.1.2");
sender.sendMsg("Loading Configurate-Hocon library. This may take a while...");
core.plugin().downloadLibrary("org.spongepowered", "configurate-hocon", "4.1.2");
sender.sendMsg("<green>Library loaded!");
PluginLogger logger = core.getPlugin().getPluginLogger();
String folder = core.getPlugin().getLoader().equals("velocity") ? "minimotd-velocity" : "MiniMOTD";
PluginLogger logger = core.plugin().pluginLogger();
String folder = core.plugin().loader().equals("velocity") ? "minimotd-velocity" : "MiniMOTD";
Path mainConf = core.getPlugin().getFolderPath().getParent().resolve(folder).resolve("main.conf");
Path mainConf = core.plugin().folderPath().getParent().resolve(folder).resolve("main.conf");
if(!Files.exists(mainConf)){
logger.warn("[<white>Migrator - MiniMOTD</white>] Cannot find a main.conf file in <white>/plugins/%s/</white> folder.", folder);
sender.sendErrorMsg(" -> <red>No main.conf file found.");
@@ -98,7 +100,7 @@ public class MiniMOTDConfigMigrator{
if(config.motdEnabled()){
if(config.motds().size() == 1){
applyMotd(profileBuilder, config.motds().get(0));
applyMotd(profileBuilder, config.motds().getFirst());
}else
if(config.motds().size() > 1){
for(int i = 0; i < config.motds().size(); i++){
@@ -109,7 +111,7 @@ public class MiniMOTDConfigMigrator{
if(config.iconEnabled()){
if(config.motds().size() == 1){
MiniMOTDConfig.Motd motd = config.motds().get(0);
MiniMOTDConfig.Motd motd = config.motds().getFirst();
if(!motd.icon().isEmpty()){
profileBuilder.favicon(motd.icon());
}
@@ -152,7 +154,7 @@ public class MiniMOTDConfigMigrator{
return false;
}
Path profile = core.getPlugin().getFolderPath().resolve("profiles").resolve("minimotd_migrated.yml");
Path profile = core.plugin().folderPath().resolve("profiles").resolve("minimotd_migrated.yml");
if(Files.exists(profile)){
logger.warn("[<white>Migrator - MiniMOTD</white>] Cannot create new file minimotd_migrated.yml. One with the same name is already present.");
sender.sendErrorMsg(" -> <red>File</red> minimotd_migrated.yml <red>already present.");
@@ -99,7 +99,7 @@ public class SLPConfigMigrator{
public static int migrate(AdvancedServerList<?> core, CmdSender sender){
ServerListPlusCore slpCore = ServerListPlusCore.getInstance();
PluginLogger logger = core.getPlugin().getPluginLogger();
PluginLogger logger = core.plugin().pluginLogger();
if(slpCore == null){
logger.warn("[<white>Migrator - ServerListPlus</white>] Cannot migrate ServerListPlus config. ServerListPlus is not active!");
return 0;
@@ -128,7 +128,7 @@ public class SLPConfigMigrator{
}
private static int parseConf(AdvancedServerList<?> core, CmdSender sender, PersonalizedStatusConf.StatusConf conf, Type type){
PluginLogger logger = core.getPlugin().getPluginLogger();
PluginLogger logger = core.plugin().pluginLogger();
if(conf == null){
logger.info("[<white>Migrator - ServerListPlus</white>] No StatusConf found for type <white>%s</white>. Skipping...", type.getName());
sender.sendPrefixedMsg(" -> Not found! Skipping...");
@@ -176,7 +176,7 @@ public class SLPConfigMigrator{
return 0;
}
Path profile = core.getPlugin().getFolderPath().resolve("profiles").resolve(type.getFile());
Path profile = core.plugin().folderPath().resolve("profiles").resolve(type.getFile());
if(Files.exists(profile)){
logger.warn("[<white>Migrator - ServerListPlus</white>] Cannot create new file <white>%s</white>. One with the same name is already present", type.getFile());
sender.sendErrorMsg(" -> <red>File</red> %s <red>already present.", type.getFile());
@@ -223,7 +223,7 @@ public class SLPConfigMigrator{
if(type == Type.PERSONALIZED){
node.node("condition")
.set("${player name} != \"" + core.getFileHandler().getString("Anonymous", "unknownPlayer", "name") + "\"");
.set("${player name} != \"" + core.fileHandler().getString("Anonymous", "unknownPlayer", "name") + "\"");
}else
if(type == Type.BANNED){
node.node("condition")
@@ -25,8 +25,11 @@
package ch.andre601.advancedserverlist.core.parsing;
import ch.andre601.advancedserverlist.core.compat.miniplaceholders.MiniPlaceholdersUtil;
import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import java.util.function.Function;
@@ -61,6 +64,17 @@ public class ComponentParser{
return this;
}
public ComponentParser applyMMTags(PluginCore<?> plugin){
if(!plugin.isPluginEnabled("MiniPlaceholders"))
return this;
TagResolver resolver = MiniPlaceholdersUtil.tagResolvers();
Component component = mm.deserialize(this.text, resolver);
this.text = mm.serialize(component);
return this;
}
public Component toComponent(){
return mm.deserialize(text);
}
@@ -77,8 +77,8 @@ public class TextCenterUtil{
private Map<String, FontInfo> loadFontWidths(AdvancedServerList<?> plugin){
try(InputStream stream = plugin.getClass().getResourceAsStream("/char-widths.json.gz")){
if(stream == null){
plugin.getPlugin().getPluginLogger().warn("Internal char-widths.json.gz couldn't be retrieved.");
plugin.getPlugin().getPluginLogger().warn("The <center> Placeholder won't work.");
plugin.plugin().pluginLogger().warn("Internal char-widths.json.gz couldn't be retrieved.");
plugin.plugin().pluginLogger().warn("The <center> Placeholder won't work.");
return new HashMap<>();
}
@@ -87,9 +87,9 @@ public class TextCenterUtil{
return new Gson().fromJson(reader, new TypeToken<Map<String, FontInfo>>(){}.getType());
}catch(IOException ex){
plugin.getPlugin().getPluginLogger().warn("Encountered IOException while loading font widths.");
plugin.getPlugin().getPluginLogger().warn("The <center> Placeholder won't work.");
plugin.getPlugin().getPluginLogger().warn("Cause: <white>%s</white>", ex.getMessage());
plugin.plugin().pluginLogger().warn("Encountered IOException while loading font widths.");
plugin.plugin().pluginLogger().warn("The <center> Placeholder won't work.");
plugin.plugin().pluginLogger().warn("Cause: <white>%s</white>", ex.getMessage());
return new HashMap<>();
}
}
@@ -0,0 +1,81 @@
package ch.andre601.advancedserverlist.core.placeholders;
import ch.andre601.advancedserverlist.api.PlaceholderProvider;
import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
import ch.andre601.advancedserverlist.api.objects.GenericServer;
import org.jspecify.annotations.NonNull;
import org.jspecify.annotations.Nullable;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.function.Function;
public class DatePlaceholder extends PlaceholderProvider{
public DatePlaceholder(){
super("date");
}
@Override
public @Nullable String parsePlaceholder(@NonNull String placeholder, @NonNull GenericPlayer player, @NonNull GenericServer server){
String[] args = placeholder.split("\\s+");
return switch(args[0]){
case "current" -> {
String format = "dd/MM/yyyy";
if(args.length > 1){
format = format(Arrays.copyOfRange(args, 1, args.length));
}
try{
SimpleDateFormat dateFormat = new SimpleDateFormat(format);
yield dateFormat.format(new Date());
}catch(IllegalArgumentException ex){
yield "ERR: Invalid Date pattern " + format;
}
}
case "isBefore" -> compareDates(args, integer -> integer < 0);
case "isExactly" -> compareDates(args, integer -> integer == 0);
case "isAfter" -> compareDates(args, integer -> integer > 0);
default -> null;
};
}
private String format(String... args){
if(args.length == 0)
return "dd/MM/yyyy";
String format = String.join(" ", args);
if(format.trim().isEmpty()){
return "dd/MM/yyyy";
}else{
return format.trim();
}
}
private String compareDates(String[] args, Function<Integer, Boolean> function){
if(args.length == 1)
return "ERR: No Date provided!";
String targetDateStr = args[1];
String format = "dd/MM/yyyy";
if(args.length > 3){
format = format(Arrays.copyOfRange(args, 2, args.length));
}
SimpleDateFormat dateFormat;
try{
dateFormat = new SimpleDateFormat(format);
Date targetDate = dateFormat.parse(targetDateStr);
int diff = new Date().compareTo(targetDate);
return String.valueOf(function.apply(diff));
}catch(IllegalArgumentException ex){
return "ERR: Invalid Date format provided!";
}catch(ParseException ex){
return "ERR: Received invalid Date " + targetDateStr;
}
}
}
@@ -46,9 +46,9 @@ public record ServerListProfile(int priority, String condition, ProfileEntry def
return true;
ParseWarnCollector collector = new ParseWarnCollector(condition);
PluginLogger logger = core.getPlugin().getPluginLogger();
PluginLogger logger = core.plugin().pluginLogger();
boolean result = core.getParser().evaluate(condition, player, server, collector);
boolean result = core.parser().evaluate(condition, player, server, collector);
if(collector.hasWarnings()){
logger.warn("Encountered <white>%d</white> Error(s) while parsing condition for file '<white>%s</white>':", collector.getWarnings().size(), file);
@@ -38,10 +38,10 @@ public class FaviconHandler<F>{
public FaviconHandler(AdvancedServerList<F> core){
this.core = core;
this.logger = core.getPlugin().getPluginLogger();
this.logger = core.plugin().pluginLogger();
this.faviconThreadPool = createThreadPool();
this.faviconCache = CacheBuilder.newBuilder()
.expireAfterWrite(core.getFileHandler().getLong(1, 1, "faviconCacheTime"), TimeUnit.MINUTES)
.expireAfterWrite(core.fileHandler().getLong(1, 1, "faviconCacheTime"), TimeUnit.MINUTES)
.build();
loadLocalFavicons();
@@ -110,6 +110,7 @@ public class FaviconHandler<F>{
public void cleanCache(){
localFavicons.clear();
faviconCache.invalidateAll();
loadLocalFavicons();
}
@@ -118,7 +119,7 @@ public class FaviconHandler<F>{
BufferedImage image = new BufferedImage(64, 64, BufferedImage.TYPE_INT_ARGB);
Graphics2D graphics = image.createGraphics();
String strategy = core.getFileHandler().getString("resize", "faviconStrategy");
String strategy = core.fileHandler().getString("resize", "faviconStrategy");
int layer = 0;
for(BufferedImage img : images){
layer++;
@@ -172,7 +173,8 @@ public class FaviconHandler<F>{
}else
if(input.toLowerCase(Locale.ROOT).endsWith(".png")){
logger.debug(FaviconHandler.class, "Returning local Favicon '%s'...", input);
return localFavicons.get(input.toLowerCase(Locale.ROOT)).image();
FaviconPair<F> pair = localFavicons.get(input.toLowerCase(Locale.ROOT));
return pair == null ? null : pair.image();
}else{
logger.debug(FaviconHandler.class, "Handling Player Name/UUID '%s'...", input);
return fromURL("https://mc-heads.net/avatar/" + input + "/64");
@@ -200,7 +202,7 @@ public class FaviconHandler<F>{
logger.info("[-] Loading local images as Favicons...");
Path folder = core.getPlugin().getFolderPath().resolve("favicons");
Path folder = core.plugin().folderPath().resolve("favicons");
if(!Files.exists(folder)){
try{
Files.createDirectories(folder);
@@ -228,7 +230,7 @@ public class FaviconHandler<F>{
if(image == null)
return;
F favicon = core.getPlugin().createFavicon(image);
F favicon = core.plugin().createFavicon(image);
if(favicon == null)
return;
@@ -245,7 +247,7 @@ public class FaviconHandler<F>{
logger.debug(FaviconHandler.class, "Creating request for URL '%s'...", url);
HttpRequest request = HttpRequest.newBuilder()
.uri(new URI(url))
.header("User-Agent", "AdvancedServerList-" + core.getPlugin().getLoader() + "/" + core.getVersion())
.header("User-Agent", "AdvancedServerList-" + core.plugin().loader() + "/" + core.version())
.build();
try(InputStream stream = client.send(request, HttpResponse.BodyHandlers.ofInputStream()).body()){
@@ -282,7 +284,7 @@ public class FaviconHandler<F>{
BufferedImage image = new BufferedImage(64, 64, BufferedImage.TYPE_INT_ARGB);
Graphics2D graphics = image.createGraphics();
String resizeMode = core.getFileHandler().getString("resize", "faviconStrategy");
String resizeMode = core.fileHandler().getString("resize", "faviconStrategy");
switch(resizeMode.toLowerCase(Locale.ROOT)){
case "center" -> {
int height = original.getHeight();
@@ -316,7 +318,7 @@ public class FaviconHandler<F>{
private F createFavicon(BufferedImage image){
try{
return core.getPlugin().createFavicon(image);
return core.plugin().createFavicon(image);
}catch(Exception ex){
logger.warn("Encountered an Exception while trying to create a Favicon instance.", ex);
return null;
@@ -61,8 +61,8 @@ public class PlayerHandler{
public PlayerHandler(AdvancedServerList<?> core){
this.core = core;
this.logger = core.getPlugin().getPluginLogger();
this.cache = core.getPlugin().getFolderPath().resolve("playercache.json");
this.logger = core.plugin().pluginLogger();
this.cache = core.plugin().folderPath().resolve("playercache.json");
}
public void load(){
@@ -71,7 +71,7 @@ public class PlayerHandler{
return;
}
if(core.getFileHandler().getBoolean("disableCache")){
if(core.fileHandler().getBoolean("disableCache")){
logger.info("'disableCache' is set to true. Skipping playercache.json loading...");
return;
}
@@ -103,7 +103,7 @@ public class PlayerHandler{
return;
}
if(core.getFileHandler().getBoolean("disableCache")){
if(core.fileHandler().getBoolean("disableCache")){
logger.debug(PlayerHandler.class, "[-] 'disable_cache' is set to true. Not saving cached players.");
return;
}
@@ -117,14 +117,14 @@ public class PlayerHandler{
}
public void addPlayer(String ip, String name, UUID uuid){
if(contains(ip) || core.getFileHandler().getBoolean("disableCache"))
if(contains(ip) || core.fileHandler().getBoolean("disableCache"))
return;
cachedPlayers.add(new CachedPlayer(ip, name, uuid));
}
public CachedPlayer getCachedPlayer(String key){
if(!contains(key) || core.getFileHandler().getBoolean("disableCache"))
if(!contains(key) || core.fileHandler().getBoolean("disableCache"))
return getDefaultPlayer();
for(CachedPlayer player : cachedPlayers){
@@ -164,8 +164,8 @@ public class PlayerHandler{
return (defaultPlayer = new CachedPlayer(
"0.0.0.0",
core.getFileHandler().getString("Anonymous", "unknownPlayer", "name"),
convertToUUID(core.getFileHandler().getString(defaultUUID.toString(), "unknownPlayer", "uuid"))
core.fileHandler().getString("Anonymous", "unknownPlayer", "name"),
convertToUUID(core.fileHandler().getString(defaultUUID.toString(), "unknownPlayer", "uuid"))
));
}
@@ -78,7 +78,7 @@ public class ProfileManager{
}
public static ServerListProfile resolveProfile(AdvancedServerList<?> core, GenericPlayer player, GenericServer server){
for(ServerListProfile profile : core.getFileHandler().getProfiles()){
for(ServerListProfile profile : core.fileHandler().profiles()){
if(profile.isInvalidProfile())
continue;
@@ -68,7 +68,7 @@ public class StringReplacer{
}
private static String parsePlaceholder0(String input, ParsePosition position, GenericPlayer player, GenericServer server, ParseWarnCollector collector){
AdvancedServerListAPI api = AdvancedServerList.getApi();
AdvancedServerListAPI api = AdvancedServerList.api();
int index = position.getIndex();
StringBuilder identifier = new StringBuilder();
+1 -1
View File
@@ -77,7 +77,7 @@ faviconCacheTime: 1
#
# Setting any not listed option or leaving this blank/removing it sets the option to resize.
#
faviconStrategy: 'resize'
faviconResizeStrategy: 'resize'
#
# Options to disable while the Maintenance Plugin is present and Maintenance Mode is active.
+19 -19
View File
@@ -2,7 +2,7 @@
# Set the priority of this profile.
# If there are multiple profiles (files) will they be sorted by priority, starting with highest.
#
# Read more: https://asl.andre601.ch/profiles/#priority
# Read more: https://asl.andre601.ch/profiles/options/priority/
#
priority: 0
@@ -14,7 +14,7 @@ priority: 0
#
# Removing the condition option or setting it to an empty String will be treated as a true condition being returned.
#
# Read more: https://asl.andre601.ch/profiles/#condition
# Read more: https://asl.andre601.ch/profiles/options/condition
#
condition: ''
@@ -30,7 +30,7 @@ condition: ''
#
# When not present or empty (profiles: []), no profiles will be used and global options from the file will be used instead.
#
# Read more: https://asl.andre601.ch/profiles/#profiles
# Read more: https://asl.andre601.ch/profiles/options/profiles
#
profiles:
- motd: ['<aqua>Line A', '<gold>Line B']
@@ -50,7 +50,7 @@ profiles:
#
# When not present or empty (motd: []), no MOTD will be set.
#
# Read more: https://asl.andre601.ch/profiles/#motd
# Read more: https://asl.andre601.ch/profiles/options/motd
#
motd:
- '<grey>First Line'
@@ -71,7 +71,7 @@ motd:
#
# If not present or empty (favicon: ''), defaults to not modifying the favicon.
#
# Read more: https://asl.andre601.ch/profiles/#favicon
# Read more: https://asl.andre601.ch/profiles/options/favicon
#
# "The favicon isn't showing!"
# This is a side effect of using either URLs or player names/UUIDs for the favicon.
@@ -87,7 +87,7 @@ favicon: ''
#
# Contains options for modifying the player count (Text displaying <online>/<max>).
#
# Read more: https://asl.andre601.ch/profiles/#playercount
# Read more: https://asl.andre601.ch/profiles/options/playercount
#
playerCount:
#
@@ -97,7 +97,7 @@ playerCount:
#
# If not present, defaults to false.
#
# Read more: https://asl.andre601.ch/profiles/#hideplayers
# Read more: https://asl.andre601.ch/profiles/options/playercount/hideplayers
#
hidePlayers: false
#
@@ -106,7 +106,7 @@ playerCount:
#
# If not present, defaults to false.
#
# Read more: https://asl.andre601.ch/profiles/#hideplayershover
# Read more: https://asl.andre601.ch/profiles/options/playercount/hideplayershover
#
hidePlayersHover: false
#
@@ -116,7 +116,7 @@ playerCount:
#
# If not present or empty (hover: []), defaults to not modifying the hover.
#
# Read more: https://asl.andre601.ch/profiles/#hover
# Read more: https://asl.andre601.ch/profiles/options/playercount/hover
#
hover:
- '<aqua>Line 1'
@@ -130,7 +130,7 @@ playerCount:
#
# If not present or empty (text: ''), defaults to not modifying the text.
#
# Read more: https://asl.andre601.ch/profiles/#text
# Read more: https://asl.andre601.ch/profiles/options/playercount/text
#
text: ''
#
@@ -139,7 +139,7 @@ playerCount:
#
# Using this feature will modify the ${server playersMax} placeholder, except for usage in the condition option.
#
# Read more: https://asl.andre601.ch/profiles/#extraplayers
# Read more: https://asl.andre601.ch/profiles/options/playercount/extraplayers
#
extraPlayers:
#
@@ -149,7 +149,7 @@ playerCount:
#
# If not present, defaults to false.
#
# Read more: https://asl.andre601.ch/profiles/#extraplayers-enabled
# Read more: https://asl.andre601.ch/profiles/options/playercount/extraplayers#enabled
#
enabled: false
#
@@ -161,7 +161,7 @@ playerCount:
#
# If not present, defaults to 0.
#
# Read more: https://asl.andre601.ch/profiles/#extraplayers-amount
# Read more: https://asl.andre601.ch/profiles/options/playercount/extraplayers#amount
#
amount: 0
#
@@ -169,7 +169,7 @@ playerCount:
#
# Using this feature will modify the ${server playersMax} placeholder, except for usage in the condition option.
#
# Read more: https://asl.andre601.ch/profiles/#maxplayers
# Read more: https://asl.andre601.ch/profiles/options/playercount/maxplayers
#
maxPlayers:
#
@@ -178,7 +178,7 @@ playerCount:
#
# If not present, defaults to false.
#
# Read more: https://asl.andre601.ch/profiles/#maxplayers-enabled
# Read more: https://asl.andre601.ch/profiles/options/playercount/maxplayers#enabled
#
enabled: false
#
@@ -187,13 +187,13 @@ playerCount:
#
# If not present, defaults to 0.
#
# Read more: https://asl.andre601.ch/profiles/#maxplayers-amount
# Read more: https://asl.andre601.ch/profiles/options/playercount/maxplayers#amount
#
amount: 0
#
# The onlinePlayers feature allows to set a number to use as the online player count to display.
#
# Read more: https://asl.andre601.ch/profiles/#onlineplayers
# Read more: https://asl.andre601.ch/profiles/options/playercount/onlineplayers
#
onlinePlayers:
#
@@ -202,7 +202,7 @@ playerCount:
#
# If not present, defaults to false.
#
# Read more: https://asl.andre601.ch/profiles/#onlineplayers-enabled
# Read more: https://asl.andre601.ch/profiles/options/playercount/onlineplayers#enabled
#
enabled: false
#
@@ -211,6 +211,6 @@ playerCount:
#
# If not present, defaults to current online player count.
#
# Read more: https://asl.andre601.ch/profiles/#onlineplayers-amount
# Read more: https://asl.andre601.ch/profiles/options/playercount/onlineplayers#amount
#
amount: 0
+3 -2
View File
@@ -1,6 +1,7 @@
{% extends "base.html" %}
{% block announce %}
<span class="twemoji">{% include ".icons/octicons/paintbrush-24.svg" %}</span>
The <a href="/profiles">Profiles page</a> received a huge restructuring!
<span class="twemoji balloon">{% include ".icons/material/balloon.svg" %}</span>
<span class="rainbow">Celebrating <b>50,000 downloads</b> of AdvancedServerList! THANK YOU!</span>
<span class="twemoji balloon">{% include ".icons/material/balloon.svg" %}</span>
{% endblock %}
+1 -1
View File
@@ -1,6 +1,6 @@
[discord]: https://discord.gg/MyPTjpsgGH
[placeholderapi]: https://hangar.papermc.io/HelpChat/PlaceholderAPI
[placeholderapi]: https://modrinth.com/plugin/PlaceholderAPI
[viaversion]: https://hangar.papermc.io/ViaVersion/ViaVersion
[papiproxybridge]: https://hangar.papermc.io/William278/PAPIProxyBridge
[maintenance]: https://hangar.papermc.io/kennytv/Maintenance
+39
View File
@@ -0,0 +1,39 @@
---
icon: octicons/checklist-24
---
# LuckPerms Addon
The LuckPerms addon provides placeholders to return values from LuckPerms for a specific player.
This can be a players primary group, whether they have a specific group or whether they have a specific permission.
/// note
The Userdata retrieval is done asynchronously by LuckPerms.
However, this addon forces the thread for this to be blocked, which can cause lag, if done on the main thread.
This was done due to possible downsides and issues with trying to keep it async and block-free.
To mitigate possible lag is the retrieved user data cached for 1 minute before being discarded.
///
## Placeholders
**Supported Platforms:**
<!-- icon:all -->
| Placeholder | Description |
|-------------------------------------------|-----------------------------------------------------------------------------------------------------------------|
| `${luckperms hasGroup <group>}` | Returns whether the player has the specified group or not. |
| `${luckperms hasPermission <permission>}` | Returns whether the player has the specified permission.<br/>No permission or one set to `false` returns false. |
| `${luckperms primaryGroup}` | Gives the name of the primary group the player has. |
/// details | Example
type: example
```yaml title="is_admin.yml
priority: 1
condition: "${luckperms hasGroup admin}"
motd:
- "<yellow>Welcome Admin!"
```
///
+6
View File
@@ -19,6 +19,12 @@ These Addons are made by Andre601 and available together with the plugin downloa
Addon for different Punishment plugins such as AdvancedBan, that add new placeholders to use in AdvancedServerList.
- [**LuckPerms**](first-party/luckperms.md)
----
Addon for adding LuckPerms-related placeholders to use in conditions.
</div>
## Third-party
+82
View File
@@ -61,4 +61,86 @@
padding: .5em;
line-height: 0;
color: var(--md-default-fg-color);
}
/* Animations */
@keyframes balloon {
0% {
transform: translate(0rem, 0rem) rotate(0deg) scale(2);
}
10% {
transform: translate(0.05rem, -0.08rem) rotate(2deg) scale(1.95);
}
20% {
transform: translate(-0.07rem, 0.06rem) rotate(-3deg) scale(2);
}
30% {
transform: translate(0.1rem, -0.02rem) rotate(1.5deg) scale(2.05);
}
40% {
transform: translate(-0.06rem, -0.1rem) rotate(-2deg) scale(1.95);
}
50% {
transform: translate(0.02rem, 0.08rem) rotate(3deg) scale(2);
}
60% {
transform: translate(-0.1rem, -0.01rem) rotate(-1deg) scale(2.05);
}
70% {
transform: translate(0.08rem, 0.04rem) rotate(2.5deg) scale(1.95);
}
80% {
transform: translate(-0.03rem, -0.07rem) rotate(-2.5deg) scale(2);
}
90% {
transform: translate(0.06rem, 0.03rem) rotate(1deg) scale(2.05);
}
100% {
transform: translate(0rem, 0rem) rotate(0deg) scale(2);
}
}
@keyframes rainbow {
0% {
color: #ff6b6b;
}
10% {
color: #ffcc70;
}
20% {
color: #f7f48b;
}
30% {
color: #caffbf;
}
40% {
color: #9bf6ff;
}
50% {
color: #a0c4ff;
}
60% {
color: #bdb2ff;
}
70% {
color: #ffc6ff;
}
80% {
color: #ffadad;
}
90% {
color: #ffd6a5;
}
100% {
color: #ff6b6b;
}
}
.balloon {
animation: 20s ease-in-out infinite balloon;
}
.rainbow {
animation: 10s ease-in-out infinite rainbow;
}
+1 -1
View File
@@ -11,4 +11,4 @@ title: /asl clearcache
- `advancedserverlist.command.clearcache`
///
Resets the current Favicon and Player cache.
Clears currently loaded favicons and the player cache and loads local favicons again.
+22 -1
View File
@@ -2,7 +2,7 @@
title: /asl profiles
---
# `/asl profiles add <profile>`<br>`/asl profiles copy <profile> <name>`<br>`/asl profiles info <profile>`<br>`/asl profiles list`<br>`/asl profiles set <profile> <option> [value]`
# `/asl profiles add <profile>`<br>`/asl profiles copy <profile> <name>`<br>`/asl profiles edit <profile>`<br>`/asl profiles info <profile>`<br>`/asl profiles list`<br>`/asl profiles set <profile> <option> [value]`
/// info |
**Permissions:**
@@ -56,6 +56,27 @@ Creates a new profile using default values.
Creates a copy from the provided profile.
[`/asl reload`](reload.md) needs to be executed to load the new profile.
## `/asl profiles edit <profile>` { #edit }
/// info |
**Permissions:**
- `advancedserverlist.admin`
- `advancedserverlist.command.profiles`
- `advancedserverlist.command.profiles.edit`
**Arguments:**
- `<profile>` - Name of the profile to edit.
///
Opens a Dialog to edit the specified Profile.
The first Dialog allows you to select either the primary settings or the individual `profiles` with each option allowing you to edit their values according to what they support.
/// warning
This Feature only works for `v5.7.0-b1` and newer of AdvancedServerList and only for Paper 1.21.7 Builds 17 and newer due to lack of API in older versions.
///
## `/asl profiles info <profile>` { #info }
/// info |
+7
View File
@@ -42,6 +42,13 @@ The mode used is set in the `faviconStrategy` option in the `config.yml` and can
Please note that the actual favicon displayed will always be 64x64 pixels, even if the image(s) depicted in it aren't.
## Updating local Images
Local favicons (images in the `favicons` folder) are only loaded during the plugin's startup.
If you would like to add new images to be used, you have to execute [`/asl clearcache`](../../commands/clearcache.md) to add them.
Note that this will also clear any dynamically created Favicons, requiring them to be created again.
## Example
```yaml
+16
View File
@@ -74,6 +74,22 @@ These placeholders require the [Maintenance](https://hangar.papermc.io/kennytv/M
|-------------------------------------|----------------------------------------------------------------|
| `${maintenance maintenanceEnabled}` | Returns whether the Global maintenance mode is enabled or not. |
### Date
These placeholders can be used to get the current date or compare it with another.
| Placeholder | Description |
|---------------------------|---------------------------------------------------------------------------------------------------------------------------|
| `${date current}` | Returns the current date. |
| `${date isBefore <date>}` | Returns, whether the current date is before the specified one. The specified date needs to match the date pattern used. |
| `${date isExact <date>}` | Returns, whether the current date is equal to the specified one. The specified date needs to match the date pattern used. |
| `${date isAfter <date>}` | Returns, whether the current date is after the specified one. The specified date needs to match the date pattern used. |
/// note
Each placeholder accepts an optional date pattern that follows Java's SimpleDateFormat structure.
If none is provided does each default to `dd/MM/yyyy`
///
## Adding your own Placeholders
Thanks to the API of AdvancedServerList are you able to add your own Placeholders that can be used using the `${identifier value}` pattern.
+1
View File
@@ -235,5 +235,6 @@ nav:
- addons/index.md
- First-party:
- BanPlugins: addons/first-party/banplugins.md
- LuckPerms: addons/first-party/luckperms.md
- Third-party:
- SayanVanish: addons/third-party/sayanvanish.md
+4 -4
View File
@@ -78,7 +78,7 @@
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.21.4-R0.1-SNAPSHOT</version>
<version>1.21.7-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -94,13 +94,13 @@
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.11.6</version>
<version>2.11.7</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.viaversion</groupId>
<artifactId>viaversion-api</artifactId>
<version>5.4.0</version>
<version>5.7.0</version>
<scope>provided</scope>
</dependency>
@@ -141,7 +141,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.6.0</version>
<version>3.6.1</version>
<executions>
<execution>
<phase>package</phase>
@@ -26,11 +26,16 @@
package ch.andre601.advancedserverlist.paper;
import ch.andre601.advancedserverlist.core.AdvancedServerList;
import ch.andre601.advancedserverlist.core.interfaces.dialogs.IDialog;
import ch.andre601.advancedserverlist.core.interfaces.dialogs.IDialogList;
import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
import ch.andre601.advancedserverlist.core.profiles.handlers.FaviconHandler;
import ch.andre601.advancedserverlist.paper.commands.PaperCommandManagerInterface;
import ch.andre601.advancedserverlist.paper.dialogs.PaperDialog;
import ch.andre601.advancedserverlist.paper.dialogs.PaperDialogList;
import ch.andre601.advancedserverlist.paper.listeners.ServerLoadEventListener;
import ch.andre601.advancedserverlist.paper.logging.PaperLogger;
import ch.andre601.advancedserverlist.paper.objects.WorldCache;
@@ -95,7 +100,7 @@ public class PaperCore extends JavaPlugin implements PluginCore<CachedServerIcon
if(worldCache != null)
worldCache = null;
getCore().disable();
core().disable();
}
@Override
@@ -106,7 +111,7 @@ public class PaperCore extends JavaPlugin implements PluginCore<CachedServerIcon
@Override
public void loadMetrics(){
new Metrics(this, 15584).addCustomChart(new SimplePie("profiles",
() -> String.valueOf(core.getFileHandler().getProfiles().size())
() -> String.valueOf(core.fileHandler().profiles().size())
));
}
@@ -146,22 +151,22 @@ public class PaperCore extends JavaPlugin implements PluginCore<CachedServerIcon
}
@Override
public AdvancedServerList<CachedServerIcon> getCore(){
public AdvancedServerList<CachedServerIcon> core(){
return core;
}
@Override
public Path getFolderPath(){
public Path folderPath(){
return getDataFolder().toPath();
}
@Override
public PluginLogger getPluginLogger(){
public PluginLogger pluginLogger(){
return logger;
}
@Override
public FaviconHandler<CachedServerIcon> getFaviconHandler(){
public FaviconHandler<CachedServerIcon> faviconHandler(){
if(faviconHandler == null)
faviconHandler = new FaviconHandler<>(core);
@@ -169,23 +174,23 @@ public class PaperCore extends JavaPlugin implements PluginCore<CachedServerIcon
}
@Override
public CommandManager<CmdSender> getCommandManager(){
public CommandManager<CmdSender> commandManager(){
return commandHandler.commandHandler();
}
@Override
public String getPlatformInfo(){
public String platformInfo(){
try{
Class.forName("io.papermc.paper.ServerBuildInfo");
return getNewVersion();
return buildInfo();
}catch(ClassNotFoundException ignored){
// Old Paper versions (Before 16th of May 2024)
return getOldVersion();
return version();
}
}
@Override
public String getLoader(){
public String loader(){
return "paper";
}
@@ -194,19 +199,39 @@ public class PaperCore extends JavaPlugin implements PluginCore<CachedServerIcon
return Bukkit.getPluginManager().isPluginEnabled(plugin);
}
@Override
public boolean isDialogsSupported(){
try{
Class.forName("io.papermc.paper.dialog.Dialog");
return true;
}catch(ClassNotFoundException ignored){
return false;
}
}
@Override
public CachedServerIcon createFavicon(BufferedImage image) throws Exception{
return Bukkit.loadServerIcon(image);
}
public WorldCache getWorldCache(){
@Override
public IDialogList.IDialogListBuilder createDialogListBuilder(String title){
return PaperDialogList.PaperDialogListBuilder.create(title);
}
@Override
public IDialog.IDialogBuilder createDialogBuilder(String title, ServerListProfile profile, int profilesPosition){
return PaperDialog.PaperDialogBuilder.create(core(), title, profile, profilesPosition);
}
public WorldCache worldCache(){
if(worldCache != null)
return worldCache;
return (worldCache = new WorldCache());
}
public int getPlayersOnline(World world){
public int playersOnline(World world){
List<? extends Player> players = new ArrayList<>(world == null ? getServer().getOnlinePlayers() : world.getPlayers());
players.removeIf(player -> {
@@ -221,7 +246,7 @@ public class PaperCore extends JavaPlugin implements PluginCore<CachedServerIcon
return players.size();
}
private String getNewVersion(){
private String buildInfo(){
ServerBuildInfo info = ServerBuildInfo.buildInfo();
String name = info.brandName();
@@ -235,20 +260,20 @@ public class PaperCore extends JavaPlugin implements PluginCore<CachedServerIcon
return String.format("%s (ID: %s, Version: %s, Build: %d)", name, id, version, build.getAsInt());
}
private String getOldVersion(){
private String version(){
return getServer().getName() + " " + getServer().getVersion();
}
private void printOutdatedPaper(){
getPluginLogger().warn("================================================================");
getPluginLogger().warn("OUTDATED PAPER VERSION DETECTED!");
getPluginLogger().warn("");
getPluginLogger().warn("AdvancedServerList detected an outdated Paper version.");
getPluginLogger().warn("The plugin requires at least 1.20.6 of Paper due to required");
getPluginLogger().warn("classes only existing within this version onwards.");
getPluginLogger().warn("");
getPluginLogger().warn("Please use at least Paper 1.20.6 or downgrade AdvancedServerList");
getPluginLogger().warn("to v5.4.1.");
getPluginLogger().warn("================================================================");
pluginLogger().warn("================================================================");
pluginLogger().warn("OUTDATED PAPER VERSION DETECTED!");
pluginLogger().warn("");
pluginLogger().warn("AdvancedServerList detected an outdated Paper version.");
pluginLogger().warn("The plugin requires at least 1.20.6 of Paper due to required");
pluginLogger().warn("classes only existing within this version onwards.");
pluginLogger().warn("");
pluginLogger().warn("Please use at least Paper 1.20.6 or downgrade AdvancedServerList");
pluginLogger().warn("to v5.4.1.");
pluginLogger().warn("================================================================");
}
}
@@ -32,7 +32,6 @@ import net.kyori.adventure.audience.Audience;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@SuppressWarnings("UnstableApiUsage")
public class PaperCmdSender implements CmdSender{
private final CommandSender sender;
@@ -70,7 +69,7 @@ public class PaperCmdSender implements CmdSender{
return sender;
}
public CommandSourceStack getCommandSourceStack(){
public CommandSourceStack commandSourceStack(){
return commandSourceStack;
}
}
@@ -33,7 +33,6 @@ import org.incendo.cloud.SenderMapper;
import org.incendo.cloud.execution.ExecutionCoordinator;
import org.incendo.cloud.paper.PaperCommandManager;
@SuppressWarnings("UnstableApiUsage")
public class PaperCommandManagerInterface implements CommandManagerInterface<CommandSourceStack>{
private final PaperCore plugin;
@@ -45,7 +44,7 @@ public class PaperCommandManagerInterface implements CommandManagerInterface<Com
@Override
public CommandManager<CmdSender> commandHandler(){
return PaperCommandManager.builder(senderMapper())
.executionCoordinator(ExecutionCoordinator.asyncCoordinator())
.executionCoordinator(ExecutionCoordinator.simpleCoordinator())
.buildOnEnable(plugin);
}
@@ -53,7 +52,7 @@ public class PaperCommandManagerInterface implements CommandManagerInterface<Com
public SenderMapper<CommandSourceStack, CmdSender> senderMapper(){
return SenderMapper.create(
PaperCmdSender::new,
sender -> ((PaperCmdSender)sender).getCommandSourceStack()
sender -> ((PaperCmdSender)sender).commandSourceStack()
);
}
}
@@ -0,0 +1,231 @@
package ch.andre601.advancedserverlist.paper.dialogs;
import ch.andre601.advancedserverlist.api.objects.NullBool;
import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
import ch.andre601.advancedserverlist.core.AdvancedServerList;
import ch.andre601.advancedserverlist.core.interfaces.dialogs.IDialog;
import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
import io.papermc.paper.dialog.Dialog;
import io.papermc.paper.dialog.DialogResponseView;
import io.papermc.paper.registry.data.dialog.ActionButton;
import io.papermc.paper.registry.data.dialog.DialogBase;
import io.papermc.paper.registry.data.dialog.action.DialogAction;
import io.papermc.paper.registry.data.dialog.body.DialogBody;
import io.papermc.paper.registry.data.dialog.input.DialogInput;
import io.papermc.paper.registry.data.dialog.input.TextDialogInput;
import io.papermc.paper.registry.data.dialog.type.DialogType;
import net.kyori.adventure.audience.Audience;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.event.ClickCallback;
import net.kyori.adventure.text.event.ClickEvent;
import java.util.ArrayList;
import java.util.List;
@SuppressWarnings("UnstableApiUsage")
public class PaperDialog implements IDialog<Dialog>{
private final AdvancedServerList<?> core;
private final String title;
private final ServerListProfile profile;
private final int profilesPosition;
private final List<DialogBody> bodies;
private final List<DialogInput> inputs;
private PaperDialog(AdvancedServerList<?> core, String title, ServerListProfile profile, int profilesPosition, List<DialogBody> bodies, List<DialogInput> inputs){
this.core = core;
this.title = title;
this.profile = profile;
this.profilesPosition = profilesPosition;
this.bodies = bodies;
this.inputs = inputs;
}
@Override
public Dialog createDialog(){
return Dialog.create(
factory -> factory.empty().base(
DialogBase.builder(ComponentParser.text(title).toComponent())
.body(bodies)
.inputs(inputs)
.afterAction(DialogBase.DialogAfterAction.NONE)
.pause(false)
.build()
).type(DialogType.confirmation(
ActionButton.builder(ComponentParser.text("<green>Save changes").toComponent())
.tooltip(ComponentParser.text("""
<grey>Saves your changes made in this Dialog.
<grey>Applying changes requires the use of <aqua>/asl reload""").toComponent())
.action(
DialogAction.customClick(
(view, audience) -> handle(audience, view, profile, profilesPosition),
ClickCallback.Options.builder().build()
)
)
.build(),
ActionButton.builder(ComponentParser.text("Back...").toComponent())
.tooltip(ComponentParser.text("""
<grey>Returns you to the main Dialog Screen.
<grey>Any unsaved changes will be <red>lost</red>!
<grey>Click the <green>Save changes</green> button to save your changes.""").toComponent())
.action(DialogAction.staticAction(ClickEvent.runCommand("/asl profiles edit " + profile.file())))
.build()
))
);
}
private void handle(Audience audience, DialogResponseView view, ServerListProfile slp, int profilesPosition){
Float priority = view.getFloat("priority");
String condition = view.getText("condition");
String motd = view.getText("motd");
String favicon = view.getText("favicon");
NullBool hidePlayers = NullBool.resolve(view.getBoolean("hidePlayers"));
NullBool hidePlayersHover = NullBool.resolve(view.getBoolean("hidePlayersHover"));
String hover = view.getText("hover");
String playerCountText = view.getText("text");
NullBool extraPlayersEnabled = NullBool.resolve(view.getBoolean("extraPlayersEnabled"));
String extraPlayersCount = view.getText("extraPlayersCount");
NullBool maxPlayersEnabled = NullBool.resolve(view.getBoolean("maxPlayersEnabled"));
String maxPlayersCount = view.getText("maxPlayersCount");
NullBool onlinePlayersEnabled = NullBool.resolve(view.getBoolean("onlinePlayersEnabled"));
String onlinePlayersCount = view.getText("onlinePlayersCount");
ProfileEntry.Builder builder = ProfileEntry.empty().builder();
if(motd != null && !motd.isEmpty())
builder.motd(List.of(motd.split("\n")));
if(favicon != null && !favicon.isEmpty())
builder.favicon(favicon);
builder.hidePlayersEnabled(hidePlayers);
builder.hidePlayersHoverEnabled(hidePlayersHover);
if(hover != null && !hover.isEmpty())
builder.players(List.of(hover.split("\n")));
if(playerCountText != null && !playerCountText.isEmpty())
builder.playerCountText(playerCountText);
builder.extraPlayersEnabled(extraPlayersEnabled);
if(extraPlayersCount != null && !extraPlayersCount.isEmpty())
builder.extraPlayersCount(extraPlayersCount);
builder.maxPlayersEnabled(maxPlayersEnabled);
if(maxPlayersCount != null && !maxPlayersCount.isEmpty())
builder.maxPlayersCount(maxPlayersCount);
builder.onlinePlayersEnabled(onlinePlayersEnabled);
if(onlinePlayersCount != null && !onlinePlayersCount.isEmpty())
builder.onlinePlayersCount(onlinePlayersCount);
ProfileEntry entry = slp.defaultProfile();
List<ProfileEntry> entries = slp.profiles();
if(profilesPosition >= 0){
if(profilesPosition >= entries.size()){
entries.add(builder.build());
}else{
entries.set(profilesPosition, builder.build());
}
}else{
entry = builder.build();
}
float newPriority = priority == null ? slp.priority() : priority;
if(core.fileHandler().saveProfile(slp.file(), (int)newPriority, condition, entries, entry)){
audience.sendMessage(ComponentParser.textFormatted(
"<grey>[<aqua>ASL</aqua>] <green>Successfully saved changes for <white>%s</white>!",
slp.file()
).toComponent());
}else{
audience.sendMessage(ComponentParser.textFormatted(
"<grey>[<red>ASL</red>] <red>Error while saving changes for <white>%s</white>! See console for details.",
slp.file()
).toComponent());
}
}
public static class PaperDialogBuilder implements IDialogBuilder{
public static PaperDialogBuilder create(AdvancedServerList<?> core, String title, ServerListProfile profile, int profilesPosition){
return new PaperDialogBuilder(core, title, profile, profilesPosition);
}
private final AdvancedServerList<?> core;
private final String title;
private final ServerListProfile profile;
private final int profilesPosition;
private final List<DialogBody> bodies = new ArrayList<>();
private final List<DialogInput> inputs = new ArrayList<>();
private PaperDialogBuilder(AdvancedServerList<?> core, String title, ServerListProfile profile, int profilesPosition){
this.core = core;
this.title = title;
this.profile = profile;
this.profilesPosition = profilesPosition;
}
@Override
public PaperDialogBuilder appendBody(String body){
this.bodies.add(DialogBody.plainMessage(ComponentParser.text(body).toComponent()));
return this;
}
@Override
public PaperDialogBuilder appendTextInput(String key, String title, String initValue, int maxLength){
this.inputs.add(DialogInput.text(key, Component.text(title))
.initial(initValue == null ? "" : initValue)
.maxLength(maxLength)
.build()
);
return this;
}
@Override
public PaperDialogBuilder appendTextbox(String key, String title, List<String> initValue, int maxLength, int rows){
this.inputs.add(DialogInput.text(key, Component.text(title))
.initial(initValue == null ? "" : String.join("\n", initValue))
.maxLength(maxLength)
.multiline(TextDialogInput.MultilineOptions.create(rows, null))
.build()
);
return this;
}
@Override
public PaperDialogBuilder appendNumberRange(String key, String title, int initValue){
float minValue = Math.min((float)initValue, -100.0F);
float maxValue = Math.max((float)initValue, 100.0F);
this.inputs.add(DialogInput.numberRange(key, Component.text(title), minValue, maxValue)
.step(1.0F)
.initial((float)initValue)
.build()
);
return this;
}
@Override
public PaperDialogBuilder appendBoolean(String key, String title, NullBool initValue){
this.inputs.add(DialogInput.bool(key, Component.text(title))
.initial(initValue.getOrDefault(false))
.build()
);
return this;
}
@Override
public PaperDialog build(){
return new PaperDialog(core, title, profile, profilesPosition, bodies, inputs);
}
}
}
@@ -0,0 +1,86 @@
package ch.andre601.advancedserverlist.paper.dialogs;
import ch.andre601.advancedserverlist.core.interfaces.dialogs.IDialog;
import ch.andre601.advancedserverlist.core.interfaces.dialogs.IDialogList;
import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
import io.papermc.paper.dialog.Dialog;
import io.papermc.paper.registry.RegistryKey;
import io.papermc.paper.registry.data.dialog.DialogBase;
import io.papermc.paper.registry.data.dialog.body.DialogBody;
import io.papermc.paper.registry.data.dialog.type.DialogType;
import io.papermc.paper.registry.set.RegistrySet;
import net.kyori.adventure.text.Component;
import java.util.ArrayList;
import java.util.List;
public class PaperDialogList implements IDialogList{
private final String title;
private final List<String> bodies;
private final List<IDialog<?>> dialogs;
protected PaperDialogList(String title, List<String> bodies, List<IDialog<?>> dialogs){
this.title = title;
this.bodies = bodies;
this.dialogs = dialogs;
}
@Override
@SuppressWarnings("UnstableApiUsage")
public void show(CmdSender sender){
List<DialogBody> dialogBodies = bodies.stream()
.<DialogBody>map(text -> DialogBody.plainMessage(ComponentParser.text(text).toComponent()))
.toList();
List<Dialog> paperDialogs = dialogs.stream()
.filter(dialog -> dialog instanceof PaperDialog)
.map(dialog -> (PaperDialog)dialog)
.map(PaperDialog::createDialog)
.toList();
DialogBase.Builder builder = DialogBase.builder(Component.text(title))
.body(dialogBodies);
RegistrySet<Dialog> dialogRegistry = RegistrySet.valueSet(RegistryKey.DIALOG, paperDialogs);
Dialog dialog = Dialog.create(
factory -> factory.empty().base(builder.build())
.type(DialogType.dialogList(dialogRegistry).columns(3).build())
);
sender.audience().showDialog(dialog);
}
public static class PaperDialogListBuilder implements IDialogListBuilder{
public static PaperDialogListBuilder create(String title){
return new PaperDialogListBuilder(title);
}
private final String title;
private final List<String> bodies = new ArrayList<>();
private final List<IDialog<?>> dialogs = new ArrayList<>();
private PaperDialogListBuilder(String title){
this.title = title;
}
@Override
public PaperDialogListBuilder appendBody(String body){
this.bodies.add(body);
return this;
}
@Override
public PaperDialogListBuilder appendDialog(IDialog<?> dialog){
this.dialogs.add(dialog);
return this;
}
@Override
public PaperDialogList build(){
return new PaperDialogList(this.title, this.bodies, this.dialogs);
}
}
}
@@ -70,17 +70,17 @@ public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon,
}
@Override
public void setMaxPlayers(int maxPlayers){
public void maxPlayers(int maxPlayers){
event.setMaxPlayers(maxPlayers);
}
@Override
public void setOnlinePlayers(int onlinePlayers){
public void onlinePlayers(int onlinePlayers){
event.setNumPlayers(onlinePlayers);
}
@Override
public void setMotd(Component component){
public void motd(Component component){
event.motd(component);
}
@@ -90,13 +90,13 @@ public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon,
}
@Override
public void setPlayerCount(String name){
public void playerCount(String name){
event.setVersion(name);
event.setProtocolVersion(-1);
}
@Override
public void setPlayers(List<String> lines, PaperPlayerImpl player, GenericServer server){
public void players(List<String> lines, PaperPlayerImpl player, GenericServer server){
try{
Class.forName("com.destroystokyo.paper.event.server.PaperServerListPingEvent$ListedPlayerInfo");
setListedPlayers(lines, player, server);
@@ -107,7 +107,7 @@ public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon,
}
@Override
public void setPlayersHidden(){
public void playersHidden(){
try{
Class.forName("com.destroystokyo.paper.event.server.PaperServerListPingEvent$ListedPlayerInfo");
clearListedPlayers();
@@ -117,12 +117,12 @@ public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon,
}
@Override
public void setFavicon(CachedServerIcon favicon){
public void favicon(CachedServerIcon favicon){
event.setServerIcon(favicon);
}
@Override
public void setDefaultFavicon(){
public void defaultFavicon(){
event.setServerIcon(event.getServerIcon());
}
@@ -145,22 +145,22 @@ public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon,
}
@Override
public int getProtocolVersion(){
public int protocolVersion(){
return event.getClient().getProtocolVersion();
}
@Override
public int getOnlinePlayers(){
return plugin.getPlayersOnline(null);
public int onlinePlayers(){
return plugin.playersOnline(null);
}
@Override
public int getMaxPlayers(){
public int maxPlayers(){
return event.getMaxPlayers();
}
@Override
public String getPlayerIP(){
public String playerIP(){
return event.getClient().getAddress().getHostString();
}
@@ -173,12 +173,12 @@ public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon,
}
@Override
public String getVirtualHost(){
public String virtualHost(){
return this.resolveHost(event.getClient().getVirtualHost());
}
@Override
public PluginCore<CachedServerIcon> getPlugin(){
public PluginCore<CachedServerIcon> plugin(){
return plugin;
}
@@ -190,8 +190,8 @@ public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon,
}
@Override
public GenericServer createGenericServer(int playersOnline, int playersMax, String host){
return new PaperServerImpl(plugin.getWorldCache().worlds(), playersOnline, playersMax, host);
public GenericServer createServer(int playersOnline, int playersMax, String host){
return new PaperServerImpl(plugin.worldCache().worlds(), playersOnline, playersMax, host);
}
private void clearListedPlayers(){
@@ -225,6 +225,7 @@ public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon,
String parsed = ComponentParser.text(line)
.modifyText(text -> StringReplacer.replace(text, player, server))
.modifyText(text -> parsePAPIPlaceholders(text, player))
.applyMMTags(plugin())
.toString();
playerList.add(function.apply(parsed));
@@ -51,15 +51,15 @@ public class PlayerJoinEventListener implements Listener{
return;
Player player = event.getPlayer();
plugin.getCore().getPlayerHandler().addPlayer(address.getHostString(), player.getName(), player.getUniqueId());
plugin.core().playerHandler().addPlayer(address.getHostString(), player.getName(), player.getUniqueId());
if(player.hasPermission("advancedserverlist.admin") || player.hasPermission("advancedserverlist.updatecheck")){
if(plugin.getCore().getUpdateChecker() == null)
if(plugin.core().updateChecker() == null)
return;
PaperCmdSender sender = new PaperCmdSender(player);
plugin.getCore().getUpdateChecker().performCachedUpdateCheck(sender);
plugin.core().updateChecker().performCachedUpdateCheck(sender);
}
}
}
@@ -29,7 +29,6 @@ import ch.andre601.advancedserverlist.api.bukkit.events.PreServerListSetEvent;
import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
public class PreServerListSetEventImpl extends PreServerListSetEvent{
public PreServerListSetEventImpl(ProfileEntry entry){
super(entry);
}
@@ -47,21 +47,21 @@ public class ServerLoadEventListener implements Listener{
new WorldEventsListener(plugin);
// Load currently loaded worlds into the WorldCache
Bukkit.getWorlds().forEach(world -> plugin.getWorldCache().addWorld(world));
Bukkit.getWorlds().forEach(world -> plugin.worldCache().addWorld(world));
// Print a warning if server load was after a reload.
if(event.getType() != ServerLoadEvent.LoadType.RELOAD)
return;
plugin.getPluginLogger().warn("======================================================================================");
plugin.getPluginLogger().warn("SERVER RELOAD DETECTED!");
plugin.getPluginLogger().warn("");
plugin.getPluginLogger().warn("A server reload has been detected by AdvancedServerList, meaning either the /reload");
plugin.getPluginLogger().warn("command or Bukkit.reload() was executed.");
plugin.getPluginLogger().warn("");
plugin.getPluginLogger().warn("YOU WILL GET NO SUPPORT FOR THE PLUGIN FOR ANY ISSUES YOU ENCOUNTER AFTER A SERVER");
plugin.getPluginLogger().warn("RELOAD!");
plugin.getPluginLogger().warn("ALWAYS RESTART YOUR SERVER. NEVER RELOAD IT!");
plugin.getPluginLogger().warn("======================================================================================");
plugin.pluginLogger().warn("======================================================================================");
plugin.pluginLogger().warn("SERVER RELOAD DETECTED!");
plugin.pluginLogger().warn("");
plugin.pluginLogger().warn("A server reload has been detected by AdvancedServerList, meaning either the /reload");
plugin.pluginLogger().warn("command or Bukkit.reload() was executed.");
plugin.pluginLogger().warn("");
plugin.pluginLogger().warn("YOU WILL GET NO SUPPORT FOR THE PLUGIN FOR ANY ISSUES YOU ENCOUNTER AFTER A SERVER");
plugin.pluginLogger().warn("RELOAD!");
plugin.pluginLogger().warn("ALWAYS RESTART YOUR SERVER. NEVER RELOAD IT!");
plugin.pluginLogger().warn("======================================================================================");
}
}
@@ -41,11 +41,11 @@ public class WorldEventsListener implements Listener{
@EventHandler
public void onWorldLoad(WorldLoadEvent event){
plugin.getWorldCache().addWorld(event.getWorld());
plugin.worldCache().addWorld(event.getWorld());
}
@EventHandler
public void onWorldUnload(WorldUnloadEvent event){
plugin.getWorldCache().removeWorld(event.getWorld().getName());
plugin.worldCache().removeWorld(event.getWorld().getName());
}
}
@@ -28,14 +28,17 @@ package ch.andre601.advancedserverlist.paper.objects.impl;
import ch.andre601.advancedserverlist.api.bukkit.objects.BukkitPlayer;
import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
import org.bukkit.OfflinePlayer;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;
import java.util.UUID;
public record PaperPlayerImpl(OfflinePlayer player, CachedPlayer cachedPlayer, int protocol) implements BukkitPlayer{
@NullMarked
public record PaperPlayerImpl(@Nullable OfflinePlayer player, CachedPlayer cachedPlayer, int protocol) implements BukkitPlayer{
@Override
public String getName(){
return player == null ? cachedPlayer.name() : player.getName();
return player == null || player.getName() == null ? cachedPlayer.name() : player.getName();
}
@Override
@@ -49,7 +52,7 @@ public record PaperPlayerImpl(OfflinePlayer player, CachedPlayer cachedPlayer, i
}
@Override
public OfflinePlayer getPlayer(){
public @Nullable OfflinePlayer getPlayer(){
return player;
}
@@ -27,12 +27,13 @@ package ch.andre601.advancedserverlist.paper.objects.impl;
import ch.andre601.advancedserverlist.api.bukkit.objects.BukkitServer;
import org.bukkit.World;
import org.jspecify.annotations.NonNull;
import java.util.Map;
public record PaperServerImpl(Map<String, World> worlds, int playersOnline, int playersMax, String host) implements BukkitServer {
@Override
public Map<String, World> getWorlds(){
public @NonNull Map<String, World> getWorlds(){
return worlds;
}
@@ -69,7 +69,7 @@ public class PAPIPlaceholders extends PlaceholderExpansion{
@Override
public @NotNull String getVersion(){
return plugin.getCore().getVersion();
return plugin.core().version();
}
@Override
@@ -80,16 +80,16 @@ public class PAPIPlaceholders extends PlaceholderExpansion{
@Override
public String onPlaceholderRequest(Player pl, @NotNull String identifier){
String host = pl.getVirtualHost() == null ? null : pl.getVirtualHost().getHostString();
CachedPlayer cached = plugin.getCore().getPlayerHandler().getCachedPlayer(pl.getUniqueId());
CachedPlayer cached = plugin.core().playerHandler().getCachedPlayer(pl.getUniqueId());
int protocol = resolveProtocol(pl);
int online = Bukkit.getOnlinePlayers().size();
int max = Bukkit.getMaxPlayers();
BukkitServer server = new PaperServerImpl(plugin.getWorldCache().worlds(), online, max, host);
BukkitServer server = new PaperServerImpl(plugin.worldCache().worlds(), online, max, host);
BukkitPlayer player = new PaperPlayerImpl(pl, cached, protocol);
ServerListProfile profile = ProfileManager.resolveProfile(plugin.getCore(), player, server);
ServerListProfile profile = ProfileManager.resolveProfile(plugin.core(), player, server);
if(profile == null)
return null;
@@ -113,7 +113,7 @@ public class PAPIPlaceholders extends PlaceholderExpansion{
max = online + (extraPlayers == null ? 0 : extraPlayers);
}
BukkitServer finalServer = new PaperServerImpl(plugin.getWorldCache().worlds(), online, max, host);
BukkitServer finalServer = new PaperServerImpl(plugin.worldCache().worlds(), online, max, host);
return switch(identifier.toLowerCase(Locale.ROOT)){
case "favicon" -> getOption(entry.favicon(), pl, player, finalServer);
case "motd" -> getOption(entry.motd(), pl, player, finalServer, true);
@@ -155,7 +155,7 @@ public class PAPIPlaceholders extends PlaceholderExpansion{
.modifyText(text -> PlaceholderAPI.setPlaceholders(pl, text))
.modifyText(text -> {
if(isMotd)
return plugin.getCore().getTextCenterUtil().getCenteredText(text);
return plugin.core().textCenterUtil().getCenteredText(text);
return text;
})
@@ -29,7 +29,10 @@ import ch.andre601.advancedserverlist.api.PlaceholderProvider;
import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
import ch.andre601.advancedserverlist.api.objects.GenericServer;
import ch.andre601.advancedserverlist.paper.objects.impl.PaperPlayerImpl;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;
@NullMarked
public class PaperPlayerPlaceholders extends PlaceholderProvider{
public PaperPlayerPlaceholders(){
@@ -37,7 +40,7 @@ public class PaperPlayerPlaceholders extends PlaceholderProvider{
}
@Override
public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
public @Nullable String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
if(!(player instanceof PaperPlayerImpl paperPlayer))
return null;
@@ -32,7 +32,10 @@ import ch.andre601.advancedserverlist.paper.PaperCore;
import ch.andre601.advancedserverlist.paper.objects.impl.PaperServerImpl;
import org.bukkit.Bukkit;
import org.bukkit.World;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;
@NullMarked
public class PaperServerPlaceholders extends PlaceholderProvider{
private final PaperCore plugin;
@@ -43,7 +46,7 @@ public class PaperServerPlaceholders extends PlaceholderProvider{
}
@Override
public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
public @Nullable String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
if(!(server instanceof PaperServerImpl paperServer))
return null;
@@ -63,7 +66,7 @@ public class PaperServerPlaceholders extends PlaceholderProvider{
if(world == null)
continue;
players += plugin.getPlayersOnline(world);
players += plugin.playersOnline(world);
}
yield String.valueOf(players);
@@ -21,5 +21,8 @@ dependencies:
load: BEFORE
required: false
ServerListPlus:
load: BEFORE
required: false
MiniPlaceholders:
load: BEFORE
required: false
+11 -10
View File
@@ -41,24 +41,24 @@
<project.build.build_id/>
<plugin.version>5.6.0</plugin.version>
<plugin.version>5.7.1</plugin.version>
<plugin.description>Create multiple Server lists based on conditions.</plugin.description>
<api.version>4.1.1</api.version>
<!-- Adventure versions -->
<dependency.adventure-api>4.23.0</dependency.adventure-api>
<dependency.adventure-text-minimessage>4.23.0</dependency.adventure-text-minimessage>
<dependency.adventure-text-serializer-legacy>4.23.0</dependency.adventure-text-serializer-legacy>
<dependency.adventure-platform-bungeecord>4.4.0</dependency.adventure-platform-bungeecord>
<dependency.adventure-api>4.26.1</dependency.adventure-api>
<dependency.adventure-text-minimessage>4.26.1</dependency.adventure-text-minimessage>
<dependency.adventure-text-serializer-legacy>4.26.1</dependency.adventure-text-serializer-legacy>
<dependency.adventure-platform-bungeecord>4.4.1</dependency.adventure-platform-bungeecord>
<!-- Configurate version -->
<dependency.configurate-yaml>4.2.0</dependency.configurate-yaml>
<!-- Cloud versions -->
<dependency.cloud-annotations>2.0.0</dependency.cloud-annotations>
<dependency.cloud-bungee>2.0.0-SNAPSHOT</dependency.cloud-bungee>
<dependency.cloud-paper>2.0.0-SNAPSHOT</dependency.cloud-paper>
<dependency.cloud-velocity>2.0.0-SNAPSHOT</dependency.cloud-velocity>
<dependency.cloud-minecraft-extras>2.0.0-beta.10</dependency.cloud-minecraft-extras>
<dependency.cloud-bungee>2.0.0-beta.14</dependency.cloud-bungee>
<dependency.cloud-paper>2.0.0-beta.14</dependency.cloud-paper>
<dependency.cloud-velocity>2.0.0-beta.14</dependency.cloud-velocity>
<dependency.cloud-minecraft-extras>2.0.0-beta.14</dependency.cloud-minecraft-extras>
</properties>
<profiles>
@@ -96,7 +96,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
<configuration>
<compilerArgs>
<arg>-parameters</arg>
@@ -114,5 +114,6 @@
<module>velocity</module>
<module>version-uploader</module>
<module>addons/banplugins</module>
<module>addons/luckperms</module>
</modules>
</project>
+3 -3
View File
@@ -1,6 +1,6 @@
mkdocs-material==9.6.14
mkdocs-glightbox==0.4.0
mkdocs-material==9.7.1
mkdocs-glightbox==0.5.2
mkdocs-redirects==1.2.2
git+https://github.com/Andre601/mkdocs-pagenav-generator
mkdocs-macros-plugin==1.3.7
mkdocs-macros-plugin==1.5.0
pygments-minimessage==1.0.0
+3 -3
View File
@@ -103,13 +103,13 @@
<dependency>
<groupId>org.sayandev</groupId>
<artifactId>sayanvanish-api</artifactId>
<version>1.6.5</version>
<version>1.7.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.sayandev</groupId>
<artifactId>sayanvanish-proxy-velocity</artifactId>
<version>1.6.5</version>
<version>1.7.3</version>
<scope>provided</scope>
</dependency>
@@ -140,7 +140,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.6.0</version>
<version>3.6.1</version>
<executions>
<execution>
<phase>package</phase>
@@ -26,9 +26,12 @@
package ch.andre601.advancedserverlist.velocity;
import ch.andre601.advancedserverlist.core.AdvancedServerList;
import ch.andre601.advancedserverlist.core.interfaces.dialogs.IDialog;
import ch.andre601.advancedserverlist.core.interfaces.dialogs.IDialogList;
import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
import ch.andre601.advancedserverlist.core.profiles.handlers.FaviconHandler;
import ch.andre601.advancedserverlist.velocity.commands.VelocityCommandManagerInterface;
import ch.andre601.advancedserverlist.velocity.listeners.PlayerJoinEventListener;
@@ -120,7 +123,7 @@ public class VelocityCore implements PluginCore<Favicon>{
@Override
public void loadMetrics(){
metrics.make(this, 15587).addCustomChart(new SimplePie("profiles",
() -> String.valueOf(core.getFileHandler().getProfiles().size())
() -> String.valueOf(core.fileHandler().profiles().size())
));
}
@@ -140,7 +143,7 @@ public class VelocityCore implements PluginCore<Favicon>{
@Override
public void downloadLibrary(String groupId, String artifactId, String version){
if(libraryManager == null){
libraryManager = new VelocityLibraryManager<>(this, this.logger, getFolderPath(), getProxy().getPluginManager());
libraryManager = new VelocityLibraryManager<>(this, this.logger, folderPath(), proxy().getPluginManager());
libraryManager.addRepository("https://repo.papermc.io/repository/maven-public");
}
@@ -156,28 +159,28 @@ public class VelocityCore implements PluginCore<Favicon>{
@Override
public void startScheduler(){
scheduledTask = getProxy().getScheduler().buildTask(this, this::fetchServers)
scheduledTask = proxy().getScheduler().buildTask(this, this::fetchServers)
.repeat(10, TimeUnit.SECONDS)
.schedule();
}
@Override
public AdvancedServerList<Favicon> getCore(){
public AdvancedServerList<Favicon> core(){
return core;
}
@Override
public Path getFolderPath(){
public Path folderPath(){
return path;
}
@Override
public PluginLogger getPluginLogger(){
public PluginLogger pluginLogger(){
return pluginLogger;
}
@Override
public FaviconHandler<Favicon> getFaviconHandler(){
public FaviconHandler<Favicon> faviconHandler(){
if(faviconHandler == null)
faviconHandler = new FaviconHandler<>(core);
@@ -185,26 +188,31 @@ public class VelocityCore implements PluginCore<Favicon>{
}
@Override
public CommandManager<CmdSender> getCommandManager(){
public CommandManager<CmdSender> commandManager(){
return commandHandler.commandHandler();
}
@Override
public String getPlatformInfo(){
return getProxy().getVersion().getName() + " " + getProxy().getVersion().getVersion();
public String platformInfo(){
return proxy().getVersion().getName() + " " + proxy().getVersion().getVersion();
}
@Override
public String getLoader(){
public String loader(){
return "velocity";
}
@Override
public boolean isPluginEnabled(String plugin){
if(getProxy() == null)
if(proxy() == null)
return false;
return getProxy().getPluginManager().isLoaded(plugin.toLowerCase(Locale.ROOT));
return proxy().getPluginManager().isLoaded(plugin.toLowerCase(Locale.ROOT));
}
@Override
public boolean isDialogsSupported(){
return false; // Velocity lacks a Dialog System
}
@Override
@@ -212,21 +220,31 @@ public class VelocityCore implements PluginCore<Favicon>{
return Favicon.create(image);
}
public ProxyServer getProxy(){
@Override
public IDialogList.IDialogListBuilder createDialogListBuilder(String title){
return null;
}
@Override
public IDialog.IDialogBuilder createDialogBuilder(String title, ServerListProfile profile, int profilesPosition){
return null;
}
public ProxyServer proxy(){
return proxy;
}
public int getOnlinePlayers(RegisteredServer server){
if(getProxy() == null)
public int onlinePlayers(RegisteredServer server){
if(proxy() == null)
return -1;
List<Player> players = new ArrayList<>(server == null ? getProxy().getAllPlayers() : server.getPlayersConnected());
List<Player> players = new ArrayList<>(server == null ? proxy().getAllPlayers() : server.getPlayersConnected());
// Exclude players when PremiumVanish is enabled and player is hidden.
if(getProxy().getPluginManager().isLoaded("premiumvanish")){
if(proxy().getPluginManager().isLoaded("premiumvanish")){
players.removeIf(VelocityVanishAPI::isInvisible);
}else // Do the same if SayanVanish is enabled.
if(getProxy().getPluginManager().isLoaded("sayanvanish")){
if(proxy().getPluginManager().isLoaded("sayanvanish")){
players.removeIf(player -> SayanVanishVelocityAPI.getInstance().isVanished(player.getUniqueId()));
}
@@ -239,7 +257,7 @@ public class VelocityCore implements PluginCore<Favicon>{
private void fetchServers(){
fetchedServers.clear();
getProxy().getAllServers().forEach(server -> server.ping().whenComplete((ping, throwable) -> {
proxy().getAllServers().forEach(server -> server.ping().whenComplete((ping, throwable) -> {
if(throwable != null)
return;
@@ -39,7 +39,7 @@ public class PlayerJoinEventListener{
public PlayerJoinEventListener(VelocityCore plugin){
this.plugin = plugin;
plugin.getProxy().getEventManager().register(plugin, this);
plugin.proxy().getEventManager().register(plugin, this);
}
@Subscribe
@@ -47,15 +47,15 @@ public class PlayerJoinEventListener{
InetSocketAddress address = event.getPlayer().getRemoteAddress();
Player player = event.getPlayer();
plugin.getCore().getPlayerHandler().addPlayer(address.getHostString(), player.getUsername(), player.getUniqueId());
plugin.core().playerHandler().addPlayer(address.getHostString(), player.getUsername(), player.getUniqueId());
if(player.hasPermission("advancedserverlist.admin") || player.hasPermission("advancedserverlist.updatecheck")){
if(plugin.getCore().getUpdateChecker() == null)
if(plugin.core().updateChecker() == null)
return;
VelocityCmdSender sender = new VelocityCmdSender(player);
plugin.getCore().getUpdateChecker().performCachedUpdateCheck(sender);
plugin.core().updateChecker().performCachedUpdateCheck(sender);
}
}
}
@@ -38,13 +38,13 @@ public class ProxyPingEventListener{
public ProxyPingEventListener(VelocityCore plugin){
this.plugin = plugin;
plugin.getProxy().getEventManager().register(plugin, this);
plugin.proxy().getEventManager().register(plugin, this);
}
@Subscribe(priority = Short.MIN_VALUE + 1) // Equivalent to PostOrder.LAST which maintenance uses.
public void onProxyPing(ProxyPingEvent event){
ProfileEntry entry = PingEventHandler.handleEvent(new VelocityEventWrapper(plugin, event));
plugin.getProxy().getEventManager().fire(new PostServerListSetEvent(entry));
plugin.proxy().getEventManager().fire(new PostServerListSetEvent(entry));
}
}
@@ -69,7 +69,7 @@ public class VelocityEventWrapper implements GenericEventWrapper<Favicon, Veloci
public GenericServerListEvent callEvent(ProfileEntry entry){
PreServerListSetEventImpl event = new PreServerListSetEventImpl(entry);
try{
plugin.getProxy().getEventManager().fire(event).get();
plugin.proxy().getEventManager().fire(event).get();
}catch(InterruptedException | ExecutionException ignored){
return null;
}
@@ -78,17 +78,17 @@ public class VelocityEventWrapper implements GenericEventWrapper<Favicon, Veloci
}
@Override
public void setMaxPlayers(int maxPlayers){
public void maxPlayers(int maxPlayers){
builder.maximumPlayers(maxPlayers);
}
@Override
public void setOnlinePlayers(int onlinePlayers){
public void onlinePlayers(int onlinePlayers){
builder.onlinePlayers(onlinePlayers);
}
@Override
public void setMotd(Component component){
public void motd(Component component){
builder.description(component);
}
@@ -98,18 +98,19 @@ public class VelocityEventWrapper implements GenericEventWrapper<Favicon, Veloci
}
@Override
public void setPlayerCount(String name){
public void playerCount(String name){
builder.version(new ServerPing.Version(-1, name));
}
@Override
public void setPlayers(List<String> lines, VelocityPlayerImpl player, GenericServer server){
public void players(List<String> lines, VelocityPlayerImpl player, GenericServer server){
ServerPing.SamplePlayer[] players = new ServerPing.SamplePlayer[lines.size()];
for(int i = 0; i < players.length; i++){
String parsed = ComponentParser.text(lines.get(i))
.modifyText(text -> StringReplacer.replace(text, player, server))
.modifyText(text -> parsePAPIPlaceholders(text, player))
.applyMMTags(plugin())
.toString();
players[i] = new ServerPing.SamplePlayer(parsed, UUID.randomUUID());
@@ -120,18 +121,18 @@ public class VelocityEventWrapper implements GenericEventWrapper<Favicon, Veloci
}
@Override
public void setPlayersHidden(){
public void playersHidden(){
builder.clearSamplePlayers();
}
@Override
public void setFavicon(Favicon favicon){
public void favicon(Favicon favicon){
builder.favicon(favicon);
}
// Not used in Velocity
@Override
public void setDefaultFavicon(){}
public void defaultFavicon(){}
@Override
public void updateEvent(){
@@ -145,20 +146,20 @@ public class VelocityEventWrapper implements GenericEventWrapper<Favicon, Veloci
@Override
public boolean isMaintenanceModeActive(){
if(!plugin.getProxy().getPluginManager().isLoaded("maintenance"))
if(!plugin.proxy().getPluginManager().isLoaded("maintenance"))
return false;
return MaintenanceUtil.get().isMaintenanceEnabled();
}
@Override
public int getProtocolVersion(){
public int protocolVersion(){
return event.getConnection().getProtocolVersion().getProtocol();
}
@Override
public int getOnlinePlayers(){
int players = plugin.getOnlinePlayers(null);
public int onlinePlayers(){
int players = plugin.onlinePlayers(null);
if(players == -1)
return builder.getOnlinePlayers();
@@ -166,18 +167,18 @@ public class VelocityEventWrapper implements GenericEventWrapper<Favicon, Veloci
}
@Override
public int getMaxPlayers(){
public int maxPlayers(){
return builder.getMaximumPlayers();
}
@Override
public String getPlayerIP(){
public String playerIP(){
return event.getConnection().getRemoteAddress().getHostString();
}
@Override
public String parsePAPIPlaceholders(String text, VelocityPlayerImpl player){
if(!plugin.getProxy().getPluginManager().isLoaded("papiproxybridge"))
if(!plugin.proxy().getPluginManager().isLoaded("papiproxybridge"))
return text;
if(!PAPIUtil.get().isCompatible())
@@ -187,7 +188,7 @@ public class VelocityEventWrapper implements GenericEventWrapper<Favicon, Veloci
if(server == null || server.isEmpty())
return text;
RegisteredServer registeredServer = plugin.getProxy().getServer(server).orElse(null);
RegisteredServer registeredServer = plugin.proxy().getServer(server).orElse(null);
if(registeredServer == null || registeredServer.getPlayersConnected().isEmpty())
return text;
@@ -199,12 +200,12 @@ public class VelocityEventWrapper implements GenericEventWrapper<Favicon, Veloci
}
@Override
public String getVirtualHost(){
public String virtualHost(){
return this.resolveHost(event.getConnection().getVirtualHost().orElse(null));
}
@Override
public PluginCore<Favicon> getPlugin(){
public PluginCore<Favicon> plugin(){
return plugin;
}
@@ -214,9 +215,9 @@ public class VelocityEventWrapper implements GenericEventWrapper<Favicon, Veloci
}
@Override
public GenericServer createGenericServer(int playersOnline, int playersMax, String host){
public GenericServer createServer(int playersOnline, int playersMax, String host){
Map<String, RegisteredServer> servers = new HashMap<>();
plugin.getProxy().getAllServers().forEach(server -> servers.put(server.getServerInfo().getName(), server));
plugin.proxy().getAllServers().forEach(server -> servers.put(server.getServerInfo().getName(), server));
return new VelocityProxyImpl(servers, playersOnline, playersMax, host);
}
@@ -28,9 +28,11 @@ package ch.andre601.advancedserverlist.velocity.objects.impl;
import ch.andre601.advancedserverlist.api.velocity.objects.VelocityPlayer;
import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
import com.velocitypowered.api.network.ProtocolVersion;
import org.jspecify.annotations.NullMarked;
import java.util.UUID;
@NullMarked
public record VelocityPlayerImpl(CachedPlayer player, int protocol) implements VelocityPlayer{
@Override
@@ -27,12 +27,13 @@ package ch.andre601.advancedserverlist.velocity.objects.impl;
import ch.andre601.advancedserverlist.api.velocity.objects.VelocityProxy;
import com.velocitypowered.api.proxy.server.RegisteredServer;
import org.jspecify.annotations.NonNull;
import java.util.Map;
public record VelocityProxyImpl(Map<String, RegisteredServer> servers, int playersOnline, int playersMax, String host) implements VelocityProxy{
@Override
public Map<String, RegisteredServer> getServers(){
public @NonNull Map<String, RegisteredServer> getServers(){
return servers;
}
@@ -29,7 +29,10 @@ import ch.andre601.advancedserverlist.api.PlaceholderProvider;
import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
import ch.andre601.advancedserverlist.api.objects.GenericServer;
import ch.andre601.advancedserverlist.api.velocity.objects.VelocityPlayer;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;
@NullMarked
public class VelocityPlayerPlaceholders extends PlaceholderProvider{
private VelocityPlayerPlaceholders(){
@@ -41,7 +44,7 @@ public class VelocityPlayerPlaceholders extends PlaceholderProvider{
}
@Override
public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
public @Nullable String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
if(!(player instanceof VelocityPlayer velocityPlayer))
return null;
@@ -6,7 +6,10 @@ import ch.andre601.advancedserverlist.api.objects.GenericServer;
import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
import ch.andre601.advancedserverlist.velocity.VelocityCore;
import com.velocitypowered.api.proxy.server.ServerPing;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;
@NullMarked
public class VelocityProxyPlaceholders extends PlaceholderProvider{
private final VelocityCore plugin;
@@ -22,7 +25,7 @@ public class VelocityProxyPlaceholders extends PlaceholderProvider{
}
@Override
public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
public @Nullable String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
String[] args = placeholder.split("\\s", 2);
if(args.length < 2)
return null;
@@ -31,7 +31,10 @@ import ch.andre601.advancedserverlist.api.objects.GenericServer;
import ch.andre601.advancedserverlist.api.velocity.objects.VelocityProxy;
import ch.andre601.advancedserverlist.velocity.VelocityCore;
import com.velocitypowered.api.proxy.server.RegisteredServer;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;
@NullMarked
public class VelocityServerPlaceholders extends PlaceholderProvider{
private final VelocityCore plugin;
@@ -46,7 +49,7 @@ public class VelocityServerPlaceholders extends PlaceholderProvider{
}
@Override
public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
public @Nullable String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
if(!(server instanceof VelocityProxy proxy))
return null;
@@ -66,7 +69,7 @@ public class VelocityServerPlaceholders extends PlaceholderProvider{
if(registeredServer == null)
continue;
int connected = plugin.getOnlinePlayers(registeredServer);
int connected = plugin.onlinePlayers(registeredServer);
if(connected == -1)
continue;
@@ -88,7 +91,7 @@ public class VelocityServerPlaceholders extends PlaceholderProvider{
if(args.length > 2)
yield "";
if(args.length == 2 && args[1] != null && !args[1].isEmpty()){
if(args.length == 2 && !args[1].isEmpty()){
RegisteredServer info = proxy.getServers().get(args[1]);
if(info == null)
yield "";
@@ -18,6 +18,10 @@
{
"id": "serverlistplus",
"optional": true
},
{
"id": "miniplaceholders",
"optional": true
}
],
"main": "ch.andre601.advancedserverlist.velocity.VelocityCore"
+8 -8
View File
@@ -46,25 +46,25 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.13.1</version>
<version>2.13.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.5.18</version>
<version>1.5.23</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>5.5</version>
<version>5.6</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>4.12.0</version>
<artifactId>okhttp-jvm</artifactId>
<version>5.3.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -93,7 +93,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version>
<version>3.14.1</version>
<configuration>
<release>16</release>
</configuration>
@@ -101,7 +101,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.2</version>
<version>3.5.0</version>
<configuration>
<archive>
<manifest>
@@ -115,7 +115,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.6.0</version>
<version>3.6.1</version>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
</configuration>
@@ -33,7 +33,8 @@ public enum PlatformInfo{
"paper",
List.of(
"paper/target/AdvancedServerList-Paper-{{version}}.jar",
"addons/banplugins/target/AdvancedServerList-BanPlugins-Addon-{{version}}.jar"
"addons/banplugins/target/AdvancedServerList-BanPlugins-Addon-{{version}}.jar",
"addons/luckperms/target/AdvancedServerList-Luckperms-Addon-{{version}}.jar"
),
List.of("Paper", "Folia")
),
@@ -41,7 +42,8 @@ public enum PlatformInfo{
"bungeecord",
List.of(
"bungeecord/target/AdvancedServerList-BungeeCord-{{version}}.jar",
"addons/banplugins/target/AdvancedServerList-BanPlugins-Addon-{{version}}.jar"
"addons/banplugins/target/AdvancedServerList-BanPlugins-Addon-{{version}}.jar",
"addons/luckperms/target/AdvancedServerList-Luckperms-Addon-{{version}}.jar"
),
List.of("BungeeCord", "Waterfall")
),
@@ -49,7 +51,8 @@ public enum PlatformInfo{
"velocity",
List.of(
"velocity/target/AdvancedServerList-Velocity-{{version}}.jar",
"addons/banplugins/target/AdvancedServerList-BanPlugins-Addon-{{version}}.jar"
"addons/banplugins/target/AdvancedServerList-BanPlugins-Addon-{{version}}.jar",
"addons/luckperms/target/AdvancedServerList-Luckperms-Addon-{{version}}.jar"
),
List.of("Velocity")
);
@@ -40,5 +40,5 @@ public class ReleaseHolder{
return releases;
}
record ReleaseInfo(String type, String platform, String url){}
public record ReleaseInfo(String type, String platform, String url){}
}
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
import java.time.Duration;
public class CodebergReleaseFetcher{
@@ -43,9 +43,9 @@ public class CodebergReleaseFetcher{
private static final Gson GSON = new Gson();
private static final OkHttpClient CLIENT = new OkHttpClient.Builder()
.callTimeout(30, TimeUnit.SECONDS)
.connectTimeout(30, TimeUnit.SECONDS)
.readTimeout(30, TimeUnit.SECONDS)
.callTimeout(Duration.ofSeconds(30))
.connectTimeout(Duration.ofSeconds(30))
.readTimeout(Duration.ofSeconds(30))
.build();
public static CodebergRelease fetch(){
@@ -132,7 +132,7 @@ public class HangarVersionUploader{
Map.of(
Platform.PAPER, List.of("1.20.6", "1.21.x"),
Platform.WATERFALL, List.of("1.19.x", "1.20.x", "1.21"),
Platform.VELOCITY, Collections.singletonList("3.2")
Platform.VELOCITY, List.of("3.2", "3.3", "3.4")
),
changelog.replaceAll("\r\n", "\n"),
fileInfo,
@@ -55,11 +55,11 @@ public class ModrinthVersionUploader{
);
private final List<String> paperVersions = List.of(
"1.20.6",
"1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4"
"1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.9", "1.21.10", "1.21.11"
);
private final List<String> versions = List.of(
"1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6",
"1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4"
"1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.9", "1.21.10", "1.21.11"
);
private final ModrinthAPI api;
@@ -91,7 +91,8 @@ public class ModrinthVersionUploader{
List<ProjectVersion.ProjectDependency> paperDependencies = List.of(
new ProjectVersion.ProjectDependency(null, "VCAqN1ln", null, ProjectVersion.ProjectDependencyType.OPTIONAL), // Maintenance
new ProjectVersion.ProjectDependency(null, "P1OZGk5p", null, ProjectVersion.ProjectDependencyType.OPTIONAL) // ViaVersion
new ProjectVersion.ProjectDependency(null, "P1OZGk5p", null, ProjectVersion.ProjectDependencyType.OPTIONAL), // ViaVersion
new ProjectVersion.ProjectDependency(null, "HQyibRsN", null, ProjectVersion.ProjectDependencyType.OPTIONAL) // MiniPlaceholders
);
List<ProjectVersion.ProjectDependency> bungeeDependencies = List.of(
new ProjectVersion.ProjectDependency(null, "VCAqN1ln", null, ProjectVersion.ProjectDependencyType.OPTIONAL), // Maintenance
@@ -99,7 +100,8 @@ public class ModrinthVersionUploader{
);
List<ProjectVersion.ProjectDependency> velocityDependencies = List.of(
new ProjectVersion.ProjectDependency(null, "VCAqN1ln", null, ProjectVersion.ProjectDependencyType.OPTIONAL), // Maintenance
new ProjectVersion.ProjectDependency(null, "bEIUEGTX", null, ProjectVersion.ProjectDependencyType.OPTIONAL) // PAPIProxyBridge
new ProjectVersion.ProjectDependency(null, "bEIUEGTX", null, ProjectVersion.ProjectDependencyType.OPTIONAL), // PAPIProxyBridge
new ProjectVersion.ProjectDependency(null, "HQyibRsN", null, ProjectVersion.ProjectDependencyType.OPTIONAL) // MiniPlaceholders
);
for(int i = 0; i < platforms.size(); i++){
@@ -146,9 +148,10 @@ public class ModrinthVersionUploader{
String url = versionUrl + projectVersion.getId();
logger.info("Created new release!");
logger.info("Link: {}", url);
logger.info("Platform: {}", platformInfo.getPlatform());
logger.info("""
New release created:
- Link: {}
- Platform: {}""", url, platformInfo.getPlatform());
releaseHolder.addRelease(
"modrinth",