hibiscus-client
/
fabric-loom
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build functional intermediary-mapped sources JARs; update Stitch

dev/0.11
Adrian Siekierka 2018-12-22 14:37:16 +01:00
parent 2b85714448
commit a620812aab
7 changed files with 211 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -38,7 +38,7 @@ dependencies {
implementation ('org.zeroturnaround:zt-zip:1.13')
implementation ('com.google.code.gson:gson:2.8.5')
implementation ('com.google.guava:guava:27.0.1-jre')
implementation ('net.fabricmc:stitch:0.1.0.29')
implementation ('net.fabricmc:stitch:0.1.1.32')
implementation ('net.fabricmc:tiny-remapper:0.1.0.22') {
transitive = false
}

14
src/main/java/net/fabricmc/loom/AbstractPlugin.java
View File

@ -29,12 +29,14 @@ import net.fabricmc.loom.providers.MappingsProvider;
import net.fabricmc.loom.providers.MinecraftProvider;
import net.fabricmc.loom.providers.ModRemapperProvider;
import net.fabricmc.loom.task.RemapJar;
import net.fabricmc.loom.task.RemapSourcesJar;
import net.fabricmc.loom.util.Constants;
import net.fabricmc.loom.util.LoomDependencyManager;
import net.fabricmc.loom.util.SetupIntelijRunConfigs;
import org.gradle.api.Plugin;
import org.gradle.api.Project;
import org.gradle.api.Task;
import org.gradle.api.UnknownTaskException;
import org.gradle.api.artifacts.Configuration;
import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
import org.gradle.api.plugins.JavaPlugin;
@ -238,6 +240,18 @@ public class AbstractPlugin implements Plugin<Project> {
remapJarTask.doLast(task -> project1.getArtifacts().add("archives", remapJarTask.jar));
remapJarTask.dependsOn(project1.getTasks().getByName("jar"));
project1.getTasks().getByName("build").dependsOn(remapJarTask);
try {
AbstractArchiveTask sourcesTask = (AbstractArchiveTask) project1.getTasks().getByName("sourcesJar");
RemapSourcesJar remapSourcesJarTask = (RemapSourcesJar) project1.getTasks().findByName("remapSourcesJar");
remapSourcesJarTask.jar = sourcesTask.getArchivePath();
remapSourcesJarTask.doLast(task -> project1.getArtifacts().add("archives", remapSourcesJarTask.jar));
remapSourcesJarTask.dependsOn(project1.getTasks().getByName("sourcesJar"));
project1.getTasks().getByName("build").dependsOn(remapSourcesJarTask);
} catch (UnknownTaskException e) {
// pass
}
} else {
AbstractArchiveTask jarTask = (AbstractArchiveTask) project1.getTasks().getByName("jar");
extension.addUnmappedMod(jarTask.getArchivePath());

7
src/main/java/net/fabricmc/loom/LoomGradleExtension.java
View File

@ -29,6 +29,7 @@ import net.fabricmc.loom.providers.MappingsProvider;
import net.fabricmc.loom.providers.MinecraftMappedProvider;
import net.fabricmc.loom.providers.MinecraftProvider;
import net.fabricmc.loom.util.LoomDependencyManager;
import org.cadixdev.lorenz.MappingSet;
import org.gradle.api.Project;
import org.gradle.api.artifacts.Dependency;
@ -38,6 +39,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.function.Supplier;
public class LoomGradleExtension {
public String runDir = "run";
@ -53,6 +55,11 @@ public class LoomGradleExtension {
private LoomDependencyManager dependencyManager;
private JsonObject installerJson;
private int installerJsonPriority = Integer.MAX_VALUE; // 0+, higher = less prioritized
private MappingSet[] srcMappingCache = new MappingSet[2];
public MappingSet getOrCreateSrcMappingCache(int id, Supplier<MappingSet> factory) {
return srcMappingCache[id] != null ? srcMappingCache[id] : (srcMappingCache[id] = factory.get());
}
public LoomGradleExtension(Project project) {
this.project = project;

2
src/main/java/net/fabricmc/loom/LoomGradlePlugin.java
View File

@ -42,7 +42,7 @@ public class LoomGradlePlugin extends AbstractPlugin {
makeTask("vscode", GenVsCodeProjectTask.class).setGroup("ide");
makeTask("genEclipseRuns", GenEclipseRunsTask.class).setGroup("ide");
makeTask("remapSources", RemapSourcesTask.class);
makeTask("remapSourcesJar", RemapSourcesJar.class);
makeTask("runClient", RunClientTask.class).dependsOn("buildNeeded").setGroup("minecraftMapped");
makeTask("runServer", RunServerTask.class).dependsOn("buildNeeded").setGroup("minecraftMapped");

10
src/main/java/net/fabricmc/loom/providers/MinecraftJarProvider.java
View File

@ -54,19 +54,11 @@ public class MinecraftJarProvider {
public void mergeJars(Project project) throws IOException {
project.getLogger().lifecycle(":merging jars");
FileInputStream client = new FileInputStream(minecraftProvider.MINECRAFT_CLIENT_JAR);
FileInputStream server = new FileInputStream(minecraftProvider.MINECRAFT_SERVER_JAR);
FileOutputStream merged = new FileOutputStream(MINECRAFT_MERGED_JAR);
JarMerger jarMerger = new JarMerger(client, server, merged);
JarMerger jarMerger = new JarMerger(minecraftProvider.MINECRAFT_CLIENT_JAR, minecraftProvider.MINECRAFT_SERVER_JAR, minecraftProvider.MINECRAFT_MERGED_JAR);
jarMerger.enableSyntheticParamsOffset();
jarMerger.merge();
jarMerger.close();
client.close();
server.close();
merged.close();
}
private void initFiles(Project project, MinecraftProvider minecraftProvider) {

15
src/main/java/net/fabricmc/loom/task/RemapSourcesTask.java → src/main/java/net/fabricmc/loom/task/RemapSourcesJar.java
View File

@ -26,13 +26,22 @@ package net.fabricmc.loom.task;
import net.fabricmc.loom.util.SourceRemapper;
import org.gradle.api.DefaultTask;
import org.gradle.api.tasks.Input;
import org.gradle.api.tasks.TaskAction;
public class RemapSourcesTask extends DefaultTask {
import java.io.File;
public class RemapSourcesJar extends DefaultTask {
public File jar;
public String direction = "intermediary";
@Input
public File getJar() {
return jar;
}
@TaskAction
public void remap() throws Exception {
SourceRemapper.remapSources(getProject());
SourceRemapper.remapSources(getProject(), jar, jar, direction.equals("named"));
}
}

200
src/main/java/net/fabricmc/loom/util/SourceRemapper.java
View File

@ -24,31 +24,49 @@
package net.fabricmc.loom.util;
import com.google.common.collect.ImmutableMap;
import net.fabricmc.loom.LoomGradleExtension;
import net.fabricmc.loom.providers.MappingsProvider;
import net.fabricmc.stitch.util.Pair;
import net.fabricmc.stitch.util.StitchUtil;
import org.cadixdev.lorenz.MappingSet;
import org.cadixdev.lorenz.io.MappingsReader;
import org.cadixdev.lorenz.io.TextMappingsReader;
import org.cadixdev.mercury.Mercury;
import org.cadixdev.mercury.remapper.MercuryRemapper;
import org.gradle.api.Project;
import org.objectweb.asm.commons.Remapper;
import org.zeroturnaround.zip.ZipUtil;
import java.io.File;
import java.io.FileReader;
import java.io.Reader;
import java.io.*;
import java.net.URI;
import java.nio.file.*;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class SourceRemapper {
public static void remapSources(Project project) throws Exception {
public static void remapSources(Project project, File source, File destination, boolean toNamed) throws Exception {
LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class);
MappingsProvider mappingsProvider = extension.getMappingsProvider();
project.getLogger().lifecycle("Setting up source remapper");
MappingSet mappings = extension.getOrCreateSrcMappingCache(toNamed ? 1 : 0, () -> {
try {
project.getLogger().lifecycle(":loading " + (toNamed ? "intermediary -> named" : "named -> intermediary") + " source mappings");
FileReader mappingsReader = new FileReader(mappingsProvider.MAPPINGS_TINY);
MappingSet mappings = new TinyReader(mappingsReader, "intermediary", "named").read();
MappingSet mappingsOut = new TinyReader(mappingsReader, toNamed ? "intermediary" : "named", toNamed ? "named" : "intermediary").read();
mappingsReader.close();
return mappingsOut;
} catch (Exception e) {
throw new RuntimeException(e);
}
});
project.getLogger().lifecycle(":remapping source jar");
Mercury mercury = new Mercury();
@ -61,70 +79,83 @@ public class SourceRemapper {
}
}
mercury.getClassPath().add(extension.getMinecraftMappedProvider().MINECRAFT_INTERMEDIARY_JAR.toPath());
mercury.getClassPath().add(extension.getMinecraftMappedProvider().MINECRAFT_MAPPED_JAR.toPath());
mercury.getClassPath().add(extension.getMinecraftMappedProvider().MINECRAFT_INTERMEDIARY_JAR.toPath());
mercury.getProcessors().add(MercuryRemapper.create(mappings));
project.getLogger().lifecycle("Remapping source");
mercury.rewrite(new File(project.getRootDir(), "src/main/java").toPath(), new File(project.getRootDir(), "src_mapped").toPath());
if (source.equals(destination)) {
if (source.isDirectory()) {
throw new RuntimeException("Directories must differ!");
}
//Thanks jamierocks
public static class TinyReader extends TextMappingsReader {
public TinyReader(final Reader reader, String to, String from) {
super(reader, mappingSet -> new Processor(mappingSet, to, from));
source = new File(destination.getAbsolutePath().substring(0, destination.getAbsolutePath().lastIndexOf('.')) + "-dev.jar");
if (!destination.renameTo(source)) {
throw new RuntimeException("Could not rename " + destination.getName() + "!");
}
}
public static class Processor extends TextMappingsReader.Processor {
Path srcPath = source.toPath();
boolean isSrcTmp = false;
if (!source.isDirectory()) {
// create tmp directory
isSrcTmp = true;
srcPath = Files.createTempDirectory("fabric-loom-src");
ZipUtil.unpack(source, srcPath.toFile());
}
String to;
String from;
StitchUtil.FileSystemDelegate dstFs = destination.isDirectory() ? null : StitchUtil.getJarFileSystem(destination, true);
Path dstPath = dstFs != null ? dstFs.get().getPath("/") : destination.toPath();
int toOffset = 0;
int fromOffset = 1;
mercury.rewrite(srcPath, dstPath);
public Processor(MappingSet mappings, String to, String from) {
super(mappings);
this.to = to;
this.from = from;
if (dstFs != null) {
dstFs.close();
}
if (isSrcTmp) {
Files.walkFileTree(srcPath, new SimpleFileVisitor<Path>() {
@Override
public FileVisitResult visitFile(Path path, BasicFileAttributes basicFileAttributes) throws IOException {
Files.delete(path);
return FileVisitResult.CONTINUE;
}
@Override
public void accept(final String line) {
final String[] params = line.split("\t");
switch (params[0]) {
case "v1":
Pair<Integer, Integer> offset = getMappingOffset(to, from, line);
System.out.println("To: " + to + " From: " + from + " toOffset:" + offset.getLeft() + " from:" + offset.getRight());
toOffset = offset.getLeft();
fromOffset = offset.getRight();
return;
case "CLASS": {
this.mappings.getOrCreateClassMapping(params[1 + toOffset])
.setDeobfuscatedName(params[1 + fromOffset]);
System.out.println("Class " + params[1 + toOffset] + " -> " + params[1 + fromOffset]);
return;
public FileVisitResult postVisitDirectory(Path path, IOException e) throws IOException {
Files.delete(path);
return FileVisitResult.CONTINUE;
}
});
}
}
case "FIELD": {
this.mappings.getOrCreateClassMapping(params[1 + toOffset])
// params[2] is the descriptor
.getOrCreateFieldMapping(params[3 + toOffset])
.setDeobfuscatedName(params[3 + fromOffset]);
System.out.println("Field " + params[3 + toOffset] + " -> " + params[3 + fromOffset]);
return;
}
case "METHOD": {
this.mappings.getOrCreateClassMapping(params[1 + toOffset])
.getOrCreateMethodMapping(params[3 + toOffset], params[2])
.setDeobfuscatedName(params[3 + fromOffset]);
static class SimpleClassMapper extends Remapper {
final Map<String, String> classMap;
System.out.println("Method " + params[3 + toOffset] + " -> " + params[3 + fromOffset]);
return;
public SimpleClassMapper(Map<String, String> map) {
this.classMap = map;
}
public String map(String typeName) {
return this.classMap.getOrDefault(typeName, typeName);
}
}
// With help from jamierocks; heavily modified
public static class TinyReader extends MappingsReader {
private final Reader reader;
private final String to;
private final String from;
private int toOffset = 0;
private int fromOffset = 1;
private int lineNumber = 0;
public TinyReader(Reader reader, String from, String to) {
this.reader = reader;
this.from = from;
this.to = to;
}
//This looks at the first line of the tiny file and finds the column of the mappings, horrible but works.
@ -144,9 +175,74 @@ public class SourceRemapper {
return Pair.of(toOffset, fromOffset);
}
@Override
public MappingSet read(final MappingSet mappings) throws IOException {
// As TinyV1 stores descriptors in obfuscated format always, we need to take a two-step approach.
Map<String, String> classNames = new HashMap<>();
List<String[]> otherNames = new ArrayList<>();
SimpleClassMapper classMapper = new SimpleClassMapper(classNames);
BufferedReader br = new BufferedReader(reader);
br.lines().forEach((line) -> {
final String[] params = line.split("\t");
if ((lineNumber++) == 0) {
if (params.length < 1) {
throw new RuntimeException("Invalid mapping file!");
} else if (params.length < 3 || !params[0].equals("v1")) {
throw new RuntimeException("Invalid mapping version: '" + params[0] + "'!");
}
Pair<Integer, Integer> offset = getMappingOffset(to, from, line);
// System.out.println("To: " + to + " From: " + from + " toOffset:" + offset.getLeft() + " from:" + offset.getRight());
toOffset = offset.getLeft();
fromOffset = offset.getRight();
} else {
switch (params[0]) {
case "CLASS": {
mappings.getOrCreateClassMapping(params[1 + toOffset])
.setDeobfuscatedName(params[1 + fromOffset]);
classNames.put(params[1], params[1 + toOffset]);
// System.out.println("Class " + params[1 + toOffset] + " -> " + params[1 + fromOffset]);
return;
}
case "FIELD":
case "METHOD": {
otherNames.add(params);
return;
}
}
}
});
br.close();
for (String[] params : otherNames) {
switch (params[0]) {
case "FIELD": {
mappings.getOrCreateClassMapping(classMapper.map(params[1]))
.getOrCreateFieldMapping(params[3 + toOffset], classMapper.mapDesc(params[2]))
.setDeobfuscatedName(params[3 + fromOffset]);
// System.out.println("Field " + params[3 + toOffset] + classMapper.mapDesc(params[2]) + " -> " + params[3 + fromOffset]);
break;
}
case "METHOD": {
mappings.getOrCreateClassMapping(classMapper.map(params[1]))
.getOrCreateMethodMapping(params[3 + toOffset], classMapper.mapMethodDesc(params[2]))
.setDeobfuscatedName(params[3 + fromOffset]);
// System.out.println("Method " + params[3 + toOffset] + classMapper.mapMethodDesc(params[2]) + " -> " + params[3 + fromOffset]);
break;
}
}
}
return mappings;
}
@Override
public void close() throws IOException {
}
}
}