Even more TL. Fixes command description issues.
This commit is contained in:
@@ -84,4 +84,8 @@ public class CmdAdmin extends FCommand {
|
||||
}
|
||||
}
|
||||
|
||||
public TL getUsageTranslation(){
|
||||
return TL.COMMAND_ADMIN_DESCRIPTION;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -39,4 +39,9 @@ public class CmdAutoHelp extends MCommand<P> {
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -58,4 +58,9 @@ public class CmdChat extends FCommand {
|
||||
msg(TL.COMMAND_CHAT_MODE_FACTION);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public TL getUsageTranslation() {
|
||||
return TL.COMMAND_CHAT_DESCRIPTION;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -68,4 +68,9 @@ public class CmdClaim extends FCommand {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public TL getUsageTranslation() {
|
||||
return TL.COMMAND_CLAIM_DESCRIPTION;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -240,4 +240,9 @@ public class CmdConfig extends FCommand {
|
||||
Conf.save();
|
||||
}
|
||||
|
||||
@Override
|
||||
public TL getUsageTranslation() {
|
||||
return TL.COMMAND_CONFIG_DESCRIPTION;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -36,4 +36,9 @@ public class CmdConvert extends FCommand {
|
||||
Conf.backEnd = nb;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TL getUsageTranslation() {
|
||||
return TL.COMMAND_CONVERT_DESCRIPTION;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -98,4 +98,9 @@ public class CmdCreate extends FCommand {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public TL getUsageTranslation() {
|
||||
return TL.COMMAND_CREATE_DESCRIPTION;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,4 +48,9 @@ public class CmdDescription extends FCommand {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public TL getUsageTranslation() {
|
||||
return TL.COMMAND_DESCRIPTION_DESCRIPTION;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -110,4 +110,9 @@ public class CmdJoin extends FCommand {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public TL getUsageTranslation() {
|
||||
return TL.COMMAND_JOIN_DESCRIPTION;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -117,4 +117,9 @@ public class CmdKick extends FCommand {
|
||||
toKick.resetFactionData();
|
||||
}
|
||||
|
||||
@Override
|
||||
public TL getUsageTranslation() {
|
||||
return TL.COMMAND_KICK_DESCRIPTION;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -77,4 +77,9 @@ public class CmdMod extends FCommand {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public TL getUsageTranslation() {
|
||||
return TL.COMMAND_MOD_DESCRIPTION;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -41,4 +41,9 @@ public class CmdMoneyBalance extends FCommand {
|
||||
Econ.sendBalanceInfo(fme, faction);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TL getUsageTranslation() {
|
||||
return TL.COMMAND_MONEYBALANCE_DESCRIPTION;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -45,4 +45,9 @@ public class CmdOpen extends FCommand {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public TL getUsageTranslation() {
|
||||
return TL.COMMAND_OPEN_DESCRIPTION;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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)) + "<i> has " + change + " your faction.");
|
||||
fplayer.msg(TL.COMMAND_PEACEFUL_YOURS, blame, change);
|
||||
} else {
|
||||
fplayer.msg((fme == null ? "A server admin" : fme.describeTo(fplayer, true)) + "<i> has " + change + " the faction \"" + faction.getTag(fplayer) + "<i>\".");
|
||||
fplayer.msg(TL.COMMAND_PEACEFUL_OTHER, blame, change, faction.getTag(fplayer));
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public TL getUsageTranslation() {
|
||||
return TL.COMMAND_PEACEFUL_DESCRIPTION;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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)) + "<i> " + change + " your faction.");
|
||||
fplayer.msg(TL.COMMAND_PERMANENT_YOURS, blame, change);
|
||||
} else {
|
||||
fplayer.msg((fme == null ? "A server admin" : fme.describeTo(fplayer, true)) + "<i> " + 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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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("<i>You %s <h>%s<i>.", 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)) + "<i> " + 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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -33,4 +33,9 @@ public class CmdReload extends FCommand {
|
||||
|
||||
msg(TL.COMMAND_RELOAD_TIME, timeReload);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TL getUsageTranslation() {
|
||||
return TL.COMMAND_RELOAD_DESCRIPTION;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -35,4 +35,9 @@ public class CmdSaveAll extends FCommand {
|
||||
msg(TL.COMMAND_SAVEALL);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TL getUsageTranslation() {
|
||||
return TL.COMMAND_SAVEALL_DESCRIPTION;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -70,4 +70,9 @@ public class CmdSethome extends FCommand {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public TL getUsageTranslation() {
|
||||
return TL.COMMAND_SETHOME_DESCRIPTION;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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<FPlayer> normals = faction.getFPlayersWhereRole(Role.NORMAL);
|
||||
|
||||
msg((p).txt.titleize(faction.getTag(this.fme)));
|
||||
msg("<a>Description: <i>%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("<a>Joining: <i>" + (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("<a>Land / Power / Maxpower: <i> %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("<a>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("<a>Total land value: <i>" + 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("<a>Bank contains: <i>" + Econ.moneyString(Econ.getBalance(faction.getAccountId())));
|
||||
msg(TL.COMMAND_SHOW_BANKCONTAINS, Econ.moneyString(Econ.getBalance(faction.getAccountId())));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
String allyList = p.txt.parse("<a>Allies: ");
|
||||
String enemyList = p.txt.parse("<a>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("<a>") + "Members online: ";
|
||||
String offlineList = p.txt.parse("<a>") + "Members offline: ";
|
||||
String onlineList = p.txt.parse("<a>") + TL.COMMAND_SHOW_MEMBERSONLINE.toString();
|
||||
String offlineList = p.txt.parse("<a>") + TL.COMMAND_SHOW_MEMBERSOFFLINE.toString();
|
||||
for (FPlayer follower : admins) {
|
||||
String listpart = follower.getNameAndTitle(this.fme) + p.txt.parse("<i>") + ", ";
|
||||
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;
|
||||
}
|
||||
}
|
||||
@@ -31,5 +31,10 @@ public class CmdShowInvites extends FCommand {
|
||||
sendFancyMessage(msg);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TL getUsageTranslation() {
|
||||
return TL.COMMAND_SHOWINVITES_DESCRIPTION;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -35,4 +35,9 @@ public class CmdStatus extends FCommand {
|
||||
fme.sendMessage(ret);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TL getUsageTranslation() {
|
||||
return TL.COMMAND_STATUS_DESCRIPTION;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -76,4 +76,9 @@ public class CmdTag extends FCommand {
|
||||
FTeamWrapper.updatePrefixes(myFaction);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TL getUsageTranslation() {
|
||||
return TL.COMMAND_TAG_DESCRIPTION;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -112,4 +112,9 @@ public class CmdUnclaim extends FCommand {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public TL getUsageTranslation() {
|
||||
return TL.COMMAND_UNCLAIM_DESCRIPTION;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -56,4 +56,9 @@ public class CmdUnclaimall extends FCommand {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public TL getUsageTranslation() {
|
||||
return TL.COMMAND_UNCLAIMALL_DESCRIPTION;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user