Skip to content

Commit

Permalink
Implement 'account create' and 'delete' subcommands
Browse files Browse the repository at this point in the history 
Added detailed 'create' and 'delete' subcommands to handle player-specific and world-specific account management. This improves command granularity and enhances permission control for different account operations.
  • Loading branch information
@NonSwag
NonSwag committed Sep 7, 2024
1 parent a03b42b commit b421298
Showing 1 changed file with 146 additions and 2 deletions.
148 changes: 146 additions & 2 deletions src/main/java/net/thenextlvl/economist/command/AccountCommand.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,25 @@
package net.thenextlvl.economist.command;

import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import com.mojang.brigadier.context.CommandContext;
import core.paper.command.CustomArgumentTypes;
import io.papermc.paper.command.brigadier.CommandSourceStack;
import io.papermc.paper.command.brigadier.Commands;
import io.papermc.paper.command.brigadier.argument.ArgumentTypes;
import io.papermc.paper.command.brigadier.argument.resolvers.selector.PlayerSelectorArgumentResolver;
import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents;
import lombok.RequiredArgsConstructor;
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import net.thenextlvl.economist.EconomistPlugin;
import net.thenextlvl.economist.api.Account;
import org.bukkit.OfflinePlayer;
import org.bukkit.World;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.Nullable;

import java.util.Collection;
import java.util.List;
import java.util.concurrent.CompletableFuture;

@RequiredArgsConstructor
@SuppressWarnings("UnstableApiUsage")
Expand All @@ -14,10 +30,138 @@ public void register() {
var command = Commands.literal("account")
.requires(stack -> stack.getSender().hasPermission("economist.account"))
// .then(Commands.literal("balance").redirect())
.then(Commands.literal("create").requires(stack -> stack.getSender().hasPermission("economist.account.create")))
.then(Commands.literal("delete").requires(stack -> stack.getSender().hasPermission("economist.account.delete")))
.then(create())
.then(delete())
.build();
plugin.getLifecycleManager().registerEventHandler(LifecycleEvents.COMMANDS.newHandler(event ->
event.registrar().register(command, "Manage user accounts")));
}

private LiteralArgumentBuilder<CommandSourceStack> create() {
return Commands.literal("create")
.requires(stack -> stack.getSender().hasPermission("economist.account.create"))
.then(Commands.argument("player", CustomArgumentTypes.cachedOfflinePlayer())
.requires(stack -> stack.getSender().hasPermission("economist.account.create.others"))
.then(Commands.argument("world", ArgumentTypes.world())
.requires(stack -> stack.getSender().hasPermission("economist.account.create.world"))
.executes(context -> {
var player = context.getArgument("player", OfflinePlayer.class);
var world = context.getArgument("world", World.class);
return create(context, List.of(player), world);
}))
.executes(context -> {
var player = context.getArgument("player", OfflinePlayer.class);
return create(context, List.of(player), null);
}))
.then(Commands.argument("players", ArgumentTypes.players())
.requires(stack -> stack.getSender().hasPermission("economist.account.create.others"))
.then(Commands.argument("world", ArgumentTypes.world())
.requires(stack -> stack.getSender().hasPermission("economist.account.create.world"))
.executes(context -> {
var players = context.getArgument("players", PlayerSelectorArgumentResolver.class);
var world = context.getArgument("world", World.class);
var resolve = players.resolve(context.getSource());
return create(context, resolve, world);
}))
.executes(context -> {
var players = context.getArgument("players", PlayerSelectorArgumentResolver.class);
var resolve = players.resolve(context.getSource());
return create(context, resolve, null);
}))
.executes(context -> {
var players = context.getSource().getSender() instanceof Player player
? List.<OfflinePlayer>of(player) : List.<OfflinePlayer>of();
return create(context, players, null);
});
}

private LiteralArgumentBuilder<CommandSourceStack> delete() {
return Commands.literal("delete")
.requires(stack -> stack.getSender().hasPermission("economist.account.delete"))
.then(Commands.argument("player", CustomArgumentTypes.cachedOfflinePlayer())
.requires(stack -> stack.getSender().hasPermission("economist.account.delete.others"))
.then(Commands.argument("world", ArgumentTypes.world())
.requires(stack -> stack.getSender().hasPermission("economist.account.delete.world"))
.executes(context -> {
var player = context.getArgument("player", OfflinePlayer.class);
var world = context.getArgument("world", World.class);
return delete(context, List.of(player), world);
}))
.executes(context -> {
var player = context.getArgument("player", OfflinePlayer.class);
return delete(context, List.of(player), null);
}))
.then(Commands.argument("players", ArgumentTypes.players())
.requires(stack -> stack.getSender().hasPermission("economist.account.delete.others"))
.then(Commands.argument("world", ArgumentTypes.world())
.requires(stack -> stack.getSender().hasPermission("economist.account.delete.world"))
.executes(context -> {
var players = context.getArgument("players", PlayerSelectorArgumentResolver.class);
var world = context.getArgument("world", World.class);
var resolve = players.resolve(context.getSource());
return delete(context, resolve, world);
}))
.executes(context -> {
var players = context.getArgument("players", PlayerSelectorArgumentResolver.class);
var resolve = players.resolve(context.getSource());
return delete(context, resolve, null);
}))
.executes(context -> {
var players = context.getSource().getSender() instanceof Player player
? List.<OfflinePlayer>of(player) : List.<OfflinePlayer>of();
return delete(context, players, null);
});
}

private int create(CommandContext<CommandSourceStack> context, Collection<? extends OfflinePlayer> players, @Nullable World world) {
var sender = context.getSource().getSender();
if (players.isEmpty()) plugin.bundle().sendMessage(sender, "player.define");
else players.forEach(player -> createAccount(player, world).thenAccept(account -> {
var message = world != null
? (player.equals(sender) ? "account.created.world.self" : "account.created.world.other")
: (player.equals(sender) ? "account.created.self" : "account.created.other");
plugin.bundle().sendMessage(sender, message,
Placeholder.parsed("player", player.getName() != null ? player.getName() : "null"),
Placeholder.parsed("world", world != null ? world.key().asString() : "null"));
}).exceptionally(throwable -> {
var message = world != null
? (player.equals(sender) ? "account.exists.world.self" : "account.exists.world.other")
: (player.equals(sender) ? "account.exists.self" : "account.exists.other");
plugin.bundle().sendMessage(sender, message,
Placeholder.parsed("player", player.getName() != null ? player.getName() : "null"),
Placeholder.parsed("world", world != null ? world.key().asString() : "null"));
return null;
}));
return players.size();
}

private int delete(CommandContext<CommandSourceStack> context, Collection<? extends OfflinePlayer> players, @Nullable World world) {
var sender = context.getSource().getSender();
if (players.isEmpty()) plugin.bundle().sendMessage(sender, "player.define");
else players.forEach(player -> deleteAccount(player, world).thenAccept(success -> {
var message = success ? (world != null
? (player.equals(sender) ? "account.deleted.world.self" : "account.deleted.world.other")
: (player.equals(sender) ? "account.deleted.self" : "account.deleted.other"))
: (world != null
? (player.equals(sender) ? "account.not-found.world.self" : "account.not-found.world.other")
: (player.equals(sender) ? "account.not-found.self" : "account.not-found.other"));
plugin.bundle().sendMessage(sender, message,
Placeholder.parsed("player", player.getName() != null ? player.getName() : "null"),
Placeholder.parsed("world", world != null ? world.key().asString() : "null"));
}).exceptionally(throwable -> {
plugin.getComponentLogger().error("Failed to delete account for {}", player.getName(), throwable);
return null;
}));
return players.size();
}

private CompletableFuture<Account> createAccount(OfflinePlayer player, @Nullable World world) {
if (world == null) return plugin.economyController().createAccount(player);
return plugin.economyController().createAccount(player, world);
}

private CompletableFuture<Boolean> deleteAccount(OfflinePlayer player, @Nullable World world) {
if (world == null) return plugin.economyController().deleteAccount(player);
return plugin.economyController().deleteAccount(player, world);
}
}

0 comments on commit b421298

Please sign in to comment.