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

Permission node simplification.

Browse Source
This commit is contained in:
Olof Larsson
2014-04-03 17:21:07 +02:00
parent 1bb7d0a1d5
commit 722ce6b2a7
26 changed files with 108 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/com/massivecraft/mcore/MCorePerm.java
View File

@@ -10,30 +10,29 @@ public enum MCorePerm
// ENUM
// -------------------------------------------- //
CMD_MCORE("cmd.mcore"),
CMD_MCORE_ID("cmd.mcore.id"),
CMD_MCORE_VERSION("cmd.mcore.version"),
CMD_MCORE_HEARSOUND("cmd.mcore.hearsound"),
CMD_MCORE_MSTORE("cmd.mcore.mstore"),
CMD_MCORE_MSTORE_STATS("cmd.mcore.mstore.stats"),
CMD_MCORE_MSTORE_LISTCOLLS("cmd.mcore.mstore.listcolls"),
CMD_MCORE_MSTORE_COPYDB("cmd.mcore.mstore.copydb"),
CMD_MCORE_USYS("cmd.mcore.usys"),
CMD_MCORE_USYS_MULTIVERSE("cmd.mcore.usys.multiverse"),
CMD_MCORE_USYS_MULTIVERSE_LIST("cmd.mcore.usys.multiverse.list"),
CMD_MCORE_USYS_MULTIVERSE_SHOW("cmd.mcore.usys.multiverse.show"),
CMD_MCORE_USYS_MULTIVERSE_NEW("cmd.mcore.usys.multiverse.new"),
CMD_MCORE_USYS_MULTIVERSE_DEL("cmd.mcore.usys.multiverse.del"),
CMD_MCORE_USYS_UNIVERSE("cmd.mcore.usys.universe"),
CMD_MCORE_USYS_UNIVERSE_NEW("cmd.mcore.usys.universe.new"),
CMD_MCORE_USYS_UNIVERSE_DEL("cmd.mcore.usys.universe.del"),
CMD_MCORE_USYS_UNIVERSE_CLEAR("cmd.mcore.usys.universe.clear"),
CMD_MCORE_USYS_WORLD("cmd.mcore.usys.world"),
CMD_MCORE_USYS_ASPECT("cmd.mcore.usys.aspect"),
CMD_MCORE_USYS_ASPECT_LIST("cmd.mcore.usys.aspect.list"),
CMD_MCORE_USYS_ASPECT_SHOW("cmd.mcore.usys.aspect.show"),
CMD_MCORE_USYS_ASPECT_USE("cmd.mcore.usys.aspect.use"),
BASECOMMAND("basecommand"),
ID("id"),
VERSION("version"),
HEARSOUND("hearsound"),
MSTORE("mstore"),
MSTORE_STATS("mstore.stats"),
MSTORE_LISTCOLLS("mstore.listcolls"),
MSTORE_COPYDB("mstore.copydb"),
USYS("usys"),
USYS_MULTIVERSE("usys.multiverse"),
USYS_MULTIVERSE_LIST("usys.multiverse.list"),
USYS_MULTIVERSE_SHOW("usys.multiverse.show"),
USYS_MULTIVERSE_NEW("usys.multiverse.new"),
USYS_MULTIVERSE_DEL("usys.multiverse.del"),
USYS_UNIVERSE("usys.universe"),
USYS_UNIVERSE_NEW("usys.universe.new"),
USYS_UNIVERSE_DEL("usys.universe.del"),
USYS_UNIVERSE_CLEAR("usys.universe.clear"),
USYS_WORLD("usys.world"),
USYS_ASPECT("usys.aspect"),
USYS_ASPECT_LIST("usys.aspect.list"),
USYS_ASPECT_SHOW("usys.aspect.show"),
USYS_ASPECT_USE("usys.aspect.use"),
NOTPDELAY("notpdelay"),
// END OF LIST

2
src/com/massivecraft/mcore/cmd/arg/ARAspect.java
View File

@@ -36,7 +36,7 @@ public class ARAspect extends ARAbstractSelect<Aspect>
@Override
public boolean canList(CommandSender sender)
{
return MCorePerm.CMD_MCORE_USYS_ASPECT_LIST.has(sender, false);
return MCorePerm.USYS_ASPECT_LIST.has(sender, false);
}
@Override

2
src/com/massivecraft/mcore/cmd/arg/ARMultiverse.java
View File

@@ -36,7 +36,7 @@ public class ARMultiverse extends ARAbstractSelect<Multiverse>
@Override
public boolean canList(CommandSender sender)
{
return MCorePerm.CMD_MCORE_USYS_MULTIVERSE_LIST.has(sender, false);
return MCorePerm.USYS_MULTIVERSE_LIST.has(sender, false);
}
@Override

4
src/com/massivecraft/mcore/mcorecmd/CmdMCore.java
View File

@@ -16,7 +16,7 @@ public class CmdMCore extends MCommand
public CmdMCoreMStore cmdMCoreMStore = new CmdMCoreMStore();
public CmdMCoreId cmdMCoreId = new CmdMCoreId();
public CmdMCoreHearsound cmdMCoreHearsound = new CmdMCoreHearsound();
public VersionCommand cmdMCoreVersion = new VersionCommand(MCore.get(), MCorePerm.CMD_MCORE_VERSION.node, "v", "version");
public VersionCommand cmdMCoreVersion = new VersionCommand(MCore.get(), MCorePerm.VERSION.node, "v", "version");
// -------------------------------------------- //
// CONSTRUCT
@@ -32,7 +32,7 @@ public class CmdMCore extends MCommand
this.addSubCommand(this.cmdMCoreVersion);
// Requirements
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.BASECOMMAND.node));
}
}

2
src/com/massivecraft/mcore/mcorecmd/CmdMCoreHearsound.java
View File

@@ -25,7 +25,7 @@ public class CmdMCoreHearsound extends MCommand
this.setErrorOnToManyArgs(false);
// Requirements
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_HEARSOUND.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.HEARSOUND.node));
this.addRequirements(ReqIsPlayer.get());
}

2
src/com/massivecraft/mcore/mcorecmd/CmdMCoreId.java
View File

@@ -17,7 +17,7 @@ public class CmdMCoreId extends MCommand
this.addAliases("id");
// Requirements
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_ID.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.ID.node));
}
// -------------------------------------------- //

2
src/com/massivecraft/mcore/mcorecmd/CmdMCoreMStore.java
View File

@@ -29,7 +29,7 @@ public class CmdMCoreMStore extends MCommand
this.addAliases("mstore");
// Requirements
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_MSTORE.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.MSTORE.node));
}
}

2
src/com/massivecraft/mcore/mcorecmd/CmdMCoreMStoreCopydb.java
View File

@@ -30,7 +30,7 @@ public class CmdMCoreMStoreCopydb extends MCommand
this.addRequiredArg("to");
// Requirements
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_MSTORE_COPYDB.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.MSTORE_COPYDB.node));
}
// -------------------------------------------- //

2
src/com/massivecraft/mcore/mcorecmd/CmdMCoreMStoreListcolls.java
View File

@@ -29,7 +29,7 @@ public class CmdMCoreMStoreListcolls extends MCommand
this.addOptionalArg("db", ConfServer.dburi);
// Requirements
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_MSTORE_LISTCOLLS.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.MSTORE_LISTCOLLS.node));
}
// -------------------------------------------- //

2
src/com/massivecraft/mcore/mcorecmd/CmdMCoreMStoreStats.java
View File

@@ -26,7 +26,7 @@ public class CmdMCoreMStoreStats extends MCommand
this.addOptionalArg("coll", Coll.TOTAL);
// Requirements
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_MSTORE_STATS.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.MSTORE_STATS.node));
}
// -------------------------------------------- //

2
src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsys.java
View File

@@ -31,7 +31,7 @@ public class CmdMCoreUsys extends MCommand
this.addAliases("usys");
// Requirements
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.USYS.node));
}
}

2
src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysAspect.java
View File

@@ -29,7 +29,7 @@ public class CmdMCoreUsysAspect extends MCommand
this.addAliases("a", "aspect");
// Requirements
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_ASPECT.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_ASPECT.node));
}
}

2
src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysAspectList.java
View File

@@ -26,7 +26,7 @@ public class CmdMCoreUsysAspectList extends MCommand
this.addOptionalArg("page", "1");
// Requirements
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_ASPECT_LIST.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_ASPECT_LIST.node));
}
// -------------------------------------------- //

2
src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysAspectShow.java
View File

@@ -22,7 +22,7 @@ public class CmdMCoreUsysAspectShow extends MCommand
this.addRequiredArg("aspect");
// Requirements
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_ASPECT_SHOW.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_ASPECT_SHOW.node));
}
// -------------------------------------------- //

2
src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysAspectUse.java
View File

@@ -24,7 +24,7 @@ public class CmdMCoreUsysAspectUse extends MCommand
this.addRequiredArg("multiverse");
// Requirements
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_ASPECT_USE.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_ASPECT_USE.node));
}
// -------------------------------------------- //

2
src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysMultiverse.java
View File

@@ -31,7 +31,7 @@ public class CmdMCoreUsysMultiverse extends MCommand
this.addAliases("m", "multiverse");
// Requirements
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_MULTIVERSE.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_MULTIVERSE.node));
}
}

2
src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysMultiverseDel.java
View File

@@ -22,7 +22,7 @@ public class CmdMCoreUsysMultiverseDel extends MCommand
this.addRequiredArg("multiverse");
// Requirements
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_MULTIVERSE_DEL.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_MULTIVERSE_DEL.node));
}
// -------------------------------------------- //

2
src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysMultiverseList.java
View File

@@ -26,7 +26,7 @@ public class CmdMCoreUsysMultiverseList extends MCommand
this.addOptionalArg("page", "1");
// Requirements
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_MULTIVERSE_LIST.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_MULTIVERSE_LIST.node));
}
// -------------------------------------------- //

2
src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysMultiverseNew.java
View File

@@ -20,7 +20,7 @@ public class CmdMCoreUsysMultiverseNew extends MCommand
this.addRequiredArg("multiverse");
// Requirements
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_MULTIVERSE_NEW.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_MULTIVERSE_NEW.node));
}
// -------------------------------------------- //

2
src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysMultiverseShow.java
View File

@@ -27,7 +27,7 @@ public class CmdMCoreUsysMultiverseShow extends MCommand
this.addRequiredArg("multiverse");
// Requirements
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_MULTIVERSE_SHOW.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_MULTIVERSE_SHOW.node));
}
// -------------------------------------------- //

2
src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysUniverse.java
View File

@@ -29,7 +29,7 @@ public class CmdMCoreUsysUniverse extends MCommand
this.addAliases("u", "universe");
// Requirements
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_UNIVERSE.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_UNIVERSE.node));
}
}

2
src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysUniverseClear.java
View File

@@ -23,7 +23,7 @@ public class CmdMCoreUsysUniverseClear extends MCommand
this.addRequiredArg("multiverse");
// Requirements
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_UNIVERSE_CLEAR.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_UNIVERSE_CLEAR.node));
}
// -------------------------------------------- //

2
src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysUniverseDel.java
View File

@@ -23,7 +23,7 @@ public class CmdMCoreUsysUniverseDel extends MCommand
this.addRequiredArg("multiverse");
// Requirements
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_MULTIVERSE_DEL.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_MULTIVERSE_DEL.node));
}
// -------------------------------------------- //

2
src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysUniverseNew.java
View File

@@ -22,7 +22,7 @@ public class CmdMCoreUsysUniverseNew extends MCommand
this.addRequiredArg("multiverse");
// Requirements
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_UNIVERSE_NEW.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_UNIVERSE_NEW.node));
}
// -------------------------------------------- //

2
src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysWorld.java
View File

@@ -23,7 +23,7 @@ public class CmdMCoreUsysWorld extends MCommand
this.addRequiredArg("multiverse");
// Requirements
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_WORLD.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.USYS_WORLD.node));
}
// -------------------------------------------- //