Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unneccessary perms in Perm.java

Browse Source
This commit is contained in:
Magnus Ulf 2019-02-08 16:52:14 +01:00
parent edb9f46167
commit d6ec4ad5f0
6 changed files with 19 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
src/com/massivecraft/factions/Perm.java
View File

@ -10,110 +10,27 @@ public enum Perm implements Identified
// ENUM
// -------------------------------------------- //
ACCESS,
ACCESS_VIEW,
ACCESS_PLAYER,
ACCESS_FACTION,
OVERRIDE,
BASECOMMAND,
CLAIM,
CLAIM_ONE,
CLAIM_AUTO,
CLAIM_FILL,
CLAIM_SQUARE,
CLAIM_CIRCLE,
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_AUTO,
UNCLAIM_FILL,
UNCLAIM_SQUARE,
UNCLAIM_CIRCLE,
UNCLAIM_ALL,
UNSETHOME,
UNSTUCK,
WARP,
WARP_GO,
WARP_LIST,
WARP_ADD,
WARP_REMOVE,
OVERRIDE,
FLY,
JOIN_OTHERS,
INVITE_LIST_OTHER,
TITLE_COLOR,
POWERBOOST_SET,
MONEY_BALANCE_ANY,
SETPOWER,
CONFIG,
CLEAN,
VERSION,
// END OF LIST

2
src/com/massivecraft/factions/cmd/CmdFactions.java
View File

@ -63,7 +63,7 @@ public class CmdFactions extends FactionsCommand
public CmdFactionsMoneyconvert cmdFactionsMoneyconvert = new CmdFactionsMoneyconvert();
public CmdFactionsConfig cmdFactionsConfig = new CmdFactionsConfig();
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

6
src/com/massivecraft/factions/cmd/CmdFactionsMoney.java
View File

@ -11,9 +11,9 @@ public class CmdFactionsMoney extends FactionsCommand
public CmdFactionsMoneyBalance cmdMoneyBalance = new CmdFactionsMoneyBalance();
public CmdFactionsMoneyDeposit cmdMoneyDeposit = new CmdFactionsMoneyDeposit();
public CmdFactionsMoneyWithdraw cmdMoneyWithdraw = new CmdFactionsMoneyWithdraw();
public CmdFactionsMoneyTransferFf cmdMoneyTransferFf = new CmdFactionsMoneyTransferFf();
public CmdFactionsMoneyTransferFp cmdMoneyTransferFp = new CmdFactionsMoneyTransferFp();
public CmdFactionsMoneyTransferPf cmdMoneyTransferPf = new CmdFactionsMoneyTransferPf();
public CmdFactionsMoneyTransferF2f cmdMoneyTransferFf = new CmdFactionsMoneyTransferF2f();
public CmdFactionsMoneyTransferF2p cmdMoneyTransferFp = new CmdFactionsMoneyTransferF2p();
public CmdFactionsMoneyTransferP2f cmdMoneyTransferPf = new CmdFactionsMoneyTransferP2f();
// -------------------------------------------- //
// CONSTRUCT

7
src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java → src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferF2f.java
View File

@ -1,26 +1,24 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled;
import com.massivecraft.factions.cmd.type.TypeFaction;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.MConf;
import com.massivecraft.factions.integration.Econ;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.command.requirement.RequirementHasPerm;
import com.massivecraft.massivecore.command.type.primitive.TypeDouble;
import com.massivecraft.massivecore.money.Money;
import com.massivecraft.massivecore.util.Txt;
import org.bukkit.ChatColor;
public class CmdFactionsMoneyTransferFf extends FactionsCommand
public class CmdFactionsMoneyTransferF2f extends FactionsCommand
{
// -------------------------------------------- //
// CONSTRUCT
// -------------------------------------------- //
public CmdFactionsMoneyTransferFf()
public CmdFactionsMoneyTransferF2f()
{
// Fields
this.setSetupEnabled(false);
@ -34,7 +32,6 @@ public class CmdFactionsMoneyTransferFf extends FactionsCommand
this.addParameter(TypeFaction.get(), "faction").setDesc("the faction to transfer money to");
// Requirements
this.addRequirements(RequirementHasPerm.get(Perm.MONEY_F2F));
this.addRequirements(ReqBankCommandsEnabled.get());
}

7
src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java → src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferF2p.java
View File

@ -1,7 +1,6 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled;
import com.massivecraft.factions.cmd.type.TypeFaction;
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.integration.Econ;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.command.requirement.RequirementHasPerm;
import com.massivecraft.massivecore.command.type.primitive.TypeDouble;
import com.massivecraft.massivecore.money.Money;
import com.massivecraft.massivecore.util.Txt;
import org.bukkit.ChatColor;
public class CmdFactionsMoneyTransferFp extends FactionsCommand
public class CmdFactionsMoneyTransferF2p extends FactionsCommand
{
// -------------------------------------------- //
// CONSTRUCT
// -------------------------------------------- //
public CmdFactionsMoneyTransferFp()
public CmdFactionsMoneyTransferF2p()
{
// Fields
this.setSetupEnabled(false);
@ -36,7 +34,6 @@ public class CmdFactionsMoneyTransferFp extends FactionsCommand
this.addParameter(TypeMPlayer.get(), "player").setDesc("the player to transfer money to");
// Requirements
this.addRequirements(RequirementHasPerm.get(Perm.MONEY_F2P));
this.addRequirements(ReqBankCommandsEnabled.get());
}

7
src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java → src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferP2f.java
View File

@ -1,7 +1,6 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled;
import com.massivecraft.factions.cmd.type.TypeFaction;
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.integration.Econ;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.command.requirement.RequirementHasPerm;
import com.massivecraft.massivecore.command.type.primitive.TypeDouble;
import com.massivecraft.massivecore.money.Money;
import com.massivecraft.massivecore.util.Txt;
import org.bukkit.ChatColor;
public class CmdFactionsMoneyTransferPf extends FactionsCommand
public class CmdFactionsMoneyTransferP2f extends FactionsCommand
{
// -------------------------------------------- //
// CONSTRUCT
// -------------------------------------------- //
public CmdFactionsMoneyTransferPf()
public CmdFactionsMoneyTransferP2f()
{
// Fields
this.setSetupEnabled(false);
@ -36,7 +34,6 @@ public class CmdFactionsMoneyTransferPf extends FactionsCommand
this.addParameter(TypeFaction.get(), "faction").setDesc("the faction to transfer money to");
// Requirements
this.addRequirements(RequirementHasPerm.get(Perm.MONEY_P2F));
this.addRequirements(ReqBankCommandsEnabled.get());
}