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