diff --git a/src/main/java/com/falsepattern/lib/mixin/IMixin.java b/src/main/java/com/falsepattern/lib/mixin/IMixin.java index f8538b9..6ba6516 100644 --- a/src/main/java/com/falsepattern/lib/mixin/IMixin.java +++ b/src/main/java/com/falsepattern/lib/mixin/IMixin.java @@ -21,27 +21,28 @@ public interface IMixin { && getFilter().test(loadedMods); } - static Predicate> never() { - return (list) -> false; - } + final class PredicateHelpers { + public static Predicate> never() { + return (list) -> false; + } - static Predicate> condition(Supplier condition) { - return (list) -> condition.get(); - } + public static Predicate> condition(Supplier condition) { + return (list) -> condition.get(); + } - static Predicate> always() { - return (list) -> true; - } + public static Predicate> always() { + return (list) -> true; + } - static Predicate> require(ITargetedMod mod) { - return (list) -> list.contains(mod); - } + public static Predicate> require(ITargetedMod mod) { + return (list) -> list.contains(mod); + } - static Predicate> avoid(ITargetedMod mod) { - return (list) -> !list.contains(mod); + public static Predicate> avoid(ITargetedMod mod) { + return (list) -> !list.contains(mod); + } } - enum Side { COMMON, CLIENT, diff --git a/src/main/java/com/falsepattern/lib/mixin/ITargetedMod.java b/src/main/java/com/falsepattern/lib/mixin/ITargetedMod.java index 6432bfa..472cff3 100644 --- a/src/main/java/com/falsepattern/lib/mixin/ITargetedMod.java +++ b/src/main/java/com/falsepattern/lib/mixin/ITargetedMod.java @@ -6,15 +6,6 @@ import java.nio.file.Path; import java.util.function.Predicate; public interface ITargetedMod { - static Predicate startsWith(String subString) { - return (name) -> name.startsWith(subString); - } - static Predicate contains(String subString) { - return (name) -> name.contains(subString); - } - static Predicate matches(String regex) { - return (name) -> name.matches(regex); - } String getModName(); Predicate getCondition(); @@ -28,7 +19,17 @@ public interface ITargetedMod { return "jar".equals(fileExtension) && getCondition().test(nameLowerCase); } - default String toStringDefault() { - return String.format("TargetedMod{%s}", getModName()); + final class PredicateHelpers { + public static Predicate startsWith(String subString) { + return (name) -> name.startsWith(subString); + } + + public static Predicate contains(String subString) { + return (name) -> name.contains(subString); + } + + public static Predicate matches(String regex) { + return (name) -> name.matches(regex); + } } }