Merged Relation and Role into one enum

This commit is contained in:
Olof Larsson
2011-10-23 17:55:53 +02:00
parent e6ff84ad9a
commit 842844969b
64 changed files with 254 additions and 363 deletions

@ -18,8 +18,8 @@ public class CmdAutoClaim extends FCommand
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -18,8 +18,8 @@ public class CmdBoom extends FCommand
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = true;
senderMustBeAdmin = false;
senderMustBeOfficer = true;
senderMustBeLeader = false;
}
@Override

@ -18,8 +18,8 @@ public class CmdBypass extends FCommand
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -21,8 +21,8 @@ public class CmdChat extends FCommand
senderMustBePlayer = true;
senderMustBeMember = true;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -19,8 +19,8 @@ public class CmdClaim extends FCommand
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
aliases.add("claim");
}

@ -32,8 +32,8 @@ public class CmdConfig extends FCommand
senderMustBePlayer = false;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -25,8 +25,8 @@ public class CmdCreate extends FCommand
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -20,8 +20,8 @@ public class CmdDeinvite extends FCommand
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = true;
senderMustBeAdmin = false;
senderMustBeOfficer = true;
senderMustBeLeader = false;
}
@Override

@ -22,8 +22,8 @@ public class CmdDescription extends FCommand
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = true;
senderMustBeAdmin = false;
senderMustBeOfficer = true;
senderMustBeLeader = false;
}
@Override

@ -24,8 +24,8 @@ public class CmdDisband extends FCommand
senderMustBePlayer = false;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -26,8 +26,8 @@ public class CmdHelp extends FCommand
senderMustBePlayer = false;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override
@ -105,8 +105,8 @@ public class CmdHelp extends FCommand
pageLines.add( p.cmdBase.cmdUnclaim.getUseageTemplate(true) );
pageLines.add( p.cmdBase.cmdUnclaimall.getUseageTemplate(true) );
pageLines.add( p.cmdBase.cmdKick.getUseageTemplate(true) );
pageLines.add( p.cmdBase.cmdMod.getUseageTemplate(true) );
pageLines.add( p.cmdBase.cmdAdmin.getUseageTemplate(true) );
pageLines.add( p.cmdBase.cmdOfficer.getUseageTemplate(true) );
pageLines.add( p.cmdBase.cmdLeader.getUseageTemplate(true) );
pageLines.add( p.cmdBase.cmdTitle.getUseageTemplate(true) );
pageLines.add( p.txt.parse("<i>Player titles are just for fun. No rules connected to them." ));
helpPages.add(pageLines);

@ -33,8 +33,8 @@ public class CmdHome extends FCommand
senderMustBePlayer = true;
senderMustBeMember = true;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -20,8 +20,8 @@ public class CmdInvite extends FCommand
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = true;
senderMustBeAdmin = false;
senderMustBeOfficer = true;
senderMustBeLeader = false;
}
@Override

@ -19,8 +19,8 @@ public class CmdJoin extends FCommand
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -22,8 +22,8 @@ public class CmdKick extends FCommand
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = true;
senderMustBeAdmin = false;
senderMustBeOfficer = true;
senderMustBeLeader = false;
}
@Override

@ -5,23 +5,23 @@ import com.massivecraft.factions.FPlayers;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Rel;
public class CmdAdmin extends FCommand
public class CmdLeader extends FCommand
{
public CmdAdmin()
public CmdLeader()
{
super();
this.aliases.add("admin");
this.aliases.add("leader");
this.requiredArgs.add("player name");
//this.optionalArgs.put("", "");
this.permission = Permission.ADMIN.node;
this.permission = Permission.LEADER.node;
this.disableOnLock = true;
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = true;
senderMustBeOfficer = false;
senderMustBeLeader = true;
}
@Override

@ -17,8 +17,8 @@ public class CmdLeave extends FCommand {
senderMustBePlayer = true;
senderMustBeMember = true;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -27,8 +27,8 @@ public class CmdList extends FCommand
senderMustBePlayer = false;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -24,8 +24,8 @@ public class CmdLock extends FCommand {
senderMustBePlayer = false;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -21,8 +21,8 @@ public class CmdMap extends FCommand
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -23,8 +23,8 @@ public class CmdMoney extends FCommand
senderMustBePlayer = false;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
this.setHelpShort("faction money commands");
this.helpLong.add(p.txt.parseTags("<i>The faction money commands."));

@ -20,8 +20,8 @@ public class CmdMoneyBalance extends FCommand
senderMustBePlayer = false;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -22,8 +22,8 @@ public class CmdMoneyDeposit extends FCommand
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -22,8 +22,8 @@ public class CmdMoneyTransferFf extends FCommand
senderMustBePlayer = false;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -22,8 +22,8 @@ public class CmdMoneyTransferFp extends FCommand
senderMustBePlayer = false;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -22,8 +22,8 @@ public class CmdMoneyTransferPf extends FCommand
senderMustBePlayer = false;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -19,8 +19,8 @@ public class CmdMoneyWithdraw extends FCommand
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -4,24 +4,24 @@ import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.struct.Rel;
public class CmdMod extends FCommand
public class CmdOfficer extends FCommand
{
public CmdMod()
public CmdOfficer()
{
super();
this.aliases.add("mod");
this.aliases.add("officer");
this.requiredArgs.add("player name");
//this.optionalArgs.put("", "");
this.permission = Permission.MOD.node;
this.permission = Permission.OFFICER.node;
this.disableOnLock = true;
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = true;
senderMustBeOfficer = false;
senderMustBeLeader = true;
}
@Override

@ -20,8 +20,8 @@ public class CmdOpen extends FCommand
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = true;
senderMustBeAdmin = false;
senderMustBeOfficer = true;
senderMustBeLeader = false;
}
@Override

@ -26,8 +26,8 @@ public class CmdOwner extends FCommand
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
// TODO: Fix colors!

@ -22,8 +22,8 @@ public class CmdOwnerList extends FCommand
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -22,8 +22,8 @@ public class CmdPeaceful extends FCommand
senderMustBePlayer = false;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -21,8 +21,8 @@ public class CmdPermanent extends FCommand
senderMustBePlayer = false;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -19,8 +19,8 @@ public class CmdPermanentPower extends FCommand
senderMustBePlayer = false;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -21,8 +21,8 @@ public class CmdPower extends FCommand
senderMustBePlayer = false;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -23,8 +23,8 @@ public class CmdReload extends FCommand
senderMustBePlayer = false;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -20,8 +20,8 @@ public class CmdSafeunclaimall extends FCommand
senderMustBePlayer = false;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
this.setHelpShort("Unclaim all safezone land");
}

@ -23,8 +23,8 @@ public class CmdSaveAll extends FCommand
senderMustBePlayer = false;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -21,8 +21,8 @@ public class CmdSethome extends FCommand
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -26,8 +26,8 @@ public class CmdShow extends FCommand
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -24,8 +24,8 @@ public class CmdTag extends FCommand
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = true;
senderMustBeAdmin = false;
senderMustBeOfficer = true;
senderMustBeLeader = false;
}
@Override

@ -20,8 +20,8 @@ public class CmdTitle extends FCommand
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = true;
senderMustBeAdmin = false;
senderMustBeOfficer = true;
senderMustBeLeader = false;
}
@Override

@ -24,8 +24,8 @@ public class CmdUnclaim extends FCommand
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -21,8 +21,8 @@ public class CmdUnclaimall extends FCommand
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = true;
senderMustBeAdmin = false;
senderMustBeOfficer = true;
senderMustBeLeader = false;
}
@Override

@ -18,8 +18,8 @@ public class CmdVersion extends FCommand
senderMustBePlayer = false;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override

@ -20,8 +20,8 @@ public class CmdWarunclaimall extends FCommand
senderMustBePlayer = false;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
this.setHelpShort("unclaim all warzone land");
}

@ -6,7 +6,7 @@ import com.massivecraft.factions.Conf;
public class FCmdRoot extends FCommand
{
public CmdAdmin cmdAdmin = new CmdAdmin();
public CmdLeader cmdLeader = new CmdLeader();
public CmdAutoClaim cmdAutoClaim = new CmdAutoClaim();
public CmdBoom cmdBoom = new CmdBoom();
public CmdBypass cmdBypass = new CmdBypass();
@ -26,7 +26,7 @@ public class FCmdRoot extends FCommand
public CmdList cmdList = new CmdList();
public CmdLock cmdLock = new CmdLock();
public CmdMap cmdMap = new CmdMap();
public CmdMod cmdMod = new CmdMod();
public CmdOfficer cmdOfficer = new CmdOfficer();
public CmdMoney cmdMoney = new CmdMoney();
public CmdOpen cmdOpen = new CmdOpen();
public CmdOwner cmdOwner = new CmdOwner();
@ -62,8 +62,8 @@ public class FCmdRoot extends FCommand
senderMustBePlayer = false;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
this.disableOnLock = false;
@ -72,7 +72,7 @@ public class FCmdRoot extends FCommand
//this.subCommands.add(p.cmdHelp);
this.addSubCommand(this.cmdAdmin);
this.addSubCommand(this.cmdLeader);
this.addSubCommand(this.cmdAutoClaim);
this.addSubCommand(this.cmdBoom);
this.addSubCommand(this.cmdBypass);
@ -92,7 +92,7 @@ public class FCmdRoot extends FCommand
this.addSubCommand(this.cmdList);
this.addSubCommand(this.cmdLock);
this.addSubCommand(this.cmdMap);
this.addSubCommand(this.cmdMod);
this.addSubCommand(this.cmdOfficer);
this.addSubCommand(this.cmdMoney);
this.addSubCommand(this.cmdOpen);
this.addSubCommand(this.cmdOwner);

@ -23,8 +23,8 @@ public abstract class FCommand extends MCommand<P>
public FPlayer fme;
public Faction myFaction;
public boolean senderMustBeMember;
public boolean senderMustBeModerator;
public boolean senderMustBeAdmin;
public boolean senderMustBeOfficer;
public boolean senderMustBeLeader;
public boolean isMoneyCommand;
@ -39,8 +39,8 @@ public abstract class FCommand extends MCommand<P>
isMoneyCommand = false;
senderMustBeMember = false;
senderMustBeModerator = false;
senderMustBeAdmin = false;
senderMustBeOfficer = false;
senderMustBeLeader = false;
}
@Override
@ -89,7 +89,7 @@ public abstract class FCommand extends MCommand<P>
boolean superValid = super.validSenderType(sender, informSenderIfNot);
if ( ! superValid) return false;
if ( ! (this.senderMustBeMember || this.senderMustBeModerator || this.senderMustBeAdmin)) return true;
if ( ! (this.senderMustBeMember || this.senderMustBeOfficer || this.senderMustBeLeader)) return true;
if ( ! (sender instanceof Player)) return false;
@ -101,13 +101,13 @@ public abstract class FCommand extends MCommand<P>
return false;
}
if (this.senderMustBeModerator && ! fplayer.getRole().isAtLeast(Rel.OFFICER))
if (this.senderMustBeOfficer && ! fplayer.getRole().isAtLeast(Rel.OFFICER))
{
sender.sendMessage(p.txt.parse("<b>Only faction moderators can %s.", this.getHelpShort()));
return false;
}
if (this.senderMustBeAdmin && ! fplayer.getRole().isAtLeast(Rel.LEADER))
if (this.senderMustBeLeader && ! fplayer.getRole().isAtLeast(Rel.LEADER))
{
sender.sendMessage(p.txt.parse("<b>Only faction admins can %s.", this.getHelpShort()));
return false;

@ -23,8 +23,8 @@ public abstract class FRelationCommand extends FCommand
senderMustBePlayer = true;
senderMustBeMember = false;
senderMustBeModerator = true;
senderMustBeAdmin = false;
senderMustBeOfficer = true;
senderMustBeLeader = false;
}
@Override