Added edit_tunnel command
+ Supported by the add_tunnel command + I hate past me sometimespull/2/head
parent
7ecdb7b283
commit
2fcf01a7de
|
@ -1,7 +1,9 @@
|
||||||
package com.zerohighdef.geoffrey.Commands;
|
package com.zerohighdef.geoffrey.Commands;
|
||||||
|
|
||||||
import com.google.gson.JsonElement;
|
import com.google.gson.JsonElement;
|
||||||
|
import com.google.gson.JsonObject;
|
||||||
import com.zerohighdef.geoffrey.GeoffreyMC;
|
import com.zerohighdef.geoffrey.GeoffreyMC;
|
||||||
|
import com.zerohighdef.geoffrey.Models.GeoffreyLocation;
|
||||||
import com.zerohighdef.geoffrey.Models.GeoffreyTunnel;
|
import com.zerohighdef.geoffrey.Models.GeoffreyTunnel;
|
||||||
import com.zerohighdef.geoffrey.Objects.GeoffreyAPICallback;
|
import com.zerohighdef.geoffrey.Objects.GeoffreyAPICallback;
|
||||||
import com.zerohighdef.geoffrey.Objects.GeoffreyCommand;
|
import com.zerohighdef.geoffrey.Objects.GeoffreyCommand;
|
||||||
|
@ -24,15 +26,25 @@ public class AddTunnelCommand extends GeoffreyCommand {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
|
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
|
||||||
|
String commmandName;
|
||||||
|
|
||||||
|
if (label.contains("edit")) {
|
||||||
|
commmandName = "edit_tunnel";
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
commmandName = "add_tunnel";
|
||||||
|
}
|
||||||
|
|
||||||
if ((sender instanceof Player)) {
|
if ((sender instanceof Player)) {
|
||||||
Map<String, String> params = new HashMap<String, String>();
|
Map<String, String> params = new HashMap<String, String>();
|
||||||
|
|
||||||
if (args.length > 2) {
|
if (args.length >= 3) {
|
||||||
String name[] = Arrays.copyOfRange(args, 2, args.length);
|
String name[] = Arrays.copyOfRange(args, 3, args.length);
|
||||||
params.put("location_name", StringUtils.join(name, " "));
|
// this is a hack
|
||||||
|
String paramName = (commmandName.compareTo("edit_tunnel") == 0) ? "loc_name" : "location_name";
|
||||||
|
params.put(paramName, StringUtils.join(name, " "));
|
||||||
}
|
}
|
||||||
else if (args.length < 2) {
|
else {
|
||||||
sender.sendMessage(ChatColor.RED + "Too few parameters given.");
|
sender.sendMessage(ChatColor.RED + "Too few parameters given.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -54,7 +66,7 @@ public class AddTunnelCommand extends GeoffreyCommand {
|
||||||
params.put("mc_uuid", player.getUniqueId().toString().replace("-", ""));
|
params.put("mc_uuid", player.getUniqueId().toString().replace("-", ""));
|
||||||
params.put("tunnel_direction", tunnelDirection);
|
params.put("tunnel_direction", tunnelDirection);
|
||||||
params.put("tunnel_number", tunnelNumber);
|
params.put("tunnel_number", tunnelNumber);
|
||||||
RunCommand("add_tunnel", params, GeoffreyCommand.Method.POST , new CommandCallback(sender, tunnelDirection));
|
RunCommand(commmandName, params, GeoffreyCommand.Method.POST , new CommandCallback(sender, tunnelDirection));
|
||||||
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -77,9 +89,16 @@ public class AddTunnelCommand extends GeoffreyCommand {
|
||||||
public void invoke(String s) {
|
public void invoke(String s) {
|
||||||
try {
|
try {
|
||||||
JsonElement json = parseJSON(s);
|
JsonElement json = parseJSON(s);
|
||||||
|
JsonObject jsonObj = json.getAsJsonObject();
|
||||||
|
String locationName;
|
||||||
|
if (jsonObj.has("type")) {
|
||||||
|
locationName = new GeoffreyLocation(jsonObj).getLocationName();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
locationName = new GeoffreyTunnel(jsonObj).getLocationName();
|
||||||
|
}
|
||||||
|
|
||||||
GeoffreyTunnel geoffreyTunnel = new GeoffreyTunnel(json.getAsJsonObject());
|
String msg = ChatColor.GREEN + "The tunnel has been updated for " + locationName;
|
||||||
String msg = ChatColor.GREEN + "A tunnel has been added to " + geoffreyTunnel.getLocationName();
|
|
||||||
commandSender.sendMessage(msg);
|
commandSender.sendMessage(msg);
|
||||||
}
|
}
|
||||||
catch (GeoffreyCommandError e) {
|
catch (GeoffreyCommandError e) {
|
||||||
|
|
|
@ -70,6 +70,9 @@ public final class GeoffreyMC extends JavaPlugin {
|
||||||
|
|
||||||
EditPosCommand editPosCommand = new EditPosCommand(this);
|
EditPosCommand editPosCommand = new EditPosCommand(this);
|
||||||
this.getCommand("geoffrey_edit_pos").setExecutor(editPosCommand);
|
this.getCommand("geoffrey_edit_pos").setExecutor(editPosCommand);
|
||||||
|
|
||||||
|
AddTunnelCommand editTunnelCommand = new AddTunnelCommand(this);
|
||||||
|
this.getCommand("geoffrey_edit_tunnel").setExecutor(editTunnelCommand);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -101,6 +101,11 @@ commands:
|
||||||
aliases: [edit_pos]
|
aliases: [edit_pos]
|
||||||
permission: geoffrey.add
|
permission: geoffrey.add
|
||||||
usage: /edit_pos [location name]
|
usage: /edit_pos [location name]
|
||||||
|
geoffrey_edit_tunnel:
|
||||||
|
description: Updates a location's tunnel in Geoffrey
|
||||||
|
aliases: [edit_tunnel]
|
||||||
|
permission: geoffrey.add
|
||||||
|
usage: /edit_tunnel [tunnel direction] [tunnel number] [location name]
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
add:
|
add:
|
||||||
|
|
Loading…
Reference in New Issue