diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java b/src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java index b3e6b186..6635380c 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java @@ -84,4 +84,8 @@ public class CmdAdmin extends FCommand { } } + public TL getUsageTranslation(){ + return TL.COMMAND_ADMIN_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdAnnounce.java b/src/main/java/com/massivecraft/factions/cmd/CmdAnnounce.java index a1f7ed5e..32610e3a 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdAnnounce.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdAnnounce.java @@ -2,6 +2,8 @@ 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.StringUtils; import org.bukkit.ChatColor; import org.bukkit.entity.Player; @@ -39,4 +41,9 @@ public class CmdAnnounce extends FCommand { } } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_ANNOUNCE_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdAutoClaim.java b/src/main/java/com/massivecraft/factions/cmd/CmdAutoClaim.java index 0e90eb1e..5aa47e72 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdAutoClaim.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdAutoClaim.java @@ -34,7 +34,7 @@ public class CmdAutoClaim extends FCommand { if (!fme.canClaimForFaction(forFaction)) { if (myFaction == forFaction) { - msg(TL.COMMAND_AUTOCLAIM_REQUIREDRANK, Role.MODERATOR.toString()); + msg(TL.COMMAND_AUTOCLAIM_REQUIREDRANK, Role.MODERATOR.getTranslation()); } else { msg(TL.COMMAND_AUTOCLAIM_OTHERFACTION, forFaction.describeTo(fme)); } @@ -48,4 +48,9 @@ public class CmdAutoClaim extends FCommand { fme.attemptClaim(forFaction, me.getLocation(), true); } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_AUTOCLAIM_DESCRIPTION; + } + } \ No newline at end of file diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdAutoHelp.java b/src/main/java/com/massivecraft/factions/cmd/CmdAutoHelp.java index 77e294c6..b422401b 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdAutoHelp.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdAutoHelp.java @@ -39,4 +39,9 @@ public class CmdAutoHelp extends MCommand

{ sendMessage(p.txt.getPage(lines, this.argAsInt(0, 1), TL.COMMAND_AUTOHELP_HELPFOR.toString() + pcmd.aliases.get(0) + "\"")); } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_HELP_DESCRIPTION; + } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdBoom.java b/src/main/java/com/massivecraft/factions/cmd/CmdBoom.java index 6bdb3693..3ee2a83c 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdBoom.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdBoom.java @@ -41,4 +41,9 @@ public class CmdBoom extends FCommand { // Inform myFaction.msg(TL.COMMAND_BOOM_ENABLED, fme.describeTo(myFaction), enabled); } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_BOOM_DESCRIPTION; + } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdBypass.java b/src/main/java/com/massivecraft/factions/cmd/CmdBypass.java index 2496cccc..01044129 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdBypass.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdBypass.java @@ -35,4 +35,9 @@ public class CmdBypass extends FCommand { P.p.log(fme.getName() + TL.COMMAND_BYPASS_DISABLELOG.toString()); } } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_BYPASS_DESCRIPTION; + } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdChat.java b/src/main/java/com/massivecraft/factions/cmd/CmdChat.java index e54ab6ef..c374490d 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdChat.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdChat.java @@ -58,4 +58,9 @@ public class CmdChat extends FCommand { msg(TL.COMMAND_CHAT_MODE_FACTION); } } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_CHAT_DESCRIPTION; + } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdChatSpy.java b/src/main/java/com/massivecraft/factions/cmd/CmdChatSpy.java index 4776e8bb..c5e35fa1 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdChatSpy.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdChatSpy.java @@ -33,4 +33,9 @@ public class CmdChatSpy extends FCommand { P.p.log(fme.getName() + TL.COMMAND_CHATSPY_DISABLELOG.toString()); } } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_CHATSPY_DESCRIPTION; + } } \ No newline at end of file diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdClaim.java b/src/main/java/com/massivecraft/factions/cmd/CmdClaim.java index 5a7aeb0b..5bcddf15 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdClaim.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdClaim.java @@ -68,4 +68,9 @@ public class CmdClaim extends FCommand { } } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_CLAIM_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdConfig.java b/src/main/java/com/massivecraft/factions/cmd/CmdConfig.java index 766b99c3..956b6b4e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdConfig.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdConfig.java @@ -240,4 +240,9 @@ public class CmdConfig extends FCommand { Conf.save(); } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_CONFIG_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdConvert.java b/src/main/java/com/massivecraft/factions/cmd/CmdConvert.java index 685f9ada..42cf9173 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdConvert.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdConvert.java @@ -36,4 +36,9 @@ public class CmdConvert extends FCommand { Conf.backEnd = nb; } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_CONVERT_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java b/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java index aa7cb40f..7b70b011 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java @@ -98,4 +98,9 @@ public class CmdCreate extends FCommand { } } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_CREATE_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java b/src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java index e29e6573..2300034e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java @@ -54,4 +54,9 @@ public class CmdDeinvite extends FCommand { myFaction.msg(TL.COMMAND_DEINVITE_REVOKES, fme.describeTo(myFaction), you.describeTo(myFaction)); } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_DEINVITE_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdDelFWarp.java b/src/main/java/com/massivecraft/factions/cmd/CmdDelFWarp.java index df8cb5ca..00583e25 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdDelFWarp.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdDelFWarp.java @@ -36,4 +36,9 @@ public class CmdDelFWarp 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.delwarp", 5), TL.COMMAND_DELFWARP_TODELETE.toString(), TL.COMMAND_DELFWARP_FORDELETE.toString()); } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_DELFWARP_DESCRIPTION; + } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdDescription.java b/src/main/java/com/massivecraft/factions/cmd/CmdDescription.java index ba8b1bd2..dc04d8b8 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdDescription.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdDescription.java @@ -48,4 +48,9 @@ public class CmdDescription extends FCommand { } } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_DESCRIPTION_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java b/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java index 7005d7fc..bb72f340 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java @@ -99,4 +99,9 @@ public class CmdDisband extends FCommand { Factions.getInstance().removeFaction(faction.getId()); FTeamWrapper.applyUpdates(faction); } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_DISBAND_DESCRIPTION; + } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java b/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java index 8e2ddba5..db3c5e83 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java @@ -58,4 +58,9 @@ public class CmdFWarp 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.warp", 5), TL.COMMAND_FWARP_TOWARP.toString(), TL.COMMAND_FWARP_FORWARPING.toString()); } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_FWARP_DESCRIPTION; + } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdHelp.java b/src/main/java/com/massivecraft/factions/cmd/CmdHelp.java index adce079f..6a2f5f2b 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdHelp.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdHelp.java @@ -187,5 +187,10 @@ public class CmdHelp extends FCommand { pageLines.add(p.cmdBase.cmdVersion.getUseageTemplate(true)); helpPages.add(pageLines); } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_HELP_DESCRIPTION; + } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdHome.java b/src/main/java/com/massivecraft/factions/cmd/CmdHome.java index 22351b1a..8107d6f8 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdHome.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdHome.java @@ -128,4 +128,9 @@ public class CmdHome extends FCommand { }, this.p.getConfig().getLong("warmups.f-home", 0)); } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_HOME_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdInvite.java b/src/main/java/com/massivecraft/factions/cmd/CmdInvite.java index 1e5b15a9..05eeac4c 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdInvite.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdInvite.java @@ -58,4 +58,9 @@ public class CmdInvite extends FCommand { myFaction.msg(TL.COMMAND_INVITE_INVITED, fme.describeTo(myFaction, true), you.describeTo(myFaction)); } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_INVITE_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdJoin.java b/src/main/java/com/massivecraft/factions/cmd/CmdJoin.java index 5bcc467c..9de7bb55 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdJoin.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdJoin.java @@ -110,4 +110,9 @@ public class CmdJoin extends FCommand { } } } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_JOIN_DESCRIPTION; + } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdKick.java b/src/main/java/com/massivecraft/factions/cmd/CmdKick.java index dba81901..49d4591e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdKick.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdKick.java @@ -117,4 +117,9 @@ public class CmdKick extends FCommand { toKick.resetFactionData(); } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_KICK_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdLeave.java b/src/main/java/com/massivecraft/factions/cmd/CmdLeave.java index b5e4273c..635b1da4 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdLeave.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdLeave.java @@ -1,6 +1,7 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.struct.Permission; +import com.massivecraft.factions.zcore.util.TL; public class CmdLeave extends FCommand { @@ -25,4 +26,9 @@ public class CmdLeave extends FCommand { fme.leave(true); } + @Override + public TL getUsageTranslation() { + return TL.LEAVE_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdList.java b/src/main/java/com/massivecraft/factions/cmd/CmdList.java index 5298e452..5793068a 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdList.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdList.java @@ -4,6 +4,7 @@ import com.massivecraft.factions.Conf; import com.massivecraft.factions.Faction; import com.massivecraft.factions.Factions; import com.massivecraft.factions.struct.Permission; +import com.massivecraft.factions.zcore.util.TL; import java.util.ArrayList; import java.util.Collections; @@ -101,4 +102,9 @@ public class CmdList extends FCommand { sendMessage(lines); } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_LIST_DESCRIPTION; + } } \ No newline at end of file diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdLock.java b/src/main/java/com/massivecraft/factions/cmd/CmdLock.java index 7b775278..4b195baa 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdLock.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdLock.java @@ -34,4 +34,9 @@ public class CmdLock extends FCommand { msg(p.getLocked() ? TL.COMMAND_LOCK_LOCKED : TL.COMMAND_LOCK_UNLOCKED); } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_LOCK_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdLogins.java b/src/main/java/com/massivecraft/factions/cmd/CmdLogins.java index 8b6ddbe1..08900c48 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdLogins.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdLogins.java @@ -22,4 +22,9 @@ public class CmdLogins extends FCommand { fme.msg(TL.COMMAND_LOGINS_TOGGLE, String.valueOf(!monitor)); fme.setMonitorJoins(!monitor); } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_LOGINS_DESCRIPTION; + } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdMap.java b/src/main/java/com/massivecraft/factions/cmd/CmdMap.java index 90531d66..9724cdac 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdMap.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdMap.java @@ -60,4 +60,9 @@ public class CmdMap extends FCommand { sendMessage(Board.getInstance().getMap(myFaction, new FLocation(fme), fme.getPlayer().getLocation().getYaw())); } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_MAP_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdMod.java b/src/main/java/com/massivecraft/factions/cmd/CmdMod.java index d7cd9466..d0f77643 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdMod.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdMod.java @@ -77,4 +77,9 @@ public class CmdMod extends FCommand { } } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_MOD_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdModifyPower.java b/src/main/java/com/massivecraft/factions/cmd/CmdModifyPower.java index 8f7e8767..7c5f75d5 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdModifyPower.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdModifyPower.java @@ -41,4 +41,9 @@ public class CmdModifyPower extends FCommand { int newPower = player.getPowerRounded(); // int so we don't have super long doubles. msg(TL.COMMAND_MODIFYPOWER_ADDED, number, player.getName(), newPower); } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_MODIFYPOWER_DESCRIPTION; + } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdMoney.java b/src/main/java/com/massivecraft/factions/cmd/CmdMoney.java index b9b2303f..a1a3d630 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdMoney.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdMoney.java @@ -26,7 +26,6 @@ public class CmdMoney extends FCommand { senderMustBeModerator = false; senderMustBeAdmin = false; - this.setHelpShort(TL.COMMAND_MONEY_SHORT.toString()); this.helpLong.add(p.txt.parseTags(TL.COMMAND_MONEY_LONG.toString())); this.addSubCommand(this.cmdMoneyBalance); @@ -43,4 +42,9 @@ public class CmdMoney extends FCommand { P.p.cmdAutoHelp.execute(this.sender, this.args, this.commandChain); } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_MONEY_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyBalance.java b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyBalance.java index 6b826c37..3a79e91b 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyBalance.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyBalance.java @@ -41,4 +41,9 @@ public class CmdMoneyBalance extends FCommand { Econ.sendBalanceInfo(fme, faction); } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_MONEYBALANCE_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyDeposit.java b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyDeposit.java index 5fcf5840..3ab83bbe 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyDeposit.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyDeposit.java @@ -20,7 +20,6 @@ public class CmdMoneyDeposit extends FCommand { this.optionalArgs.put("faction", "yours"); this.permission = Permission.MONEY_DEPOSIT.node; - this.setHelpShort(TL.COMMAND_MONEYDEPOSIT_SHORT.toString()); senderMustBePlayer = true; senderMustBeMember = false; @@ -42,4 +41,9 @@ public class CmdMoneyDeposit extends FCommand { } } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_MONEYDEPOSIT_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFf.java b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFf.java index 908310e1..4a8955de 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFf.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFf.java @@ -21,7 +21,6 @@ public class CmdMoneyTransferFf extends FCommand { //this.optionalArgs.put("", ""); this.permission = Permission.MONEY_F2F.node; - this.setHelpShort(TL.COMMAND_MONEYTRANSFERFF_SHORT.toString()); senderMustBePlayer = false; senderMustBeMember = false; @@ -47,4 +46,9 @@ public class CmdMoneyTransferFf extends FCommand { P.p.log(ChatColor.stripColor(P.p.txt.parse(TL.COMMAND_MONEYTRANSFERFF_TRANSFER.toString(), fme.getName(), Econ.moneyString(amount), from.describeTo(null), to.describeTo(null)))); } } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_MONEYTRANSFERFF_DESCRIPTION; + } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFp.java b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFp.java index 1a8b8619..f15e9274 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFp.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFp.java @@ -21,7 +21,6 @@ public class CmdMoneyTransferFp extends FCommand { //this.optionalArgs.put("", ""); this.permission = Permission.MONEY_F2P.node; - this.setHelpShort(TL.COMMAND_MONEYTRANSFERFP_SHORT.toString()); senderMustBePlayer = false; senderMustBeMember = false; @@ -47,4 +46,9 @@ public class CmdMoneyTransferFp extends FCommand { P.p.log(ChatColor.stripColor(P.p.txt.parse(TL.COMMAND_MONEYTRANSFERFP_TRANSFER.toString(), fme.getName(), Econ.moneyString(amount), from.describeTo(null), to.describeTo(null)))); } } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_MONEYTRANSFERFP_DESCRIPTION; + } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferPf.java b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferPf.java index de86b0e8..939e100d 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferPf.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferPf.java @@ -21,7 +21,6 @@ public class CmdMoneyTransferPf extends FCommand { //this.optionalArgs.put("", ""); this.permission = Permission.MONEY_P2F.node; - this.setHelpShort(TL.COMMAND_MONEYTRANSFERPF_SHORT.toString()); senderMustBePlayer = false; senderMustBeMember = false; @@ -47,4 +46,9 @@ public class CmdMoneyTransferPf extends FCommand { P.p.log(ChatColor.stripColor(P.p.txt.parse(TL.COMMAND_MONEYTRANSFERPF_TRANSFER.toString(), fme.getName(), Econ.moneyString(amount), from.describeTo(null), to.describeTo(null)))); } } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_MONEYTRANSFERPF_DESCRIPTION; + } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java index d95c507c..92042b39 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java @@ -19,7 +19,6 @@ public class CmdMoneyWithdraw extends FCommand { this.optionalArgs.put("faction", "yours"); this.permission = Permission.MONEY_WITHDRAW.node; - this.setHelpShort(TL.COMMAND_MONEYWITHDRAW_SHORT.toString()); senderMustBePlayer = true; senderMustBeMember = false; @@ -40,4 +39,9 @@ public class CmdMoneyWithdraw extends FCommand { P.p.log(ChatColor.stripColor(P.p.txt.parse(TL.COMMAND_MONEYWITHDRAW_WITHDRAW.toString(), fme.getName(), Econ.moneyString(amount), faction.describeTo(null)))); } } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_MONEYWITHDRAW_DESCRIPTION; + } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdOpen.java b/src/main/java/com/massivecraft/factions/cmd/CmdOpen.java index c8b41083..5f6239a3 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdOpen.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdOpen.java @@ -45,4 +45,9 @@ public class CmdOpen extends FCommand { } } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_OPEN_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdOwner.java b/src/main/java/com/massivecraft/factions/cmd/CmdOwner.java index bbcc9682..f4710c14 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdOwner.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdOwner.java @@ -98,4 +98,9 @@ public class CmdOwner extends FCommand { fme.msg(TL.COMMAND_OWNER_ADDED, playerName); } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_OWNER_DESCRIPTION; + } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdOwnerList.java b/src/main/java/com/massivecraft/factions/cmd/CmdOwnerList.java index c69183a5..ccf737f5 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdOwnerList.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdOwnerList.java @@ -62,4 +62,9 @@ public class CmdOwnerList extends FCommand { fme.msg(TL.COMMAND_OWNERLIST_OWNERS, owners); } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_OWNERLIST_DESCRIPTION; + } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPeaceful.java b/src/main/java/com/massivecraft/factions/cmd/CmdPeaceful.java index f82fafd6..792dac0f 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdPeaceful.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdPeaceful.java @@ -4,6 +4,7 @@ import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayers; import com.massivecraft.factions.Faction; import com.massivecraft.factions.struct.Permission; +import com.massivecraft.factions.zcore.util.TL; public class CmdPeaceful extends FCommand { @@ -23,7 +24,6 @@ public class CmdPeaceful extends FCommand { senderMustBeAdmin = false; } - //TODO: TL @Override public void perform() { Faction faction = this.argAsFaction(0); @@ -33,22 +33,28 @@ public class CmdPeaceful extends FCommand { String change; if (faction.isPeaceful()) { - change = "removed peaceful status from"; + change = TL.COMMAND_PEACEFUL_REVOKE.toString(); faction.setPeaceful(false); } else { - change = "granted peaceful status to"; + change = TL.COMMAND_PEACEFUL_GRANT.toString(); faction.setPeaceful(true); } // Inform all players for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) { + String blame=(fme == null ? TL.GENERIC_SERVERADMIN.toString() : fme.describeTo(fplayer, true)); if (fplayer.getFaction() == faction) { - fplayer.msg((fme == null ? "A server admin" : fme.describeTo(fplayer, true)) + " has " + change + " your faction."); + fplayer.msg(TL.COMMAND_PEACEFUL_YOURS, blame, change); } else { - fplayer.msg((fme == null ? "A server admin" : fme.describeTo(fplayer, true)) + " has " + change + " the faction \"" + faction.getTag(fplayer) + "\"."); + fplayer.msg(TL.COMMAND_PEACEFUL_OTHER, blame, change, faction.getTag(fplayer)); } } } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_PEACEFUL_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPermanent.java b/src/main/java/com/massivecraft/factions/cmd/CmdPermanent.java index 513b8aa8..263608cf 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdPermanent.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdPermanent.java @@ -5,6 +5,7 @@ import com.massivecraft.factions.FPlayers; import com.massivecraft.factions.Faction; import com.massivecraft.factions.P; import com.massivecraft.factions.struct.Permission; +import com.massivecraft.factions.zcore.util.TL; public class CmdPermanent extends FCommand { @@ -25,7 +26,6 @@ public class CmdPermanent extends FCommand { senderMustBeAdmin = false; } - //TODO: TL @Override public void perform() { Faction faction = this.argAsFaction(0); @@ -35,10 +35,10 @@ public class CmdPermanent extends FCommand { String change; if (faction.isPermanent()) { - change = "removed permanent status from"; + change = TL.COMMAND_PERMANENT_REVOKE.toString(); faction.setPermanent(false); } else { - change = "added permanent status to"; + change = TL.COMMAND_PERMANENT_GRANT.toString(); faction.setPermanent(true); } @@ -46,11 +46,17 @@ public class CmdPermanent extends FCommand { // Inform all players for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) { + String blame=(fme == null ? TL.GENERIC_SERVERADMIN.toString() : fme.describeTo(fplayer, true)); if (fplayer.getFaction() == faction) { - fplayer.msg((fme == null ? "A server admin" : fme.describeTo(fplayer, true)) + " " + change + " your faction."); + fplayer.msg(TL.COMMAND_PERMANENT_YOURS, blame, change); } else { - fplayer.msg((fme == null ? "A server admin" : fme.describeTo(fplayer, true)) + " " + change + " the faction \"" + faction.getTag(fplayer) + "\"."); + fplayer.msg(TL.COMMAND_PERMANENT_OTHER, blame, change, faction.getTag(fplayer)); } } } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_PERMANENT_DESCRIPTION; + } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPermanentPower.java b/src/main/java/com/massivecraft/factions/cmd/CmdPermanentPower.java index 26287387..cfcbc31e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdPermanentPower.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdPermanentPower.java @@ -3,6 +3,7 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.Faction; import com.massivecraft.factions.struct.Permission; +import com.massivecraft.factions.zcore.util.TL; public class CmdPermanentPower extends FCommand { public CmdPermanentPower() { @@ -21,7 +22,6 @@ public class CmdPermanentPower extends FCommand { senderMustBeAdmin = false; } - //TODO: TL @Override public void perform() { Faction targetFaction = this.argAsFaction(0); @@ -33,16 +33,22 @@ public class CmdPermanentPower extends FCommand { targetFaction.setPermanentPower(targetPower); - String change = "removed permanentpower status from"; + String change = TL.COMMAND_PERMANENTPOWER_REVOKE.toString(); if (targetFaction.hasPermanentPower()) { - change = "added permanentpower status to"; + change = TL.COMMAND_PERMANENTPOWER_GRANT.toString(); } - msg("You %s %s.", change, targetFaction.describeTo(fme)); + msg(TL.COMMAND_PERMANENTPOWER_SUCCESS, change, targetFaction.describeTo(fme)); // Inform all players for (FPlayer fplayer : targetFaction.getFPlayersWhereOnline(true)) { - fplayer.msg((fme == null ? "A server admin" : fme.describeTo(fplayer, true)) + " " + change + " your faction."); + String blame = (fme == null ? TL.GENERIC_SERVERADMIN.toString() : fme.describeTo(fplayer, true)); + fplayer.msg(TL.COMMAND_PERMANENTPOWER_FACTION, blame, change); } } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_PERMANENTPOWER_DESCRIPTION; + } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPower.java b/src/main/java/com/massivecraft/factions/cmd/CmdPower.java index 52c6745f..f8061d62 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdPower.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdPower.java @@ -45,4 +45,9 @@ public class CmdPower extends FCommand { msg(TL.COMMAND_POWER_POWER, target.describeTo(fme, true), target.getPowerRounded(), target.getPowerMaxRounded(), boost); } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_POWER_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPowerBoost.java b/src/main/java/com/massivecraft/factions/cmd/CmdPowerBoost.java index 9782cc24..657d6d4d 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdPowerBoost.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdPowerBoost.java @@ -67,4 +67,9 @@ public class CmdPowerBoost extends FCommand { P.p.log(TL.COMMAND_POWERBOOST_BOOSTLOG.toString(), fme.getName(), target, roundedPower); } } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_POWERBOOST_DESCRIPTION; + } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdReload.java b/src/main/java/com/massivecraft/factions/cmd/CmdReload.java index 18865072..333bb6d8 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdReload.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdReload.java @@ -33,4 +33,9 @@ public class CmdReload extends FCommand { msg(TL.COMMAND_RELOAD_TIME, timeReload); } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_RELOAD_DESCRIPTION; + } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdSB.java b/src/main/java/com/massivecraft/factions/cmd/CmdSB.java index cd187bd4..bec70df0 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdSB.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdSB.java @@ -101,4 +101,9 @@ public class CmdSB extends FCommand { public boolean showBoard(UUID uuid) { return yml.getBoolean(uuid.toString(), true); } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_SCOREBOARD_DESCRIPTION; + } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdSafeunclaimall.java b/src/main/java/com/massivecraft/factions/cmd/CmdSafeunclaimall.java index 069d5436..21bf11f9 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdSafeunclaimall.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdSafeunclaimall.java @@ -24,7 +24,6 @@ public class CmdSafeunclaimall extends FCommand { senderMustBeModerator = false; senderMustBeAdmin = false; - this.setHelpShort(TL.COMMAND_SAFEUNCLAIMALL_SHORT.toString()); } @Override @@ -37,4 +36,9 @@ public class CmdSafeunclaimall extends FCommand { } } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_SAFEUNCLAIMALL_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdSaveAll.java b/src/main/java/com/massivecraft/factions/cmd/CmdSaveAll.java index 66e523ed..309ec53f 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdSaveAll.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdSaveAll.java @@ -35,4 +35,9 @@ public class CmdSaveAll extends FCommand { msg(TL.COMMAND_SAVEALL); } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_SAVEALL_DESCRIPTION; + } + } \ No newline at end of file diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdSeeChunk.java b/src/main/java/com/massivecraft/factions/cmd/CmdSeeChunk.java index b3b81916..a6fe7744 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdSeeChunk.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdSeeChunk.java @@ -3,6 +3,8 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.FLocation; import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.util.VisualizeUtil; +import com.massivecraft.factions.zcore.util.TL; + import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; @@ -62,4 +64,9 @@ public class CmdSeeChunk extends FCommand { } } + @Override + public TL getUsageTranslation() { + return TL.GENERIC_PLACEHOLDER; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdSetFWarp.java b/src/main/java/com/massivecraft/factions/cmd/CmdSetFWarp.java index ba08521e..630540c5 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdSetFWarp.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdSetFWarp.java @@ -46,4 +46,9 @@ 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()); } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_SETFWARP_DESCRIPTION; + } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdSethome.java b/src/main/java/com/massivecraft/factions/cmd/CmdSethome.java index 79085f0b..36f0a262 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdSethome.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdSethome.java @@ -70,4 +70,9 @@ public class CmdSethome extends FCommand { } } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_SETHOME_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdShow.java b/src/main/java/com/massivecraft/factions/cmd/CmdShow.java index 8b2f8349..2897b910 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdShow.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdShow.java @@ -5,6 +5,7 @@ import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.struct.Permission; import com.massivecraft.factions.struct.Relation; import com.massivecraft.factions.struct.Role; +import com.massivecraft.factions.zcore.util.TL; import java.util.Collection; @@ -35,7 +36,7 @@ public class CmdShow extends FCommand { } - if (!payForCommand(Conf.econCostShow, "to show faction information", "for showing faction information")) { + if (!payForCommand(Conf.econCostShow, TL.COMMAND_SHOW_TOSHOW, TL.COMMAND_SHOW_FORSHOW)) { return; } @@ -44,24 +45,24 @@ public class CmdShow extends FCommand { Collection normals = faction.getFPlayersWhereRole(Role.NORMAL); msg((p).txt.titleize(faction.getTag(this.fme))); - msg("Description: %s", faction.getDescription()); + msg(TL.COMMAND_SHOW_DESCRIPTION, faction.getDescription()); if (!faction.isNormal()) { return; } String peaceStatus = ""; if (faction.isPeaceful()) { - peaceStatus = " " + Conf.colorNeutral + "This faction is Peaceful"; + peaceStatus = " " + Conf.colorNeutral + TL.COMMAND_SHOW_PEACEFUL.toString(); } - msg("Joining: " + (faction.getOpen() ? "no invitation is needed" : "invitation is required") + peaceStatus); + msg(TL.COMMAND_SHOW_JOINING.toString() + peaceStatus, (faction.getOpen() ? TL.COMMAND_SHOW_UNINVITED.toString() : TL.COMMAND_SHOW_INVITATION.toString())); double powerBoost = faction.getPowerBoost(); - String boost = (powerBoost > 0.0D ? " (bonus: " : " (penalty: ") + powerBoost + ")"; - msg("Land / Power / Maxpower: %d/%d/%d %s", faction.getLandRounded(), faction.getPowerRounded(), faction.getPowerMaxRounded(), boost); + String boost = (powerBoost == 0.0) ? "" : (powerBoost > 0.0 ? TL.COMMAND_SHOW_BONUS.toString():TL.COMMAND_SHOW_PENALTY.toString() + powerBoost + ")"); + msg(TL.COMMAND_SHOW_POWER, faction.getLandRounded(), faction.getPowerRounded(), faction.getPowerMaxRounded(), boost); if (faction.isPermanent()) { - msg("This faction is permanent, remaining even with no members."); + msg(TL.COMMAND_SHOW_PERMANENT); } if (Econ.shouldBeUsed()) { @@ -69,18 +70,18 @@ public class CmdShow extends FCommand { double refund = value * Conf.econClaimRefundMultiplier; if (value > 0.0D) { String stringValue = Econ.moneyString(value); - String stringRefund = refund > 0.0D ? " (" + Econ.moneyString(refund) + " depreciated)" : ""; - msg("Total land value: " + stringValue + stringRefund); + String stringRefund = (refund > 0.0) ? (TL.COMMAND_SHOW_DEPRECIATED.format(Econ.moneyString(refund))) : ""; + msg(TL.COMMAND_SHOW_LANDVALUE, stringValue, stringRefund); } if (Conf.bankEnabled) { - msg("Bank contains: " + Econ.moneyString(Econ.getBalance(faction.getAccountId()))); + msg(TL.COMMAND_SHOW_BANKCONTAINS, Econ.moneyString(Econ.getBalance(faction.getAccountId()))); } } - String allyList = p.txt.parse("Allies: "); - String enemyList = p.txt.parse("Enemies: "); + String allyList = p.txt.parse(TL.COMMAND_SHOW_ALLIES.toString()); + String enemyList = p.txt.parse(TL.COMMAND_SHOW_ENEMIES.toString()); for (Faction otherFaction : Factions.getInstance().getAllFactions()) { if (otherFaction != faction) { Relation rel = otherFaction.getRelationTo(faction); @@ -104,8 +105,8 @@ public class CmdShow extends FCommand { sendMessage(allyList); sendMessage(enemyList); - String onlineList = p.txt.parse("") + "Members online: "; - String offlineList = p.txt.parse("") + "Members offline: "; + String onlineList = p.txt.parse("") + TL.COMMAND_SHOW_MEMBERSONLINE.toString(); + String offlineList = p.txt.parse("") + TL.COMMAND_SHOW_MEMBERSOFFLINE.toString(); for (FPlayer follower : admins) { String listpart = follower.getNameAndTitle(this.fme) + p.txt.parse("") + ", "; if (follower.isOnlineAndVisibleTo(this.me)) { @@ -143,4 +144,9 @@ public class CmdShow extends FCommand { sendMessage(onlineList); sendMessage(offlineList); } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_SHOW_COMMANDDESCRIPTION; + } } \ No newline at end of file diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdShowInvites.java b/src/main/java/com/massivecraft/factions/cmd/CmdShowInvites.java index 8d3e5a82..ddc0bd1c 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdShowInvites.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdShowInvites.java @@ -31,5 +31,10 @@ public class CmdShowInvites extends FCommand { sendFancyMessage(msg); } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_SHOWINVITES_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdStatus.java b/src/main/java/com/massivecraft/factions/cmd/CmdStatus.java index 8eb64e2f..7caea961 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdStatus.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdStatus.java @@ -35,4 +35,9 @@ public class CmdStatus extends FCommand { fme.sendMessage(ret); } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_STATUS_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdTag.java b/src/main/java/com/massivecraft/factions/cmd/CmdTag.java index 414a1671..b5acd6ee 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdTag.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdTag.java @@ -76,4 +76,9 @@ public class CmdTag extends FCommand { FTeamWrapper.updatePrefixes(myFaction); } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_TAG_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdTitle.java b/src/main/java/com/massivecraft/factions/cmd/CmdTitle.java index 2f5925ff..02b8da62 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdTitle.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdTitle.java @@ -48,4 +48,9 @@ public class CmdTitle extends FCommand { myFaction.msg(TL.COMMAND_TITLE_CHANGED, fme.describeTo(myFaction, true), you.describeTo(myFaction, true)); } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_TITLE_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdUnclaim.java b/src/main/java/com/massivecraft/factions/cmd/CmdUnclaim.java index eb3b663e..3e3d1f40 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdUnclaim.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdUnclaim.java @@ -112,4 +112,9 @@ public class CmdUnclaim extends FCommand { } } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_UNCLAIM_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdUnclaimall.java b/src/main/java/com/massivecraft/factions/cmd/CmdUnclaimall.java index 80005969..c8e2b682 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdUnclaimall.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdUnclaimall.java @@ -56,4 +56,9 @@ public class CmdUnclaimall extends FCommand { } } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_UNCLAIMALL_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdVersion.java b/src/main/java/com/massivecraft/factions/cmd/CmdVersion.java index 0f37a3f6..c1d81f38 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdVersion.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdVersion.java @@ -29,4 +29,9 @@ public class CmdVersion extends FCommand { msg(TL.GENERIC_TRANSLATION_CONTRIBUTORS, TL._LOCAL_AUTHOR); msg(TL.GENERIC_TRANSLATION_RESPONSIBLE, TL._LOCAL_RESPONSIBLE); } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_VERSION_DESCRIPTION; + } } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdWarunclaimall.java b/src/main/java/com/massivecraft/factions/cmd/CmdWarunclaimall.java index 8199df71..f85c84f2 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdWarunclaimall.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdWarunclaimall.java @@ -23,8 +23,6 @@ public class CmdWarunclaimall extends FCommand { senderMustBeMember = false; senderMustBeModerator = false; senderMustBeAdmin = false; - - this.setHelpShort(TL.COMMAND_WARUNCLAIMALL_SHORT.toString()); } @Override @@ -37,4 +35,9 @@ public class CmdWarunclaimall extends FCommand { } } + @Override + public TL getUsageTranslation() { + return TL.COMMAND_WARUNCLAIMALL_DESCRIPTION; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java b/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java index 78e89bc3..9b023ca1 100644 --- a/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java +++ b/src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java @@ -1,6 +1,7 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.Conf; +import com.massivecraft.factions.zcore.util.TL; import java.util.Collections; @@ -148,4 +149,9 @@ public class FCmdRoot extends FCommand { this.cmdHelp.execute(this.sender, this.args, this.commandChain); } + @Override + public TL getUsageTranslation() { + return TL.GENERIC_PLACEHOLDER; + } + } diff --git a/src/main/java/com/massivecraft/factions/cmd/FRelationCommand.java b/src/main/java/com/massivecraft/factions/cmd/FRelationCommand.java index 06f641a8..59487988 100644 --- a/src/main/java/com/massivecraft/factions/cmd/FRelationCommand.java +++ b/src/main/java/com/massivecraft/factions/cmd/FRelationCommand.java @@ -8,6 +8,7 @@ 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; @@ -98,4 +99,9 @@ public abstract class FRelationCommand extends FCommand { FTeamWrapper.updatePrefixes(myFaction); FTeamWrapper.updatePrefixes(them); } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_RELATIONS_DESCRIPTION; + } } diff --git a/src/main/java/com/massivecraft/factions/struct/Role.java b/src/main/java/com/massivecraft/factions/struct/Role.java index 4ce4e69d..cf81e8a2 100644 --- a/src/main/java/com/massivecraft/factions/struct/Role.java +++ b/src/main/java/com/massivecraft/factions/struct/Role.java @@ -1,18 +1,21 @@ package com.massivecraft.factions.struct; import com.massivecraft.factions.Conf; +import com.massivecraft.factions.zcore.util.TL; public enum Role { - ADMIN(2, "admin"), - MODERATOR(1, "moderator"), - NORMAL(0, "normal member"); + ADMIN(2, TL.ROLE_ADMIN), + MODERATOR(1, TL.ROLE_MODERATOR), + NORMAL(0, TL.ROLE_NORMAL); public final int value; public final String nicename; + public final TL translation; - private Role(final int value, final String nicename) { + private Role(final int value, final TL translation) { this.value = value; - this.nicename = nicename; + this.nicename = translation.toString(); + this.translation = translation; } public boolean isAtLeast(Role role) { @@ -28,6 +31,10 @@ public enum Role { return this.nicename; } + public TL getTranslation(){ + return translation; + } + public String getPrefix() { if (this == Role.ADMIN) { return Conf.prefixAdmin; diff --git a/src/main/java/com/massivecraft/factions/zcore/MCommand.java b/src/main/java/com/massivecraft/factions/zcore/MCommand.java index a5b71496..7f828814 100644 --- a/src/main/java/com/massivecraft/factions/zcore/MCommand.java +++ b/src/main/java/com/massivecraft/factions/zcore/MCommand.java @@ -1,15 +1,9 @@ package com.massivecraft.factions.zcore; -import com.massivecraft.factions.FPlayer; -import com.massivecraft.factions.Faction; -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; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -52,15 +46,14 @@ public abstract class MCommand { public String getHelpShort() { if (this.helpShort == null) { - TL pdesc = TL.valueOf(this.permission.toUpperCase().replace('.', '_')); - if (pdesc != null) { - return pdesc.toString(); - } - return "*info unavailable*"; + return getUsageTranslation().toString(); } + return this.helpShort; } + public abstract TL getUsageTranslation(); + public List helpLong; public CommandVisibility visibility; 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 0ac795f2..c9ae5acd 100644 --- a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java +++ b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java @@ -670,7 +670,7 @@ public abstract class MemoryFPlayer implements FPlayer { } else if (forFaction == currentFaction) { error = P.p.txt.parse(TL.CLAIM_ALREADYOWN.toString(), forFaction.describeTo(this, true)); } else if (this.getRole().value < Role.MODERATOR.value) { - error = P.p.txt.parse(TL.CLAIM_MUSTBE.toString(), Role.MODERATOR.toString()); + error = P.p.txt.parse(TL.CLAIM_MUSTBE.toString(), Role.MODERATOR.getTranslation()); } else if (forFaction.getFPlayers().size() < Conf.claimsRequireMinFactionMembers) { error = P.p.txt.parse(TL.CLAIM_MEMBERS.toString(), Conf.claimsRequireMinFactionMembers); } else if (currentFaction.isSafeZone()) { 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 90bcee3f..7ed6667d 100644 --- a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java +++ b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java @@ -575,6 +575,7 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator { oldLeader.setRole(Role.NORMAL); } replacements.get(0).setRole(Role.ADMIN); + //TODO:TL this.msg("Faction admin %s has been removed. %s has been promoted as the new faction admin.", oldLeader == null ? "" : oldLeader.getName(), replacements.get(0).getName()); P.p.log("Faction " + this.getTag() + " (" + this.getId() + ") admin was removed. Replacement admin: " + replacements.get(0).getName()); } @@ -710,6 +711,7 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator { ownerList += ", "; } OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(UUID.fromString(iter.next())); + //TODO:TL ownerList += offlinePlayer != null ? offlinePlayer.getName() : "null player"; } return ownerList; 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 6623979e..6e17c1c9 100644 --- a/src/main/java/com/massivecraft/factions/zcore/util/TL.java +++ b/src/main/java/com/massivecraft/factions/zcore/util/TL.java @@ -35,6 +35,7 @@ public enum TL { _REQUIRESUNICODE("false"), _DEFAULT("true"), _STATE("complete"), //incomplete, limited, partial, majority, complete + /** * Localised translation meta */ @@ -54,11 +55,15 @@ public enum TL { COMMAND_ADMIN_DEMOTED("You have been demoted from the position of faction admin by %1$s."), COMMAND_ADMIN_PROMOTES("You have promoted %1$s to the position of faction admin."), COMMAND_ADMIN_PROMOTED("%1$s gave %2$s the leadership of %3$s."), + COMMAND_ADMIN_DESCRIPTION("Hand over your admin rights"), + + COMMAND_ANNOUNCE_DESCRIPTION("Announce a message to players in faction."), COMMAND_AUTOCLAIM_ENABLED("Now auto-claiming land for %1$s."), COMMAND_AUTOCLAIM_DISABLED("Auto-claiming of land disabled."), COMMAND_AUTOCLAIM_REQUIREDRANK("You must be %1$s to claim land."), COMMAND_AUTOCLAIM_OTHERFACTION("You can't claim land for %1$s."), + COMMAND_AUTOCLAIM_DESCRIPTION("Auto-claim land as you walk around"), COMMAND_AUTOHELP_HELPFOR("Help for command \""), @@ -66,14 +71,17 @@ public enum TL { COMMAND_BOOM_TOTOGGLE("to toggle explosions"), COMMAND_BOOM_FORTOGGLE("for toggling explosions"), COMMAND_BOOM_ENABLED("%1$s has %2$s explosions in your faction's territory."), + COMMAND_BOOM_DESCRIPTION("Toggle explosions (peaceful factions only)"), 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_BYPASS_DESCRIPTION("Enable 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_DESCRIPTION("Change chat mode"), COMMAND_CHAT_MODE_PUBLIC("Public chat mode."), COMMAND_CHAT_MODE_ALLIANCE("Alliance only chat mode."), @@ -83,9 +91,11 @@ public enum TL { 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_CHATSPY_DESCRIPTION("Enable admin chat spy 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_CLAIM_DESCRIPTION("Claim land from where you are standing"), COMMAND_CONFIG_NOEXIST("No configuration setting \"%1$s\" exists."), COMMAND_CONFIG_SET_TRUE("\" option set to true (enabled)."), @@ -108,9 +118,11 @@ public enum TL { COMMAND_CONFIG_ERROR_SETTING("Error setting configuration setting \"%1$s\" to \"%2$s\"."), COMMAND_CONFIG_ERROR_MATCHING("Configuration setting \"%1$s\" couldn't be matched, though it should be... please report this error."), COMMAND_CONFIG_ERROR_TYPE("'%1$s' is of type '%2$s', which cannot be modified with this command."), + COMMAND_CONFIG_DESCRIPTION("Change a conf.json setting"), - 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_RUNNING("Already running that backend."), + COMMAND_CONVERT_BACKEND_INVALID("Invalid backend"), + COMMAND_CONVERT_DESCRIPTION("Convert the plugin backend"), COMMAND_CREATE_MUSTLEAVE("You must leave your current faction first."), COMMAND_CREATE_INUSE("That tag is already in use."), @@ -120,6 +132,7 @@ public enum TL { COMMAND_CREATE_CREATED("%1$s created a new faction %2$s"), COMMAND_CREATE_YOUSHOULD("You should now: %1$s"), COMMAND_CREATE_CREATEDLOG(" created a new faction: "), + COMMAND_CREATE_DESCRIPTION("Create a new faction"), COMMAND_DEINVITE_CANDEINVITE("Players you can deinvite: "), COMMAND_DEINVITE_CLICKTODEINVITE("Click to revoke invite for %1$s"), @@ -127,22 +140,26 @@ public enum TL { COMMAND_DEINVITE_MIGHTWANT("You might want to: %1$s"), COMMAND_DEINVITE_REVOKED("%1$s revoked your invitation to %2$s."), COMMAND_DEINVITE_REVOKES("%1$s revoked %2$s's invitation."), + COMMAND_DEINVITE_DESCRIPTION("Remove a pending invitation"), COMMAND_DELFWARP_DELETED("Deleted warp %1$s"), COMMAND_DELFWARP_INVALID("Couldn't find warp %1$s"), COMMAND_DELFWARP_TODELETE("to delete warp"), COMMAND_DELFWARP_FORDELETE("for deleting warp"), + COMMAND_DELFWARP_DESCRIPTION("Delete a faction warp"), COMMAND_DESCRIPTION_CHANGES("You have changed the description for %1$s to:"), COMMAND_DESCRIPTION_CHANGED("The faction %1$s changed their description to:"), COMMAND_DESCRIPTION_TOCHANGE("to change faction description"), COMMAND_DESCRIPTION_FORCHANGE("for changing faction description"), + COMMAND_DESCRIPTION_DESCRIPTION("Change the 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("%1$s disbanded your faction."), COMMAND_DISBAND_BROADCAST_NOTYOURS("%1$s disbanded the faction %2$s."), COMMAND_DISBAND_HOLDINGS("You have been given the disbanded faction's bank, totaling %1$s."), + COMMAND_DISBAND_DESCRIPTION("Disband a faction"), COMMAND_FWARP_CLICKTOWARP("Click to warp!"), COMMAND_FWARP_COMMANDFORMAT("/f warp "), @@ -151,6 +168,7 @@ public enum TL { COMMAND_FWARP_TOWARP("to warp"), COMMAND_FWARP_FORWARPING("for warping"), COMMAND_FWARP_WARPS("Warps: "), + COMMAND_FWARP_DESCRIPTION("Teleport to a faction warp"), COMMAND_HELP_404("This page does not exist"), COMMAND_HELP_NEXTCREATE("Learn how to create a faction on the next page."), @@ -191,6 +209,7 @@ 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_HELP_DESCRIPTION("Display a help page"), 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."), @@ -200,6 +219,7 @@ public enum TL { 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_HOME_DESCRIPTION("Teleport to the faction home"), COMMAND_INVITE_TOINVITE("to invite someone"), COMMAND_INVITE_FORINVITE("for inviting someone"), @@ -207,6 +227,7 @@ public enum TL { COMMAND_INVITE_INVITEDYOU(" has invited you to join "), COMMAND_INVITE_INVITED("%1$s invited %2$s to your faction."), COMMAND_INVITE_ALREADYMEMBER("%1$s is already a member of %2$s"), + COMMAND_INVITE_DESCRIPTION("Invite a player to your faction"), 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."), @@ -223,6 +244,7 @@ public enum TL { COMMAND_JOIN_JOINED("%1$s joined your faction."), COMMAND_JOIN_JOINEDLOG("%1$s joined the faction %2$s."), COMMAND_JOIN_MOVEDLOG("%1$s moved the player %2$s into the faction %3$s."), + COMMAND_JOIN_DESCRIPTION("Join a faction"), COMMAND_KICK_CANDIDATES("Players you can kick: "), COMMAND_KICK_CLICKTOKICK("Click to kick "), @@ -236,22 +258,26 @@ public enum TL { COMMAND_KICK_FACTION("%1$s kicked %2$s from the faction! :O"), //message given to faction members COMMAND_KICK_KICKS("You kicked %1$s from the faction %2$s!"), //kicker perspective COMMAND_KICK_KICKED("%1$s kicked you from %2$s! :O"), //kicked player perspective - + COMMAND_KICK_DESCRIPTION("Kick a player from the faction"), 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_LIST_DESCRIPTION("See a list of the factions"), COMMAND_LOCK_LOCKED("Factions is now locked"), COMMAND_LOCK_UNLOCKED("Factions in now unlocked"), + COMMAND_LOCK_DESCRIPTION("Lock all write stuff. Apparently."), COMMAND_LOGINS_TOGGLE("Set login / logout notifications for Faction members to: %s"), + COMMAND_LOGINS_DESCRIPTION("Toggle(?) login / logout notifications for Faction members"), 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_MAP_DESCRIPTION("Show the territory map, and set optional auto update"), COMMAND_MOD_CANDIDATES("Players you can promote: "), COMMAND_MOD_CLICKTOPROMOTE("Click to promote "), @@ -263,27 +289,30 @@ public enum TL { COMMAND_MOD_REVOKED("%1$s is no longer moderator in your faction."), COMMAND_MOD_PROMOTES("%1$s was promoted to moderator in your faction."), COMMAND_MOD_PROMOTED("You have promoted %1$s to moderator."), + COMMAND_MOD_DESCRIPTION("Give or revoke moderator rights"), COMMAND_MODIFYPOWER_ADDED("Added %1$f power to %2$s. New total rounded power: %3$d"), + COMMAND_MODIFYPOWER_DESCRIPTION("Modify the power of a faction/player"), - COMMAND_MONEY_SHORT("faction money commands"), COMMAND_MONEY_LONG("The faction money commands."), + COMMAND_MONEY_DESCRIPTION("Faction money commands"), COMMAND_MONEYBALANCE_SHORT("show faction balance"), + COMMAND_MONEYBALANCE_DESCRIPTION("Show your factions current money balance"), - COMMAND_MONEYDEPOSIT_SHORT("deposit money"), + COMMAND_MONEYDEPOSIT_DESCRIPTION("Deposit money"), COMMAND_MONEYDEPOSIT_DEPOSITED("%1$s deposited %2$s in the faction bank: %3$s"), - COMMAND_MONEYTRANSFERFF_SHORT("transfer f -> f"), + COMMAND_MONEYTRANSFERFF_DESCRIPTION("Transfer f -> f"), COMMAND_MONEYTRANSFERFF_TRANSFER("%1$s transferred %2$s from the faction \"%3$s\" to the faction \"%4$s\""), - COMMAND_MONEYTRANSFERFP_SHORT("transfer f -> p"), + COMMAND_MONEYTRANSFERFP_DESCRIPTION("Transfer f -> p"), COMMAND_MONEYTRANSFERFP_TRANSFER("%1$s transferred %2$s from the faction \"%3$s\" to the player \"%4$s\""), - COMMAND_MONEYTRANSFERPF_SHORT("transfer p -> f"), + COMMAND_MONEYTRANSFERPF_DESCRIPTION("Transfer p -> f"), COMMAND_MONEYTRANSFERPF_TRANSFER("%1$s transferred %2$s from the player \"%3$s\" to the faction \"%4$s\""), - COMMAND_MONEYWITHDRAW_SHORT("withdraw money"), + COMMAND_MONEYWITHDRAW_DESCRIPTION("Withdraw money"), COMMAND_MONEYWITHDRAW_WITHDRAW("%1$s withdrew %2$s from the faction bank: %3$s"), COMMAND_OPEN_TOOPEN("to open or close the faction"), @@ -292,6 +321,7 @@ public enum TL { COMMAND_OPEN_CLOSED("closed"), COMMAND_OPEN_CHANGES("%1$s changed the faction to %2$s."), COMMAND_OPEN_CHANGED("The faction %1$s is now %2$s"), + COMMAND_OPEN_DESCRIPTION("Switch if invitation is required to join"), 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 %1$d owned areas per faction."), @@ -303,18 +333,39 @@ public enum TL { COMMAND_OWNER_TOSET("to set ownership of claimed land"), COMMAND_OWNER_FORSET("for setting ownership of claimed land"), COMMAND_OWNER_ADDED("You have added %1$s to the owner list for this claimed land."), + COMMAND_OWNER_DESCRIPTION("Set ownership of 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: %1$s"), + COMMAND_OWNERLIST_DESCRIPTION("List owner(s) of this claimed land"), + + COMMAND_PEACEFUL_DESCRIPTION("Set a faction to peaceful"), + COMMAND_PEACEFUL_YOURS("%1$s has %2$s your faction"), + COMMAND_PEACEFUL_OTHER("%s has %s the faction '%s'."), + COMMAND_PEACEFUL_GRANT("granted peaceful status to"), + COMMAND_PEACEFUL_REVOKE("removed peaceful status from"), + + COMMAND_PERMANENT_DESCRIPTION("Toggles a faction's permanence"), //TODO: Real word? + COMMAND_PERMANENT_GRANT("added permanent status to"), + COMMAND_PERMANENT_REVOKE("removed permanent status from"), + COMMAND_PERMANENT_YOURS("%1$s has %2$s your faction"), + COMMAND_PERMANENT_OTHER("%s has %s the faction '%s'."), + + COMMAND_PERMANENTPOWER_DESCRIPTION("Toggle faction power permanence"), //TODO: This a real word? + COMMAND_PERMANENTPOWER_GRANT("added permanentpower status to"), + COMMAND_PERMANENTPOWER_REVOKE("removed permanentpower status from"), + COMMAND_PERMANENTPOWER_SUCCESS("You %s %s."), + COMMAND_PERMANENTPOWER_FACTION("%s %s your faction"), COMMAND_POWER_TOSHOW("to show player power info"), COMMAND_POWER_FORSHOW("for showing player power info"), COMMAND_POWER_POWER("%1$s - Power / Maxpower: %2$d / %3$d %4$s"), COMMAND_POWER_BONUS(" (bonus: "), COMMAND_POWER_PENALTY(" (penalty: "), + COMMAND_POWER_DESCRIPTION("Show player power info"), 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"), @@ -323,20 +374,26 @@ public enum TL { COMMAND_POWERBOOST_FACTION("Faction \"%1$s\""), COMMAND_POWERBOOST_BOOST("%1$s now has a power bonus/penalty of %2$d to min and max power levels."), COMMAND_POWERBOOST_BOOSTLOG("%1$s has set the power bonus/penalty for %2$s to %3$d."), + COMMAND_POWERBOOST_DESCRIPTION("Apply permanent power bonus/penalty to specified player or faction"), COMMAND_RELOAD_TIME("Reloaded conf.json from disk, took %1$d ms."), + COMMAND_RELOAD_DESCRIPTION("Reload data file(s) from disk"), - COMMAND_SAFEUNCLAIMALL_SHORT("Unclaim all safezone land"), + COMMAND_SAFEUNCLAIMALL_DESCRIPTION("Unclaim all safezone land"), COMMAND_SAFEUNCLAIMALL_UNCLAIMED("You unclaimed ALL safe zone land."), COMMAND_SAFEUNCLAIMALL_UNCLAIMEDLOG("%1$s unclaimed all safe zones."), COMMAND_SAVEALL("Factions saved to disk!"), + COMMAND_SAVEALL_DESCRIPTION("Save all data to disk"), + + COMMAND_SCOREBOARD_DESCRIPTION("Scoreboardy things"), 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 (%1$d)."), COMMAND_SETFWARP_SET("Set warp %1$s to your location."), COMMAND_SETFWARP_TOSET("to set warp"), COMMAND_SETFWARP_FORSET("for setting warp"), + COMMAND_SETFWARP_DESCRIPTION("Set a faction 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."), @@ -344,6 +401,7 @@ public enum TL { COMMAND_SETHOME_FORSET("for setting the faction home"), COMMAND_SETHOME_SET("%1$s set the home for your faction. You can now use:"), COMMAND_SETHOME_SETOTHER("You have set the home for the %1$s faction."), + COMMAND_SETHOME_DESCRIPTION("Set the faction home"), COMMAND_SHOW_NOFACTION_SELF("You are not in a faction"), COMMAND_SHOW_NOFACTION_OTHER("That's not a faction"), @@ -365,23 +423,28 @@ public enum TL { COMMAND_SHOW_ENEMIES("Enemies: "), COMMAND_SHOW_MEMBERSONLINE("Members online: "), COMMAND_SHOW_MEMBERSOFFLINE("Members offline: "), + COMMAND_SHOW_COMMANDDESCRIPTION("Show faction information"), COMMAND_SHOWINVITES_PENDING("Players with pending invites: "), COMMAND_SHOWINVITES_CLICKTOREVOKE("Click to revoke invite for %1$s"), + COMMAND_SHOWINVITES_DESCRIPTION("Show pending faction invites"), COMMAND_STATUS_FORMAT("%1$s Power: %2$s Last Seen: %3$s"), COMMAND_STATUS_ONLINE("Online"), COMMAND_STATUS_AGOSUFFIX(" ago."), + COMMAND_STATUS_DESCRIPTION("Show the status of a player"), 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("%1$s changed your faction tag to %2$s"), COMMAND_TAG_CHANGED("The faction %1$s changed their name to %2$s."), + COMMAND_TAG_DESCRIPTION("Change the faction tag"), COMMAND_TITLE_TOCHANGE("to change a players title"), COMMAND_TITLE_FORCHANGE("for changing a players title"), COMMAND_TITLE_CHANGED("%1$s changed a title: %2$s"), + COMMAND_TITLE_DESCRIPTION("Set or remove a players title"), COMMAND_UNCLAIM_SAFEZONE_SUCCESS("Safe zone was unclaimed."), COMMAND_UNCLAIM_SAFEZONE_NOPERM("This is a safe zone. You lack permissions to unclaim."), @@ -394,15 +457,18 @@ public enum TL { COMMAND_UNCLAIM_TOUNCLAIM("to unclaim this land"), COMMAND_UNCLAIM_FORUNCLAIM("for unclaiming this land"), COMMAND_UNCLAIM_FACTIONUNCLAIMED("%1$s unclaimed some land."), + COMMAND_UNCLAIM_DESCRIPTION("Unclaim the land where you are standing"), COMMAND_UNCLAIMALL_TOUNCLAIM("to unclaim all faction land"), COMMAND_UNCLAIMALL_FORUNCLAIM("for unclaiming all faction land"), COMMAND_UNCLAIMALL_UNCLAIMED("%1$s unclaimed ALL of your faction's land."), COMMAND_UNCLAIMALL_LOG("%1$s unclaimed everything for the faction: %2$s"), + COMMAND_UNCLAIMALL_DESCRIPTION("Unclaim all of your factions land"), COMMAND_VERSION_VERSION("You are running %1$s"), + COMMAND_VERSION_DESCRIPTION("Show plugin and translation version information"), - COMMAND_WARUNCLAIMALL_SHORT("unclaim all warzone land"), + COMMAND_WARUNCLAIMALL_DESCRIPTION("Unclaim all warzone land"), COMMAND_WARUNCLAIMALL_SUCCESS("You unclaimed ALL war zone land."), COMMAND_WARUNCLAIMALL_LOG("%1$s unclaimed all war zones."), @@ -414,12 +480,14 @@ public enum TL { COMMAND_RELATIONS_MUTUAL("Your faction is now %1$s to %2$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_DESCRIPTION("Set relation wish to another faction"), COMMAND_RELATIONS_PROPOSAL_1("%1$s wishes to be your %2$s"), COMMAND_RELATIONS_PROPOSAL_2("Type /%1$s %2$s %3$s to accept."), COMMAND_RELATIONS_PROPOSAL_SENT("%1$s were informed that you wish to be %2$s"), + /** - * Leaving + * Leaving - This is accessed through a command, and so it MAY need a COMMAND_* slug :s */ LEAVE_PASSADMIN("You must give the admin role to someone else first."), LEAVE_NEGATIVEPOWER("You cannot leave until your power is positive."), @@ -428,8 +496,10 @@ public enum TL { LEAVE_LEFT("%s left faction %s."), LEAVE_DISBANDED("%s was disbanded."), LEAVE_DISBANDEDLOG("The faction %s (%s) was disbanded due to the last player (%s) leaving."), + LEAVE_DESCRIPTION("Leave your faction"), + /** - * Claiming + * Claiming - Same as above basically. No COMMAND_* because it's not in a command class, but... */ CLAIM_PROTECTED("This land is protected"), CLAIM_DISABLED("Sorry, this world has land claiming disabled."), @@ -452,63 +522,7 @@ public enum TL { CLAIM_FORCLAIM("for claiming this land"), CLAIM_CLAIMED("%s claimed land for %s from %s."), CLAIM_CLAIMEDLOG("%s claimed land at (%s) for the faction: %s"), - /** - * Command descriptions - */ - FACTIONS_ADMIN("hand over your admin rights"), - FACTIONS_AUTOCLAIM("auto-claim land as you walk around"), - FACTIONS_BYPASS("enable admin bypass mode"), - FACTIONS_CHAT("change chat mode"), - FACTIONS_CHATSPY("enable admin chat spy mode"), - FACTIONS_CLAIM("claim land where you are standing"), - FACTIONS_CONFIG("change a conf.json setting"), - FACTIONS_CREATE("create a new faction"), - FACTIONS_DEINVITE("remove a pending invitation"), - FACTIONS_DISBAND("disband a faction"), - FACTIONS_HELP("display a help page"), - FACTIONS_HOME("teleport to the faction home"), - FACTIONS_INVITE("invite a player to your faction"), - FACTIONS_JOIN("join a faction"), - FACTIONS_KICK("kick a player from the faction"), - FACTIONS_LEAVE("leave your faction"), - FACTIONS_LIST("see a list of the factions"), - FACTIONS_LOCK("lock all write stuff"), - FACTIONS_MANAGESAFEZONE("claim land as a safe zone and build/destroy within safe zones"), - FACTIONS_MANAGEWARZONE("claim land as a war zone and build/destroy within war zones"), - FACTIONS_MAP("show the territory map, and set optional auto update"), - FACTIONS_MOD("give or revoke moderator rights"), - FACTIONS_MONEY_BALANCE ("show your factions current money balance"), - FACTIONS_MONEY_DEPOSIT ("deposit money into a faction bank"), - FACTIONS_MONEY_WITHDRAW ("withdraw money from your faction bank"), - FACTIONS_MONEY_F2F ("transfer money from faction to faction"), - FACTIONS_MONEY_F2P ("transfer money from faction to player"), - FACTIONS_MONEY_P2F ("transfer money from player to faction"), - FACTIONS_NOBOOM ("toggle explosions (peaceful factions only),"), - FACTIONS_OPEN ("switch if invitation is required to join"), - FACTIONS_OWNER ("set ownership of claimed land"), - FACTIONS_OWNERLIST ("list owner(s), of this claimed land"), - FACTIONS_SETPEACEFUL("designate a faction as peaceful"), - FACTIONS_SETPERMANENT("designate a faction as permanent"), - FACTIONS_SETPERMANENTPOWER("set permanent power for a faction"), - FACTIONS_POWER("show player power info"), - FACTIONS_POWERBOOST("apply permanent power bonus/penalty to specified player or faction"), - FACTIONS_RELATION("set relation wish to another faction"), - FACTIONS_RELOAD("reload data file(s), from disk"), - FACTIONS_SAVE("save all data to disk"), - FACTIONS_SETHOME("set the faction home"), - FACTIONS_SHOW("show faction information"), - FACTIONS_TAG("change the faction tag"), - FACTIONS_TITLE("set or remove a players title"), - FACTIONS_VERSION("see the version of the plugin"), - FACTIONS_UNCLAIM("unclaim the land where you are standing"), - FACTIONS_UNCLAIMALL("unclaim all of your factions land"), - FACTIONS_SCOREBOARD("ability to toggle scoreboards"), - FACTIONS_SHOWINVITES("show pending invites to your faction"), - FACTIONS_SEECHUNK("see the chunk you stand in"), - FACTIONS_SETWARP("set a warp for your faction"), - FACTIONS_WARP("access your faction warps"), - FACTIONS_MODIFYPOWER("modify other player's power"), - FACTIONS_MONITORLOGINS("monitor join and leaves of faction members"), + /** * More generic, or less easily categorisable translations, which may apply to more than one class */ @@ -535,6 +549,8 @@ public enum TL { GENERIC_FACTIONTAG_TOOSHORT("The faction tag can't be shorter than %1$s chars."), GENERIC_FACTIONTAG_TOOLONG("The faction tag can't be longer than %s chars."), GENERIC_FACTIONTAG_ALPHANUMERIC("Faction tag must be alphanumeric. \"%s\" is not allowed."), + GENERIC_PLACEHOLDER(""), + /** * ASCII compass (for chat map) */ @@ -542,12 +558,14 @@ public enum TL { COMPASS_SHORT_EAST("E"), COMPASS_SHORT_SOUTH("S"), COMPASS_SHORT_WEST("W"), + /** * Chat modes */ CHAT_FACTION("faction chat"), CHAT_ALLIANCE("alliance chat"), CHAT_PUBLIC("public chat"), + /** * Relations */ @@ -555,11 +573,20 @@ public enum TL { RELATION_ALLY("ally"), RELATION_NEUTRAL("neutral"), RELATION_ENEMY("enemy"), + + /** + * Roles + */ + ROLE_ADMIN("admin"), + ROLE_MODERATOR("moderator"), + ROLE_NORMAL("normal member"), + /** * Strings lying around in other bits of the plugins */ NOPAGES("Sorry. No Pages available."), INVALIDPAGE("Invalid page. Must be between 1 and %1$d"), + /** * The ones here before I started messing around with this */ @@ -574,6 +601,7 @@ public enum TL { DEFAULT_PREFIX("default-prefix", "{relationcolor}[{faction}] &r"), FACTION_LOGIN("faction-login", "&e%1$s &9logged in."), FACTION_LOGOUT("faction-logout", "&e%1$s &9logged out.."), + /** * Warmups */