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

command stuff

Browse Source 
- exceptions used now
- use CommandSource over CommandSender as it will generally be more versatile
This commit is contained in:
Super_
2020-11-02 19:19:26 -05:00
parent 3517c05054
commit 57dbafb385
16 changed files with 195 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/me/totalfreedom/plex/command/impl/FionnCMD.java
View File

@ -2,19 +2,23 @@ package me.totalfreedom.plex.command.impl;
import me.totalfreedom.plex.cache.PlayerCache;
import me.totalfreedom.plex.command.PlexCommand;
import me.totalfreedom.plex.command.annotations.CommandParameters;
import me.totalfreedom.plex.command.annotations.CommandPermissions;
import me.totalfreedom.plex.command.annotation.CommandParameters;
import me.totalfreedom.plex.command.annotation.CommandPermissions;
import me.totalfreedom.plex.command.exception.CommandArgumentException;
import me.totalfreedom.plex.command.exception.CommandFailException;
import me.totalfreedom.plex.command.source.CommandSource;
import me.totalfreedom.plex.command.source.RequiredCommandSource;
import me.totalfreedom.plex.util.PlexUtils;
import me.totalfreedom.plex.world.BlockMapChunkGenerator;
import me.totalfreedom.plex.world.CustomWorld;
import org.bukkit.*;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.*;
import org.bukkit.scheduler.BukkitRunnable;
import java.util.*;
import static me.totalfreedom.plex.util.PlexUtils.tl;
@CommandParameters(description = "Subliminal message.")
@CommandPermissions(source = RequiredCommandSource.IN_GAME)
public class FionnCMD extends PlexCommand
@ -28,14 +32,12 @@ public class FionnCMD extends PlexCommand
}
@Override
public void execute(CommandSender sender, String[] args)
public void execute(CommandSource sender, String[] args)
{
Player player = (Player) sender;
if (!player.getUniqueId().equals(UUID.fromString("9aa3eda6-c271-440a-a578-a952ee9aee2f")))
{
sender.sendMessage(ChatColor.RED + "You cannot run this command!");
return;
}
if (!sender.getPlayer().getUniqueId().equals(UUID.fromString("9aa3eda6-c271-440a-a578-a952ee9aee2f")))
throw new CommandFailException(tl("noPermission"));
if (args.length != 0)
throw new CommandArgumentException();
String name = "fionn";
LinkedHashMap<Material, Integer> map = new LinkedHashMap<>();
map.put(Material.CRIMSON_NYLIUM, 1);
@ -115,7 +117,7 @@ public class FionnCMD extends PlexCommand
}
@Override
public List<String> onTabComplete(CommandSender sender, String[] args)
public List<String> onTabComplete(CommandSource sender, String[] args)
{
return null;
}

10
src/main/java/me/totalfreedom/plex/command/impl/OpAllCMD.java
View File

@ -1,12 +1,12 @@
package me.totalfreedom.plex.command.impl;
import me.totalfreedom.plex.command.PlexCommand;
import me.totalfreedom.plex.command.annotations.CommandParameters;
import me.totalfreedom.plex.command.annotations.CommandPermissions;
import me.totalfreedom.plex.command.annotation.CommandParameters;
import me.totalfreedom.plex.command.annotation.CommandPermissions;
import me.totalfreedom.plex.command.source.CommandSource;
import me.totalfreedom.plex.rank.enums.Rank;
import me.totalfreedom.plex.util.PlexUtils;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import java.util.List;
@ -23,7 +23,7 @@ public class OpAllCMD extends PlexCommand
}
@Override
public void execute(CommandSender sender, String[] args)
public void execute(CommandSource sender, String[] args)
{
for (Player player : Bukkit.getOnlinePlayers())
player.setOp(true);
@ -31,7 +31,7 @@ public class OpAllCMD extends PlexCommand
}
@Override
public List<String> onTabComplete(CommandSender sender, String[] args) {
public List<String> onTabComplete(CommandSource sender, String[] args) {
return null;
}
}

24
src/main/java/me/totalfreedom/plex/command/impl/OpCMD.java
View File

@ -1,12 +1,12 @@
package me.totalfreedom.plex.command.impl;
import me.totalfreedom.plex.command.PlexCommand;
import me.totalfreedom.plex.command.annotations.CommandParameters;
import me.totalfreedom.plex.command.annotations.CommandPermissions;
import me.totalfreedom.plex.command.annotation.CommandParameters;
import me.totalfreedom.plex.command.annotation.CommandPermissions;
import me.totalfreedom.plex.command.exception.CommandArgumentException;
import me.totalfreedom.plex.command.source.CommandSource;
import me.totalfreedom.plex.rank.enums.Rank;
import me.totalfreedom.plex.util.PlexUtils;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import java.util.List;
@ -23,19 +23,17 @@ public class OpCMD extends PlexCommand
}
@Override
public void execute(CommandSender sender, String[] args)
public void execute(CommandSource sender, String[] args)
{
Player player = Bukkit.getPlayer(args[0]);
if (player == null)
{
sender.sendMessage(tl("playerNotFound"));
return;
}
if (args.length != 1)
throw new CommandArgumentException();
Player player = getNonNullPlayer(args[0]);
PlexUtils.broadcast(tl("oppedPlayer", sender.getName(), player.getName()));
}
@Override
public List<String> onTabComplete(CommandSender sender, String[] args) {
return null;
public List<String> onTabComplete(CommandSource sender, String[] args)
{
return args.length == 1 ? PlexUtils.getPlayerNameList() : null;
}
}

11
src/main/java/me/totalfreedom/plex/command/impl/PlexCMD.java
View File

@ -1,8 +1,9 @@
package me.totalfreedom.plex.command.impl;
import me.totalfreedom.plex.command.annotations.CommandParameters;
import me.totalfreedom.plex.command.annotations.CommandPermissions;
import me.totalfreedom.plex.command.annotation.CommandParameters;
import me.totalfreedom.plex.command.annotation.CommandPermissions;
import me.totalfreedom.plex.command.PlexCommand;
import me.totalfreedom.plex.command.source.CommandSource;
import me.totalfreedom.plex.command.source.RequiredCommandSource;
import me.totalfreedom.plex.rank.enums.Rank;
import org.bukkit.command.CommandSender;
@ -19,13 +20,13 @@ public class PlexCMD extends PlexCommand
}
@Override
public void execute(CommandSender sender, String[] args)
public void execute(CommandSource sender, String[] args)
{
sender.sendMessage("HI");
send("HI");
}
@Override
public List<String> onTabComplete(CommandSender sender, String[] args) {
public List<String> onTabComplete(CommandSource sender, String[] args) {
return Arrays.asList("Telesphoreo", "super", "Taahh");
}
}

12
src/main/java/me/totalfreedom/plex/command/impl/TestCMD.java
View File

@ -1,12 +1,12 @@
package me.totalfreedom.plex.command.impl;
import com.google.common.collect.ImmutableList;
import me.totalfreedom.plex.command.annotations.CommandParameters;
import me.totalfreedom.plex.command.annotations.CommandPermissions;
import me.totalfreedom.plex.command.annotation.CommandParameters;
import me.totalfreedom.plex.command.annotation.CommandPermissions;
import me.totalfreedom.plex.command.PlexCommand;
import me.totalfreedom.plex.command.source.CommandSource;
import me.totalfreedom.plex.command.source.RequiredCommandSource;
import me.totalfreedom.plex.rank.enums.Rank;
import org.bukkit.command.CommandSender;
import java.util.Arrays;
import java.util.List;
@ -22,13 +22,13 @@ public class TestCMD extends PlexCommand
}
@Override
public void execute(CommandSender sender, String[] args)
public void execute(CommandSource sender, String[] args)
{
sender.sendMessage(tl("variableTest", sender.getName()));
send(tl("variableTest", sender.getName()));
}
@Override
public List<String> onTabComplete(CommandSender sender, String[] args) {
public List<String> onTabComplete(CommandSource sender, String[] args) {
if (args.length == 1)
{
return Arrays.asList("WHATTHEFAWK", "LUL");

23
src/main/java/me/totalfreedom/plex/command/impl/WorldCMD.java
View File

@ -1,20 +1,18 @@
package me.totalfreedom.plex.command.impl;
import com.google.common.collect.ImmutableList;
import me.totalfreedom.plex.Plex;
import me.totalfreedom.plex.command.PlexCommand;
import me.totalfreedom.plex.command.annotations.CommandParameters;
import me.totalfreedom.plex.command.annotations.CommandPermissions;
import me.totalfreedom.plex.command.annotation.CommandParameters;
import me.totalfreedom.plex.command.annotation.CommandPermissions;
import me.totalfreedom.plex.command.exception.CommandArgumentException;
import me.totalfreedom.plex.command.source.CommandSource;
import me.totalfreedom.plex.command.source.RequiredCommandSource;
import me.totalfreedom.plex.rank.enums.Rank;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static me.totalfreedom.plex.util.PlexUtils.tl;
@ -28,16 +26,17 @@ public class WorldCMD extends PlexCommand
}
@Override
public void execute(CommandSender sender, String[] args)
public void execute(CommandSource sender, String[] args)
{
Player player = (Player) sender;
World world = Bukkit.getWorld(args[0]);
player.teleport(new Location(world, 0, world.getHighestBlockYAt(0, 0) + 1, 0, 0, 0));
sender.sendMessage(tl("playerWorldTeleport", world.getName()));
if (args.length != 1)
throw new CommandArgumentException();
World world = getNonNullWorld(args[0]);
sender.getPlayer().teleport(new Location(world, 0, world.getHighestBlockYAt(0, 0) + 1, 0, 0, 0));
send(tl("playerWorldTeleport", world.getName()));
}
@Override
public List<String> onTabComplete(CommandSender sender, String[] args)
public List<String> onTabComplete(CommandSource sender, String[] args)
{
List<String> worlds = new ArrayList<>();
for (World world : Bukkit.getWorlds())