A Complete Whitelist Module #8205
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
NotSoDelayed
requested review from
sovdeeth and
cheeezburga
and removed request for
a team
skriptlang-automation
bot
added
the
needs reviews
|
PS. MC 1.19.4 tests are expected to fail due to classes doesn't exist in that version, but the next Skript release drops support of that version |
sovdeeth
requested changes
Sep 25, 2025
src/main/java/org/skriptlang/skript/bukkit/whitelist/WhitelistModule.java
Outdated
Show resolved
Hide resolved
src/main/java/org/skriptlang/skript/bukkit/whitelist/elements/CondWillBeWhitelisted.java
Outdated
Show resolved
Hide resolved
src/main/java/org/skriptlang/skript/bukkit/whitelist/elements/CondWillBeWhitelisted.java
Show resolved
Hide resolved
src/main/java/org/skriptlang/skript/bukkit/whitelist/elements/EvtWhitelist.java
Outdated
Show resolved
Hide resolved
src/main/java/org/skriptlang/skript/bukkit/whitelist/elements/EvtWhitelist.java
Outdated
Show resolved
Hide resolved
src/main/java/org/skriptlang/skript/bukkit/whitelist/elements/EvtWhitelist.java
Outdated
Show resolved
Hide resolved
sovdeeth
requested changes
Sep 28, 2025
| "", | ||
| "on player whitelist:", | ||
| "\tsend "Whitelist of player % event - player % has been set to % whether server will be whitelisted%" to all ops" | ||
| """) |
There was a problem hiding this comment.
Suggested change
| """) | |
| """) |
Also gotta remove all the " and , in the block.
|
|
||
| static { | ||
| Skript.registerEvent("Player Whitelist", EvtPlayerWhitelist.class, WhitelistStateUpdateEvent.class, | ||
| "player whitelist [state] (change[d]|toggle[d]|update[d])", |
There was a problem hiding this comment.
Suggested change
| "player whitelist [state] (change[d]|toggle[d]|update[d])", | |
| "player whitelist [state] (change[d]|update[d])", |
the toggled syntax sounds like i'm turning the whitelist on or off, not updating a single player.
| "", | ||
| "on player whitelist toggled:", | ||
| "\tsend \"Whitelist of player %event-offlineplayer% has been set to %whether server will be whitelisted%\" to all ops") | ||
| .since(""); |
There was a problem hiding this comment.
Suggested change
| .since(""); | |
| .since(""); |
?
| EventValues.registerEventValue(WhitelistStateUpdateEvent.class, OfflinePlayer.class, WhitelistStateUpdateEvent::getPlayer); | ||
| } | ||
|
|
||
| private Kleenean state = Kleenean.UNKNOWN; |
There was a problem hiding this comment.
Use a proper enum for this, a Kleenean isn't the right tool for the job.
| .since(""); | ||
| } | ||
|
|
||
| private Kleenean state = Kleenean.UNKNOWN; |
sovdeeth
added
enhancement
Efnilite
requested changes
Sep 28, 2025
Comment on lines
+66
to
+71
| return new SyntaxStringBuilder(event, debug) | ||
| .append("the") | ||
| .append(isServer ? "server" : "player") | ||
| .append(isNegated() ? "will not" : "will") | ||
| .append("be whitelisted") | ||
| .toString(); |
There was a problem hiding this comment.
this should use if statements instead of ternary to improve readability
| SyntaxStringBuilder builder = new SyntaxStringBuilder(event, debug) | ||
| .append("player"); | ||
| if (!state.isUnknown()) { | ||
| builder.append(state.isTrue() ? "added to" : "removed from") |
src/main/java/org/skriptlang/skript/bukkit/whitelist/elements/ExprWhitelist.java
Show resolved
Hide resolved
skriptlang-automation
bot
removed
the
needs reviews
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
Skript is lacking certain coverage on whitelist related APIs, especially whitelist events.
Solution
This PR focuses more on completing the whitelist module, such as:
Testing Completed
The current test coverage for whitelist only covers manipulating player list in whitelist and server whitelist state. Alongside with new additions added in this PR, JUnit tests were also added -- in EvtWhitelistTest.java and EvtWhitelistTest.sk, marking this a complete test coverage specifically for whitelist.
Supporting Information
Completes: none
Related: none