icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add permissions for setting fake players' gamemode and their spawn dimension.

Browse Source
This commit is contained in:
iceBear67 committed 2024-09-26 09:43:04 +08:00
1 parent e2b683c0db
commit 11867dd8cf
1 file changed
+43 -73
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/carpet/commands/PlayerCommand.java
+43 -73
View File
@@ -36,6 +36,7 @@ import net.minecraft.world.level.GameType;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import net.minecraft.world.phys.Vec2; import net.minecraft.world.phys.Vec2;
import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.Vec3;
import java.util.Collection; import java.util.Collection;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
@@ -46,11 +47,9 @@ import static net.minecraft.commands.Commands.argument;
import static net.minecraft.commands.Commands.literal; import static net.minecraft.commands.Commands.literal;
import static net.minecraft.commands.SharedSuggestionProvider.suggest; import static net.minecraft.commands.SharedSuggestionProvider.suggest;
public class PlayerCommand public class PlayerCommand {
{
// TODO: allow any order like execute // TODO: allow any order like execute
public static void register(CommandDispatcher<CommandSourceStack> dispatcher, CommandBuildContext commandBuildContext) public static void register(CommandDispatcher<CommandSourceStack> dispatcher, CommandBuildContext commandBuildContext) {
{
LiteralArgumentBuilder<CommandSourceStack> command = literal("player") LiteralArgumentBuilder<CommandSourceStack> command = literal("player")
.requires((player) -> Permissions.check(player, "carpet.command.player", CommandHelper.canUseCommand(player, CarpetSettings.commandPlayer))) .requires((player) -> Permissions.check(player, "carpet.command.player", CommandHelper.canUseCommand(player, CarpetSettings.commandPlayer)))
.then(argument("player", StringArgumentType.word()) .then(argument("player", StringArgumentType.word())
@@ -99,12 +98,14 @@ public class PlayerCommand
.then(literal("left").executes(manipulation(ap -> ap.setStrafing(1)))) .then(literal("left").executes(manipulation(ap -> ap.setStrafing(1))))
.then(literal("right").executes(manipulation(ap -> ap.setStrafing(-1)))) .then(literal("right").executes(manipulation(ap -> ap.setStrafing(-1))))
).then(literal("spawn").executes(PlayerCommand::spawn) ).then(literal("spawn").executes(PlayerCommand::spawn)
.then(literal("in").requires((player) -> player.hasPermission(2)) .then(literal("in").requires((player) -> Permissions.check(player, "carpet.command.player.gamemode", player.hasPermission(2)))
.then(argument("gamemode", GameModeArgument.gameMode()) .then(argument("gamemode", GameModeArgument.gameMode())
.executes(PlayerCommand::spawn))) .executes(PlayerCommand::spawn)))
.then(literal("at").then(argument("position", Vec3Argument.vec3()).executes(PlayerCommand::spawn) .then(literal("at").then(argument("position", Vec3Argument.vec3()).executes(PlayerCommand::spawn)
.then(literal("facing").then(argument("direction", RotationArgument.rotation()).executes(PlayerCommand::spawn) .then(literal("facing").then(argument("direction", RotationArgument.rotation()).executes(PlayerCommand::spawn)
.then(literal("in").then(argument("dimension", DimensionArgument.dimension()).executes(PlayerCommand::spawn) .then(literal("in")
.requires((player) -> Permissions.check(player,"carpet.command.player.dimension",player.hasPermission(4)))
.then(argument("dimension", DimensionArgument.dimension()).executes(PlayerCommand::spawn)
.then(literal("in").requires((player) -> player.hasPermission(2)) .then(literal("in").requires((player) -> player.hasPermission(2))
.then(argument("gamemode", GameModeArgument.gameMode()) .then(argument("gamemode", GameModeArgument.gameMode())
.executes(PlayerCommand::spawn) .executes(PlayerCommand::spawn)
@@ -116,8 +117,7 @@ public class PlayerCommand
dispatcher.register(command); dispatcher.register(command);
} }
private static LiteralArgumentBuilder<CommandSourceStack> makeActionCommand(String actionName, ActionType type) private static LiteralArgumentBuilder<CommandSourceStack> makeActionCommand(String actionName, ActionType type) {
{
return literal(actionName) return literal(actionName)
.executes(manipulation(ap -> ap.start(type, Action.once()))) .executes(manipulation(ap -> ap.start(type, Action.once())))
.then(literal("once").executes(manipulation(ap -> ap.start(type, Action.once())))) .then(literal("once").executes(manipulation(ap -> ap.start(type, Action.once()))))
@@ -126,8 +126,7 @@ public class PlayerCommand
.executes(c -> manipulate(c, ap -> ap.start(type, Action.interval(IntegerArgumentType.getInteger(c, "ticks"))))))); .executes(c -> manipulate(c, ap -> ap.start(type, Action.interval(IntegerArgumentType.getInteger(c, "ticks")))))));
} }
private static LiteralArgumentBuilder<CommandSourceStack> makeDropCommand(String actionName, boolean dropAll) private static LiteralArgumentBuilder<CommandSourceStack> makeDropCommand(String actionName, boolean dropAll) {
{
return literal(actionName) return literal(actionName)
.then(literal("all").executes(manipulation(ap -> ap.drop(-2, dropAll)))) .then(literal("all").executes(manipulation(ap -> ap.drop(-2, dropAll))))
.then(literal("mainhand").executes(manipulation(ap -> ap.drop(-1, dropAll)))) .then(literal("mainhand").executes(manipulation(ap -> ap.drop(-1, dropAll))))
@@ -136,39 +135,32 @@ public class PlayerCommand
executes(c -> manipulate(c, ap -> ap.drop(IntegerArgumentType.getInteger(c, "slot"), dropAll)))); executes(c -> manipulate(c, ap -> ap.drop(IntegerArgumentType.getInteger(c, "slot"), dropAll))));
} }
private static Collection<String> getPlayerSuggestions(CommandSourceStack source) private static Collection<String> getPlayerSuggestions(CommandSourceStack source) {
{
Set<String> players = new LinkedHashSet<>(List.of("Steve", "Alex")); Set<String> players = new LinkedHashSet<>(List.of("Steve", "Alex"));
players.addAll(source.getOnlinePlayerNames()); players.addAll(source.getOnlinePlayerNames());
return players; return players;
} }
private static ServerPlayer getPlayer(CommandContext<CommandSourceStack> context) private static ServerPlayer getPlayer(CommandContext<CommandSourceStack> context) {
{
String playerName = StringArgumentType.getString(context, "player"); String playerName = StringArgumentType.getString(context, "player");
MinecraftServer server = context.getSource().getServer(); MinecraftServer server = context.getSource().getServer();
return server.getPlayerList().getPlayerByName(playerName); return server.getPlayerList().getPlayerByName(playerName);
} }
private static boolean cantManipulate(CommandContext<CommandSourceStack> context) private static boolean cantManipulate(CommandContext<CommandSourceStack> context) {
{
Player player = getPlayer(context); Player player = getPlayer(context);
CommandSourceStack source = context.getSource(); CommandSourceStack source = context.getSource();
if (player == null) if (player == null) {
{
Messenger.m(source, "r Can only manipulate existing players"); Messenger.m(source, "r Can only manipulate existing players");
return true; return true;
} }
Player sender = source.getPlayer(); Player sender = source.getPlayer();
if (sender == null) if (sender == null) {
{
return false; return false;
} }
if (!source.getServer().getPlayerList().isOp(sender.getGameProfile())) if (!source.getServer().getPlayerList().isOp(sender.getGameProfile())) {
{ if (sender != player && !(player instanceof EntityPlayerMPFake)) {
if (sender != player && !(player instanceof EntityPlayerMPFake))
{
Messenger.m(source, "r Non OP players can't control other real players"); Messenger.m(source, "r Non OP players can't control other real players");
return true; return true;
} }
@@ -176,8 +168,7 @@ public class PlayerCommand
return false; return false;
} }
private static boolean cantReMove(CommandContext<CommandSourceStack> context) private static boolean cantReMove(CommandContext<CommandSourceStack> context) {
{
if (cantManipulate(context)) return true; if (cantManipulate(context)) return true;
Player player = getPlayer(context); Player player = getPlayer(context);
if (player instanceof EntityPlayerMPFake) return false; if (player instanceof EntityPlayerMPFake) return false;
@@ -185,22 +176,18 @@ public class PlayerCommand
return true; return true;
} }
private static boolean cantSpawn(CommandContext<CommandSourceStack> context) private static boolean cantSpawn(CommandContext<CommandSourceStack> context) {
{
String playerName = StringArgumentType.getString(context, "player"); String playerName = StringArgumentType.getString(context, "player");
MinecraftServer server = context.getSource().getServer(); MinecraftServer server = context.getSource().getServer();
PlayerList manager = server.getPlayerList(); PlayerList manager = server.getPlayerList();
if (manager.getPlayerByName(playerName) != null) if (manager.getPlayerByName(playerName) != null) {
{
Messenger.m(context.getSource(), "r Player ", "rb " + playerName, "r is already logged on"); Messenger.m(context.getSource(), "r Player ", "rb " + playerName, "r is already logged on");
return true; return true;
} }
GameProfile profile = server.getProfileCache().get(playerName).orElse(null); GameProfile profile = server.getProfileCache().get(playerName).orElse(null);
if (profile == null) if (profile == null) {
{ if (!CarpetSettings.allowSpawningOfflinePlayers) {
if (!CarpetSettings.allowSpawningOfflinePlayers)
{
Messenger.m(context.getSource(), "r Player " + playerName + " is either banned by Mojang, or auth servers are down. " + Messenger.m(context.getSource(), "r Player " + playerName + " is either banned by Mojang, or auth servers are down. " +
"Banned players can only be summoned in Singleplayer and in servers in off-line mode."); "Banned players can only be summoned in Singleplayer and in servers in off-line mode.");
return true; return true;
@@ -208,46 +195,37 @@ public class PlayerCommand
profile = new GameProfile(UUIDUtil.createOfflinePlayerUUID(playerName), playerName); profile = new GameProfile(UUIDUtil.createOfflinePlayerUUID(playerName), playerName);
} }
} }
if (manager.getBans().isBanned(profile)) if (manager.getBans().isBanned(profile)) {
{
Messenger.m(context.getSource(), "r Player ", "rb " + playerName, "r is banned on this server"); Messenger.m(context.getSource(), "r Player ", "rb " + playerName, "r is banned on this server");
return true; return true;
} }
if (manager.isUsingWhitelist() && manager.isWhiteListed(profile) && !context.getSource().hasPermission(2)) if (manager.isUsingWhitelist() && manager.isWhiteListed(profile) && !context.getSource().hasPermission(2)) {
{
Messenger.m(context.getSource(), "r Whitelisted players can only be spawned by operators"); Messenger.m(context.getSource(), "r Whitelisted players can only be spawned by operators");
return true; return true;
} }
return false; return false;
} }
private static int kill(CommandContext<CommandSourceStack> context) private static int kill(CommandContext<CommandSourceStack> context) {
{
if (cantReMove(context)) return 0; if (cantReMove(context)) return 0;
getPlayer(context).kill(); getPlayer(context).kill();
return 1; return 1;
} }
@FunctionalInterface @FunctionalInterface
interface SupplierWithCSE<T> interface SupplierWithCSE<T> {
{
T get() throws CommandSyntaxException; T get() throws CommandSyntaxException;
} }
private static <T> T getArgOrDefault(SupplierWithCSE<T> getter, T defaultValue) throws CommandSyntaxException private static <T> T getArgOrDefault(SupplierWithCSE<T> getter, T defaultValue) throws CommandSyntaxException {
{ try {
try
{
return getter.get(); return getter.get();
} } catch (IllegalArgumentException e) {
catch (IllegalArgumentException e)
{
return defaultValue; return defaultValue;
} }
} }
private static int spawn(CommandContext<CommandSourceStack> context) throws CommandSyntaxException private static int spawn(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
{
if (cantSpawn(context)) return 0; if (cantSpawn(context)) return 0;
CommandSourceStack source = context.getSource(); CommandSourceStack source = context.getSource();
@@ -265,33 +243,29 @@ public class PlayerCommand
); );
GameType mode = GameType.CREATIVE; GameType mode = GameType.CREATIVE;
boolean flying = false; boolean flying = false;
if (source.getEntity() instanceof ServerPlayer sender) if (source.getEntity() instanceof ServerPlayer sender) {
{
mode = sender.gameMode.getGameModeForPlayer(); mode = sender.gameMode.getGameModeForPlayer();
flying = sender.getAbilities().flying; flying = sender.getAbilities().flying;
} }
try { try {
mode = GameModeArgument.getGameMode(context, "gamemode"); mode = GameModeArgument.getGameMode(context, "gamemode");
} catch (IllegalArgumentException notPresent) {} } catch (IllegalArgumentException notPresent) {
}
if (mode == GameType.SPECTATOR) if (mode == GameType.SPECTATOR) {
{
// Force override flying to true for spectator players, or they will fell out of the world. // Force override flying to true for spectator players, or they will fell out of the world.
flying = true; flying = true;
} else if (mode.isSurvival()) } else if (mode.isSurvival()) {
{
// Force override flying to false for survival-like players, or they will fly too // Force override flying to false for survival-like players, or they will fly too
flying = false; flying = false;
} }
String playerName = StringArgumentType.getString(context, "player"); String playerName = StringArgumentType.getString(context, "player");
if (playerName.length() > maxNameLength(source.getServer())) if (playerName.length() > maxNameLength(source.getServer())) {
{
Messenger.m(source, "rb Player name: " + playerName + " is too long"); Messenger.m(source, "rb Player name: " + playerName + " is too long");
return 0; return 0;
} }
if (!Level.isInSpawnableBounds(BlockPos.containing(pos))) if (!Level.isInSpawnableBounds(BlockPos.containing(pos))) {
{
Messenger.m(source, "rb Player " + playerName + " cannot be placed outside of the world"); Messenger.m(source, "rb Player " + playerName + " cannot be placed outside of the world");
return 0; return 0;
} }
@@ -300,35 +274,31 @@ public class PlayerCommand
Messenger.m(source, "rb Player " + playerName + " doesn't exist and cannot spawn in online mode. " + Messenger.m(source, "rb Player " + playerName + " doesn't exist and cannot spawn in online mode. " +
"Turn the server offline or the allowSpawningOfflinePlayers on to spawn non-existing players"); "Turn the server offline or the allowSpawningOfflinePlayers on to spawn non-existing players");
return 0; return 0;
}; }
;
return 1; return 1;
} }
private static int maxNameLength(MinecraftServer server) private static int maxNameLength(MinecraftServer server) {
{
return server.getPort() >= 0 ? SharedConstants.MAX_PLAYER_NAME_LENGTH : 40; return server.getPort() >= 0 ? SharedConstants.MAX_PLAYER_NAME_LENGTH : 40;
} }
private static int manipulate(CommandContext<CommandSourceStack> context, Consumer<EntityPlayerActionPack> action) private static int manipulate(CommandContext<CommandSourceStack> context, Consumer<EntityPlayerActionPack> action) {
{
if (cantManipulate(context)) return 0; if (cantManipulate(context)) return 0;
ServerPlayer player = getPlayer(context); ServerPlayer player = getPlayer(context);
action.accept(((ServerPlayerInterface) player).getActionPack()); action.accept(((ServerPlayerInterface) player).getActionPack());
return 1; return 1;
} }
private static Command<CommandSourceStack> manipulation(Consumer<EntityPlayerActionPack> action) private static Command<CommandSourceStack> manipulation(Consumer<EntityPlayerActionPack> action) {
{
return c -> manipulate(c, action); return c -> manipulate(c, action);
} }
private static int shadow(CommandContext<CommandSourceStack> context) private static int shadow(CommandContext<CommandSourceStack> context) {
{
if (cantManipulate(context)) return 0; if (cantManipulate(context)) return 0;
ServerPlayer player = getPlayer(context); ServerPlayer player = getPlayer(context);
if (player instanceof EntityPlayerMPFake) if (player instanceof EntityPlayerMPFake) {
{
Messenger.m(context.getSource(), "r Cannot shadow fake players"); Messenger.m(context.getSource(), "r Cannot shadow fake players");
return 0; return 0;
} }