From 8c859ecba26af6cc3deafbc02471d284c4610391 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sun, 4 Apr 2021 19:44:11 +0800 Subject: Fix merge conflicts --- .../java/net/fabricmc/loom/LoomGradleExtension.java | 6 ++---- .../loom/configuration/CompileConfiguration.java | 3 ++- .../fabricmc/loom/configuration/MavenConfiguration.java | 17 +++++++++++++++++ .../fabricmc/loom/configuration/RemapConfiguration.java | 11 ++++++++++- .../loom/configuration/providers/LaunchProvider.java | 6 ------ src/main/java/net/fabricmc/loom/task/RemapJarTask.java | 2 +- 6 files changed, 32 insertions(+), 13 deletions(-) (limited to 'src/main/java/net/fabricmc') diff --git a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java index 3fcefcea..9569c34d 100644 --- a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java +++ b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java @@ -80,8 +80,6 @@ public class LoomGradleExtension { public File accessWidener = null; public Function intermediaryUrl = mcVer -> "https://maven.fabricmc.net/net/fabricmc/intermediary/" + mcVer + "/intermediary-" + mcVer + "-v2.jar"; public boolean shareCaches = false; - @Deprecated - public String mixinConfig = null; // FORGE: Passed to Minecraft public List mixinConfigs = new ArrayList<>(); // FORGE: Passed to Minecraft public boolean useFabricMixin = true; // FORGE: Use Fabric Mixin for better refmap resolutions @@ -198,8 +196,8 @@ public class LoomGradleExtension { return tasksBeforeRun; } - public void mixinConfig(String config) { - mixinConfigs.add(config); + public void mixinConfig(String... config) { + mixinConfigs.addAll(Arrays.asList(config)); } public void silentMojangMappingsLicense() { diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index 23de41b2..ebc8059b 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -47,6 +47,7 @@ import net.fabricmc.loom.configuration.providers.forge.McpConfigProvider; import net.fabricmc.loom.configuration.providers.forge.PatchProvider; import net.fabricmc.loom.configuration.providers.forge.SrgProvider; import net.fabricmc.loom.configuration.providers.mappings.MappingsProvider; +import net.fabricmc.loom.task.GenVsCodeProjectTask; import net.fabricmc.loom.util.Constants; public final class CompileConfiguration { @@ -179,7 +180,7 @@ public final class CompileConfiguration { project.getTasks().getByName("cleanEclipse").finalizedBy(project.getTasks().getByName("cleanEclipseRuns")); SetupIntelijRunConfigs.setup(project); - GenVsCodeProjectTask.generate(project1); + GenVsCodeProjectTask.generate(project); // Enables the default mod remapper if (extension.remapMod) { diff --git a/src/main/java/net/fabricmc/loom/configuration/MavenConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/MavenConfiguration.java index 2fb2ae7c..118fd546 100644 --- a/src/main/java/net/fabricmc/loom/configuration/MavenConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/MavenConfiguration.java @@ -25,6 +25,7 @@ package net.fabricmc.loom.configuration; import org.gradle.api.Project; +import org.gradle.api.artifacts.repositories.MavenArtifactRepository; import net.fabricmc.loom.LoomGradleExtension; @@ -52,6 +53,22 @@ public class MavenConfiguration { repo.setUrl("https://libraries.minecraft.net/"); }); + project.getRepositories().maven(repo -> { + repo.setName("Forge"); + repo.setUrl("https://files.minecraftforge.net/maven/"); + + repo.metadataSources(sources -> { + sources.mavenPom(); + + try { + MavenArtifactRepository.MetadataSources.class.getDeclaredMethod("ignoreGradleMetadataRedirection") + .invoke(sources); + } catch (Throwable ignored) { + // Method not available + } + }); + }); + project.getRepositories().mavenCentral(); } } diff --git a/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java index 7534c27b..9edc6206 100644 --- a/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/RemapConfiguration.java @@ -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); } diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java index f745348f..a602612e 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/LaunchProvider.java @@ -101,14 +101,8 @@ public class LaunchProvider extends DependencyProvider { launchConfig.property("net.minecraftforge.gradle.GradleStart.srg.srg-mcp", getExtension().getMappingsProvider().srgToNamedSrg.getAbsolutePath()); } - String mixinConfig = getExtension().mixinConfig; List mixinConfigs = getExtension().mixinConfigs; - if (mixinConfig != null) { - launchConfig.argument("-mixin.config"); - launchConfig.argument(mixinConfig); - } - if (mixinConfigs != null) { for (String config : mixinConfigs) { launchConfig.argument("-mixin.config"); diff --git a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java index 7b3c923e..8e929163 100644 --- a/src/main/java/net/fabricmc/loom/task/RemapJarTask.java +++ b/src/main/java/net/fabricmc/loom/task/RemapJarTask.java @@ -132,7 +132,7 @@ public class RemapJarTask extends Jar { scheduleRemap(singleRemap || getProject().getExtensions().getByType(LoomGradleExtension.class).isRootProject()); if (singleRemap) { - jarRemapper.remap(); + jarRemapper.remap(getProject()); } } -- cgit