Skip to content

Commit 320d010

Browse files
committed
make utility methods separate classes, removing downstream boilerplate
1 parent e746830 commit 320d010

File tree

2 files changed

+32
-30
lines changed

2 files changed

+32
-30
lines changed

src/main/java/com/falsepattern/lib/mixin/IMixin.java

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,28 @@ default boolean shouldLoad(List<ITargetedMod> loadedMods) {
2121
&& getFilter().test(loadedMods);
2222
}
2323

24-
static Predicate<List<ITargetedMod>> never() {
25-
return (list) -> false;
24+
final class PredicateHelpers {
25+
public static Predicate<List<ITargetedMod>> never() {
26+
return (list) -> false;
27+
}
28+
29+
public static Predicate<List<ITargetedMod>> condition(Supplier<Boolean> condition) {
30+
return (list) -> condition.get();
31+
}
32+
33+
public static Predicate<List<ITargetedMod>> always() {
34+
return (list) -> true;
35+
}
36+
37+
public static Predicate<List<ITargetedMod>> require(ITargetedMod mod) {
38+
return (list) -> list.contains(mod);
39+
}
40+
41+
public static Predicate<List<ITargetedMod>> avoid(ITargetedMod mod) {
42+
return (list) -> !list.contains(mod);
43+
}
2644
}
2745

28-
static Predicate<List<ITargetedMod>> condition(Supplier<Boolean> condition) {
29-
return (list) -> condition.get();
30-
}
31-
32-
static Predicate<List<ITargetedMod>> always() {
33-
return (list) -> true;
34-
}
35-
36-
static Predicate<List<ITargetedMod>> require(ITargetedMod mod) {
37-
return (list) -> list.contains(mod);
38-
}
39-
40-
static Predicate<List<ITargetedMod>> avoid(ITargetedMod mod) {
41-
return (list) -> !list.contains(mod);
42-
}
43-
44-
4546
enum Side {
4647
COMMON,
4748
CLIENT,

src/main/java/com/falsepattern/lib/mixin/ITargetedMod.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,6 @@
66
import java.util.function.Predicate;
77

88
public interface ITargetedMod {
9-
static Predicate<String> startsWith(String subString) {
10-
return (name) -> name.startsWith(subString);
11-
}
12-
static Predicate<String> contains(String subString) {
13-
return (name) -> name.contains(subString);
14-
}
15-
static Predicate<String> matches(String regex) {
16-
return (name) -> name.matches(regex);
17-
}
189

1910
String getModName();
2011
Predicate<String> getCondition();
@@ -28,7 +19,17 @@ default boolean isMatchingJar(Path path) {
2819
return "jar".equals(fileExtension) && getCondition().test(nameLowerCase);
2920
}
3021

31-
default String toStringDefault() {
32-
return String.format("TargetedMod{%s}", getModName());
22+
final class PredicateHelpers {
23+
public static Predicate<String> startsWith(String subString) {
24+
return (name) -> name.startsWith(subString);
25+
}
26+
27+
public static Predicate<String> contains(String subString) {
28+
return (name) -> name.contains(subString);
29+
}
30+
31+
public static Predicate<String> matches(String regex) {
32+
return (name) -> name.matches(regex);
33+
}
3334
}
3435
}

0 commit comments

Comments
 (0)