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

Move the Aspect and Multiverse entities to the main package.

Browse Source
This commit is contained in:
Olof Larsson 2013-05-01 11:25:39 +02:00
parent 41e581ee71
commit 738d1f7822
22 changed files with 29 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/massivecraft/mcore/usys/Aspect.java → src/com/massivecraft/mcore/Aspect.java
View File

@ -1,10 +1,9 @@
package com.massivecraft.mcore.usys; package com.massivecraft.mcore;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import com.massivecraft.mcore.MCore;
import com.massivecraft.mcore.store.Entity; import com.massivecraft.mcore.store.Entity;
import com.massivecraft.mcore.xlib.gson.annotations.SerializedName; import com.massivecraft.mcore.xlib.gson.annotations.SerializedName;

3
src/com/massivecraft/mcore/usys/AspectColl.java → src/com/massivecraft/mcore/AspectColl.java
View File

@ -1,9 +1,8 @@
package com.massivecraft.mcore.usys; package com.massivecraft.mcore;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.massivecraft.mcore.MCore;
import com.massivecraft.mcore.store.Coll; import com.massivecraft.mcore.store.Coll;
import com.massivecraft.mcore.store.MStore; import com.massivecraft.mcore.store.MStore;

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

@ -29,10 +29,6 @@ import com.massivecraft.mcore.store.Coll;
import com.massivecraft.mcore.store.Db; import com.massivecraft.mcore.store.Db;
import com.massivecraft.mcore.store.ExamineThread; import com.massivecraft.mcore.store.ExamineThread;
import com.massivecraft.mcore.store.MStore; import com.massivecraft.mcore.store.MStore;
import com.massivecraft.mcore.usys.Aspect;
import com.massivecraft.mcore.usys.AspectColl;
import com.massivecraft.mcore.usys.Multiverse;
import com.massivecraft.mcore.usys.MultiverseColl;
import com.massivecraft.mcore.usys.cmd.CmdUsys; import com.massivecraft.mcore.usys.cmd.CmdUsys;
import com.massivecraft.mcore.util.PlayerUtil; import com.massivecraft.mcore.util.PlayerUtil;
import com.massivecraft.mcore.util.TimeDiffUtil; import com.massivecraft.mcore.util.TimeDiffUtil;

3
src/com/massivecraft/mcore/usys/Multiverse.java → src/com/massivecraft/mcore/Multiverse.java
View File

@ -1,4 +1,4 @@
package com.massivecraft.mcore.usys; package com.massivecraft.mcore;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
@ -8,7 +8,6 @@ import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import java.util.TreeSet; import java.util.TreeSet;
import com.massivecraft.mcore.MCore;
import com.massivecraft.mcore.cmd.arg.ARUniverse; import com.massivecraft.mcore.cmd.arg.ARUniverse;
import com.massivecraft.mcore.store.Entity; import com.massivecraft.mcore.store.Entity;
import com.massivecraft.mcore.util.MUtil; import com.massivecraft.mcore.util.MUtil;

3
src/com/massivecraft/mcore/usys/MultiverseColl.java → src/com/massivecraft/mcore/MultiverseColl.java
View File

@ -1,6 +1,5 @@
package com.massivecraft.mcore.usys; package com.massivecraft.mcore;
import com.massivecraft.mcore.MCore;
import com.massivecraft.mcore.store.Coll; import com.massivecraft.mcore.store.Coll;
import com.massivecraft.mcore.store.MStore; import com.massivecraft.mcore.store.MStore;

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

@ -4,9 +4,9 @@ import java.util.Collection;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import com.massivecraft.mcore.Aspect;
import com.massivecraft.mcore.AspectColl;
import com.massivecraft.mcore.Perm; import com.massivecraft.mcore.Perm;
import com.massivecraft.mcore.usys.Aspect;
import com.massivecraft.mcore.usys.AspectColl;
public class ARAspect extends ARAbstractSelect<Aspect> public class ARAspect extends ARAbstractSelect<Aspect>
{ {

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

@ -4,9 +4,9 @@ import java.util.Collection;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import com.massivecraft.mcore.Multiverse;
import com.massivecraft.mcore.MultiverseColl;
import com.massivecraft.mcore.Perm; import com.massivecraft.mcore.Perm;
import com.massivecraft.mcore.usys.Multiverse;
import com.massivecraft.mcore.usys.MultiverseColl;
public class ARMultiverse extends ARAbstractSelect<Multiverse> public class ARMultiverse extends ARAbstractSelect<Multiverse>
{ {

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

@ -5,7 +5,7 @@ import java.util.Collection;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import com.massivecraft.mcore.usys.Multiverse; import com.massivecraft.mcore.Multiverse;
import com.massivecraft.mcore.util.Txt; import com.massivecraft.mcore.util.Txt;
public class ARUniverse extends ArgReaderAbstract<String> public class ARUniverse extends ArgReaderAbstract<String>

4
src/com/massivecraft/mcore/ps/PS.java
View File

@ -11,9 +11,9 @@ import org.bukkit.block.Block;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import com.massivecraft.mcore.Aspect;
import com.massivecraft.mcore.MCore; import com.massivecraft.mcore.MCore;
import com.massivecraft.mcore.usys.Aspect; import com.massivecraft.mcore.Multiverse;
import com.massivecraft.mcore.usys.Multiverse;
import com.massivecraft.mcore.util.MUtil; import com.massivecraft.mcore.util.MUtil;
import com.massivecraft.mcore.xlib.gson.JsonElement; import com.massivecraft.mcore.xlib.gson.JsonElement;
import com.massivecraft.mcore.xlib.gson.JsonObject; import com.massivecraft.mcore.xlib.gson.JsonObject;

4
src/com/massivecraft/mcore/store/Colls.java
View File

@ -5,8 +5,8 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.massivecraft.mcore.usys.Aspect; import com.massivecraft.mcore.Aspect;
import com.massivecraft.mcore.usys.Multiverse; import com.massivecraft.mcore.Multiverse;
import com.massivecraft.mcore.util.MUtil; import com.massivecraft.mcore.util.MUtil;
public abstract class Colls<C extends Coll<E>, E> public abstract class Colls<C extends Coll<E>, E>

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

@ -3,12 +3,12 @@ package com.massivecraft.mcore.usys.cmd;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.massivecraft.mcore.Aspect;
import com.massivecraft.mcore.AspectColl;
import com.massivecraft.mcore.Perm; import com.massivecraft.mcore.Perm;
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;
import com.massivecraft.mcore.usys.Aspect;
import com.massivecraft.mcore.usys.AspectColl;
import com.massivecraft.mcore.util.Txt; import com.massivecraft.mcore.util.Txt;
public class CmdUsysAspectList extends MCommand public class CmdUsysAspectList extends MCommand

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

@ -1,10 +1,10 @@
package com.massivecraft.mcore.usys.cmd; package com.massivecraft.mcore.usys.cmd;
import com.massivecraft.mcore.Aspect;
import com.massivecraft.mcore.Perm; import com.massivecraft.mcore.Perm;
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;
import com.massivecraft.mcore.usys.Aspect;
import com.massivecraft.mcore.util.Txt; import com.massivecraft.mcore.util.Txt;
public class CmdUsysAspectShow extends MCommand public class CmdUsysAspectShow extends MCommand

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

@ -1,12 +1,12 @@
package com.massivecraft.mcore.usys.cmd; 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.Perm;
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;
import com.massivecraft.mcore.cmd.req.ReqHasPerm; import com.massivecraft.mcore.cmd.req.ReqHasPerm;
import com.massivecraft.mcore.usys.Aspect;
import com.massivecraft.mcore.usys.Multiverse;
public class CmdUsysAspectUse extends MCommand public class CmdUsysAspectUse extends MCommand
{ {

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

@ -1,11 +1,11 @@
package com.massivecraft.mcore.usys.cmd; 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.Perm; import com.massivecraft.mcore.Perm;
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;
import com.massivecraft.mcore.usys.Multiverse;
public class CmdUsysMultiverseDel extends MCommand public class CmdUsysMultiverseDel extends MCommand
{ {

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

@ -3,12 +3,12 @@ package com.massivecraft.mcore.usys.cmd;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.massivecraft.mcore.Multiverse;
import com.massivecraft.mcore.MultiverseColl;
import com.massivecraft.mcore.Perm; import com.massivecraft.mcore.Perm;
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;
import com.massivecraft.mcore.usys.Multiverse;
import com.massivecraft.mcore.usys.MultiverseColl;
import com.massivecraft.mcore.util.Txt; import com.massivecraft.mcore.util.Txt;
public class CmdUsysMultiverseList extends MCommand public class CmdUsysMultiverseList extends MCommand

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

@ -1,9 +1,9 @@
package com.massivecraft.mcore.usys.cmd; package com.massivecraft.mcore.usys.cmd;
import com.massivecraft.mcore.MultiverseColl;
import com.massivecraft.mcore.Perm; import com.massivecraft.mcore.Perm;
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;
import com.massivecraft.mcore.usys.MultiverseColl;
public class CmdUsysMultiverseNew extends MCommand public class CmdUsysMultiverseNew extends MCommand
{ {

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

@ -3,13 +3,13 @@ package com.massivecraft.mcore.usys.cmd;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.massivecraft.mcore.Aspect;
import com.massivecraft.mcore.MCore; import com.massivecraft.mcore.MCore;
import com.massivecraft.mcore.Multiverse;
import com.massivecraft.mcore.Perm; import com.massivecraft.mcore.Perm;
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;
import com.massivecraft.mcore.usys.Aspect;
import com.massivecraft.mcore.usys.Multiverse;
import com.massivecraft.mcore.util.Txt; import com.massivecraft.mcore.util.Txt;
public class CmdUsysMultiverseShow extends MCommand public class CmdUsysMultiverseShow extends MCommand

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

@ -1,11 +1,11 @@
package com.massivecraft.mcore.usys.cmd; 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.Perm; import com.massivecraft.mcore.Perm;
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;
import com.massivecraft.mcore.usys.Multiverse;
public class CmdUsysUniverseClear extends MCommand public class CmdUsysUniverseClear extends MCommand
{ {

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

@ -1,11 +1,11 @@
package com.massivecraft.mcore.usys.cmd; 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.Perm; import com.massivecraft.mcore.Perm;
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;
import com.massivecraft.mcore.usys.Multiverse;
public class CmdUsysUniverseDel extends MCommand public class CmdUsysUniverseDel extends MCommand
{ {

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

@ -1,10 +1,10 @@
package com.massivecraft.mcore.usys.cmd; package com.massivecraft.mcore.usys.cmd;
import com.massivecraft.mcore.Multiverse;
import com.massivecraft.mcore.Perm; import com.massivecraft.mcore.Perm;
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;
import com.massivecraft.mcore.usys.Multiverse;
public class CmdUsysUniverseNew extends MCommand public class CmdUsysUniverseNew extends MCommand
{ {

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

@ -1,10 +1,10 @@
package com.massivecraft.mcore.usys.cmd; package com.massivecraft.mcore.usys.cmd;
import com.massivecraft.mcore.Multiverse;
import com.massivecraft.mcore.Perm; import com.massivecraft.mcore.Perm;
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;
import com.massivecraft.mcore.usys.Multiverse;
public class CmdUsysWorld extends MCommand public class CmdUsysWorld extends MCommand
{ {

2
src/com/massivecraft/mcore/util/extractor/ExtractorLogic.java
View File

@ -26,9 +26,9 @@ import org.bukkit.event.vehicle.VehicleEvent;
import org.bukkit.event.vehicle.VehicleExitEvent; import org.bukkit.event.vehicle.VehicleExitEvent;
import com.massivecraft.mcore.MCore; import com.massivecraft.mcore.MCore;
import com.massivecraft.mcore.Multiverse;
import com.massivecraft.mcore.ps.PS; import com.massivecraft.mcore.ps.PS;
import com.massivecraft.mcore.store.SenderEntity; import com.massivecraft.mcore.store.SenderEntity;
import com.massivecraft.mcore.usys.Multiverse;
import com.massivecraft.mcore.util.MUtil; import com.massivecraft.mcore.util.MUtil;
import com.massivecraft.mcore.util.SenderUtil; import com.massivecraft.mcore.util.SenderUtil;