diff --git a/src/com/massivecraft/massivecore/MassiveCore.java b/src/com/massivecraft/massivecore/MassiveCore.java index 46669979..dbb80908 100644 --- a/src/com/massivecraft/massivecore/MassiveCore.java +++ b/src/com/massivecraft/massivecore/MassiveCore.java @@ -55,7 +55,6 @@ import com.massivecraft.massivecore.engine.EngineMassiveCoreScheduledTeleport; import com.massivecraft.massivecore.engine.EngineMassiveCoreTeleportMixinCause; import com.massivecraft.massivecore.engine.EngineMassiveCoreVariable; import com.massivecraft.massivecore.engine.EngineMassiveCoreWorldNameSet; -import com.massivecraft.massivecore.entity.AspectColl; import com.massivecraft.massivecore.entity.MassiveCoreMConf; import com.massivecraft.massivecore.entity.MassiveCoreMConfColl; import com.massivecraft.massivecore.entity.MultiverseColl; @@ -294,7 +293,6 @@ public class MassiveCore extends MassivePlugin { return MUtil.list( MassiveCoreMConfColl.class, - AspectColl.class, MultiverseColl.class ); } diff --git a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsys.java b/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsys.java index 35ec2e3a..26d2227e 100755 --- a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsys.java +++ b/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsys.java @@ -20,6 +20,5 @@ public class CmdMassiveCoreUsys extends MassiveCoreCommand public CmdMassiveCoreUsysMultiverse cmdMassiveCoreUsysMultiverse = new CmdMassiveCoreUsysMultiverse(); public CmdMassiveCoreUsysUniverse cmdMassiveCoreUsysUniverse = new CmdMassiveCoreUsysUniverse(); public CmdMassiveCoreUsysWorld cmdMassiveCoreUsysWorld = new CmdMassiveCoreUsysWorld(); - public CmdMassiveCoreUsysAspect cmdMassiveCoreUsysAspect = new CmdMassiveCoreUsysAspect(); } diff --git a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysAspect.java b/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysAspect.java deleted file mode 100755 index ea4efec8..00000000 --- a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysAspect.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.massivecraft.massivecore.cmd; - -public class CmdMassiveCoreUsysAspect extends MassiveCoreCommand -{ - // -------------------------------------------- // - // FIELDS - // -------------------------------------------- // - - public CmdMassiveCoreUsysAspectList cmdMassiveCoreUsysAspectList = new CmdMassiveCoreUsysAspectList(); - public CmdMassiveCoreUsysAspectShow cmdMassiveCoreUsysAspectShow = new CmdMassiveCoreUsysAspectShow(); - public CmdMassiveCoreUsysAspectUse cmdMassiveCoreUsysAspectUse = new CmdMassiveCoreUsysAspectUse(); - -} diff --git a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysAspectList.java b/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysAspectList.java deleted file mode 100755 index 5e9a409b..00000000 --- a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysAspectList.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.massivecraft.massivecore.cmd; - -import com.massivecraft.massivecore.entity.Aspect; -import com.massivecraft.massivecore.entity.AspectColl; -import com.massivecraft.massivecore.MassiveException; -import com.massivecraft.massivecore.command.Parameter; -import com.massivecraft.massivecore.pager.Pager; -import com.massivecraft.massivecore.pager.Stringifier; -import com.massivecraft.massivecore.util.Txt; - -public class CmdMassiveCoreUsysAspectList extends MassiveCoreCommand -{ - // -------------------------------------------- // - // CONSTRUCT - // -------------------------------------------- // - - public CmdMassiveCoreUsysAspectList() - { - // Parameters - this.addParameter(Parameter.getPage()).setDesc("the page in the aspect list"); - } - - // -------------------------------------------- // - // OVERRIDE - // -------------------------------------------- // - - @Override - public void perform() throws MassiveException - { - // Args - int page = this.readArg(); - - // Pager Create - Pager pager = new Pager<>(this, "Aspect List", page, AspectColl.get().getAllRegistered(), new Stringifier() - { - @Override - public String toString(Aspect aspect, int index) - { - return Txt.parse("" + aspect.getId() + " --> " + aspect.getMultiverse().getId()); - } - }); - - // Pager Message - pager.message(); - } - -} diff --git a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysAspectShow.java b/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysAspectShow.java deleted file mode 100755 index 1a86cb2d..00000000 --- a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysAspectShow.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.massivecraft.massivecore.cmd; - -import com.massivecraft.massivecore.entity.Aspect; -import com.massivecraft.massivecore.MassiveException; -import com.massivecraft.massivecore.command.type.store.TypeAspect; -import com.massivecraft.massivecore.util.Txt; - -public class CmdMassiveCoreUsysAspectShow extends MassiveCoreCommand -{ - // -------------------------------------------- // - // CONSTRUCT - // -------------------------------------------- // - - public CmdMassiveCoreUsysAspectShow() - { - // Parameters - this.addParameter(TypeAspect.get(), "aspect").setDesc("the aspect to show info about"); - } - - // -------------------------------------------- // - // OVERRIDE - // -------------------------------------------- // - - @Override - public void perform() throws MassiveException - { - Aspect aspect = this.readArg(); - - message(Txt.titleize("Aspect: "+aspect.getId())); - msg("using multiverse: %s",aspect.getMultiverse().getId()); - - for (String descLine : aspect.getDesc()) - { - msg(descLine); - } - } - -} diff --git a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysAspectUse.java b/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysAspectUse.java deleted file mode 100755 index 3b3e28a2..00000000 --- a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysAspectUse.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.massivecraft.massivecore.cmd; - -import com.massivecraft.massivecore.entity.Aspect; -import com.massivecraft.massivecore.MassiveException; -import com.massivecraft.massivecore.entity.Multiverse; -import com.massivecraft.massivecore.command.type.store.TypeAspect; -import com.massivecraft.massivecore.command.type.store.TypeMultiverse; - -public class CmdMassiveCoreUsysAspectUse extends MassiveCoreCommand -{ - // -------------------------------------------- // - // CONSTRUCT - // -------------------------------------------- // - - public CmdMassiveCoreUsysAspectUse() - { - // Parameters - this.addParameter(TypeAspect.get(), "aspect").setDesc("the aspect to modify"); - this.addParameter(TypeMultiverse.get(), "multiverse").setDesc("the multiverse which the aspect should use"); - } - - // -------------------------------------------- // - // OVERRIDE - // -------------------------------------------- // - - @Override - public void perform() throws MassiveException - { - Aspect aspect = this.readArg(); - Multiverse multiverse = this.readArg(); - - aspect.setMultiverse(multiverse); - - msg("The aspect %s now use multiverse %s.", aspect.getId(), multiverse.getId()); - } - -} diff --git a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysMultiverseShow.java b/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysMultiverseShow.java index ccce80a9..0f3b8a26 100755 --- a/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysMultiverseShow.java +++ b/src/com/massivecraft/massivecore/cmd/CmdMassiveCoreUsysMultiverseShow.java @@ -1,15 +1,11 @@ package com.massivecraft.massivecore.cmd; -import com.massivecraft.massivecore.entity.Aspect; import com.massivecraft.massivecore.MassiveCore; import com.massivecraft.massivecore.MassiveException; -import com.massivecraft.massivecore.entity.Multiverse; import com.massivecraft.massivecore.command.type.store.TypeMultiverse; +import com.massivecraft.massivecore.entity.Multiverse; import com.massivecraft.massivecore.util.Txt; -import java.util.ArrayList; -import java.util.List; - public class CmdMassiveCoreUsysMultiverseShow extends MassiveCoreCommand { @@ -40,32 +36,7 @@ public class CmdMassiveCoreUsysMultiverseShow extends MassiveCoreCommand msg(""+universe+": "+Txt.implodeCommaAndDot(multiverse.getWorlds(universe), "%s", ", ", " and ", ".")); } msg("default: for all other worlds."); - - msg(""); - msg("Aspects using this multiverse:"); - this.msgAspects(multiverse.myAspects()); - - msg(""); - msg("Aspects NOT using this multiverse:"); - this.msgAspects(multiverse.otherAspects()); - } - - public void msgAspects(List aspects) - { - List ids = new ArrayList<>(); - for (Aspect aspect : aspects) - { - ids.add(aspect.getId()); - } - - if (ids.size() == 0) - { - msg("*none*"); - } - else - { - msg(Txt.implodeCommaAndDot(ids, "%s", ", ", " and ", ".")); - } } + } diff --git a/src/com/massivecraft/massivecore/command/type/RegistryType.java b/src/com/massivecraft/massivecore/command/type/RegistryType.java index b07a65dc..20850e19 100644 --- a/src/com/massivecraft/massivecore/command/type/RegistryType.java +++ b/src/com/massivecraft/massivecore/command/type/RegistryType.java @@ -47,7 +47,6 @@ import com.massivecraft.massivecore.command.type.primitive.TypeLong; import com.massivecraft.massivecore.command.type.primitive.TypeString; import com.massivecraft.massivecore.command.type.sender.TypePlayer; import com.massivecraft.massivecore.command.type.sender.TypeSender; -import com.massivecraft.massivecore.command.type.store.TypeAspect; import com.massivecraft.massivecore.command.type.store.TypeMultiverse; import com.massivecraft.massivecore.util.ReflectionUtil; @@ -337,7 +336,6 @@ public class RegistryType register(TypeSender.get()); // Store - register(TypeAspect.get()); register(TypeMultiverse.get()); // Collection diff --git a/src/com/massivecraft/massivecore/command/type/TypeUniverse.java b/src/com/massivecraft/massivecore/command/type/TypeUniverse.java index 4c64893b..8b653e7a 100644 --- a/src/com/massivecraft/massivecore/command/type/TypeUniverse.java +++ b/src/com/massivecraft/massivecore/command/type/TypeUniverse.java @@ -1,6 +1,5 @@ package com.massivecraft.massivecore.command.type; -import com.massivecraft.massivecore.entity.Aspect; import com.massivecraft.massivecore.entity.Multiverse; import java.util.Collection; @@ -10,24 +9,20 @@ public class TypeUniverse extends TypeAbstractChoice // -------------------------------------------- // // FIELDS // -------------------------------------------- // - - protected Aspect aspect = null; + protected Multiverse multiverse = null; public Multiverse getMultiverse() { - if (this.aspect != null) return this.aspect.getMultiverse(); return this.multiverse; } // -------------------------------------------- // // INSTANCE & CONSTRUCT // -------------------------------------------- // - - public static TypeUniverse get(Aspect aspect) { return new TypeUniverse(aspect); } + public static TypeUniverse get(Multiverse multiverse) { return new TypeUniverse(multiverse); } - - public TypeUniverse(Aspect aspect) { super(String.class); this.aspect = aspect; } + public TypeUniverse(Multiverse multiverse) { super(String.class); this.multiverse = multiverse; } // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/command/type/store/TypeAspect.java b/src/com/massivecraft/massivecore/command/type/store/TypeAspect.java deleted file mode 100644 index 96ffacb6..00000000 --- a/src/com/massivecraft/massivecore/command/type/store/TypeAspect.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.massivecraft.massivecore.command.type.store; - -import com.massivecraft.massivecore.entity.Aspect; -import com.massivecraft.massivecore.entity.AspectColl; -import com.massivecraft.massivecore.MassiveCorePerm; -import org.bukkit.command.CommandSender; - -public class TypeAspect extends TypeEntity -{ - // -------------------------------------------- // - // INSTANCE & CONSTRUCT - // -------------------------------------------- // - - private static TypeAspect i = new TypeAspect(); - public static TypeAspect get() { return i; } - public TypeAspect() - { - super(AspectColl.get()); - } - - // -------------------------------------------- // - // OVERRIDE - // -------------------------------------------- // - - @Override - public boolean canList(CommandSender sender) - { - return MassiveCorePerm.USYS_ASPECT_LIST.has(sender, false); - } - -} diff --git a/src/com/massivecraft/massivecore/entity/Aspect.java b/src/com/massivecraft/massivecore/entity/Aspect.java deleted file mode 100644 index 0e4b55ae..00000000 --- a/src/com/massivecraft/massivecore/entity/Aspect.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.massivecraft.massivecore.entity; - -import com.google.gson.annotations.SerializedName; -import com.massivecraft.massivecore.MassiveCore; -import com.massivecraft.massivecore.store.Entity; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; - -public class Aspect extends Entity -{ - // -------------------------------------------- // - // META - // -------------------------------------------- // - - public static Aspect get(Object oid) - { - return AspectColl.get().get(oid); - } - - // -------------------------------------------- // - // TRANSIENT FIELDS - // -------------------------------------------- // - - private transient boolean registered = false; - public boolean isRegistered() { return this.registered; } - public void register() { this.registered = true; } - - private transient Collection desc = new ArrayList<>(); - public Collection getDesc() { return this.desc; } - public void setDesc(Collection val) { this.desc = val; } - public void setDesc(String... val) { this.desc = Arrays.asList(val); } - - // -------------------------------------------- // - // STORED FIELDS - // -------------------------------------------- // - - @SerializedName("mid") - private String multiverseId; - public String getMultiverseId() { return this.multiverseId; } - public void setMultiverseId(String multiverseId) { this.multiverseId = multiverseId; } - public Multiverse getMultiverse() - { - Multiverse ret = MultiverseColl.get().get(this.multiverseId); - if (ret == null) ret = MultiverseColl.get().get(MassiveCore.DEFAULT); - return ret; - } - public void setMultiverse(Multiverse val) { this.multiverseId = val.getId(); } - - // -------------------------------------------- // - // CONSTRUCT - // -------------------------------------------- // - - public Aspect() - { - - } - -} diff --git a/src/com/massivecraft/massivecore/entity/AspectColl.java b/src/com/massivecraft/massivecore/entity/AspectColl.java deleted file mode 100644 index 569c582a..00000000 --- a/src/com/massivecraft/massivecore/entity/AspectColl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.massivecraft.massivecore.entity; - -import com.massivecraft.massivecore.store.Coll; - -import java.util.ArrayList; -import java.util.List; - -public class AspectColl extends Coll -{ - // -------------------------------------------- // - // INSTANCE & CONSTRUCT - // -------------------------------------------- // - - private static AspectColl i = new AspectColl(); - public static AspectColl get() { return i; } - - // -------------------------------------------- // - // STACK TRACEABILITY - // -------------------------------------------- // - - @Override - public void onTick() - { - super.onTick(); - } - - // -------------------------------------------- // - // EXTRAS - // -------------------------------------------- // - - public List getAllRegistered() - { - List ret = new ArrayList<>(); - for (Aspect aspect : this.getAll()) - { - if (aspect.isRegistered() == false) continue; - ret.add(aspect); - } - return ret; - } - - public List getAllRegisteredForMultiverse(Multiverse multiverse, boolean normal) - { - List ret = new ArrayList<>(); - for (Aspect aspect : this.getAll()) - { - if (aspect.isRegistered() == false) continue; - if ((aspect.getMultiverse() != multiverse) == normal) continue; - ret.add(aspect); - } - return ret; - } - -} diff --git a/src/com/massivecraft/massivecore/entity/Multiverse.java b/src/com/massivecraft/massivecore/entity/Multiverse.java index 0c0a4297..e694bd23 100644 --- a/src/com/massivecraft/massivecore/entity/Multiverse.java +++ b/src/com/massivecraft/massivecore/entity/Multiverse.java @@ -7,7 +7,6 @@ import com.massivecraft.massivecore.util.MUtil; import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; @@ -40,20 +39,6 @@ public class Multiverse extends Entity } - // -------------------------------------------- // - // ASPECTS - // -------------------------------------------- // - - public List myAspects() - { - return AspectColl.get().getAllRegisteredForMultiverse(this, true); - } - - public List otherAspects() - { - return AspectColl.get().getAllRegisteredForMultiverse(this, false); - } - // -------------------------------------------- // // UNIVERSE // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/ps/PS.java b/src/com/massivecraft/massivecore/ps/PS.java index 74b6bf5d..fb52143a 100644 --- a/src/com/massivecraft/massivecore/ps/PS.java +++ b/src/com/massivecraft/massivecore/ps/PS.java @@ -3,11 +3,10 @@ package com.massivecraft.massivecore.ps; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.annotations.SerializedName; -import com.massivecraft.massivecore.entity.Aspect; import com.massivecraft.massivecore.MassiveCore; -import com.massivecraft.massivecore.entity.Multiverse; import com.massivecraft.massivecore.collections.MassiveSet; import com.massivecraft.massivecore.comparator.ComparatorSmart; +import com.massivecraft.massivecore.entity.Multiverse; import com.massivecraft.massivecore.util.MUtil; import org.bukkit.Bukkit; import org.bukkit.Chunk; @@ -851,11 +850,6 @@ public final class PS implements Serializable, Comparable return m1.equalsIgnoreCase(m2); } - - public static boolean inSameUniverse(PS one, PS two, Aspect aspect) - { - return inSameUniverse(one, two, aspect.getMultiverse()); - } // -------------------------------------------- // // GET SETS diff --git a/src/com/massivecraft/massivecore/sender/BasicCommandSender.java b/src/com/massivecraft/massivecore/sender/BasicCommandSender.java deleted file mode 100644 index b4289b36..00000000 --- a/src/com/massivecraft/massivecore/sender/BasicCommandSender.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.massivecraft.massivecore.sender; - -import com.massivecraft.massivecore.MassiveCore; -import com.massivecraft.massivecore.util.IdUtil; -import org.bukkit.Bukkit; -import org.bukkit.Server; -import org.bukkit.command.CommandSender; -import org.bukkit.permissions.PermissibleBase; - -public abstract class BasicCommandSender extends PermissibleBase implements CommandSender -{ - public final String name; - - public BasicCommandSender(String name, boolean op, boolean opChangeable) - { - super(new BasicServerOperator(name, op, opChangeable)); - this.name = name; - } - - @Override - public void setOp(boolean value) - { - boolean before = this.isOp(); - super.setOp(value); - boolean after = this.isOp(); - if (before == after) return; - this.recalculatePermissions(); - } - - @Override - public String getName() - { - return this.name; - } - - @Override - public Server getServer() - { - return Bukkit.getServer(); - } - - @Override - public void sendMessage(String[] messages) - { - for (String message : messages) - { - this.sendMessage(message); - } - } - - public void register() - { - final BasicCommandSender ME = this; - - // Register Now - registerImmediately(); - - // Register Later - Bukkit.getScheduler().scheduleSyncDelayedTask(MassiveCore.get(), new Runnable() - { - @Override - public void run() - { - ME.registerImmediately(); - } - }); - } - - public void registerImmediately() - { - IdUtil.register(this); - } - - public void unregister() - { - IdUtil.unregister(this); - } - -} diff --git a/src/com/massivecraft/massivecore/store/Colls.java b/src/com/massivecraft/massivecore/store/Colls.java deleted file mode 100644 index 45e88b45..00000000 --- a/src/com/massivecraft/massivecore/store/Colls.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.massivecraft.massivecore.store; - -import com.massivecraft.massivecore.Active; -import com.massivecraft.massivecore.entity.Aspect; -import com.massivecraft.massivecore.MassivePlugin; -import com.massivecraft.massivecore.entity.Multiverse; -import com.massivecraft.massivecore.util.MUtil; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public abstract class Colls, E extends Entity> implements Active -{ - protected Map name2coll = new HashMap<>(); - - public abstract Aspect getAspect(); - public abstract String getBasename(); - public abstract C createColl(String name); - - // -------------------------------------------- // - // CONSTRUCT - // -------------------------------------------- // - - public List getColls() - { - List ret = new ArrayList<>(); - Aspect a = this.getAspect(); - Multiverse m = a.getMultiverse(); - for (String universe : m.getUniverses()) - { - ret.add(this.getForUniverse(universe)); - } - return ret; - } - - // -------------------------------------------- // - // ACTIVE - // -------------------------------------------- // - - private boolean active = false; - @Override - public boolean isActive() - { - return this.active; - } - @Override - public void setActive(boolean active) - { - this.active = active; - if (active) - { - this.getColls(); - } - else - { - // TODO: Uuuuuh - } - } - - private MassivePlugin plugin = null; - @Override - public MassivePlugin setActivePlugin(MassivePlugin plugin) - { - MassivePlugin ret = this.plugin; - this.plugin = plugin; - return ret; - } - @Override - public MassivePlugin getActivePlugin() - { - return this.plugin; - } - - @Override - public void setActive(MassivePlugin plugin) - { - this.setActivePlugin(plugin); - this.setActive(plugin != null); - } - - // -------------------------------------------- // - // UTIL - // -------------------------------------------- // - - public String collnameForUniverse(String universe) - { - return this.getBasename() + "@" + universe; - } - - public String universeFromWorldName(String worldName) - { - if (worldName == null) throw new IllegalArgumentException("worldName may not be null."); - - return this.getAspect().getMultiverse().getUniverseForWorldName(worldName); - } - - // -------------------------------------------- // - // GET - // -------------------------------------------- // - - public C getForWorld(String worldName) - { - if (worldName == null) throw new IllegalArgumentException("worldName may not be null."); - return this.getForUniverse(this.universeFromWorldName(worldName)); - } - - public C getForUniverse(String universe) - { - if (universe == null) throw new IllegalArgumentException("universe may not be null."); - String collname = this.collnameForUniverse(universe); - return this.getForCollname(collname); - } - - public C getForCollname(String collname) - { - C ret = this.name2coll.get(collname); - if (ret == null) - { - ret = this.createColl(collname); - this.name2coll.put(collname, ret); - ret.setActivePlugin(this.getActivePlugin()); - ret.setActive(true); - } - return ret; - } - - public C get(Object worldNameExtractable) - { - if (worldNameExtractable == null) return null; - String worldName = MUtil.extract(String.class, "worldName", worldNameExtractable); - if (worldName == null) return null; - return this.getForWorld(worldName); - } - - public E get2(Object worldNameExtractable) - { - C coll = this.get(worldNameExtractable); - if (coll == null) return null; - return coll.get(worldNameExtractable); - } -} diff --git a/src/com/massivecraft/massivecore/store/EntityContainerAbstract.java b/src/com/massivecraft/massivecore/store/EntityContainerAbstract.java index 88a0b415..b692c268 100644 --- a/src/com/massivecraft/massivecore/store/EntityContainerAbstract.java +++ b/src/com/massivecraft/massivecore/store/EntityContainerAbstract.java @@ -146,19 +146,19 @@ public abstract class EntityContainerAbstract> imple @Override public List getAll(Integer limit) { return MUtil.transform(this.getAll(), limit); } // OLD PREDICATE - @Override public List getAll(Iterable oids, com.massivecraft.massivecore.predicate.Predicate where, Comparator orderby, Integer limit, Integer offset) { return MUtil.transform(this.getAll(oids), where, orderby, limit, offset); } - @Override public List getAll(Iterable oids, com.massivecraft.massivecore.predicate.Predicate where, Comparator orderby, Integer limit) { return MUtil.transform(this.getAll(oids), where, orderby, limit); } - @Override public List getAll(Iterable oids, com.massivecraft.massivecore.predicate.Predicate where, Comparator orderby) { return MUtil.transform(this.getAll(oids), where, orderby); } - @Override public List getAll(Iterable oids, com.massivecraft.massivecore.predicate.Predicate where, Integer limit, Integer offset) { return MUtil.transform(this.getAll(oids), where, limit, offset); } - @Override public List getAll(Iterable oids, com.massivecraft.massivecore.predicate.Predicate where, Integer limit) { return MUtil.transform(this.getAll(oids), where, limit); } - @Override public List getAll(Iterable oids, com.massivecraft.massivecore.predicate.Predicate where) { return MUtil.transform(this.getAll(oids), where); } + @Deprecated @Override public List getAll(Iterable oids, com.massivecraft.massivecore.predicate.Predicate where, Comparator orderby, Integer limit, Integer offset) { return MUtil.transform(this.getAll(oids), where, orderby, limit, offset); } + @Deprecated @Override public List getAll(Iterable oids, com.massivecraft.massivecore.predicate.Predicate where, Comparator orderby, Integer limit) { return MUtil.transform(this.getAll(oids), where, orderby, limit); } + @Deprecated @Override public List getAll(Iterable oids, com.massivecraft.massivecore.predicate.Predicate where, Comparator orderby) { return MUtil.transform(this.getAll(oids), where, orderby); } + @Deprecated @Override public List getAll(Iterable oids, com.massivecraft.massivecore.predicate.Predicate where, Integer limit, Integer offset) { return MUtil.transform(this.getAll(oids), where, limit, offset); } + @Deprecated @Override public List getAll(Iterable oids, com.massivecraft.massivecore.predicate.Predicate where, Integer limit) { return MUtil.transform(this.getAll(oids), where, limit); } + @Deprecated @Override public List getAll(Iterable oids, com.massivecraft.massivecore.predicate.Predicate where) { return MUtil.transform(this.getAll(oids), where); } - @Override public List getAll(com.massivecraft.massivecore.predicate.Predicate where, Comparator orderby, Integer limit, Integer offset) { return MUtil.transform(this.getAll(), where, orderby, limit, offset); } - @Override public List getAll(com.massivecraft.massivecore.predicate.Predicate where, Comparator orderby, Integer limit) { return MUtil.transform(this.getAll(), where, orderby, limit); } - @Override public List getAll(com.massivecraft.massivecore.predicate.Predicate where, Comparator orderby) { return MUtil.transform(this.getAll(), where, orderby); } - @Override public List getAll(com.massivecraft.massivecore.predicate.Predicate where, Integer limit, Integer offset) { return MUtil.transform(this.getAll(), where, limit, offset); } - @Override public List getAll(com.massivecraft.massivecore.predicate.Predicate where, Integer limit) { return MUtil.transform(this.getAll(), where, limit); } - @Override public List getAll(com.massivecraft.massivecore.predicate.Predicate where) { return MUtil.transform(this.getAll(), where); } + @Deprecated @Override public List getAll(com.massivecraft.massivecore.predicate.Predicate where, Comparator orderby, Integer limit, Integer offset) { return MUtil.transform(this.getAll(), where, orderby, limit, offset); } + @Deprecated @Override public List getAll(com.massivecraft.massivecore.predicate.Predicate where, Comparator orderby, Integer limit) { return MUtil.transform(this.getAll(), where, orderby, limit); } + @Deprecated @Override public List getAll(com.massivecraft.massivecore.predicate.Predicate where, Comparator orderby) { return MUtil.transform(this.getAll(), where, orderby); } + @Deprecated @Override public List getAll(com.massivecraft.massivecore.predicate.Predicate where, Integer limit, Integer offset) { return MUtil.transform(this.getAll(), where, limit, offset); } + @Deprecated @Override public List getAll(com.massivecraft.massivecore.predicate.Predicate where, Integer limit) { return MUtil.transform(this.getAll(), where, limit); } + @Deprecated @Override public List getAll(com.massivecraft.massivecore.predicate.Predicate where) { return MUtil.transform(this.getAll(), where); } // -------------------------------------------- // // BEHAVIOR