Skip to content

stop allocating an applyIf by default #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

stop allocating an applyIf by default #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/builders/AbstractBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public abstract class AbstractBuilder {
protected @Nullable List<ITargetMod> requiredMods;
protected @Nullable List<ITargetMod> excludedMods;
protected @Nullable Phase phase;
protected @Nonnull Supplier<Boolean> applyIf = () -> true;
protected @Nullable Supplier<Boolean> applyIf;

protected AbstractBuilder addCommonClasses(@Nonnull String... classes) {
Objects.requireNonNull(classes);
Expand Down
2 changes: 1 addition & 1 deletion module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/builders/MixinBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ private static <E extends Enum<E> & IMixins> List<AbstractBuilder> getEnabledBui
MixinBuilder builder = mixin.getBuilder();
validateBuilder(builder, mixin, loadingPhase != null);
if (builder.phase != loadingPhase) continue;
if (builder.applyIf.get()) {
if (builder.applyIf == null || builder.applyIf.get()) {
list.add(builder);
} else {
builder.addAllClassesTo(toNotLoad);
Expand Down
2 changes: 1 addition & 1 deletion module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/builders/TransformerBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ private static <E extends Enum<E> & ITransformers> List<AbstractBuilder> getEnab
for (E transformer : constants) {
TransformerBuilder builder = transformer.getBuilder();
validateBuilder(builder, transformer);
if (builder.applyIf.get()) {
if (builder.applyIf == null || builder.applyIf.get()) {
list.add(builder);
} else {
builder.addAllClassesTo(toNotLoad);
Expand Down