Fix Field Migration

[shedaniel]

#162 is caused by SrgMerger dropping the migrated fields. The easiest and most reliable way to fix this is to apply the migration to both base and srg tiny, instead of only applying to the base and let SrgMerger merge the mappings.

The fix seems pretty reliable.

[Juuxel]

I trust you that it works, I don't understand the field migrator to begin with :ioa:

[Juuxel]

Thanks for this, it makes applying the same thing to the Mojang-merged mappings much easier too

[github-actions]

Test Results

  95 files  ±  0    95 suites  ±0   3h 48m 8s ⏱️ + 7m 57s
595 tests ±  0  583 ✔️ +  1  1 💤 ±0  11 ❌  - 1 
629 runs   - 13  584 ✔️  - 12  1 💤 ±0  44 ❌  - 1 

For more details on these failures, see this check.

Results for commit 3448898. ± Comparison against base commit 683a866.

This pull request removes 24 and adds 13 tests. Note that renamed tests count towards both.

 '
Fabric-Loom-Remap: broken
Fabric-Loom-Remap: false
Fabric-Loom-Remap: true
Something: Hello
], #1]
], #2]
], #3]
], #4]
…

net.fabricmc.loom.test.integration.UnpickTest ‑ unpick build [version: 8.3, #1]
net.fabricmc.loom.test.integration.UnpickTest ‑ unpick build [version: 8.5-20230908221250+0000, #0]
net.fabricmc.loom.test.integration.UnpickTest ‑ unpick decompile [version: 8.3, #1]
net.fabricmc.loom.test.integration.UnpickTest ‑ unpick decompile [version: 8.5-20230908221250+0000, #0]
net.fabricmc.loom.test.unit.ArtifactMetadataTest ‑ Should Remap [shouldRemap: false, entries: [fabric.mod.json:{}, META-INF/MANIFEST.MF:Manifest-Version: 1.0
Fabric-Loom-Remap: false

], #2]
net.fabricmc.loom.test.unit.ArtifactMetadataTest ‑ Should Remap [shouldRemap: false, entries: [hello.json:{}, META-INF/MANIFEST.MF:Manifest-Version: 1.0
Fabric-Loom-Remap: broken

], #6]
net.fabricmc.loom.test.unit.ArtifactMetadataTest ‑ Should Remap [shouldRemap: false, entries: [hello.json:{}, META-INF/MANIFEST.MF:Manifest-Version: 1.0
Fabric-Loom-Remap: false

], #4]
net.fabricmc.loom.test.unit.ArtifactMetadataTest ‑ Should Remap [shouldRemap: false, entries: [hello.json:{}, META-INF/MANIFEST.MF:Manifest-Version: 1.0
Something: Hello

], #7]
net.fabricmc.loom.test.unit.ArtifactMetadataTest ‑ Should Remap [shouldRemap: true, entries: [fabric.mod.json:{}, META-INF/MANIFEST.MF:Manifest-Version: 1.0
Fabric-Loom-Remap: true

], #3]
net.fabricmc.loom.test.unit.ArtifactMetadataTest ‑ Should Remap [shouldRemap: true, entries: [hello.json:{}, META-INF/MANIFEST.MF:Manifest-Version: 1.0
Fabric-Loom-Remap: true

], #5]
…

♻️ This comment has been updated with latest results.