craftinc/craftinc-gates
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Command cleanup. Stub commands for material and teleport added.

Browse Source
This commit is contained in:
Tobias Ottenweller 2017-01-01 13:27:07 +01:00
parent e34276b729
commit 64a7ac50fa
20 changed files with 110 additions and 406 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/de/craftinc/gates/Plugin.java
View File

@ -94,9 +94,7 @@ public class Plugin extends JavaPlugin {
@Override @Override
public void onDisable() { public void onDisable() {
// Save gates
gatesManager.saveGatesToDisk(); gatesManager.saveGatesToDisk();
log("Disabled"); log("Disabled");
} }
@ -122,18 +120,14 @@ public class Plugin extends JavaPlugin {
commands.add(new CommandRemove()); commands.add(new CommandRemove());
commands.add(new CommandLocation()); commands.add(new CommandLocation());
commands.add(new CommandExit()); commands.add(new CommandExit());
commands.add(new CommandOpen()); commands.add(new CommandTriggerOpen());
commands.add(new CommandRename()); commands.add(new CommandRename());
commands.add(new CommandClose());
commands.add(new CommandList()); commands.add(new CommandList());
commands.add(new CommandInfo()); commands.add(new CommandInfo());
commands.add(new CommandHide());
commands.add(new CommandUnhide());
commands.add(new CommandExitOpen());
commands.add(new CommandNearby()); commands.add(new CommandNearby());
commands.add(new CommandAllowRiding()); commands.add(new CommandTriggerVehicles());
commands.add(new CommandDenyRiding()); commands.add(new CommandMaterial());
commands.add(new CommandTeleport());
// Register events // Register events
this.registerEventListeners(); this.registerEventListeners();
@ -168,7 +162,6 @@ public class Plugin extends JavaPlugin {
} }
} }
// -------------------------------------------- // // -------------------------------------------- //
// Commands // Commands
// -------------------------------------------- // // -------------------------------------------- //
@ -184,7 +177,6 @@ public class Plugin extends JavaPlugin {
return this.baseCommand; return this.baseCommand;
} }
@Override @Override
public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) { public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) {
List<String> parameters = new ArrayList<>(Arrays.asList(args)); List<String> parameters = new ArrayList<>(Arrays.asList(args));
@ -192,7 +184,6 @@ public class Plugin extends JavaPlugin {
return true; return true;
} }
private void handleCommand(CommandSender sender, List<String> parameters) { private void handleCommand(CommandSender sender, List<String> parameters) {
if (parameters.size() == 0) { if (parameters.size() == 0) {
this.commands.get(0).execute(sender, parameters); this.commands.get(0).execute(sender, parameters);
@ -220,7 +211,6 @@ public class Plugin extends JavaPlugin {
log(Level.INFO, msg); log(Level.INFO, msg);
} }
public static void log(Level level, String msg) { public static void log(Level level, String msg) {
Logger.getLogger("Minecraft").log(level, "[" + instance.getDescription().getFullName() + "] " + msg); Logger.getLogger("Minecraft").log(level, "[" + instance.getDescription().getFullName() + "] " + msg);
} }

12
src/de/craftinc/gates/commands/BaseCommand.java
View File

@ -33,6 +33,7 @@ import de.craftinc.gates.util.TextUtil;
public abstract class BaseCommand { public abstract class BaseCommand {
PermissionController permissionController; PermissionController permissionController;
GatesManager gatesManager;
List<String> aliases = new ArrayList<>(); List<String> aliases = new ArrayList<>();
List<String> requiredParameters = new ArrayList<>(); List<String> requiredParameters = new ArrayList<>();
@ -58,6 +59,7 @@ public abstract class BaseCommand {
} }
public BaseCommand() { public BaseCommand() {
gatesManager = Plugin.getPlugin().getGatesManager();
permissionController = Plugin.getPlugin().getPermissionController(); permissionController = Plugin.getPlugin().getPermissionController();
} }
@ -69,14 +71,14 @@ public abstract class BaseCommand {
return; return;
} }
if (this.senderMustBePlayer) { if (sender instanceof Player) {
this.player = (Player)sender; this.player = (Player)sender;
} }
this.perform(); this.perform();
if (this.shouldPersistToDisk && getSaveOnChanges()) { if (this.shouldPersistToDisk && getSaveOnChanges()) {
Plugin.getPlugin().getGatesManager().saveGatesToDisk(); gatesManager.saveGatesToDisk();
} }
} }
@ -93,12 +95,10 @@ public abstract class BaseCommand {
} }
boolean setGateUsingParameter(String param) { boolean setGateUsingParameter(String param) {
GatesManager gateManager = Plugin.getPlugin().getGatesManager(); if (!gatesManager.gateExists(param)) {
if (!gateManager.gateExists(param)) {
return false; return false;
} else { } else {
gate = gateManager.getGateWithId(param); gate = gatesManager.getGateWithId(param);
return true; return true;
} }
} }

53
src/de/craftinc/gates/commands/CommandClose.java
View File

@ -1,53 +0,0 @@
/* Craft Inc. Gates
Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program (LGPLv3). If not, see <http://www.gnu.org/licenses/>.
*/
package de.craftinc.gates.commands;
import java.util.logging.Level;
import de.craftinc.gates.controllers.PermissionController;
import de.craftinc.gates.util.GateBlockChangeSender;
import org.bukkit.ChatColor;
import de.craftinc.gates.Plugin;
public class CommandClose extends BaseCommand {
public CommandClose() {
aliases.add("close");
aliases.add("c");
requiredParameters.add("id");
helpDescription = "Closes a gate to prevent players from using it.";
requiredPermission = PermissionController.permissionManage;
needsPermissionAtCurrentLocation = false;
shouldPersistToDisk = true;
senderMustBePlayer = false;
}
@Override
public void perform() {
try {
gate.setOpen(false);
GateBlockChangeSender.updateGateBlocks(gate);
sendMessage(ChatColor.GREEN + "The gate was closed.");
} catch (Exception e) {
sendMessage(ChatColor.RED + "Opening the gate failed! See server log for more information");
Plugin.log(Level.WARNING, e.getMessage());
e.printStackTrace();
}
}
}

41
src/de/craftinc/gates/commands/CommandDenyRiding.java
View File

@ -1,41 +0,0 @@
/* Craft Inc. Gates
Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program (LGPLv3). If not, see <http://www.gnu.org/licenses/>.
*/
package de.craftinc.gates.commands;
import de.craftinc.gates.controllers.PermissionController;
import org.bukkit.ChatColor;
public class CommandDenyRiding extends BaseCommand {
public CommandDenyRiding() {
aliases.add("denyRiding");
aliases.add("dr");
requiredParameters.add("id");
helpDescription = "Deny players to travel while riding.";
requiredPermission = PermissionController.permissionManage;
needsPermissionAtCurrentLocation = false;
shouldPersistToDisk = true;
senderMustBePlayer = false;
}
@Override
protected void perform() {
gate.setAllowsVehicles(false);
sendMessage(ChatColor.GREEN + "Traveling while riding is now disabled for this gate.");
}
}

7
src/de/craftinc/gates/commands/CommandExit.java
View File

@ -30,25 +30,20 @@ public class CommandExit extends BaseCommand {
public CommandExit() { public CommandExit() {
aliases.add("exit"); aliases.add("exit");
aliases.add("e"); aliases.add("e");
requiredParameters.add("id"); requiredParameters.add("id");
helpDescription = "Change exit of location."; helpDescription = "Change exit of location.";
requiredPermission = PermissionController.permissionManage; requiredPermission = PermissionController.permissionManage;
needsPermissionAtCurrentLocation = true; needsPermissionAtCurrentLocation = true;
shouldPersistToDisk = true; shouldPersistToDisk = true;
senderMustBePlayer = true; senderMustBePlayer = true;
} }
public void perform() { public void perform() {
try { try {
Location oldExit = gate.getExit(); Location oldExit = gate.getExit();
gate.setExit(player.getLocation()); gate.setExit(player.getLocation());
sendMessage(ChatColor.GREEN + "The exit of gate '" + gate.getId() + "' is now where you stand."); sendMessage(ChatColor.GREEN + "The exit of gate '" + gate.getId() + "' is now where you stand.");
Plugin.getPlugin().getGatesManager().handleGateExitChange(gate, oldExit); gatesManager.handleGateExitChange(gate, oldExit);
} catch (Exception e) { } catch (Exception e) {
GateBlockChangeSender.updateGateBlocks(gate); GateBlockChangeSender.updateGateBlocks(gate);
sendMessage(ChatColor.RED + "Setting the exit for the gate failed! See server log for more information"); sendMessage(ChatColor.RED + "Setting the exit for the gate failed! See server log for more information");

76
src/de/craftinc/gates/commands/CommandExitOpen.java
View File

@ -1,76 +0,0 @@
/* Craft Inc. Gates
Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program (LGPLv3). If not, see <http://www.gnu.org/licenses/>.
*/
package de.craftinc.gates.commands;
import de.craftinc.gates.controllers.PermissionController;
import de.craftinc.gates.Plugin;
import de.craftinc.gates.util.GateBlockChangeSender;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import java.util.logging.Level;
public class CommandExitOpen extends BaseCommand {
public CommandExitOpen() {
aliases.add("exitopen");
aliases.add("eo");
requiredParameters.add("id");
helpDescription = "Change exit of location and open that gate afterwards.";
requiredPermission = PermissionController.permissionManage;
needsPermissionAtCurrentLocation = true;
shouldPersistToDisk = true;
senderMustBePlayer = true;
}
public void perform() {
try {
Location oldExit = gate.getExit();
gate.setExit(player.getLocation());
sendMessage(ChatColor.GREEN + "The exit of gate '" + gate.getId() + "' is now where you stand.");
Plugin.getPlugin().getGatesManager().handleGateExitChange(gate, oldExit);
try {
boolean needsGateManagerUpdate = false;
if (gate.getGateBlockLocations().isEmpty()) {
needsGateManagerUpdate = true;
}
gate.setOpen(true);
GateBlockChangeSender.updateGateBlocks(gate);
if (needsGateManagerUpdate) {
Plugin.getPlugin().getGatesManager().handleGateLocationChange(gate, null, null, null);
}
sendMessage(ChatColor.GREEN + "The gate was opened.");
} catch (Exception e) {
sendMessage(ChatColor.RED + e.getMessage());
}
} catch (Exception e) {
GateBlockChangeSender.updateGateBlocks(gate);
sendMessage(ChatColor.RED + "Setting the exit for the gate failed! This gate is now closed! (See server log for more information.)");
Plugin.log(Level.WARNING, e.getMessage());
e.printStackTrace();
}
}
}

84
src/de/craftinc/gates/commands/CommandHelp.java
View File

@ -17,90 +17,50 @@
package de.craftinc.gates.commands; package de.craftinc.gates.commands;
import de.craftinc.gates.controllers.PermissionController; import de.craftinc.gates.controllers.PermissionController;
import de.craftinc.gates.util.TextUtil;
import java.util.ArrayList; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
public class CommandHelp extends BaseCommand { public class CommandHelp extends BaseCommand {
private static List<List<String>> helpPages; private static List<String> help;
static {
// sort the usage strings
List<String> allUsageStrings = new ArrayList<>();
allUsageStrings.add(new CommandHelp().getUsageTemplate(true));
allUsageStrings.add(new CommandNew().getUsageTemplate(true));
allUsageStrings.add(new CommandRemove().getUsageTemplate(true));
allUsageStrings.add(new CommandLocation().getUsageTemplate(true));
allUsageStrings.add(new CommandExit().getUsageTemplate(true));
allUsageStrings.add(new CommandOpen().getUsageTemplate(true));
allUsageStrings.add(new CommandRename().getUsageTemplate(true));
allUsageStrings.add(new CommandClose().getUsageTemplate(true));
allUsageStrings.add(new CommandList().getUsageTemplate(true));
allUsageStrings.add(new CommandInfo().getUsageTemplate(true));
allUsageStrings.add(new CommandHide().getUsageTemplate(true));
allUsageStrings.add(new CommandUnhide().getUsageTemplate(true));
allUsageStrings.add(new CommandExitOpen().getUsageTemplate(true));
allUsageStrings.add(new CommandNearby().getUsageTemplate(true));
Collections.sort(allUsageStrings);
// put 5 commands on one page
helpPages = new ArrayList<>();
while (!allUsageStrings.isEmpty()) {
int toIndex = allUsageStrings.size() >= 6 ? 5 : allUsageStrings.size();
List<String> currentHelpPage = new ArrayList<>(allUsageStrings.subList(0, toIndex));
helpPages.add(currentHelpPage);
allUsageStrings.removeAll(currentHelpPage);
}
}
public CommandHelp() { public CommandHelp() {
aliases.add("help"); aliases.add("help");
aliases.add("?"); aliases.add("?");
optionalParameters.add("page");
helpDescription = "prints this help page"; helpDescription = "prints this help page";
requiredPermission = PermissionController.permissionInfo; requiredPermission = PermissionController.permissionInfo;
hasGateParam = false; hasGateParam = false;
needsPermissionAtCurrentLocation = false; needsPermissionAtCurrentLocation = false;
shouldPersistToDisk = false; shouldPersistToDisk = false;
senderMustBePlayer = false; senderMustBePlayer = false;
} }
public void perform() { public void perform() {
int page; sendMessage(getHelp());
if (parameters.size() > 0) {
try {
page = Integer.parseInt(parameters.get(0));
} catch (NumberFormatException e) {
// wasn't an integer
page = 1;
}
} else {
page = 1;
} }
sendMessage(TextUtil.titleSize("Craft Inc. Gates Help (" + page + "/" + helpPages.size() + ")")); private List<String> getHelp() {
if (help == null) {
page -= 1; help = Arrays.asList(
if (page < 0 || page >= helpPages.size()) { new CommandHelp().getUsageTemplate(true),
sendMessage("This page does not exist"); new CommandNew().getUsageTemplate(true),
return; new CommandRemove().getUsageTemplate(true),
new CommandLocation().getUsageTemplate(true),
new CommandExit().getUsageTemplate(true),
new CommandTriggerOpen().getUsageTemplate(true),
new CommandRename().getUsageTemplate(true),
new CommandList().getUsageTemplate(true),
new CommandInfo().getUsageTemplate(true),
new CommandNearby().getUsageTemplate(true),
new CommandTriggerVehicles().getUsageTemplate(true),
new CommandTeleport().getUsageTemplate(true),
new CommandMaterial().getUsageTemplate(true)
);
Collections.sort(help);
} }
sendMessage(helpPages.get(page)); return help;
} }
} }

57
src/de/craftinc/gates/commands/CommandHide.java
View File

@ -1,57 +0,0 @@
/* Craft Inc. Gates
Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program (LGPLv3). If not, see <http://www.gnu.org/licenses/>.
*/
package de.craftinc.gates.commands;
import java.util.logging.Level;
import de.craftinc.gates.controllers.PermissionController;
import de.craftinc.gates.util.GateBlockChangeSender;
import org.bukkit.ChatColor;
import de.craftinc.gates.Plugin;
public class CommandHide extends BaseCommand {
public CommandHide() {
aliases.add("hide");
aliases.add("h");
requiredParameters.add("id");
helpDescription = "Makes a gate NOT consist of gate blocks while open.";
requiredPermission = PermissionController.permissionManage;
needsPermissionAtCurrentLocation = false;
shouldPersistToDisk = true;
senderMustBePlayer = false;
}
public void perform() {
try {
gate.setHidden(true);
GateBlockChangeSender.updateGateBlocks(gate);
sendMessage(ChatColor.GREEN + "The gate '" + gate.getId() + "' is now hidden.");
} catch (Exception e) {
sendMessage(ChatColor.RED + "Hiding the gate failed! See server log for more information");
Plugin.log(Level.WARNING, e.getMessage());
e.printStackTrace();
}
}
}

7
src/de/craftinc/gates/commands/CommandInfo.java
View File

@ -32,20 +32,15 @@ public class CommandInfo extends BaseCommand {
public CommandInfo() { public CommandInfo() {
aliases.add("info"); aliases.add("info");
aliases.add("i"); aliases.add("i");
optionalParameters.add("id"); optionalParameters.add("id");
helpDescription = "Print detailed information about a certain or the closest gate."; helpDescription = "Print detailed information about a certain or the closest gate.";
requiredPermission = PermissionController.permissionInfo; requiredPermission = PermissionController.permissionInfo;
needsPermissionAtCurrentLocation = false; needsPermissionAtCurrentLocation = false;
shouldPersistToDisk = false; shouldPersistToDisk = false;
senderMustBePlayer = false; senderMustBePlayer = false;
hasGateParam = false; hasGateParam = false;
} }
public void perform() { public void perform() {
if (this.parameters.size() > 0) { if (this.parameters.size() > 0) {
@ -64,7 +59,7 @@ public class CommandInfo extends BaseCommand {
} }
Player p = (Player) this.sender; Player p = (Player) this.sender;
this.gate = Plugin.getPlugin().getGatesManager().getNearestGate(p.getLocation()); this.gate = gatesManager.getNearestGate(p.getLocation());
if (!this.hasPermission() || this.gate == null) { if (!this.hasPermission() || this.gate == null) {
sendMessage(ChatColor.RED + "There is either no gate nearby or you do not have permission to " + this.helpDescription.toLowerCase()); sendMessage(ChatColor.RED + "There is either no gate nearby or you do not have permission to " + this.helpDescription.toLowerCase());

6
src/de/craftinc/gates/commands/CommandList.java
View File

@ -30,7 +30,7 @@ import de.craftinc.gates.util.TextUtil;
public class CommandList extends BaseCommand { public class CommandList extends BaseCommand {
private static final int linesPerPage = 10; private static final int linesPerPage = 15;
/* this is actually not true. the font used by Minecraft is not /* this is actually not true. the font used by Minecraft is not
monospaced. but there seems to be no (easy) way to calculate monospaced. but there seems to be no (easy) way to calculate
@ -64,7 +64,7 @@ public class CommandList extends BaseCommand {
} }
if (page > allPages.size() || page < 1) { if (page > allPages.size() || page < 1) {
sendMessage(ChatColor.RED + "The requested page is not availible"); sendMessage(ChatColor.RED + "The requested page is not available");
return; return;
} }
@ -148,7 +148,7 @@ public class CommandList extends BaseCommand {
* Method for getting a collection of gates the player is allowed to see. * Method for getting a collection of gates the player is allowed to see.
*/ */
private Collection<Gate> getAllGates() { private Collection<Gate> getAllGates() {
Collection<Gate> gates = Plugin.getPlugin().getGatesManager().allGates(); Collection<Gate> gates = gatesManager.allGates();
// create a copy since we cannot iterate over a collection while modifying it! // create a copy since we cannot iterate over a collection while modifying it!
Collection<Gate> gatesCopy = new ArrayList<>(gates); Collection<Gate> gatesCopy = new ArrayList<>(gates);

4
src/de/craftinc/gates/commands/CommandLocation.java
View File

@ -62,9 +62,9 @@ public class CommandLocation extends BaseLocationCommand {
sendMessage(ChatColor.GREEN + "The location of '" + gate.getId() + "' is now at your current location."); sendMessage(ChatColor.GREEN + "The location of '" + gate.getId() + "' is now at your current location.");
} catch (Exception e) { } catch (Exception e) {
sendMessage(ChatColor.RED + "There seems to be no frame at your new location! The gate got closed!" + ChatColor.AQUA + " You should build a frame now and execute:"); sendMessage(ChatColor.RED + "There seems to be no frame at your new location! The gate got closed!" + ChatColor.AQUA + " You should build a frame now and execute:");
sendMessage(new CommandOpen().getUsageTemplate(true)); sendMessage(new CommandTriggerOpen().getUsageTemplate(true));
} finally { } finally {
Plugin.getPlugin().getGatesManager().handleGateLocationChange(gate, oldLocation, oldGateBlockLocations, oldFrameBlocks); gatesManager.handleGateLocationChange(gate, oldLocation, oldGateBlockLocations, oldFrameBlocks);
GateBlockChangeSender.updateGateBlocks(gate); GateBlockChangeSender.updateGateBlocks(gate);
} }
} }

23
src/de/craftinc/gates/commands/CommandMaterial.java Normal file
View File

@ -0,0 +1,23 @@
package de.craftinc.gates.commands;
import de.craftinc.gates.controllers.PermissionController;
public class CommandMaterial extends BaseCommand {
public CommandMaterial() {
aliases.add("material");
aliases.add("m");
requiredParameters.add("id");
senderMustBePlayer = false;
hasGateParam = true;
helpDescription = "Change the material of a gate";
requiredPermission = PermissionController.permissionManage;
needsPermissionAtCurrentLocation = false;
shouldPersistToDisk = true;
}
public void perform() {
}
}

3
src/de/craftinc/gates/commands/CommandNearby.java
View File

@ -25,8 +25,7 @@ public class CommandNearby extends BaseLocationCommand {
} }
public void perform() { public void perform() {
GatesManager manager = Plugin.getPlugin().getGatesManager(); Set<Gate> nearbyGates = gatesManager.getNearbyGates(player.getLocation().getChunk());
Set<Gate> nearbyGates = manager.getNearbyGates(player.getLocation().getChunk());
if (nearbyGates == null) { if (nearbyGates == null) {
player.sendMessage("There are no gates near you!"); player.sendMessage("There are no gates near you!");

2
src/de/craftinc/gates/commands/CommandNew.java
View File

@ -28,6 +28,7 @@ public class CommandNew extends BaseLocationCommand {
public CommandNew() { public CommandNew() {
aliases.add("new"); aliases.add("new");
aliases.add("create");
aliases.add("n"); aliases.add("n");
requiredParameters.add("id"); requiredParameters.add("id");
@ -43,7 +44,6 @@ public class CommandNew extends BaseLocationCommand {
public void perform() { public void perform() {
String id = parameters.get(0); String id = parameters.get(0);
GatesManager gatesManager = Plugin.getPlugin().getGatesManager();
if (gatesManager.gateExists(id)) { if (gatesManager.gateExists(id)) {
sendMessage(ChatColor.RED + "Creating the gate failed! " + "A gate with the supplied id already exists!"); sendMessage(ChatColor.RED + "Creating the gate failed! " + "A gate with the supplied id already exists!");

2
src/de/craftinc/gates/commands/CommandRemove.java
View File

@ -43,7 +43,7 @@ public class CommandRemove extends BaseCommand {
} }
public void perform() { public void perform() {
Plugin.getPlugin().getGatesManager().handleDeletion(gate); gatesManager.handleDeletion(gate);
GateBlockChangeSender.updateGateBlocks(gate, true); GateBlockChangeSender.updateGateBlocks(gate, true);
sendMessage(ChatColor.GREEN + "Gate with id '" + gate.getId() + "' was deleted."); sendMessage(ChatColor.GREEN + "Gate with id '" + gate.getId() + "' was deleted.");
} }

7
src/de/craftinc/gates/commands/CommandRename.java
View File

@ -30,23 +30,16 @@ public class CommandRename extends BaseCommand {
hasGateParam = true; hasGateParam = true;
senderMustBePlayer = false; senderMustBePlayer = false;
requiredParameters.add("current name"); requiredParameters.add("current name");
requiredParameters.add("new name"); requiredParameters.add("new name");
helpDescription = "Changes the id of a gate."; helpDescription = "Changes the id of a gate.";
requiredPermission = PermissionController.permissionManage; requiredPermission = PermissionController.permissionManage;
needsPermissionAtCurrentLocation = false; needsPermissionAtCurrentLocation = false;
shouldPersistToDisk = true; shouldPersistToDisk = true;
senderMustBePlayer = false;
} }
public void perform() { public void perform() {
String newId = parameters.get(1); String newId = parameters.get(1);
GatesManager gatesManager = Plugin.getPlugin().getGatesManager();
if (gatesManager.gateExists(newId)) { if (gatesManager.gateExists(newId)) {
sendMessage(ChatColor.RED + "Cannot rename " + gate.getId() + ". There is already a gate named " + newId + "."); sendMessage(ChatColor.RED + "Cannot rename " + gate.getId() + ". There is already a gate named " + newId + ".");

23
src/de/craftinc/gates/commands/CommandTeleport.java Normal file
View File

@ -0,0 +1,23 @@
package de.craftinc.gates.commands;
import de.craftinc.gates.controllers.PermissionController;
public class CommandTeleport extends BaseCommand {
public CommandTeleport() {
aliases.add("teleport");
aliases.add("t");
requiredParameters.add("id");
senderMustBePlayer = true;
hasGateParam = true;
helpDescription = "Teleport to the location of a gate";
requiredPermission = PermissionController.permissionManage;
needsPermissionAtCurrentLocation = false;
shouldPersistToDisk = false;
}
public void perform() {
}
}

23
src/de/craftinc/gates/commands/CommandOpen.java → src/de/craftinc/gates/commands/CommandTriggerOpen.java
View File

@ -22,14 +22,14 @@ import org.bukkit.ChatColor;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
public class CommandOpen extends BaseCommand { public class CommandTriggerOpen extends BaseCommand {
public CommandOpen() { public CommandTriggerOpen() {
aliases.add("open"); aliases.add("triggerOpen");
aliases.add("o"); aliases.add("o");
requiredParameters.add("id"); requiredParameters.add("id");
helpDescription = "Open a gate so players can use it."; helpDescription = "Open/close a gate.";
requiredPermission = PermissionController.permissionManage; requiredPermission = PermissionController.permissionManage;
needsPermissionAtCurrentLocation = false; needsPermissionAtCurrentLocation = false;
@ -39,20 +39,15 @@ public class CommandOpen extends BaseCommand {
public void perform() { public void perform() {
try { try {
boolean needsGateManagerUpdate = false; if (!gate.isOpen() && gate.getExit() == null && player != null) {
gate.setExit(player.getLocation());
if (gate.getGateBlockLocations().isEmpty()) { sendMessage(ChatColor.GREEN + "The exit of gate '" + gate.getId() + "' is now where you stand.");
needsGateManagerUpdate = true;
} }
gate.setOpen(true); gate.setOpen(gate.isOpen());
GateBlockChangeSender.updateGateBlocks(gate); GateBlockChangeSender.updateGateBlocks(gate);
gatesManager.handleGateLocationChange(gate, null, null, null);
if (needsGateManagerUpdate) {
Plugin.getPlugin().getGatesManager().handleGateLocationChange(gate, null, null, null);
}
sendMessage(ChatColor.GREEN + "The gate was opened."); sendMessage(ChatColor.GREEN + "The gate was opened.");
} catch (Exception e) { } catch (Exception e) {
sendMessage(ChatColor.RED + e.getMessage()); sendMessage(ChatColor.RED + e.getMessage());

18
src/de/craftinc/gates/commands/CommandAllowRiding.java → src/de/craftinc/gates/commands/CommandTriggerVehicles.java
View File

@ -19,25 +19,29 @@ package de.craftinc.gates.commands;
import de.craftinc.gates.controllers.PermissionController; import de.craftinc.gates.controllers.PermissionController;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
public class CommandAllowRiding extends BaseCommand { public class CommandTriggerVehicles extends BaseCommand {
public CommandAllowRiding() { public CommandTriggerVehicles() {
aliases.add("allowRiding"); aliases.add("vehicles");
aliases.add("ar"); aliases.add("v");
requiredParameters.add("id"); requiredParameters.add("id");
helpDescription = "Allow players to travel while riding."; helpDescription = "Allow/deny players to travel while riding.";
requiredPermission = PermissionController.permissionManage; requiredPermission = PermissionController.permissionManage;
needsPermissionAtCurrentLocation = false; needsPermissionAtCurrentLocation = false;
shouldPersistToDisk = true; shouldPersistToDisk = true;
senderMustBePlayer = false; senderMustBePlayer = false;
} }
@Override @Override
protected void perform() { protected void perform() {
gate.setAllowsVehicles(true); gate.setAllowsVehicles(gate.getAllowsVehicles());
if (gate.getAllowsVehicles()) {
sendMessage(ChatColor.GREEN + "Traveling while riding is now enabled for this gate."); sendMessage(ChatColor.GREEN + "Traveling while riding is now enabled for this gate.");
} else {
sendMessage(ChatColor.GREEN + "Traveling while riding is now disabled for this gate.");
}
} }
} }

46
src/de/craftinc/gates/commands/CommandUnhide.java
View File

@ -1,46 +0,0 @@
/* Craft Inc. Gates
Copyright (C) 2011-2013 Craft Inc. Gates Team (see AUTHORS.txt)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program (LGPLv3). If not, see <http://www.gnu.org/licenses/>.
*/
package de.craftinc.gates.commands;
import de.craftinc.gates.controllers.PermissionController;
import de.craftinc.gates.util.GateBlockChangeSender;
import org.bukkit.ChatColor;
public class CommandUnhide extends BaseCommand {
public CommandUnhide() {
aliases.add("unhide");
aliases.add("u");
requiredParameters.add("id");
helpDescription = "Make that gate visible";
requiredPermission = PermissionController.permissionManage;
needsPermissionAtCurrentLocation = false;
shouldPersistToDisk = true;
senderMustBePlayer = false;
}
public void perform() {
try {
gate.setHidden(false);
GateBlockChangeSender.updateGateBlocks(gate);
sendMessage(ChatColor.GREEN + "The gate " + gate.getId() + " is now visible.");
} catch (Exception e) {
sendMessage(ChatColor.RED + e.getMessage());
}
}
}