Skip to content

Feat/gamemode permissions #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TheBjoRedCraft wants to merge 2 commits into
base: version/1.21.11
Choose a base branch
from
Open

Feat/gamemode permissions #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ea6264
feat: add permission checks to GameModeArgument and update version to…
TheBjoRedCraft Jan 27, 2026
ea3bcca
feat: add specific permissions for each game mode
TheBjoRedCraft Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
kotlin.code.style=official
kotlin.stdlib.default.dependency=false
org.gradle.parallel=true
version=1.21.11-2.0.10-SNAPSHOT
version=1.21.11-2.0.11-SNAPSHOT
26 changes: 20 additions & 6 deletions src/main/kotlin/dev/slne/surf/essentials/command/argument/GameModeArgument.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,34 @@ import org.bukkit.command.CommandSender

class GameModeArgument(nodeName: String) :
CustomArgument<GameMode, String>(StringArgument(nodeName), { info ->
getGameMode(info.input.lowercase())
val gameMode = getGameMode(info.input.lowercase())
?: throw CustomArgumentException.fromAdventureComponent {
buildText {
appendErrorPrefix()
error("Der Spielmodus wurde nicht gefunden.")
}
}

val permission = "surf.essentials.gameMode.${gameMode.name.lowercase()}"
val sender = info.sender

if (!sender.hasPermission(permission)) {
throw CustomArgumentException.fromAdventureComponent {
buildText {
appendErrorPrefix()
error("Dazu hast du keine Berechtigung.")
}
}
}

gameMode
}) {
init {
this.replaceSuggestions(
ArgumentSuggestions.stringCollection<CommandSender> {
GameMode.entries.map {
it.name.lowercase()
}
ArgumentSuggestions.stringCollection<CommandSender> { sender ->
GameMode.entries
.filter { sender.sender.hasPermission("surf.essentials.gameMode.${it.name.lowercase()}") }
.map { it.name.lowercase() }
}
)
}
Expand Down Expand Up @@ -52,4 +66,4 @@ inline fun CommandTree.gameModeArgument(
block: Argument<*>.() -> Unit = {}
): CommandTree = then(
GameModeArgument(nodeName).setOptional(optional).apply(block)
)
)
4 changes: 4 additions & 0 deletions src/main/kotlin/dev/slne/surf/essentials/util/permission/EssentialsPermissionRegistry.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ object EssentialsPermissionRegistry : PermissionRegistry() {
val FLY_COMMAND_OTHERS = create("$PREFIX.fly.command.others")
val GAME_MODE_SWITCHER = create("$PREFIX.gameMode.gameModeSwitcher")
val GAME_MODE_COMMAND = create("$PREFIX.gameMode.command")
val GAME_MODE_CREATIVE = create("$PREFIX.gameMode.creative")
val GAME_MODE_SURVIVAL = create("$PREFIX.gameMode.survival")
val GAME_MODE_ADVENTURE = create("$PREFIX.gameMode.adventure")
val GAME_MODE_SPECTATOR = create("$PREFIX.gameMode.spectator")
val GAME_MODE_COMMAND_OTHERS = create("$PREFIX.gameMode.command.others")
val GAME_MODE_COMMAND_OFFLINE = create("$PREFIX.gameMode.command.offline")
val GAME_MODE_COMMAND_DEFAULT = create("$PREFIX.gamemode.command.default")
Expand Down