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

Rename Perm --> MCorePerm to reduce ammount of class name clashes.

Browse Source
This commit is contained in:
Olof Larsson 2013-05-01 11:28:15 +02:00
parent 738d1f7822
commit 9264911634
19 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/massivecraft/mcore/Perm.java → src/com/massivecraft/mcore/MCorePerm.java
View File

@ -4,7 +4,7 @@ import org.bukkit.permissions.Permissible;
import com.massivecraft.mcore.util.PermUtil; import com.massivecraft.mcore.util.PermUtil;
public enum Perm public enum MCorePerm
{ {
// -------------------------------------------- // // -------------------------------------------- //
// ENUM // ENUM
@ -41,7 +41,7 @@ public enum Perm
// CONSTRUCT // CONSTRUCT
// -------------------------------------------- // // -------------------------------------------- //
Perm(final String permissionNode) MCorePerm(final String permissionNode)
{ {
this.node = "mcore."+permissionNode; this.node = "mcore."+permissionNode;
} }

4
src/com/massivecraft/mcore/cmd/CmdMcore.java
View File

@ -2,7 +2,7 @@ package com.massivecraft.mcore.cmd;
import com.massivecraft.mcore.ConfServer; import com.massivecraft.mcore.ConfServer;
import com.massivecraft.mcore.MCore; import com.massivecraft.mcore.MCore;
import com.massivecraft.mcore.Perm; import com.massivecraft.mcore.MCorePerm;
import com.massivecraft.mcore.cmd.req.ReqHasPerm; import com.massivecraft.mcore.cmd.req.ReqHasPerm;
public class CmdMcore extends MCommand public class CmdMcore extends MCommand
@ -12,7 +12,7 @@ public class CmdMcore extends MCommand
public CmdMcore() public CmdMcore()
{ {
this.addAliases(ConfServer.getCmdAliases(MCORE)); this.addAliases(ConfServer.getCmdAliases(MCORE));
this.addRequirements(ReqHasPerm.get(Perm.CMD_MCORE.node)); this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE.node));
} }
@Override @Override

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

@ -6,7 +6,7 @@ import org.bukkit.command.CommandSender;
import com.massivecraft.mcore.Aspect; import com.massivecraft.mcore.Aspect;
import com.massivecraft.mcore.AspectColl; import com.massivecraft.mcore.AspectColl;
import com.massivecraft.mcore.Perm; import com.massivecraft.mcore.MCorePerm;
public class ARAspect extends ARAbstractSelect<Aspect> public class ARAspect extends ARAbstractSelect<Aspect>
{ {
@ -36,7 +36,7 @@ public class ARAspect extends ARAbstractSelect<Aspect>
@Override @Override
public boolean canList(CommandSender sender) public boolean canList(CommandSender sender)
{ {
return Perm.CMD_USYS_ASPECT_LIST.has(sender, false); return MCorePerm.CMD_USYS_ASPECT_LIST.has(sender, false);
} }
@Override @Override

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

@ -6,7 +6,7 @@ import org.bukkit.command.CommandSender;
import com.massivecraft.mcore.Multiverse; import com.massivecraft.mcore.Multiverse;
import com.massivecraft.mcore.MultiverseColl; import com.massivecraft.mcore.MultiverseColl;
import com.massivecraft.mcore.Perm; import com.massivecraft.mcore.MCorePerm;
public class ARMultiverse extends ARAbstractSelect<Multiverse> public class ARMultiverse extends ARAbstractSelect<Multiverse>
{ {
@ -36,7 +36,7 @@ public class ARMultiverse extends ARAbstractSelect<Multiverse>
@Override @Override
public boolean canList(CommandSender sender) public boolean canList(CommandSender sender)
{ {
return Perm.CMD_USYS_MULTIVERSE_LIST.has(sender, false); return MCorePerm.CMD_USYS_MULTIVERSE_LIST.has(sender, false);
} }
@Override @Override

4
src/com/massivecraft/mcore/usys/cmd/CmdUsys.java
View File

@ -1,7 +1,7 @@
package com.massivecraft.mcore.usys.cmd; package com.massivecraft.mcore.usys.cmd;
import com.massivecraft.mcore.ConfServer; 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.HelpCommand;
import com.massivecraft.mcore.cmd.MCommand; import com.massivecraft.mcore.cmd.MCommand;
import com.massivecraft.mcore.cmd.req.ReqHasPerm; import com.massivecraft.mcore.cmd.req.ReqHasPerm;
@ -26,7 +26,7 @@ public class CmdUsys extends MCommand
this.addSubCommand(this.cmdUsysWorld); this.addSubCommand(this.cmdUsysWorld);
this.addSubCommand(this.cmdUsysAspect); this.addSubCommand(this.cmdUsysAspect);
this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS.node)); this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS.node));
} }
@Override @Override

4
src/com/massivecraft/mcore/usys/cmd/CmdUsysAspect.java
View File

@ -1,6 +1,6 @@
package com.massivecraft.mcore.usys.cmd; 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.HelpCommand;
import com.massivecraft.mcore.cmd.MCommand; import com.massivecraft.mcore.cmd.MCommand;
import com.massivecraft.mcore.cmd.req.ReqHasPerm; import com.massivecraft.mcore.cmd.req.ReqHasPerm;
@ -20,7 +20,7 @@ public class CmdUsysAspect extends MCommand
this.addSubCommand(this.cmdUsysAspectShow); this.addSubCommand(this.cmdUsysAspectShow);
this.addSubCommand(this.cmdUsysAspectUse); this.addSubCommand(this.cmdUsysAspectUse);
this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS_ASPECT.node)); this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_ASPECT.node));
} }
@Override @Override

4
src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectList.java
View File

@ -5,7 +5,7 @@ import java.util.List;
import com.massivecraft.mcore.Aspect; import com.massivecraft.mcore.Aspect;
import com.massivecraft.mcore.AspectColl; 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.MCommand;
import com.massivecraft.mcore.cmd.arg.ARInteger; import com.massivecraft.mcore.cmd.arg.ARInteger;
import com.massivecraft.mcore.cmd.req.ReqHasPerm; import com.massivecraft.mcore.cmd.req.ReqHasPerm;
@ -18,7 +18,7 @@ public class CmdUsysAspectList extends MCommand
this.addAliases("l", "list"); this.addAliases("l", "list");
this.addOptionalArg("page", "1"); 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 @Override

4
src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectShow.java
View File

@ -1,7 +1,7 @@
package com.massivecraft.mcore.usys.cmd; package com.massivecraft.mcore.usys.cmd;
import com.massivecraft.mcore.Aspect; 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.MCommand;
import com.massivecraft.mcore.cmd.arg.ARAspect; import com.massivecraft.mcore.cmd.arg.ARAspect;
import com.massivecraft.mcore.cmd.req.ReqHasPerm; import com.massivecraft.mcore.cmd.req.ReqHasPerm;
@ -14,7 +14,7 @@ public class CmdUsysAspectShow extends MCommand
this.addAliases("s", "show"); this.addAliases("s", "show");
this.addRequiredArg("aspect"); this.addRequiredArg("aspect");
this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS_ASPECT_SHOW.node)); this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_ASPECT_SHOW.node));
} }
@Override @Override

4
src/com/massivecraft/mcore/usys/cmd/CmdUsysAspectUse.java
View File

@ -2,7 +2,7 @@ package com.massivecraft.mcore.usys.cmd;
import com.massivecraft.mcore.Aspect; import com.massivecraft.mcore.Aspect;
import com.massivecraft.mcore.Multiverse; 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.MCommand;
import com.massivecraft.mcore.cmd.arg.ARAspect; import com.massivecraft.mcore.cmd.arg.ARAspect;
import com.massivecraft.mcore.cmd.arg.ARMultiverse; import com.massivecraft.mcore.cmd.arg.ARMultiverse;
@ -16,7 +16,7 @@ public class CmdUsysAspectUse extends MCommand
this.addRequiredArg("aspect"); this.addRequiredArg("aspect");
this.addRequiredArg("multiverse"); this.addRequiredArg("multiverse");
this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS_ASPECT_USE.node)); this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_ASPECT_USE.node));
} }
@Override @Override

4
src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverse.java
View File

@ -1,6 +1,6 @@
package com.massivecraft.mcore.usys.cmd; 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.HelpCommand;
import com.massivecraft.mcore.cmd.MCommand; import com.massivecraft.mcore.cmd.MCommand;
import com.massivecraft.mcore.cmd.req.ReqHasPerm; import com.massivecraft.mcore.cmd.req.ReqHasPerm;
@ -22,7 +22,7 @@ public class CmdUsysMultiverse extends MCommand
this.addSubCommand(this.cmdUsysMultiverseNew); this.addSubCommand(this.cmdUsysMultiverseNew);
this.addSubCommand(this.cmdUsysMultiverseDel); this.addSubCommand(this.cmdUsysMultiverseDel);
this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS_MULTIVERSE.node)); this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_MULTIVERSE.node));
} }
@Override @Override

4
src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseDel.java
View File

@ -2,7 +2,7 @@ package com.massivecraft.mcore.usys.cmd;
import com.massivecraft.mcore.MCore; import com.massivecraft.mcore.MCore;
import com.massivecraft.mcore.Multiverse; 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.MCommand;
import com.massivecraft.mcore.cmd.arg.ARMultiverse; import com.massivecraft.mcore.cmd.arg.ARMultiverse;
import com.massivecraft.mcore.cmd.req.ReqHasPerm; import com.massivecraft.mcore.cmd.req.ReqHasPerm;
@ -14,7 +14,7 @@ public class CmdUsysMultiverseDel extends MCommand
this.addAliases("d", "del"); this.addAliases("d", "del");
this.addRequiredArg("multiverse"); this.addRequiredArg("multiverse");
this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS_MULTIVERSE_DEL.node)); this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_MULTIVERSE_DEL.node));
} }
@Override @Override

4
src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseList.java
View File

@ -5,7 +5,7 @@ import java.util.List;
import com.massivecraft.mcore.Multiverse; import com.massivecraft.mcore.Multiverse;
import com.massivecraft.mcore.MultiverseColl; 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.MCommand;
import com.massivecraft.mcore.cmd.arg.ARInteger; import com.massivecraft.mcore.cmd.arg.ARInteger;
import com.massivecraft.mcore.cmd.req.ReqHasPerm; import com.massivecraft.mcore.cmd.req.ReqHasPerm;
@ -18,7 +18,7 @@ public class CmdUsysMultiverseList extends MCommand
this.addAliases("l", "list"); this.addAliases("l", "list");
this.addOptionalArg("page", "1"); 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 @Override

4
src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseNew.java
View File

@ -1,7 +1,7 @@
package com.massivecraft.mcore.usys.cmd; package com.massivecraft.mcore.usys.cmd;
import com.massivecraft.mcore.MultiverseColl; 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.MCommand;
import com.massivecraft.mcore.cmd.req.ReqHasPerm; import com.massivecraft.mcore.cmd.req.ReqHasPerm;
@ -12,7 +12,7 @@ public class CmdUsysMultiverseNew extends MCommand
this.addAliases("n", "new"); this.addAliases("n", "new");
this.addRequiredArg("multiverse"); this.addRequiredArg("multiverse");
this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS_MULTIVERSE_NEW.node)); this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_MULTIVERSE_NEW.node));
} }
@Override @Override

4
src/com/massivecraft/mcore/usys/cmd/CmdUsysMultiverseShow.java
View File

@ -6,7 +6,7 @@ import java.util.List;
import com.massivecraft.mcore.Aspect; import com.massivecraft.mcore.Aspect;
import com.massivecraft.mcore.MCore; import com.massivecraft.mcore.MCore;
import com.massivecraft.mcore.Multiverse; 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.MCommand;
import com.massivecraft.mcore.cmd.arg.ARMultiverse; import com.massivecraft.mcore.cmd.arg.ARMultiverse;
import com.massivecraft.mcore.cmd.req.ReqHasPerm; import com.massivecraft.mcore.cmd.req.ReqHasPerm;
@ -19,7 +19,7 @@ public class CmdUsysMultiverseShow extends MCommand
this.addAliases("s", "show"); this.addAliases("s", "show");
this.addRequiredArg("multiverse"); this.addRequiredArg("multiverse");
this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS_MULTIVERSE_SHOW.node)); this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_MULTIVERSE_SHOW.node));
} }
@Override @Override

4
src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverse.java
View File

@ -1,6 +1,6 @@
package com.massivecraft.mcore.usys.cmd; 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.HelpCommand;
import com.massivecraft.mcore.cmd.MCommand; import com.massivecraft.mcore.cmd.MCommand;
import com.massivecraft.mcore.cmd.req.ReqHasPerm; import com.massivecraft.mcore.cmd.req.ReqHasPerm;
@ -20,7 +20,7 @@ public class CmdUsysUniverse extends MCommand
this.addSubCommand(this.cmdUsysUniverseDel); this.addSubCommand(this.cmdUsysUniverseDel);
this.addSubCommand(this.cmdUsysUniverseClear); this.addSubCommand(this.cmdUsysUniverseClear);
this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS_UNIVERSE.node)); this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_UNIVERSE.node));
} }
@Override @Override

4
src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseClear.java
View File

@ -2,7 +2,7 @@ package com.massivecraft.mcore.usys.cmd;
import com.massivecraft.mcore.MCore; import com.massivecraft.mcore.MCore;
import com.massivecraft.mcore.Multiverse; 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.MCommand;
import com.massivecraft.mcore.cmd.arg.ARMultiverse; import com.massivecraft.mcore.cmd.arg.ARMultiverse;
import com.massivecraft.mcore.cmd.req.ReqHasPerm; import com.massivecraft.mcore.cmd.req.ReqHasPerm;
@ -15,7 +15,7 @@ public class CmdUsysUniverseClear extends MCommand
this.addRequiredArg("universe"); this.addRequiredArg("universe");
this.addRequiredArg("multiverse"); this.addRequiredArg("multiverse");
this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS_UNIVERSE_CLEAR.node)); this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_UNIVERSE_CLEAR.node));
} }
@Override @Override

4
src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseDel.java
View File

@ -2,7 +2,7 @@ package com.massivecraft.mcore.usys.cmd;
import com.massivecraft.mcore.MCore; import com.massivecraft.mcore.MCore;
import com.massivecraft.mcore.Multiverse; 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.MCommand;
import com.massivecraft.mcore.cmd.arg.ARMultiverse; import com.massivecraft.mcore.cmd.arg.ARMultiverse;
import com.massivecraft.mcore.cmd.req.ReqHasPerm; import com.massivecraft.mcore.cmd.req.ReqHasPerm;
@ -15,7 +15,7 @@ public class CmdUsysUniverseDel extends MCommand
this.addRequiredArg("universe"); this.addRequiredArg("universe");
this.addRequiredArg("multiverse"); this.addRequiredArg("multiverse");
this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS_MULTIVERSE_DEL.node)); this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_MULTIVERSE_DEL.node));
} }
@Override @Override

4
src/com/massivecraft/mcore/usys/cmd/CmdUsysUniverseNew.java
View File

@ -1,7 +1,7 @@
package com.massivecraft.mcore.usys.cmd; package com.massivecraft.mcore.usys.cmd;
import com.massivecraft.mcore.Multiverse; 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.MCommand;
import com.massivecraft.mcore.cmd.arg.ARMultiverse; import com.massivecraft.mcore.cmd.arg.ARMultiverse;
import com.massivecraft.mcore.cmd.req.ReqHasPerm; import com.massivecraft.mcore.cmd.req.ReqHasPerm;
@ -14,7 +14,7 @@ public class CmdUsysUniverseNew extends MCommand
this.addRequiredArg("universe"); this.addRequiredArg("universe");
this.addRequiredArg("multiverse"); this.addRequiredArg("multiverse");
this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS_UNIVERSE_NEW.node)); this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_UNIVERSE_NEW.node));
} }
@Override @Override

4
src/com/massivecraft/mcore/usys/cmd/CmdUsysWorld.java
View File

@ -1,7 +1,7 @@
package com.massivecraft.mcore.usys.cmd; package com.massivecraft.mcore.usys.cmd;
import com.massivecraft.mcore.Multiverse; 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.MCommand;
import com.massivecraft.mcore.cmd.arg.ARMultiverse; import com.massivecraft.mcore.cmd.arg.ARMultiverse;
import com.massivecraft.mcore.cmd.req.ReqHasPerm; import com.massivecraft.mcore.cmd.req.ReqHasPerm;
@ -15,7 +15,7 @@ public class CmdUsysWorld extends MCommand
this.addRequiredArg("universe"); this.addRequiredArg("universe");
this.addRequiredArg("multiverse"); this.addRequiredArg("multiverse");
this.addRequirements(ReqHasPerm.get(Perm.CMD_USYS_WORLD.node)); this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_WORLD.node));
} }
@Override @Override