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

Fix client remap classpath.

Browse Source
This commit is contained in:
modmuss50
2022-05-21 00:53:14 +01:00
parent 79668102c0
commit 86d74b789a
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftSourceSets.java
View File

@@ -37,6 +37,7 @@ import org.gradle.api.tasks.SourceSet;
import org.gradle.jvm.tasks.Jar;
import net.fabricmc.loom.LoomGradleExtension;
import net.fabricmc.loom.task.AbstractRemapJarTask;
import net.fabricmc.loom.util.Constants;
public abstract sealed class MinecraftSourceSets permits MinecraftSourceSets.Single, MinecraftSourceSets.Split {
@@ -201,6 +202,13 @@ public abstract sealed class MinecraftSourceSets permits MinecraftSourceSets.Sin
jar.from(clientOnlySourceSet.getOutput().getResourcesDir());
});
// Remap with the client compile classpath.
project.getTasks().withType(AbstractRemapJarTask.class).configureEach(remapJarTask -> {
remapJarTask.getClasspath().from(
project.getConfigurations().getByName(clientOnlySourceSet.getCompileClasspathConfigurationName())
);
});
if (project.getTasks().findByName(mainSourceSet.getSourcesJarTaskName()) == null) {
// No sources.
return;

3
src/main/java/net/fabricmc/loom/task/service/TinyRemapperService.java
View File

@@ -26,6 +26,7 @@ package net.fabricmc.loom.task.service;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.HashMap;
@@ -85,7 +86,7 @@ public class TinyRemapperService implements SharedService {
return new TinyRemapperService(mappings, !legacyMixin, kotlinClasspathService);
});
service.readClasspath(remapJarTask.getClasspath().getFiles().stream().map(File::toPath).toList());
service.readClasspath(remapJarTask.getClasspath().getFiles().stream().map(File::toPath).filter(Files::exists).toList());
return service;
}