Remove unneccessary perms in Perm.java
This commit is contained in:
		
							parent
							
								
									edb9f46167
								
							
						
					
					
						commit
						d6ec4ad5f0
					
				@ -9,111 +9,28 @@ public enum Perm implements Identified
 | 
				
			|||||||
	// -------------------------------------------- //
 | 
						// -------------------------------------------- //
 | 
				
			||||||
	// ENUM
 | 
						// ENUM
 | 
				
			||||||
	// -------------------------------------------- //
 | 
						// -------------------------------------------- //
 | 
				
			||||||
	
 | 
					
 | 
				
			||||||
	ACCESS,
 | 
					 | 
				
			||||||
	ACCESS_VIEW,
 | 
					 | 
				
			||||||
	ACCESS_PLAYER,
 | 
					 | 
				
			||||||
	ACCESS_FACTION,
 | 
					 | 
				
			||||||
	OVERRIDE,
 | 
					 | 
				
			||||||
	BASECOMMAND,
 | 
					 | 
				
			||||||
	CLAIM,
 | 
					 | 
				
			||||||
	CLAIM_ONE,
 | 
						CLAIM_ONE,
 | 
				
			||||||
	CLAIM_AUTO,
 | 
						CLAIM_AUTO,
 | 
				
			||||||
	CLAIM_FILL,
 | 
						CLAIM_FILL,
 | 
				
			||||||
	CLAIM_SQUARE,
 | 
						CLAIM_SQUARE,
 | 
				
			||||||
	CLAIM_CIRCLE,
 | 
						CLAIM_CIRCLE,
 | 
				
			||||||
	CLAIM_ALL,
 | 
						CLAIM_ALL,
 | 
				
			||||||
	CREATE,
 | 
					 | 
				
			||||||
	DESCRIPTION,
 | 
					 | 
				
			||||||
	DISBAND,
 | 
					 | 
				
			||||||
	DOCUMENTATION,
 | 
					 | 
				
			||||||
	DOCUMENTATION_FLAGS,
 | 
					 | 
				
			||||||
	DOCUMENTATION_PERMS,
 | 
					 | 
				
			||||||
	DOCUMENTATION_POWER,
 | 
					 | 
				
			||||||
	DOCUMENTATION_RANKS,
 | 
					 | 
				
			||||||
	DOCUMENTATION_WARPS,
 | 
					 | 
				
			||||||
	EXPANSIONS,
 | 
					 | 
				
			||||||
	FACTION,
 | 
					 | 
				
			||||||
	FLAG,
 | 
					 | 
				
			||||||
	FLAG_LIST,
 | 
					 | 
				
			||||||
	FLAG_SET,
 | 
					 | 
				
			||||||
	FLAG_SHOW,
 | 
					 | 
				
			||||||
	FLY,
 | 
					 | 
				
			||||||
	FLY_OTHER,
 | 
					 | 
				
			||||||
	HOME,
 | 
					 | 
				
			||||||
	INVITE,
 | 
					 | 
				
			||||||
	INVITE_LIST,
 | 
					 | 
				
			||||||
	INVITE_LIST_OTHER,
 | 
					 | 
				
			||||||
	INVITE_ADD,
 | 
					 | 
				
			||||||
	INVITE_REMOVE,
 | 
					 | 
				
			||||||
	JOIN,
 | 
					 | 
				
			||||||
	JOIN_OTHERS,
 | 
					 | 
				
			||||||
	KICK,
 | 
					 | 
				
			||||||
	LEAVE,
 | 
					 | 
				
			||||||
	LIST,
 | 
					 | 
				
			||||||
	MAP,
 | 
					 | 
				
			||||||
	MONEY,
 | 
					 | 
				
			||||||
	MONEY_BALANCE,
 | 
					 | 
				
			||||||
	MONEY_BALANCE_ANY,
 | 
					 | 
				
			||||||
	MONEY_DEPOSIT,
 | 
					 | 
				
			||||||
	MONEY_F2F,
 | 
					 | 
				
			||||||
	MONEY_F2P,
 | 
					 | 
				
			||||||
	MONEY_P2F,
 | 
					 | 
				
			||||||
	MONEY_WITHDRAW,
 | 
					 | 
				
			||||||
	MONEYCONVERT,
 | 
					 | 
				
			||||||
	MOTD,
 | 
					 | 
				
			||||||
	OPEN,
 | 
					 | 
				
			||||||
	PERM,
 | 
					 | 
				
			||||||
	PERM_LIST,
 | 
					 | 
				
			||||||
	PERM_SET,
 | 
					 | 
				
			||||||
	PERM_SHOW,
 | 
					 | 
				
			||||||
	PERM_VIEW,
 | 
					 | 
				
			||||||
	PERM_VIEWALL,
 | 
					 | 
				
			||||||
	PLAYER,
 | 
					 | 
				
			||||||
	POWERBOOST,
 | 
					 | 
				
			||||||
	POWERBOOST_PLAYER,
 | 
					 | 
				
			||||||
	POWERBOOST_FACTION,
 | 
					 | 
				
			||||||
	POWERBOOST_SET,
 | 
					 | 
				
			||||||
	RANK,
 | 
					 | 
				
			||||||
	RANK_SHOW,
 | 
					 | 
				
			||||||
	RANK_SET,
 | 
					 | 
				
			||||||
	RANK_LIST,
 | 
					 | 
				
			||||||
	RANK_EDIT,
 | 
					 | 
				
			||||||
	RANK_EDIT_CREATE,
 | 
					 | 
				
			||||||
	RANK_EDIT_NAME,
 | 
					 | 
				
			||||||
	RANK_EDIT_PREFIX,
 | 
					 | 
				
			||||||
	RANK_EDIT_PRIORITY,
 | 
					 | 
				
			||||||
	RANK_EDIT_DELETE,
 | 
					 | 
				
			||||||
	RELATION,
 | 
					 | 
				
			||||||
	RELATION_SET,
 | 
					 | 
				
			||||||
	RELATION_LIST,
 | 
					 | 
				
			||||||
	RELATION_WISHES,
 | 
					 | 
				
			||||||
	SEECHUNK,
 | 
					 | 
				
			||||||
	SEECHUNKOLD,
 | 
					 | 
				
			||||||
	SETHOME,
 | 
					 | 
				
			||||||
	SETPOWER,
 | 
					 | 
				
			||||||
	STATUS,
 | 
					 | 
				
			||||||
	NAME,
 | 
					 | 
				
			||||||
	TITLE,
 | 
					 | 
				
			||||||
	TITLE_COLOR,
 | 
					 | 
				
			||||||
	TERRITORYTITLES,
 | 
					 | 
				
			||||||
	TOP,
 | 
					 | 
				
			||||||
	UNCLAIM,
 | 
					 | 
				
			||||||
	UNCLAIM_ONE,
 | 
						UNCLAIM_ONE,
 | 
				
			||||||
	UNCLAIM_AUTO,
 | 
						UNCLAIM_AUTO,
 | 
				
			||||||
	UNCLAIM_FILL,
 | 
						UNCLAIM_FILL,
 | 
				
			||||||
	UNCLAIM_SQUARE,
 | 
						UNCLAIM_SQUARE,
 | 
				
			||||||
	UNCLAIM_CIRCLE,
 | 
						UNCLAIM_CIRCLE,
 | 
				
			||||||
	UNCLAIM_ALL,
 | 
						UNCLAIM_ALL,
 | 
				
			||||||
	UNSETHOME,
 | 
						OVERRIDE,
 | 
				
			||||||
	UNSTUCK,
 | 
						FLY,
 | 
				
			||||||
	WARP,
 | 
						JOIN_OTHERS,
 | 
				
			||||||
	WARP_GO,
 | 
						INVITE_LIST_OTHER,
 | 
				
			||||||
	WARP_LIST,
 | 
						TITLE_COLOR,
 | 
				
			||||||
	WARP_ADD,
 | 
						POWERBOOST_SET,
 | 
				
			||||||
	WARP_REMOVE,
 | 
						MONEY_BALANCE_ANY,
 | 
				
			||||||
 | 
						SETPOWER,
 | 
				
			||||||
	CONFIG,
 | 
						CONFIG,
 | 
				
			||||||
	CLEAN,
 | 
					 | 
				
			||||||
	VERSION,
 | 
						VERSION,
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
	// END OF LIST
 | 
						// END OF LIST
 | 
				
			||||||
 | 
				
			|||||||
@ -63,7 +63,7 @@ public class CmdFactions extends FactionsCommand
 | 
				
			|||||||
	public CmdFactionsMoneyconvert cmdFactionsMoneyconvert = new CmdFactionsMoneyconvert();
 | 
						public CmdFactionsMoneyconvert cmdFactionsMoneyconvert = new CmdFactionsMoneyconvert();
 | 
				
			||||||
	public CmdFactionsConfig cmdFactionsConfig = new CmdFactionsConfig();
 | 
						public CmdFactionsConfig cmdFactionsConfig = new CmdFactionsConfig();
 | 
				
			||||||
	public CmdFactionsClean cmdFactionsClean = new CmdFactionsClean();
 | 
						public CmdFactionsClean cmdFactionsClean = new CmdFactionsClean();
 | 
				
			||||||
	public MassiveCommandVersion cmdFactionsVersion = new MassiveCommandVersion(Factions.get()).setAliases("v", "version").addRequirements(RequirementHasPerm.get(Perm.VERSION));
 | 
						public MassiveCommandVersion cmdFactionsVersion = new MassiveCommandVersion(Factions.get()).addRequirements(RequirementHasPerm.get(Perm.VERSION));
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
	// -------------------------------------------- //
 | 
						// -------------------------------------------- //
 | 
				
			||||||
	// CONSTRUCT
 | 
						// CONSTRUCT
 | 
				
			||||||
 | 
				
			|||||||
@ -11,9 +11,9 @@ public class CmdFactionsMoney extends FactionsCommand
 | 
				
			|||||||
	public CmdFactionsMoneyBalance cmdMoneyBalance = new CmdFactionsMoneyBalance();
 | 
						public CmdFactionsMoneyBalance cmdMoneyBalance = new CmdFactionsMoneyBalance();
 | 
				
			||||||
	public CmdFactionsMoneyDeposit cmdMoneyDeposit = new CmdFactionsMoneyDeposit();
 | 
						public CmdFactionsMoneyDeposit cmdMoneyDeposit = new CmdFactionsMoneyDeposit();
 | 
				
			||||||
	public CmdFactionsMoneyWithdraw cmdMoneyWithdraw = new CmdFactionsMoneyWithdraw();
 | 
						public CmdFactionsMoneyWithdraw cmdMoneyWithdraw = new CmdFactionsMoneyWithdraw();
 | 
				
			||||||
	public CmdFactionsMoneyTransferFf cmdMoneyTransferFf = new CmdFactionsMoneyTransferFf();
 | 
						public CmdFactionsMoneyTransferF2f cmdMoneyTransferFf = new CmdFactionsMoneyTransferF2f();
 | 
				
			||||||
	public CmdFactionsMoneyTransferFp cmdMoneyTransferFp = new CmdFactionsMoneyTransferFp();
 | 
						public CmdFactionsMoneyTransferF2p cmdMoneyTransferFp = new CmdFactionsMoneyTransferF2p();
 | 
				
			||||||
	public CmdFactionsMoneyTransferPf cmdMoneyTransferPf = new CmdFactionsMoneyTransferPf();
 | 
						public CmdFactionsMoneyTransferP2f cmdMoneyTransferPf = new CmdFactionsMoneyTransferP2f();
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
	// -------------------------------------------- //
 | 
						// -------------------------------------------- //
 | 
				
			||||||
	// CONSTRUCT
 | 
						// CONSTRUCT
 | 
				
			||||||
 | 
				
			|||||||
@ -1,26 +1,24 @@
 | 
				
			|||||||
package com.massivecraft.factions.cmd;
 | 
					package com.massivecraft.factions.cmd;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import com.massivecraft.factions.Factions;
 | 
					import com.massivecraft.factions.Factions;
 | 
				
			||||||
import com.massivecraft.factions.Perm;
 | 
					 | 
				
			||||||
import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled;
 | 
					import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled;
 | 
				
			||||||
import com.massivecraft.factions.cmd.type.TypeFaction;
 | 
					import com.massivecraft.factions.cmd.type.TypeFaction;
 | 
				
			||||||
import com.massivecraft.factions.entity.Faction;
 | 
					import com.massivecraft.factions.entity.Faction;
 | 
				
			||||||
import com.massivecraft.factions.entity.MConf;
 | 
					import com.massivecraft.factions.entity.MConf;
 | 
				
			||||||
import com.massivecraft.factions.integration.Econ;
 | 
					import com.massivecraft.factions.integration.Econ;
 | 
				
			||||||
import com.massivecraft.massivecore.MassiveException;
 | 
					import com.massivecraft.massivecore.MassiveException;
 | 
				
			||||||
import com.massivecraft.massivecore.command.requirement.RequirementHasPerm;
 | 
					 | 
				
			||||||
import com.massivecraft.massivecore.command.type.primitive.TypeDouble;
 | 
					import com.massivecraft.massivecore.command.type.primitive.TypeDouble;
 | 
				
			||||||
import com.massivecraft.massivecore.money.Money;
 | 
					import com.massivecraft.massivecore.money.Money;
 | 
				
			||||||
import com.massivecraft.massivecore.util.Txt;
 | 
					import com.massivecraft.massivecore.util.Txt;
 | 
				
			||||||
import org.bukkit.ChatColor;
 | 
					import org.bukkit.ChatColor;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public class CmdFactionsMoneyTransferFf extends FactionsCommand
 | 
					public class CmdFactionsMoneyTransferF2f extends FactionsCommand
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	// -------------------------------------------- //
 | 
						// -------------------------------------------- //
 | 
				
			||||||
	// CONSTRUCT
 | 
						// CONSTRUCT
 | 
				
			||||||
	// -------------------------------------------- //
 | 
						// -------------------------------------------- //
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
	public CmdFactionsMoneyTransferFf()
 | 
						public CmdFactionsMoneyTransferF2f()
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
		// Fields
 | 
							// Fields
 | 
				
			||||||
		this.setSetupEnabled(false);
 | 
							this.setSetupEnabled(false);
 | 
				
			||||||
@ -34,7 +32,6 @@ public class CmdFactionsMoneyTransferFf extends FactionsCommand
 | 
				
			|||||||
		this.addParameter(TypeFaction.get(), "faction").setDesc("the faction to transfer money to");
 | 
							this.addParameter(TypeFaction.get(), "faction").setDesc("the faction to transfer money to");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		// Requirements
 | 
							// Requirements
 | 
				
			||||||
		this.addRequirements(RequirementHasPerm.get(Perm.MONEY_F2F));
 | 
					 | 
				
			||||||
		this.addRequirements(ReqBankCommandsEnabled.get());
 | 
							this.addRequirements(ReqBankCommandsEnabled.get());
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -1,7 +1,6 @@
 | 
				
			|||||||
package com.massivecraft.factions.cmd;
 | 
					package com.massivecraft.factions.cmd;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import com.massivecraft.factions.Factions;
 | 
					import com.massivecraft.factions.Factions;
 | 
				
			||||||
import com.massivecraft.factions.Perm;
 | 
					 | 
				
			||||||
import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled;
 | 
					import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled;
 | 
				
			||||||
import com.massivecraft.factions.cmd.type.TypeFaction;
 | 
					import com.massivecraft.factions.cmd.type.TypeFaction;
 | 
				
			||||||
import com.massivecraft.factions.cmd.type.TypeMPlayer;
 | 
					import com.massivecraft.factions.cmd.type.TypeMPlayer;
 | 
				
			||||||
@ -10,19 +9,18 @@ import com.massivecraft.factions.entity.MConf;
 | 
				
			|||||||
import com.massivecraft.factions.entity.MPlayer;
 | 
					import com.massivecraft.factions.entity.MPlayer;
 | 
				
			||||||
import com.massivecraft.factions.integration.Econ;
 | 
					import com.massivecraft.factions.integration.Econ;
 | 
				
			||||||
import com.massivecraft.massivecore.MassiveException;
 | 
					import com.massivecraft.massivecore.MassiveException;
 | 
				
			||||||
import com.massivecraft.massivecore.command.requirement.RequirementHasPerm;
 | 
					 | 
				
			||||||
import com.massivecraft.massivecore.command.type.primitive.TypeDouble;
 | 
					import com.massivecraft.massivecore.command.type.primitive.TypeDouble;
 | 
				
			||||||
import com.massivecraft.massivecore.money.Money;
 | 
					import com.massivecraft.massivecore.money.Money;
 | 
				
			||||||
import com.massivecraft.massivecore.util.Txt;
 | 
					import com.massivecraft.massivecore.util.Txt;
 | 
				
			||||||
import org.bukkit.ChatColor;
 | 
					import org.bukkit.ChatColor;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public class CmdFactionsMoneyTransferFp extends FactionsCommand
 | 
					public class CmdFactionsMoneyTransferF2p extends FactionsCommand
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	// -------------------------------------------- //
 | 
						// -------------------------------------------- //
 | 
				
			||||||
	// CONSTRUCT
 | 
						// CONSTRUCT
 | 
				
			||||||
	// -------------------------------------------- //
 | 
						// -------------------------------------------- //
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
	public CmdFactionsMoneyTransferFp()
 | 
						public CmdFactionsMoneyTransferF2p()
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
		// Fields
 | 
							// Fields
 | 
				
			||||||
		this.setSetupEnabled(false);
 | 
							this.setSetupEnabled(false);
 | 
				
			||||||
@ -36,7 +34,6 @@ public class CmdFactionsMoneyTransferFp extends FactionsCommand
 | 
				
			|||||||
		this.addParameter(TypeMPlayer.get(), "player").setDesc("the player to transfer money to");
 | 
							this.addParameter(TypeMPlayer.get(), "player").setDesc("the player to transfer money to");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		// Requirements
 | 
							// Requirements
 | 
				
			||||||
		this.addRequirements(RequirementHasPerm.get(Perm.MONEY_F2P));
 | 
					 | 
				
			||||||
		this.addRequirements(ReqBankCommandsEnabled.get());
 | 
							this.addRequirements(ReqBankCommandsEnabled.get());
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
@ -1,7 +1,6 @@
 | 
				
			|||||||
package com.massivecraft.factions.cmd;
 | 
					package com.massivecraft.factions.cmd;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import com.massivecraft.factions.Factions;
 | 
					import com.massivecraft.factions.Factions;
 | 
				
			||||||
import com.massivecraft.factions.Perm;
 | 
					 | 
				
			||||||
import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled;
 | 
					import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled;
 | 
				
			||||||
import com.massivecraft.factions.cmd.type.TypeFaction;
 | 
					import com.massivecraft.factions.cmd.type.TypeFaction;
 | 
				
			||||||
import com.massivecraft.factions.cmd.type.TypeMPlayer;
 | 
					import com.massivecraft.factions.cmd.type.TypeMPlayer;
 | 
				
			||||||
@ -10,19 +9,18 @@ import com.massivecraft.factions.entity.MConf;
 | 
				
			|||||||
import com.massivecraft.factions.entity.MPlayer;
 | 
					import com.massivecraft.factions.entity.MPlayer;
 | 
				
			||||||
import com.massivecraft.factions.integration.Econ;
 | 
					import com.massivecraft.factions.integration.Econ;
 | 
				
			||||||
import com.massivecraft.massivecore.MassiveException;
 | 
					import com.massivecraft.massivecore.MassiveException;
 | 
				
			||||||
import com.massivecraft.massivecore.command.requirement.RequirementHasPerm;
 | 
					 | 
				
			||||||
import com.massivecraft.massivecore.command.type.primitive.TypeDouble;
 | 
					import com.massivecraft.massivecore.command.type.primitive.TypeDouble;
 | 
				
			||||||
import com.massivecraft.massivecore.money.Money;
 | 
					import com.massivecraft.massivecore.money.Money;
 | 
				
			||||||
import com.massivecraft.massivecore.util.Txt;
 | 
					import com.massivecraft.massivecore.util.Txt;
 | 
				
			||||||
import org.bukkit.ChatColor;
 | 
					import org.bukkit.ChatColor;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public class CmdFactionsMoneyTransferPf extends FactionsCommand
 | 
					public class CmdFactionsMoneyTransferP2f extends FactionsCommand
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	// -------------------------------------------- //
 | 
						// -------------------------------------------- //
 | 
				
			||||||
	// CONSTRUCT
 | 
						// CONSTRUCT
 | 
				
			||||||
	// -------------------------------------------- //
 | 
						// -------------------------------------------- //
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
	public CmdFactionsMoneyTransferPf()
 | 
						public CmdFactionsMoneyTransferP2f()
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
		// Fields
 | 
							// Fields
 | 
				
			||||||
		this.setSetupEnabled(false);
 | 
							this.setSetupEnabled(false);
 | 
				
			||||||
@ -36,7 +34,6 @@ public class CmdFactionsMoneyTransferPf extends FactionsCommand
 | 
				
			|||||||
		this.addParameter(TypeFaction.get(), "faction").setDesc("the faction to transfer money to");
 | 
							this.addParameter(TypeFaction.get(), "faction").setDesc("the faction to transfer money to");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		// Requirements
 | 
							// Requirements
 | 
				
			||||||
		this.addRequirements(RequirementHasPerm.get(Perm.MONEY_P2F));
 | 
					 | 
				
			||||||
		this.addRequirements(ReqBankCommandsEnabled.get());
 | 
							this.addRequirements(ReqBankCommandsEnabled.get());
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user