SBDevelopment/V10Lift
3
0
Fork 0
Code Issues 11 Pull requests Releases Wiki Activity Actions

Added #29

Browse source
This commit is contained in:
stijnb1234 2020-02-22 16:51:20 +01:00
parent 4b5ee21872
commit 6f0aa3c1ff
2 changed files with 72 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/lombok/nl/SBDeveloper/V10Lift/API/V10LiftAPI.java
View file

@ -130,6 +130,24 @@ public class V10LiftAPI {
return true; return true;
} }
/**
* Get the name of a lift by a location (checking for cab blocks)
*
* @param loc The location you want to check for
* @return The liftname
*/
public String getLiftByLocation(Location loc) {
for (Map.Entry<String, Lift> entry : DataManager.getLifts().entrySet()) {
for (LiftBlock block : entry.getValue().getBlocks()) {
//Check for world, x and z
if (block.getWorld().equals(Objects.requireNonNull(loc.getWorld(), "World is null at getLiftByLocation").getName()) && block.getX() == loc.getBlockX() && block.getZ() == loc.getBlockZ()) {
return entry.getKey();
}
}
}
return null;
}
/** /**
* Rename a lift * Rename a lift
* *

74
src/main/lombok/nl/SBDeveloper/V10Lift/Commands/V10LiftCommand.java
View file

@ -232,7 +232,7 @@ public class V10LiftCommand implements CommandExecutor {
} else { } else {
sender.sendMessage(ChatColor.RED + "You don't have the permission to do this!"); sender.sendMessage(ChatColor.RED + "You don't have the permission to do this!");
} }
} else if (args[0].equalsIgnoreCase("start") && args.length == 3) { } else if (args[0].equalsIgnoreCase("start")) {
//v10lift start <Name> <Floor> //v10lift start <Name> <Floor>
if (!(sender instanceof Player)) { if (!(sender instanceof Player)) {
sender.sendMessage(ChatColor.RED + "You have to be a player to do this."); sender.sendMessage(ChatColor.RED + "You have to be a player to do this.");
@ -243,7 +243,7 @@ public class V10LiftCommand implements CommandExecutor {
} else { } else {
sender.sendMessage(ChatColor.RED + "You don't have the permission to do this!"); sender.sendMessage(ChatColor.RED + "You don't have the permission to do this!");
} }
} else if (args[0].equalsIgnoreCase("stop") && args.length == 2) { } else if (args[0].equalsIgnoreCase("stop")) {
//v10lift stop <Name> //v10lift stop <Name>
if (!(sender instanceof Player)) { if (!(sender instanceof Player)) {
sender.sendMessage(ChatColor.RED + "You have to be a player to do this."); sender.sendMessage(ChatColor.RED + "You have to be a player to do this.");
@ -261,18 +261,24 @@ public class V10LiftCommand implements CommandExecutor {
} }
private boolean stopCommand(CommandSender sender, @Nonnull String[] args) { private boolean stopCommand(CommandSender sender, @Nonnull String[] args) {
String liftName = args[1]; String liftName;
if (!DataManager.containsLift(liftName)) { if (args.length == 1 && sender instanceof Player) {
sender.sendMessage(ChatColor.RED + "Lift " + args[1] + " doesn't exists!"); //v10lift stop -> Get liftName from loc and floorName from sign
Player p = (Player) sender;
liftName = V10LiftPlugin.getAPI().getLiftByLocation(p.getLocation());
} else if (args.length == 1) {
sender.sendMessage(ChatColor.RED + "Please give a name as non-player!");
return true;
} else {
liftName = args[1];
}
if (liftName == null || !DataManager.containsLift(liftName)) {
sender.sendMessage(ChatColor.RED + "Lift doesn't exists!");
return true; return true;
} }
Lift lift = DataManager.getLift(liftName); Lift lift = DataManager.getLift(liftName);
if (!lift.getFloors().containsKey(args[2])) {
sender.sendMessage(ChatColor.RED + "Lift " + args[1] + " doesn't contain the floor " + args[2] + "!");
return true;
}
if (!lift.getQueue().isEmpty()) lift.getQueue().clear(); if (!lift.getQueue().isEmpty()) lift.getQueue().clear();
if (!DataManager.containsMovingTask(args[1])) { if (!DataManager.containsMovingTask(args[1])) {
@ -287,21 +293,49 @@ public class V10LiftCommand implements CommandExecutor {
} }
private boolean startCommand(CommandSender sender, @Nonnull String[] args) { private boolean startCommand(CommandSender sender, @Nonnull String[] args) {
String liftName = args[1]; String liftName;
if (!DataManager.containsLift(liftName)) { if (args.length == 1 && sender instanceof Player) {
sender.sendMessage(ChatColor.RED + "Lift " + args[1] + " doesn't exists!"); //v10lift start -> Get liftName from loc and floorName from sign
Player p = (Player) sender;
liftName = V10LiftPlugin.getAPI().getLiftByLocation(p.getLocation());
} else if (args.length == 1) {
sender.sendMessage(ChatColor.RED + "Please give a name as non-player!");
return true;
} else {
liftName = args[1];
}
if (liftName == null || !DataManager.containsLift(liftName)) {
sender.sendMessage(ChatColor.RED + "Lift doesn't exists!");
return true; return true;
} }
Lift lift = DataManager.getLift(liftName); Lift lift = DataManager.getLift(liftName);
if (!lift.getFloors().containsKey(args[2])) {
sender.sendMessage(ChatColor.RED + "Lift " + args[1] + " doesn't contain the floor " + args[2] + "!"); String floorName = null;
if (args.length == 2) {
for (LiftBlock lb : lift.getBlocks()) {
Block block = Objects.requireNonNull(Bukkit.getWorld(lb.getWorld()), "World is null at start command").getBlockAt(lb.getX(), lb.getY(), lb.getZ());
if (block.getState() instanceof Sign) {
Sign sign = (Sign) block.getState();
String f = ChatColor.stripColor(sign.getLine(3));
if (lift.getFloors().containsKey(f)) {
floorName = f;
}
}
}
} else {
floorName = args[2];
}
if (floorName == null || !lift.getFloors().containsKey(floorName)) {
sender.sendMessage(ChatColor.RED + "Lift " + liftName + " doesn't contain this floor!");
return true; return true;
} }
Floor f = lift.getFloors().get(args[2]); Floor f = lift.getFloors().get(floorName);
V10LiftPlugin.getAPI().addToQueue(args[1], f, args[2]); V10LiftPlugin.getAPI().addToQueue(liftName, f, floorName);
sender.sendMessage(ChatColor.GREEN + "Lift " + args[1] + " started!"); sender.sendMessage(ChatColor.GREEN + "Lift " + liftName + " started!");
return true; return true;
} }
@ -1017,8 +1051,8 @@ public class V10LiftCommand implements CommandExecutor {
sender.sendMessage("§6/v10lift realistic§f: Toggle realistic mode."); sender.sendMessage("§6/v10lift realistic§f: Toggle realistic mode.");
sender.sendMessage("§6/v10lift repair§f: Repair a lift."); sender.sendMessage("§6/v10lift repair§f: Repair a lift.");
sender.sendMessage("§6/v10lift whitelist <add/del> <Player> [Floorname]§f: Add/remove someone of the whitelist."); sender.sendMessage("§6/v10lift whitelist <add/del> <Player> [Floorname]§f: Add/remove someone of the whitelist.");
sender.sendMessage("§6/v10lift start <Name> <Floor>§f: Start a lift to a floor."); sender.sendMessage("§6/v10lift start [Name] [Floor]§f: Start a lift to a floor.");
sender.sendMessage("§6/v10lift stop <Name>§f: Stop a lift."); sender.sendMessage("§6/v10lift stop [Name]§f: Stop a lift.");
sender.sendMessage("§6/v10lift repair§f: Repair a lift."); sender.sendMessage("§6/v10lift repair§f: Repair a lift.");
return true; return true;
} }