From 46da96472f4ba0f5d5f29a4c075a56f04de22102 Mon Sep 17 00:00:00 2001 From: UrAvgCode Date: Wed, 10 Sep 2025 12:44:52 +0200 Subject: [PATCH] refactor whitelist command --- .../globalwhitelist/command/WhitelistCommand.java | 4 ++-- .../command/WhitelistCommandHandler.java | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/uravgcode/globalwhitelist/command/WhitelistCommand.java b/src/main/java/com/uravgcode/globalwhitelist/command/WhitelistCommand.java index 7478396..8089ed0 100644 --- a/src/main/java/com/uravgcode/globalwhitelist/command/WhitelistCommand.java +++ b/src/main/java/com/uravgcode/globalwhitelist/command/WhitelistCommand.java @@ -24,7 +24,7 @@ public final class WhitelistCommand { ) { var commandHandler = new WhitelistCommandHandler(proxy, profileService, whitelist, config, messages); - LiteralCommandNode helloNode = BrigadierCommand.literalArgumentBuilder("globalwhitelist") + var rootNode = BrigadierCommand.literalArgumentBuilder("globalwhitelist") .requires(source -> source.hasPermission(PERMISSION_BASE) || source.hasPermission(PERMISSION_ADMIN)) .executes(commandHandler::help) .then(buildAddCommand(commandHandler)) @@ -37,7 +37,7 @@ public final class WhitelistCommand { .then(buildUnenforcedCommand(commandHandler)) .build(); - return new BrigadierCommand(helloNode); + return new BrigadierCommand(rootNode); } private static LiteralArgumentBuilder buildAddCommand(WhitelistCommandHandler handler) { diff --git a/src/main/java/com/uravgcode/globalwhitelist/command/WhitelistCommandHandler.java b/src/main/java/com/uravgcode/globalwhitelist/command/WhitelistCommandHandler.java index d51d00d..428fb87 100644 --- a/src/main/java/com/uravgcode/globalwhitelist/command/WhitelistCommandHandler.java +++ b/src/main/java/com/uravgcode/globalwhitelist/command/WhitelistCommandHandler.java @@ -98,7 +98,7 @@ public class WhitelistCommandHandler { } public int on(CommandContext context) { - CommandSource source = context.getSource(); + var source = context.getSource(); if (config.whitelistEnabled()) { source.sendMessage(messages.getMessage(MessagesConfig.WHITELIST_ON_ALREADY)); @@ -118,7 +118,7 @@ public class WhitelistCommandHandler { } public int off(CommandContext context) { - CommandSource source = context.getSource(); + var source = context.getSource(); if (config.whitelistEnabled()) { config.setWhitelistEnabled(false); @@ -131,7 +131,7 @@ public class WhitelistCommandHandler { } public int enforced(CommandContext context) { - CommandSource source = context.getSource(); + var source = context.getSource(); if (config.enforceWhitelistEnabled()) { source.sendMessage(messages.getMessage(MessagesConfig.WHITELIST_ENFORCED_ALREADY)); @@ -151,7 +151,7 @@ public class WhitelistCommandHandler { } public int unenforced(CommandContext context) { - CommandSource source = context.getSource(); + var source = context.getSource(); if (config.enforceWhitelistEnabled()) { config.setEnforceWhitelistEnabled(false); @@ -167,8 +167,7 @@ public class WhitelistCommandHandler { whitelist.reload(); config.reload(); messages.reload(); - CommandSource source = context.getSource(); - source.sendMessage(messages.getMessage(MessagesConfig.WHITELIST_RELOAD)); + context.getSource().sendMessage(messages.getMessage(MessagesConfig.WHITELIST_RELOAD)); return Command.SINGLE_SUCCESS; } }