Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-04 23:47:59 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #373 from MrGazdag/patch-3

Browse Source 
Modify /gamemode to behave more like vanilla
This commit is contained in:
TheMode 2021-07-20 22:29:52 +02:00 committed by GitHub
commit 8f6f63b2c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 105 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
src/test/java/demo/commands/GamemodeCommand.java
View File

@ -1,73 +1,131 @@
package demo.commands; package demo.commands;
import net.kyori.adventure.audience.MessageType;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.event.ClickEvent; import net.kyori.adventure.text.format.NamedTextColor;
import net.minestom.server.command.CommandSender; import net.minestom.server.command.CommandSender;
import net.minestom.server.command.builder.Command; import net.minestom.server.command.builder.Command;
import net.minestom.server.command.builder.CommandContext;
import net.minestom.server.command.builder.arguments.ArgumentEnum; import net.minestom.server.command.builder.arguments.ArgumentEnum;
import net.minestom.server.command.builder.arguments.ArgumentType; import net.minestom.server.command.builder.arguments.ArgumentType;
import net.minestom.server.command.builder.condition.Conditions; import net.minestom.server.command.builder.arguments.minecraft.ArgumentEntity;
import net.minestom.server.command.builder.exception.ArgumentSyntaxException; import net.minestom.server.entity.Entity;
import net.minestom.server.entity.GameMode; import net.minestom.server.entity.GameMode;
import net.minestom.server.entity.Player; import net.minestom.server.entity.Player;
import net.minestom.server.utils.entity.EntityFinder; import net.minestom.server.utils.entity.EntityFinder;
import java.util.List;
import java.util.Locale;
/** /**
* Command that make a player change gamemode * Command that make a player change gamemode, made in
* the style of the vanilla /gamemode command.
*
* @see https://minecraft.fandom.com/wiki/Commands/gamemode
*/ */
public class GamemodeCommand extends Command { public class GamemodeCommand extends Command {
public GamemodeCommand() { public GamemodeCommand() {
super("gamemode", "g", "gm"); super("gamemode", "gm");
setCondition(Conditions::playerOnly); //GameMode parameter
ArgumentEnum<GameMode> gamemode = ArgumentType.Enum("gamemode", GameMode.class).setFormat(ArgumentEnum.Format.LOWER_CASED);
gamemode.setCallback((sender, exception) -> {
sender.sendMessage(
Component.text("Invalid gamemode ", NamedTextColor.RED)
.append(Component.text(exception.getInput(), NamedTextColor.WHITE))
.append(Component.text("!")), MessageType.SYSTEM);
});
setDefaultExecutor(this::usage); ArgumentEntity player = ArgumentType.Entity("targets").onlyPlayers(true);
var player = ArgumentType.Entity("player") //Upon invalid usage, print the correct usage of the command to the sender
.onlyPlayers(true) setDefaultExecutor((sender, context) -> {
.singleEntity(true); String commandName = context.getCommandName();
sender.sendMessage(Component.text("Usage: /" + commandName + " <gamemode> [targets]", NamedTextColor.RED), MessageType.SYSTEM);
});
var mode = ArgumentType.Enum("gamemode", GameMode.class) //Command Syntax for /gamemode <gamemode>
.setFormat(ArgumentEnum.Format.LOWER_CASED); addSyntax((sender, context) -> {
//Limit execution to players only
if (!sender.isPlayer()) {
sender.sendMessage(Component.text("Please run this command in-game.", NamedTextColor.RED));
return;
}
//Check permission, this could be replaced with hasPermission
if (sender.asPlayer().getPermissionLevel() < 2) {
sender.sendMessage(Component.text("You don't have permission to use this command.", NamedTextColor.RED));
return;
}
GameMode mode = context.get(gamemode);
//Set the gamemode for the sender
executeSelf(sender.asPlayer(), mode);
}, gamemode);
setArgumentCallback(this::targetCallback, player); //Command Syntax for /gamemode <gamemode> [targets]
setArgumentCallback(this::gameModeCallback, mode); addSyntax((sender, context) -> {
//Check permission for players only
addSyntax(this::executeOnSelf, mode); //This allows the console to use this syntax too
addSyntax(this::executeOnOther, player, mode); if (sender.isPlayer() && sender.asPlayer().getPermissionLevel() < 2) {
sender.sendMessage(Component.text("You don't have permission to use this command.", NamedTextColor.RED));
return;
}
EntityFinder finder = context.get(player);
GameMode mode = context.get(gamemode);
//Set the gamemode for the targets
executeOthers(sender, mode, finder.find(sender));
}, gamemode, player);
} }
private void usage(CommandSender sender, CommandContext context) { /**
sender.sendMessage(Component.text("Usage: /gamemode [player] <gamemode>") * Sets the gamemode for the specified entities, and
.hoverEvent(Component.text("Click to get this command.")) * notifies them (and the sender) in the chat.
.clickEvent(ClickEvent.suggestCommand("/gamemode player gamemode"))); */
private void executeOthers(CommandSender sender, GameMode mode, List<Entity> entities) {
if (entities.size() == 0) {
//If there are no players that could be modified, display an error message
if (sender.isPlayer()) sender.sendMessage(Component.translatable("argument.entity.notfound.player", NamedTextColor.RED), MessageType.SYSTEM);
else sender.sendMessage(Component.text("No player was found", NamedTextColor.RED), MessageType.SYSTEM);
} else for (Entity entity : entities) {
if (entity instanceof Player) {
Player p = (Player) entity;
if (p == sender) {
//If the player is the same as the sender, call
//executeSelf to display one message instead of two
executeSelf(sender.asPlayer(), mode);
} else {
p.setGameMode(mode);
String gamemodeString = "gameMode." + mode.name().toLowerCase(Locale.ROOT);
Component gamemodeComponent = Component.translatable(gamemodeString);
Component playerName = p.getDisplayName() == null ? p.getName() : p.getDisplayName();
//Send a message to the changed player and the sender
p.sendMessage(Component.translatable("gameMode.changed", gamemodeComponent), MessageType.SYSTEM);
sender.sendMessage(Component.translatable("commands.gamemode.success.other", playerName, gamemodeComponent), MessageType.SYSTEM);
}
}
}
} }
private void executeOnSelf(CommandSender sender, CommandContext context) { /**
Player player = (Player) sender; * Sets the gamemode for the executing Player, and
* notifies them in the chat.
GameMode gamemode = context.get("gamemode"); */
assert gamemode != null; // mode is not supposed to be null, because gamemodeName will be valid private void executeSelf(Player sender, GameMode mode) {
player.setGameMode(gamemode); sender.setGameMode(mode);
player.sendMessage(Component.text("You are now playing in " + gamemode.toString().toLowerCase()));
} //The translation keys 'gameMode.survival', 'gameMode.creative', etc.
//correspond to the translated game mode names.
private void executeOnOther(CommandSender sender, CommandContext context) { String gamemodeString = "gameMode." + mode.name().toLowerCase(Locale.ROOT);
GameMode gamemode = context.get("gamemode"); Component gamemodeComponent = Component.translatable(gamemodeString);
EntityFinder targetFinder = context.get("player");
Player target = targetFinder.findFirstPlayer(sender); //Send the translated message to the player.
assert gamemode != null; // mode is not supposed to be null, because gamemodeName will be valid sender.sendMessage(Component.translatable("commands.gamemode.success.self", gamemodeComponent), MessageType.SYSTEM);
assert target != null;
target.setGameMode(gamemode);
target.sendMessage(Component.text("You are now playing in " + gamemode.toString().toLowerCase()));
}
private void targetCallback(CommandSender sender, ArgumentSyntaxException exception) {
sender.sendMessage(Component.text("'" + exception.getInput() + "' is not a valid player name."));
}
private void gameModeCallback(CommandSender sender, ArgumentSyntaxException exception) {
sender.sendMessage(Component.text("'" + exception.getInput() + "' is not a valid gamemode!"));
} }
} }