diff --git a/src/com/massivecraft/massivecore/Integration.java b/src/com/massivecraft/massivecore/Integration.java index 56cb3644..7035adce 100644 --- a/src/com/massivecraft/massivecore/Integration.java +++ b/src/com/massivecraft/massivecore/Integration.java @@ -1,7 +1,6 @@ package com.massivecraft.massivecore; import com.massivecraft.massivecore.collections.MassiveList; -import com.massivecraft.massivecore.predicate.Predicate; import com.massivecraft.massivecore.predicate.PredicateIntegration; import com.massivecraft.massivecore.util.Txt; import org.bukkit.event.EventHandler; @@ -13,6 +12,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; +import java.util.function.Predicate; public class Integration extends Engine { @@ -56,7 +56,7 @@ public class Integration extends Engine // Calc if (integrationActive == null) { - integrationActive = this.getPredicate().apply(this); + integrationActive = this.getPredicate().test(this); } // NoChange diff --git a/src/com/massivecraft/massivecore/command/requirement/Requirement.java b/src/com/massivecraft/massivecore/command/requirement/Requirement.java index ce7f2dd7..9b46891b 100644 --- a/src/com/massivecraft/massivecore/command/requirement/Requirement.java +++ b/src/com/massivecraft/massivecore/command/requirement/Requirement.java @@ -1,9 +1,10 @@ package com.massivecraft.massivecore.command.requirement; import com.massivecraft.massivecore.command.MassiveCommand; -import com.massivecraft.massivecore.predicate.Predicate; import org.bukkit.command.CommandSender; +import java.util.function.Predicate; + public interface Requirement extends Predicate { boolean apply(CommandSender sender, MassiveCommand command); diff --git a/src/com/massivecraft/massivecore/command/requirement/RequirementAbstract.java b/src/com/massivecraft/massivecore/command/requirement/RequirementAbstract.java index 05e09a95..27de2d5a 100644 --- a/src/com/massivecraft/massivecore/command/requirement/RequirementAbstract.java +++ b/src/com/massivecraft/massivecore/command/requirement/RequirementAbstract.java @@ -15,7 +15,7 @@ public abstract class RequirementAbstract implements Requirement, Serializable // -------------------------------------------- // @Override - public boolean apply(CommandSender sender) + public boolean test(CommandSender sender) { return this.apply(sender, null); } diff --git a/src/com/massivecraft/massivecore/event/EventMassiveCoreLorePriority.java b/src/com/massivecraft/massivecore/event/EventMassiveCoreLorePriority.java index d4f820c0..7c1cea13 100644 --- a/src/com/massivecraft/massivecore/event/EventMassiveCoreLorePriority.java +++ b/src/com/massivecraft/massivecore/event/EventMassiveCoreLorePriority.java @@ -1,7 +1,6 @@ package com.massivecraft.massivecore.event; import com.massivecraft.massivecore.collections.MassiveList; -import com.massivecraft.massivecore.predicate.Predicate; import org.bukkit.ChatColor; import org.bukkit.event.HandlerList; import org.bukkit.inventory.ItemStack; @@ -85,12 +84,6 @@ public class EventMassiveCoreLorePriority extends EventMassiveCore } } - @Deprecated - public void setPriorityByPredicate(Predicate predicate, int priority) - { - setPriorityByPredicate((java.util.function.Predicate) predicate, priority); - } - public void setPriorityByPrefix(final String prefix, int priority) { java.util.function.Predicate predicate = prefix::startsWith; diff --git a/src/com/massivecraft/massivecore/mson/Mson.java b/src/com/massivecraft/massivecore/mson/Mson.java index 7c361885..7841a9f0 100644 --- a/src/com/massivecraft/massivecore/mson/Mson.java +++ b/src/com/massivecraft/massivecore/mson/Mson.java @@ -11,7 +11,6 @@ import com.massivecraft.massivecore.adapter.AdapterMsonEventFix; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.command.MassiveCommand; import com.massivecraft.massivecore.mixin.MixinMessage; -import com.massivecraft.massivecore.predicate.Predicate; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.Txt; import org.apache.commons.lang.mutable.MutableInt; @@ -26,6 +25,7 @@ import java.util.Collection; import java.util.List; import java.util.ListIterator; import java.util.Objects; +import java.util.function.Predicate; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/com/massivecraft/massivecore/store/EntityContainer.java b/src/com/massivecraft/massivecore/store/EntityContainer.java index ef2b27e6..bfead675 100644 --- a/src/com/massivecraft/massivecore/store/EntityContainer.java +++ b/src/com/massivecraft/massivecore/store/EntityContainer.java @@ -1,7 +1,5 @@ package com.massivecraft.massivecore.store; -import com.massivecraft.massivecore.predicate.Predicate; - import java.util.Collection; import java.util.Comparator; import java.util.List; @@ -73,21 +71,6 @@ public interface EntityContainer List getAll(Integer limit, Integer offset); List getAll(Integer limit); - // OLD PREDICATE - @Deprecated List getAll(Predicate where, Comparator orderby, Integer limit, Integer offset); - @Deprecated List getAll(Predicate where, Comparator orderby, Integer limit); - @Deprecated List getAll(Predicate where, Comparator orderby); - @Deprecated List getAll(Predicate where, Integer limit, Integer offset); - @Deprecated List getAll(Predicate where, Integer limit); - @Deprecated List getAll(Predicate where); - - @Deprecated List getAll(Iterable oids, Predicate where, Comparator orderby, Integer limit, Integer offset); - @Deprecated List getAll(Iterable oids, Predicate where, Comparator orderby, Integer limit); - @Deprecated List getAll(Iterable oids, Predicate where, Comparator orderby); - @Deprecated List getAll(Iterable oids, Predicate where, Integer limit, Integer offset); - @Deprecated List getAll(Iterable oids, Predicate where, Integer limit); - @Deprecated List getAll(Iterable oids, Predicate where); - // -------------------------------------------- // // BEHAVIOR // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/store/EntityContainerAbstract.java b/src/com/massivecraft/massivecore/store/EntityContainerAbstract.java index 6a284141..72a49062 100644 --- a/src/com/massivecraft/massivecore/store/EntityContainerAbstract.java +++ b/src/com/massivecraft/massivecore/store/EntityContainerAbstract.java @@ -144,21 +144,6 @@ public abstract class EntityContainerAbstract> imple @Override public List getAll(Comparator orderby) { return MUtil.transform(this.getAll(), orderby); } @Override public List getAll(Integer limit, Integer offset) { return MUtil.transform(this.getAll(), limit, offset); } @Override public List getAll(Integer limit) { return MUtil.transform(this.getAll(), limit); } - - // OLD PREDICATE - @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); } - - @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 diff --git a/src/com/massivecraft/massivecore/util/MUtil.java b/src/com/massivecraft/massivecore/util/MUtil.java index 77cec461..b23a0191 100644 --- a/src/com/massivecraft/massivecore/util/MUtil.java +++ b/src/com/massivecraft/massivecore/util/MUtil.java @@ -1408,12 +1408,6 @@ public class MUtil // TRANSFORM // -------------------------------------------- // - @Deprecated - public static List transform(Iterable items, com.massivecraft.massivecore.predicate.Predicate where, Comparator orderby, Integer limit, Integer offset) - { - return transform(items, (Predicate) where, orderby, limit, offset); - } - public static List transform(Iterable items, Predicate where, Comparator orderby, Integer limit, Integer offset) { // Collection @@ -1511,13 +1505,6 @@ public class MUtil public static List transform(Iterable items, Comparator orderby, Integer limit, Integer offset) { return transform(items, null, orderby, limit, offset); } public static List transform(Iterable items, Integer limit) { return transform(items, null, null, limit, null); } public static List transform(Iterable items, Integer limit, Integer offset) { return transform(items, null, null, limit, offset); } - - // OLD PREDICATE - @Deprecated public static List transform(Iterable items, com.massivecraft.massivecore.predicate.Predicate where) { return transform(items, where, null, null, null); } - @Deprecated public static List transform(Iterable items, com.massivecraft.massivecore.predicate.Predicate where, Comparator orderby) { return transform(items, where, orderby, null, null); } - @Deprecated public static List transform(Iterable items, com.massivecraft.massivecore.predicate.Predicate where, Comparator orderby, Integer limit) { return transform(items, where, orderby, limit, null); } - @Deprecated public static List transform(Iterable items, com.massivecraft.massivecore.predicate.Predicate where, Integer limit) { return transform(items, where, null, limit, null); } - @Deprecated public static List transform(Iterable items, com.massivecraft.massivecore.predicate.Predicate where, Integer limit, Integer offset) { return transform(items, where, null, limit, offset); } // -------------------------------------------- // // SIMPLE CONSTRUCTORS