ObsidianMC/nugget
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup download result mapping

Browse source
This commit is contained in:
Jason Penilla 2021-12-10 17:03:06 -08:00
parent 762221763b
commit 638d21638b
No known key found for this signature in database
GPG key ID: 0E75A301420E48F8
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
paperweight-userdev/src/main/kotlin/internal/setup/UserdevSetup.kt
View file

@ -83,19 +83,9 @@ abstract class UserdevSetup : BuildService<UserdevSetup.Parameters> {
private val devBundleChanged = extractDevBundle.first
val devBundleConfig = extractDevBundle.second
private fun downloadMinecraftManifest(force: Boolean): DownloadResult<MinecraftManifest> {
val minecraftManifestJson = download(
"minecraft manifest",
MC_MANIFEST_URL,
cache.resolve(MC_MANIFEST),
force
)
return DownloadResult(
minecraftManifestJson.path,
minecraftManifestJson.didDownload,
gson.fromJson(minecraftManifestJson.path)
)
}
private fun downloadMinecraftManifest(force: Boolean): DownloadResult<MinecraftManifest> =
download("minecraft manifest", MC_MANIFEST_URL, cache.resolve(MC_MANIFEST), force)
.mapData { gson.fromJson(it.path) }
private val minecraftVersionManifest: JsonObject by lazy { setupMinecraftVersionManifest() }
private fun setupMinecraftVersionManifest(): JsonObject {
@ -493,7 +483,10 @@ abstract class UserdevSetup : BuildService<UserdevSetup.Parameters> {
hash(builder)
}
private data class DownloadResult<D>(val path: Path, val didDownload: Boolean, val data: D)
private data class DownloadResult<D>(val path: Path, val didDownload: Boolean, val data: D) {
fun <N> mapData(mapper: (DownloadResult<D>) -> N): DownloadResult<N> =
DownloadResult(path, didDownload, mapper(this))
}
private interface HashFunctionBuilder : MutableList<Any> {
var includePaperweightHash: Boolean