diff --git a/src/com/massivecraft/massivecore/cmd/DeprecatedCommand.java b/src/com/massivecraft/massivecore/cmd/DeprecatedCommand.java index f3454256..f77b9c28 100644 --- a/src/com/massivecraft/massivecore/cmd/DeprecatedCommand.java +++ b/src/com/massivecraft/massivecore/cmd/DeprecatedCommand.java @@ -39,7 +39,7 @@ public class DeprecatedCommand extends MassiveCommand public void perform() { msg("Use this new command instead:"); - sendMessage(target.getUseageTemplate(true)); + message(target.getUseageTemplate(true)); } } diff --git a/src/com/massivecraft/massivecore/cmd/HelpCommand.java b/src/com/massivecraft/massivecore/cmd/HelpCommand.java index 6b5d9431..6812d313 100644 --- a/src/com/massivecraft/massivecore/cmd/HelpCommand.java +++ b/src/com/massivecraft/massivecore/cmd/HelpCommand.java @@ -56,7 +56,7 @@ public class HelpCommand extends MassiveCommand } // Send Lines - sendMessage(Txt.getPage(lines, page, "Help for command \"" + parentCommand.getAliases().get(0) + "\"", sender)); + message(Txt.getPage(lines, page, "Help for command \"" + parentCommand.getAliases().get(0) + "\"", sender)); } } diff --git a/src/com/massivecraft/massivecore/cmd/MassiveCommand.java b/src/com/massivecraft/massivecore/cmd/MassiveCommand.java index 7077c361..7c49d6e0 100644 --- a/src/com/massivecraft/massivecore/cmd/MassiveCommand.java +++ b/src/com/massivecraft/massivecore/cmd/MassiveCommand.java @@ -1099,24 +1099,7 @@ public class MassiveCommand // MESSAGE SENDING HELPERS // -------------------------------------------- // - // CONVENIENCE SEND MESSAGE - - public boolean sendMessage(String message) - { - return Mixin.messageOne(this.sender, message); - } - - public boolean sendMessage(String... messages) - { - return Mixin.messageOne(this.sender, messages); - } - - public boolean sendMessage(Collection messages) - { - return Mixin.messageOne(this.sender, messages); - } - - // CONVENIENCE MSG + // MSG public boolean msg(String msg) { @@ -1133,21 +1116,21 @@ public class MassiveCommand return Mixin.msgOne(this.sender, msgs); } - // CONVENIENCE RAW + // MESSAGE - public boolean sendRaw(Mson mson) + public boolean message(Object message) { - return Mixin.messageRawOne(this.sender, mson); + return Mixin.messageOne(this.sender, message); } - public boolean sendRaw(Mson... mson) + public boolean message(Object... messages) { - return Mixin.messageRawOne(this.sender, mson); + return Mixin.messageOne(this.sender, messages); } - public boolean sendRaw(Collection mson) + public boolean message(Collection messages) { - return Mixin.messageRawOne(this.sender, mson); + return Mixin.messageOne(this.sender, messages); } // CONVENIENCE MSON diff --git a/src/com/massivecraft/massivecore/cmd/VersionCommand.java b/src/com/massivecraft/massivecore/cmd/VersionCommand.java index cc17ef5d..c735f3a4 100644 --- a/src/com/massivecraft/massivecore/cmd/VersionCommand.java +++ b/src/com/massivecraft/massivecore/cmd/VersionCommand.java @@ -82,12 +82,12 @@ public class VersionCommand extends MassiveCommand public void sendTitle() { - sendMessage(Txt.titleize("Plugin Version & Information")); + message(Txt.titleize("Plugin Version & Information")); } public void sendEntry(String key, String value) { - sendMessage(Txt.parse("%s: %s", Txt.upperCaseFirst(key), value == null ? NOT_SPECIFIED : value)); + message(Txt.parse("%s: %s", Txt.upperCaseFirst(key), value == null ? NOT_SPECIFIED : value)); } } diff --git a/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreBufferPrint.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreBufferPrint.java index 20100994..1e5a615c 100644 --- a/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreBufferPrint.java +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreBufferPrint.java @@ -35,7 +35,7 @@ public class CmdMassiveCoreBufferPrint extends MassiveCommand } msg("Printing your buffer on the line below:"); - sendMessage(buffer); + message(buffer); } } diff --git a/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreStoreListcolls.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreStoreListcolls.java index 5c9302c3..111cf368 100644 --- a/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreStoreListcolls.java +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreStoreListcolls.java @@ -78,7 +78,7 @@ public class CmdMassiveCoreStoreListcolls extends MassiveCommand message += Txt.parse(" (%d documents)", coll.getIds().size()); } - sendMessage(message); + message(message); } } diff --git a/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreTest.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreTest.java index 877151ab..9e71b196 100644 --- a/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreTest.java +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreTest.java @@ -40,7 +40,7 @@ public class CmdMassiveCoreTest extends MassiveCommand public void perform() throws MassiveException { - sendRaw(mson("This is your ", mson("item").tooltip(me.getItemInHand()))); + message(mson("This is your ", mson("item").tooltip(me.getItemInHand()))); // OLD STUFF /*// Args ParticleEffect particleEffect = this.readArg(); diff --git a/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysAspectList.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysAspectList.java index c3c13a06..0599078c 100644 --- a/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysAspectList.java +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysAspectList.java @@ -50,7 +50,7 @@ public class CmdMassiveCoreUsysAspectList extends MassiveCommand } // Send them - this.sendMessage(Txt.getPage(lines, page, "Aspect List", sender)); + this.message(Txt.getPage(lines, page, "Aspect List", sender)); } } diff --git a/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysMultiverseList.java b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysMultiverseList.java index b5946d76..91ac9231 100644 --- a/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysMultiverseList.java +++ b/src/com/massivecraft/massivecore/cmd/massivecore/CmdMassiveCoreUsysMultiverseList.java @@ -49,7 +49,7 @@ public class CmdMassiveCoreUsysMultiverseList extends MassiveCommand } // Send them - this.sendMessage(Txt.getPage(lines, page, "Multiverse List", sender)); + this.message(Txt.getPage(lines, page, "Multiverse List", sender)); } } diff --git a/src/com/massivecraft/massivecore/mixin/MessageMixin.java b/src/com/massivecraft/massivecore/mixin/MessageMixin.java index b2a5a998..2f8205a0 100644 --- a/src/com/massivecraft/massivecore/mixin/MessageMixin.java +++ b/src/com/massivecraft/massivecore/mixin/MessageMixin.java @@ -5,39 +5,20 @@ import java.util.Collection; import org.bukkit.command.CommandSender; import com.massivecraft.massivecore.Predictate; -import com.massivecraft.massivecore.mson.Mson; public interface MessageMixin { // -------------------------------------------- // - // MESSAGE - // -------------------------------------------- // - - // All - public boolean messageAll(String message); - public boolean messageAll(String... messages); - public boolean messageAll(Collection messages); - - // Predictate - public boolean messagePredictate(Predictate predictate, String message); - public boolean messagePredictate(Predictate predictate, String... messages); - public boolean messagePredictate(Predictate predictate, Collection messages); - - // One - public boolean messageOne(Object sendeeObject, String message); - public boolean messageOne(Object sendeeObject, String... messages); - public boolean messageOne(Object sendeeObject, Collection messages); - - // -------------------------------------------- // - // PARSE MSG + // MSG // -------------------------------------------- // + // All implemented in abstract! // All public boolean msgAll(String msg); public boolean msgAll(String msg, Object... args); public boolean msgAll(Collection msgs); - // Predictate + // Predicate public boolean msgPredictate(Predictate predictate, String msg); public boolean msgPredictate(Predictate predictate, String msg, Object... args); public boolean msgPredictate(Predictate predictate, Collection msgs); @@ -46,24 +27,24 @@ public interface MessageMixin public boolean msgOne(Object sendeeObject, String msg); public boolean msgOne(Object sendeeObject, String msg, Object... args); public boolean msgOne(Object sendeeObject, Collection msgs); - + // -------------------------------------------- // - // RAW MESSAGE + // MESSAGE // -------------------------------------------- // // All - public boolean messageRawAll(Mson mson); - public boolean messageRawAll(Mson... msons); - public boolean messageRawAll(Collection msons); + public boolean messageAll(Object message); + public boolean messageAll(Object... messages); + public boolean messageAll(Collection messages); - // Predictate - public boolean messageRawPredictate(Predictate predictate, Mson mson); - public boolean messageRawPredictate(Predictate predictate, Mson... msons); - public boolean messageRawPredictate(Predictate predictate, Collection msons); + // Predicate + public boolean messagePredictate(Predictate predictate, Object message); + public boolean messagePredictate(Predictate predictate, Object... messages); + public boolean messagePredictate(Predictate predictate, Collection messages); // One - public boolean messageRawOne(Object sendeeObject, Mson mson); - public boolean messageRawOne(Object sendeeObject, Mson... msons); - public boolean messageRawOne(Object sendeeObject, Collection msons); + public boolean messageOne(Object sendeeObject, Object message); + public boolean messageOne(Object sendeeObject, Object... messages); + public boolean messageOne(Object sendeeObject, Collection messages); } diff --git a/src/com/massivecraft/massivecore/mixin/MessageMixinAbstract.java b/src/com/massivecraft/massivecore/mixin/MessageMixinAbstract.java index 1d3af601..839bfa4b 100644 --- a/src/com/massivecraft/massivecore/mixin/MessageMixinAbstract.java +++ b/src/com/massivecraft/massivecore/mixin/MessageMixinAbstract.java @@ -7,58 +7,14 @@ import java.util.Collections; import org.bukkit.command.CommandSender; import com.massivecraft.massivecore.Predictate; -import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.util.Txt; public abstract class MessageMixinAbstract implements MessageMixin { // -------------------------------------------- // - // MESSAGE + // MSG STRING // -------------------------------------------- // - - // All - @Override - public boolean messageAll(String message) - { - return this.messageAll(Collections.singleton(message)); - } - - @Override - public boolean messageAll(String... messages) - { - return this.messageAll(Arrays.asList(messages)); - } - - // Predictate - @Override - public boolean messagePredictate(Predictate predictate, String message) - { - return this.messagePredictate(predictate, Collections.singleton(message)); - } - - @Override - public boolean messagePredictate(Predictate predictate, String... messages) - { - return this.messagePredictate(predictate, Arrays.asList(messages)); - } - - // One - @Override - public boolean messageOne(Object sendeeObject, String message) - { - return this.messageOne(sendeeObject, Collections.singleton(message)); - } - - @Override - public boolean messageOne(Object sendeeObject, String... messages) - { - return this.messageOne(sendeeObject, Arrays.asList(messages)); - } - - // -------------------------------------------- // - // PARSE MSG - // -------------------------------------------- // - // They are all in abstract! + // All implemented in abstract! // All @Override @@ -116,48 +72,48 @@ public abstract class MessageMixinAbstract implements MessageMixin { return this.messageOne(sendeeObject, Txt.parse(msgs)); } - + // -------------------------------------------- // - // RAW MESSAGE + // MESSAGE // -------------------------------------------- // // All @Override - public boolean messageRawAll(Mson mson) + public boolean messageAll(Object message) { - return this.messageRawAll(Arrays.asList(mson)); + return this.messageAll(Collections.singleton(message)); } @Override - public boolean messageRawAll(Mson... msons) + public boolean messageAll(Object... messages) { - return this.messageRawAll(Arrays.asList(msons)); + return this.messageAll(Arrays.asList(messages)); } - // Predictate + // Predicate @Override - public boolean messageRawPredictate(Predictate predictate, Mson mson) + public boolean messagePredictate(Predictate predictate, Object message) { - return this.messageRawPredictate(predictate, Arrays.asList(mson)); + return this.messagePredictate(predictate, Collections.singleton(message)); } @Override - public boolean messageRawPredictate(Predictate predictate, Mson... msons) + public boolean messagePredictate(Predictate predictate, Object... messages) { - return this.messageRawPredictate(predictate, Arrays.asList(msons)); + return this.messagePredictate(predictate, Arrays.asList(messages)); } // One @Override - public boolean messageRawOne(Object sendeeObject, Mson mson) + public boolean messageOne(Object sendeeObject, Object message) { - return this.messageRawOne(sendeeObject, Arrays.asList(mson)); + return this.messageOne(sendeeObject, Collections.singleton(message)); } @Override - public boolean messageRawOne(Object sendeeObject, Mson... msons) + public boolean messageOne(Object sendeeObject, Object... messages) { - return this.messageRawOne(sendeeObject, Arrays.asList(msons)); + return this.messageOne(sendeeObject, Arrays.asList(messages)); } } diff --git a/src/com/massivecraft/massivecore/mixin/MessageMixinDefault.java b/src/com/massivecraft/massivecore/mixin/MessageMixinDefault.java index cc8dbd43..092c4a94 100644 --- a/src/com/massivecraft/massivecore/mixin/MessageMixinDefault.java +++ b/src/com/massivecraft/massivecore/mixin/MessageMixinDefault.java @@ -20,93 +20,99 @@ public class MessageMixinDefault extends MessageMixinAbstract public static MessageMixinDefault get() { return i; } // -------------------------------------------- // - // OVERRIDE + // MESSAGE // -------------------------------------------- // + // All + // NOTE: Targets messageOne @Override - public boolean messageAll(Collection messages) + public boolean messageAll(Collection messages) { + // Check Messages if (messages == null) return false; + if (messages.isEmpty()) return false; + + // Here for (CommandSender sender : IdUtil.getLocalSenders()) { this.messageOne(sender, messages); } + + // Return return true; } + // Predicate + // NOTE: Targets messageOne @Override - public boolean messagePredictate(Predictate predictate, Collection messages) + public boolean messagePredictate(Predictate predictate, Collection messages) { + // Check Predicate if (predictate == null) return false; + + // Check Messages if (messages == null) return false; + if (messages.isEmpty()) return false; + + // Here for (CommandSender sender : IdUtil.getLocalSenders()) { if (!predictate.apply(sender)) continue; this.messageOne(sender, messages); } + + // Return return true; } + // One + // NOTE: The core implementation + @SuppressWarnings("unchecked") @Override - public boolean messageOne(Object sendeeObject, Collection messages) + public boolean messageOne(Object sendeeObject, Collection messages) { + // Check Sendee CommandSender sendee = IdUtil.getSender(sendeeObject); if (sendee == null) return false; + + // Check Messages if (messages == null) return false; - sendee.sendMessage(messages.toArray(new String[0])); - return true; - } - - // Raw message aka. JsonString - @Override - public boolean messageRawAll(Collection msons) - { - if (msons == null) return false; - for (CommandSender sender : IdUtil.getLocalSenders()) - { - this.messageRawOne(sender, msons); - } - return true; - } - - @Override - public boolean messageRawPredictate(Predictate predictate, Collection msons) - { - if (predictate == null) return false; - if (msons == null) return false; - for (CommandSender sender : IdUtil.getLocalSenders()) - { - if ( ! predictate.apply(sender)) continue; - this.messageRawOne(sender, msons); - } - return true; - } - - @Override - public boolean messageRawOne(Object sendeeObject, Collection msons) - { - if (msons == null) return false; + if (messages.isEmpty()) return false; - CommandSender sender = IdUtil.getSender(sendeeObject); - if (sender == null) return false; - - if (sender instanceof Player && NmsPacket.get().isAvailable()) + // Type Switch + Object first = messages.iterator().next(); + if (first instanceof String) { - Player player = (Player) sender; - for (Mson mson : msons) + // String + Collection strings = (Collection) messages; + sendee.sendMessage(strings.toArray(new String[0])); + return true; + } + else if (first instanceof Mson) + { + // Mson + Collection msons = (Collection) messages; + if (sendee instanceof Player && NmsPacket.get().isAvailable()) { - NmsPacket.sendRaw(player, mson.toRaw()); + Player player = (Player) sendee; + for (Mson mson : msons) + { + NmsPacket.sendRaw(player, mson.toRaw()); + } } + else + { + for (Mson mson : msons) + { + sendee.sendMessage(mson.toPlain(true)); + } + } + return true; } else { - for (Mson mson : msons) - { - sender.sendMessage(mson.toPlain(true)); - } + throw new IllegalArgumentException("The messages must be either String or Mson."); } - - return true; } } diff --git a/src/com/massivecraft/massivecore/mixin/Mixin.java b/src/com/massivecraft/massivecore/mixin/Mixin.java index 54aca4dd..01693611 100644 --- a/src/com/massivecraft/massivecore/mixin/Mixin.java +++ b/src/com/massivecraft/massivecore/mixin/Mixin.java @@ -234,130 +234,100 @@ public class Mixin // STATIC EXPOSE: MESSAGE // -------------------------------------------- // - // All - public static boolean messageAll(String message) - { - return getMessageMixin().messageAll(message); - } - public static boolean messageAll(String... messages) - { - return getMessageMixin().messageAll(messages); - } - public static boolean messageAll(Collection messages) - { - return getMessageMixin().messageAll(messages); - } - - // Predictate - public static boolean messagePredictate(Predictate predictate, String message) - { - return getMessageMixin().messagePredictate(predictate, message); - } - public static boolean messagePredictate(Predictate predictate, String... messages) - { - return getMessageMixin().messagePredictate(predictate, messages); - } - public static boolean messagePredictate(Predictate predictate, Collection messages) - { - return getMessageMixin().messagePredictate(predictate, messages); - } - - // One - public static boolean messageOne(Object senderObject, String message) - { - return getMessageMixin().messageOne(senderObject, message); - } - public static boolean messageOne(Object senderObject, String... messages) - { - return getMessageMixin().messageOne(senderObject, messages); - } - public static boolean messageOne(Object senderObject, Collection messages) - { - return getMessageMixin().messageOne(senderObject, messages); - } - - // All + // MSG: All public static boolean msgAll(String msg) { return getMessageMixin().msgAll(msg); } + public static boolean msgAll(String msg, Object... args) { return getMessageMixin().msgAll(msg, args); } + public static boolean msgAll(Collection msgs) { return getMessageMixin().msgAll(msgs); } - - // Predictate + + // MSG: Predicate public static boolean msgPredictate(Predictate predictate, String msg) { return getMessageMixin().msgPredictate(predictate, msg); } + public static boolean msgPredictate(Predictate predictate, String msg, Object... args) { return getMessageMixin().msgPredictate(predictate, msg, args); } + public static boolean msgPredictate(Predictate predictate, Collection msgs) { return getMessageMixin().msgPredictate(predictate, msgs); } - - // One - public static boolean msgOne(Object senderObject, String msg) + + // MSG: One + public static boolean msgOne(Object sendeeObject, String msg) { - return getMessageMixin().msgOne(senderObject, msg); - } - public static boolean msgOne(Object senderObject, String msg, Object... args) - { - return getMessageMixin().msgOne(senderObject, msg, args); - } - public static boolean msgOne(Object senderObject, Collection msgs) - { - return getMessageMixin().msgOne(senderObject, msgs); + return getMessageMixin().msgOne(sendeeObject, msg); } - // RAW All - public static boolean messageRawAll(Mson mson) + public static boolean msgOne(Object sendeeObject, String msg, Object... args) { - return getMessageMixin().messageRawAll(mson); - } - public static boolean messageRawAll(Mson... msons) - { - return getMessageMixin().messageRawAll(msons); - } - public static boolean messageRawAll(Collection msons) - { - return getMessageMixin().messageRawAll(msons); + return getMessageMixin().msgOne(sendeeObject, msg, args); } - // RAW Predictate - public static boolean messageRawPredictate(Predictate predictate, Mson mson) + public static boolean msgOne(Object sendeeObject, Collection msgs) { - return getMessageMixin().messageRawPredictate(predictate, mson); + return getMessageMixin().msgOne(sendeeObject, msgs); } - public static boolean messageRawPredictate(Predictate predictate, Mson... msons) + + // MESSAGE: All + public static boolean messageAll(Object message) { - return getMessageMixin().messageRawPredictate(predictate, msons); - } - public static boolean messageRawPredictate(Predictate predictate, Collection msons) - { - return getMessageMixin().messageRawPredictate(predictate, msons); + return getMessageMixin().messageAll(message); } - // RAW One - public static boolean messageRawOne(Object senderObject, Mson mson) + public static boolean messageAll(Object... messages) { - return getMessageMixin().messageRawOne(senderObject, mson); + return getMessageMixin().messageAll(messages); } - public static boolean messageRawOne(Object senderObject, Mson... msons) + + public static boolean messageAll(Collection messages) { - return getMessageMixin().messageRawOne(senderObject, msons); + return getMessageMixin().messageAll(messages); } - public static boolean messageRawOne(Object senderObject, Collection msons) + + // MESSAGE: Predicate + public static boolean messagePredictate(Predictate predictate, Object message) { - return getMessageMixin().messageRawOne(senderObject, msons); + return getMessageMixin().messagePredictate(predictate, message); + } + + public static boolean messagePredictate(Predictate predictate, Object... messages) + { + return getMessageMixin().messagePredictate(predictate, messages); + } + + public static boolean messagePredictate(Predictate predictate, Collection messages) + { + return getMessageMixin().messagePredictate(predictate, messages); + } + + // MESSAGE: One + public static boolean messageOne(Object sendeeObject, Object message) + { + return getMessageMixin().messageOne(sendeeObject, message); + } + + public static boolean messageOne(Object sendeeObject, Object... messages) + { + return getMessageMixin().messageOne(sendeeObject, messages); + } + + public static boolean messageOne(Object sendeeObject, Collection messages) + { + return getMessageMixin().messageOne(sendeeObject, messages); } // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/mson/Mson.java b/src/com/massivecraft/massivecore/mson/Mson.java index 770d9bd2..2fd6186d 100644 --- a/src/com/massivecraft/massivecore/mson/Mson.java +++ b/src/com/massivecraft/massivecore/mson/Mson.java @@ -820,25 +820,25 @@ public class Mson implements Serializable } // -------------------------------------------- // - // SEND + // MESSAGE // -------------------------------------------- // // All - public boolean sendAll() + public boolean messageAll() { - return Mixin.messageRawAll(this); + return Mixin.messageAll(this); } // Predictate - public boolean sendPredictate(Predictate predictate) + public boolean messagePredictate(Predictate predictate) { - return Mixin.messageRawPredictate(predictate, this); + return Mixin.messagePredictate(predictate, this); } // One - public boolean sendOne(Object senderObject) + public boolean messageOne(Object senderObject) { - return Mixin.messageRawOne(senderObject, this); + return Mixin.messageOne(senderObject, this); } // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/pager/Pager.java b/src/com/massivecraft/massivecore/pager/Pager.java index 532f1071..f420d5f6 100644 --- a/src/com/massivecraft/massivecore/pager/Pager.java +++ b/src/com/massivecraft/massivecore/pager/Pager.java @@ -36,6 +36,7 @@ public interface Pager // MSON // -------------------------------------------- // - public List getPageMson(int number, String title, Msonifier msonifier, MassiveCommand command, List args); + public List getPageMson(int number, String title, MassiveCommand command, List args, Msonifier msonifier); + public List getPageMson(int number, String title, MassiveCommand command, Msonifier msonifier); } diff --git a/src/com/massivecraft/massivecore/pager/PagerAbstract.java b/src/com/massivecraft/massivecore/pager/PagerAbstract.java index e9eec2e8..716927e3 100644 --- a/src/com/massivecraft/massivecore/pager/PagerAbstract.java +++ b/src/com/massivecraft/massivecore/pager/PagerAbstract.java @@ -13,11 +13,13 @@ public abstract class PagerAbstract implements Pager // CORE // -------------------------------------------- // + @Override public int size() { return (int) Math.ceil((double) this.getItems().size() / this.getItemsPerPage()); } + @Override public boolean isValid(int number) { if (this.isEmpty()) return false; @@ -26,6 +28,7 @@ public abstract class PagerAbstract implements Pager return true; } + @Override public boolean isEmpty() { return this.getItems().isEmpty(); @@ -66,11 +69,13 @@ public abstract class PagerAbstract implements Pager // TXT // -------------------------------------------- // + @Override public String getMessageEmpty() { return Txt.getMessageEmpty().toPlain(true); } + @Override public String getMessageInvalid() { return Txt.getMessageInvalid(this.size()).toPlain(true); @@ -81,7 +86,7 @@ public abstract class PagerAbstract implements Pager { List ret = new ArrayList(); - List msons = getPageMson(number, title, new Msonifier(){ + List msons = getPageMson(number, title, null, null, new Msonifier(){ @Override public Mson toMson(T item, int index) @@ -89,7 +94,7 @@ public abstract class PagerAbstract implements Pager return Mson.mson(stringifier.toString(item, index)); } - }, null, null); + }); for (Mson mson : msons) { @@ -103,7 +108,8 @@ public abstract class PagerAbstract implements Pager // Mson // -------------------------------------------- // - public List getPageMson(int number, String title, Msonifier msonifier, MassiveCommand command, List args) + @Override + public List getPageMson(int number, String title, MassiveCommand command, List args, Msonifier msonifier) { List ret = new ArrayList(); @@ -140,4 +146,10 @@ public abstract class PagerAbstract implements Pager return ret; } + @Override + public List getPageMson(int number, String title, MassiveCommand command, Msonifier msonifier) + { + return this.getPageMson(number, title, command, command.getArgs(), msonifier); + } + } diff --git a/src/com/massivecraft/massivecore/store/SenderEntity.java b/src/com/massivecraft/massivecore/store/SenderEntity.java index b33e026b..2c199ac1 100644 --- a/src/com/massivecraft/massivecore/store/SenderEntity.java +++ b/src/com/massivecraft/massivecore/store/SenderEntity.java @@ -59,7 +59,7 @@ public abstract class SenderEntity> extends Entity } // -------------------------------------------- // - // SENDER UTIL METHOD MIRRORING + // TYPE // -------------------------------------------- // // IS @@ -86,8 +86,11 @@ public abstract class SenderEntity> extends Entity return IdUtil.getAsConsole(this.getSender()); } + // -------------------------------------------- // // ONLINE / OFFLINE - + // -------------------------------------------- // + // TODO: Update with new presence enumeration? + public boolean isOnline() { return Mixin.isOnline(this.getId()); @@ -113,8 +116,11 @@ public abstract class SenderEntity> extends Entity return Mixin.hasPlayedBefore(this.getId()); } + // -------------------------------------------- // // DISPLAY NAME + // -------------------------------------------- // + // TODO: Remove this one shortly. @Deprecated public String getDisplayName() { @@ -131,24 +137,11 @@ public abstract class SenderEntity> extends Entity return Mixin.getDisplayNameMson(this.getId(), watcherObject); } - // CONVENIENCE SEND MESSAGE + // -------------------------------------------- // + // MSG / MESSAGE + // -------------------------------------------- // - public boolean sendMessage(String message) - { - return Mixin.messageOne(this.getId(), message); - } - - public boolean sendMessage(String... messages) - { - return Mixin.messageOne(this.getId(), messages); - } - - public boolean sendMessage(Collection messages) - { - return Mixin.messageOne(this.getId(), messages); - } - - // CONVENIENCE MSG + // MSG public boolean msg(String msg) { @@ -165,24 +158,26 @@ public abstract class SenderEntity> extends Entity return Mixin.msgOne(this.getId(), msgs); } - // CONVENIENCE SEND RAW + // MESSAGE - public boolean sendRaw(Mson mson) + public boolean message(Object message) { - return Mixin.messageRawOne(this.getId(), mson); + return Mixin.messageOne(this.getId(), message); } - public boolean sendRaw(Mson... msons) + public boolean message(Object... messages) { - return Mixin.messageRawOne(this.getId(), msons); + return Mixin.messageOne(this.getId(), messages); } - public boolean sendRaw(Collection msons) + public boolean message(Collection messages) { - return Mixin.messageRawOne(this.getId(), msons); + return Mixin.messageOne(this.getId(), messages); } - // CONVENIENCE GAME-MODE + // -------------------------------------------- // + // GAME-MODE + // -------------------------------------------- // public GameMode getGameMode(GameMode def) {