code formatter applied.

This commit is contained in:
Tobias Ottenweller 2016-12-31 11:59:11 +01:00
parent 238dbe3e51
commit 40b396f8a2
18 changed files with 857 additions and 1021 deletions

View File

@ -22,6 +22,7 @@ import java.util.List;
import de.craftinc.gates.util.ConfigurationUtil; import de.craftinc.gates.util.ConfigurationUtil;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import de.craftinc.gates.Gate; import de.craftinc.gates.Gate;
@ -29,224 +30,213 @@ import de.craftinc.gates.GatesManager;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
import de.craftinc.gates.util.TextUtil; import de.craftinc.gates.util.TextUtil;
public abstract class BaseCommand public abstract class BaseCommand {
{
protected List<String> aliases = new ArrayList<String>();
protected List<String> requiredParameters = new ArrayList<String>();
protected List<String> optionalParameters = new ArrayList<String>();
protected String helpDescription = "no description"; protected List<String> aliases = new ArrayList<String>();
protected List<String> requiredParameters = new ArrayList<String>();
protected List<String> optionalParameters = new ArrayList<String>();
protected List<String> parameters; protected String helpDescription = "no description";
protected CommandSender sender;
protected Player player;
protected Gate gate;
protected boolean senderMustBePlayer = true; protected List<String> parameters;
protected boolean hasGateParam = true; protected CommandSender sender;
protected Player player;
protected Gate gate;
protected String requiredPermission; protected boolean senderMustBePlayer = true;
protected boolean needsPermissionAtCurrentLocation; protected boolean hasGateParam = true;
protected boolean shouldPersistToDisk; protected String requiredPermission;
protected boolean needsPermissionAtCurrentLocation;
protected boolean shouldPersistToDisk;
public List<String> getAliases() { public List<String> getAliases() {
return aliases; return aliases;
} }
public void execute(CommandSender sender, List<String> parameters) { public void execute(CommandSender sender, List<String> parameters) {
this.sender = sender; this.sender = sender;
this.parameters = parameters; this.parameters = parameters;
if (!this.validateCall()) { if (!this.validateCall()) {
return; return;
} }
if (this.senderMustBePlayer) { if (this.senderMustBePlayer) {
this.player = (Player)sender; this.player = (Player) sender;
} }
this.perform(); this.perform();
if (this.shouldPersistToDisk && Plugin.getPlugin().getConfig().getBoolean(ConfigurationUtil.confSaveOnChangesKey)) { if (this.shouldPersistToDisk && getSaveOnChanges()) {
Plugin.getPlugin().getGatesManager().saveGatesToDisk(); Plugin.getPlugin().getGatesManager().saveGatesToDisk();
} }
} }
private boolean getSaveOnChanges() {
FileConfiguration config = Plugin.getPlugin().getConfig();
return config.getBoolean(ConfigurationUtil.confSaveOnChangesKey);
}
abstract protected void perform(); abstract protected void perform();
protected void sendMessage(String message) { protected void sendMessage(String message) {
sender.sendMessage(message); sender.sendMessage(message);
} }
protected void sendMessage(List<String> messages) { protected void sendMessage(List<String> messages) {
for(String message : messages) { for (String message : messages) {
this.sendMessage(message); this.sendMessage(message);
} }
} }
protected boolean validateCall() protected boolean validateCall() {
{ boolean allParametersThere = parameters.size() >= requiredParameters.size();
boolean allParametersThere = parameters.size() >= requiredParameters.size(); boolean senderIsPlayer = this.sender instanceof Player;
boolean senderIsPlayer = this.sender instanceof Player; boolean hasGateParameter = false;
boolean hasGateParameter = false;
if (this.hasGateParam && this.parameters.size() > 0 && this.setGateUsingParameter(this.parameters.get(0))) { if (this.hasGateParam && this.parameters.size() > 0 && this.setGateUsingParameter(this.parameters.get(0))) {
hasGateParameter = true; hasGateParameter = true;
} }
boolean senderHasPermission = this.hasPermission(); boolean senderHasPermission = this.hasPermission();
boolean valid; boolean valid;
if (this.senderMustBePlayer && !senderIsPlayer) { if (this.senderMustBePlayer && !senderIsPlayer) {
sendMessage(ChatColor.RED + "This command can only be used by ingame players."); sendMessage(ChatColor.RED + "This command can only be used by ingame players.");
valid = false; valid = false;
} } else {
else {
if (!allParametersThere) { if (!allParametersThere) {
sendMessage(ChatColor.RED + "Some parameters are missing! " + ChatColor.AQUA + "Usage: " + this.getUsageTemplate(true)); sendMessage(ChatColor.RED + "Some parameters are missing! " + ChatColor.AQUA + "Usage: " + this.getUsageTemplate(true));
valid = false; valid = false;
} } else if ((!senderHasPermission && this.hasGateParam) ||
else if ((!senderHasPermission && this.hasGateParam) || (!senderHasPermission) ||
(!senderHasPermission) || (this.hasGateParam && !hasGateParameter)) {
(this.hasGateParam && !hasGateParameter)) {
sendMessage(ChatColor.RED + "You either provided a invalid gate or do not have permission to " + this.helpDescription.toLowerCase()); sendMessage(ChatColor.RED + "You either provided a invalid gate or do not have permission to " + this.helpDescription.toLowerCase());
valid = false; valid = false;
} } else {
else {
valid = true; valid = true;
} }
} }
return valid; return valid;
} }
protected boolean setGateUsingParameter(String param) protected boolean setGateUsingParameter(String param) {
{ GatesManager gateManager = Plugin.getPlugin().getGatesManager();
GatesManager gateManager = Plugin.getPlugin().getGatesManager();
if (!gateManager.gateExists(param)) { if (!gateManager.gateExists(param)) {
return false; return false;
} } else {
else { gate = gateManager.getGateWithId(param);
gate = gateManager.getGateWithId(param); return true;
return true; }
} }
}
/** /**
* This will return false if a gate is required for this command but this.gate == null. * This will return false if a gate is required for this command but this.gate == null.
*/ */
protected boolean hasPermission() protected boolean hasPermission() {
{ if (Plugin.getPermission() == null) { // fallback - use the standard bukkit permission system
if (Plugin.getPermission() == null) { // fallback - use the standard bukkit permission system return this.sender.hasPermission(this.requiredPermission);
return this.sender.hasPermission(this.requiredPermission); }
}
if (!(this.sender instanceof Player)) { if (!(this.sender instanceof Player)) {
// sender is no player - there is no information about the senders locations // sender is no player - there is no information about the senders locations
return Plugin.getPermission().has(this.sender, this.requiredPermission); return Plugin.getPermission().has(this.sender, this.requiredPermission);
} }
Player p = (Player) this.sender; Player p = (Player) this.sender;
boolean hasPermission = false; boolean hasPermission = false;
if (this.requiredPermission.equals(Plugin.permissionInfo)) { if (this.requiredPermission.equals(Plugin.permissionInfo)) {
if (this.hasGateParam) { if (this.hasGateParam) {
hasPermission = this.hasPermissionAtGateLocationAndExit(p); hasPermission = this.hasPermissionAtGateLocationAndExit(p);
} } else {
else { hasPermission = Plugin.getPermission().has(p.getWorld(), p.getName(), this.requiredPermission);
hasPermission = Plugin.getPermission().has(p.getWorld(), p.getName(), this.requiredPermission); }
} } else if (this.requiredPermission.equals(Plugin.permissionUse)) {
} hasPermission = this.hasPermissionAtGateLocationAndExit(p);
else if (this.requiredPermission.equals(Plugin.permissionUse) ) { } else if (this.requiredPermission.equals(Plugin.permissionManage)) {
hasPermission = this.hasPermissionAtGateLocationAndExit(p);
}
else if (this.requiredPermission.equals(Plugin.permissionManage)) {
if (this.needsPermissionAtCurrentLocation && this.hasGateParam) { if (this.needsPermissionAtCurrentLocation && this.hasGateParam) {
boolean hasPersmissionAtCurrentLocation = Plugin.getPermission().has(p.getWorld(), p.getName(), this.requiredPermission); boolean hasPersmissionAtCurrentLocation = Plugin.getPermission().has(p.getWorld(), p.getName(), this.requiredPermission);
hasPermission = hasPersmissionAtCurrentLocation && this.hasPermissionAtGateLocationAndExit(p); hasPermission = hasPersmissionAtCurrentLocation && this.hasPermissionAtGateLocationAndExit(p);
} } else if (this.needsPermissionAtCurrentLocation) {
else if (this.needsPermissionAtCurrentLocation) { hasPermission = Plugin.getPermission().has(p.getWorld(), p.getName(), this.requiredPermission);
hasPermission = Plugin.getPermission().has(p.getWorld(), p.getName(), this.requiredPermission); } else {
} hasPermission = this.hasPermissionAtGateLocationAndExit(p);
else { }
hasPermission = this.hasPermissionAtGateLocationAndExit(p); }
}
}
return hasPermission; return hasPermission;
} }
protected boolean hasPermissionAtGateLocationAndExit(Player p) protected boolean hasPermissionAtGateLocationAndExit(Player p) {
{ if (this.gate == null || p == null) {
if (this.gate == null || p == null) { // make sure we don't run into a nullpointer exception return false;
return false; }
}
boolean permAtLocation = this.gate.getLocation() == null || Plugin.getPermission().has(this.gate.getLocation().getWorld(), p.getName(), this.requiredPermission); boolean permAtLocation = this.gate.getLocation() == null || Plugin.getPermission().has(this.gate.getLocation().getWorld(), p.getName(), this.requiredPermission);
boolean permAtExit = this.gate.getExit() == null || Plugin.getPermission().has(this.gate.getExit().getWorld(), p.getName(), this.requiredPermission); boolean permAtExit = this.gate.getExit() == null || Plugin.getPermission().has(this.gate.getExit().getWorld(), p.getName(), this.requiredPermission);
return permAtLocation & permAtExit; return permAtLocation & permAtExit;
} }
// -------------------------------------------- // // -------------------------------------------- //
// Help and usage description // Help and usage description
// -------------------------------------------- // // -------------------------------------------- //
protected String getUsageTemplate(boolean withColor, boolean withDescription) protected String getUsageTemplate(boolean withColor, boolean withDescription) {
{ String ret = "";
String ret = "";
if (withColor) { if (withColor) {
ret += ChatColor.AQUA; ret += ChatColor.AQUA;
} }
ret += "/" + Plugin.getPlugin().getBaseCommand() + " " + TextUtil.implode(this.getAliases(), ",")+" "; ret += "/" + Plugin.getPlugin().getBaseCommand() + " " + TextUtil.implode(this.getAliases(), ",") + " ";
List<String> parts = new ArrayList<String>(); List<String> parts = new ArrayList<String>();
for (String requiredParameter : this.requiredParameters) { for (String requiredParameter : this.requiredParameters) {
parts.add("["+requiredParameter+"]"); parts.add("[" + requiredParameter + "]");
} }
for (String optionalParameter : this.optionalParameters) { for (String optionalParameter : this.optionalParameters) {
parts.add("*["+optionalParameter+"]"); parts.add("*[" + optionalParameter + "]");
} }
if (withColor) { if (withColor) {
ret += ChatColor.DARK_AQUA; ret += ChatColor.DARK_AQUA;
} }
ret += TextUtil.implode(parts, " "); ret += TextUtil.implode(parts, " ");
if (withDescription) { if (withDescription) {
ret += " "; ret += " ";
if (withColor) { if (withColor) {
ret += ChatColor.YELLOW; ret += ChatColor.YELLOW;
} }
ret += this.helpDescription;
}
return ret;
}
ret += this.helpDescription; protected String getUsageTemplate(boolean withColor) {
} return getUsageTemplate(withColor, false);
return ret; }
}
protected String getUsageTemplate(boolean withColor)
{
return getUsageTemplate(withColor, false);
}
} }

View File

@ -21,27 +21,25 @@ import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
public abstract class BaseLocationCommand extends BaseCommand public abstract class BaseLocationCommand extends BaseCommand {
{
protected Location getValidPlayerLocation()
{
// The player might stand in a half block or a sign or whatever
// Therefore we load some extra locations and blocks
Block playerBlock = player.getLocation().getBlock();
Block upBlock = playerBlock.getRelative(BlockFace.UP);
if (playerBlock.getType() == Material.AIR) { protected Location getValidPlayerLocation() {
return player.getLocation(); // The player might stand in a half block or a sign or whatever
} // Therefore we load some extra locations and blocks
else if (upBlock.getType() == Material.AIR) { Block playerBlock = player.getLocation().getBlock();
return new Location(player.getLocation().getWorld(), Block upBlock = playerBlock.getRelative(BlockFace.UP);
player.getLocation().getX(),
player.getLocation().getY() + 1,
player.getLocation().getZ(),
player.getLocation().getYaw(),
player.getLocation().getPitch());
}
return null; if (playerBlock.getType() == Material.AIR) {
} return player.getLocation();
} else if (upBlock.getType() == Material.AIR) {
return new Location(player.getLocation().getWorld(),
player.getLocation().getX(),
player.getLocation().getY() + 1,
player.getLocation().getZ(),
player.getLocation().getYaw(),
player.getLocation().getPitch());
}
return null;
}
} }

View File

@ -20,19 +20,16 @@ package de.craftinc.gates.commands;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
public class CommandAllowRiding extends BaseCommand public class CommandAllowRiding extends BaseCommand {
{
public CommandAllowRiding() public CommandAllowRiding() {
{
aliases.add("allowRiding"); aliases.add("allowRiding");
aliases.add("ar"); aliases.add("ar");
requiredParameters.add("id"); requiredParameters.add("id");
helpDescription = "Allow players to travel while riding."; helpDescription = "Allow players to travel while riding.";
requiredPermission = Plugin.permissionManage; requiredPermission = Plugin.permissionManage;
needsPermissionAtCurrentLocation = false; needsPermissionAtCurrentLocation = false;
shouldPersistToDisk = true; shouldPersistToDisk = true;
@ -40,8 +37,7 @@ public class CommandAllowRiding extends BaseCommand
} }
@Override @Override
protected void perform() protected void perform() {
{
gate.setAllowsVehicles(true); gate.setAllowsVehicles(true);
sendMessage(ChatColor.GREEN + "Traveling while riding is now enabled for this gate."); sendMessage(ChatColor.GREEN + "Traveling while riding is now enabled for this gate.");
} }

View File

@ -24,41 +24,30 @@ import org.bukkit.ChatColor;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
public class CommandClose extends BaseCommand public class CommandClose extends BaseCommand {
{
public CommandClose()
{
aliases.add("close");
aliases.add("c");
requiredParameters.add("id"); public CommandClose() {
aliases.add("close");
aliases.add("c");
helpDescription = "Closes a gate to prevent players from using it."; requiredParameters.add("id");
helpDescription = "Closes a gate to prevent players from using it.";
requiredPermission = Plugin.permissionManage;
needsPermissionAtCurrentLocation = false;
shouldPersistToDisk = true;
senderMustBePlayer = false;
}
requiredPermission = Plugin.permissionManage; @Override
public void perform() {
needsPermissionAtCurrentLocation = false; try {
shouldPersistToDisk = true; gate.setOpen(false);
senderMustBePlayer = false;
}
@Override
public void perform()
{
try
{
gate.setOpen(false);
GateBlockChangeSender.updateGateBlocks(gate); GateBlockChangeSender.updateGateBlocks(gate);
sendMessage(ChatColor.GREEN + "The gate was closed."); sendMessage(ChatColor.GREEN + "The gate was closed.");
} } catch (Exception e) {
catch(Exception e) sendMessage(ChatColor.RED + "Opening the gate failed! See server log for more information");
{ Plugin.log(Level.WARNING, e.getMessage());
sendMessage(ChatColor.RED + "Opening the gate failed! See server log for more information"); e.printStackTrace();
Plugin.log(Level.WARNING, e.getMessage()); }
e.printStackTrace(); }
}
}
} }

View File

@ -19,28 +19,22 @@ package de.craftinc.gates.commands;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
public class CommandDenyRiding extends BaseCommand public class CommandDenyRiding extends BaseCommand {
{
public CommandDenyRiding() public CommandDenyRiding() {
{
aliases.add("denyRiding"); aliases.add("denyRiding");
aliases.add("dr"); aliases.add("dr");
requiredParameters.add("id"); requiredParameters.add("id");
helpDescription = "Deny players to travel while riding."; helpDescription = "Deny players to travel while riding.";
requiredPermission = Plugin.permissionManage; requiredPermission = Plugin.permissionManage;
needsPermissionAtCurrentLocation = false; needsPermissionAtCurrentLocation = false;
shouldPersistToDisk = true; shouldPersistToDisk = true;
senderMustBePlayer = false; senderMustBePlayer = false;
} }
@Override @Override
protected void perform() protected void perform() {
{
gate.setAllowsVehicles(false); gate.setAllowsVehicles(false);
sendMessage(ChatColor.GREEN + "Traveling while riding is now disabled for this gate."); sendMessage(ChatColor.GREEN + "Traveling while riding is now disabled for this gate.");
} }

View File

@ -24,41 +24,35 @@ import org.bukkit.ChatColor;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
import org.bukkit.Location; import org.bukkit.Location;
public class CommandExit extends BaseCommand {
public class CommandExit extends BaseCommand public CommandExit() {
{ aliases.add("exit");
public CommandExit() aliases.add("e");
{
aliases.add("exit");
aliases.add("e");
requiredParameters.add("id"); requiredParameters.add("id");
helpDescription = "Change exit of location."; helpDescription = "Change exit of location.";
requiredPermission = Plugin.permissionManage; requiredPermission = Plugin.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); Plugin.getPlugin().getGatesManager().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");
Plugin.log(Level.WARNING, e.getMessage()); Plugin.log(Level.WARNING, e.getMessage());
e.printStackTrace(); e.printStackTrace();
} }
} }
} }

View File

@ -24,29 +24,23 @@ import org.bukkit.Location;
import java.util.logging.Level; import java.util.logging.Level;
public class CommandExitOpen extends BaseCommand public class CommandExitOpen extends BaseCommand {
{
public CommandExitOpen() public CommandExitOpen() {
{
aliases.add("exitopen"); aliases.add("exitopen");
aliases.add("eo"); aliases.add("eo");
requiredParameters.add("id"); requiredParameters.add("id");
helpDescription = "Change exit of location and open that gate afterwards."; helpDescription = "Change exit of location and open that gate afterwards.";
requiredPermission = Plugin.permissionManage; requiredPermission = Plugin.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.");
@ -68,12 +62,10 @@ public class CommandExitOpen extends BaseCommand
} }
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());
} }
} } catch (Exception e) {
catch (Exception e) {
GateBlockChangeSender.updateGateBlocks(gate); GateBlockChangeSender.updateGateBlocks(gate);
sendMessage(ChatColor.RED + "Setting the exit for the gate failed! This gate is now closed! (See server log for more information.)"); 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()); Plugin.log(Level.WARNING, e.getMessage());

View File

@ -23,89 +23,84 @@ import java.util.ArrayList;
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 {
{
public static List<List<String>> helpPages;
static public static List<List<String>> helpPages;
{
// sort the usage strings
List<String> allUsageStrings = new ArrayList<String>();
allUsageStrings.add( new CommandHelp().getUsageTemplate(true, true) ); static {
allUsageStrings.add( new CommandNew().getUsageTemplate(true, true) ); // sort the usage strings
allUsageStrings.add( new CommandRemove().getUsageTemplate(true, true) ); List<String> allUsageStrings = new ArrayList<String>();
allUsageStrings.add( new CommandLocation().getUsageTemplate(true, true) );
allUsageStrings.add( new CommandExit().getUsageTemplate(true, true) );
allUsageStrings.add( new CommandOpen().getUsageTemplate(true, true) );
allUsageStrings.add( new CommandRename().getUsageTemplate(true, true) );
allUsageStrings.add( new CommandClose().getUsageTemplate(true, true) );
allUsageStrings.add( new CommandList().getUsageTemplate(true, true) );
allUsageStrings.add( new CommandInfo().getUsageTemplate(true, true) );
allUsageStrings.add( new CommandHide().getUsageTemplate(true, true) );
allUsageStrings.add( new CommandUnhide().getUsageTemplate(true, true) );
allUsageStrings.add( new CommandExitOpen().getUsageTemplate(true, true) );
allUsageStrings.add( new CommandNearby().getUsageTemplate(true, true) );
Collections.sort(allUsageStrings); allUsageStrings.add(new CommandHelp().getUsageTemplate(true, true));
allUsageStrings.add(new CommandNew().getUsageTemplate(true, true));
allUsageStrings.add(new CommandRemove().getUsageTemplate(true, true));
allUsageStrings.add(new CommandLocation().getUsageTemplate(true, true));
allUsageStrings.add(new CommandExit().getUsageTemplate(true, true));
allUsageStrings.add(new CommandOpen().getUsageTemplate(true, true));
allUsageStrings.add(new CommandRename().getUsageTemplate(true, true));
allUsageStrings.add(new CommandClose().getUsageTemplate(true, true));
allUsageStrings.add(new CommandList().getUsageTemplate(true, true));
allUsageStrings.add(new CommandInfo().getUsageTemplate(true, true));
allUsageStrings.add(new CommandHide().getUsageTemplate(true, true));
allUsageStrings.add(new CommandUnhide().getUsageTemplate(true, true));
allUsageStrings.add(new CommandExitOpen().getUsageTemplate(true, true));
allUsageStrings.add(new CommandNearby().getUsageTemplate(true, true));
Collections.sort(allUsageStrings);
// put 5 commands on one page // put 5 commands on one page
helpPages = new ArrayList<List<String>>(); helpPages = new ArrayList<List<String>>();
while (!allUsageStrings.isEmpty()) { while (!allUsageStrings.isEmpty()) {
int toIndex = allUsageStrings.size() >= 6 ? 5 : allUsageStrings.size(); int toIndex = allUsageStrings.size() >= 6 ? 5 : allUsageStrings.size();
List<String> currentHelpPage = new ArrayList<String>(allUsageStrings.subList(0, toIndex)); List<String> currentHelpPage = new ArrayList<String>(allUsageStrings.subList(0, toIndex));
helpPages.add(currentHelpPage); helpPages.add(currentHelpPage);
allUsageStrings.removeAll(currentHelpPage); allUsageStrings.removeAll(currentHelpPage);
} }
} }
public CommandHelp() public CommandHelp() {
{ aliases.add("help");
aliases.add("help"); aliases.add("?");
aliases.add("?");
optionalParameters.add("page"); optionalParameters.add("page");
helpDescription = "prints this help page"; helpDescription = "prints this help page";
requiredPermission = Plugin.permissionInfo; requiredPermission = Plugin.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;
int page;
if (parameters.size() > 0) { if (parameters.size() > 0) {
try { try {
page = Integer.parseInt(parameters.get(0)); page = Integer.parseInt(parameters.get(0));
} } catch (NumberFormatException e) {
catch (NumberFormatException e) { // wasn't an integer
// wasn't an integer
page = 1; page = 1;
} }
} } else {
else {
page = 1; page = 1;
} }
sendMessage(TextUtil.titleize("Craft Inc. Gates Help (" + page + "/" + helpPages.size() + ")")); sendMessage(TextUtil.titleize("Craft Inc. Gates Help (" + page + "/" + helpPages.size() + ")"));
page -= 1; page -= 1;
if (page < 0 || page >= helpPages.size()) { if (page < 0 || page >= helpPages.size()) {
sendMessage("This page does not exist"); sendMessage("This page does not exist");
return; return;
} }
sendMessage(helpPages.get(page)); sendMessage(helpPages.get(page));
} }
} }

View File

@ -24,36 +24,33 @@ import org.bukkit.ChatColor;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
public class CommandHide extends BaseCommand public class CommandHide extends BaseCommand {
{
public CommandHide() public CommandHide() {
{ aliases.add("hide");
aliases.add("hide");
aliases.add("h"); aliases.add("h");
requiredParameters.add("id"); requiredParameters.add("id");
helpDescription = "Makes a gate NOT consist of gate blocks while open."; helpDescription = "Makes a gate NOT consist of gate blocks while open.";
requiredPermission = Plugin.permissionManage; requiredPermission = Plugin.permissionManage;
needsPermissionAtCurrentLocation = false; needsPermissionAtCurrentLocation = false;
shouldPersistToDisk = true; shouldPersistToDisk = true;
senderMustBePlayer = false; senderMustBePlayer = false;
} }
public void perform() public void perform() {
{ try {
try { gate.setHidden(true);
gate.setHidden(true);
GateBlockChangeSender.updateGateBlocks(gate); GateBlockChangeSender.updateGateBlocks(gate);
sendMessage(ChatColor.GREEN + "The gate '" + gate.getId() + "' is now hidden."); sendMessage(ChatColor.GREEN + "The gate '" + gate.getId() + "' is now hidden.");
} } catch (Exception e) {
catch (Exception e) { sendMessage(ChatColor.RED + "Hiding the gate failed! See server log for more information");
sendMessage(ChatColor.RED + "Hiding the gate failed! See server log for more information"); Plugin.log(Level.WARNING, e.getMessage());
Plugin.log(Level.WARNING, e.getMessage()); e.printStackTrace();
e.printStackTrace(); }
} }
}
} }

View File

@ -16,7 +16,6 @@
*/ */
package de.craftinc.gates.commands; package de.craftinc.gates.commands;
import de.craftinc.gates.util.GateBlockChangeSender; import de.craftinc.gates.util.GateBlockChangeSender;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
@ -24,30 +23,27 @@ import de.craftinc.gates.Plugin;
import de.craftinc.gates.util.TextUtil; import de.craftinc.gates.util.TextUtil;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class CommandInfo extends BaseCommand {
public class CommandInfo extends BaseCommand public CommandInfo() {
{ aliases.add("info");
public CommandInfo() aliases.add("i");
{
aliases.add("info");
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 = Plugin.permissionInfo; requiredPermission = Plugin.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) {
if (!this.setGateUsingParameter(this.parameters.get(0))) { if (!this.setGateUsingParameter(this.parameters.get(0))) {
sendMessage(ChatColor.RED + "You either provided a invalid gate or do not have permission to " + this.helpDescription.toLowerCase()); sendMessage(ChatColor.RED + "You either provided a invalid gate or do not have permission to " + this.helpDescription.toLowerCase());
@ -55,8 +51,7 @@ public class CommandInfo extends BaseCommand
} }
sendMessage(TextUtil.titleize("Information about: '" + ChatColor.WHITE + gate.getId() + ChatColor.YELLOW + "'")); sendMessage(TextUtil.titleize("Information about: '" + ChatColor.WHITE + gate.getId() + ChatColor.YELLOW + "'"));
} } else {
else {
boolean senderIsPlayer = this.sender instanceof Player; boolean senderIsPlayer = this.sender instanceof Player;
if (!senderIsPlayer) { if (!senderIsPlayer) {
@ -64,7 +59,7 @@ public class CommandInfo extends BaseCommand
return; return;
} }
Player p = (Player)this.sender; Player p = (Player) this.sender;
this.gate = Plugin.getPlugin().getGatesManager().getNearestGate(p.getLocation()); this.gate = Plugin.getPlugin().getGatesManager().getNearestGate(p.getLocation());
if (!this.hasPermission() || this.gate == null) { if (!this.hasPermission() || this.gate == null) {
@ -85,22 +80,22 @@ public class CommandInfo extends BaseCommand
openHiddenMessage += ChatColor.AQUA + " closed"; openHiddenMessage += ChatColor.AQUA + " closed";
if (gate.isHidden()) if (gate.isHidden())
openHiddenMessage += ChatColor.DARK_AQUA +" and" + ChatColor.AQUA + " hidden"; openHiddenMessage += ChatColor.DARK_AQUA + " and" + ChatColor.AQUA + " hidden";
openHiddenMessage += ".\n"; openHiddenMessage += ".\n";
sendMessage(openHiddenMessage); sendMessage(openHiddenMessage);
if (gate.getLocation() != null) if (gate.getLocation() != null)
sendMessage(ChatColor.DARK_AQUA + "location: " + ChatColor.AQUA + "( " + (int)gate.getLocation().getX() + sendMessage(ChatColor.DARK_AQUA + "location: " + ChatColor.AQUA + "( " + (int) gate.getLocation().getX() +
" | " + (int)gate.getLocation().getY() + " | " + (int)gate.getLocation().getZ() + " ) in " + " | " + (int) gate.getLocation().getY() + " | " + (int) gate.getLocation().getZ() + " ) in " +
gate.getLocation().getWorld().getName()); gate.getLocation().getWorld().getName());
else else
sendMessage(ChatColor.DARK_AQUA + "NOTE: this gate has no location"); sendMessage(ChatColor.DARK_AQUA + "NOTE: this gate has no location");
if (gate.getExit() != null) if (gate.getExit() != null)
sendMessage(ChatColor.DARK_AQUA + "exit: " + ChatColor.AQUA + "( " + (int)gate.getExit().getX() + " | " sendMessage(ChatColor.DARK_AQUA + "exit: " + ChatColor.AQUA + "( " + (int) gate.getExit().getX() + " | "
+ (int)gate.getExit().getY() + " | " + (int)gate.getExit().getZ() + " ) in " + + (int) gate.getExit().getY() + " | " + (int) gate.getExit().getZ() + " ) in " +
gate.getExit().getWorld().getName()); gate.getExit().getWorld().getName());
else else
sendMessage(ChatColor.DARK_AQUA + "NOTE: this gate has no exit"); sendMessage(ChatColor.DARK_AQUA + "NOTE: this gate has no exit");
@ -111,7 +106,7 @@ public class CommandInfo extends BaseCommand
if (this.sender instanceof Player) { if (this.sender instanceof Player) {
GateBlockChangeSender.temporaryHighlightGateFrame((Player)this.sender, this.gate); GateBlockChangeSender.temporaryHighlightGateFrame((Player) this.sender, this.gate);
} }
} }
} }

View File

@ -28,324 +28,287 @@ import de.craftinc.gates.Gate;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
import de.craftinc.gates.util.TextUtil; import de.craftinc.gates.util.TextUtil;
public class CommandList extends BaseCommand {
public class CommandList extends BaseCommand private static final int linesPerPage = 10;
{
protected static final int linesPerPage = 10;
protected static final int charactersPerLine = 52; /* this is actually no true. the
font used by minecraft is not
monospace. but I don't think
there is a (easy) way for a
bukkit plugin to calculate
the drawing-size of a string.
*/
public CommandList() /* this is actually not true. the font used by Minecraft is not
{ monospaced. but there seems to be no (easy) way to calculate
aliases.add("list"); the drawing-size of a string.
aliases.add("ls"); */
private static final int charactersPerLine = 52;
optionalParameters.add("page"); public CommandList() {
hasGateParam = false; aliases.add("list");
needsPermissionAtCurrentLocation = false; aliases.add("ls");
helpDescription = "lists all availible gates."; optionalParameters.add("page");
hasGateParam = false;
needsPermissionAtCurrentLocation = false;
requiredPermission = Plugin.permissionInfo; helpDescription = "lists all availible gates.";
shouldPersistToDisk = false;
senderMustBePlayer = false;
}
requiredPermission = Plugin.permissionInfo;
shouldPersistToDisk = false;
senderMustBePlayer = false;
}
protected static List<String> linesOfGateIds(List<String> gates) public void perform() {
{ int page = this.getPageParameter();
List<String> lines = new ArrayList<String>(); List<String> allPages = this.pagedGateIds();
int index = 0; if (allPages == null) { // no gates exist
List<String> gateIdsForCurrentLine = new ArrayList<String>(); sendMessage(ChatColor.RED + "There are no gates yet. " + ChatColor.RESET +
int numCharactersInCurrentLine = 0; "(Note that you might not be allowed to get information about certain gates)");
return;
}
if (page > allPages.size() || page < 1) {
sendMessage(ChatColor.RED + "The requested page is not availible");
return;
}
while (index < gates.size()) { String message = TextUtil.titleize("List of all gates (" + page + "/" + allPages.size() + ")") + "\n";
String gateId = gates.get(index); message += allPages.get(page - 1);
int gateIdLength = gateId.length() + 2; // actual length + comma + whitespace
// special case: very long gate id sendMessage(message);
if (gateIdLength > charactersPerLine && numCharactersInCurrentLine == 0) { }
gateIdsForCurrentLine = new ArrayList<String>();
numCharactersInCurrentLine = 0;
while ((gateId.length() + 2) > charactersPerLine) { private static List<String> linesOfGateIds(List<String> gates) {
List<String> lines = new ArrayList<String>();
int cutPos = charactersPerLine; int index = 0;
List<String> gateIdsForCurrentLine = new ArrayList<String>();
int numCharactersInCurrentLine = 0;
// is the id too long to add comma and whitespace but not longer than the line? while (index < gates.size()) {
if (gateId.length() <= charactersPerLine) { String gateId = gates.get(index);
cutPos -= 2; int gateIdLength = gateId.length() + 2; // actual length + comma + whitespace
}
lines.add(gateId.substring(0, cutPos)); if (gateIdLength > charactersPerLine && numCharactersInCurrentLine == 0) { // special case: very long gate id
gateId = gateId.substring(cutPos, gateId.length()); gateIdsForCurrentLine = new ArrayList<String>();
numCharactersInCurrentLine = 0;
} while ((gateId.length() + 2) > charactersPerLine) {
int cutPos = charactersPerLine;
gateIdsForCurrentLine.add(gateId); // is the id too long to add comma and whitespace but not longer than the line?
if (gateId.length() <= charactersPerLine) {
cutPos -= 2;
}
numCharactersInCurrentLine += gateId.length(); lines.add(gateId.substring(0, cutPos));
index++; gateId = gateId.substring(cutPos, gateId.length());
} }
// gate fits into current line gateIdsForCurrentLine.add(gateId);
else if ((numCharactersInCurrentLine + gateIdLength) <= charactersPerLine) {
gateIdsForCurrentLine.add(gateId);
numCharactersInCurrentLine += gateIdLength;
index++; numCharactersInCurrentLine += gateId.length();
} index++;
} else if ((numCharactersInCurrentLine + gateIdLength) <= charactersPerLine) { // gate fits into current line
gateIdsForCurrentLine.add(gateId);
numCharactersInCurrentLine += gateIdLength;
// the current gate does not fit on the index++;
else { } else { // the current gate does not fit on the
lines.add(TextUtil.implode(gateIdsForCurrentLine, ", ") + ", "); lines.add(TextUtil.implode(gateIdsForCurrentLine, ", ") + ", ");
gateIdsForCurrentLine = new ArrayList<String>(); gateIdsForCurrentLine = new ArrayList<String>();
numCharactersInCurrentLine = 0; numCharactersInCurrentLine = 0;
} }
} }
lines.add(TextUtil.implode(gateIdsForCurrentLine, ", ")); lines.add(TextUtil.implode(gateIdsForCurrentLine, ", "));
return lines; return lines;
} }
private static String intToTitleString(int i, boolean addPreviousPageNote, boolean addNextPageNote) {
String retVal = ChatColor.DARK_AQUA + "";
protected static String intToTitleString(int i, boolean addPreviousPageNote, boolean addNextPageNote) if (i < 26) {
{ retVal += (char) (i + 65);
String retVal = ChatColor.DARK_AQUA + ""; } else if (i == 26) {
retVal += "0-9";
} else {
retVal += "!@#$";
}
if ( i < 26 ) { if (addPreviousPageNote && addNextPageNote) {
retVal += (char)(i+65); retVal += " (more on previous and next page)";
} } else if (addPreviousPageNote) {
else if ( i == 26 ) { retVal += " (more on previous page)";
retVal += "0-9"; } else if (addNextPageNote) {
} retVal += " (more on next page)";
else { }
retVal += "!@#$";
}
if (addPreviousPageNote && addNextPageNote) { return retVal + "\n";
retVal += " (more on previous and next page)"; }
}
else if (addPreviousPageNote) {
retVal += " (more on previous page)";
}
else if (addNextPageNote) {
retVal += " (more on next page)";
}
return retVal + "\n"; /**
} * Method for getting a collection of gates the player is allowed to see.
*/
private Collection<Gate> getAllGates() {
Collection<Gate> gates = Plugin.getPlugin().getGatesManager().allGates();
if (this.sender instanceof Player && Plugin.getPermission() != null) {
Player p = (Player) this.sender;
/** // create a copy since we cannot iterate over a collection while modifying it!
* Method for getting a collection of gates the player is allowed to see. Collection<Gate> gatesCopy = new ArrayList<Gate>(gates);
*/
protected Collection<Gate> getAllGates()
{
Collection<Gate> gates = Plugin.getPlugin().getGatesManager().allGates();
if (this.sender instanceof Player && Plugin.getPermission() != null) { for (Gate gate : gatesCopy) {
Player p = (Player)this.sender; if (gate.getLocation() != null) {
boolean permissionAtGateLocation = Plugin.getPermission().has(gate.getLocation().getWorld(), p.getName(), this.requiredPermission);
if (!permissionAtGateLocation) {
gates.remove(gate);
continue;
}
}
// create a copy since we cannot iterate over a collection while modifying it! if (gate.getExit() != null) {
Collection<Gate> gatesCopy = new ArrayList<Gate>(gates); boolean permissionAtGateExit = Plugin.getPermission().has(gate.getExit().getWorld(), p.getName(), this.requiredPermission);
if (!permissionAtGateExit) {
gates.remove(gate);
}
}
}
}
for (Gate gate : gatesCopy) { return gates;
}
if (gate.getLocation() != null) { /**
boolean permissionAtGateLocation = Plugin.getPermission().has(gate.getLocation().getWorld(), p.getName(), this.requiredPermission); * Sorts all gates by there first character.
if (!permissionAtGateLocation) { * Puts gates in corresponding Lists: (all returned lists will be sorted alphabetically)
gates.remove(gate); * list 0-25: a,b,c,..,z
continue; * list 26: 0-9
} * list 27: other
} */
private static List<List<String>> gatesSortedByName(Collection<Gate> allGates) {
// create the lists
List<List<String>> ids = new ArrayList<List<String>>();
if (gate.getExit() != null) { for (int i = 0; i < 28; i++) {
ids.add(new ArrayList<String>());
}
boolean permissionAtGateExit = Plugin.getPermission().has(gate.getExit().getWorld(), p.getName(), this.requiredPermission); // put all gates into correct lists
if (!permissionAtGateExit) { for (Gate gate : allGates) {
gates.remove(gate); String id = gate.getId();
} int first = id.charAt(0);
}
}
}
return gates; if (first > 96 && first < 123) { // convert lower case chars
} first -= 97;
} else if (first > 64 && first < 91) { // convert upper case chars
first -= 65;
} else if (first > 47 && first < 58) { // convert numbers
first = 26;
} else { // everything else
first = 27;
}
ids.get(first).add(id);
}
/** // sort everything
* Sorts all gates by there first character. for (int i = 0; i < 28; i++) {
* Puts gates in corresponding Lists: (all returned lists will be sorted alphabetically) Collections.sort(ids.get(i));
* list 0-25: a,b,c,..,z }
* list 26: 0-9
* list 27: other
*/
protected static List<List<String>> gatesSortedByName(Collection<Gate> allGates)
{
// create the lists
List<List<String>> ids = new ArrayList<List<String>>();
for (int i=0; i<28; i++) { return ids;
ids.add(new ArrayList<String>()); }
}
// put all gates into correct lists /**
for (Gate gate : allGates) { * Returns a list of strings.
String id = gate.getId(); * Each string is the text for a page.
int first = id.charAt(0); * The maximum number of lines per page is 'linesPerPage' minus 1.
* Will return an empty list if no gates are availible.
*/
private List<String> pagedGateIds() {
Collection<Gate> gates = this.getAllGates();
if (first > 96 && first < 123) { // convert lower case chars if (gates.size() == 0) {
first -= 97; return null;
} }
else if (first > 64 && first < 91) { // convert upper case chars
first -= 65;
}
else if (first > 47 && first < 58) { // convert numbers
first = 26;
}
else { // everything else
first = 27;
}
ids.get(first).add(id); List<List<String>> gatesSortedByName = gatesSortedByName(gates);
} List<String> allPages = new ArrayList<String>();
int linesLeftOnPage = linesPerPage - 1;
String currentPageString = "";
// sort everything for (int i = 0; i < gatesSortedByName.size(); i++) {
for (int i=0; i<28; i++) {
Collections.sort(ids.get(i));
}
return ids; List<String> currentGates = gatesSortedByName.get(i);
}
if (currentGates.isEmpty()) {
continue;
}
/** List<String> currentGatesAsLines = linesOfGateIds(currentGates);
* Returns a list of strings. boolean moreGatesOnLastPage = false;
* Each string is the text for a page.
* The maximum number of lines per page is 'linesPerPage' minus 1.
* Will return an empty list if no gates are availible.
*/
protected List<String> pagedGateIds()
{
Collection<Gate> gates = this.getAllGates();
if (gates.size() == 0) { while (!currentGatesAsLines.isEmpty()) {
return null;
}
List<List<String>> gatesSortedByName = gatesSortedByName(gates); if (linesLeftOnPage < 2) {
List<String> allPages = new ArrayList<String>(); currentPageString = currentPageString.substring(0, currentPageString.length() - 2); // remove newlines add the end of the page
int linesLeftOnPage = linesPerPage - 1; allPages.add(currentPageString);
String currentPageString = ""; currentPageString = "";
for (int i=0; i<gatesSortedByName.size(); i++) { linesLeftOnPage = linesPerPage - 1;
}
List<String> currentGates = gatesSortedByName.get(i); // calculate number of lines to add to current page
int linesNecessaryForCurrentGates = currentGatesAsLines.size();
int linesToFill;
boolean moreGatesOnNextPage;
if(currentGates.isEmpty()) { if (linesNecessaryForCurrentGates < linesLeftOnPage) {
continue; linesToFill = linesNecessaryForCurrentGates;
} moreGatesOnNextPage = false;
} else {
linesToFill = linesLeftOnPage - 1;
moreGatesOnNextPage = true;
}
List<String> currentGatesAsLines = linesOfGateIds(currentGates); // add title
boolean moreGatesOnLastPage = false; currentPageString += intToTitleString(i, moreGatesOnLastPage, moreGatesOnNextPage);
currentPageString += ChatColor.AQUA;
linesLeftOnPage--;
while (!currentGatesAsLines.isEmpty()) { // add gate lines
for (int j = 0; j < linesToFill; j++) {
currentPageString += currentGatesAsLines.get(j) + "\n";
}
if (linesLeftOnPage < 2) { // remove lines added
currentPageString = currentPageString.substring(0, currentPageString.length()-2); // remove newlines add the end of the page for (int j = 0; j < linesToFill; j++) {
allPages.add(currentPageString); currentGatesAsLines.remove(0);
currentPageString = ""; }
linesLeftOnPage = linesPerPage - 1; // cleanup
}
// calculate number of lines to add to current page
int linesNecessaryForCurrentGates = currentGatesAsLines.size();
int linesToFill;
boolean moreGatesOnNextPage;
if (linesNecessaryForCurrentGates < linesLeftOnPage) {
linesToFill = linesNecessaryForCurrentGates;
moreGatesOnNextPage = false;
}
else {
linesToFill = linesLeftOnPage -1;
moreGatesOnNextPage = true;
}
// add title
currentPageString += intToTitleString(i, moreGatesOnLastPage, moreGatesOnNextPage);
currentPageString += ChatColor.AQUA;
linesLeftOnPage--;
// add gate lines
for (int j=0; j<linesToFill; j++) {
currentPageString += currentGatesAsLines.get(j) + "\n";
}
// remove lines added
for (int j=0; j<linesToFill; j++) {
currentGatesAsLines.remove(0);
}
// cleanup
moreGatesOnLastPage = linesNecessaryForCurrentGates >= linesLeftOnPage; moreGatesOnLastPage = linesNecessaryForCurrentGates >= linesLeftOnPage;
linesLeftOnPage -= linesToFill; linesLeftOnPage -= linesToFill;
} }
} }
// add the last page // add the last page
if (!currentPageString.isEmpty()) { if (!currentPageString.isEmpty()) {
currentPageString = currentPageString.substring(0, currentPageString.length()-2); // remove newlines add the end of the page currentPageString = currentPageString.substring(0, currentPageString.length() - 2); // remove newlines add the end of the page
allPages.add(currentPageString); allPages.add(currentPageString);
} }
return allPages; return allPages;
} }
protected int getPageParameter() private int getPageParameter() {
{ int page = 1;
int page = 1;
try { try {
page = new Integer(parameters.get(0)); page = new Integer(parameters.get(0));
} } catch (Exception ignored) {
catch (Exception ignored) { } }
return page; return page;
} }
public void perform()
{
int page = this.getPageParameter();
List<String> allPages = this.pagedGateIds();
if (allPages == null) { // no gates exist
sendMessage(ChatColor.RED + "There are no gates yet. " + ChatColor.RESET +
"(Note that you might not be allowed to get information about certain gates)");
return;
}
if (page > allPages.size() || page < 1) {
sendMessage(ChatColor.RED + "The requested page is not availible");
return;
}
String message = TextUtil.titleize("List of all gates (" + page + "/" + allPages.size() + ")") + "\n";
message += allPages.get(page-1);
sendMessage(message);
}
} }

View File

@ -16,7 +16,6 @@
*/ */
package de.craftinc.gates.commands; package de.craftinc.gates.commands;
import java.util.Set; import java.util.Set;
import de.craftinc.gates.util.GateBlockChangeSender; import de.craftinc.gates.util.GateBlockChangeSender;
@ -26,59 +25,46 @@ import org.bukkit.Location;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
import org.bukkit.block.Block; import org.bukkit.block.Block;
public class CommandLocation extends BaseLocationCommand {
public class CommandLocation extends BaseLocationCommand public CommandLocation() {
{ aliases.add("location");
public CommandLocation() aliases.add("lo");
{
aliases.add("location");
aliases.add("lo");
requiredParameters.add("id"); requiredParameters.add("id");
helpDescription = "Set the entrance of the gate to your current location.";
requiredPermission = Plugin.permissionManage;
helpDescription = "Set the entrance of the gate to your current location."; needsPermissionAtCurrentLocation = true;
shouldPersistToDisk = true;
senderMustBePlayer = true;
}
requiredPermission = Plugin.permissionManage; public void perform() {
Location playerLocation = getValidPlayerLocation();
needsPermissionAtCurrentLocation = true; if (playerLocation == null) {
shouldPersistToDisk = true; sendMessage("There is not enough room for a gate to open here");
senderMustBePlayer = true; return;
} }
public void perform()
{
Location playerLocation = getValidPlayerLocation();
if (playerLocation == null)
{
sendMessage("There is not enough room for a gate to open here");
return;
}
Location oldLocation = gate.getLocation(); Location oldLocation = gate.getLocation();
Set<Location> oldGateBlockLocations = gate.getGateBlockLocations(); Set<Location> oldGateBlockLocations = gate.getGateBlockLocations();
Set<Block> oldFrameBlocks = gate.getGateFrameBlocks(); Set<Block> oldFrameBlocks = gate.getGateFrameBlocks();
try try {
{
if (gate.isOpen()) { if (gate.isOpen()) {
GateBlockChangeSender.updateGateBlocks(gate, true); GateBlockChangeSender.updateGateBlocks(gate, true);
} }
gate.setLocation(playerLocation); gate.setLocation(playerLocation);
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, true)); sendMessage(new CommandOpen().getUsageTemplate(true, true));
} } finally {
finally {
Plugin.getPlugin().getGatesManager().handleGateLocationChange(gate, oldLocation, oldGateBlockLocations, oldFrameBlocks); Plugin.getPlugin().getGatesManager().handleGateLocationChange(gate, oldLocation, oldGateBlockLocations, oldFrameBlocks);
GateBlockChangeSender.updateGateBlocks(gate); GateBlockChangeSender.updateGateBlocks(gate);
} }
} }
} }

View File

@ -1,6 +1,5 @@
package de.craftinc.gates.commands; package de.craftinc.gates.commands;
import de.craftinc.gates.Gate; import de.craftinc.gates.Gate;
import de.craftinc.gates.GatesManager; import de.craftinc.gates.GatesManager;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
@ -10,33 +9,27 @@ import de.craftinc.gates.util.TextUtil;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Set; import java.util.Set;
public class CommandNearby extends BaseLocationCommand public class CommandNearby extends BaseLocationCommand {
{
public CommandNearby() public CommandNearby() {
{
aliases.add("nearby"); aliases.add("nearby");
aliases.add("nb"); aliases.add("nb");
helpDescription = "Highlight nearby gates"; helpDescription = "Highlight nearby gates";
requiredPermission = Plugin.permissionInfo; requiredPermission = Plugin.permissionInfo;
needsPermissionAtCurrentLocation = true; needsPermissionAtCurrentLocation = true;
shouldPersistToDisk = false; shouldPersistToDisk = false;
senderMustBePlayer = true; senderMustBePlayer = true;
hasGateParam = false; hasGateParam = false;
} }
public void perform() {
public void perform()
{
GatesManager manager = Plugin.getPlugin().getGatesManager(); GatesManager manager = Plugin.getPlugin().getGatesManager();
Set<Gate> nearbyGates = manager.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!");
} } else {
else {
GateBlockChangeSender.temporaryHighlightGatesFrames(player, nearbyGates); GateBlockChangeSender.temporaryHighlightGatesFrames(player, nearbyGates);
ArrayList<String> gateNames = new ArrayList<String>(); ArrayList<String> gateNames = new ArrayList<String>();
@ -44,10 +37,7 @@ public class CommandNearby extends BaseLocationCommand
for (Gate g : nearbyGates) { for (Gate g : nearbyGates) {
gateNames.add(g.getId()); gateNames.add(g.getId());
} }
player.sendMessage("Nearby gates: " + TextUtil.implode(gateNames, ", ")); player.sendMessage("Nearby gates: " + TextUtil.implode(gateNames, ", "));
} }
} }
} }

View File

@ -23,61 +23,48 @@ import de.craftinc.gates.Gate;
import de.craftinc.gates.GatesManager; import de.craftinc.gates.GatesManager;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
public class CommandNew extends BaseLocationCommand {
public class CommandNew extends BaseLocationCommand public CommandNew() {
{ aliases.add("new");
public CommandNew()
{
aliases.add("new");
aliases.add("n"); aliases.add("n");
requiredParameters.add("id"); requiredParameters.add("id");
senderMustBePlayer = true; senderMustBePlayer = true;
hasGateParam = false; hasGateParam = false;
helpDescription = "Create a gate at your current location.";
requiredPermission = Plugin.permissionManage;
needsPermissionAtCurrentLocation = true;
shouldPersistToDisk = true;
senderMustBePlayer = true;
}
helpDescription = "Create a gate at your current location."; public void perform() {
String id = parameters.get(0);
GatesManager gatesManager = Plugin.getPlugin().getGatesManager();
requiredPermission = Plugin.permissionManage; if (gatesManager.gateExists(id)) {
sendMessage(ChatColor.RED + "Creating the gate failed! " + "A gate with the supplied id already exists!");
return;
}
needsPermissionAtCurrentLocation = true; gate = new Gate(id);
shouldPersistToDisk = true; sendMessage(ChatColor.GREEN + "Gate with id '" + id + "' was created.");
senderMustBePlayer = true; Location playerLocation = getValidPlayerLocation();
}
if (playerLocation != null) {
public void perform() try {
{ gate.setLocation(playerLocation);
String id = parameters.get(0); sendMessage(ChatColor.AQUA + "The gates location has been set to your current location.");
GatesManager gatesManager = Plugin.getPlugin().getGatesManager(); } catch (Exception ignored) {
}
if (gatesManager.gateExists(id)) { } else {
sendMessage(ChatColor.RED + "Creating the gate failed! " + "A gate with the supplied id already exists!"); sendMessage(ChatColor.RED + "Your location is invalid!" + ChatColor.AQUA + "Go somewhere else and execute:");
return; sendMessage(new CommandLocation().getUsageTemplate(true, true));
} }
gate = new Gate(id);
sendMessage(ChatColor.GREEN + "Gate with id '" + id + "' was created.");
Location playerLocation = getValidPlayerLocation();
if (playerLocation != null) {
try {
gate.setLocation(playerLocation);
sendMessage(ChatColor.AQUA + "The gates location has been set to your current location.");
}
catch (Exception ignored) {}
}
else
{
sendMessage(ChatColor.RED + "Your location is invalid!" + ChatColor.AQUA + "Go somewhere else and execute:");
sendMessage(new CommandLocation().getUsageTemplate(true, true));
}
gatesManager.handleNewGate(gate); gatesManager.handleNewGate(gate);
} }
} }

View File

@ -16,39 +16,31 @@
*/ */
package de.craftinc.gates.commands; package de.craftinc.gates.commands;
import de.craftinc.gates.util.GateBlockChangeSender; import de.craftinc.gates.util.GateBlockChangeSender;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
public class CommandOpen extends BaseCommand {
public class CommandOpen extends BaseCommand public CommandOpen() {
{ aliases.add("open");
aliases.add("o");
public CommandOpen() requiredParameters.add("id");
{ helpDescription = "Open a gate so players can use it.";
aliases.add("open"); requiredPermission = Plugin.permissionManage;
aliases.add("o");
requiredParameters.add("id"); needsPermissionAtCurrentLocation = false;
shouldPersistToDisk = true;
senderMustBePlayer = false;
}
helpDescription = "Open a gate so players can use it."; public void perform() {
try {
requiredPermission = Plugin.permissionManage;
needsPermissionAtCurrentLocation = false;
shouldPersistToDisk = true;
senderMustBePlayer = false;
}
public void perform()
{
try {
boolean needsGateManagerUpdate = false; boolean needsGateManagerUpdate = false;
if (gate.getGateBlockLocations().isEmpty()) { if (gate.getGateBlockLocations().isEmpty()) {
needsGateManagerUpdate = true; needsGateManagerUpdate = true;
} }
@ -60,11 +52,9 @@ public class CommandOpen extends BaseCommand
Plugin.getPlugin().getGatesManager().handleGateLocationChange(gate, null, null, null); 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()); }
} }
}
} }

View File

@ -21,33 +21,29 @@ import org.bukkit.ChatColor;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
public class CommandRemove extends BaseCommand {
public class CommandRemove extends BaseCommand public CommandRemove() {
{ aliases.add("delete");
public CommandRemove() aliases.add("del");
{ aliases.add("remove");
aliases.add("delete");
aliases.add("del");
aliases.add("remove");
requiredParameters.add("id"); requiredParameters.add("id");
senderMustBePlayer = false; senderMustBePlayer = false;
helpDescription = "Removes the gate from the game."; helpDescription = "Removes the gate from the game.";
requiredPermission = Plugin.permissionManage; requiredPermission = Plugin.permissionManage;
needsPermissionAtCurrentLocation = false; needsPermissionAtCurrentLocation = false;
shouldPersistToDisk = true; shouldPersistToDisk = true;
senderMustBePlayer = false; senderMustBePlayer = false;
} }
public void perform() {
public void perform() Plugin.getPlugin().getGatesManager().handleDeletion(gate);
{
Plugin.getPlugin().getGatesManager().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.");
} }
} }

View File

@ -21,46 +21,41 @@ import org.bukkit.ChatColor;
import de.craftinc.gates.GatesManager; import de.craftinc.gates.GatesManager;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
public class CommandRename extends BaseCommand {
public class CommandRename extends BaseCommand public CommandRename() {
{ aliases.add("rename");
public CommandRename() aliases.add("rn");
{
aliases.add("rename");
aliases.add("rn");
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 = Plugin.permissionManage; requiredPermission = Plugin.permissionManage;
needsPermissionAtCurrentLocation = false; needsPermissionAtCurrentLocation = false;
shouldPersistToDisk = true; shouldPersistToDisk = true;
senderMustBePlayer = false; senderMustBePlayer = false;
} }
public void perform() public void perform() {
{ String newId = parameters.get(1);
String newId = parameters.get(1); GatesManager gatesManager = Plugin.getPlugin().getGatesManager();
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 + ".");
} } else {
else { String oldId = gate.getId();
String oldId = gate.getId();
gate.setId(newId); gate.setId(newId);
gatesManager.handleGateIdChange(gate, oldId); gatesManager.handleGateIdChange(gate, oldId);
sendMessage(ChatColor.GREEN + "Gate " + gate.getId() + " is now known as " + newId + ".");
}
}
sendMessage(ChatColor.GREEN + "Gate " + gate.getId() + " is now known as " + newId + ".");
}
}
} }

View File

@ -21,38 +21,27 @@ import org.bukkit.ChatColor;
import de.craftinc.gates.Plugin; import de.craftinc.gates.Plugin;
public class CommandUnhide extends BaseCommand {
public class CommandUnhide extends BaseCommand public CommandUnhide() {
{ aliases.add("unhide");
aliases.add("u");
public CommandUnhide() requiredParameters.add("id");
{ helpDescription = "Make that gate visible";
aliases.add("unhide"); requiredPermission = Plugin.permissionManage;
aliases.add("u"); needsPermissionAtCurrentLocation = false;
shouldPersistToDisk = true;
senderMustBePlayer = false;
}
requiredParameters.add("id"); public void perform() {
try {
helpDescription = "Make that gate visible"; gate.setHidden(false);
requiredPermission = Plugin.permissionManage;
needsPermissionAtCurrentLocation = false;
shouldPersistToDisk = true;
senderMustBePlayer = false;
}
public void perform()
{
try
{
gate.setHidden(false);
GateBlockChangeSender.updateGateBlocks(gate); GateBlockChangeSender.updateGateBlocks(gate);
sendMessage(ChatColor.GREEN + "The gate " + gate.getId() + " is now visible."); sendMessage(ChatColor.GREEN + "The gate " + gate.getId() + " is now visible.");
} } catch (Exception e) {
catch (Exception e) { sendMessage(ChatColor.RED + e.getMessage());
sendMessage(ChatColor.RED + e.getMessage()); }
} }
}
} }