diff --git a/module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/builders/AbstractBuilder.java b/module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/builders/AbstractBuilder.java index d0a3852..0378a25 100644 --- a/module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/builders/AbstractBuilder.java +++ b/module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/builders/AbstractBuilder.java @@ -14,16 +14,20 @@ import java.util.Iterator; import java.util.List; import java.util.Objects; import java.util.Set; +import java.util.function.BooleanSupplier; import java.util.function.Supplier; @SuppressWarnings("ForLoopReplaceableByForEach") public abstract class AbstractBuilder { + private static final BooleanSupplier TRUE = () -> true; protected @Nullable List commonClasses; protected @Nullable List clientClasses; protected @Nullable List serverClasses; protected @Nullable List requiredMods; + protected @Nullable List requiredModsCond; protected @Nullable List excludedMods; + protected @Nullable List excludedModsCond; protected @Nullable Phase phase; protected @Nonnull Supplier applyIf = () -> true; @@ -69,16 +73,30 @@ public abstract class AbstractBuilder { } protected AbstractBuilder addRequiredMod(@Nonnull ITargetMod mod) { + return addRequiredModIf(mod, TRUE); + } + + protected AbstractBuilder addRequiredModIf(@Nonnull ITargetMod mod, @Nonnull BooleanSupplier condition) { Objects.requireNonNull(mod); + Objects.requireNonNull(condition); if (requiredMods == null) requiredMods = new ArrayList<>(2); + if (requiredModsCond == null) requiredModsCond = new ArrayList<>(2); requiredMods.add(mod); + requiredModsCond.add(condition); return this; } protected AbstractBuilder addExcludedMod(@Nonnull ITargetMod mod) { + return addExcludedModIf(mod, TRUE); + } + + protected AbstractBuilder addExcludedModIf(@Nonnull ITargetMod mod, @Nonnull BooleanSupplier condition) { Objects.requireNonNull(mod); + Objects.requireNonNull(condition); if (excludedMods == null) excludedMods = new ArrayList<>(2); + if (excludedModsCond == null) excludedModsCond = new ArrayList<>(2); excludedMods.add(mod); + excludedModsCond.add(condition); return this; } @@ -102,8 +120,12 @@ public abstract class AbstractBuilder { } protected void addAllTargetsTo(Set set) { - if (requiredMods != null) set.addAll(requiredMods); - if (excludedMods != null) set.addAll(excludedMods); + if (requiredMods != null) { + set.addAll(requiredMods); + } + if (excludedMods != null) { + set.addAll(excludedMods); + } } protected boolean shouldLoad(Set loadedTargets) { @@ -112,7 +134,10 @@ public abstract class AbstractBuilder { protected boolean allRequiredModsPresent(Set loadedTargets) { if (requiredMods == null) return true; + boolean hasCond = requiredModsCond != null; for (int i = 0; i < requiredMods.size(); i++) { + if (hasCond && !requiredModsCond.get(i).getAsBoolean()) + continue; if (!loadedTargets.contains(requiredMods.get(i))) return false; } return true; @@ -120,7 +145,10 @@ public abstract class AbstractBuilder { protected boolean noExcludedModsPresent(Set loadedTargets) { if (excludedMods == null) return true; + boolean hasCond = excludedModsCond != null; for (int i = 0; i < excludedMods.size(); i++) { + if (hasCond && !excludedModsCond.get(i).getAsBoolean()) + continue; if (loadedTargets.contains(excludedMods.get(i))) return false; } return true; diff --git a/module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/builders/MixinBuilder.java b/module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/builders/MixinBuilder.java index 8d03f8e..0e4638a 100644 --- a/module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/builders/MixinBuilder.java +++ b/module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/builders/MixinBuilder.java @@ -8,6 +8,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Set; +import java.util.function.BooleanSupplier; import java.util.function.Supplier; @SuppressWarnings("unused") @@ -61,6 +62,14 @@ public class MixinBuilder extends AbstractBuilder { return (MixinBuilder) super.addRequiredMod(mod); } + /** + * Specify mods that are required to be present for this mixin to load and the condition is true. The condition is evaluated lazily during mixin loading. + */ + @Override + public MixinBuilder addRequiredModIf(@Nonnull ITargetMod mod, @Nonnull BooleanSupplier condition) { + return (MixinBuilder) super.addExcludedModIf(mod, condition); + } + /** * Specify mods that will disable this mixin if they are present */ @@ -70,11 +79,11 @@ public class MixinBuilder extends AbstractBuilder { } /** - * Specify mods that will disable this mixin if they are present and the condition is true. + * Specify mods that will disable this mixin if they are present and the condition is true. The condition is evaluated lazily during mixin loading. */ - public MixinBuilder addExcludedModIf(@Nonnull ITargetMod mod, boolean condition) { - if (condition) return (MixinBuilder) super.addExcludedMod(mod); - return this; + @Override + public MixinBuilder addExcludedModIf(@Nonnull ITargetMod mod, @Nonnull BooleanSupplier condition) { + return (MixinBuilder) super.addExcludedModIf(mod, condition); } /** diff --git a/module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/builders/TransformerBuilder.java b/module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/builders/TransformerBuilder.java index 94e4b64..69cf3f7 100644 --- a/module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/builders/TransformerBuilder.java +++ b/module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/builders/TransformerBuilder.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Set; +import java.util.function.BooleanSupplier; import java.util.function.Supplier; public class TransformerBuilder extends AbstractBuilder { @@ -58,6 +59,14 @@ public class TransformerBuilder extends AbstractBuilder { return (TransformerBuilder) super.addRequiredMod(mod); } + /** + * Specify mods that are required to be present for this transformer to load and the condition is true. The condition is evaluated lazily during transformer loading. + */ + @Override + public TransformerBuilder addRequiredModIf(@Nonnull ITargetMod mod, @Nonnull BooleanSupplier condition) { + return (TransformerBuilder) super.addExcludedModIf(mod, condition); + } + /** * Specify mods that will disable this transformer if they are present */ @@ -65,12 +74,13 @@ public class TransformerBuilder extends AbstractBuilder { return (TransformerBuilder) super.addExcludedMod(mod); } + /** - * Specify mods that will disable this transformer if they are present and the condition is true. + * Specify mods that will disable this transformer if they are present and the condition is true. The condition is evaluated lazily during transformer loading. */ - public TransformerBuilder addExcludedModIf(@Nonnull ITargetMod mod, boolean condition) { - if (condition) return (TransformerBuilder) super.addExcludedMod(mod); - return this; + @Override + public TransformerBuilder addExcludedModIf(@Nonnull ITargetMod mod, @Nonnull BooleanSupplier condition) { + return (TransformerBuilder) super.addExcludedModIf(mod, condition); } protected static & ITransformers> void loadTransformers(Class transformerEnum, List toLoad, List toNotLoad) {