From d1faac8b96b057d3d04379b7bda5b1cb3152154f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Fri, 3 Oct 2025 15:27:48 -0600 Subject: [PATCH] Pull in remaining packs --- buildSrc/src/main/kotlin/DistributionConfig.kt | 18 ++++++++++++++---- buildSrc/src/main/kotlin/Versions.kt | 3 +++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/kotlin/DistributionConfig.kt b/buildSrc/src/main/kotlin/DistributionConfig.kt index d418de41a..73d40b1e1 100644 --- a/buildSrc/src/main/kotlin/DistributionConfig.kt +++ b/buildSrc/src/main/kotlin/DistributionConfig.kt @@ -49,9 +49,18 @@ fun Project.configureDistribution() { doFirst { try { file("${buildDir}/resources/main/packs/").deleteRecursively() - val defaultPackUrl = + val overworldPackUrl = URL("https://github.com/PolyhedralDev/TerraOverworldConfig/releases/download/" + Versions.Terra.overworldConfig + "/Overworld.zip") - downloadPack(defaultPackUrl, project) + val reimagENDPackUrl = + URL("https://github.com/PolyhedralDev/ReimagEND/releases/download/" + Versions.Terra.reimagENDConfig + "/ReimagEND.zip") + val tartarusPackUrl = + URL("https://github.com/PolyhedralDev/Tartarus/releases/download/" + Versions.Terra.tartarusConfig + "/Tartarus.zip") + val defaultPackUrl = + URL("https://github.com/PolyhedralDev/DefaultMetapack/releases/download/" + Versions.Terra.defaultConfig + "/default.zip") + downloadPack(overworldPackUrl, project) + downloadPack(reimagENDPackUrl, project) + downloadPack(tartarusPackUrl, project) + downloadPack(defaultPackUrl, project, true) } catch (_: Exception) { } } @@ -164,9 +173,10 @@ fun Project.configureDistribution() { } } -fun downloadPack(packUrl: URL, project: Project) { +fun downloadPack(packUrl: URL, project: Project, metapack: Boolean = false) { val fileName = packUrl.file.substring(packUrl.file.lastIndexOf("/")) - val file = File("${project.buildDir}/resources/main/packs/${fileName}") + val resourceType = if (metapack) "metapacks" else "packs" + val file = File("${project.buildDir}/resources/main/${resourceType}/${fileName}") file.parentFile.mkdirs() file.outputStream().write(packUrl.readBytes()) } diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 3593b1d4b..7917832b1 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,6 +1,9 @@ object Versions { object Terra { const val overworldConfig = "latest" + const val reimagENDConfig = "latest" + const val tartarusConfig = "latest" + const val defaultConfig = "latest" } object Libraries {