From 4d10953278e3992368e31a1bb0509f6ef65d7d29 Mon Sep 17 00:00:00 2001 From: Username404-59 <53659497+Username404-59@users.noreply.github.com> Date: Thu, 29 Apr 2021 14:10:09 +0200 Subject: [PATCH 1/3] Fix displayed forge version when using prefix-ranges in dev environments and fix the forge repo url too (#16) * Fix displayed forge version when using prefix-ranges in dev environments * Fix the forge repo url --- build.gradle | 2 +- .../loom/configuration/providers/forge/ForgeProvider.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 1d29b95d..743e4eb6 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,7 @@ sourceSets { repositories { maven { url "https://maven.fabricmc.net/" } - maven { url "https://files.minecraftforge.net/maven/" } + maven { url "https://maven.minecraftforge.net/" } maven { url "https://maven.shedaniel.me/" } mavenCentral() } diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeProvider.java index d1e0d462..80c09be9 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeProvider.java @@ -40,7 +40,7 @@ public class ForgeProvider extends DependencyProvider { @Override public void provide(DependencyInfo dependency, Consumer postPopulationScheduler) throws Exception { - version = new ForgeVersion(dependency.getDependency().getVersion()); + version = new ForgeVersion(dependency.getResolvedVersion()); addDependency(dependency.getDepString() + ":userdev", Constants.Configurations.FORGE_USERDEV); addDependency(dependency.getDepString() + ":installer", Constants.Configurations.FORGE_INSTALLER); } From 162a9034233dd40b9446366e371ea88a42ec3690 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Thu, 29 Apr 2021 20:13:31 +0800 Subject: [PATCH 2/3] Change MavenConfiguration's forge maven --- .../net/fabricmc/loom/configuration/CompileConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index f22ff5d1..2e13ef14 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -208,7 +208,7 @@ public final class CompileConfiguration { project1.getRepositories().maven(mavenArtifactRepository -> { mavenArtifactRepository.setName("Forge"); - mavenArtifactRepository.setUrl("https://files.minecraftforge.net/maven/"); + mavenArtifactRepository.setUrl("https://maven.minecraftforge.net/"); mavenArtifactRepository.metadataSources(sources -> { sources.mavenPom(); From 3364e7ae640aafe66c031c5eb38b8d97e6b34876 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Mon, 10 May 2021 23:12:54 +0800 Subject: [PATCH 3/3] Add detection for "architectury.common.marker" to remap Signed-off-by: shedaniel --- .../java/net/fabricmc/loom/build/ModCompileRemapper.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java b/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java index 72cf4620..c0057e60 100644 --- a/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java +++ b/src/main/java/net/fabricmc/loom/build/ModCompileRemapper.java @@ -129,6 +129,11 @@ public class ModCompileRemapper { File input = artifact.getFile(); try (ZipFile zipFile = new ZipFile(input)) { + if (zipFile.getEntry("architectury.common.marker") != null) { + logger.info("Found architectury common mod in " + config + ": {}", artifact.getId()); + return true; + } + if (forge) { if (zipFile.getEntry("META-INF/mods.toml") != null) { logger.info("Found Forge mod in " + config + ": {}", artifact.getId());