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

Fix AT jar processor and add a test for it

Browse Source
This commit is contained in:
Juuz
2022-01-20 15:57:49 +02:00
parent f0ebe3aa18
commit 26122e769e
12 changed files with 289 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/main/java/net/fabricmc/loom/configuration/accesstransformer/AccessTransformerJarProcessor.java
View File

@@ -37,6 +37,8 @@ import java.util.Set;
import com.google.common.hash.Hashing;
import com.google.common.io.ByteSource;
import org.apache.commons.io.output.NullOutputStream;
import org.cadixdev.at.AccessTransformSet;
import org.cadixdev.at.io.AccessTransformFormats;
import org.gradle.api.Project;
import org.gradle.api.file.ConfigurableFileCollection;
import org.gradle.api.file.FileCollection;
@@ -46,10 +48,13 @@ import org.gradle.api.plugins.JavaPluginExtension;
import org.gradle.api.tasks.SourceSet;
import net.fabricmc.loom.LoomGradleExtension;
import net.fabricmc.loom.api.mappings.layered.MappingsNamespace;
import net.fabricmc.loom.configuration.processors.JarProcessor;
import net.fabricmc.loom.util.Checksum;
import net.fabricmc.loom.util.Constants;
import net.fabricmc.loom.util.DependencyDownloader;
import net.fabricmc.lorenztiny.TinyMappingsReader;
import net.fabricmc.mappingio.tree.MemoryMappingTree;
public final class AccessTransformerJarProcessor implements JarProcessor {
private final Project project;
@@ -112,17 +117,18 @@ public final class AccessTransformerJarProcessor implements JarProcessor {
@Override
public void process(File file) {
try {
project.getLogger().lifecycle(":applying project access transformers");
Path tempDir = Files.createTempDirectory("loom-access-transforming");
Path tempInput = tempDir.resolve("input.jar");
Files.copy(file.toPath(), tempInput);
Path atPath = mergeAndRemapAccessTransformers(tempDir);
executeAt(project, tempInput, file.toPath(), args -> {
for (File atFile : atFiles) {
args.add("--atFile");
args.add(atFile.getAbsolutePath());
}
args.add("--atFile");
args.add(atPath.toAbsolutePath().toString());
});
Files.delete(atPath);
Files.delete(tempInput);
Files.delete(tempDir);
} catch (IOException e) {
@@ -130,6 +136,35 @@ public final class AccessTransformerJarProcessor implements JarProcessor {
}
}
private Path mergeAndRemapAccessTransformers(Path tempDir) {
AccessTransformSet accessTransformSet = AccessTransformSet.create();
for (File atFile : atFiles) {
try {
accessTransformSet.merge(AccessTransformFormats.FML.read(atFile.toPath()));
} catch (IOException e) {
throw new UncheckedIOException("Could not read access transformer " + atFile, e);
}
}
try {
MemoryMappingTree mappings = LoomGradleExtension.get(project).getMappingsProvider().getMappingsWithSrg();
accessTransformSet = accessTransformSet.remap(new TinyMappingsReader(mappings, MappingsNamespace.SRG.toString(), MappingsNamespace.NAMED.toString()).read());
} catch (IOException e) {
throw new UncheckedIOException("Could not remap access transformers from srg to named", e);
}
Path accessTransformerPath = tempDir.resolve("accesstransformer.cfg");
try {
AccessTransformFormats.FML.write(accessTransformerPath, accessTransformSet);
} catch (IOException e) {
throw new UncheckedIOException("Could not write access transformers to " + accessTransformerPath, e);
}
return accessTransformerPath;
}
public static void executeAt(Project project, Path input, Path output, AccessTransformerConfiguration configuration) throws IOException {
boolean serverBundleMetadataPresent = LoomGradleExtension.get(project).getMinecraftProvider().getServerBundleMetadata() != null;
String atDependency = Constants.Dependencies.ACCESS_TRANSFORMERS + (serverBundleMetadataPresent ? Constants.Dependencies.Versions.ACCESS_TRANSFORMERS_NEW : Constants.Dependencies.Versions.ACCESS_TRANSFORMERS);

8
src/main/java/net/fabricmc/loom/configuration/providers/forge/MinecraftPatchedProvider.java
View File

@@ -110,6 +110,7 @@ public class MinecraftPatchedProvider extends MergedMinecraftProvider {
private File minecraftClientExtra;
private boolean dirty;
private boolean serverJarInitialized = false;
public static MergedMinecraftProvider createMergedMinecraftProvider(Project project) {
return LoomGradleExtension.get(project).isForge() ? new MinecraftPatchedProvider(project) : new MergedMinecraftProvider(project);
@@ -146,8 +147,13 @@ public class MinecraftPatchedProvider extends MergedMinecraftProvider {
minecraftClientExtra = file("forge-client-extra.jar");
}
private File getEffectiveServerJar() {
private File getEffectiveServerJar() throws IOException {
if (getServerBundleMetadata() != null) {
if (!serverJarInitialized) {
extractBundledServerJar();
serverJarInitialized = true;
}
return getMinecraftExtractedServerJar();
} else {
return getMinecraftServerJar();

2
src/main/java/net/fabricmc/loom/configuration/providers/minecraft/mapped/ProcessedNamedMinecraftProvider.java
View File

@@ -100,7 +100,7 @@ public abstract class ProcessedNamedMinecraftProvider<M extends MinecraftProvide
@Override
protected String getName(String name) {
return "%s%s-%s".formatted(projectMappedName, name, getTargetNamespace().toString());
return "%s%s%s-%s".formatted(parentMinecraftProvider.getMinecraftProvider().getJarPrefix(), projectMappedName, name, getTargetNamespace().toString());
}
@Override