hyro/lighteco
1
0
Fork 0
mirror of https://github.com/xHyroM/lighteco.git synced 2024-11-21 22:41:06 +01:00
Code Issues Projects Releases Wiki Activity

feat: console support

Browse source
This commit is contained in:
Jozef Steinhübl 2024-07-16 17:55:19 +02:00
parent c656999576
commit 49dd99b5ef
No known key found for this signature in database
GPG key ID: E6BC90C91973B08F
4 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
common/src/main/java/dev/xhyrom/lighteco/common/command/CommandManager.java
View file

@ -60,7 +60,7 @@ public class CommandManager {
} }
public void execute(CommandSender sender, String name, String[] args) { public void execute(CommandSender sender, String name, String[] args) {
if (locks.contains(sender.getUniqueId())) { if (!sender.isConsole() && locks.contains(sender.getUniqueId())) {
sender.sendMessage(MiniMessage.miniMessage().deserialize( sender.sendMessage(MiniMessage.miniMessage().deserialize(
this.plugin.getConfig().messages.wait this.plugin.getConfig().messages.wait
)); ));
@ -73,7 +73,8 @@ public class CommandManager {
source source
); );
locks.add(sender.getUniqueId()); if (!sender.isConsole())
locks.add(sender.getUniqueId());
CompletableFuture.runAsync(() -> { CompletableFuture.runAsync(() -> {
try { try {
@ -81,17 +82,19 @@ public class CommandManager {
} catch (CommandSyntaxException e) { } catch (CommandSyntaxException e) {
this.sendError(sender, name, e); this.sendError(sender, name, e);
} finally { } finally {
this.plugin.getBootstrap().getLogger().debug("Removing lock for " + sender.getUsername()); if (!source.sender().isConsole()) {
this.plugin.getBootstrap().getLogger().debug("Removing lock for " + sender.getUsername());
UUID target = locksMappings.get(sender.getUniqueId()); UUID target = locksMappings.get(sender.getUniqueId());
if (target != null) { if (target != null) {
locks.remove(target); locks.remove(target);
locksMappings.remove(sender.getUniqueId()); locksMappings.remove(sender.getUniqueId());
this.plugin.getBootstrap().getLogger().debug("Removing lock caused by " + sender.getUsername() + " for " + target); this.plugin.getBootstrap().getLogger().debug("Removing lock caused by " + sender.getUsername() + " for " + target);
}
locks.remove(sender.getUniqueId());
} }
locks.remove(sender.getUniqueId());
} }
}, executor); }, executor);
} }

5
common/src/main/java/dev/xhyrom/lighteco/common/command/argument/type/OfflineUserArgument.java
View file

@ -9,8 +9,6 @@ import dev.xhyrom.lighteco.common.command.exception.LockedUserException;
import dev.xhyrom.lighteco.common.model.chat.CommandSender; import dev.xhyrom.lighteco.common.model.chat.CommandSender;
import dev.xhyrom.lighteco.common.model.user.User; import dev.xhyrom.lighteco.common.model.user.User;
import dev.xhyrom.lighteco.common.plugin.LightEcoPlugin; import dev.xhyrom.lighteco.common.plugin.LightEcoPlugin;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import java.util.UUID; import java.util.UUID;
@ -32,7 +30,8 @@ public class OfflineUserArgument implements ArgumentType<String> {
} }
// Lock the user to prevent race conditions // Lock the user to prevent race conditions
plugin.getCommandManager().lockBySender(context.getSource().sender(), uniqueId); if (!sender.isConsole())
plugin.getCommandManager().lockBySender(context.getSource().sender(), uniqueId);
return plugin.getUserManager().loadUser(uniqueId).join(); return plugin.getUserManager().loadUser(uniqueId).join();
} }

4
common/src/main/java/dev/xhyrom/lighteco/common/commands/PayCommand.java
View file

@ -123,7 +123,7 @@ public class PayCommand extends Command {
public CommandNode<CommandSource> build() { public CommandNode<CommandSource> build() {
if (currency.fractionalDigits() > 0) { if (currency.fractionalDigits() > 0) {
return builder() return builder()
.requires((source) -> source.sender().eligible("lighteco.currency." + currency.getIdentifier() + ".command.pay")) .requires((source) -> !source.sender().isConsole() && source.sender().eligible("lighteco.currency." + currency.getIdentifier() + ".command.pay"))
.then(RequiredArgumentBuilder.<CommandSource, String>argument("target", StringArgumentType.word()) .then(RequiredArgumentBuilder.<CommandSource, String>argument("target", StringArgumentType.word())
.suggests(OfflineUserSuggestionProvider.create()) .suggests(OfflineUserSuggestionProvider.create())
.then(RequiredArgumentBuilder.<CommandSource, Double>argument("amount", DoubleArgumentType.doubleArg(1)) .then(RequiredArgumentBuilder.<CommandSource, Double>argument("amount", DoubleArgumentType.doubleArg(1))
@ -136,7 +136,7 @@ public class PayCommand extends Command {
} }
return builder() return builder()
.requires((source) -> source.sender().eligible("lighteco.currency." + currency.getIdentifier() + ".command.pay")) .requires((source) -> !source.sender().isConsole() && source.sender().eligible("lighteco.currency." + currency.getIdentifier() + ".command.pay"))
.then(RequiredArgumentBuilder.<CommandSource, String>argument("target", StringArgumentType.word()) .then(RequiredArgumentBuilder.<CommandSource, String>argument("target", StringArgumentType.word())
.suggests(OfflineUserSuggestionProvider.create()) .suggests(OfflineUserSuggestionProvider.create())
.then(RequiredArgumentBuilder.<CommandSource, Integer>argument("amount", IntegerArgumentType.integer(1)) .then(RequiredArgumentBuilder.<CommandSource, Integer>argument("amount", IntegerArgumentType.integer(1))

7
common/src/main/java/dev/xhyrom/lighteco/common/model/chat/CommandSender.java
View file

@ -1,13 +1,18 @@
package dev.xhyrom.lighteco.common.model.chat; package dev.xhyrom.lighteco.common.model.chat;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import org.checkerframework.checker.nullness.qual.Nullable;
import java.util.UUID; import java.util.UUID;
public interface CommandSender { public interface CommandSender {
String getUsername(); String getUsername();
UUID getUniqueId(); @Nullable UUID getUniqueId();
boolean eligible(String permission); boolean eligible(String permission);
void sendMessage(Component message); void sendMessage(Component message);
default boolean isConsole() {
return getUniqueId() == null;
}
} }