Skip to content

Conversation

@Norbiros
Copy link

@Norbiros Norbiros commented Jun 19, 2025

Resolves architectury/architectury-loom#283

We’re seeing this conflict error:

Mapping source name conflicts detected:
  kn METHOD c ((Lkp;)Z) -> [kn/method_57832, kn/method_57826]
    fixable: replaced with method_57832
  kl METHOD c ((Lkp;)Z) -> [kl/method_57826, kn/method_57832]
  km METHOD c ((Lkp;)Z) -> [kn/method_57832, km/method_57826]
    fixable: replaced with method_57826
  kn$a$a METHOD c ((Lkp;)Z) -> [kn/method_57832, kn$a$a/method_57826]
    fixable: replaced with method_57832

The only unfixable conflict is:

kl METHOD c ((Lkp;)Z) -> [kl/method_57826, kn/method_57832]

It should prefer kl/method_57826, but currently doesn't.

This PR adds an alternative conflict resolution strategy: if all existing checks fail (e.g. parent-based), we fall back to resolving by member.cls.getName() + "/" + member.getNewMappedName().

This change is non-breaking and only runs as a last resort. It fixes the above issue without altering existing behaviour.

@Norbiros Norbiros force-pushed the fix/find-by-new-mapped-name branch from 285c04f to d196ef6 Compare June 19, 2025 18:10
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.

NeoForge 21.5.69-beta have unfixable conflicts with yarn

1 participant