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

Reorganizing MCore internal commands and permissions.

Browse Source
This commit is contained in:
Olof Larsson
2013-05-01 12:29:51 +02:00
parent a3d99f627f
commit b64e8a8b77
28 changed files with 367 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/massivecraft/mcore/ConfServer.java
View File

@@ -1,13 +1,11 @@
package com.massivecraft.mcore;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import com.massivecraft.mcore.mcorecmd.CmdMcore;
import com.massivecraft.mcore.mcorecmd.CmdUsys;
import com.massivecraft.mcore.util.MUtil;
public class ConfServer extends SimpleConfig
{
// -------------------------------------------- //
@@ -22,23 +20,10 @@ public class ConfServer extends SimpleConfig
// FIELDS
// -------------------------------------------- //
public static String serverid = UUID.randomUUID().toString();
public static String dburi = "gson://./mstore";
public static String serverid = UUID.randomUUID().toString();
public static Map<String, List<String>> cmdaliases = MUtil.map(
CmdUsys.USYS, MUtil.list(CmdUsys.USYS),
CmdMcore.MCORE, MUtil.list(CmdMcore.MCORE)
);
public static List<String> getCmdAliases(String name)
{
List<String> ret = cmdaliases.get(name);
if (ret == null)
{
ret = MUtil.list(name);
cmdaliases.put(name, ret);
i.save();
}
return ret;
}
public static List<String> aliasesOuterMCore = MUtil.list("mcore");
public static List<String> aliasesOuterMCoreUsys = MUtil.list("usys");
}

24
src/com/massivecraft/mcore/MCore.java
View File

@@ -19,8 +19,8 @@ import com.massivecraft.mcore.adapter.PlayerInventoryAdapter;
import com.massivecraft.mcore.adapter.UUIDAdapter;
import com.massivecraft.mcore.integration.protocollib.ProtocolLibFeatures;
import com.massivecraft.mcore.integration.vault.VaultFeatures;
import com.massivecraft.mcore.mcorecmd.CmdMcore;
import com.massivecraft.mcore.mcorecmd.CmdUsys;
import com.massivecraft.mcore.mcorecmd.CmdMCore;
import com.massivecraft.mcore.mcorecmd.CmdMCoreUsys;
import com.massivecraft.mcore.mixin.ScheduledTeleportEngine;
import com.massivecraft.mcore.mixin.SenderIdMixinDefault;
import com.massivecraft.mcore.mixin.TeleportMixinCauseEngine;
@@ -83,16 +83,20 @@ public class MCore extends MPlugin
// FIELDS
// -------------------------------------------- //
// Commands
public CmdUsys cmdUsys;
public CmdMcore cmdMcore;
// Aspects
private Aspect moneyAspect;
public Aspect getMoneyAspect() { return this.moneyAspect; }
public Multiverse getMoneyMultiverse() { return this.getMoneyAspect().getMultiverse(); }
// Commands
private CmdMCore outerCmdMCore;
public CmdMCore getOuterCmdMCore() { return this.outerCmdMCore; }
private CmdMCoreUsys outerCmdMCoreUsys;
public CmdMCoreUsys getOuterCmdMCoreUsys() { return this.outerCmdMCoreUsys; }
// Runnables
// TODO: Make this one a singleton
private Runnable collTickTask = new Runnable()
{
public void run()
@@ -152,11 +156,11 @@ public class MCore extends MPlugin
);
// Register commands
this.cmdUsys = new CmdUsys();
this.cmdUsys.register(this, true);
this.outerCmdMCore = new CmdMCore(ConfServer.aliasesOuterMCore);
this.outerCmdMCore.register(this);
this.cmdMcore = new CmdMcore();
this.cmdMcore.register(this, true);
this.outerCmdMCoreUsys = new CmdMCoreUsys(ConfServer.aliasesOuterMCoreUsys);
this.outerCmdMCoreUsys.register(this);
// Integration
this.integrate(

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

@@ -10,22 +10,25 @@ public enum MCorePerm
// ENUM
// -------------------------------------------- //
CMD_USYS("cmd.usys"),
CMD_USYS_MULTIVERSE("cmd.usys.multiverse"),
CMD_USYS_MULTIVERSE_LIST("cmd.usys.multiverse.list"),
CMD_USYS_MULTIVERSE_SHOW("cmd.usys.multiverse.show"),
CMD_USYS_MULTIVERSE_NEW("cmd.usys.multiverse.new"),
CMD_USYS_MULTIVERSE_DEL("cmd.usys.multiverse.del"),
CMD_USYS_UNIVERSE("cmd.usys.universe"),
CMD_USYS_UNIVERSE_NEW("cmd.usys.universe.new"),
CMD_USYS_UNIVERSE_DEL("cmd.usys.universe.del"),
CMD_USYS_UNIVERSE_CLEAR("cmd.usys.universe.clear"),
CMD_USYS_WORLD("cmd.usys.world"),
CMD_USYS_ASPECT("cmd.usys.aspect"),
CMD_USYS_ASPECT_LIST("cmd.usys.aspect.list"),
CMD_USYS_ASPECT_SHOW("cmd.usys.aspect.show"),
CMD_USYS_ASPECT_USE("cmd.usys.aspect.use"),
CMD_MCORE("cmd.mcore"),
CMD_MCORE_ID("cmd.mcore.id"),
CMD_MCORE_VERSION("cmd.mcore.version"),
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"),
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_USYS_ASPECT_LIST.has(sender, false);
return MCorePerm.CMD_MCORE_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_USYS_MULTIVERSE_LIST.has(sender, false);
return MCorePerm.CMD_MCORE_USYS_MULTIVERSE_LIST.has(sender, false);
}
@Override

22
src/com/massivecraft/mcore/mcorecmd/CmdMCoreId.java Normal file
View File

@@ -0,0 +1,22 @@
package com.massivecraft.mcore.mcorecmd;
import java.util.List;
import com.massivecraft.mcore.ConfServer;
import com.massivecraft.mcore.MCorePerm;
import com.massivecraft.mcore.cmd.req.ReqHasPerm;
public class CmdMCoreId extends MCoreCommand
{
public CmdMCoreId(List<String> aliases)
{
super(aliases);
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_ID.node));
}
@Override
public void perform()
{
this.msg("<i>The id of this server is \"<h>%s<i>\".", ConfServer.serverid);
}
}

35
src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsys.java Normal file
View File

@@ -0,0 +1,35 @@
package com.massivecraft.mcore.mcorecmd;
import java.util.List;
import com.massivecraft.mcore.MCorePerm;
import com.massivecraft.mcore.cmd.HelpCommand;
import com.massivecraft.mcore.cmd.req.ReqHasPerm;
import com.massivecraft.mcore.util.MUtil;
public class CmdMCoreUsys extends MCoreCommand
{
public CmdMCoreUsysMultiverse cmdUsysMultiverse = new CmdMCoreUsysMultiverse(MUtil.list("m", "multiverse"));
public CmdMCoreUsysUniverse cmdUsysUniverse = new CmdMCoreUsysUniverse(MUtil.list("u", "universe"));
public CmdMCoreUsysWorld cmdUsysWorld = new CmdMCoreUsysWorld(MUtil.list("w", "world"));
public CmdMCoreUsysAspect cmdUsysAspect = new CmdMCoreUsysAspect(MUtil.list("a", "aspect"));
public CmdMCoreUsys(List<String> aliases)
{
super(aliases);
this.addSubCommand(this.cmdUsysMultiverse);
this.addSubCommand(this.cmdUsysUniverse);
this.addSubCommand(this.cmdUsysWorld);
this.addSubCommand(this.cmdUsysAspect);
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS.node));
}
@Override
public void perform()
{
this.getCommandChain().add(this);
HelpCommand.getInstance().execute(this.sender, this.args, this.commandChain);
}
}

33
src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysAspect.java Normal file
View File

@@ -0,0 +1,33 @@
package com.massivecraft.mcore.mcorecmd;
import java.util.List;
import com.massivecraft.mcore.MCorePerm;
import com.massivecraft.mcore.cmd.HelpCommand;
import com.massivecraft.mcore.cmd.req.ReqHasPerm;
import com.massivecraft.mcore.util.MUtil;
public class CmdMCoreUsysAspect extends MCoreCommand
{
public CmdMCoreUsysAspectList cmdUsysAspectList = new CmdMCoreUsysAspectList(MUtil.list("l", "list"));
public CmdMCoreUsysAspectShow cmdUsysAspectShow = new CmdMCoreUsysAspectShow(MUtil.list("s", "show"));
public CmdMCoreUsysAspectUse cmdUsysAspectUse = new CmdMCoreUsysAspectUse(MUtil.list("u", "use"));
public CmdMCoreUsysAspect(List<String> aliases)
{
super(aliases);
this.addSubCommand(this.cmdUsysAspectList);
this.addSubCommand(this.cmdUsysAspectShow);
this.addSubCommand(this.cmdUsysAspectUse);
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_ASPECT.node));
}
@Override
public void perform()
{
this.getCommandChain().add(this);
HelpCommand.getInstance().execute(this.sender, this.args, this.commandChain);
}
}

9
src/com/massivecraft/mcore/mcorecmd/CmdUsysAspectList.java → src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysAspectList.java
View File

@@ -6,19 +6,18 @@ import java.util.List;
import com.massivecraft.mcore.Aspect;
import com.massivecraft.mcore.AspectColl;
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;
import com.massivecraft.mcore.util.Txt;
public class CmdUsysAspectList extends MCommand
public class CmdMCoreUsysAspectList extends MCoreCommand
{
public CmdUsysAspectList()
public CmdMCoreUsysAspectList(List<String> aliases)
{
this.addAliases("l", "list");
super(aliases);
this.addOptionalArg("page", "1");
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_ASPECT_LIST.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_ASPECT_LIST.node));
}
@Override

11
src/com/massivecraft/mcore/mcorecmd/CmdUsysAspectShow.java → src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysAspectShow.java
View File

@@ -1,20 +1,21 @@
package com.massivecraft.mcore.mcorecmd;
import java.util.List;
import com.massivecraft.mcore.Aspect;
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;
import com.massivecraft.mcore.util.Txt;
public class CmdUsysAspectShow extends MCommand
public class CmdMCoreUsysAspectShow extends MCoreCommand
{
public CmdUsysAspectShow()
public CmdMCoreUsysAspectShow(List<String> aliases)
{
this.addAliases("s", "show");
super(aliases);
this.addRequiredArg("aspect");
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_ASPECT_SHOW.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_ASPECT_SHOW.node));
}
@Override

11
src/com/massivecraft/mcore/mcorecmd/CmdUsysAspectUse.java → src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysAspectUse.java
View File

@@ -1,22 +1,23 @@
package com.massivecraft.mcore.mcorecmd;
import java.util.List;
import com.massivecraft.mcore.Aspect;
import com.massivecraft.mcore.Multiverse;
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;
import com.massivecraft.mcore.cmd.req.ReqHasPerm;
public class CmdUsysAspectUse extends MCommand
public class CmdMCoreUsysAspectUse extends MCoreCommand
{
public CmdUsysAspectUse()
public CmdMCoreUsysAspectUse(List<String> aliases)
{
this.addAliases("u", "use");
super(aliases);
this.addRequiredArg("aspect");
this.addRequiredArg("multiverse");
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_ASPECT_USE.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_ASPECT_USE.node));
}
@Override

35
src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysMultiverse.java Normal file
View File

@@ -0,0 +1,35 @@
package com.massivecraft.mcore.mcorecmd;
import java.util.List;
import com.massivecraft.mcore.MCorePerm;
import com.massivecraft.mcore.cmd.HelpCommand;
import com.massivecraft.mcore.cmd.req.ReqHasPerm;
import com.massivecraft.mcore.util.MUtil;
public class CmdMCoreUsysMultiverse extends MCoreCommand
{
public CmdMCoreUsysMultiverseList cmdUsysMultiverseList = new CmdMCoreUsysMultiverseList(MUtil.list("l", "list"));
public CmdMCoreUsysMultiverseShow cmdUsysMultiverseShow = new CmdMCoreUsysMultiverseShow(MUtil.list("s", "show"));
public CmdMCoreUsysMultiverseNew cmdUsysMultiverseNew = new CmdMCoreUsysMultiverseNew(MUtil.list("n", "new"));
public CmdMCoreUsysMultiverseDel cmdUsysMultiverseDel = new CmdMCoreUsysMultiverseDel(MUtil.list("d", "del"));
public CmdMCoreUsysMultiverse(List<String> aliases)
{
super(aliases);
this.addSubCommand(this.cmdUsysMultiverseList);
this.addSubCommand(this.cmdUsysMultiverseShow);
this.addSubCommand(this.cmdUsysMultiverseNew);
this.addSubCommand(this.cmdUsysMultiverseDel);
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_MULTIVERSE.node));
}
@Override
public void perform()
{
this.getCommandChain().add(this);
HelpCommand.getInstance().execute(this.sender, this.args, this.commandChain);
}
}

11
src/com/massivecraft/mcore/mcorecmd/CmdUsysMultiverseDel.java → src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysMultiverseDel.java
View File

@@ -1,20 +1,21 @@
package com.massivecraft.mcore.mcorecmd;
import java.util.List;
import com.massivecraft.mcore.MCore;
import com.massivecraft.mcore.Multiverse;
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;
public class CmdUsysMultiverseDel extends MCommand
public class CmdMCoreUsysMultiverseDel extends MCoreCommand
{
public CmdUsysMultiverseDel()
public CmdMCoreUsysMultiverseDel(List<String> aliases)
{
this.addAliases("d", "del");
super(aliases);
this.addRequiredArg("multiverse");
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_MULTIVERSE_DEL.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_MULTIVERSE_DEL.node));
}
@Override

9
src/com/massivecraft/mcore/mcorecmd/CmdUsysMultiverseList.java → src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysMultiverseList.java
View File

@@ -6,19 +6,18 @@ import java.util.List;
import com.massivecraft.mcore.Multiverse;
import com.massivecraft.mcore.MultiverseColl;
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;
import com.massivecraft.mcore.util.Txt;
public class CmdUsysMultiverseList extends MCommand
public class CmdMCoreUsysMultiverseList extends MCoreCommand
{
public CmdUsysMultiverseList()
public CmdMCoreUsysMultiverseList(List<String> aliases)
{
this.addAliases("l", "list");
super(aliases);
this.addOptionalArg("page", "1");
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_MULTIVERSE_LIST.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_MULTIVERSE_LIST.node));
}
@Override

11
src/com/massivecraft/mcore/mcorecmd/CmdUsysMultiverseNew.java → src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysMultiverseNew.java
View File

@@ -1,18 +1,19 @@
package com.massivecraft.mcore.mcorecmd;
import java.util.List;
import com.massivecraft.mcore.MultiverseColl;
import com.massivecraft.mcore.MCorePerm;
import com.massivecraft.mcore.cmd.MCommand;
import com.massivecraft.mcore.cmd.req.ReqHasPerm;
public class CmdUsysMultiverseNew extends MCommand
public class CmdMCoreUsysMultiverseNew extends MCoreCommand
{
public CmdUsysMultiverseNew()
public CmdMCoreUsysMultiverseNew(List<String> aliases)
{
this.addAliases("n", "new");
super(aliases);
this.addRequiredArg("multiverse");
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_MULTIVERSE_NEW.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_MULTIVERSE_NEW.node));
}
@Override

9
src/com/massivecraft/mcore/mcorecmd/CmdUsysMultiverseShow.java → src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysMultiverseShow.java
View File

@@ -7,19 +7,18 @@ import com.massivecraft.mcore.Aspect;
import com.massivecraft.mcore.MCore;
import com.massivecraft.mcore.Multiverse;
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;
import com.massivecraft.mcore.util.Txt;
public class CmdUsysMultiverseShow extends MCommand
public class CmdMCoreUsysMultiverseShow extends MCoreCommand
{
public CmdUsysMultiverseShow()
public CmdMCoreUsysMultiverseShow(List<String> aliases)
{
this.addAliases("s", "show");
super(aliases);
this.addRequiredArg("multiverse");
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_MULTIVERSE_SHOW.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_MULTIVERSE_SHOW.node));
}
@Override

33
src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysUniverse.java Normal file
View File

@@ -0,0 +1,33 @@
package com.massivecraft.mcore.mcorecmd;
import java.util.List;
import com.massivecraft.mcore.MCorePerm;
import com.massivecraft.mcore.cmd.HelpCommand;
import com.massivecraft.mcore.cmd.req.ReqHasPerm;
import com.massivecraft.mcore.util.MUtil;
public class CmdMCoreUsysUniverse extends MCoreCommand
{
public CmdMCoreUsysUniverseNew cmdUsysUniverseNew = new CmdMCoreUsysUniverseNew(MUtil.list("n", "new"));
public CmdMCoreUsysUniverseDel cmdUsysUniverseDel = new CmdMCoreUsysUniverseDel(MUtil.list("d", "del"));
public CmdMCoreUsysUniverseClear cmdUsysUniverseClear = new CmdMCoreUsysUniverseClear(MUtil.list("c", "clear"));
public CmdMCoreUsysUniverse(List<String> aliases)
{
super(aliases);
this.addSubCommand(this.cmdUsysUniverseNew);
this.addSubCommand(this.cmdUsysUniverseDel);
this.addSubCommand(this.cmdUsysUniverseClear);
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_UNIVERSE.node));
}
@Override
public void perform()
{
this.getCommandChain().add(this);
HelpCommand.getInstance().execute(this.sender, this.args, this.commandChain);
}
}

11
src/com/massivecraft/mcore/mcorecmd/CmdUsysUniverseClear.java → src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysUniverseClear.java
View File

@@ -1,21 +1,22 @@
package com.massivecraft.mcore.mcorecmd;
import java.util.List;
import com.massivecraft.mcore.MCore;
import com.massivecraft.mcore.Multiverse;
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;
public class CmdUsysUniverseClear extends MCommand
public class CmdMCoreUsysUniverseClear extends MCoreCommand
{
public CmdUsysUniverseClear()
public CmdMCoreUsysUniverseClear(List<String> aliases)
{
this.addAliases("c", "clear");
super(aliases);
this.addRequiredArg("universe");
this.addRequiredArg("multiverse");
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_UNIVERSE_CLEAR.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_UNIVERSE_CLEAR.node));
}
@Override

11
src/com/massivecraft/mcore/mcorecmd/CmdUsysUniverseDel.java → src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysUniverseDel.java
View File

@@ -1,21 +1,22 @@
package com.massivecraft.mcore.mcorecmd;
import java.util.List;
import com.massivecraft.mcore.MCore;
import com.massivecraft.mcore.Multiverse;
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;
public class CmdUsysUniverseDel extends MCommand
public class CmdMCoreUsysUniverseDel extends MCoreCommand
{
public CmdUsysUniverseDel()
public CmdMCoreUsysUniverseDel(List<String> aliases)
{
this.addAliases("d", "del");
super(aliases);
this.addRequiredArg("universe");
this.addRequiredArg("multiverse");
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_MULTIVERSE_DEL.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_MULTIVERSE_DEL.node));
}
@Override

11
src/com/massivecraft/mcore/mcorecmd/CmdUsysUniverseNew.java → src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysUniverseNew.java
View File

@@ -1,20 +1,21 @@
package com.massivecraft.mcore.mcorecmd;
import java.util.List;
import com.massivecraft.mcore.Multiverse;
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;
public class CmdUsysUniverseNew extends MCommand
public class CmdMCoreUsysUniverseNew extends MCoreCommand
{
public CmdUsysUniverseNew()
public CmdMCoreUsysUniverseNew(List<String> aliases)
{
this.addAliases("n", "new");
super(aliases);
this.addRequiredArg("universe");
this.addRequiredArg("multiverse");
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_UNIVERSE_NEW.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_UNIVERSE_NEW.node));
}
@Override

11
src/com/massivecraft/mcore/mcorecmd/CmdUsysWorld.java → src/com/massivecraft/mcore/mcorecmd/CmdMCoreUsysWorld.java
View File

@@ -1,21 +1,22 @@
package com.massivecraft.mcore.mcorecmd;
import java.util.List;
import com.massivecraft.mcore.Multiverse;
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;
public class CmdUsysWorld extends MCommand
public class CmdMCoreUsysWorld extends MCoreCommand
{
public CmdUsysWorld()
public CmdMCoreUsysWorld(List<String> aliases)
{
this.addAliases("w", "world");
super(aliases);
this.addRequiredArg("world");
this.addRequiredArg("universe");
this.addRequiredArg("multiverse");
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_WORLD.node));
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE_USYS_WORLD.node));
}
@Override

57
src/com/massivecraft/mcore/mcorecmd/CmdMcore.java
View File

@@ -1,25 +1,34 @@
package com.massivecraft.mcore.mcorecmd;
import com.massivecraft.mcore.ConfServer;
import com.massivecraft.mcore.MCore;
import com.massivecraft.mcore.MCorePerm;
import com.massivecraft.mcore.cmd.MCommand;
import com.massivecraft.mcore.cmd.req.ReqHasPerm;
public class CmdMcore extends MCommand
{
public final static String MCORE = "mcore";
public CmdMcore()
{
this.addAliases(ConfServer.getCmdAliases(MCORE));
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE.node));
}
@Override
public void perform()
{
this.msg("<i>You are running %s", MCore.get().getDescription().getFullName());
this.msg("<i>The id of this server is \"<h>%s<i>\".", ConfServer.serverid);
}
package com.massivecraft.mcore.mcorecmd;
import java.util.List;
import com.massivecraft.mcore.MCore;
import com.massivecraft.mcore.MCorePerm;
import com.massivecraft.mcore.cmd.HelpCommand;
import com.massivecraft.mcore.cmd.VersionCommand;
import com.massivecraft.mcore.cmd.req.ReqHasPerm;
import com.massivecraft.mcore.util.MUtil;
public class CmdMCore extends MCoreCommand
{
public CmdMCoreId cmdMCoreId = new CmdMCoreId(MUtil.list("id"));
public CmdMCoreUsys cmdMCoreUsys = new CmdMCoreUsys(MUtil.list("usys"));
public CmdMCore(List<String> aliases)
{
super(aliases);
this.addSubCommand(this.cmdMCoreUsys);
this.addSubCommand(this.cmdMCoreId);
this.addSubCommand(new VersionCommand(MCore.get(), MCorePerm.CMD_MCORE_VERSION.node, "v", "version"));
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_MCORE.node));
}
@Override
public void perform()
{
this.getCommandChain().add(this);
HelpCommand.getInstance().execute(this.sender, this.args, this.commandChain);
}
}

38
src/com/massivecraft/mcore/mcorecmd/CmdUsys.java
View File

@@ -1,38 +0,0 @@
package com.massivecraft.mcore.mcorecmd;
import com.massivecraft.mcore.ConfServer;
import com.massivecraft.mcore.MCorePerm;
import com.massivecraft.mcore.cmd.HelpCommand;
import com.massivecraft.mcore.cmd.MCommand;
import com.massivecraft.mcore.cmd.req.ReqHasPerm;
public class CmdUsys extends MCommand
{
public final static String USYS = "usys";
public CmdUsysMultiverse cmdUsysMultiverse = new CmdUsysMultiverse();
public CmdUsysUniverse cmdUsysUniverse = new CmdUsysUniverse();
public CmdUsysWorld cmdUsysWorld = new CmdUsysWorld();
public CmdUsysAspect cmdUsysAspect = new CmdUsysAspect();
public CmdUsys()
{
super();
this.addAliases(ConfServer.getCmdAliases(USYS));
this.addSubCommand(this.cmdUsysMultiverse);
this.addSubCommand(this.cmdUsysUniverse);
this.addSubCommand(this.cmdUsysWorld);
this.addSubCommand(this.cmdUsysAspect);
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS.node));
}
@Override
public void perform()
{
this.getCommandChain().add(this);
HelpCommand.getInstance().execute(this.sender, this.args, this.commandChain);
}
}

32
src/com/massivecraft/mcore/mcorecmd/CmdUsysAspect.java
View File

@@ -1,32 +0,0 @@
package com.massivecraft.mcore.mcorecmd;
import com.massivecraft.mcore.MCorePerm;
import com.massivecraft.mcore.cmd.HelpCommand;
import com.massivecraft.mcore.cmd.MCommand;
import com.massivecraft.mcore.cmd.req.ReqHasPerm;
public class CmdUsysAspect extends MCommand
{
public CmdUsysAspectList cmdUsysAspectList = new CmdUsysAspectList();
public CmdUsysAspectShow cmdUsysAspectShow = new CmdUsysAspectShow();
public CmdUsysAspectUse cmdUsysAspectUse = new CmdUsysAspectUse();
public CmdUsysAspect()
{
super();
this.addAliases("a", "aspect");
this.addSubCommand(this.cmdUsysAspectList);
this.addSubCommand(this.cmdUsysAspectShow);
this.addSubCommand(this.cmdUsysAspectUse);
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_ASPECT.node));
}
@Override
public void perform()
{
this.getCommandChain().add(this);
HelpCommand.getInstance().execute(this.sender, this.args, this.commandChain);
}
}

34
src/com/massivecraft/mcore/mcorecmd/CmdUsysMultiverse.java
View File

@@ -1,34 +0,0 @@
package com.massivecraft.mcore.mcorecmd;
import com.massivecraft.mcore.MCorePerm;
import com.massivecraft.mcore.cmd.HelpCommand;
import com.massivecraft.mcore.cmd.MCommand;
import com.massivecraft.mcore.cmd.req.ReqHasPerm;
public class CmdUsysMultiverse extends MCommand
{
public CmdUsysMultiverseList cmdUsysMultiverseList = new CmdUsysMultiverseList();
public CmdUsysMultiverseShow cmdUsysMultiverseShow = new CmdUsysMultiverseShow();
public CmdUsysMultiverseNew cmdUsysMultiverseNew = new CmdUsysMultiverseNew();
public CmdUsysMultiverseDel cmdUsysMultiverseDel = new CmdUsysMultiverseDel();
public CmdUsysMultiverse()
{
super();
this.addAliases("m", "multiverse");
this.addSubCommand(this.cmdUsysMultiverseList);
this.addSubCommand(this.cmdUsysMultiverseShow);
this.addSubCommand(this.cmdUsysMultiverseNew);
this.addSubCommand(this.cmdUsysMultiverseDel);
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_MULTIVERSE.node));
}
@Override
public void perform()
{
this.getCommandChain().add(this);
HelpCommand.getInstance().execute(this.sender, this.args, this.commandChain);
}
}

32
src/com/massivecraft/mcore/mcorecmd/CmdUsysUniverse.java
View File

@@ -1,32 +0,0 @@
package com.massivecraft.mcore.mcorecmd;
import com.massivecraft.mcore.MCorePerm;
import com.massivecraft.mcore.cmd.HelpCommand;
import com.massivecraft.mcore.cmd.MCommand;
import com.massivecraft.mcore.cmd.req.ReqHasPerm;
public class CmdUsysUniverse extends MCommand
{
public CmdUsysUniverseNew cmdUsysUniverseNew = new CmdUsysUniverseNew();
public CmdUsysUniverseDel cmdUsysUniverseDel = new CmdUsysUniverseDel();
public CmdUsysUniverseClear cmdUsysUniverseClear = new CmdUsysUniverseClear();
public CmdUsysUniverse()
{
super();
this.addAliases("u", "universe");
this.addSubCommand(this.cmdUsysUniverseNew);
this.addSubCommand(this.cmdUsysUniverseDel);
this.addSubCommand(this.cmdUsysUniverseClear);
this.addRequirements(ReqHasPerm.get(MCorePerm.CMD_USYS_UNIVERSE.node));
}
@Override
public void perform()
{
this.getCommandChain().add(this);
HelpCommand.getInstance().execute(this.sender, this.args, this.commandChain);
}
}

13
src/com/massivecraft/mcore/mcorecmd/MCoreCommand.java Normal file
View File

@@ -0,0 +1,13 @@
package com.massivecraft.mcore.mcorecmd;
import java.util.List;
import com.massivecraft.mcore.cmd.MCommand;
public abstract class MCoreCommand extends MCommand
{
public MCoreCommand(List<String> aliases)
{
this.setAliases(aliases);
}
}