mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2026-10-25 00:34:29 +00:00
Update MinecraftExec to work with config cache
- Switch withFileContents/withFileSource to be normal inputs. - Download complementary shaders from Maven instead.
This commit is contained in:
6 files changed
+71
-93
No files matched your search
@@ -81,18 +81,6 @@ tasks.javadoc {
|
||||
|
||||
// Include the core-api in our javadoc export. This is wrong, but it means we can export a single javadoc dump.
|
||||
source("../core-api/src/main/java")
|
||||
|
||||
options {
|
||||
this as StandardJavadocDocletOptions
|
||||
addBooleanOption("-allow-script-in-comments", true)
|
||||
bottom(
|
||||
"""
|
||||
<script src="https://cdn.jsdelivr.net/npm/prismjs@v1.29.0/components/prism-core.min.js"></script>
|
||||
<script src="https://cdn.jsdelivr.net/npm/prismjs@v1.29.0/plugins/autoloader/prism-autoloader.min.js"></script>
|
||||
<link href=" https://cdn.jsdelivr.net/npm/prismjs@1.29.0/themes/prism.min.css " rel="stylesheet">
|
||||
""".trimIndent(),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
configurations.named("javadocElements") {
|
||||
|
||||
@@ -67,6 +67,11 @@ configurations {
|
||||
runtimeClasspath { extendsFrom(localImplementation.get()) }
|
||||
}
|
||||
|
||||
val testWithIrisShaders = configurations.dependencyScope("testWithIrisShaders")
|
||||
val testWithIrisShadersResolve = configurations.resolvable("testWithIrisShadersResolve") {
|
||||
extendsFrom(testWithIrisShaders)
|
||||
}
|
||||
|
||||
dependencies {
|
||||
clientCompileOnly(variantOf(libs.emi) { classifier("api") })
|
||||
modCompileOnly(libs.bundles.externalMods.fabric.compile) {
|
||||
@@ -83,6 +88,7 @@ dependencies {
|
||||
"modTestWithSodium"(libs.sodium)
|
||||
"modTestWithIris"(libs.iris)
|
||||
"modTestWithIris"(libs.sodium)
|
||||
"testWithIrisShaders"(variantOf(libs.complementary) { artifactType("zip") })
|
||||
|
||||
"includeRuntimeOnly"(libs.cobalt)
|
||||
"includeRuntimeOnly"(libs.jzlib)
|
||||
@@ -289,15 +295,9 @@ val runGametestClientWithIris = tasks.register<ClientJavaExec>("runGametestClien
|
||||
tags("iris")
|
||||
classpath += configurations["testWithIris"]
|
||||
|
||||
withFileFrom(workingDir.resolve("shaderpacks/ComplementaryShaders_v4.6.zip")) {
|
||||
cct.downloadFile("Complementary Shaders", "https://edge.forgecdn.net/files/3951/170/ComplementaryShaders_v4.6.zip")
|
||||
}
|
||||
withFileContents(workingDir.resolve("config/iris.properties")) {
|
||||
"""
|
||||
enableShaders=true
|
||||
shaderPack=ComplementaryShaders_v4.6.zip
|
||||
""".trimIndent()
|
||||
}
|
||||
// Ideally we'd use a detached configuration here, but that seems to ignore the artifactType (so it tries to fetch
|
||||
// a jar), hence we use a full one.
|
||||
withShaderPack(testWithIrisShadersResolve.get())
|
||||
}
|
||||
cct.jacoco(runGametestClientWithIris)
|
||||
|
||||
|
||||
Reference in new issue
Block a user