imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-03-27 19:57:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update to Mapping-IO 0.8.0 (#1419)

Browse Source
This commit is contained in:
Julian Burner
2025-11-03 10:27:59 +01:00
committed by GitHub
parent a0d73dc3b7
commit 224d015c22
2 changed files with 5 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/libs.versions.toml
View File

@@ -6,7 +6,7 @@ gson = "2.10.1"
stitch = "0.6.2"
tiny-remapper = "0.12.0"
clazz-tweaker = "0.1.1"
mapping-io = "0.7.1"
mapping-io = "0.8.0"
lorenz-tiny = "4.0.2"
mercury = "0.4.3"
mercury-mixin = "0.2.1"

30
src/main/java/net/fabricmc/loom/configuration/providers/mappings/tiny/MappingsMerger.java
View File

@@ -29,9 +29,8 @@ import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
import org.jetbrains.annotations.VisibleForTesting;
import org.slf4j.Logger;
@@ -110,32 +109,11 @@ public final class MappingsMerger {
* Currently, Yarn does not export mappings for these inner classes.
*/
private static void inheritMappedNamesOfEnclosingClasses(MemoryMappingTree tree) {
int intermediaryIdx = tree.getNamespaceId("intermediary");
int namedIdx = tree.getNamespaceId("named");
assert tree.getNamespaceId("intermediary") > MappingTree.SRC_NAMESPACE_ID;
// The tree does not have an index by intermediary names by default
// Create an index by intermediary names for faster lookups during the propagation
tree.setIndexByDstNames(true);
for (MappingTree.ClassMapping classEntry : tree.getClasses()) {
String intermediaryName = classEntry.getDstName(intermediaryIdx);
String namedName = classEntry.getDstName(namedIdx);
if (intermediaryName.equals(namedName) && intermediaryName.contains("$")) {
String[] path = intermediaryName.split(Pattern.quote("$"));
int parts = path.length;
for (int i = parts - 2; i >= 0; i--) {
String currentPath = String.join("$", Arrays.copyOfRange(path, 0, i + 1));
String namedParentClass = tree.mapClassName(currentPath, intermediaryIdx, namedIdx);
if (!namedParentClass.equals(currentPath)) {
classEntry.setDstName(namedParentClass
+ "$" + String.join("$", Arrays.copyOfRange(path, i + 1, path.length)),
namedIdx);
break;
}
}
}
}
tree.propagateOuterClassNames("intermediary", List.of("named"), false);
}
}