imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-02 13:37:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash in DownloadAssetsTask when there is no client run config. (#1137)

Browse Source 
* Fix crash in DownloadAssetsTask when there is no client run config.

* Fix build
This commit is contained in:
modmuss
2024-07-04 14:39:49 +01:00
parent f456190f71
commit 462ba97d52
2 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/fabricmc/loom/task/DownloadAssetsTask.java
View File

@@ -27,7 +27,6 @@ package net.fabricmc.loom.task;
import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.util.Objects;
import javax.inject.Inject;
@@ -92,8 +91,9 @@ public abstract class DownloadAssetsTask extends AbstractLoomTask {
getLegacyResourcesDirectory().set(new File(assetsDir, "/legacy/" + versionInfo.id()));
} else {
// pre-1.6 resources
RunConfigSettings client = Objects.requireNonNull(getExtension().getRunConfigs().findByName("client"), "Could not find client run config");
getLegacyResourcesDirectory().set(new File(getProject().getProjectDir(), client.getRunDir() + "/resources"));
RunConfigSettings client = getExtension().getRunConfigs().findByName("client");
String runDir = client != null ? client.getRunDir() : "run";
getLegacyResourcesDirectory().set(new File(getProject().getProjectDir(), runDir + "/resources"));
}
getResourcesBaseUrl().set(MirrorUtil.getResourcesBase(getProject()));

28
src/test/groovy/net/fabricmc/loom/test/integration/RunConfigTest.groovy
View File

@@ -102,4 +102,32 @@ class RunConfigTest extends Specification implements GradleProjectTestTrait {
where:
version << STANDARD_TEST_VERSIONS
}
// Test that the download assets task doesnt depend on a client run existing.
@Unroll
def "cleared runs (gradle #version)"() {
setup:
def gradle = gradleProject(project: "minimalBase", version: version)
gradle.buildGradle << '''
dependencies {
minecraft "com.mojang:minecraft:1.18.1"
mappings "net.fabricmc:yarn:1.18.1+build.18:v2"
modImplementation "net.fabricmc:fabric-loader:0.12.12"
}
loom {
runs.clear()
}
'''
when:
def result = gradle.run(tasks: ["downloadAssets"])
then:
result.task(":downloadAssets").outcome == SUCCESS
where:
version << STANDARD_TEST_VERSIONS
}
}