Skip to content

Fix accessor case sensitivity #221

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

Fix accessor case sensitivity #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9907862
Prioritize exact matches
kevinthegreat1 Jul 11, 2026
c9656c3
Stream is a bit nicer here
kevinthegreat1 Jul 11, 2026
1d63d85
Gate priority fixes
kevinthegreat1 Jul 11, 2026
9c74356
Pass mixin context
kevinthegreat1 Jul 11, 2026
f795ac4
Add candidates before throwing below min
kevinthegreat1 Jul 11, 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
7 changes: 6 additions & 1 deletion 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 @@ -66,10 +66,15 @@ public final class FabricUtil {
*/
public static final int COMPATIBILITY_0_17_1 = 17001; // 0.17.1+mixin.0.8.7

/**
* Fabric compatibility version 0.17.4
*/
public static final int COMPATIBILITY_0_17_4 = 17004; // 0.17.4+mixin.0.8.7

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

public static String getModId(IMixinConfig config) {
return getModId(config, "(unknown)");
Expand Down
23 changes: 9 additions & 14 deletions src/main/java/org/spongepowered/asm/mixin/gen/AccessorInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,9 @@
*/
package org.spongepowered.asm.mixin.gen;

import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import com.google.common.base.Joiner;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
import org.objectweb.asm.Type;
import org.objectweb.asm.tree.FieldNode;
import org.objectweb.asm.tree.MethodNode;
Expand All @@ -41,8 +35,8 @@
import org.spongepowered.asm.mixin.injection.selectors.ElementNode;
import org.spongepowered.asm.mixin.injection.selectors.ISelectorContext;
import org.spongepowered.asm.mixin.injection.selectors.ITargetSelector;
import org.spongepowered.asm.mixin.injection.selectors.TargetSelector;
import org.spongepowered.asm.mixin.injection.selectors.ITargetSelector.Configure;
import org.spongepowered.asm.mixin.injection.selectors.TargetSelector;
import org.spongepowered.asm.mixin.injection.selectors.TargetSelector.Result;
import org.spongepowered.asm.mixin.injection.struct.MemberInfo;
import org.spongepowered.asm.mixin.struct.SpecialMethodInfo;
Expand All @@ -52,9 +46,10 @@
import org.spongepowered.asm.util.Bytecode;
import org.spongepowered.asm.util.asm.MethodNodeEx;

import com.google.common.base.Joiner;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
import java.lang.annotation.Annotation;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
* Information about an accessor
Expand Down Expand Up @@ -511,7 +506,7 @@ private FieldNode findTargetField() {
* @return best match
*/
protected <TNode> TNode findTarget(List<ElementNode<TNode>> nodes) {
Result<TNode> result = TargetSelector.<TNode>run(this.target.configure(Configure.ORPHAN), nodes);
Result<TNode> result = TargetSelector.<TNode>run(this.mixin, this.target.configure(Configure.ORPHAN), nodes);

try {
return result.getSingleResult(true);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/spongepowered/asm/mixin/gen/InvokerInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public void locate() {
}

private MethodNode findTargetMethod() {
Result<MethodNode> result = TargetSelector.<MethodNode>run(this.target.configure(Configure.ORPHAN),
Result<MethodNode> result = TargetSelector.<MethodNode>run(this.mixin, this.target.configure(Configure.ORPHAN),
ElementNode.methodList(this.classNode));

try {
Expand Down
87 changes: 41 additions & 46 deletions src/main/java/org/spongepowered/asm/mixin/injection/selectors/TargetSelector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,37 +24,33 @@
*/
package org.spongepowered.asm.mixin.injection.selectors;

import java.lang.annotation.Annotation;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import javax.tools.Diagnostic.Kind;

import com.google.common.base.Strings;
import org.objectweb.asm.Type;
import org.objectweb.asm.tree.AnnotationNode;
import org.spongepowered.asm.mixin.FabricUtil;
import org.spongepowered.asm.mixin.injection.selectors.ITargetSelectorDynamic.SelectorAnnotation;
import org.spongepowered.asm.mixin.injection.selectors.ITargetSelectorDynamic.SelectorId;
import org.spongepowered.asm.mixin.injection.selectors.dynamic.DynamicSelectorDesc;
import org.spongepowered.asm.mixin.injection.selectors.throwables.SelectorConstraintException;
import org.spongepowered.asm.mixin.injection.struct.MemberInfo;
import org.spongepowered.asm.mixin.refmap.IMixinContext;
import org.spongepowered.asm.mixin.throwables.MixinError;
import org.spongepowered.asm.mixin.throwables.MixinException;
import org.spongepowered.asm.util.Annotations;
import org.spongepowered.asm.util.asm.IAnnotationHandle;
import org.spongepowered.asm.util.logging.MessageRouter;

import com.google.common.base.Strings;
import javax.tools.Diagnostic.Kind;
import java.lang.annotation.Annotation;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;

/**
* Utility class for parsing selectors
Expand Down Expand Up @@ -450,32 +446,34 @@ public static String parseName(String name, ISelectorContext context) {

/**
* Run query on supplied target nodes
*
*
* @param mixin context
* @param selector Target selector
* @param nodes Node collection to enumerate
* @param <TNode> Node type
* @return query result
*/
public static <TNode> Result<TNode> run(ITargetSelector selector, Iterable<ElementNode<TNode>> nodes) {
public static <TNode> Result<TNode> run(IMixinContext mixin, ITargetSelector selector, Iterable<ElementNode<TNode>> nodes) {
List<ElementNode<TNode>> candidates = new ArrayList<ElementNode<TNode>>();
ElementNode<TNode> exactMatch = TargetSelector.runSelector(selector, nodes, candidates);
ElementNode<TNode> exactMatch = TargetSelector.runSelector(mixin, selector, nodes, candidates);
return new Result<TNode>(exactMatch, candidates);
}

/**
* Run query on supplied target nodes
*
*
* @param mixin context
* @param selector Target selector
* @param nodes Node collection to enumerate
* @param <TNode> Node type
* @return query result
*/
public static <TNode> Result<TNode> run(Iterable<ITargetSelector> selector, Iterable<ElementNode<TNode>> nodes) {
public static <TNode> Result<TNode> run(IMixinContext mixin, Iterable<ITargetSelector> selector, Iterable<ElementNode<TNode>> nodes) {
ElementNode<TNode> exactMatch = null;
List<ElementNode<TNode>> candidates = new ArrayList<ElementNode<TNode>>();

for (ITargetSelector target : selector) {
ElementNode<TNode> selectorExactMatch = TargetSelector.runSelector(target, nodes, candidates);
ElementNode<TNode> selectorExactMatch = TargetSelector.runSelector(mixin, target, nodes, candidates);
if (exactMatch == null) {
exactMatch = selectorExactMatch;
}
Expand All @@ -484,33 +482,30 @@ public static <TNode> Result<TNode> run(Iterable<ITargetSelector> selector, Iter
return new Result<TNode>(exactMatch, candidates);
}

private static <TNode> ElementNode<TNode> runSelector(ITargetSelector selector, Iterable<ElementNode<TNode>> nodes,
private static <TNode> ElementNode<TNode> runSelector(IMixinContext mixin, ITargetSelector selector, Iterable<ElementNode<TNode>> nodes,
List<ElementNode<TNode>> candidates) {
int matchCount = 0;
ElementNode<TNode> exactMatch = null;
for (Iterator<ElementNode<TNode>> iterator = nodes.iterator(); iterator.hasNext();) {
ElementNode<TNode> element = iterator.next();
MatchResult match = selector.match(element);
if (match.isMatch()) {
matchCount++;
if (matchCount > selector.getMaxMatchCount()) {
break;
}
if (!candidates.contains(element)) {
candidates.add(element);
}
if (exactMatch == null && match.isExactMatch()) {
exactMatch = element;
}
}
Stream<AbstractMap.SimpleImmutableEntry<ElementNode<TNode>, MatchResult>> stream = StreamSupport.stream(nodes.spliterator(), false)
.map(element -> new AbstractMap.SimpleImmutableEntry<>(element, selector.match(element)))
.filter(entry -> entry.getValue().isMatch());

if (FabricUtil.getCompatibility(mixin) >= FabricUtil.COMPATIBILITY_0_17_4) {
stream = stream.sorted(Comparator.<Map.Entry<ElementNode<TNode>, MatchResult>, Boolean>comparing(entry -> entry.getValue().isExactMatch()).reversed());
}

if (matchCount < selector.getMinMatchCount()) {

List<Map.Entry<ElementNode<TNode>, MatchResult>> matches = stream
.limit(selector.getMaxMatchCount())
.collect(Collectors.toList());

for (Map.Entry<ElementNode<TNode>, MatchResult> match : matches) {
candidates.add(match.getKey());
}

if (matches.size() < selector.getMinMatchCount()) {
throw new SelectorConstraintException(selector, String.format("%s did not match the required number of targets (required=%d, matched=%d)",
selector, selector.getMinMatchCount(), matchCount));
selector, selector.getMinMatchCount(), matches.size()));
}

return exactMatch;
return matches.stream().filter(entry -> entry.getValue().isExactMatch()).findFirst().map(Map.Entry::getKey).orElse(null);
}

}
2 changes: 1 addition & 1 deletion src/main/java/org/spongepowered/asm/mixin/injection/selectors/TargetSelectors.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ protected void findNestedTargets() {
}

recursed = true;
Result<AbstractInsnNode> result = TargetSelector.run(next, ElementNode.dynamicInsnList(target.getMethod().instructions));
Result<AbstractInsnNode> result = TargetSelector.run(this.mixin, next, ElementNode.dynamicInsnList(target.getMethod().instructions));
iter.remove();
for (ElementNode<AbstractInsnNode> candidate : result.candidates) {
if (candidate.getInsn().getOpcode() != Opcodes.INVOKEDYNAMIC) {
Expand Down
Loading