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 merge conflicts

Browse Source
This commit is contained in:
shedaniel
2021-04-04 19:44:11 +08:00
parent ad1754a932
commit 8c859ecba2
6 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java
View File

@@ -27,11 +27,13 @@ package net.fabricmc.loom.configuration;
import java.io.IOException;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import org.gradle.api.Project;
import org.gradle.api.Task;
import org.gradle.api.UnknownTaskException;
import org.gradle.api.plugins.JavaPlugin;
import org.gradle.api.tasks.bundling.AbstractArchiveTask;
import org.gradle.api.tasks.bundling.Jar;
import org.jetbrains.annotations.ApiStatus;
import net.fabricmc.loom.LoomGradleExtension;
@@ -74,6 +76,13 @@ public class RemapConfiguration {
remapJarTask.getInput().set(jarTask.getArchivePath());
}
if (extension.isForge()) {
remapJarTask.getToM().set("srg");
((Jar) jarTask).manifest(manifest -> {
manifest.attributes(ImmutableMap.of("MixinConfigs", String.join(",", extension.mixinConfigs)));
});
}
if (isDefaultRemap) {
extension.getUnmappedModCollection().from(jarTask);
remapJarTask.getAddNestedDependencies().set(true);
@@ -115,7 +124,7 @@ public class RemapConfiguration {
rootProject.getTasks().register(remapAllJarsTaskName, AbstractLoomTask.class, task -> {
task.doLast(t -> {
try {
jarRemapper.remap();
jarRemapper.remap(project);
} catch (IOException e) {
throw new RuntimeException("Failed to remap jars", e);
}