Skip to content

Fix: Overhaul initialiser merging and targeting for new mixins. #197

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
LlamaLad7 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix: Overhaul initialiser merging and targeting for new mixins. #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2bf42e8
Refactor: Make phased Mixin application more flexible.
LlamaLad7 Feb 8, 2026
9b9fa9e
Fix: Overhaul initialiser merging and targeting for new mixins.
LlamaLad7 Feb 8, 2026
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
19 changes: 17 additions & 2 deletions src/main/java/org/spongepowered/asm/mixin/FabricUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@
package org.spongepowered.asm.mixin;

import org.spongepowered.asm.mixin.extensibility.IMixinConfig;
import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
import org.spongepowered.asm.mixin.injection.selectors.ISelectorContext;
import org.spongepowered.asm.mixin.refmap.IMixinContext;

public final class FabricUtil {
public static final String KEY_MOD_ID = "fabric-modId";
Expand Down Expand Up @@ -59,10 +61,15 @@ public final class FabricUtil {
*/
public static final int COMPATIBILITY_0_17_0 = 17000; // 0.17.0+mixin.0.8.7

/**
* Fabric compatibility version 0.17.1
*/
public static final int COMPATIBILITY_0_17_1 = 17001; // 0.17.1+mixin.0.8.7

/**
* Latest compatibility version
*/
public static final int COMPATIBILITY_LATEST = COMPATIBILITY_0_17_0;
public static final int COMPATIBILITY_LATEST = COMPATIBILITY_0_17_1;

public static String getModId(IMixinConfig config) {
return getModId(config, "(unknown)");
Expand All @@ -77,7 +84,15 @@ public static String getModId(ISelectorContext context) {
}

public static int getCompatibility(ISelectorContext context) {
return getDecoration(getConfig(context), KEY_COMPATIBILITY, COMPATIBILITY_LATEST);
return getCompatibility(getConfig(context));
}

public static int getCompatibility(IMixinContext context) {
return getCompatibility(context.getMixin().getConfig());
}

private static int getCompatibility(IMixinConfig config) {
return getDecoration(config, KEY_COMPATIBILITY, COMPATIBILITY_LATEST);
}

private static IMixinConfig getConfig(ISelectorContext context) {
Expand Down
14 changes: 8 additions & 6 deletions src/main/java/org/spongepowered/asm/mixin/transformer/MixinApplicatorInterface.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@
package org.spongepowered.asm.mixin.transformer;

import java.util.Map.Entry;
import java.util.function.Supplier;

import org.objectweb.asm.tree.FieldNode;
import org.objectweb.asm.tree.MethodNode;
import org.spongepowered.asm.mixin.MixinEnvironment.Feature;
import org.spongepowered.asm.mixin.injection.struct.InjectionInfo;
import org.spongepowered.asm.mixin.injection.throwables.InvalidInjectionException;
import org.spongepowered.asm.mixin.transformer.ClassInfo.Field;
import org.spongepowered.asm.mixin.transformer.struct.Clinit;
import org.spongepowered.asm.mixin.transformer.throwables.InvalidInterfaceMixinException;
import org.spongepowered.asm.util.Annotations;
import org.spongepowered.asm.util.Constants;

/**
* Applicator for interface mixins, mainly just disables things which aren't
Expand Down Expand Up @@ -97,11 +97,13 @@ protected void mergeNewFields(MixinTargetContext mixin) {
}

@Override
protected void applyNormalMethod(MixinTargetContext mixin, MethodNode mixinMethod) {
protected void applyClinitLegacy(MixinTargetContext mixin) {
//Skip merging static blocks, the only contents will be setting shadowed fields
}

@Override
protected void applyClinit(MixinTargetContext mixin, Supplier<Clinit> clinit) {
//Skip merging static blocks, the only contents will be setting shadowed fields
if (!Constants.CLINIT.equals(mixinMethod.name)) {
super.applyNormalMethod(mixin, mixinMethod);
}
}

/* (non-Javadoc)
Expand Down
Loading