diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java b/src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java index 38de5837..b3e6b186 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java @@ -7,7 +7,6 @@ import com.massivecraft.factions.event.FPlayerJoinEvent; import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.zcore.util.TL; - import org.bukkit.Bukkit; public class CmdAdmin extends FCommand { diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdBoom.java b/src/main/java/com/massivecraft/factions/cmd/CmdBoom.java index 03ef9f92..6bdb3693 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdBoom.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdBoom.java @@ -39,6 +39,6 @@ public class CmdBoom extends FCommand { String enabled = myFaction.noExplosionsInTerritory() ? TL.GENERIC_DISABLED.toString() : TL.GENERIC_ENABLED.toString(); // Inform - myFaction.msg(TL.COMMAND_BOOM_ENABLED, fme.describeTo(myFaction),enabled); + myFaction.msg(TL.COMMAND_BOOM_ENABLED, fme.describeTo(myFaction), enabled); } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdConfig.java b/src/main/java/com/massivecraft/factions/cmd/CmdConfig.java index c035772e..766b99c3 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdConfig.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdConfig.java @@ -4,7 +4,6 @@ import com.massivecraft.factions.Conf; import com.massivecraft.factions.P; import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.zcore.util.TL; - import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -143,7 +142,7 @@ public class CmdConfig extends FCommand { } if (newColor == null) { - sendMessage(TL.COMMAND_CONFIG_INVALID_COLOUR.format(fieldName,value.toUpperCase())); + sendMessage(TL.COMMAND_CONFIG_INVALID_COLOUR.format(fieldName, value.toUpperCase())); return; } target.set(null, newColor); @@ -170,7 +169,7 @@ public class CmdConfig extends FCommand { } if (newMat == null) { - sendMessage(TL.COMMAND_CONFIG_INVALID_MATERIAL.format(fieldName,value.toUpperCase())); + sendMessage(TL.COMMAND_CONFIG_INVALID_MATERIAL.format(fieldName, value.toUpperCase())); return; } @@ -180,13 +179,13 @@ public class CmdConfig extends FCommand { if (matSet.contains(newMat)) { matSet.remove(newMat); 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 else { matSet.add(newMat); 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)) { stringSet.remove(value); 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 else { stringSet.add(value); 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 else { - sendMessage(TL.COMMAND_CONFIG_ERROR_TYPE.format(fieldName,target.getClass().getName())); + sendMessage(TL.COMMAND_CONFIG_ERROR_TYPE.format(fieldName, target.getClass().getName())); return; } } catch (NoSuchFieldException ex) { sendMessage(TL.COMMAND_CONFIG_ERROR_MATCHING.format(fieldName)); return; } catch (IllegalAccessException ex) { - sendMessage(TL.COMMAND_CONFIG_ERROR_SETTING.format(fieldName,value)); + sendMessage(TL.COMMAND_CONFIG_ERROR_SETTING.format(fieldName, value)); return; } if (!success.isEmpty()) { if (sender instanceof Player) { 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 { P.p.log(success); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdConvert.java b/src/main/java/com/massivecraft/factions/cmd/CmdConvert.java index 0b9145f5..685f9ada 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdConvert.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdConvert.java @@ -4,7 +4,6 @@ import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf.Backend; import com.massivecraft.factions.zcore.persist.json.FactionsJSON; import com.massivecraft.factions.zcore.util.TL; - import org.bukkit.command.ConsoleCommandSender; public class CmdConvert extends FCommand { diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java b/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java index 5eba0853..104c2dd8 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java @@ -7,7 +7,6 @@ import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.util.MiscUtil; import com.massivecraft.factions.zcore.util.TL; - import org.bukkit.Bukkit; import java.util.ArrayList; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java b/src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java index 9628a75f..a49ea207 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java @@ -4,9 +4,7 @@ import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayers; import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.zcore.util.TL; - import mkremins.fanciful.FancyMessage; - import org.bukkit.ChatColor; public class CmdDeinvite extends FCommand { diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java b/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java index 61987205..7005d7fc 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java @@ -8,7 +8,6 @@ import com.massivecraft.factions.scoreboards.FTeamWrapper; import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.zcore.util.TL; - import org.bukkit.Bukkit; @@ -80,7 +79,7 @@ public class CmdDisband extends FCommand { } } 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()) + "."); } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdHelp.java b/src/main/java/com/massivecraft/factions/cmd/CmdHelp.java index 15acc337..adce079f 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdHelp.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdHelp.java @@ -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_6.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_10.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_2.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_6.toString())); pageLines.add(p.txt.parse(TL.COMMAND_HELP_PERMISSIONS_7.toString())); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdHome.java b/src/main/java/com/massivecraft/factions/cmd/CmdHome.java index 20d5388f..ed962a66 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdHome.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdHome.java @@ -7,7 +7,6 @@ import com.massivecraft.factions.struct.Relation; import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.zcore.util.SmokeUtil; import com.massivecraft.factions.zcore.util.TL; - import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Player; @@ -96,7 +95,7 @@ public class CmdHome extends FCommand { continue; } - fme.msg(TL.COMMAND_HOME_ENEMYNEAR,String.valueOf(Conf.homesTeleportAllowedEnemyDistance)); + fme.msg(TL.COMMAND_HOME_ENEMYNEAR, String.valueOf(Conf.homesTeleportAllowedEnemyDistance)); return; } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdInvite.java b/src/main/java/com/massivecraft/factions/cmd/CmdInvite.java index f317fa23..6936131a 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdInvite.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdInvite.java @@ -4,9 +4,7 @@ import com.massivecraft.factions.Conf; import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.zcore.util.TL; - import mkremins.fanciful.FancyMessage; - import org.bukkit.ChatColor; public class CmdInvite extends FCommand { diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdJoin.java b/src/main/java/com/massivecraft/factions/cmd/CmdJoin.java index 5f707135..5bcc467c 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdJoin.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdJoin.java @@ -4,7 +4,6 @@ import com.massivecraft.factions.*; import com.massivecraft.factions.event.FPlayerJoinEvent; import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.zcore.util.TL; - import org.bukkit.Bukkit; public class CmdJoin extends FCommand { @@ -46,7 +45,7 @@ public class CmdJoin extends FCommand { } if (faction == fplayer.getFaction()) { - //TODO:TL + //TODO:TL msg(TL.COMMAND_JOIN_ALREADYMEMBER, fplayer.describeTo(fme, true), (samePlayer ? "are" : "is"), faction.getTag(fme)); return; } @@ -57,7 +56,7 @@ public class CmdJoin extends FCommand { } if (fplayer.hasFaction()) { - //TODO:TL + //TODO:TL msg(TL.COMMAND_JOIN_INOTHERFACTION, fplayer.describeTo(fme, true), (samePlayer ? "your" : "their")); return; } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdKick.java b/src/main/java/com/massivecraft/factions/cmd/CmdKick.java index 54934454..f1bd6f4b 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdKick.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdKick.java @@ -106,7 +106,7 @@ public class CmdKick extends FCommand { } if (Conf.logFactionKick) { - //TODO:TL + //TODO:TL P.p.log((senderIsConsole ? "A console command" : fme.getName()) + " kicked " + toKick.getName() + " from the faction: " + toKickFaction.getTag()); } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdList.java b/src/main/java/com/massivecraft/factions/cmd/CmdList.java index f355301d..e527ca6a 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdList.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdList.java @@ -5,9 +5,7 @@ import com.massivecraft.factions.Faction; import com.massivecraft.factions.Factions; import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.zcore.util.TL; - import mkremins.fanciful.FancyMessage; - import org.bukkit.ChatColor; import java.util.ArrayList; @@ -37,7 +35,7 @@ public class CmdList extends FCommand { @Override 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 (!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; } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdLock.java b/src/main/java/com/massivecraft/factions/cmd/CmdLock.java index ceae6be9..7b775278 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdLock.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdLock.java @@ -31,7 +31,7 @@ public class CmdLock extends FCommand { @Override public void perform() { 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); } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdMap.java b/src/main/java/com/massivecraft/factions/cmd/CmdMap.java index 7f927b3d..90531d66 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdMap.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdMap.java @@ -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())); } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdMod.java b/src/main/java/com/massivecraft/factions/cmd/CmdMod.java index 32d32d14..47ed4806 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdMod.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdMod.java @@ -5,9 +5,7 @@ import com.massivecraft.factions.Faction; import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.zcore.util.TL; - import mkremins.fanciful.FancyMessage; - import org.bukkit.ChatColor; public class CmdMod extends FCommand { diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyDeposit.java b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyDeposit.java index 5ca90212..5fcf5840 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyDeposit.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyDeposit.java @@ -6,7 +6,6 @@ import com.massivecraft.factions.iface.EconomyParticipator; import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.zcore.util.TL; - import org.bukkit.ChatColor; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFf.java b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFf.java index d9f76976..908310e1 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFf.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFf.java @@ -6,7 +6,6 @@ import com.massivecraft.factions.iface.EconomyParticipator; import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.zcore.util.TL; - import org.bukkit.ChatColor; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFp.java b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFp.java index 9a8f0f50..1a8b8619 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFp.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFp.java @@ -6,7 +6,6 @@ import com.massivecraft.factions.iface.EconomyParticipator; import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.zcore.util.TL; - import org.bukkit.ChatColor; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferPf.java b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferPf.java index 1190d3b2..de86b0e8 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferPf.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferPf.java @@ -6,7 +6,6 @@ import com.massivecraft.factions.iface.EconomyParticipator; import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.zcore.util.TL; - import org.bukkit.ChatColor; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java index 1433dccb..d95c507c 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java @@ -6,7 +6,6 @@ import com.massivecraft.factions.iface.EconomyParticipator; import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.zcore.util.TL; - import org.bukkit.ChatColor; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdOwner.java b/src/main/java/com/massivecraft/factions/cmd/CmdOwner.java index b3997bbe..bbcc9682 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdOwner.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdOwner.java @@ -56,8 +56,8 @@ public class CmdOwner extends FCommand { fme.msg(TL.COMMAND_OWNER_NOTCLAIMED); return; } - - if (!hasBypass) { + + if (!hasBypass) { fme.msg(TL.COMMAND_OWNER_WRONGFACTION); 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 (!payForCommand(Conf.econCostOwner, TL.COMMAND_OWNER_TOSET , TL.COMMAND_OWNER_FORSET)) { + if (!payForCommand(Conf.econCostOwner, TL.COMMAND_OWNER_TOSET, TL.COMMAND_OWNER_FORSET)) { return; } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPower.java b/src/main/java/com/massivecraft/factions/cmd/CmdPower.java index 71eb41b0..52c6745f 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdPower.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdPower.java @@ -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 (!payForCommand(Conf.econCostPower, TL.COMMAND_POWER_TOSHOW , TL.COMMAND_POWER_FORSHOW)) { + if (!payForCommand(Conf.econCostPower, TL.COMMAND_POWER_TOSHOW, TL.COMMAND_POWER_FORSHOW)) { return; } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPowerBoost.java b/src/main/java/com/massivecraft/factions/cmd/CmdPowerBoost.java index cc72db02..baf18073 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdPowerBoost.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdPowerBoost.java @@ -61,9 +61,9 @@ public class CmdPowerBoost extends FCommand { target = TL.COMMAND_POWERBOOST_FACTION.format(targetFaction.getTag()); } - msg(TL.COMMAND_POWERBOOST_BOOST,target,targetPower); + msg(TL.COMMAND_POWERBOOST_BOOST, target, targetPower); 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); } } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdSetFWarp.java b/src/main/java/com/massivecraft/factions/cmd/CmdSetFWarp.java index f8073baf..ba08521e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdSetFWarp.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdSetFWarp.java @@ -44,6 +44,6 @@ public class CmdSetFWarp extends FCommand { } 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()); } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdSethome.java b/src/main/java/com/massivecraft/factions/cmd/CmdSethome.java index 51ad07de..79085f0b 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdSethome.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdSethome.java @@ -66,7 +66,7 @@ public class CmdSethome extends FCommand { faction.msg(TL.COMMAND_SETHOME_SET, fme.describeTo(myFaction, true)); faction.sendMessage(p.cmdBase.cmdHome.getUseageTemplate()); if (faction != myFaction) { - fme.msg(TL.COMMAND_SETHOME_SETOTHER,faction.getTag(fme)); + fme.msg(TL.COMMAND_SETHOME_SETOTHER, faction.getTag(fme)); } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdShowInvites.java b/src/main/java/com/massivecraft/factions/cmd/CmdShowInvites.java index f258b164..51180f8c 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdShowInvites.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdShowInvites.java @@ -4,9 +4,7 @@ import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayers; import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.zcore.util.TL; - import mkremins.fanciful.FancyMessage; - import org.bukkit.ChatColor; public class CmdShowInvites extends FCommand { diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdStatus.java b/src/main/java/com/massivecraft/factions/cmd/CmdStatus.java index 5d78f501..8eb64e2f 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdStatus.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdStatus.java @@ -3,7 +3,6 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.zcore.util.TL; - import org.apache.commons.lang.time.DurationFormatUtils; import org.bukkit.ChatColor; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdTag.java b/src/main/java/com/massivecraft/factions/cmd/CmdTag.java index 11a82292..631789c3 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdTag.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdTag.java @@ -6,7 +6,6 @@ import com.massivecraft.factions.scoreboards.FTeamWrapper; import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.util.MiscUtil; import com.massivecraft.factions.zcore.util.TL; - import org.bukkit.Bukkit; import java.util.ArrayList; @@ -57,7 +56,7 @@ public class CmdTag extends FCommand { } // 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; } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdUnclaim.java b/src/main/java/com/massivecraft/factions/cmd/CmdUnclaim.java index 3bf16d1b..eb3b663e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdUnclaim.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdUnclaim.java @@ -6,7 +6,6 @@ import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.zcore.util.TL; - import org.bukkit.Bukkit; public class CmdUnclaim extends FCommand { @@ -38,7 +37,7 @@ public class CmdUnclaim extends FCommand { msg(TL.COMMAND_UNCLAIM_SAFEZONE_SUCCESS); 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 { msg(TL.COMMAND_UNCLAIM_SAFEZONE_NOPERM); @@ -50,7 +49,7 @@ public class CmdUnclaim extends FCommand { msg(TL.COMMAND_UNCLAIM_WARZONE_SUCCESS); 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 { msg(TL.COMMAND_UNCLAIM_WARZONE_NOPERM); @@ -65,7 +64,7 @@ public class CmdUnclaim extends FCommand { msg(TL.COMMAND_UNCLAIM_UNCLAIMS); 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; @@ -109,7 +108,7 @@ public class CmdUnclaim extends FCommand { myFaction.msg(TL.COMMAND_UNCLAIM_FACTIONUNCLAIMED, fme.describeTo(myFaction, true)); 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())); } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdUnclaimall.java b/src/main/java/com/massivecraft/factions/cmd/CmdUnclaimall.java index 70b2515e..d0e2bcce 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdUnclaimall.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdUnclaimall.java @@ -7,7 +7,6 @@ import com.massivecraft.factions.event.LandUnclaimAllEvent; import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.zcore.util.TL; - import org.bukkit.Bukkit; public class CmdUnclaimall extends FCommand { @@ -51,7 +50,7 @@ public class CmdUnclaimall extends FCommand { myFaction.msg(TL.COMMAND_UNCLAIMALL_UNCLAIMED, fme.describeTo(myFaction, true)); 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())); } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdVersion.java b/src/main/java/com/massivecraft/factions/cmd/CmdVersion.java index e7713140..0f37a3f6 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdVersion.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdVersion.java @@ -24,9 +24,9 @@ public class CmdVersion extends FCommand { @Override public void perform() { - 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_CONTRIBUTORS,TL._LOCAL_AUTHOR); - msg(TL.GENERIC_TRANSLATION_RESPONSIBLE,TL._LOCAL_RESPONSIBLE); + 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_CONTRIBUTORS, TL._LOCAL_AUTHOR); + msg(TL.GENERIC_TRANSLATION_RESPONSIBLE, TL._LOCAL_RESPONSIBLE); } } diff --git a/src/main/java/com/massivecraft/factions/cmd/FCommand.java b/src/main/java/com/massivecraft/factions/cmd/FCommand.java index fbda0959..a3ae7b77 100644 --- a/src/main/java/com/massivecraft/factions/cmd/FCommand.java +++ b/src/main/java/com/massivecraft/factions/cmd/FCommand.java @@ -5,7 +5,6 @@ import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.zcore.MCommand; import com.massivecraft.factions.zcore.util.TL; - import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; @@ -276,9 +275,9 @@ public abstract class FCommand extends MCommand

{ return Econ.modifyMoney(fme, -cost, toDoThis, forDoingThis); } } - - public boolean payForCommand(double cost,TL toDoThis,TL forDoingThis){ - return payForCommand(cost,toDoThis.toString(),forDoingThis.toString()); + + public boolean payForCommand(double cost, TL toDoThis, TL forDoingThis) { + 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 diff --git a/src/main/java/com/massivecraft/factions/cmd/FRelationCommand.java b/src/main/java/com/massivecraft/factions/cmd/FRelationCommand.java index 576652e5..8009d17e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/FRelationCommand.java +++ b/src/main/java/com/massivecraft/factions/cmd/FRelationCommand.java @@ -7,7 +7,6 @@ import com.massivecraft.factions.scoreboards.FTeamWrapper; import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Relation; import com.massivecraft.factions.zcore.util.TL; - import org.bukkit.Bukkit; 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 (!payForCommand(targetRelation.getRelationCost(),TL.COMMAND_RELATIONS_TOMARRY , TL.COMMAND_RELATIONS_FORMARRY)) { + if (!payForCommand(targetRelation.getRelationCost(), TL.COMMAND_RELATIONS_TOMARRY, TL.COMMAND_RELATIONS_FORMARRY)) { return; } @@ -68,15 +67,15 @@ public abstract class FRelationCommand extends FCommand { FactionRelationEvent relationEvent = new FactionRelationEvent(myFaction, them, oldRelation, currentRelation); Bukkit.getServer().getPluginManager().callEvent(relationEvent); - them.msg(TL.COMMAND_RELATIONS_MUTUAL, currentRelationColor + targetRelation.getTranslation() ,currentRelationColor + myFaction.getTag()); - myFaction.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()); } // inform the other faction of your request else { - - 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()); - myFaction.msg(TL.COMMAND_RELATIONS_PROPOSAL_SENT,currentRelationColor + them.getTag(),"" + targetRelation.getColor() + targetRelation); + + 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()); + myFaction.msg(TL.COMMAND_RELATIONS_PROPOSAL_SENT, currentRelationColor + them.getTag(), "" + targetRelation.getColor() + targetRelation); } if (!targetRelation.isNeutral() && them.isPeaceful()) { diff --git a/src/main/java/com/massivecraft/factions/iface/EconomyParticipator.java b/src/main/java/com/massivecraft/factions/iface/EconomyParticipator.java index 214aa860..30f4bc6c 100644 --- a/src/main/java/com/massivecraft/factions/iface/EconomyParticipator.java +++ b/src/main/java/com/massivecraft/factions/iface/EconomyParticipator.java @@ -7,6 +7,6 @@ public interface EconomyParticipator extends RelationParticipator { public String getAccountId(); public void msg(String str, Object... args); - - public void msg(TL translation,Object... args); + + public void msg(TL translation, Object... args); } \ No newline at end of file diff --git a/src/main/java/com/massivecraft/factions/zcore/MCommand.java b/src/main/java/com/massivecraft/factions/zcore/MCommand.java index e9dc3fc1..ed66ea71 100644 --- a/src/main/java/com/massivecraft/factions/zcore/MCommand.java +++ b/src/main/java/com/massivecraft/factions/zcore/MCommand.java @@ -6,9 +6,7 @@ import com.massivecraft.factions.P; import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TextUtil; - import mkremins.fanciful.FancyMessage; - import org.apache.commons.lang.time.DurationFormatUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -256,9 +254,9 @@ public abstract class MCommand { public void msg(String str, Object... args) { sender.sendMessage(p.txt.parse(str, args)); } - - public void msg(TL translation,Object... args){ - sender.sendMessage(p.txt.parse(translation.toString(),args)); + + public void msg(TL translation, Object... args) { + sender.sendMessage(p.txt.parse(translation.toString(), args)); } public void sendMessage(String msg) { diff --git a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java index 47ee1d77..6bac91f7 100644 --- a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java +++ b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java @@ -16,7 +16,6 @@ import com.massivecraft.factions.struct.Relation; import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.util.RelationUtil; import com.massivecraft.factions.zcore.util.TL; - import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Location; @@ -766,9 +765,9 @@ public abstract class MemoryFPlayer implements FPlayer { public void msg(String str, Object... args) { this.sendMessage(P.p.txt.parse(str, args)); } - - public void msg(TL translation,Object... args){ - this.msg(translation.toString(), args); + + public void msg(TL translation, Object... args) { + this.msg(translation.toString(), args); } public Player getPlayer() { diff --git a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java index e0f15eaf..a9298cc8 100644 --- a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java +++ b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java @@ -11,7 +11,6 @@ import com.massivecraft.factions.util.LazyLocation; import com.massivecraft.factions.util.MiscUtil; import com.massivecraft.factions.util.RelationUtil; import com.massivecraft.factions.zcore.util.TL; - import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Location; @@ -603,9 +602,9 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator { fplayer.sendMessage(message); } } - - public void msg(TL translation, Object... args){ - msg(translation.toString(),args); + + public void msg(TL translation, Object... args) { + msg(translation.toString(), args); } public void sendMessage(String message) { diff --git a/src/main/java/com/massivecraft/factions/zcore/util/TL.java b/src/main/java/com/massivecraft/factions/zcore/util/TL.java index 1b56ef5a..bf78c201 100644 --- a/src/main/java/com/massivecraft/factions/zcore/util/TL.java +++ b/src/main/java/com/massivecraft/factions/zcore/util/TL.java @@ -20,146 +20,146 @@ import org.bukkit.ChatColor; import org.bukkit.configuration.file.YamlConfiguration; /** - * An enum for requesting strings from the language file. - * The contents of this enum file may be subject to frequent changes. + * An enum for requesting strings from the language file. The contents of this enum file may be subject to frequent + * changes. */ public enum TL { - /** - * Translation meta - */ - _AUTHOR("misc"), - _RESPONSIBLE("misc"), - _LANGUAGE("English"), - _ENCODING("UTF-8"), - _LOCALE("en_US"), - _REQUIRESUNICODE("false"), - _DEFAULT("true"), - _STATE("complete"), //incomplete, limited, partial, majority, complete - /** - * Localised translation meta - */ - _LOCAL_AUTHOR("misc"), - _LOCAL_RESPONSIBLE("misc"), - _LOCAL_LANGUAGE("English"), - _LOCAL_REGION("US"), - _LOCAL_STATE("complete"), //And this is the English version. It's not ever going to be not complete. - - /** - * Command translations - */ - COMMAND_ADMIN_NOTMEMBER("%s is not a member in your faction."), - COMMAND_ADMIN_NOTADMIN("You are not the faction admin."), - COMMAND_ADMIN_TARGETSELF("The target player musn't be yourself."), - COMMAND_ADMIN_DEMOTES("You have demoted %s from the position of faction admin."), - COMMAND_ADMIN_DEMOTED("You have been demoted from the position of faction admin by %s."), - COMMAND_ADMIN_PROMOTES("You have promoted %s to the position of faction admin."), - COMMAND_ADMIN_PROMOTED("%s gave %s the leadership of %s."), - - COMMAND_AUTOCLAIM_ENABLED("Now auto-claiming land for %s."), - COMMAND_AUTOCLAIM_DISABLED("Auto-claiming of land disabled."), - COMMAND_AUTOCLAIM_REQUIREDRANK("You must be %s to claim land."), - COMMAND_AUTOCLAIM_OTHERFACTION("You can't claim land for %s."), - - COMMAND_AUTOHELP_HELPFOR("Help for command \""), - - COMMAND_BOOM_PEACEFULONLY("This command is only usable by factions which are specifically designated as peaceful."), - COMMAND_BOOM_TOTOGGLE("to toggle explosions"), - COMMAND_BOOM_FORTOGGLE("for toggling explosions"), - COMMAND_BOOM_ENABLED("%s has %s explosions in your faction's territory."), - - COMMAND_BYPASS_ENABLE("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_DISABLE("You have disabled admin bypass mode."), - COMMAND_BYPASS_DISABLELOG(" has DISABLED admin bypass mode."), - - COMMAND_CHAT_DISABLED("The built in chat chat channels are disabled on this server."), - COMMAND_CHAT_INVALIDMODE("Unrecognised chat mode. Please enter either 'a','f' or 'p'"), - - COMMAND_CHAT_MODE_PUBLIC("Public chat mode."), - COMMAND_CHAT_MODE_ALLIANCE("Alliance only chat mode."), - COMMAND_CHAT_MODE_FACTION("Faction only chat mode."), - - COMMAND_CHATSPY_ENABLE("You have enabled chat spying mode."), - COMMAND_CHATSPY_ENABLELOG(" has ENABLED chat spying mode."), - COMMAND_CHATSPY_DISABLE("You have disabled chat spying mode."), - COMMAND_CHATSPY_DISABLELOG(" has DISABLED chat spying mode."), - - COMMAND_CLAIM_INVALIDRADIUS("If you specify a radius, it must be at least 1."), - COMMAND_CLAIM_DENIED("You do not have permission to claim in a radius."), - - COMMAND_CONFIG_NOEXIST("No configuration setting \"%s\" exists."), - COMMAND_CONFIG_SET_TRUE("\" option set to true (enabled)."), - COMMAND_CONFIG_SET_FALSE("\" option set to false (disabled)."), - COMMAND_CONFIG_OPTIONSET("\" option set to "), - COMMAND_CONFIG_COLOURSET("\" color option set to \""), - 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_DOUBLEREQUIRED("Cannot set \"%s\": A double (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_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_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_REMOVED("\"%s\" set: Material \"%s\" removed."), - COMMAND_CONFIG_SET_ADDED("\"%s\" set: \"%s\" added."), - COMMAND_CONFIG_SET_REMOVED("\"%s\" set: \"%s\" removed."), - COMMAND_CONFIG_LOG(" (Command was run by %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_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_INVALID("command.convert.backend.invalid","Invalid backend"), - - COMMAND_CREATE_MUSTLEAVE("You must leave your current faction first."), - COMMAND_CREATE_INUSE("That tag is already in use."), - COMMAND_CREATE_TOCREATE("to create a new faction"), - COMMAND_CREATE_FORCREATE("for creating a new faction"), - COMMAND_CREATE_ERROR("There was an internal error while trying to create your faction. Please try again."), - COMMAND_CREATE_CREATED("%s created a new faction %s"), - COMMAND_CREATE_YOUSHOULD("You should now: %s"), - COMMAND_CREATE_CREATED_LOG(" created a new faction: "), - - COMMAND_DEINVITE_CANDEINVITE("Players you can deinvite: "), - COMMAND_DEINVITE_CLICKTODEINVITE("Click to revoke invite for %s"), - COMMAND_DEINVITE_ALREADYMEMBER("%s is already a member of %s"), - COMMAND_DEINVITE_MIGHTWANT("You might want to: %s"), - COMMAND_DEINVITE_REVOKED("%s revoked your invitation to %s."), - COMMAND_DEINVITE_REVOKES("%s revoked %s's invitation."), - - COMMAND_DELFWARP_DELETED("Deleted warp %s"), - COMMAND_DELFWARP_INVALID("Couldn't find warp %s"), - COMMAND_DELFWARP_TODELETE("to delete warp"), - COMMAND_DELFWARP_FORDELETE("for deleting warp"), - - COMMAND_DESCRIPTION_CHANGES("You have changed the description for %s to:"), - COMMAND_DESCRIPTION_CHANGED("The faction %s changed their description to:"), - COMMAND_DESCRIPTION_TOCHANGE("to change faction description"), - COMMAND_DESCRIPTION_FORCHANGE("for changing faction description"), - - COMMAND_DISBAND_IMMUTABLE("You cannot disband the Wilderness, SafeZone, or WarZone."), - COMMAND_DISBAND_MARKEDPERMANENT("This faction is designated as permanent, so you cannot disband it."), - COMMAND_DISBAND_BROADCAST_YOURS("%s disbanded your faction."), - COMMAND_DISBAND_BROADCAST_NOTYOURS("%s disbanded the faction %s."), - COMMAND_DISBAND_HOLDINGS("You have been given the disbanded faction's bank, totaling %s."), - - COMMAND_FWARP_CLICKTOWARP("Click to warp!"), - COMMAND_FWARP_COMMANDFORMAT("/f warp "), - COMMAND_FWARP_WARPED("Warped to %s"), - COMMAND_FWARP_INVALID("Couldn't find warp %s"), - COMMAND_FWARP_TOWARP("to warp"), - COMMAND_FWARP_FORWARPING("for warping"), - COMMAND_FWARP_WARPS("Warps: "), - - COMMAND_HELP_404("This page does not exist"), - COMMAND_HELP_NEXTCREATE("Learn how to create a faction on the next page."), - COMMAND_HELP_INVITATIONS("command.help.invitations","You might want to close it and use invitations:"), - COMMAND_HELP_HOME("And don't forget to set your home:"), - COMMAND_HELP_BANK_1("Your faction has a bank which is used to pay for certain"), + /** + * Translation meta + */ + _AUTHOR("misc"), + _RESPONSIBLE("misc"), + _LANGUAGE("English"), + _ENCODING("UTF-8"), + _LOCALE("en_US"), + _REQUIRESUNICODE("false"), + _DEFAULT("true"), + _STATE("complete"), //incomplete, limited, partial, majority, complete + /** + * Localised translation meta + */ + _LOCAL_AUTHOR("misc"), + _LOCAL_RESPONSIBLE("misc"), + _LOCAL_LANGUAGE("English"), + _LOCAL_REGION("US"), + _LOCAL_STATE("complete"), //And this is the English version. It's not ever going to be not complete. + + /** + * Command translations + */ + COMMAND_ADMIN_NOTMEMBER("%s is not a member in your faction."), + COMMAND_ADMIN_NOTADMIN("You are not the faction admin."), + COMMAND_ADMIN_TARGETSELF("The target player musn't be yourself."), + COMMAND_ADMIN_DEMOTES("You have demoted %s from the position of faction admin."), + COMMAND_ADMIN_DEMOTED("You have been demoted from the position of faction admin by %s."), + COMMAND_ADMIN_PROMOTES("You have promoted %s to the position of faction admin."), + COMMAND_ADMIN_PROMOTED("%s gave %s the leadership of %s."), + + COMMAND_AUTOCLAIM_ENABLED("Now auto-claiming land for %s."), + COMMAND_AUTOCLAIM_DISABLED("Auto-claiming of land disabled."), + COMMAND_AUTOCLAIM_REQUIREDRANK("You must be %s to claim land."), + COMMAND_AUTOCLAIM_OTHERFACTION("You can't claim land for %s."), + + COMMAND_AUTOHELP_HELPFOR("Help for command \""), + + COMMAND_BOOM_PEACEFULONLY("This command is only usable by factions which are specifically designated as peaceful."), + COMMAND_BOOM_TOTOGGLE("to toggle explosions"), + COMMAND_BOOM_FORTOGGLE("for toggling explosions"), + COMMAND_BOOM_ENABLED("%s has %s explosions in your faction's territory."), + + COMMAND_BYPASS_ENABLE("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_DISABLE("You have disabled admin bypass mode."), + COMMAND_BYPASS_DISABLELOG(" has DISABLED admin bypass mode."), + + COMMAND_CHAT_DISABLED("The built in chat chat channels are disabled on this server."), + COMMAND_CHAT_INVALIDMODE("Unrecognised chat mode. Please enter either 'a','f' or 'p'"), + + COMMAND_CHAT_MODE_PUBLIC("Public chat mode."), + COMMAND_CHAT_MODE_ALLIANCE("Alliance only chat mode."), + COMMAND_CHAT_MODE_FACTION("Faction only chat mode."), + + COMMAND_CHATSPY_ENABLE("You have enabled chat spying mode."), + COMMAND_CHATSPY_ENABLELOG(" has ENABLED chat spying mode."), + COMMAND_CHATSPY_DISABLE("You have disabled chat spying mode."), + COMMAND_CHATSPY_DISABLELOG(" has DISABLED chat spying mode."), + + COMMAND_CLAIM_INVALIDRADIUS("If you specify a radius, it must be at least 1."), + COMMAND_CLAIM_DENIED("You do not have permission to claim in a radius."), + + COMMAND_CONFIG_NOEXIST("No configuration setting \"%s\" exists."), + COMMAND_CONFIG_SET_TRUE("\" option set to true (enabled)."), + COMMAND_CONFIG_SET_FALSE("\" option set to false (disabled)."), + COMMAND_CONFIG_OPTIONSET("\" option set to "), + COMMAND_CONFIG_COLOURSET("\" color option set to \""), + 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_DOUBLEREQUIRED("Cannot set \"%s\": A double (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_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_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_REMOVED("\"%s\" set: Material \"%s\" removed."), + COMMAND_CONFIG_SET_ADDED("\"%s\" set: \"%s\" added."), + COMMAND_CONFIG_SET_REMOVED("\"%s\" set: \"%s\" removed."), + COMMAND_CONFIG_LOG(" (Command was run by %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_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_INVALID("command.convert.backend.invalid", "Invalid backend"), + + COMMAND_CREATE_MUSTLEAVE("You must leave your current faction first."), + COMMAND_CREATE_INUSE("That tag is already in use."), + COMMAND_CREATE_TOCREATE("to create a new faction"), + COMMAND_CREATE_FORCREATE("for creating a new faction"), + COMMAND_CREATE_ERROR("There was an internal error while trying to create your faction. Please try again."), + COMMAND_CREATE_CREATED("%s created a new faction %s"), + COMMAND_CREATE_YOUSHOULD("You should now: %s"), + COMMAND_CREATE_CREATED_LOG(" created a new faction: "), + + COMMAND_DEINVITE_CANDEINVITE("Players you can deinvite: "), + COMMAND_DEINVITE_CLICKTODEINVITE("Click to revoke invite for %s"), + COMMAND_DEINVITE_ALREADYMEMBER("%s is already a member of %s"), + COMMAND_DEINVITE_MIGHTWANT("You might want to: %s"), + COMMAND_DEINVITE_REVOKED("%s revoked your invitation to %s."), + COMMAND_DEINVITE_REVOKES("%s revoked %s's invitation."), + + COMMAND_DELFWARP_DELETED("Deleted warp %s"), + COMMAND_DELFWARP_INVALID("Couldn't find warp %s"), + COMMAND_DELFWARP_TODELETE("to delete warp"), + COMMAND_DELFWARP_FORDELETE("for deleting warp"), + + COMMAND_DESCRIPTION_CHANGES("You have changed the description for %s to:"), + COMMAND_DESCRIPTION_CHANGED("The faction %s changed their description to:"), + COMMAND_DESCRIPTION_TOCHANGE("to change faction description"), + COMMAND_DESCRIPTION_FORCHANGE("for changing faction description"), + + COMMAND_DISBAND_IMMUTABLE("You cannot disband the Wilderness, SafeZone, or WarZone."), + COMMAND_DISBAND_MARKEDPERMANENT("This faction is designated as permanent, so you cannot disband it."), + COMMAND_DISBAND_BROADCAST_YOURS("%s disbanded your faction."), + COMMAND_DISBAND_BROADCAST_NOTYOURS("%s disbanded the faction %s."), + COMMAND_DISBAND_HOLDINGS("You have been given the disbanded faction's bank, totaling %s."), + + COMMAND_FWARP_CLICKTOWARP("Click to warp!"), + COMMAND_FWARP_COMMANDFORMAT("/f warp "), + COMMAND_FWARP_WARPED("Warped to %s"), + COMMAND_FWARP_INVALID("Couldn't find warp %s"), + COMMAND_FWARP_TOWARP("to warp"), + COMMAND_FWARP_FORWARPING("for warping"), + COMMAND_FWARP_WARPS("Warps: "), + + COMMAND_HELP_404("This page does not exist"), + COMMAND_HELP_NEXTCREATE("Learn how to create a faction on the next page."), + COMMAND_HELP_INVITATIONS("command.help.invitations", "You might want to close it and use invitations:"), + COMMAND_HELP_HOME("And don't forget to set your home:"), + COMMAND_HELP_BANK_1("Your faction has a bank which is used to pay for certain"), COMMAND_HELP_BANK_2("things, so it will need to have money deposited into it."), COMMAND_HELP_BANK_3("To learn more, use the money command."), - COMMAND_HELP_PLAYERTITLES("Player titles are just for fun. No rules connected to them."), + COMMAND_HELP_PLAYERTITLES("Player titles are just for fun. No rules connected to them."), COMMAND_HELP_OWNERSHIP_1("Claimed land with ownership set is further protected so"), COMMAND_HELP_OWNERSHIP_2("that only the owner(s), faction admin, and possibly the"), COMMAND_HELP_OWNERSHIP_3("faction moderators have full access."), @@ -191,129 +191,129 @@ public enum TL { COMMAND_HELP_MOAR_1("Finally some commands for the server admins:"), COMMAND_HELP_MOAR_2("More commands for server admins:"), COMMAND_HELP_MOAR_3("Even more commands for server admins:"), - + COMMAND_HOME_DISABLED("Sorry, Faction homes are disabled on this server."), COMMAND_HOME_TELEPORTDISABLED("Sorry, the ability to teleport to Faction homes is disabled on this server."), COMMAND_HOME_NOHOME("Your faction does not have a home. "), COMMAND_HOME_INENEMY("You cannot teleport to your faction home while in the territory of an enemy faction."), COMMAND_HOME_WRONGWORLD("You cannot teleport to your faction home while in a different world."), COMMAND_HOME_ENEMYNEAR("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_FORTELEPORT("for teleporting to your faction home"), - - COMMAND_INVITE_TOINVITE("to invite someone"), - COMMAND_INVITE_FORINVITE("for inviting someone"), - COMMAND_INVITE_CLICKTOJOIN("Click to join!"), - COMMAND_INVITE_INVITEDYOU(" has invited you to join "), - COMMAND_INVITE_INVITED("%s invited %s to your faction."), - COMMAND_INVITE_ALREADYMEMBER("%s is already a member of %s"), - - COMMAND_JOIN_CANNOTFORCE("You do not have permission to move other players into a faction."), - COMMAND_JOIN_SYSTEMFACTION("Players may only join normal factions. This is a system faction."), - COMMAND_JOIN_ALREADYMEMBER("%s %s already a member of %s"), - COMMAND_JOIN_ATLIMIT(" ! The faction %s is at the limit of %d members, so %s cannot currently join."), - COMMAND_JOIN_INOTHERFACTION("%s must leave %s current faction first."), - COMMAND_JOIN_NEGATIVEPOWER("%s cannot join a faction with a negative power level."), - COMMAND_JOIN_REQUIRESINVITATION("This faction requires invitation."), - COMMAND_JOIN_ATTEMPTEDJOIN("%s tried to join your faction."), - COMMAND_JOIN_TOJOIN("to join a faction"), - COMMAND_JOIN_FORJOIN("for joining a faction"), - COMMAND_JOIN_SUCCESS("%s successfully joined %s."), - COMMAND_JOIN_MOVED("%s moved you into the faction %s."), - COMMAND_JOIN_JOINED("%s joined your faction."), - COMMAND_JOIN_JOINEDLOG("%s joined the faction %s."), - COMMAND_JOIN_MOVEDLOG("%s moved the player %s into the faction %s."), - - COMMAND_KICK_CANDIDATES("Players you can kick: "), - COMMAND_KICK_CLICKTOKICK("Click to kick "), - COMMAND_KICK_SELF("You cannot kick yourself."), - COMMAND_KICK_OFFLINE("Something went wrong with getting the offline player's faction."), - COMMAND_KICK_NOTMEMBER("%s is not a member of %s"), - COMMAND_KICK_INSUFFICIENTRANK("Your rank is too low to kick this player."), - COMMAND_KICK_NEGATIVEPOWER("You cannot kick that member until their power is positive."), - COMMAND_KICK_TOKICK("to kick someone from the faction"), - COMMAND_KICK_FORKICK("for kicking someone from the faction"), - COMMAND_KICK_FACTION("%s kicked %s from the faction! :O"), //message given to faction members - COMMAND_KICK_KICKS("You kicked %s from the faction %s!"), //kicker perspective - COMMAND_KICK_KICKED("%s kicked you from %s! :O"), //kicked player perspective - - - COMMAND_LIST_FACTIONLIST("Faction List "), - COMMAND_LIST_TOLIST("to list the factions"), - COMMAND_LIST_FORLIST("for listing the factions"), - COMMAND_LIST_ONLINEFACTIONLESS("Online factionless: "), - - COMMAND_LOCK_LOCKED("Factions is now locked"), - COMMAND_LOCK_UNLOCKED("Factions in now unlocked"), - - COMMAND_MAP_TOSHOW("to show the map"), - COMMAND_MAP_FORSHOW("for showing the map"), - COMMAND_MAP_UPDATE_ENABLED("Map auto update ENABLED."), - COMMAND_MAP_UPDATE_DISABLED("Map auto update DISABLED."), - - COMMAND_MOD_CANDIDATES("Players you can promote: "), - COMMAND_MOD_CLICKTOPROMOTE("Click to promote "), - COMMAND_MOD_NOTMEMBER("%s is not a member in your faction."), - COMMAND_MOD_NOTADMIN("You are not the faction admin."), - COMMAND_MOD_SELF("The target player musn't be yourself."), - COMMAND_MOD_TARGETISADMIN("The target player is a faction admin. Demote them first."), - COMMAND_MOD_REVOKES("You have removed moderator status from %s."), - COMMAND_MOD_REVOKED("%s is no longer moderator in your faction."), - COMMAND_MOD_PROMOTES("%s was promoted to moderator in your faction."), - COMMAND_MOD_PROMOTED("You have promoted %s to moderator."), - - COMMAND_MODIFYPOWER_ADDED("Added %f power to %s. New total rounded power: %d"), - - COMMAND_MONEY_SHORT("faction money commands"), - COMMAND_MONEY_LONG("The faction money commands."), - - COMMAND_MONEYBALANCE_SHORT("show faction balance"), - - COMMAND_MONEYDEPOSIT_SHORT("deposit money"), - COMMAND_MONEYDEPOSIT_DEPOSITED("%s deposited %s in the faction bank: %s"), - - COMMAND_MONEYTRANSFERFF_SHORT("transfer f -> f"), - COMMAND_MONEYTRANSFERFF_TRANSFER("%s transferred %s from the faction \"%s\" to the faction \"%s\""), - - COMMAND_MONEYTRANSFERFP_SHORT("transfer f -> p"), - COMMAND_MONEYTRANSFERFP_TRANSFER("%s transferred %s from the faction \"%s\" to the player \"%s\""), - - COMMAND_MONEYTRANSFERPF_SHORT("transfer p -> f"), - COMMAND_MONEYTRANSFERPF_TRANSFER("%s transferred %s from the player \"%s\" to the faction \"%s\""), - - COMMAND_MONEYWITHDRAW_SHORT("withdraw money"), - COMMAND_MONEYWITHDRAW_WITHDRAW("%s withdrew %s from the faction bank: %s"), - - COMMAND_OPEN_TOOPEN("to open or close the faction"), - COMMAND_OPEN_FOROPEN("for opening or closing the faction"), - COMMAND_OPEN_OPEN("open"), - COMMAND_OPEN_CLOSED("closed"), - COMMAND_OPEN_CHANGES("%s changed the faction to %s."), - COMMAND_OPEN_CHANGED("The faction %s is now %s"), - - COMMAND_OWNER_DISABLED("Sorry, but owned areas are disabled on this server."), - COMMAND_OWNER_LIMIT("Sorry, but you have reached the server's limit of %d owned areas per faction."), - COMMAND_OWNER_WRONGFACTION("This land is not claimed by your faction, so you can't set ownership of it."), - COMMAND_OWNER_NOTCLAIMED("This land is not claimed by a faction. Ownership is not possible."), - COMMAND_OWNER_NOTMEMBER("%s is not a member of this faction."), - COMMAND_OWNER_CLEARED("You have cleared ownership for this claimed area."), - COMMAND_OWNER_REMOVED("You have removed ownership of this claimed land from %s."), - COMMAND_OWNER_TOSET("to set ownership of claimed land"), - COMMAND_OWNER_FORSET("for setting ownership of claimed land"), - COMMAND_OWNER_ADDED("You have added %s to the owner list for this claimed land."), - - COMMAND_OWNERLIST_DISABLED("Sorry, but owned areas are disabled on this server."),//dup-> - COMMAND_OWNERLIST_WRONGFACTION("This land is not claimed by your faction."),//eq - COMMAND_OWNERLIST_NOTCLAIMED("This land is not claimed by any faction, thus no owners."),//eq - COMMAND_OWNERLIST_NONE("No owners are set here; everyone in the faction has access."), - COMMAND_OWNERLIST_OWNERS("Current owner(s) of this land: %s"), - - COMMAND_POWER_TOSHOW("to show player power info"), - COMMAND_POWER_FORSHOW("for showing player power info"), - COMMAND_POWER_POWER("%s - Power / Maxpower: %d / %d %s"), - COMMAND_POWER_BONUS(" (bonus: "), - COMMAND_POWER_PENALTY(" (penalty: "), - + COMMAND_HOME_TOTELEPORT("to teleport to your faction home"), + COMMAND_HOME_FORTELEPORT("for teleporting to your faction home"), + + COMMAND_INVITE_TOINVITE("to invite someone"), + COMMAND_INVITE_FORINVITE("for inviting someone"), + COMMAND_INVITE_CLICKTOJOIN("Click to join!"), + COMMAND_INVITE_INVITEDYOU(" has invited you to join "), + COMMAND_INVITE_INVITED("%s invited %s to your faction."), + COMMAND_INVITE_ALREADYMEMBER("%s is already a member of %s"), + + COMMAND_JOIN_CANNOTFORCE("You do not have permission to move other players into a faction."), + COMMAND_JOIN_SYSTEMFACTION("Players may only join normal factions. This is a system faction."), + COMMAND_JOIN_ALREADYMEMBER("%s %s already a member of %s"), + COMMAND_JOIN_ATLIMIT(" ! The faction %s is at the limit of %d members, so %s cannot currently join."), + COMMAND_JOIN_INOTHERFACTION("%s must leave %s current faction first."), + COMMAND_JOIN_NEGATIVEPOWER("%s cannot join a faction with a negative power level."), + COMMAND_JOIN_REQUIRESINVITATION("This faction requires invitation."), + COMMAND_JOIN_ATTEMPTEDJOIN("%s tried to join your faction."), + COMMAND_JOIN_TOJOIN("to join a faction"), + COMMAND_JOIN_FORJOIN("for joining a faction"), + COMMAND_JOIN_SUCCESS("%s successfully joined %s."), + COMMAND_JOIN_MOVED("%s moved you into the faction %s."), + COMMAND_JOIN_JOINED("%s joined your faction."), + COMMAND_JOIN_JOINEDLOG("%s joined the faction %s."), + COMMAND_JOIN_MOVEDLOG("%s moved the player %s into the faction %s."), + + COMMAND_KICK_CANDIDATES("Players you can kick: "), + COMMAND_KICK_CLICKTOKICK("Click to kick "), + COMMAND_KICK_SELF("You cannot kick yourself."), + COMMAND_KICK_OFFLINE("Something went wrong with getting the offline player's faction."), + COMMAND_KICK_NOTMEMBER("%s is not a member of %s"), + COMMAND_KICK_INSUFFICIENTRANK("Your rank is too low to kick this player."), + COMMAND_KICK_NEGATIVEPOWER("You cannot kick that member until their power is positive."), + COMMAND_KICK_TOKICK("to kick someone from the faction"), + COMMAND_KICK_FORKICK("for kicking someone from the faction"), + COMMAND_KICK_FACTION("%s kicked %s from the faction! :O"), //message given to faction members + COMMAND_KICK_KICKS("You kicked %s from the faction %s!"), //kicker perspective + COMMAND_KICK_KICKED("%s kicked you from %s! :O"), //kicked player perspective + + + COMMAND_LIST_FACTIONLIST("Faction List "), + COMMAND_LIST_TOLIST("to list the factions"), + COMMAND_LIST_FORLIST("for listing the factions"), + COMMAND_LIST_ONLINEFACTIONLESS("Online factionless: "), + + COMMAND_LOCK_LOCKED("Factions is now locked"), + COMMAND_LOCK_UNLOCKED("Factions in now unlocked"), + + COMMAND_MAP_TOSHOW("to show the map"), + COMMAND_MAP_FORSHOW("for showing the map"), + COMMAND_MAP_UPDATE_ENABLED("Map auto update ENABLED."), + COMMAND_MAP_UPDATE_DISABLED("Map auto update DISABLED."), + + COMMAND_MOD_CANDIDATES("Players you can promote: "), + COMMAND_MOD_CLICKTOPROMOTE("Click to promote "), + COMMAND_MOD_NOTMEMBER("%s is not a member in your faction."), + COMMAND_MOD_NOTADMIN("You are not the faction admin."), + COMMAND_MOD_SELF("The target player musn't be yourself."), + COMMAND_MOD_TARGETISADMIN("The target player is a faction admin. Demote them first."), + COMMAND_MOD_REVOKES("You have removed moderator status from %s."), + COMMAND_MOD_REVOKED("%s is no longer moderator in your faction."), + COMMAND_MOD_PROMOTES("%s was promoted to moderator in your faction."), + COMMAND_MOD_PROMOTED("You have promoted %s to moderator."), + + COMMAND_MODIFYPOWER_ADDED("Added %f power to %s. New total rounded power: %d"), + + COMMAND_MONEY_SHORT("faction money commands"), + COMMAND_MONEY_LONG("The faction money commands."), + + COMMAND_MONEYBALANCE_SHORT("show faction balance"), + + COMMAND_MONEYDEPOSIT_SHORT("deposit money"), + COMMAND_MONEYDEPOSIT_DEPOSITED("%s deposited %s in the faction bank: %s"), + + COMMAND_MONEYTRANSFERFF_SHORT("transfer f -> f"), + COMMAND_MONEYTRANSFERFF_TRANSFER("%s transferred %s from the faction \"%s\" to the faction \"%s\""), + + COMMAND_MONEYTRANSFERFP_SHORT("transfer f -> p"), + COMMAND_MONEYTRANSFERFP_TRANSFER("%s transferred %s from the faction \"%s\" to the player \"%s\""), + + COMMAND_MONEYTRANSFERPF_SHORT("transfer p -> f"), + COMMAND_MONEYTRANSFERPF_TRANSFER("%s transferred %s from the player \"%s\" to the faction \"%s\""), + + COMMAND_MONEYWITHDRAW_SHORT("withdraw money"), + COMMAND_MONEYWITHDRAW_WITHDRAW("%s withdrew %s from the faction bank: %s"), + + COMMAND_OPEN_TOOPEN("to open or close the faction"), + COMMAND_OPEN_FOROPEN("for opening or closing the faction"), + COMMAND_OPEN_OPEN("open"), + COMMAND_OPEN_CLOSED("closed"), + COMMAND_OPEN_CHANGES("%s changed the faction to %s."), + COMMAND_OPEN_CHANGED("The faction %s is now %s"), + + COMMAND_OWNER_DISABLED("Sorry, but owned areas are disabled on this server."), + COMMAND_OWNER_LIMIT("Sorry, but you have reached the server's limit of %d owned areas per faction."), + COMMAND_OWNER_WRONGFACTION("This land is not claimed by your faction, so you can't set ownership of it."), + COMMAND_OWNER_NOTCLAIMED("This land is not claimed by a faction. Ownership is not possible."), + COMMAND_OWNER_NOTMEMBER("%s is not a member of this faction."), + COMMAND_OWNER_CLEARED("You have cleared ownership for this claimed area."), + COMMAND_OWNER_REMOVED("You have removed ownership of this claimed land from %s."), + COMMAND_OWNER_TOSET("to set ownership of claimed land"), + COMMAND_OWNER_FORSET("for setting ownership of claimed land"), + COMMAND_OWNER_ADDED("You have added %s to the owner list for this claimed land."), + + COMMAND_OWNERLIST_DISABLED("Sorry, but owned areas are disabled on this server."),//dup-> + COMMAND_OWNERLIST_WRONGFACTION("This land is not claimed by your faction."),//eq + COMMAND_OWNERLIST_NOTCLAIMED("This land is not claimed by any faction, thus no owners."),//eq + COMMAND_OWNERLIST_NONE("No owners are set here; everyone in the faction has access."), + COMMAND_OWNERLIST_OWNERS("Current owner(s) of this land: %s"), + + COMMAND_POWER_TOSHOW("to show player power info"), + COMMAND_POWER_FORSHOW("for showing player power info"), + COMMAND_POWER_POWER("%s - Power / Maxpower: %d / %d %s"), + COMMAND_POWER_BONUS(" (bonus: "), + COMMAND_POWER_PENALTY(" (penalty: "), + COMMAND_POWERBOOST_HELP_1("You must specify \"p\" or \"player\" to target a player or \"f\" or \"faction\" to target a faction."), COMMAND_POWERBOOST_HELP_2("ex. /f powerboost p SomePlayer 0.5 -or- /f powerboost f SomeFaction -5"), COMMAND_POWERBOOST_INVALIDNUM("You must specify a valid numeric value for the power bonus/penalty amount."), @@ -321,28 +321,28 @@ public enum TL { COMMAND_POWERBOOST_FACTION("Faction \"%s\""), COMMAND_POWERBOOST_BOOST("%s now has a power bonus/penalty of %d to min and max power levels."), COMMAND_POWERBOOST_BOOSTLOG("%s has set the power bonus/penalty for %s to %d."), - + COMMAND_RELOAD_TIME("Reloaded conf.json from disk, took %dms."), - + COMMAND_SAFEUNCLAIMALL_SHORT("Unclaim all safezone land"), COMMAND_SAFEUNCLAIMALL_UNCLAIMED("You unclaimed ALL safe zone land."), COMMAND_SAFEUNCLAIMALL_UNCLAIMEDLOG("%s unclaimed all safe zones."), - + COMMAND_SAVEALL("Factions saved to disk!"), - + COMMAND_SETFWARP_NOTCLAIMED("You can only set warps in your faction territory."), COMMAND_SETFWARP_LIMIT("Your Faction already has the max amount of warps set (%d)."), COMMAND_SETFWARP_SET("Set warp %s to your location."), COMMAND_SETFWARP_TOSET("to set warp"), COMMAND_SETFWARP_FORSET("for setting warp"), - + COMMAND_SETHOME_DISABLED("Sorry, Faction homes are disabled on this server."), COMMAND_SETHOME_NOTCLAIMED("Sorry, your faction home can only be set inside your own claimed territory."), COMMAND_SETHOME_TOSET("to set the faction home"), COMMAND_SETHOME_FORSET("for setting the faction home"), COMMAND_SETHOME_SET("%s set the home for your faction. You can now use:"), COMMAND_SETHOME_SETOTHER("You have set the home for the %s faction."), - + COMMAND_SHOW_TOSHOW("to show faction information"), COMMAND_SHOW_FORSHOW("for showing faction information"), COMMAND_SHOW_DESCRIPTION("Description: %s"), @@ -352,85 +352,85 @@ public enum TL { COMMAND_SHOW_INVITATION("invitation is required"), COMMAND_SHOW_UNINVITED("no invitation is needed"), COMMAND_SHOW_POWER("Land / Power / Maxpower: %d/%d/%d %s"), - COMMAND_SHOW_BONUS(" (bonus: "), - COMMAND_SHOW_PENALTY(" (penalty: "), - COMMAND_SHOW_DEPRECIATED("(%s depreciated)"), //This is spelled correctly. - COMMAND_SHOW_LANDVALUE("Total land value: %s%s"), - COMMAND_SHOW_BANKCONTAINS("Bank contains: %s"), - COMMAND_SHOW_ALLIES("Allies: "), - COMMAND_SHOW_ENEMIES("Enemies: "), - COMMAND_SHOW_MEMBERSONLINE("Members online: "), - COMMAND_SHOW_MEMBERSOFFLINE("Members offline: "), - - COMMAND_SHOWINVITES_PENDING("Players with pending invites: "), - COMMAND_SHOWINVITES_CLICKTOREVOKE("Click to revoke invite for %s"), - - COMMAND_STATUS_FORMAT("%s Power: %s Last Seen: %s"), - COMMAND_STATUS_ONLINE("Online"), - COMMAND_STATUS_AGOSUFFIX(" ago."), - - COMMAND_TAG_TAKEN("That tag is already taken"), - COMMAND_TAG_TOCHANGE("to change the faction tag"), - COMMAND_TAG_FORCHANGE("for changing the faction tag"), - COMMAND_TAG_FACTION("%s changed your faction tag to %s"), - COMMAND_TAG_CHANGED("The faction %s changed their name to %s."), - - COMMAND_TITLE_TOCHANGE("to change a players title"), - COMMAND_TITLE_FORCHANGE("for changing a players title"), - COMMAND_TITLE_CHANGED("%s changed a title: %s"), - - COMMAND_UNCLAIM_SAFEZONE_SUCCESS("Safe zone was unclaimed."), - COMMAND_UNCLAIM_SAFEZONE_NOPERM("This is a safe zone. You lack permissions to unclaim."), - COMMAND_UNCLAIM_WARZONE_SUCCESS("War zone was unclaimed."), - COMMAND_UNCLAIM_WARZONE_NOPERM("This is a war zone. You lack permissions to unclaim."), - COMMAND_UNCLAIM_UNCLAIMED("%s unclaimed some of your land."), - COMMAND_UNCLAIM_UNCLAIMS("You unclaimed this land."), - COMMAND_UNCLAIM_LOG("%s unclaimed land at (%s) from the faction: %s"), - COMMAND_UNCLAIM_WRONGFACTION("You don't own this land."), - COMMAND_UNCLAIM_TOUNCLAIM("to unclaim this land"), - COMMAND_UNCLAIM_FORUNCLAIM("for unclaiming this land"), - COMMAND_UNCLAIM_FACTIONUNCLAIMED("%s unclaimed some land."), - - COMMAND_UNCLAIMALL_TOUNCLAIM("to unclaim all faction land"), - COMMAND_UNCLAIMALL_FORUNCLAIM("for unclaiming all faction land"), - COMMAND_UNCLAIMALL_UNCLAIMED("%s unclaimed ALL of your faction's land."), - COMMAND_UNCLAIMALL_LOG("%s unclaimed everything for the faction: %s"), - - COMMAND_VERSION_VERSION("You are running %s"), - - COMMAND_WARUNCLAIMALL_SHORT("unclaim all warzone land"), - COMMAND_WARUNCLAIMALL_SUCCESS("You unclaimed ALL war zone land."), - COMMAND_WARUNCLAIMALL_LOG("%s unclaimed all war zones."), - - COMMAND_RELATIONS_ALLTHENOPE("Nope! You can't."), - COMMAND_RELATIONS_MORENOPE("Nope! You can't declare a relation to yourself :)"), - COMMAND_RELATIONS_ALREADYINRELATIONSHIP("You already have that relation wish set with %s."), - COMMAND_RELATIONS_TOMARRY("to change a relation wish"), - COMMAND_RELATIONS_FORMARRY("for changing a relation wish"), - COMMAND_RELATIONS_MUTUAL("Your faction is now %s to %s"), - COMMAND_RELATIONS_PEACEFUL("This will have no effect while your faction is peaceful."), - COMMAND_RELATIONS_PEACEFULOTHER("This will have no effect while their faction is peaceful."), - - COMMAND_RELATIONS_PROPOSAL_1("%s wishes to be your %s"), - COMMAND_RELATIONS_PROPOSAL_2("Type /%s %s %s to accept."), - COMMAND_RELATIONS_PROPOSAL_SENT("%s were informed that you wish to be %s"), - /** - * More generic translations, which will apply to more than one class. - */ - GENERIC_SERVERADMIN("A server admin"), - GENERIC_DISABLED("disabled"), - GENERIC_ENABLED("enabled"), - GENERIC_CONSOLEONLY("This command cannot be run as a player."), - GENERIC_ASKYOURLEADER(" Ask your leader to:"), - GENERIC_YOUSHOULD("You should:"), - GENERIC_YOUMAYWANT("You may want to: "), - GENERIC_TRANSLATION_VERSION("Translation: %s(%s,%s) State: %s"), - GENERIC_TRANSLATION_CONTRIBUTORS("Translation contributors: %s"), - GENERIC_TRANSLATION_RESPONSIBLE("Responsible for translation: %s"), - - /** - * Relations - */ + COMMAND_SHOW_BONUS(" (bonus: "), + COMMAND_SHOW_PENALTY(" (penalty: "), + COMMAND_SHOW_DEPRECIATED("(%s depreciated)"), //This is spelled correctly. + COMMAND_SHOW_LANDVALUE("Total land value: %s%s"), + COMMAND_SHOW_BANKCONTAINS("Bank contains: %s"), + COMMAND_SHOW_ALLIES("Allies: "), + COMMAND_SHOW_ENEMIES("Enemies: "), + COMMAND_SHOW_MEMBERSONLINE("Members online: "), + COMMAND_SHOW_MEMBERSOFFLINE("Members offline: "), + + COMMAND_SHOWINVITES_PENDING("Players with pending invites: "), + COMMAND_SHOWINVITES_CLICKTOREVOKE("Click to revoke invite for %s"), + + COMMAND_STATUS_FORMAT("%s Power: %s Last Seen: %s"), + COMMAND_STATUS_ONLINE("Online"), + COMMAND_STATUS_AGOSUFFIX(" ago."), + + COMMAND_TAG_TAKEN("That tag is already taken"), + COMMAND_TAG_TOCHANGE("to change the faction tag"), + COMMAND_TAG_FORCHANGE("for changing the faction tag"), + COMMAND_TAG_FACTION("%s changed your faction tag to %s"), + COMMAND_TAG_CHANGED("The faction %s changed their name to %s."), + + COMMAND_TITLE_TOCHANGE("to change a players title"), + COMMAND_TITLE_FORCHANGE("for changing a players title"), + COMMAND_TITLE_CHANGED("%s changed a title: %s"), + + COMMAND_UNCLAIM_SAFEZONE_SUCCESS("Safe zone was unclaimed."), + COMMAND_UNCLAIM_SAFEZONE_NOPERM("This is a safe zone. You lack permissions to unclaim."), + COMMAND_UNCLAIM_WARZONE_SUCCESS("War zone was unclaimed."), + COMMAND_UNCLAIM_WARZONE_NOPERM("This is a war zone. You lack permissions to unclaim."), + COMMAND_UNCLAIM_UNCLAIMED("%s unclaimed some of your land."), + COMMAND_UNCLAIM_UNCLAIMS("You unclaimed this land."), + COMMAND_UNCLAIM_LOG("%s unclaimed land at (%s) from the faction: %s"), + COMMAND_UNCLAIM_WRONGFACTION("You don't own this land."), + COMMAND_UNCLAIM_TOUNCLAIM("to unclaim this land"), + COMMAND_UNCLAIM_FORUNCLAIM("for unclaiming this land"), + COMMAND_UNCLAIM_FACTIONUNCLAIMED("%s unclaimed some land."), + + COMMAND_UNCLAIMALL_TOUNCLAIM("to unclaim all faction land"), + COMMAND_UNCLAIMALL_FORUNCLAIM("for unclaiming all faction land"), + COMMAND_UNCLAIMALL_UNCLAIMED("%s unclaimed ALL of your faction's land."), + COMMAND_UNCLAIMALL_LOG("%s unclaimed everything for the faction: %s"), + + COMMAND_VERSION_VERSION("You are running %s"), + + COMMAND_WARUNCLAIMALL_SHORT("unclaim all warzone land"), + COMMAND_WARUNCLAIMALL_SUCCESS("You unclaimed ALL war zone land."), + COMMAND_WARUNCLAIMALL_LOG("%s unclaimed all war zones."), + + COMMAND_RELATIONS_ALLTHENOPE("Nope! You can't."), + COMMAND_RELATIONS_MORENOPE("Nope! You can't declare a relation to yourself :)"), + COMMAND_RELATIONS_ALREADYINRELATIONSHIP("You already have that relation wish set with %s."), + COMMAND_RELATIONS_TOMARRY("to change a relation wish"), + COMMAND_RELATIONS_FORMARRY("for changing a relation wish"), + COMMAND_RELATIONS_MUTUAL("Your faction is now %s to %s"), + COMMAND_RELATIONS_PEACEFUL("This will have no effect while your faction is peaceful."), + COMMAND_RELATIONS_PEACEFULOTHER("This will have no effect while their faction is peaceful."), + + COMMAND_RELATIONS_PROPOSAL_1("%s wishes to be your %s"), + COMMAND_RELATIONS_PROPOSAL_2("Type /%s %s %s to accept."), + COMMAND_RELATIONS_PROPOSAL_SENT("%s were informed that you wish to be %s"), + /** + * More generic translations, which will apply to more than one class. + */ + GENERIC_SERVERADMIN("A server admin"), + GENERIC_DISABLED("disabled"), + GENERIC_ENABLED("enabled"), + GENERIC_CONSOLEONLY("This command cannot be run as a player."), + GENERIC_ASKYOURLEADER(" Ask your leader to:"), + GENERIC_YOUSHOULD("You should:"), + GENERIC_YOUMAYWANT("You may want to: "), + GENERIC_TRANSLATION_VERSION("Translation: %s(%s,%s) State: %s"), + GENERIC_TRANSLATION_CONTRIBUTORS("Translation contributors: %s"), + GENERIC_TRANSLATION_RESPONSIBLE("Responsible for translation: %s"), + + /** + * Relations + */ RELATION_MEMBER("member"), RELATION_ALLY("ally"), RELATION_NEUTRAL("neutral"), @@ -440,9 +440,9 @@ public enum TL { */ NOPAGES("Sorry. No Pages available."), INVALIDPAGE("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"), WILDERNESS("wilderness", "&2Wilderness"), WILDERNESS_DESCRIPTION("wilderness-description", ""), @@ -467,14 +467,17 @@ public enum TL { this.path = path; this.def = start; } - + /** * Lang enum constructor. Use this when your desired path simply exchanges '_' for '.' + * * @param start The default string. */ TL(String start) { this.path = this.name().replace('_', '.'); - if(this.path.startsWith(".")) path="root"+path; + if (this.path.startsWith(".")) { + path = "root" + path; + } this.def = start; } @@ -491,9 +494,9 @@ public enum TL { public String toString() { return this == TITLE ? ChatColor.translateAlternateColorCodes('&', LANG.getString(this.path, def)) + " " : ChatColor.translateAlternateColorCodes('&', LANG.getString(this.path, def)); } - - public String format(Object... args){ - return String.format(toString(), args); + + public String format(Object... args) { + return String.format(toString(), args); } /**