From 03cbb73783e3616d8079fda2e8648724d1924959 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sat, 14 Aug 2021 02:20:24 +0800 Subject: [PATCH] Fix #22 Signed-off-by: shedaniel --- .../processors/MinecraftProcessedProvider.java | 4 ++-- .../providers/minecraft/MinecraftMappedProvider.java | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/configuration/processors/MinecraftProcessedProvider.java b/src/main/java/net/fabricmc/loom/configuration/processors/MinecraftProcessedProvider.java index 9673a9a4..e2e4d3e3 100644 --- a/src/main/java/net/fabricmc/loom/configuration/processors/MinecraftProcessedProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/processors/MinecraftProcessedProvider.java @@ -68,7 +68,7 @@ public class MinecraftProcessedProvider extends MinecraftMappedProvider { getProject().getRepositories().flatDir(repository -> repository.dir(getJarDirectory(getExtension().getProjectPersistentCache(), PROJECT_MAPPED_CLASSIFIER))); getProject().getDependencies().add(Constants.Configurations.MINECRAFT_NAMED, - getProject().getDependencies().module("net.minecraft:minecraft:" + getJarVersionString(PROJECT_MAPPED_CLASSIFIER))); + getProject().getDependencies().module("net.minecraft:" + mappedJarPrefix() + "minecraft:" + getJarVersionString(PROJECT_MAPPED_CLASSIFIER))); } private void invalidateJars() { @@ -89,7 +89,7 @@ public class MinecraftProcessedProvider extends MinecraftMappedProvider { public void initFiles(MinecraftProvider minecraftProvider, MappingsProvider mappingsProvider) { super.initFiles(minecraftProvider, mappingsProvider); - projectMappedJar = new File(getJarDirectory(getExtension().getProjectPersistentCache(), PROJECT_MAPPED_CLASSIFIER), "minecraft-" + getJarVersionString(PROJECT_MAPPED_CLASSIFIER) + ".jar"); + projectMappedJar = new File(getJarDirectory(getExtension().getProjectPersistentCache(), PROJECT_MAPPED_CLASSIFIER), mappedJarPrefix() + "minecraft-" + getJarVersionString(PROJECT_MAPPED_CLASSIFIER) + ".jar"); } @Override diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java index f3d976ae..2fdd40d6 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java @@ -353,14 +353,14 @@ public class MinecraftMappedProvider extends DependencyProvider { getProject().getRepositories().flatDir(repository -> repository.dir(getJarDirectory(getExtension().getUserCache(), "mapped"))); getProject().getDependencies().add(Constants.Configurations.MINECRAFT_NAMED, - getProject().getDependencies().module("net.minecraft:minecraft:" + getJarVersionString("mapped"))); + getProject().getDependencies().module("net.minecraft:" + mappedJarPrefix() + "minecraft:" + getJarVersionString("mapped"))); } public void initFiles(MinecraftProvider minecraftProvider, MappingsProvider mappingsProvider) { this.minecraftProvider = minecraftProvider; minecraftIntermediaryJar = new File(getExtension().getUserCache(), "minecraft-" + getJarVersionString("intermediary") + ".jar"); minecraftSrgJar = !getExtension().isForge() ? null : new File(getExtension().getUserCache(), "minecraft-" + getJarVersionString("srg") + ".jar"); - minecraftMappedJar = new File(getJarDirectory(getExtension().getUserCache(), "mapped"), "minecraft-" + getJarVersionString("mapped") + ".jar"); + minecraftMappedJar = new File(getJarDirectory(getExtension().getUserCache(), "mapped"), mappedJarPrefix() + "minecraft-" + getJarVersionString("mapped") + ".jar"); inputJar = getExtension().isForge() ? mappingsProvider.patchedProvider.getMergedJar() : minecraftProvider.getMergedJar(); if (getExtension().isForgeAndNotOfficial()) { @@ -376,6 +376,10 @@ public class MinecraftMappedProvider extends DependencyProvider { } } + protected String mappedJarPrefix() { + return getExtension().isForgeAndOfficial() ? "forge-" : ""; + } + private String getForgeVersion() { return getExtension().getForgeProvider().getVersion().getCombined(); }