Skip to content

Mixin regex remap in method selector#166

Merged
modmuss50 merged 4 commits into
FabricMC:masterfrom
ishland:feat/mixin-regex-handling
May 28, 2026
Merged

Mixin regex remap in method selector#166
modmuss50 merged 4 commits into
FabricMC:masterfrom
ishland:feat/mixin-regex-handling

Conversation

@ishland

@ishland ishland commented May 19, 2026

Copy link
Copy Markdown
Contributor

Adds the capability to resolve mixin regex and remap resolved methods in method selectors.
Passes mixin audit for fabric-api 0.149.1+26.2 with modern-yarn.

The relevant mixin in fabric-api: https://github.com/FabricMC/fabric-api/blob/c3c10324a2b2973e6d1f9896a256f8df7f223c85/fabric-permission-api-v1/src/main/java/net/fabricmc/fabric/mixin/permission/CommandSourceStackMixin.java#L68

Resolving mixin regex in @At.target is not included for now and may come in a future PR. Pushing this out to get fabric-api working first.

Comparator
.<TrMethod, String>comparing(trMethod -> trMethod.getOwner().getName())
.thenComparing(TrMember::getName)
.thenComparing(TrMember::getDesc)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indented 12 times, might be time to start thinking about creating a method.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extracted it to resolveAndRemapMixinRegex

ishland added 3 commits May 20, 2026 01:06
…handling

# Conflicts:
#	src/main/java/net/fabricmc/tinyremapper/extension/mixin/soft/annotation/injection/CommonInjectionAnnotationVisitor.java
#	src/test/java/net/fabricmc/tinyremapper/extension/mixin/integration/MixinIntegrationTest.java
@modmuss50 modmuss50 merged commit a6e961a into FabricMC:master May 28, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants