diff --git a/src/com/massivecraft/mcore/Perm.java b/src/com/massivecraft/mcore/MCorePerm.java similarity index 93% rename from src/com/massivecraft/mcore/Perm.java rename to src/com/massivecraft/mcore/MCorePerm.java index 1b4c6046..b95f844f 100644 --- a/src/com/massivecraft/mcore/Perm.java +++ b/src/com/massivecraft/mcore/MCorePerm.java @@ -4,7 +4,7 @@ import org.bukkit.permissions.Permissible; import com.massivecraft.mcore.util.PermUtil; -public enum Perm +public enum MCorePerm { // -------------------------------------------- // // ENUM @@ -41,7 +41,7 @@ public enum Perm // CONSTRUCT // -------------------------------------------- // - Perm(final String permissionNode) + MCorePerm(final String permissionNode) { this.node = "mcore."+permissionNode; } diff --git a/src/com/massivecraft/mcore/cmd/CmdMcore.java b/src/com/massivecraft/mcore/cmd/CmdMcore.java index 047e1147..9ca1129a 100644 --- a/src/com/massivecraft/mcore/cmd/CmdMcore.java +++ b/src/com/massivecraft/mcore/cmd/CmdMcore.java @@ -2,7 +2,7 @@ package com.massivecraft.mcore.cmd; import com.massivecraft.mcore.ConfServer; import com.massivecraft.mcore.MCore; -import com.massivecraft.mcore.Perm; +import com.massivecraft.mcore.MCorePerm; import com.massivecraft.mcore.cmd.req.ReqHasPerm; public class CmdMcore extends MCommand @@ -12,7 +12,7 @@ public class CmdMcore extends MCommand public CmdMcore() { this.addAliases(ConfServer.getCmdAliases(MCORE)); - this.addRequirements(ReqHasPerm.get(Perm.CMD_MCORE.node)); + this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE.node)); } @Override diff --git a/src/com/massivecraft/mcore/cmd/arg/ARAspect.java b/src/com/massivecraft/mcore/cmd/arg/ARAspect.java index c71ba35f..eebf1584 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARAspect.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARAspect.java @@ -6,7 +6,7 @@ import org.bukkit.command.CommandSender; import com.massivecraft.mcore.Aspect; import com.massivecraft.mcore.AspectColl; -import com.massivecraft.mcore.Perm; +import com.massivecraft.mcore.MCorePerm; public class ARAspect extends ARAbstractSelect { @@ -36,7 +36,7 @@ public class ARAspect extends ARAbstractSelect @Override public boolean canList(CommandSender sender) { - return Perm.CMD_USYS_ASPECT_LIST.has(sender, false); + return MCorePerm.CMD_USYS_ASPECT_LIST.has(sender, false); } @Override diff --git a/src/com/massivecraft/mcore/cmd/arg/ARMultiverse.java b/src/com/massivecraft/mcore/cmd/arg/ARMultiverse.java index e7306fa2..9c46b7b0 100644 --- a/src/com/massivecraft/mcore/cmd/arg/ARMultiverse.java +++ b/src/com/massivecraft/mcore/cmd/arg/ARMultiverse.java @@ -6,7 +6,7 @@ import org.bukkit.command.CommandSender; import com.massivecraft.mcore.Multiverse; import com.massivecraft.mcore.MultiverseColl; -import com.massivecraft.mcore.Perm; +import com.massivecraft.mcore.MCorePerm; public class ARMultiverse extends ARAbstractSelect { @@ -36,7 +36,7 @@ public class ARMultiverse extends ARAbstractSelect @Override public boolean canList(CommandSender sender) { - return Perm.CMD_USYS_MULTIVERSE_LIST.has(sender, false); + return MCorePerm.CMD_USYS_MULTIVERSE_LIST.has(sender, false); } @Override diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsys.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsys.java index 7e4aefdc..91635ca2 100644 --- a/src/com/massivecraft/mcore/usys/cmd/CmdUsys.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsys.java @@ -1,7 +1,7 @@ package com.massivecraft.mcore.usys.cmd; import com.massivecraft.mcore.ConfServer; -import com.massivecraft.mcore.Perm; +import com.massivecraft.mcore.MCorePerm; import com.massivecraft.mcore.cmd.HelpCommand; import com.massivecraft.mcore.cmd.MCommand; import com.massivecraft.mcore.cmd.req.ReqHasPerm; @@ -26,7 +26,7 @@ public class CmdUsys extends MCommand this.addSubCommand(this.cmdUsysWorld); this.addSubCommand(this.cmdUsysAspect); - this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS.node)); + this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS.node)); } @Override diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspect.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspect.java index 4511b1c9..790f134f 100644 --- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspect.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspect.java @@ -1,6 +1,6 @@ package com.massivecraft.mcore.usys.cmd; -import com.massivecraft.mcore.Perm; +import com.massivecraft.mcore.MCorePerm; import com.massivecraft.mcore.cmd.HelpCommand; import com.massivecraft.mcore.cmd.MCommand; import com.massivecraft.mcore.cmd.req.ReqHasPerm; @@ -20,7 +20,7 @@ public class CmdUsysAspect extends MCommand this.addSubCommand(this.cmdUsysAspectShow); this.addSubCommand(this.cmdUsysAspectUse); - this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS_ASPECT.node)); + this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_ASPECT.node)); } @Override diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectList.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectList.java index 78216453..9852aa7e 100644 --- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectList.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectList.java @@ -5,7 +5,7 @@ import java.util.List; import com.massivecraft.mcore.Aspect; import com.massivecraft.mcore.AspectColl; -import com.massivecraft.mcore.Perm; +import com.massivecraft.mcore.MCorePerm; import com.massivecraft.mcore.cmd.MCommand; import com.massivecraft.mcore.cmd.arg.ARInteger; import com.massivecraft.mcore.cmd.req.ReqHasPerm; @@ -18,7 +18,7 @@ public class CmdUsysAspectList extends MCommand this.addAliases("l", "list"); this.addOptionalArg("page", "1"); - this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS_ASPECT_LIST.node)); + this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_ASPECT_LIST.node)); } @Override diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectShow.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectShow.java index 8a440a7d..e67c1691 100644 --- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectShow.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectShow.java @@ -1,7 +1,7 @@ package com.massivecraft.mcore.usys.cmd; import com.massivecraft.mcore.Aspect; -import com.massivecraft.mcore.Perm; +import com.massivecraft.mcore.MCorePerm; import com.massivecraft.mcore.cmd.MCommand; import com.massivecraft.mcore.cmd.arg.ARAspect; import com.massivecraft.mcore.cmd.req.ReqHasPerm; @@ -14,7 +14,7 @@ public class CmdUsysAspectShow extends MCommand this.addAliases("s", "show"); this.addRequiredArg("aspect"); - this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS_ASPECT_SHOW.node)); + this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_ASPECT_SHOW.node)); } @Override diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectUse.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectUse.java index a8c782e6..b8de3276 100644 --- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectUse.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectUse.java @@ -2,7 +2,7 @@ package com.massivecraft.mcore.usys.cmd; import com.massivecraft.mcore.Aspect; import com.massivecraft.mcore.Multiverse; -import com.massivecraft.mcore.Perm; +import com.massivecraft.mcore.MCorePerm; import com.massivecraft.mcore.cmd.MCommand; import com.massivecraft.mcore.cmd.arg.ARAspect; import com.massivecraft.mcore.cmd.arg.ARMultiverse; @@ -16,7 +16,7 @@ public class CmdUsysAspectUse extends MCommand this.addRequiredArg("aspect"); this.addRequiredArg("multiverse"); - this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS_ASPECT_USE.node)); + this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_ASPECT_USE.node)); } @Override diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverse.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverse.java index 96b66607..c38a8f0d 100644 --- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverse.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverse.java @@ -1,6 +1,6 @@ package com.massivecraft.mcore.usys.cmd; -import com.massivecraft.mcore.Perm; +import com.massivecraft.mcore.MCorePerm; import com.massivecraft.mcore.cmd.HelpCommand; import com.massivecraft.mcore.cmd.MCommand; import com.massivecraft.mcore.cmd.req.ReqHasPerm; @@ -22,7 +22,7 @@ public class CmdUsysMultiverse extends MCommand this.addSubCommand(this.cmdUsysMultiverseNew); this.addSubCommand(this.cmdUsysMultiverseDel); - this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS_MULTIVERSE.node)); + this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_MULTIVERSE.node)); } @Override diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseDel.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseDel.java index 60e80e80..0058bec8 100644 --- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseDel.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseDel.java @@ -2,7 +2,7 @@ package com.massivecraft.mcore.usys.cmd; import com.massivecraft.mcore.MCore; import com.massivecraft.mcore.Multiverse; -import com.massivecraft.mcore.Perm; +import com.massivecraft.mcore.MCorePerm; import com.massivecraft.mcore.cmd.MCommand; import com.massivecraft.mcore.cmd.arg.ARMultiverse; import com.massivecraft.mcore.cmd.req.ReqHasPerm; @@ -14,7 +14,7 @@ public class CmdUsysMultiverseDel extends MCommand this.addAliases("d", "del"); this.addRequiredArg("multiverse"); - this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS_MULTIVERSE_DEL.node)); + this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_MULTIVERSE_DEL.node)); } @Override diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseList.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseList.java index 1927048d..8cf04dde 100644 --- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseList.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseList.java @@ -5,7 +5,7 @@ import java.util.List; import com.massivecraft.mcore.Multiverse; import com.massivecraft.mcore.MultiverseColl; -import com.massivecraft.mcore.Perm; +import com.massivecraft.mcore.MCorePerm; import com.massivecraft.mcore.cmd.MCommand; import com.massivecraft.mcore.cmd.arg.ARInteger; import com.massivecraft.mcore.cmd.req.ReqHasPerm; @@ -18,7 +18,7 @@ public class CmdUsysMultiverseList extends MCommand this.addAliases("l", "list"); this.addOptionalArg("page", "1"); - this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS_MULTIVERSE_LIST.node)); + this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_MULTIVERSE_LIST.node)); } @Override diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseNew.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseNew.java index 358f35fb..17950b15 100644 --- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseNew.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseNew.java @@ -1,7 +1,7 @@ package com.massivecraft.mcore.usys.cmd; import com.massivecraft.mcore.MultiverseColl; -import com.massivecraft.mcore.Perm; +import com.massivecraft.mcore.MCorePerm; import com.massivecraft.mcore.cmd.MCommand; import com.massivecraft.mcore.cmd.req.ReqHasPerm; @@ -12,7 +12,7 @@ public class CmdUsysMultiverseNew extends MCommand this.addAliases("n", "new"); this.addRequiredArg("multiverse"); - this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS_MULTIVERSE_NEW.node)); + this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_MULTIVERSE_NEW.node)); } @Override diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseShow.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseShow.java index 5fecf5ac..8f3dc333 100644 --- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseShow.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseShow.java @@ -6,7 +6,7 @@ import java.util.List; import com.massivecraft.mcore.Aspect; import com.massivecraft.mcore.MCore; import com.massivecraft.mcore.Multiverse; -import com.massivecraft.mcore.Perm; +import com.massivecraft.mcore.MCorePerm; import com.massivecraft.mcore.cmd.MCommand; import com.massivecraft.mcore.cmd.arg.ARMultiverse; import com.massivecraft.mcore.cmd.req.ReqHasPerm; @@ -19,7 +19,7 @@ public class CmdUsysMultiverseShow extends MCommand this.addAliases("s", "show"); this.addRequiredArg("multiverse"); - this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS_MULTIVERSE_SHOW.node)); + this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_MULTIVERSE_SHOW.node)); } @Override diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverse.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverse.java index 5fbdbf62..88806e0b 100644 --- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverse.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverse.java @@ -1,6 +1,6 @@ package com.massivecraft.mcore.usys.cmd; -import com.massivecraft.mcore.Perm; +import com.massivecraft.mcore.MCorePerm; import com.massivecraft.mcore.cmd.HelpCommand; import com.massivecraft.mcore.cmd.MCommand; import com.massivecraft.mcore.cmd.req.ReqHasPerm; @@ -20,7 +20,7 @@ public class CmdUsysUniverse extends MCommand this.addSubCommand(this.cmdUsysUniverseDel); this.addSubCommand(this.cmdUsysUniverseClear); - this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS_UNIVERSE.node)); + this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_UNIVERSE.node)); } @Override diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseClear.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseClear.java index e29e5dbe..18278776 100644 --- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseClear.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseClear.java @@ -2,7 +2,7 @@ package com.massivecraft.mcore.usys.cmd; import com.massivecraft.mcore.MCore; import com.massivecraft.mcore.Multiverse; -import com.massivecraft.mcore.Perm; +import com.massivecraft.mcore.MCorePerm; import com.massivecraft.mcore.cmd.MCommand; import com.massivecraft.mcore.cmd.arg.ARMultiverse; import com.massivecraft.mcore.cmd.req.ReqHasPerm; @@ -15,7 +15,7 @@ public class CmdUsysUniverseClear extends MCommand this.addRequiredArg("universe"); this.addRequiredArg("multiverse"); - this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS_UNIVERSE_CLEAR.node)); + this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_UNIVERSE_CLEAR.node)); } @Override diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseDel.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseDel.java index e06e3e5d..e3f6d94e 100644 --- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseDel.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseDel.java @@ -2,7 +2,7 @@ package com.massivecraft.mcore.usys.cmd; import com.massivecraft.mcore.MCore; import com.massivecraft.mcore.Multiverse; -import com.massivecraft.mcore.Perm; +import com.massivecraft.mcore.MCorePerm; import com.massivecraft.mcore.cmd.MCommand; import com.massivecraft.mcore.cmd.arg.ARMultiverse; import com.massivecraft.mcore.cmd.req.ReqHasPerm; @@ -15,7 +15,7 @@ public class CmdUsysUniverseDel extends MCommand this.addRequiredArg("universe"); this.addRequiredArg("multiverse"); - this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS_MULTIVERSE_DEL.node)); + this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_MULTIVERSE_DEL.node)); } @Override diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseNew.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseNew.java index 35867a2a..f1c2ed47 100644 --- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseNew.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseNew.java @@ -1,7 +1,7 @@ package com.massivecraft.mcore.usys.cmd; import com.massivecraft.mcore.Multiverse; -import com.massivecraft.mcore.Perm; +import com.massivecraft.mcore.MCorePerm; import com.massivecraft.mcore.cmd.MCommand; import com.massivecraft.mcore.cmd.arg.ARMultiverse; import com.massivecraft.mcore.cmd.req.ReqHasPerm; @@ -14,7 +14,7 @@ public class CmdUsysUniverseNew extends MCommand this.addRequiredArg("universe"); this.addRequiredArg("multiverse"); - this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS_UNIVERSE_NEW.node)); + this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_UNIVERSE_NEW.node)); } @Override diff --git a/src/com/massivecraft/mcore/usys/cmd/CmdUsysWorld.java b/src/com/massivecraft/mcore/usys/cmd/CmdUsysWorld.java index 3bc92aa2..c4ce61f5 100644 --- a/src/com/massivecraft/mcore/usys/cmd/CmdUsysWorld.java +++ b/src/com/massivecraft/mcore/usys/cmd/CmdUsysWorld.java @@ -1,7 +1,7 @@ package com.massivecraft.mcore.usys.cmd; import com.massivecraft.mcore.Multiverse; -import com.massivecraft.mcore.Perm; +import com.massivecraft.mcore.MCorePerm; import com.massivecraft.mcore.cmd.MCommand; import com.massivecraft.mcore.cmd.arg.ARMultiverse; import com.massivecraft.mcore.cmd.req.ReqHasPerm; @@ -15,7 +15,7 @@ public class CmdUsysWorld extends MCommand this.addRequiredArg("universe"); this.addRequiredArg("multiverse"); - this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS_WORLD.node)); + this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_WORLD.node)); } @Override