diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-07-20 17:31:20 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-07-20 17:32:51 +0800 |
| commit | ab351ee8c0262c459be2396636b775194f8f5028 (patch) | |
| tree | 773d6ef324bf500ce86bdff5d1106b7c4707accf /src/main/java | |
| parent | 3761a5906404bdf80c7b2b784b60a2e69645470c (diff) | |
| download | architectury-loom-ab351ee8c0262c459be2396636b775194f8f5028.tar.gz architectury-loom-ab351ee8c0262c459be2396636b775194f8f5028.tar.bz2 architectury-loom-ab351ee8c0262c459be2396636b775194f8f5028.zip | |
Move the forge jar to prevent #35
Signed-off-by: shedaniel <daniel@shedaniel.me>
(cherry picked from commit a162373fa174ac66828dda70f8b745d7c3b62db7)
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftMappedProvider.java | 7 |
1 files changed, 5 insertions, 2 deletions
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 5049aaf4..1fd45815 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 @@ -159,6 +159,8 @@ public class MinecraftMappedProvider extends DependencyProvider { addDependencies(dependency, postPopulationScheduler); if (getExtension().isForge()) { + getProject().getRepositories().flatDir(repository -> repository.dir(new File(getJarDirectory(getExtension().getUserCache(), "mapped"), "forge"))); + getProject().getDependencies().add(Constants.Configurations.FORGE_NAMED, getProject().getDependencies().module("net.minecraftforge-loom:forge:" + getJarVersionString("mapped"))); @@ -245,7 +247,7 @@ public class MinecraftMappedProvider extends DependencyProvider { assetsOut(input, vanillaAssets); - if ( getExtension().isForge()) { + if (getExtension().isForge()) { assetsOut(inputForge, forgeAssets); } @@ -354,11 +356,12 @@ public class MinecraftMappedProvider extends DependencyProvider { minecraftSrgJar = !getExtension().isForge() ? null : new File(getExtension().getUserCache(), "minecraft-" + getJarVersionString("srg") + ".jar"); minecraftMappedJar = new File(getJarDirectory(getExtension().getUserCache(), "mapped"), "minecraft-" + getJarVersionString("mapped") + ".jar"); inputJar = getExtension().isForge() ? mappingsProvider.patchedProvider.getMergedJar() : minecraftProvider.getMergedJar(); + if (getExtension().isForge()) { inputForgeJar = mappingsProvider.patchedProvider.getForgeMergedJar(); forgeIntermediaryJar = new File(getExtension().getUserCache(), "forge-" + getJarVersionString("intermediary") + ".jar"); forgeSrgJar = new File(getExtension().getUserCache(), "forge-" + getJarVersionString("srg") + ".jar"); - forgeMappedJar = new File(getJarDirectory(getExtension().getUserCache(), "mapped"), "forge-" + getJarVersionString("mapped") + ".jar"); + forgeMappedJar = new File(getJarDirectory(getExtension().getUserCache(), "mapped"), "forge/forge-" + getJarVersionString("mapped") + ".jar"); } } |