SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reformat.

Browse Source
This commit is contained in:
drtshock 2014-12-11 10:05:04 -06:00
parent 125a8c2050
commit 9aecd5f439
39 changed files with 408 additions and 437 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java
View File

@ -7,7 +7,6 @@ import com.massivecraft.factions.event.FPlayerJoinEvent;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
public class CmdAdmin extends FCommand { public class CmdAdmin extends FCommand {

2
src/main/java/com/massivecraft/factions/cmd/CmdBoom.java
View File

@ -39,6 +39,6 @@ public class CmdBoom extends FCommand {
String enabled = myFaction.noExplosionsInTerritory() ? TL.GENERIC_DISABLED.toString() : TL.GENERIC_ENABLED.toString(); String enabled = myFaction.noExplosionsInTerritory() ? TL.GENERIC_DISABLED.toString() : TL.GENERIC_ENABLED.toString();
// Inform // Inform
myFaction.msg(TL.COMMAND_BOOM_ENABLED, fme.describeTo(myFaction),enabled); myFaction.msg(TL.COMMAND_BOOM_ENABLED, fme.describeTo(myFaction), enabled);
} }
} }

19
src/main/java/com/massivecraft/factions/cmd/CmdConfig.java
View File

@ -4,7 +4,6 @@ import com.massivecraft.factions.Conf;
import com.massivecraft.factions.P; import com.massivecraft.factions.P;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -143,7 +142,7 @@ public class CmdConfig extends FCommand {
} }
if (newColor == null) { if (newColor == null) {
sendMessage(TL.COMMAND_CONFIG_INVALID_COLOUR.format(fieldName,value.toUpperCase())); sendMessage(TL.COMMAND_CONFIG_INVALID_COLOUR.format(fieldName, value.toUpperCase()));
return; return;
} }
target.set(null, newColor); target.set(null, newColor);
@ -170,7 +169,7 @@ public class CmdConfig extends FCommand {
} }
if (newMat == null) { if (newMat == null) {
sendMessage(TL.COMMAND_CONFIG_INVALID_MATERIAL.format(fieldName,value.toUpperCase())); sendMessage(TL.COMMAND_CONFIG_INVALID_MATERIAL.format(fieldName, value.toUpperCase()));
return; return;
} }
@ -180,13 +179,13 @@ public class CmdConfig extends FCommand {
if (matSet.contains(newMat)) { if (matSet.contains(newMat)) {
matSet.remove(newMat); matSet.remove(newMat);
target.set(null, matSet); target.set(null, matSet);
success = TL.COMMAND_CONFIG_MATERIAL_REMOVED.format(fieldName,value.toUpperCase()); success = TL.COMMAND_CONFIG_MATERIAL_REMOVED.format(fieldName, value.toUpperCase());
} }
// Material not present yet, add it // Material not present yet, add it
else { else {
matSet.add(newMat); matSet.add(newMat);
target.set(null, matSet); target.set(null, matSet);
success = TL.COMMAND_CONFIG_MATERIAL_ADDED.format(fieldName,value.toUpperCase()); success = TL.COMMAND_CONFIG_MATERIAL_ADDED.format(fieldName, value.toUpperCase());
} }
} }
@ -198,13 +197,13 @@ public class CmdConfig extends FCommand {
if (stringSet.contains(value)) { if (stringSet.contains(value)) {
stringSet.remove(value); stringSet.remove(value);
target.set(null, stringSet); target.set(null, stringSet);
success = TL.COMMAND_CONFIG_SET_REMOVED.format(fieldName,value); success = TL.COMMAND_CONFIG_SET_REMOVED.format(fieldName, value);
} }
// String not present yet, add it // String not present yet, add it
else { else {
stringSet.add(value); stringSet.add(value);
target.set(null, stringSet); target.set(null, stringSet);
success = TL.COMMAND_CONFIG_SET_ADDED.format(fieldName,value); success = TL.COMMAND_CONFIG_SET_ADDED.format(fieldName, value);
} }
} }
@ -217,21 +216,21 @@ public class CmdConfig extends FCommand {
// unknown type // unknown type
else { else {
sendMessage(TL.COMMAND_CONFIG_ERROR_TYPE.format(fieldName,target.getClass().getName())); sendMessage(TL.COMMAND_CONFIG_ERROR_TYPE.format(fieldName, target.getClass().getName()));
return; return;
} }
} catch (NoSuchFieldException ex) { } catch (NoSuchFieldException ex) {
sendMessage(TL.COMMAND_CONFIG_ERROR_MATCHING.format(fieldName)); sendMessage(TL.COMMAND_CONFIG_ERROR_MATCHING.format(fieldName));
return; return;
} catch (IllegalAccessException ex) { } catch (IllegalAccessException ex) {
sendMessage(TL.COMMAND_CONFIG_ERROR_SETTING.format(fieldName,value)); sendMessage(TL.COMMAND_CONFIG_ERROR_SETTING.format(fieldName, value));
return; return;
} }
if (!success.isEmpty()) { if (!success.isEmpty()) {
if (sender instanceof Player) { if (sender instanceof Player) {
sendMessage(success); sendMessage(success);
P.p.log(success + TL.COMMAND_CONFIG_LOG.format((Player)sender)); P.p.log(success + TL.COMMAND_CONFIG_LOG.format((Player) sender));
} else // using P.p.log() instead of sendMessage if run from server console so that "[Factions v#.#.#]" is prepended in server log } else // using P.p.log() instead of sendMessage if run from server console so that "[Factions v#.#.#]" is prepended in server log
{ {
P.p.log(success); P.p.log(success);

1
src/main/java/com/massivecraft/factions/cmd/CmdConvert.java
View File

@ -4,7 +4,6 @@ import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Conf.Backend; import com.massivecraft.factions.Conf.Backend;
import com.massivecraft.factions.zcore.persist.json.FactionsJSON; import com.massivecraft.factions.zcore.persist.json.FactionsJSON;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;
public class CmdConvert extends FCommand { public class CmdConvert extends FCommand {

1
src/main/java/com/massivecraft/factions/cmd/CmdCreate.java
View File

@ -7,7 +7,6 @@ import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.util.MiscUtil; import com.massivecraft.factions.util.MiscUtil;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import java.util.ArrayList; import java.util.ArrayList;

2
src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java
View File

@ -4,9 +4,7 @@ import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers; import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import mkremins.fanciful.FancyMessage; import mkremins.fanciful.FancyMessage;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
public class CmdDeinvite extends FCommand { public class CmdDeinvite extends FCommand {

3
src/main/java/com/massivecraft/factions/cmd/CmdDisband.java
View File

@ -8,7 +8,6 @@ import com.massivecraft.factions.scoreboards.FTeamWrapper;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -80,7 +79,7 @@ public class CmdDisband extends FCommand {
} }
} }
if (Conf.logFactionDisband) { if (Conf.logFactionDisband) {
//TODO: Format this correctly and translate. //TODO: Format this correctly and translate.
P.p.log("The faction " + faction.getTag() + " (" + faction.getId() + ") was disbanded by " + (senderIsConsole ? "console command" : fme.getName()) + "."); P.p.log("The faction " + faction.getTag() + " (" + faction.getId() + ") was disbanded by " + (senderIsConsole ? "console command" : fme.getName()) + ".");
} }

4
src/main/java/com/massivecraft/factions/cmd/CmdHelp.java
View File

@ -137,7 +137,7 @@ public class CmdHelp extends FCommand {
pageLines.add(p.txt.parse(TL.COMMAND_HELP_RELATIONS_5.toString())); pageLines.add(p.txt.parse(TL.COMMAND_HELP_RELATIONS_5.toString()));
pageLines.add(p.txt.parse(TL.COMMAND_HELP_RELATIONS_6.toString())); pageLines.add(p.txt.parse(TL.COMMAND_HELP_RELATIONS_6.toString()));
pageLines.add(p.txt.parse(TL.COMMAND_HELP_RELATIONS_7.toString())); pageLines.add(p.txt.parse(TL.COMMAND_HELP_RELATIONS_7.toString()));
pageLines.add(TL.COMMAND_HELP_RELATIONS_8.toString()); pageLines.add(TL.COMMAND_HELP_RELATIONS_8.toString());
pageLines.add(p.txt.parse(TL.COMMAND_HELP_RELATIONS_9.toString())); pageLines.add(p.txt.parse(TL.COMMAND_HELP_RELATIONS_9.toString()));
pageLines.add(p.txt.parse(TL.COMMAND_HELP_RELATIONS_10.toString())); pageLines.add(p.txt.parse(TL.COMMAND_HELP_RELATIONS_10.toString()));
pageLines.add(p.txt.parse(TL.COMMAND_HELP_RELATIONS_11.toString())); pageLines.add(p.txt.parse(TL.COMMAND_HELP_RELATIONS_11.toString()));
@ -149,7 +149,7 @@ public class CmdHelp extends FCommand {
pageLines.add(p.txt.parse(TL.COMMAND_HELP_PERMISSIONS_1.toString())); pageLines.add(p.txt.parse(TL.COMMAND_HELP_PERMISSIONS_1.toString()));
pageLines.add(p.txt.parse(TL.COMMAND_HELP_PERMISSIONS_2.toString())); pageLines.add(p.txt.parse(TL.COMMAND_HELP_PERMISSIONS_2.toString()));
pageLines.add(p.txt.parse(TL.COMMAND_HELP_PERMISSIONS_3.toString())); pageLines.add(p.txt.parse(TL.COMMAND_HELP_PERMISSIONS_3.toString()));
pageLines.add(TL.COMMAND_HELP_PERMISSIONS_4.toString()); pageLines.add(TL.COMMAND_HELP_PERMISSIONS_4.toString());
pageLines.add(p.txt.parse(TL.COMMAND_HELP_PERMISSIONS_5.toString())); pageLines.add(p.txt.parse(TL.COMMAND_HELP_PERMISSIONS_5.toString()));
pageLines.add(p.txt.parse(TL.COMMAND_HELP_PERMISSIONS_6.toString())); pageLines.add(p.txt.parse(TL.COMMAND_HELP_PERMISSIONS_6.toString()));
pageLines.add(p.txt.parse(TL.COMMAND_HELP_PERMISSIONS_7.toString())); pageLines.add(p.txt.parse(TL.COMMAND_HELP_PERMISSIONS_7.toString()));

3
src/main/java/com/massivecraft/factions/cmd/CmdHome.java
View File

@ -7,7 +7,6 @@ import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.util.SmokeUtil; import com.massivecraft.factions.zcore.util.SmokeUtil;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -96,7 +95,7 @@ public class CmdHome extends FCommand {
continue; continue;
} }
fme.msg(TL.COMMAND_HOME_ENEMYNEAR,String.valueOf(Conf.homesTeleportAllowedEnemyDistance)); fme.msg(TL.COMMAND_HOME_ENEMYNEAR, String.valueOf(Conf.homesTeleportAllowedEnemyDistance));
return; return;
} }
} }

2
src/main/java/com/massivecraft/factions/cmd/CmdInvite.java
View File

@ -4,9 +4,7 @@ import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import mkremins.fanciful.FancyMessage; import mkremins.fanciful.FancyMessage;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
public class CmdInvite extends FCommand { public class CmdInvite extends FCommand {

5
src/main/java/com/massivecraft/factions/cmd/CmdJoin.java
View File

@ -4,7 +4,6 @@ import com.massivecraft.factions.*;
import com.massivecraft.factions.event.FPlayerJoinEvent; import com.massivecraft.factions.event.FPlayerJoinEvent;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
public class CmdJoin extends FCommand { public class CmdJoin extends FCommand {
@ -46,7 +45,7 @@ public class CmdJoin extends FCommand {
} }
if (faction == fplayer.getFaction()) { if (faction == fplayer.getFaction()) {
//TODO:TL //TODO:TL
msg(TL.COMMAND_JOIN_ALREADYMEMBER, fplayer.describeTo(fme, true), (samePlayer ? "are" : "is"), faction.getTag(fme)); msg(TL.COMMAND_JOIN_ALREADYMEMBER, fplayer.describeTo(fme, true), (samePlayer ? "are" : "is"), faction.getTag(fme));
return; return;
} }
@ -57,7 +56,7 @@ public class CmdJoin extends FCommand {
} }
if (fplayer.hasFaction()) { if (fplayer.hasFaction()) {
//TODO:TL //TODO:TL
msg(TL.COMMAND_JOIN_INOTHERFACTION, fplayer.describeTo(fme, true), (samePlayer ? "your" : "their")); msg(TL.COMMAND_JOIN_INOTHERFACTION, fplayer.describeTo(fme, true), (samePlayer ? "your" : "their"));
return; return;
} }

2
src/main/java/com/massivecraft/factions/cmd/CmdKick.java
View File

@ -106,7 +106,7 @@ public class CmdKick extends FCommand {
} }
if (Conf.logFactionKick) { if (Conf.logFactionKick) {
//TODO:TL //TODO:TL
P.p.log((senderIsConsole ? "A console command" : fme.getName()) + " kicked " + toKick.getName() + " from the faction: " + toKickFaction.getTag()); P.p.log((senderIsConsole ? "A console command" : fme.getName()) + " kicked " + toKick.getName() + " from the faction: " + toKickFaction.getTag());
} }

4
src/main/java/com/massivecraft/factions/cmd/CmdList.java
View File

@ -5,9 +5,7 @@ import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions; import com.massivecraft.factions.Factions;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import mkremins.fanciful.FancyMessage; import mkremins.fanciful.FancyMessage;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import java.util.ArrayList; import java.util.ArrayList;
@ -37,7 +35,7 @@ public class CmdList extends FCommand {
@Override @Override
public void perform() { public void perform() {
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
if (!payForCommand(Conf.econCostList, TL.COMMAND_LIST_TOLIST.toString() , TL.COMMAND_LIST_FORLIST.toString())) { if (!payForCommand(Conf.econCostList, TL.COMMAND_LIST_TOLIST.toString(), TL.COMMAND_LIST_FORLIST.toString())) {
return; return;
} }

2
src/main/java/com/massivecraft/factions/cmd/CmdLock.java
View File

@ -31,7 +31,7 @@ public class CmdLock extends FCommand {
@Override @Override
public void perform() { public void perform() {
p.setLocked(this.argAsBool(0, !p.getLocked())); p.setLocked(this.argAsBool(0, !p.getLocked()));
msg(p.getLocked()?TL.COMMAND_LOCK_LOCKED:TL.COMMAND_LOCK_UNLOCKED); msg(p.getLocked() ? TL.COMMAND_LOCK_LOCKED : TL.COMMAND_LOCK_UNLOCKED);
} }
} }

2
src/main/java/com/massivecraft/factions/cmd/CmdMap.java
View File

@ -56,7 +56,7 @@ public class CmdMap extends FCommand {
} }
} }
public void showMap() { public void showMap() {
sendMessage(Board.getInstance().getMap(myFaction, new FLocation(fme), fme.getPlayer().getLocation().getYaw())); sendMessage(Board.getInstance().getMap(myFaction, new FLocation(fme), fme.getPlayer().getLocation().getYaw()));
} }

2
src/main/java/com/massivecraft/factions/cmd/CmdMod.java
View File

@ -5,9 +5,7 @@ import com.massivecraft.factions.Faction;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import mkremins.fanciful.FancyMessage; import mkremins.fanciful.FancyMessage;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
public class CmdMod extends FCommand { public class CmdMod extends FCommand {

1
src/main/java/com/massivecraft/factions/cmd/CmdMoneyDeposit.java
View File

@ -6,7 +6,6 @@ import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;

1
src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFf.java
View File

@ -6,7 +6,6 @@ import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;

1
src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFp.java
View File

@ -6,7 +6,6 @@ import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;

1
src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferPf.java
View File

@ -6,7 +6,6 @@ import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;

1
src/main/java/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java
View File

@ -6,7 +6,6 @@ import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;

4
src/main/java/com/massivecraft/factions/cmd/CmdOwner.java
View File

@ -57,7 +57,7 @@ public class CmdOwner extends FCommand {
return; return;
} }
if (!hasBypass) { if (!hasBypass) {
fme.msg(TL.COMMAND_OWNER_WRONGFACTION); fme.msg(TL.COMMAND_OWNER_WRONGFACTION);
return; return;
} }
@ -90,7 +90,7 @@ public class CmdOwner extends FCommand {
} }
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
if (!payForCommand(Conf.econCostOwner, TL.COMMAND_OWNER_TOSET , TL.COMMAND_OWNER_FORSET)) { if (!payForCommand(Conf.econCostOwner, TL.COMMAND_OWNER_TOSET, TL.COMMAND_OWNER_FORSET)) {
return; return;
} }

2
src/main/java/com/massivecraft/factions/cmd/CmdPower.java
View File

@ -36,7 +36,7 @@ public class CmdPower extends FCommand {
} }
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
if (!payForCommand(Conf.econCostPower, TL.COMMAND_POWER_TOSHOW , TL.COMMAND_POWER_FORSHOW)) { if (!payForCommand(Conf.econCostPower, TL.COMMAND_POWER_TOSHOW, TL.COMMAND_POWER_FORSHOW)) {
return; return;
} }

4
src/main/java/com/massivecraft/factions/cmd/CmdPowerBoost.java
View File

@ -61,9 +61,9 @@ public class CmdPowerBoost extends FCommand {
target = TL.COMMAND_POWERBOOST_FACTION.format(targetFaction.getTag()); target = TL.COMMAND_POWERBOOST_FACTION.format(targetFaction.getTag());
} }
msg(TL.COMMAND_POWERBOOST_BOOST,target,targetPower); msg(TL.COMMAND_POWERBOOST_BOOST, target, targetPower);
if (!senderIsConsole) { if (!senderIsConsole) {
P.p.log(TL.COMMAND_POWERBOOST_BOOSTLOG.toString(),fme.getName(),target,targetPower); P.p.log(TL.COMMAND_POWERBOOST_BOOSTLOG.toString(), fme.getName(), target, targetPower);
} }
} }
} }

2
src/main/java/com/massivecraft/factions/cmd/CmdSetFWarp.java
View File

@ -44,6 +44,6 @@ public class CmdSetFWarp extends FCommand {
} }
private boolean transact(FPlayer player) { private boolean transact(FPlayer player) {
return !P.p.getConfig().getBoolean("warp-cost.enabled", false) || player.isAdminBypassing() || payForCommand(P.p.getConfig().getDouble("warp-cost.setwarp", 5), TL.COMMAND_SETFWARP_TOSET.toString() , TL.COMMAND_SETFWARP_FORSET.toString()); return !P.p.getConfig().getBoolean("warp-cost.enabled", false) || player.isAdminBypassing() || payForCommand(P.p.getConfig().getDouble("warp-cost.setwarp", 5), TL.COMMAND_SETFWARP_TOSET.toString(), TL.COMMAND_SETFWARP_FORSET.toString());
} }
} }

2
src/main/java/com/massivecraft/factions/cmd/CmdSethome.java
View File

@ -66,7 +66,7 @@ public class CmdSethome extends FCommand {
faction.msg(TL.COMMAND_SETHOME_SET, fme.describeTo(myFaction, true)); faction.msg(TL.COMMAND_SETHOME_SET, fme.describeTo(myFaction, true));
faction.sendMessage(p.cmdBase.cmdHome.getUseageTemplate()); faction.sendMessage(p.cmdBase.cmdHome.getUseageTemplate());
if (faction != myFaction) { if (faction != myFaction) {
fme.msg(TL.COMMAND_SETHOME_SETOTHER,faction.getTag(fme)); fme.msg(TL.COMMAND_SETHOME_SETOTHER, faction.getTag(fme));
} }
} }

2
src/main/java/com/massivecraft/factions/cmd/CmdShowInvites.java
View File

@ -4,9 +4,7 @@ import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayers; import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import mkremins.fanciful.FancyMessage; import mkremins.fanciful.FancyMessage;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
public class CmdShowInvites extends FCommand { public class CmdShowInvites extends FCommand {

1
src/main/java/com/massivecraft/factions/cmd/CmdStatus.java
View File

@ -3,7 +3,6 @@ package com.massivecraft.factions.cmd;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.apache.commons.lang.time.DurationFormatUtils; import org.apache.commons.lang.time.DurationFormatUtils;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;

3
src/main/java/com/massivecraft/factions/cmd/CmdTag.java
View File

@ -6,7 +6,6 @@ import com.massivecraft.factions.scoreboards.FTeamWrapper;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.util.MiscUtil; import com.massivecraft.factions.util.MiscUtil;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import java.util.ArrayList; import java.util.ArrayList;
@ -57,7 +56,7 @@ public class CmdTag extends FCommand {
} }
// then make 'em pay (if applicable) // then make 'em pay (if applicable)
if (!payForCommand(Conf.econCostTag, TL.COMMAND_TAG_TOCHANGE,TL.COMMAND_TAG_FORCHANGE)) { if (!payForCommand(Conf.econCostTag, TL.COMMAND_TAG_TOCHANGE, TL.COMMAND_TAG_FORCHANGE)) {
return; return;
} }

9
src/main/java/com/massivecraft/factions/cmd/CmdUnclaim.java
View File

@ -6,7 +6,6 @@ import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
public class CmdUnclaim extends FCommand { public class CmdUnclaim extends FCommand {
@ -38,7 +37,7 @@ public class CmdUnclaim extends FCommand {
msg(TL.COMMAND_UNCLAIM_SAFEZONE_SUCCESS); msg(TL.COMMAND_UNCLAIM_SAFEZONE_SUCCESS);
if (Conf.logLandUnclaims) { if (Conf.logLandUnclaims) {
P.p.log(TL.COMMAND_UNCLAIM_LOG.format(fme.getName(),flocation.getCoordString(),otherFaction.getTag())); P.p.log(TL.COMMAND_UNCLAIM_LOG.format(fme.getName(), flocation.getCoordString(), otherFaction.getTag()));
} }
} else { } else {
msg(TL.COMMAND_UNCLAIM_SAFEZONE_NOPERM); msg(TL.COMMAND_UNCLAIM_SAFEZONE_NOPERM);
@ -50,7 +49,7 @@ public class CmdUnclaim extends FCommand {
msg(TL.COMMAND_UNCLAIM_WARZONE_SUCCESS); msg(TL.COMMAND_UNCLAIM_WARZONE_SUCCESS);
if (Conf.logLandUnclaims) { if (Conf.logLandUnclaims) {
P.p.log(TL.COMMAND_UNCLAIM_LOG.format(fme.getName(),flocation.getCoordString(),otherFaction.getTag())); P.p.log(TL.COMMAND_UNCLAIM_LOG.format(fme.getName(), flocation.getCoordString(), otherFaction.getTag()));
} }
} else { } else {
msg(TL.COMMAND_UNCLAIM_WARZONE_NOPERM); msg(TL.COMMAND_UNCLAIM_WARZONE_NOPERM);
@ -65,7 +64,7 @@ public class CmdUnclaim extends FCommand {
msg(TL.COMMAND_UNCLAIM_UNCLAIMS); msg(TL.COMMAND_UNCLAIM_UNCLAIMS);
if (Conf.logLandUnclaims) { if (Conf.logLandUnclaims) {
P.p.log(TL.COMMAND_UNCLAIM_LOG.format(fme.getName(),flocation.getCoordString(),otherFaction.getTag())); P.p.log(TL.COMMAND_UNCLAIM_LOG.format(fme.getName(), flocation.getCoordString(), otherFaction.getTag()));
} }
return; return;
@ -109,7 +108,7 @@ public class CmdUnclaim extends FCommand {
myFaction.msg(TL.COMMAND_UNCLAIM_FACTIONUNCLAIMED, fme.describeTo(myFaction, true)); myFaction.msg(TL.COMMAND_UNCLAIM_FACTIONUNCLAIMED, fme.describeTo(myFaction, true));
if (Conf.logLandUnclaims) { if (Conf.logLandUnclaims) {
P.p.log(TL.COMMAND_UNCLAIM_LOG.format(fme.getName(),flocation.getCoordString(),otherFaction.getTag())); P.p.log(TL.COMMAND_UNCLAIM_LOG.format(fme.getName(), flocation.getCoordString(), otherFaction.getTag()));
} }
} }

3
src/main/java/com/massivecraft/factions/cmd/CmdUnclaimall.java
View File

@ -7,7 +7,6 @@ import com.massivecraft.factions.event.LandUnclaimAllEvent;
import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
public class CmdUnclaimall extends FCommand { public class CmdUnclaimall extends FCommand {
@ -51,7 +50,7 @@ public class CmdUnclaimall extends FCommand {
myFaction.msg(TL.COMMAND_UNCLAIMALL_UNCLAIMED, fme.describeTo(myFaction, true)); myFaction.msg(TL.COMMAND_UNCLAIMALL_UNCLAIMED, fme.describeTo(myFaction, true));
if (Conf.logLandUnclaims) { if (Conf.logLandUnclaims) {
P.p.log(TL.COMMAND_UNCLAIMALL_LOG.format(fme.getName(),myFaction.getTag())); P.p.log(TL.COMMAND_UNCLAIMALL_LOG.format(fme.getName(), myFaction.getTag()));
} }
} }

8
src/main/java/com/massivecraft/factions/cmd/CmdVersion.java
View File

@ -24,9 +24,9 @@ public class CmdVersion extends FCommand {
@Override @Override
public void perform() { public void perform() {
msg(TL.COMMAND_VERSION_VERSION,P.p.getDescription().getFullName()); msg(TL.COMMAND_VERSION_VERSION, P.p.getDescription().getFullName());
msg(TL.GENERIC_TRANSLATION_VERSION,TL._LOCALE,TL._LOCAL_LANGUAGE,TL._LOCAL_REGION,TL._LOCAL_STATE); msg(TL.GENERIC_TRANSLATION_VERSION, TL._LOCALE, TL._LOCAL_LANGUAGE, TL._LOCAL_REGION, TL._LOCAL_STATE);
msg(TL.GENERIC_TRANSLATION_CONTRIBUTORS,TL._LOCAL_AUTHOR); msg(TL.GENERIC_TRANSLATION_CONTRIBUTORS, TL._LOCAL_AUTHOR);
msg(TL.GENERIC_TRANSLATION_RESPONSIBLE,TL._LOCAL_RESPONSIBLE); msg(TL.GENERIC_TRANSLATION_RESPONSIBLE, TL._LOCAL_RESPONSIBLE);
} }
} }

5
src/main/java/com/massivecraft/factions/cmd/FCommand.java
View File

@ -5,7 +5,6 @@ import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.MCommand; import com.massivecraft.factions.zcore.MCommand;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@ -277,8 +276,8 @@ public abstract class FCommand extends MCommand<P> {
} }
} }
public boolean payForCommand(double cost,TL toDoThis,TL forDoingThis){ public boolean payForCommand(double cost, TL toDoThis, TL forDoingThis) {
return payForCommand(cost,toDoThis.toString(),forDoingThis.toString()); return payForCommand(cost, toDoThis.toString(), forDoingThis.toString());
} }
// like above, but just make sure they can pay; returns true unless person can't afford the cost // like above, but just make sure they can pay; returns true unless person can't afford the cost

13
src/main/java/com/massivecraft/factions/cmd/FRelationCommand.java
View File

@ -7,7 +7,6 @@ import com.massivecraft.factions.scoreboards.FTeamWrapper;
import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Relation; import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
@ -52,7 +51,7 @@ public abstract class FRelationCommand extends FCommand {
} }
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
if (!payForCommand(targetRelation.getRelationCost(),TL.COMMAND_RELATIONS_TOMARRY , TL.COMMAND_RELATIONS_FORMARRY)) { if (!payForCommand(targetRelation.getRelationCost(), TL.COMMAND_RELATIONS_TOMARRY, TL.COMMAND_RELATIONS_FORMARRY)) {
return; return;
} }
@ -68,15 +67,15 @@ public abstract class FRelationCommand extends FCommand {
FactionRelationEvent relationEvent = new FactionRelationEvent(myFaction, them, oldRelation, currentRelation); FactionRelationEvent relationEvent = new FactionRelationEvent(myFaction, them, oldRelation, currentRelation);
Bukkit.getServer().getPluginManager().callEvent(relationEvent); Bukkit.getServer().getPluginManager().callEvent(relationEvent);
them.msg(TL.COMMAND_RELATIONS_MUTUAL, currentRelationColor + targetRelation.getTranslation() ,currentRelationColor + myFaction.getTag()); them.msg(TL.COMMAND_RELATIONS_MUTUAL, currentRelationColor + targetRelation.getTranslation(), currentRelationColor + myFaction.getTag());
myFaction.msg(TL.COMMAND_RELATIONS_MUTUAL, currentRelationColor + targetRelation.getTranslation() ,currentRelationColor + myFaction.getTag()); myFaction.msg(TL.COMMAND_RELATIONS_MUTUAL, currentRelationColor + targetRelation.getTranslation(), currentRelationColor + myFaction.getTag());
} }
// inform the other faction of your request // inform the other faction of your request
else { else {
them.msg(TL.COMMAND_RELATIONS_PROPOSAL_1,currentRelationColor + myFaction.getTag(),targetRelation.getColor() + targetRelation.getTranslation()); them.msg(TL.COMMAND_RELATIONS_PROPOSAL_1, currentRelationColor + myFaction.getTag(), targetRelation.getColor() + targetRelation.getTranslation());
them.msg(TL.COMMAND_RELATIONS_PROPOSAL_2,Conf.baseCommandAliases.get(0),targetRelation,myFaction.getTag()); them.msg(TL.COMMAND_RELATIONS_PROPOSAL_2, Conf.baseCommandAliases.get(0), targetRelation, myFaction.getTag());
myFaction.msg(TL.COMMAND_RELATIONS_PROPOSAL_SENT,currentRelationColor + them.getTag(),"" + targetRelation.getColor() + targetRelation); myFaction.msg(TL.COMMAND_RELATIONS_PROPOSAL_SENT, currentRelationColor + them.getTag(), "" + targetRelation.getColor() + targetRelation);
} }
if (!targetRelation.isNeutral() && them.isPeaceful()) { if (!targetRelation.isNeutral() && them.isPeaceful()) {

2
src/main/java/com/massivecraft/factions/iface/EconomyParticipator.java
View File

@ -8,5 +8,5 @@ public interface EconomyParticipator extends RelationParticipator {
public void msg(String str, Object... args); public void msg(String str, Object... args);
public void msg(TL translation,Object... args); public void msg(TL translation, Object... args);
} }

6
src/main/java/com/massivecraft/factions/zcore/MCommand.java
View File

@ -6,9 +6,7 @@ import com.massivecraft.factions.P;
import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import com.massivecraft.factions.zcore.util.TextUtil; import com.massivecraft.factions.zcore.util.TextUtil;
import mkremins.fanciful.FancyMessage; import mkremins.fanciful.FancyMessage;
import org.apache.commons.lang.time.DurationFormatUtils; import org.apache.commons.lang.time.DurationFormatUtils;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
@ -257,8 +255,8 @@ public abstract class MCommand<T extends MPlugin> {
sender.sendMessage(p.txt.parse(str, args)); sender.sendMessage(p.txt.parse(str, args));
} }
public void msg(TL translation,Object... args){ public void msg(TL translation, Object... args) {
sender.sendMessage(p.txt.parse(translation.toString(),args)); sender.sendMessage(p.txt.parse(translation.toString(), args));
} }
public void sendMessage(String msg) { public void sendMessage(String msg) {

5
src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java
View File

@ -16,7 +16,6 @@ import com.massivecraft.factions.struct.Relation;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.util.RelationUtil; import com.massivecraft.factions.util.RelationUtil;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;
@ -767,8 +766,8 @@ public abstract class MemoryFPlayer implements FPlayer {
this.sendMessage(P.p.txt.parse(str, args)); this.sendMessage(P.p.txt.parse(str, args));
} }
public void msg(TL translation,Object... args){ public void msg(TL translation, Object... args) {
this.msg(translation.toString(), args); this.msg(translation.toString(), args);
} }
public Player getPlayer() { public Player getPlayer() {

5
src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java
View File

@ -11,7 +11,6 @@ import com.massivecraft.factions.util.LazyLocation;
import com.massivecraft.factions.util.MiscUtil; import com.massivecraft.factions.util.MiscUtil;
import com.massivecraft.factions.util.RelationUtil; import com.massivecraft.factions.util.RelationUtil;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;
@ -604,8 +603,8 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator {
} }
} }
public void msg(TL translation, Object... args){ public void msg(TL translation, Object... args) {
msg(translation.toString(),args); msg(translation.toString(), args);
} }
public void sendMessage(String message) { public void sendMessage(String message) {

577
src/main/java/com/massivecraft/factions/zcore/util/TL.java
View File

@ -20,146 +20,146 @@ import org.bukkit.ChatColor;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
/** /**
* An enum for requesting strings from the language file. * An enum for requesting strings from the language file. The contents of this enum file may be subject to frequent
* The contents of this enum file may be subject to frequent changes. * changes.
*/ */
public enum TL { public enum TL {
/** /**
* Translation meta * Translation meta
*/ */
_AUTHOR("misc"), _AUTHOR("misc"),
_RESPONSIBLE("misc"), _RESPONSIBLE("misc"),
_LANGUAGE("English"), _LANGUAGE("English"),
_ENCODING("UTF-8"), _ENCODING("UTF-8"),
_LOCALE("en_US"), _LOCALE("en_US"),
_REQUIRESUNICODE("false"), _REQUIRESUNICODE("false"),
_DEFAULT("true"), _DEFAULT("true"),
_STATE("complete"), //incomplete, limited, partial, majority, complete _STATE("complete"), //incomplete, limited, partial, majority, complete
/** /**
* Localised translation meta * Localised translation meta
*/ */
_LOCAL_AUTHOR("misc"), _LOCAL_AUTHOR("misc"),
_LOCAL_RESPONSIBLE("misc"), _LOCAL_RESPONSIBLE("misc"),
_LOCAL_LANGUAGE("English"), _LOCAL_LANGUAGE("English"),
_LOCAL_REGION("US"), _LOCAL_REGION("US"),
_LOCAL_STATE("complete"), //And this is the English version. It's not ever going to be not complete. _LOCAL_STATE("complete"), //And this is the English version. It's not ever going to be not complete.
/** /**
* Command translations * Command translations
*/ */
COMMAND_ADMIN_NOTMEMBER("%s<i> is not a member in your faction."), COMMAND_ADMIN_NOTMEMBER("%s<i> is not a member in your faction."),
COMMAND_ADMIN_NOTADMIN("<b>You are not the faction admin."), COMMAND_ADMIN_NOTADMIN("<b>You are not the faction admin."),
COMMAND_ADMIN_TARGETSELF("<b>The target player musn't be yourself."), COMMAND_ADMIN_TARGETSELF("<b>The target player musn't be yourself."),
COMMAND_ADMIN_DEMOTES("<i>You have demoted %s<i> from the position of faction admin."), COMMAND_ADMIN_DEMOTES("<i>You have demoted %s<i> from the position of faction admin."),
COMMAND_ADMIN_DEMOTED("<i>You have been demoted from the position of faction admin by %s<i>."), COMMAND_ADMIN_DEMOTED("<i>You have been demoted from the position of faction admin by %s<i>."),
COMMAND_ADMIN_PROMOTES("<i>You have promoted %s<i> to the position of faction admin."), COMMAND_ADMIN_PROMOTES("<i>You have promoted %s<i> to the position of faction admin."),
COMMAND_ADMIN_PROMOTED("%s<i> gave %s<i> the leadership of %s<i>."), COMMAND_ADMIN_PROMOTED("%s<i> gave %s<i> the leadership of %s<i>."),
COMMAND_AUTOCLAIM_ENABLED("<i>Now auto-claiming land for <h>%s<i>."), COMMAND_AUTOCLAIM_ENABLED("<i>Now auto-claiming land for <h>%s<i>."),
COMMAND_AUTOCLAIM_DISABLED("<i>Auto-claiming of land disabled."), COMMAND_AUTOCLAIM_DISABLED("<i>Auto-claiming of land disabled."),
COMMAND_AUTOCLAIM_REQUIREDRANK("<b>You must be <h>%s<b> to claim land."), COMMAND_AUTOCLAIM_REQUIREDRANK("<b>You must be <h>%s<b> to claim land."),
COMMAND_AUTOCLAIM_OTHERFACTION("<b>You can't claim land for <h>%s<b>."), COMMAND_AUTOCLAIM_OTHERFACTION("<b>You can't claim land for <h>%s<b>."),
COMMAND_AUTOHELP_HELPFOR("Help for command \""), COMMAND_AUTOHELP_HELPFOR("Help for command \""),
COMMAND_BOOM_PEACEFULONLY("<b>This command is only usable by factions which are specifically designated as peaceful."), COMMAND_BOOM_PEACEFULONLY("<b>This command is only usable by factions which are specifically designated as peaceful."),
COMMAND_BOOM_TOTOGGLE("to toggle explosions"), COMMAND_BOOM_TOTOGGLE("to toggle explosions"),
COMMAND_BOOM_FORTOGGLE("for toggling explosions"), COMMAND_BOOM_FORTOGGLE("for toggling explosions"),
COMMAND_BOOM_ENABLED("%s<i> has %s explosions in your faction's territory."), COMMAND_BOOM_ENABLED("%s<i> has %s explosions in your faction's territory."),
COMMAND_BYPASS_ENABLE("<i>You have enabled admin bypass mode. You will be able to build or destroy anywhere."), COMMAND_BYPASS_ENABLE("<i>You have enabled admin bypass mode. You will be able to build or destroy anywhere."),
COMMAND_BYPASS_ENABLELOG(" has ENABLED admin bypass mode."), COMMAND_BYPASS_ENABLELOG(" has ENABLED admin bypass mode."),
COMMAND_BYPASS_DISABLE("<i>You have disabled admin bypass mode."), COMMAND_BYPASS_DISABLE("<i>You have disabled admin bypass mode."),
COMMAND_BYPASS_DISABLELOG(" has DISABLED admin bypass mode."), COMMAND_BYPASS_DISABLELOG(" has DISABLED admin bypass mode."),
COMMAND_CHAT_DISABLED("<b>The built in chat chat channels are disabled on this server."), COMMAND_CHAT_DISABLED("<b>The built in chat chat channels are disabled on this server."),
COMMAND_CHAT_INVALIDMODE("<b>Unrecognised chat mode. <i>Please enter either 'a','f' or 'p'"), COMMAND_CHAT_INVALIDMODE("<b>Unrecognised chat mode. <i>Please enter either 'a','f' or 'p'"),
COMMAND_CHAT_MODE_PUBLIC("<i>Public chat mode."), COMMAND_CHAT_MODE_PUBLIC("<i>Public chat mode."),
COMMAND_CHAT_MODE_ALLIANCE("<i>Alliance only chat mode."), COMMAND_CHAT_MODE_ALLIANCE("<i>Alliance only chat mode."),
COMMAND_CHAT_MODE_FACTION("<i>Faction only chat mode."), COMMAND_CHAT_MODE_FACTION("<i>Faction only chat mode."),
COMMAND_CHATSPY_ENABLE("<i>You have enabled chat spying mode."), COMMAND_CHATSPY_ENABLE("<i>You have enabled chat spying mode."),
COMMAND_CHATSPY_ENABLELOG(" has ENABLED chat spying mode."), COMMAND_CHATSPY_ENABLELOG(" has ENABLED chat spying mode."),
COMMAND_CHATSPY_DISABLE("<i>You have disabled chat spying mode."), COMMAND_CHATSPY_DISABLE("<i>You have disabled chat spying mode."),
COMMAND_CHATSPY_DISABLELOG(" has DISABLED chat spying mode."), COMMAND_CHATSPY_DISABLELOG(" has DISABLED chat spying mode."),
COMMAND_CLAIM_INVALIDRADIUS("<b>If you specify a radius, it must be at least 1."), COMMAND_CLAIM_INVALIDRADIUS("<b>If you specify a radius, it must be at least 1."),
COMMAND_CLAIM_DENIED("<b>You do not have permission to claim in a radius."), COMMAND_CLAIM_DENIED("<b>You do not have permission to claim in a radius."),
COMMAND_CONFIG_NOEXIST("<b>No configuration setting \"<h>%s<b>\" exists."), COMMAND_CONFIG_NOEXIST("<b>No configuration setting \"<h>%s<b>\" exists."),
COMMAND_CONFIG_SET_TRUE("\" option set to true (enabled)."), COMMAND_CONFIG_SET_TRUE("\" option set to true (enabled)."),
COMMAND_CONFIG_SET_FALSE("\" option set to false (disabled)."), COMMAND_CONFIG_SET_FALSE("\" option set to false (disabled)."),
COMMAND_CONFIG_OPTIONSET("\" option set to "), COMMAND_CONFIG_OPTIONSET("\" option set to "),
COMMAND_CONFIG_COLOURSET("\" color option set to \""), COMMAND_CONFIG_COLOURSET("\" color option set to \""),
COMMAND_CONFIG_INTREQUIRED("Cannot set \"%s\": An integer (whole number) value required."), COMMAND_CONFIG_INTREQUIRED("Cannot set \"%s\": An integer (whole number) value required."),
COMMAND_CONFIG_LONGREQUIRED("Cannot set \"%s\": A long integer (whole number) value required."), COMMAND_CONFIG_LONGREQUIRED("Cannot set \"%s\": A long integer (whole number) value required."),
COMMAND_CONFIG_DOUBLEREQUIRED("Cannot set \"%s\": A double (numeric) value required."), COMMAND_CONFIG_DOUBLEREQUIRED("Cannot set \"%s\": A double (numeric) value required."),
COMMAND_CONFIG_FLOATREQUIRED("Cannot set \"%s\": A float (numeric) value required."), COMMAND_CONFIG_FLOATREQUIRED("Cannot set \"%s\": A float (numeric) value required."),
COMMAND_CONFIG_INVALID_COLOUR("Cannot set \"%s\": \"%s\" is not a valid color."), COMMAND_CONFIG_INVALID_COLOUR("Cannot set \"%s\": \"%s\" is not a valid color."),
COMMAND_CONFIG_INVALID_COLLECTION("\"%s\" is not a data collection type which can be modified with this command."), COMMAND_CONFIG_INVALID_COLLECTION("\"%s\" is not a data collection type which can be modified with this command."),
COMMAND_CONFIG_INVALID_MATERIAL("Cannot change \"%s\" set: \"%s\" is not a valid material."), COMMAND_CONFIG_INVALID_MATERIAL("Cannot change \"%s\" set: \"%s\" is not a valid material."),
COMMAND_CONFIG_INVALID_TYPESET("\"%s\" is not a data type set which can be modified with this command."), COMMAND_CONFIG_INVALID_TYPESET("\"%s\" is not a data type set which can be modified with this command."),
COMMAND_CONFIG_MATERIAL_ADDED("\"%s\" set: Material \"%s\" added."), COMMAND_CONFIG_MATERIAL_ADDED("\"%s\" set: Material \"%s\" added."),
COMMAND_CONFIG_MATERIAL_REMOVED("\"%s\" set: Material \"%s\" removed."), COMMAND_CONFIG_MATERIAL_REMOVED("\"%s\" set: Material \"%s\" removed."),
COMMAND_CONFIG_SET_ADDED("\"%s\" set: \"%s\" added."), COMMAND_CONFIG_SET_ADDED("\"%s\" set: \"%s\" added."),
COMMAND_CONFIG_SET_REMOVED("\"%s\" set: \"%s\" removed."), COMMAND_CONFIG_SET_REMOVED("\"%s\" set: \"%s\" removed."),
COMMAND_CONFIG_LOG(" (Command was run by %s.)"), COMMAND_CONFIG_LOG(" (Command was run by %s.)"),
COMMAND_CONFIG_ERROR_SETTING("Error setting configuration setting \"%s\" to \"%s\"."), COMMAND_CONFIG_ERROR_SETTING("Error setting configuration setting \"%s\" to \"%s\"."),
COMMAND_CONFIG_ERROR_MATCHING("Configuration setting \"%s\" couldn't be matched, though it should be... please report this error."), COMMAND_CONFIG_ERROR_MATCHING("Configuration setting \"%s\" couldn't be matched, though it should be... please report this error."),
COMMAND_CONFIG_ERROR_TYPE("'%s' is of type '%s', which cannot be modified with this command."), COMMAND_CONFIG_ERROR_TYPE("'%s' is of type '%s', which cannot be modified with this command."),
COMMAND_CONVERT_BACKEND_RUNNING("command.convert.backend.running","Already running that backend."), COMMAND_CONVERT_BACKEND_RUNNING("command.convert.backend.running", "Already running that backend."),
COMMAND_CONVERT_BACKEND_INVALID("command.convert.backend.invalid","Invalid backend"), COMMAND_CONVERT_BACKEND_INVALID("command.convert.backend.invalid", "Invalid backend"),
COMMAND_CREATE_MUSTLEAVE("<b>You must leave your current faction first."), COMMAND_CREATE_MUSTLEAVE("<b>You must leave your current faction first."),
COMMAND_CREATE_INUSE("<b>That tag is already in use."), COMMAND_CREATE_INUSE("<b>That tag is already in use."),
COMMAND_CREATE_TOCREATE("to create a new faction"), COMMAND_CREATE_TOCREATE("to create a new faction"),
COMMAND_CREATE_FORCREATE("for creating a new faction"), COMMAND_CREATE_FORCREATE("for creating a new faction"),
COMMAND_CREATE_ERROR("<b>There was an internal error while trying to create your faction. Please try again."), COMMAND_CREATE_ERROR("<b>There was an internal error while trying to create your faction. Please try again."),
COMMAND_CREATE_CREATED("%s<i> created a new faction %s"), COMMAND_CREATE_CREATED("%s<i> created a new faction %s"),
COMMAND_CREATE_YOUSHOULD("<i>You should now: %s"), COMMAND_CREATE_YOUSHOULD("<i>You should now: %s"),
COMMAND_CREATE_CREATED_LOG(" created a new faction: "), COMMAND_CREATE_CREATED_LOG(" created a new faction: "),
COMMAND_DEINVITE_CANDEINVITE("Players you can deinvite: "), COMMAND_DEINVITE_CANDEINVITE("Players you can deinvite: "),
COMMAND_DEINVITE_CLICKTODEINVITE("Click to revoke invite for %s"), COMMAND_DEINVITE_CLICKTODEINVITE("Click to revoke invite for %s"),
COMMAND_DEINVITE_ALREADYMEMBER("%s<i> is already a member of %s"), COMMAND_DEINVITE_ALREADYMEMBER("%s<i> is already a member of %s"),
COMMAND_DEINVITE_MIGHTWANT("<i>You might want to: %s"), COMMAND_DEINVITE_MIGHTWANT("<i>You might want to: %s"),
COMMAND_DEINVITE_REVOKED("%s<i> revoked your invitation to <h>%s<i>."), COMMAND_DEINVITE_REVOKED("%s<i> revoked your invitation to <h>%s<i>."),
COMMAND_DEINVITE_REVOKES("%s<i> revoked %s's<i> invitation."), COMMAND_DEINVITE_REVOKES("%s<i> revoked %s's<i> invitation."),
COMMAND_DELFWARP_DELETED("<i>Deleted warp <a>%s"), COMMAND_DELFWARP_DELETED("<i>Deleted warp <a>%s"),
COMMAND_DELFWARP_INVALID("<i>Couldn't find warp <a>%s"), COMMAND_DELFWARP_INVALID("<i>Couldn't find warp <a>%s"),
COMMAND_DELFWARP_TODELETE("to delete warp"), COMMAND_DELFWARP_TODELETE("to delete warp"),
COMMAND_DELFWARP_FORDELETE("for deleting warp"), COMMAND_DELFWARP_FORDELETE("for deleting warp"),
COMMAND_DESCRIPTION_CHANGES("You have changed the description for <h>%s<i> to:"), COMMAND_DESCRIPTION_CHANGES("You have changed the description for <h>%s<i> to:"),
COMMAND_DESCRIPTION_CHANGED("<i>The faction %s<i> changed their description to:"), COMMAND_DESCRIPTION_CHANGED("<i>The faction %s<i> changed their description to:"),
COMMAND_DESCRIPTION_TOCHANGE("to change faction description"), COMMAND_DESCRIPTION_TOCHANGE("to change faction description"),
COMMAND_DESCRIPTION_FORCHANGE("for changing faction description"), COMMAND_DESCRIPTION_FORCHANGE("for changing faction description"),
COMMAND_DISBAND_IMMUTABLE("<i>You cannot disband the Wilderness, SafeZone, or WarZone."), COMMAND_DISBAND_IMMUTABLE("<i>You cannot disband the Wilderness, SafeZone, or WarZone."),
COMMAND_DISBAND_MARKEDPERMANENT("<i>This faction is designated as permanent, so you cannot disband it."), COMMAND_DISBAND_MARKEDPERMANENT("<i>This faction is designated as permanent, so you cannot disband it."),
COMMAND_DISBAND_BROADCAST_YOURS("<h>%s<i> disbanded your faction."), COMMAND_DISBAND_BROADCAST_YOURS("<h>%s<i> disbanded your faction."),
COMMAND_DISBAND_BROADCAST_NOTYOURS("<h>%s<i> disbanded the faction %s."), COMMAND_DISBAND_BROADCAST_NOTYOURS("<h>%s<i> disbanded the faction %s."),
COMMAND_DISBAND_HOLDINGS("<i>You have been given the disbanded faction's bank, totaling %s."), COMMAND_DISBAND_HOLDINGS("<i>You have been given the disbanded faction's bank, totaling %s."),
COMMAND_FWARP_CLICKTOWARP("Click to warp!"), COMMAND_FWARP_CLICKTOWARP("Click to warp!"),
COMMAND_FWARP_COMMANDFORMAT("<i>/f warp <warpname>"), COMMAND_FWARP_COMMANDFORMAT("<i>/f warp <warpname>"),
COMMAND_FWARP_WARPED("<i>Warped to <a>%s"), COMMAND_FWARP_WARPED("<i>Warped to <a>%s"),
COMMAND_FWARP_INVALID("<i>Couldn't find warp <a>%s"), COMMAND_FWARP_INVALID("<i>Couldn't find warp <a>%s"),
COMMAND_FWARP_TOWARP("to warp"), COMMAND_FWARP_TOWARP("to warp"),
COMMAND_FWARP_FORWARPING("for warping"), COMMAND_FWARP_FORWARPING("for warping"),
COMMAND_FWARP_WARPS("Warps: "), COMMAND_FWARP_WARPS("Warps: "),
COMMAND_HELP_404("<b>This page does not exist"), COMMAND_HELP_404("<b>This page does not exist"),
COMMAND_HELP_NEXTCREATE("<i>Learn how to create a faction on the next page."), COMMAND_HELP_NEXTCREATE("<i>Learn how to create a faction on the next page."),
COMMAND_HELP_INVITATIONS("command.help.invitations","<i>You might want to close it and use invitations:"), COMMAND_HELP_INVITATIONS("command.help.invitations", "<i>You might want to close it and use invitations:"),
COMMAND_HELP_HOME("<i>And don't forget to set your home:"), COMMAND_HELP_HOME("<i>And don't forget to set your home:"),
COMMAND_HELP_BANK_1("<i>Your faction has a bank which is used to pay for certain"), COMMAND_HELP_BANK_1("<i>Your faction has a bank which is used to pay for certain"),
COMMAND_HELP_BANK_2("<i>things, so it will need to have money deposited into it."), COMMAND_HELP_BANK_2("<i>things, so it will need to have money deposited into it."),
COMMAND_HELP_BANK_3("<i>To learn more, use the money command."), COMMAND_HELP_BANK_3("<i>To learn more, use the money command."),
COMMAND_HELP_PLAYERTITLES("<i>Player titles are just for fun. No rules connected to them."), COMMAND_HELP_PLAYERTITLES("<i>Player titles are just for fun. No rules connected to them."),
COMMAND_HELP_OWNERSHIP_1("<i>Claimed land with ownership set is further protected so"), COMMAND_HELP_OWNERSHIP_1("<i>Claimed land with ownership set is further protected so"),
COMMAND_HELP_OWNERSHIP_2("<i>that only the owner(s), faction admin, and possibly the"), COMMAND_HELP_OWNERSHIP_2("<i>that only the owner(s), faction admin, and possibly the"),
COMMAND_HELP_OWNERSHIP_3("<i>faction moderators have full access."), COMMAND_HELP_OWNERSHIP_3("<i>faction moderators have full access."),
@ -198,121 +198,121 @@ public enum TL {
COMMAND_HOME_INENEMY("<b>You cannot teleport to your faction home while in the territory of an enemy faction."), COMMAND_HOME_INENEMY("<b>You cannot teleport to your faction home while in the territory of an enemy faction."),
COMMAND_HOME_WRONGWORLD("<b>You cannot teleport to your faction home while in a different world."), COMMAND_HOME_WRONGWORLD("<b>You cannot teleport to your faction home while in a different world."),
COMMAND_HOME_ENEMYNEAR("<b>You cannot teleport to your faction home while an enemy is within %s blocks of you."), COMMAND_HOME_ENEMYNEAR("<b>You cannot teleport to your faction home while an enemy is within %s blocks of you."),
COMMAND_HOME_TOTELEPORT("to teleport to your faction home"), COMMAND_HOME_TOTELEPORT("to teleport to your faction home"),
COMMAND_HOME_FORTELEPORT("for teleporting to your faction home"), COMMAND_HOME_FORTELEPORT("for teleporting to your faction home"),
COMMAND_INVITE_TOINVITE("to invite someone"), COMMAND_INVITE_TOINVITE("to invite someone"),
COMMAND_INVITE_FORINVITE("for inviting someone"), COMMAND_INVITE_FORINVITE("for inviting someone"),
COMMAND_INVITE_CLICKTOJOIN("Click to join!"), COMMAND_INVITE_CLICKTOJOIN("Click to join!"),
COMMAND_INVITE_INVITEDYOU(" has invited you to join "), COMMAND_INVITE_INVITEDYOU(" has invited you to join "),
COMMAND_INVITE_INVITED("%s<i> invited %s<i> to your faction."), COMMAND_INVITE_INVITED("%s<i> invited %s<i> to your faction."),
COMMAND_INVITE_ALREADYMEMBER("%s<i> is already a member of %s"), COMMAND_INVITE_ALREADYMEMBER("%s<i> is already a member of %s"),
COMMAND_JOIN_CANNOTFORCE("<b>You do not have permission to move other players into a faction."), COMMAND_JOIN_CANNOTFORCE("<b>You do not have permission to move other players into a faction."),
COMMAND_JOIN_SYSTEMFACTION("<b>Players may only join normal factions. This is a system faction."), COMMAND_JOIN_SYSTEMFACTION("<b>Players may only join normal factions. This is a system faction."),
COMMAND_JOIN_ALREADYMEMBER("<b>%s %s already a member of %s"), COMMAND_JOIN_ALREADYMEMBER("<b>%s %s already a member of %s"),
COMMAND_JOIN_ATLIMIT(" <b>!<white> The faction %s is at the limit of %d members, so %s cannot currently join."), COMMAND_JOIN_ATLIMIT(" <b>!<white> The faction %s is at the limit of %d members, so %s cannot currently join."),
COMMAND_JOIN_INOTHERFACTION("<b>%s must leave %s current faction first."), COMMAND_JOIN_INOTHERFACTION("<b>%s must leave %s current faction first."),
COMMAND_JOIN_NEGATIVEPOWER("<b>%s cannot join a faction with a negative power level."), COMMAND_JOIN_NEGATIVEPOWER("<b>%s cannot join a faction with a negative power level."),
COMMAND_JOIN_REQUIRESINVITATION("<i>This faction requires invitation."), COMMAND_JOIN_REQUIRESINVITATION("<i>This faction requires invitation."),
COMMAND_JOIN_ATTEMPTEDJOIN("%s<i> tried to join your faction."), COMMAND_JOIN_ATTEMPTEDJOIN("%s<i> tried to join your faction."),
COMMAND_JOIN_TOJOIN("to join a faction"), COMMAND_JOIN_TOJOIN("to join a faction"),
COMMAND_JOIN_FORJOIN("for joining a faction"), COMMAND_JOIN_FORJOIN("for joining a faction"),
COMMAND_JOIN_SUCCESS("<i>%s successfully joined %s."), COMMAND_JOIN_SUCCESS("<i>%s successfully joined %s."),
COMMAND_JOIN_MOVED("<i>%s moved you into the faction %s."), COMMAND_JOIN_MOVED("<i>%s moved you into the faction %s."),
COMMAND_JOIN_JOINED("<i>%s joined your faction."), COMMAND_JOIN_JOINED("<i>%s joined your faction."),
COMMAND_JOIN_JOINEDLOG("%s joined the faction %s."), COMMAND_JOIN_JOINEDLOG("%s joined the faction %s."),
COMMAND_JOIN_MOVEDLOG("%s moved the player %s into the faction %s."), COMMAND_JOIN_MOVEDLOG("%s moved the player %s into the faction %s."),
COMMAND_KICK_CANDIDATES("Players you can kick: "), COMMAND_KICK_CANDIDATES("Players you can kick: "),
COMMAND_KICK_CLICKTOKICK("Click to kick "), COMMAND_KICK_CLICKTOKICK("Click to kick "),
COMMAND_KICK_SELF("<b>You cannot kick yourself."), COMMAND_KICK_SELF("<b>You cannot kick yourself."),
COMMAND_KICK_OFFLINE("Something went wrong with getting the offline player's faction."), COMMAND_KICK_OFFLINE("Something went wrong with getting the offline player's faction."),
COMMAND_KICK_NOTMEMBER("%s<b> is not a member of %s"), COMMAND_KICK_NOTMEMBER("%s<b> is not a member of %s"),
COMMAND_KICK_INSUFFICIENTRANK("<b>Your rank is too low to kick this player."), COMMAND_KICK_INSUFFICIENTRANK("<b>Your rank is too low to kick this player."),
COMMAND_KICK_NEGATIVEPOWER("<b>You cannot kick that member until their power is positive."), COMMAND_KICK_NEGATIVEPOWER("<b>You cannot kick that member until their power is positive."),
COMMAND_KICK_TOKICK("to kick someone from the faction"), COMMAND_KICK_TOKICK("to kick someone from the faction"),
COMMAND_KICK_FORKICK("for kicking someone from the faction"), COMMAND_KICK_FORKICK("for kicking someone from the faction"),
COMMAND_KICK_FACTION("%s<i> kicked %s<i> from the faction! :O"), //message given to faction members COMMAND_KICK_FACTION("%s<i> kicked %s<i> from the faction! :O"), //message given to faction members
COMMAND_KICK_KICKS("<i>You kicked %s<i> from the faction %s<i>!"), //kicker perspective COMMAND_KICK_KICKS("<i>You kicked %s<i> from the faction %s<i>!"), //kicker perspective
COMMAND_KICK_KICKED("%s<i> kicked you from %s<i>! :O"), //kicked player perspective COMMAND_KICK_KICKED("%s<i> kicked you from %s<i>! :O"), //kicked player perspective
COMMAND_LIST_FACTIONLIST("Faction List "), COMMAND_LIST_FACTIONLIST("Faction List "),
COMMAND_LIST_TOLIST("to list the factions"), COMMAND_LIST_TOLIST("to list the factions"),
COMMAND_LIST_FORLIST("for listing the factions"), COMMAND_LIST_FORLIST("for listing the factions"),
COMMAND_LIST_ONLINEFACTIONLESS("Online factionless: "), COMMAND_LIST_ONLINEFACTIONLESS("Online factionless: "),
COMMAND_LOCK_LOCKED("<i>Factions is now locked"), COMMAND_LOCK_LOCKED("<i>Factions is now locked"),
COMMAND_LOCK_UNLOCKED("<i>Factions in now unlocked"), COMMAND_LOCK_UNLOCKED("<i>Factions in now unlocked"),
COMMAND_MAP_TOSHOW("to show the map"), COMMAND_MAP_TOSHOW("to show the map"),
COMMAND_MAP_FORSHOW("for showing the map"), COMMAND_MAP_FORSHOW("for showing the map"),
COMMAND_MAP_UPDATE_ENABLED("<i>Map auto update <green>ENABLED."), COMMAND_MAP_UPDATE_ENABLED("<i>Map auto update <green>ENABLED."),
COMMAND_MAP_UPDATE_DISABLED("<i>Map auto update <red>DISABLED."), COMMAND_MAP_UPDATE_DISABLED("<i>Map auto update <red>DISABLED."),
COMMAND_MOD_CANDIDATES("Players you can promote: "), COMMAND_MOD_CANDIDATES("Players you can promote: "),
COMMAND_MOD_CLICKTOPROMOTE("Click to promote "), COMMAND_MOD_CLICKTOPROMOTE("Click to promote "),
COMMAND_MOD_NOTMEMBER("%s<b> is not a member in your faction."), COMMAND_MOD_NOTMEMBER("%s<b> is not a member in your faction."),
COMMAND_MOD_NOTADMIN("<b>You are not the faction admin."), COMMAND_MOD_NOTADMIN("<b>You are not the faction admin."),
COMMAND_MOD_SELF("<b>The target player musn't be yourself."), COMMAND_MOD_SELF("<b>The target player musn't be yourself."),
COMMAND_MOD_TARGETISADMIN("<b>The target player is a faction admin. Demote them first."), COMMAND_MOD_TARGETISADMIN("<b>The target player is a faction admin. Demote them first."),
COMMAND_MOD_REVOKES("<i>You have removed moderator status from %s<i>."), COMMAND_MOD_REVOKES("<i>You have removed moderator status from %s<i>."),
COMMAND_MOD_REVOKED("%s<i> is no longer moderator in your faction."), COMMAND_MOD_REVOKED("%s<i> is no longer moderator in your faction."),
COMMAND_MOD_PROMOTES("%s<i> was promoted to moderator in your faction."), COMMAND_MOD_PROMOTES("%s<i> was promoted to moderator in your faction."),
COMMAND_MOD_PROMOTED("<i>You have promoted %s<i> to moderator."), COMMAND_MOD_PROMOTED("<i>You have promoted %s<i> to moderator."),
COMMAND_MODIFYPOWER_ADDED("<i>Added <a>%f <i>power to <a>%s. <i>New total rounded power: <a>%d"), COMMAND_MODIFYPOWER_ADDED("<i>Added <a>%f <i>power to <a>%s. <i>New total rounded power: <a>%d"),
COMMAND_MONEY_SHORT("faction money commands"), COMMAND_MONEY_SHORT("faction money commands"),
COMMAND_MONEY_LONG("<i>The faction money commands."), COMMAND_MONEY_LONG("<i>The faction money commands."),
COMMAND_MONEYBALANCE_SHORT("show faction balance"), COMMAND_MONEYBALANCE_SHORT("show faction balance"),
COMMAND_MONEYDEPOSIT_SHORT("deposit money"), COMMAND_MONEYDEPOSIT_SHORT("deposit money"),
COMMAND_MONEYDEPOSIT_DEPOSITED("%s deposited %s in the faction bank: %s"), COMMAND_MONEYDEPOSIT_DEPOSITED("%s deposited %s in the faction bank: %s"),
COMMAND_MONEYTRANSFERFF_SHORT("transfer f -> f"), COMMAND_MONEYTRANSFERFF_SHORT("transfer f -> f"),
COMMAND_MONEYTRANSFERFF_TRANSFER("%s transferred %s from the faction \"%s\" to the faction \"%s\""), COMMAND_MONEYTRANSFERFF_TRANSFER("%s transferred %s from the faction \"%s\" to the faction \"%s\""),
COMMAND_MONEYTRANSFERFP_SHORT("transfer f -> p"), COMMAND_MONEYTRANSFERFP_SHORT("transfer f -> p"),
COMMAND_MONEYTRANSFERFP_TRANSFER("%s transferred %s from the faction \"%s\" to the player \"%s\""), COMMAND_MONEYTRANSFERFP_TRANSFER("%s transferred %s from the faction \"%s\" to the player \"%s\""),
COMMAND_MONEYTRANSFERPF_SHORT("transfer p -> f"), COMMAND_MONEYTRANSFERPF_SHORT("transfer p -> f"),
COMMAND_MONEYTRANSFERPF_TRANSFER("%s transferred %s from the player \"%s\" to the faction \"%s\""), COMMAND_MONEYTRANSFERPF_TRANSFER("%s transferred %s from the player \"%s\" to the faction \"%s\""),
COMMAND_MONEYWITHDRAW_SHORT("withdraw money"), COMMAND_MONEYWITHDRAW_SHORT("withdraw money"),
COMMAND_MONEYWITHDRAW_WITHDRAW("%s withdrew %s from the faction bank: %s"), COMMAND_MONEYWITHDRAW_WITHDRAW("%s withdrew %s from the faction bank: %s"),
COMMAND_OPEN_TOOPEN("to open or close the faction"), COMMAND_OPEN_TOOPEN("to open or close the faction"),
COMMAND_OPEN_FOROPEN("for opening or closing the faction"), COMMAND_OPEN_FOROPEN("for opening or closing the faction"),
COMMAND_OPEN_OPEN("open"), COMMAND_OPEN_OPEN("open"),
COMMAND_OPEN_CLOSED("closed"), COMMAND_OPEN_CLOSED("closed"),
COMMAND_OPEN_CHANGES("%s<i> changed the faction to <h>%s<i>."), COMMAND_OPEN_CHANGES("%s<i> changed the faction to <h>%s<i>."),
COMMAND_OPEN_CHANGED("<i>The faction %s<i> is now %s"), COMMAND_OPEN_CHANGED("<i>The faction %s<i> is now %s"),
COMMAND_OWNER_DISABLED("<b>Sorry, but owned areas are disabled on this server."), COMMAND_OWNER_DISABLED("<b>Sorry, but owned areas are disabled on this server."),
COMMAND_OWNER_LIMIT("<b>Sorry, but you have reached the server's <h>limit of %d <b>owned areas per faction."), COMMAND_OWNER_LIMIT("<b>Sorry, but you have reached the server's <h>limit of %d <b>owned areas per faction."),
COMMAND_OWNER_WRONGFACTION("<b>This land is not claimed by your faction, so you can't set ownership of it."), COMMAND_OWNER_WRONGFACTION("<b>This land is not claimed by your faction, so you can't set ownership of it."),
COMMAND_OWNER_NOTCLAIMED("<b>This land is not claimed by a faction. Ownership is not possible."), COMMAND_OWNER_NOTCLAIMED("<b>This land is not claimed by a faction. Ownership is not possible."),
COMMAND_OWNER_NOTMEMBER("%s<i> is not a member of this faction."), COMMAND_OWNER_NOTMEMBER("%s<i> is not a member of this faction."),
COMMAND_OWNER_CLEARED("<i>You have cleared ownership for this claimed area."), COMMAND_OWNER_CLEARED("<i>You have cleared ownership for this claimed area."),
COMMAND_OWNER_REMOVED("<i>You have removed ownership of this claimed land from %s<i>."), COMMAND_OWNER_REMOVED("<i>You have removed ownership of this claimed land from %s<i>."),
COMMAND_OWNER_TOSET("to set ownership of claimed land"), COMMAND_OWNER_TOSET("to set ownership of claimed land"),
COMMAND_OWNER_FORSET("for setting ownership of claimed land"), COMMAND_OWNER_FORSET("for setting ownership of claimed land"),
COMMAND_OWNER_ADDED("<i>You have added %s<i> to the owner list for this claimed land."), COMMAND_OWNER_ADDED("<i>You have added %s<i> to the owner list for this claimed land."),
COMMAND_OWNERLIST_DISABLED("<b>Sorry, but owned areas are disabled on this server."),//dup-> COMMAND_OWNERLIST_DISABLED("<b>Sorry, but owned areas are disabled on this server."),//dup->
COMMAND_OWNERLIST_WRONGFACTION("<b>This land is not claimed by your faction."),//eq COMMAND_OWNERLIST_WRONGFACTION("<b>This land is not claimed by your faction."),//eq
COMMAND_OWNERLIST_NOTCLAIMED("<i>This land is not claimed by any faction, thus no owners."),//eq COMMAND_OWNERLIST_NOTCLAIMED("<i>This land is not claimed by any faction, thus no owners."),//eq
COMMAND_OWNERLIST_NONE("<i>No owners are set here; everyone in the faction has access."), COMMAND_OWNERLIST_NONE("<i>No owners are set here; everyone in the faction has access."),
COMMAND_OWNERLIST_OWNERS("<i>Current owner(s) of this land: %s"), COMMAND_OWNERLIST_OWNERS("<i>Current owner(s) of this land: %s"),
COMMAND_POWER_TOSHOW("to show player power info"), COMMAND_POWER_TOSHOW("to show player power info"),
COMMAND_POWER_FORSHOW("for showing player power info"), COMMAND_POWER_FORSHOW("for showing player power info"),
COMMAND_POWER_POWER("%s<a> - Power / Maxpower: <i>%d / %d %s"), COMMAND_POWER_POWER("%s<a> - Power / Maxpower: <i>%d / %d %s"),
COMMAND_POWER_BONUS(" (bonus: "), COMMAND_POWER_BONUS(" (bonus: "),
COMMAND_POWER_PENALTY(" (penalty: "), COMMAND_POWER_PENALTY(" (penalty: "),
COMMAND_POWERBOOST_HELP_1("<b>You must specify \"p\" or \"player\" to target a player or \"f\" or \"faction\" to target a faction."), COMMAND_POWERBOOST_HELP_1("<b>You must specify \"p\" or \"player\" to target a player or \"f\" or \"faction\" to target a faction."),
COMMAND_POWERBOOST_HELP_2("<b>ex. /f powerboost p SomePlayer 0.5 -or- /f powerboost f SomeFaction -5"), COMMAND_POWERBOOST_HELP_2("<b>ex. /f powerboost p SomePlayer 0.5 -or- /f powerboost f SomeFaction -5"),
@ -352,85 +352,85 @@ public enum TL {
COMMAND_SHOW_INVITATION("invitation is required"), COMMAND_SHOW_INVITATION("invitation is required"),
COMMAND_SHOW_UNINVITED("no invitation is needed"), COMMAND_SHOW_UNINVITED("no invitation is needed"),
COMMAND_SHOW_POWER("<a>Land / Power / Maxpower: <i> %d/%d/%d %s"), COMMAND_SHOW_POWER("<a>Land / Power / Maxpower: <i> %d/%d/%d %s"),
COMMAND_SHOW_BONUS(" (bonus: "), COMMAND_SHOW_BONUS(" (bonus: "),
COMMAND_SHOW_PENALTY(" (penalty: "), COMMAND_SHOW_PENALTY(" (penalty: "),
COMMAND_SHOW_DEPRECIATED("(%s depreciated)"), //This is spelled correctly. COMMAND_SHOW_DEPRECIATED("(%s depreciated)"), //This is spelled correctly.
COMMAND_SHOW_LANDVALUE("<a>Total land value: <i>%s%s"), COMMAND_SHOW_LANDVALUE("<a>Total land value: <i>%s%s"),
COMMAND_SHOW_BANKCONTAINS("<a>Bank contains: <i>%s"), COMMAND_SHOW_BANKCONTAINS("<a>Bank contains: <i>%s"),
COMMAND_SHOW_ALLIES("Allies: "), COMMAND_SHOW_ALLIES("Allies: "),
COMMAND_SHOW_ENEMIES("Enemies: "), COMMAND_SHOW_ENEMIES("Enemies: "),
COMMAND_SHOW_MEMBERSONLINE("Members online: "), COMMAND_SHOW_MEMBERSONLINE("Members online: "),
COMMAND_SHOW_MEMBERSOFFLINE("Members offline: "), COMMAND_SHOW_MEMBERSOFFLINE("Members offline: "),
COMMAND_SHOWINVITES_PENDING("Players with pending invites: "), COMMAND_SHOWINVITES_PENDING("Players with pending invites: "),
COMMAND_SHOWINVITES_CLICKTOREVOKE("Click to revoke invite for %s"), COMMAND_SHOWINVITES_CLICKTOREVOKE("Click to revoke invite for %s"),
COMMAND_STATUS_FORMAT("%s Power: %s Last Seen: %s"), COMMAND_STATUS_FORMAT("%s Power: %s Last Seen: %s"),
COMMAND_STATUS_ONLINE("Online"), COMMAND_STATUS_ONLINE("Online"),
COMMAND_STATUS_AGOSUFFIX(" ago."), COMMAND_STATUS_AGOSUFFIX(" ago."),
COMMAND_TAG_TAKEN("<b>That tag is already taken"), COMMAND_TAG_TAKEN("<b>That tag is already taken"),
COMMAND_TAG_TOCHANGE("to change the faction tag"), COMMAND_TAG_TOCHANGE("to change the faction tag"),
COMMAND_TAG_FORCHANGE("for changing the faction tag"), COMMAND_TAG_FORCHANGE("for changing the faction tag"),
COMMAND_TAG_FACTION("%s<i> changed your faction tag to %s"), COMMAND_TAG_FACTION("%s<i> changed your faction tag to %s"),
COMMAND_TAG_CHANGED("<i>The faction %s<i> changed their name to %s."), COMMAND_TAG_CHANGED("<i>The faction %s<i> changed their name to %s."),
COMMAND_TITLE_TOCHANGE("to change a players title"), COMMAND_TITLE_TOCHANGE("to change a players title"),
COMMAND_TITLE_FORCHANGE("for changing a players title"), COMMAND_TITLE_FORCHANGE("for changing a players title"),
COMMAND_TITLE_CHANGED("%s<i> changed a title: %s"), COMMAND_TITLE_CHANGED("%s<i> changed a title: %s"),
COMMAND_UNCLAIM_SAFEZONE_SUCCESS("<i>Safe zone was unclaimed."), COMMAND_UNCLAIM_SAFEZONE_SUCCESS("<i>Safe zone was unclaimed."),
COMMAND_UNCLAIM_SAFEZONE_NOPERM("<b>This is a safe zone. You lack permissions to unclaim."), COMMAND_UNCLAIM_SAFEZONE_NOPERM("<b>This is a safe zone. You lack permissions to unclaim."),
COMMAND_UNCLAIM_WARZONE_SUCCESS("<i>War zone was unclaimed."), COMMAND_UNCLAIM_WARZONE_SUCCESS("<i>War zone was unclaimed."),
COMMAND_UNCLAIM_WARZONE_NOPERM("<b>This is a war zone. You lack permissions to unclaim."), COMMAND_UNCLAIM_WARZONE_NOPERM("<b>This is a war zone. You lack permissions to unclaim."),
COMMAND_UNCLAIM_UNCLAIMED("%s<i> unclaimed some of your land."), COMMAND_UNCLAIM_UNCLAIMED("%s<i> unclaimed some of your land."),
COMMAND_UNCLAIM_UNCLAIMS("<i>You unclaimed this land."), COMMAND_UNCLAIM_UNCLAIMS("<i>You unclaimed this land."),
COMMAND_UNCLAIM_LOG("%s unclaimed land at (%s) from the faction: %s"), COMMAND_UNCLAIM_LOG("%s unclaimed land at (%s) from the faction: %s"),
COMMAND_UNCLAIM_WRONGFACTION("<b>You don't own this land."), COMMAND_UNCLAIM_WRONGFACTION("<b>You don't own this land."),
COMMAND_UNCLAIM_TOUNCLAIM("to unclaim this land"), COMMAND_UNCLAIM_TOUNCLAIM("to unclaim this land"),
COMMAND_UNCLAIM_FORUNCLAIM("for unclaiming this land"), COMMAND_UNCLAIM_FORUNCLAIM("for unclaiming this land"),
COMMAND_UNCLAIM_FACTIONUNCLAIMED("%s<i> unclaimed some land."), COMMAND_UNCLAIM_FACTIONUNCLAIMED("%s<i> unclaimed some land."),
COMMAND_UNCLAIMALL_TOUNCLAIM("to unclaim all faction land"), COMMAND_UNCLAIMALL_TOUNCLAIM("to unclaim all faction land"),
COMMAND_UNCLAIMALL_FORUNCLAIM("for unclaiming all faction land"), COMMAND_UNCLAIMALL_FORUNCLAIM("for unclaiming all faction land"),
COMMAND_UNCLAIMALL_UNCLAIMED("%s<i> unclaimed ALL of your faction's land."), COMMAND_UNCLAIMALL_UNCLAIMED("%s<i> unclaimed ALL of your faction's land."),
COMMAND_UNCLAIMALL_LOG("%s unclaimed everything for the faction: %s"), COMMAND_UNCLAIMALL_LOG("%s unclaimed everything for the faction: %s"),
COMMAND_VERSION_VERSION("<i>You are running %s"), COMMAND_VERSION_VERSION("<i>You are running %s"),
COMMAND_WARUNCLAIMALL_SHORT("unclaim all warzone land"), COMMAND_WARUNCLAIMALL_SHORT("unclaim all warzone land"),
COMMAND_WARUNCLAIMALL_SUCCESS("<i>You unclaimed ALL war zone land."), COMMAND_WARUNCLAIMALL_SUCCESS("<i>You unclaimed ALL war zone land."),
COMMAND_WARUNCLAIMALL_LOG("%s unclaimed all war zones."), COMMAND_WARUNCLAIMALL_LOG("%s unclaimed all war zones."),
COMMAND_RELATIONS_ALLTHENOPE("<b>Nope! You can't."), COMMAND_RELATIONS_ALLTHENOPE("<b>Nope! You can't."),
COMMAND_RELATIONS_MORENOPE("<b>Nope! You can't declare a relation to yourself :)"), COMMAND_RELATIONS_MORENOPE("<b>Nope! You can't declare a relation to yourself :)"),
COMMAND_RELATIONS_ALREADYINRELATIONSHIP("<b>You already have that relation wish set with %s."), COMMAND_RELATIONS_ALREADYINRELATIONSHIP("<b>You already have that relation wish set with %s."),
COMMAND_RELATIONS_TOMARRY("to change a relation wish"), COMMAND_RELATIONS_TOMARRY("to change a relation wish"),
COMMAND_RELATIONS_FORMARRY("for changing a relation wish"), COMMAND_RELATIONS_FORMARRY("for changing a relation wish"),
COMMAND_RELATIONS_MUTUAL("<i>Your faction is now %s<i> to %s"), COMMAND_RELATIONS_MUTUAL("<i>Your faction is now %s<i> to %s"),
COMMAND_RELATIONS_PEACEFUL("<i>This will have no effect while your faction is peaceful."), COMMAND_RELATIONS_PEACEFUL("<i>This will have no effect while your faction is peaceful."),
COMMAND_RELATIONS_PEACEFULOTHER("<i>This will have no effect while their faction is peaceful."), COMMAND_RELATIONS_PEACEFULOTHER("<i>This will have no effect while their faction is peaceful."),
COMMAND_RELATIONS_PROPOSAL_1("%s<i> wishes to be your %s"), COMMAND_RELATIONS_PROPOSAL_1("%s<i> wishes to be your %s"),
COMMAND_RELATIONS_PROPOSAL_2("<i>Type <c>/%s %s %s<i> to accept."), COMMAND_RELATIONS_PROPOSAL_2("<i>Type <c>/%s %s %s<i> to accept."),
COMMAND_RELATIONS_PROPOSAL_SENT("%s<i> were informed that you wish to be %s"), COMMAND_RELATIONS_PROPOSAL_SENT("%s<i> were informed that you wish to be %s"),
/** /**
* More generic translations, which will apply to more than one class. * More generic translations, which will apply to more than one class.
*/ */
GENERIC_SERVERADMIN("A server admin"), GENERIC_SERVERADMIN("A server admin"),
GENERIC_DISABLED("disabled"), GENERIC_DISABLED("disabled"),
GENERIC_ENABLED("enabled"), GENERIC_ENABLED("enabled"),
GENERIC_CONSOLEONLY("This command cannot be run as a player."), GENERIC_CONSOLEONLY("This command cannot be run as a player."),
GENERIC_ASKYOURLEADER("<i> Ask your leader to:"), GENERIC_ASKYOURLEADER("<i> Ask your leader to:"),
GENERIC_YOUSHOULD("<i>You should:"), GENERIC_YOUSHOULD("<i>You should:"),
GENERIC_YOUMAYWANT("<i>You may want to: "), GENERIC_YOUMAYWANT("<i>You may want to: "),
GENERIC_TRANSLATION_VERSION("Translation: %s(%s,%s) State: %s"), GENERIC_TRANSLATION_VERSION("Translation: %s(%s,%s) State: %s"),
GENERIC_TRANSLATION_CONTRIBUTORS("Translation contributors: %s"), GENERIC_TRANSLATION_CONTRIBUTORS("Translation contributors: %s"),
GENERIC_TRANSLATION_RESPONSIBLE("Responsible for translation: %s"), GENERIC_TRANSLATION_RESPONSIBLE("Responsible for translation: %s"),
/** /**
* Relations * Relations
*/ */
RELATION_MEMBER("member"), RELATION_MEMBER("member"),
RELATION_ALLY("ally"), RELATION_ALLY("ally"),
RELATION_NEUTRAL("neutral"), RELATION_NEUTRAL("neutral"),
@ -440,9 +440,9 @@ public enum TL {
*/ */
NOPAGES("<i>Sorry. No Pages available."), NOPAGES("<i>Sorry. No Pages available."),
INVALIDPAGE("<i>Invalid page. Must be between 1 and %d"), INVALIDPAGE("<i>Invalid page. Must be between 1 and %d"),
/** /**
* The ones here before I started messing around with this * The ones here before I started messing around with this
*/ */
TITLE("title", "&bFactions &0|&r"), TITLE("title", "&bFactions &0|&r"),
WILDERNESS("wilderness", "&2Wilderness"), WILDERNESS("wilderness", "&2Wilderness"),
WILDERNESS_DESCRIPTION("wilderness-description", ""), WILDERNESS_DESCRIPTION("wilderness-description", ""),
@ -470,11 +470,14 @@ public enum TL {
/** /**
* Lang enum constructor. Use this when your desired path simply exchanges '_' for '.' * Lang enum constructor. Use this when your desired path simply exchanges '_' for '.'
*
* @param start The default string. * @param start The default string.
*/ */
TL(String start) { TL(String start) {
this.path = this.name().replace('_', '.'); this.path = this.name().replace('_', '.');
if(this.path.startsWith(".")) path="root"+path; if (this.path.startsWith(".")) {
path = "root" + path;
}
this.def = start; this.def = start;
} }
@ -492,8 +495,8 @@ public enum TL {
return this == TITLE ? ChatColor.translateAlternateColorCodes('&', LANG.getString(this.path, def)) + " " : ChatColor.translateAlternateColorCodes('&', LANG.getString(this.path, def)); return this == TITLE ? ChatColor.translateAlternateColorCodes('&', LANG.getString(this.path, def)) + " " : ChatColor.translateAlternateColorCodes('&', LANG.getString(this.path, def));
} }
public String format(Object... args){ public String format(Object... args) {
return String.format(toString(), args); return String.format(toString(), args);
} }
/** /**