imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-01 21:17:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Tweak AT and coremod remappers

Browse Source
This commit is contained in:
Juuxel
2020-11-30 19:15:32 +02:00
parent 9b668547e0
commit ec199fef90
2 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/net/fabricmc/loom/util/srg/AtRemapper.java
View File

@@ -30,13 +30,12 @@ import java.nio.file.FileSystem;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import com.google.common.collect.ImmutableMap;
import org.cadixdev.at.AccessTransformSet;
import org.cadixdev.at.io.AccessTransformFormats;
import org.cadixdev.lorenz.MappingSet;
import net.fabricmc.lorenztiny.TinyMappingsReader;
import net.fabricmc.loom.util.function.CollectionUtil;
import net.fabricmc.mapping.tree.TinyTree;
/**
@@ -50,12 +49,30 @@ public final class AtRemapper {
Path atPath = fs.getPath("META-INF", "accesstransformer.cfg");
if (Files.exists(atPath)) {
AccessTransformSet atSet = AccessTransformFormats.FML.read(atPath);
MappingSet mappingSet = new TinyMappingsReader(mappings, "srg", "named").read();
AccessTransformSet remapped = atSet.remap(mappingSet);
List<String> lines = Files.readAllLines(atPath);
List<String> output = new ArrayList<>(lines.size());
Files.delete(atPath);
AccessTransformFormats.FML.write(atPath, remapped);
for (int i = 0; i < lines.size(); i++) {
String line = lines.get(i).trim();
if (line.startsWith("#")) {
output.set(i, line);
continue;
}
String[] parts = line.split(" ");
String name = parts[1].replace('.', '/');
parts[1] = CollectionUtil.find(
mappings.getClasses(),
def -> def.getName("srg").equals(name)
).map(def -> def.getName("named")).orElse(name).replace('/', '.');
output.set(i, String.join(" ", parts));
}
if (!lines.equals(output)) {
Files.write(atPath, output);
}
}
}
}

10
src/main/java/net/fabricmc/loom/util/srg/CoreModClassRemapper.java
View File

@@ -52,12 +52,16 @@ import net.fabricmc.mapping.tree.TinyTree;
* @author Juuz
*/
public final class CoreModClassRemapper {
private static final Pattern CLASS_NAME_PATTERN = Pattern.compile("^(.+')((?:com\\.mojang\\.|net\\.minecraft\\.)[A-Za-z0-9.-_$]+)('.+)$");
private static final Pattern CLASS_NAME_PATTERN = Pattern.compile("^(.*')((?:com\\.mojang\\.|net\\.minecraft\\.)[A-Za-z0-9.-_$]+)('.*)$");
public static void remapJar(Path jar, TinyTree mappings, Logger logger) throws IOException {
try (FileSystem fs = FileSystems.newFileSystem(URI.create("jar:" + jar.toUri()), ImmutableMap.of("create", false))) {
Path coremodsJsonPath = fs.getPath("META-INF", "coremods.json");
if (Files.notExists(coremodsJsonPath)) return;
if (Files.notExists(coremodsJsonPath)) {
logger.lifecycle(":no coremods in " + jar.getFileName());
return;
}
JsonObject coremodsJson;
@@ -70,7 +74,7 @@ public final class CoreModClassRemapper {
Path js = fs.getPath(file);
if (Files.exists(js)) {
logger.info(":remapping coremod '" + file + "'");
logger.lifecycle(":remapping coremod '" + file + "'");
remap(js, mappings);
} else {
logger.warn("Coremod '" + file + "' listed in coremods.json but not found");