mirror of
https://github.com/plexusorg/Module-TFMExtras.git
synced 2026-06-05 15:56:54 +00:00
Implemented changes mentioned in PR
This commit is contained in:
@@ -17,7 +17,7 @@ import org.jetbrains.annotations.Nullable;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@CommandParameters(name = "clownfish", description = "Gives a player a clownfish capable of knocking people back")
|
||||
@CommandParameters(name = "clownfish", description = "Gives a player a clownfish capable of knocking people back", usage = "/<command> [<toggle>]")
|
||||
@CommandPermissions(permission = "plex.tfmextras.clownfish")
|
||||
public class ClownfishCommand extends PlexCommand
|
||||
{
|
||||
@@ -38,25 +38,25 @@ public class ClownfishCommand extends PlexCommand
|
||||
else if (args[0].equals("toggle"))
|
||||
{
|
||||
List<String> toggledPlayers = TFMExtras.getModule().getConfig().getStringList("server.clownfish.toggled_players");
|
||||
boolean isToggled = toggledPlayers.contains(player.getName());
|
||||
|
||||
boolean isToggled = toggledPlayers.contains(player.getUniqueId().toString());
|
||||
if (isToggled)
|
||||
{
|
||||
toggledPlayers.remove(player.getName());
|
||||
toggledPlayers.remove(player.getUniqueId().toString());
|
||||
}
|
||||
else
|
||||
{
|
||||
toggledPlayers.add(player.getName());
|
||||
toggledPlayers.add(player.getUniqueId().toString());
|
||||
}
|
||||
|
||||
TFMExtras.getModule().getConfig().set("server.clownfish.toggled_players", toggledPlayers);
|
||||
TFMExtras.getModule().getConfig().save();
|
||||
|
||||
return MiniMessage.miniMessage().deserialize("<gray>You " + (isToggled ? "<green>will" : "<red>will no longer") + "<gray> be affected by the clownfish");
|
||||
return messageComponent("toggleClownfish", isToggled ? "now" : "no longer");
|
||||
}
|
||||
else
|
||||
{
|
||||
return MiniMessage.miniMessage().deserialize("<red>Incorrect usage. Use either /clownfish or /clownfish toggle");
|
||||
return usage();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,62 @@
|
||||
package dev.plex.extras.command;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import dev.plex.cache.DataUtils;
|
||||
import dev.plex.command.PlexCommand;
|
||||
import dev.plex.command.annotation.CommandParameters;
|
||||
import dev.plex.command.annotation.CommandPermissions;
|
||||
import dev.plex.command.exception.PlayerNotFoundException;
|
||||
import dev.plex.extras.TFMExtras;
|
||||
import dev.plex.player.PlexPlayer;
|
||||
import dev.plex.util.PlexUtils;
|
||||
|
||||
import net.kyori.adventure.text.Component;
|
||||
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@CommandParameters(name = "toggleclownfish", description = "Toggles the ability to use the clownfish for a specified player", usage = "/<command> <player>")
|
||||
@CommandPermissions(permission = "plex.tfmextras.toggleclownfish")
|
||||
public class RestrictClownfishCommand extends PlexCommand
|
||||
{
|
||||
@Override
|
||||
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
|
||||
{
|
||||
if (args.length == 0)
|
||||
{
|
||||
return usage();
|
||||
}
|
||||
|
||||
PlexPlayer target = DataUtils.getPlayer(args[0]);
|
||||
if (target == null)
|
||||
{
|
||||
throw new PlayerNotFoundException();
|
||||
}
|
||||
|
||||
List<String> restrictedPlayers = TFMExtras.getModule().getConfig().getStringList("server.clownfish.restricted");
|
||||
|
||||
boolean isRestricted = restrictedPlayers.contains(target.getUuid().toString());
|
||||
if (isRestricted)
|
||||
{
|
||||
restrictedPlayers.remove(target.getUuid().toString());
|
||||
}
|
||||
else
|
||||
{
|
||||
restrictedPlayers.add(target.getUuid().toString());
|
||||
}
|
||||
|
||||
TFMExtras.getModule().getConfig().set("server.clownfish.restricted", restrictedPlayers);
|
||||
TFMExtras.getModule().getConfig().save();
|
||||
|
||||
return messageComponent("restrictClownfish", target.getName(), isRestricted ? "now" : "no longer");
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull List<String> smartTabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException {
|
||||
return args.length == 1 && silentCheckPermission(sender, this.getPermission()) ? PlexUtils.getPlayerNameList() : ImmutableList.of();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user