Plexus/Plex
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex.git synced 2025-07-01 15:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move gamemode stuff to listener

Browse Source 
- Fix messages in messages.yml not being used
- Fixed checkRank not working
- Added permissions support for tab handing
This commit is contained in:
Telesphoreo
2022-02-13 23:55:50 -06:00
parent bd8c772228
commit f2db87624f
21 changed files with 197 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/dev/plex/command/impl/AdminCMD.java
View File

@ -36,7 +36,7 @@ public class AdminCMD extends PlexCommand
{
if (args.length == 0)
{
return usage(getUsage());
return usage();
}
if (args[0].equalsIgnoreCase("add"))
@ -64,8 +64,6 @@ public class AdminCMD extends PlexCommand
return tl("playerIsAdmin");
}
plexPlayer.setRank(Rank.ADMIN.name());
DataUtils.update(plexPlayer);
Bukkit.getServer().getPluginManager().callEvent(new AdminAddEvent(sender, plexPlayer));
return null;
}
@ -94,8 +92,6 @@ public class AdminCMD extends PlexCommand
return tl("playerNotAdmin");
}
plexPlayer.setRank("");
DataUtils.update(plexPlayer);
Bukkit.getServer().getPluginManager().callEvent(new AdminRemoveEvent(sender, plexPlayer));
return null;
}
@ -138,9 +134,6 @@ public class AdminCMD extends PlexCommand
return tl("playerNotAdmin");
}
plexPlayer.setRank(rank.name().toLowerCase());
DataUtils.update(plexPlayer);
Bukkit.getServer().getPluginManager().callEvent(new AdminSetRankEvent(sender, plexPlayer, rank));
return null;

21
src/main/java/dev/plex/command/impl/AdventureCMD.java
View File

@ -6,6 +6,7 @@ import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions;
import dev.plex.command.exception.CommandFailException;
import dev.plex.command.source.RequiredCommandSource;
import dev.plex.event.GameModeUpdateEvent;
import dev.plex.rank.enums.Rank;
import dev.plex.util.PlexUtils;
import java.util.List;
@ -21,7 +22,6 @@ import org.jetbrains.annotations.Nullable;
@CommandParameters(name = "adventure", aliases = "gma", description = "Set your own or another player's gamemode to adventure mode")
public class AdventureCMD extends PlexCommand
{
@Override
protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args)
{
@ -29,28 +29,27 @@ public class AdventureCMD extends PlexCommand
{
if (isConsole(sender))
{
throw new CommandFailException("You must define a player when using the console!");
throw new CommandFailException(PlexUtils.tl("consoleMustDefinePlayer"));
}
playerSender.setGameMode(GameMode.ADVENTURE);
return tl("gameModeSetTo", "adventure");
Bukkit.getServer().getPluginManager().callEvent(new GameModeUpdateEvent(sender, playerSender, GameMode.ADVENTURE));
return null;
}
if (checkRank(playerSender, Rank.ADMIN, "plex.gamemode.adventure.others"))
if (checkRank(sender, Rank.ADMIN, "plex.gamemode.adventure.others"))
{
if (args[0].equals("-a"))
{
for (Player targetPlayer : Bukkit.getServer().getOnlinePlayers())
{
targetPlayer.setGameMode(GameMode.ADVENTURE);
tl("gameModeSetTo", "adventure");
}
return tl("gameModeSetTo", "adventure");
PlexUtils.broadcast(tl("setEveryoneGameMode", sender.getName(), "adventure"));
return null;
}
Player nPlayer = getNonNullPlayer(args[0]);
// use send
send(nPlayer, tl("playerSetOtherGameMode", sender.getName(), "adventure"));
nPlayer.setGameMode(GameMode.ADVENTURE);
return tl("setOtherPlayerGameModeTo", nPlayer.getName(), "adventure");
Bukkit.getServer().getPluginManager().callEvent(new GameModeUpdateEvent(sender, nPlayer, GameMode.ADVENTURE));
}
return null;
}
@ -58,7 +57,7 @@ public class AdventureCMD extends PlexCommand
@Override
public @NotNull List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException
{
if (isAdmin(sender))
if (checkTab(sender, Rank.ADMIN, "plex.gamemode.adventure.others"))
{
return PlexUtils.getPlayerNameList();
}

2
src/main/java/dev/plex/command/impl/BanCMD.java
View File

@ -36,7 +36,7 @@ public class BanCMD extends PlexCommand
{
if (args.length == 0)
{
return usage(getUsage());
return usage();
}
UUID targetUUID = PlexUtils.getFromName(args[0]);

24
src/main/java/dev/plex/command/impl/CreativeCMD.java
View File

@ -6,6 +6,7 @@ import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions;
import dev.plex.command.exception.CommandFailException;
import dev.plex.command.source.RequiredCommandSource;
import dev.plex.event.GameModeUpdateEvent;
import dev.plex.rank.enums.Rank;
import dev.plex.util.PlexUtils;
import java.util.List;
@ -28,28 +29,31 @@ public class CreativeCMD extends PlexCommand
{
if (isConsole(sender))
{
throw new CommandFailException("You must define a player when using the console!");
throw new CommandFailException(PlexUtils.tl("consoleMustDefinePlayer"));
}
playerSender.setGameMode(GameMode.CREATIVE);
return tl("gameModeSetTo", "creative");
if (!(playerSender == null))
{
Bukkit.getServer().getPluginManager().callEvent(new GameModeUpdateEvent(sender, playerSender.getPlayer(), GameMode.CREATIVE));
}
return null;
}
if (checkRank(playerSender, Rank.ADMIN, "plex.gamemode.creative.others"))
if (checkRank(sender, Rank.ADMIN, "plex.gamemode.creative.others"))
{
if (args[0].equals("-a"))
{
for (Player targetPlayer : Bukkit.getServer().getOnlinePlayers())
{
targetPlayer.setGameMode(GameMode.CREATIVE);
tl("gameModeSetTo", "creative");
}
return tl("gameModeSetTo", "creative");
PlexUtils.broadcast(tl("setEveryoneGameMode", sender.getName(), "creative"));
return null;
}
Player nPlayer = getNonNullPlayer(args[0]);
// use send
send(nPlayer, tl("playerSetOtherGameMode", sender.getName(), "creative"));
nPlayer.setGameMode(GameMode.CREATIVE);
return tl("setOtherPlayerGameModeTo", nPlayer.getName(), "creative");
Bukkit.getServer().getPluginManager().callEvent(new GameModeUpdateEvent(sender, nPlayer, GameMode.CREATIVE));
return null;
}
return null;
}
@ -57,7 +61,7 @@ public class CreativeCMD extends PlexCommand
@Override
public @NotNull List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException
{
if (isAdmin(sender))
if (checkTab(sender, Rank.ADMIN, "plex.gamemode.creative.others"))
{
return PlexUtils.getPlayerNameList();
}

2
src/main/java/dev/plex/command/impl/DeopCMD.java
View File

@ -22,7 +22,7 @@ public class DeopCMD extends PlexCommand
{
if (args.length != 1)
{
return usage(getUsage());
return usage();
}
Player player = getNonNullPlayer(args[0]);
player.setOp(false);

2
src/main/java/dev/plex/command/impl/FreezeCMD.java
View File

@ -28,7 +28,7 @@ public class FreezeCMD extends PlexCommand
{
if (args.length != 1)
{
return usage(getUsage());
return usage();
}
Player player = getNonNullPlayer(args[0]);
PunishedPlayer punishedPlayer = PlayerCache.getPunishedPlayer(player.getUniqueId());

2
src/main/java/dev/plex/command/impl/NameHistoryCMD.java
View File

@ -32,7 +32,7 @@ public class NameHistoryCMD extends PlexCommand
{
if (args.length != 1)
{
return usage(getUsage());
return usage();
}
String username = args[0];

2
src/main/java/dev/plex/command/impl/OpCMD.java
View File

@ -22,7 +22,7 @@ public class OpCMD extends PlexCommand
{
if (args.length != 1)
{
return usage(getUsage());
return usage();
}
Player player = getNonNullPlayer(args[0]);
player.setOp(true);

2
src/main/java/dev/plex/command/impl/PlexCMD.java
View File

@ -53,7 +53,7 @@ public class PlexCMD extends PlexCommand
}
else
{
return usage(getUsage());
return usage();
}
return null;
}

20
src/main/java/dev/plex/command/impl/SpectatorCMD.java
View File

@ -6,6 +6,7 @@ import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions;
import dev.plex.command.exception.CommandFailException;
import dev.plex.command.source.RequiredCommandSource;
import dev.plex.event.GameModeUpdateEvent;
import dev.plex.rank.enums.Rank;
import dev.plex.util.PlexUtils;
import java.util.List;
@ -28,28 +29,27 @@ public class SpectatorCMD extends PlexCommand
{
if (isConsole(sender))
{
throw new CommandFailException("You must define a player when using the console!");
throw new CommandFailException(PlexUtils.tl("consoleMustDefinePlayer"));
}
playerSender.setGameMode(GameMode.SPECTATOR);
return tl("gameModeSetTo", "spectator");
Bukkit.getServer().getPluginManager().callEvent(new GameModeUpdateEvent(sender, playerSender, GameMode.SPECTATOR));
return null;
}
if (checkRank(playerSender, Rank.ADMIN, "plex.gamemode.spectator.others"))
if (checkRank(sender, Rank.ADMIN, "plex.gamemode.spectator.others"))
{
if (args[0].equals("-a"))
{
for (Player targetPlayer : Bukkit.getServer().getOnlinePlayers())
{
targetPlayer.setGameMode(GameMode.SPECTATOR);
tl("gameModeSetTo", "spectator");
}
return tl("gameModeSetTo", "spectator");
PlexUtils.broadcast(tl("setEveryoneGameMode", sender.getName(), "spectator"));
return null;
}
Player nPlayer = getNonNullPlayer(args[0]);
// use send
send(nPlayer, tl("playerSetOtherGameMode", sender.getName(), "spectator"));
nPlayer.setGameMode(GameMode.SPECTATOR);
return tl("setOtherPlayerGameModeTo", nPlayer.getName(), "spectator");
Bukkit.getServer().getPluginManager().callEvent(new GameModeUpdateEvent(sender, nPlayer, GameMode.SPECTATOR));
}
return null;
}
@ -57,7 +57,7 @@ public class SpectatorCMD extends PlexCommand
@Override
public @NotNull List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException
{
if (isAdmin(sender))
if (checkTab(sender, Rank.ADMIN, "plex.gamemode.spectator.others"))
{
return PlexUtils.getPlayerNameList();
}

20
src/main/java/dev/plex/command/impl/SurvivalCMD.java
View File

@ -6,6 +6,7 @@ import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions;
import dev.plex.command.exception.CommandFailException;
import dev.plex.command.source.RequiredCommandSource;
import dev.plex.event.GameModeUpdateEvent;
import dev.plex.rank.enums.Rank;
import dev.plex.util.PlexUtils;
import java.util.List;
@ -28,28 +29,27 @@ public class SurvivalCMD extends PlexCommand
{
if (isConsole(sender))
{
throw new CommandFailException("You must define a player when using the console!");
throw new CommandFailException(PlexUtils.tl("consoleMustDefinePlayer"));
}
playerSender.setGameMode(GameMode.SURVIVAL);
return tl("gameModeSetTo", "survival");
Bukkit.getServer().getPluginManager().callEvent(new GameModeUpdateEvent(sender, playerSender, GameMode.SURVIVAL));
}
if (checkRank(playerSender, Rank.ADMIN, "plex.gamemode.survival.others"))
if (checkRank(sender, Rank.ADMIN, "plex.gamemode.survival.others"))
{
if (args[0].equals("-a"))
{
for (Player targetPlayer : Bukkit.getServer().getOnlinePlayers())
{
targetPlayer.setGameMode(GameMode.SURVIVAL);
send(targetPlayer, tl("gameModeSetTo", "survival"));
}
return tl("gameModeSetTo", "survival");
PlexUtils.broadcast(tl("setEveryoneGameMode", sender.getName(), "survival"));
return null;
}
Player nPlayer = getNonNullPlayer(args[0]);
// use send
send(nPlayer, tl("playerSetOtherGameMode", sender.getName(), "survival"));
nPlayer.setGameMode(GameMode.SURVIVAL);
return tl("setOtherPlayerGameModeTo", nPlayer.getName(), "survival");
Bukkit.getServer().getPluginManager().callEvent(new GameModeUpdateEvent(sender, nPlayer, GameMode.SURVIVAL));
return null;
}
return null;
}
@ -57,7 +57,7 @@ public class SurvivalCMD extends PlexCommand
@Override
public @NotNull List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException
{
if (isAdmin(sender))
if (checkTab(sender, Rank.ADMIN, "plex.gamemode.survival.others"))
{
return PlexUtils.getPlayerNameList();
}

2
src/main/java/dev/plex/command/impl/UnbanCMD.java
View File

@ -28,7 +28,7 @@ public class UnbanCMD extends PlexCommand
{
if (args.length == 0)
{
return usage(getUsage());
return usage();
}
if (args.length == 1)

4
src/main/java/dev/plex/command/impl/UnfreezeCMD.java
View File

@ -25,7 +25,7 @@ public class UnfreezeCMD extends PlexCommand
{
if (args.length != 1)
{
return usage(getUsage());
return usage();
}
Player player = getNonNullPlayer(args[0]);
PunishedPlayer punishedPlayer = PlayerCache.getPunishedPlayer(player.getUniqueId());
@ -40,6 +40,6 @@ public class UnfreezeCMD extends PlexCommand
@Override
public @NotNull List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException
{
return args.length == 1 && isAdmin(sender) ? PlexUtils.getPlayerNameList() : ImmutableList.of();
return args.length == 1 && checkTab(sender, Rank.ADMIN, "plex.unfreeze") ? PlexUtils.getPlayerNameList() : ImmutableList.of();
}
}

2
src/main/java/dev/plex/command/impl/WorldCMD.java
View File

@ -26,7 +26,7 @@ public class WorldCMD extends PlexCommand
{
if (args.length != 1)
{
return usage(getUsage());
return usage();
}
World world = getNonNullWorld(args[0]);
playerSender.teleportAsync(new Location(world, 0, world.getHighestBlockYAt(0, 0) + 1, 0, 0, 0));