From 4f8be0088bccfacfc55b00a7a1716eee0ab93484 Mon Sep 17 00:00:00 2001 From: Jonathan Coates Date: Thu, 15 Aug 2024 10:11:11 +0100 Subject: [PATCH] Do not version the asset directory (#237) --- .../definition/CommonRuntimeDefinition.java | 2 +- .../common/runtime/tasks/DownloadAssets.java | 15 ++++++++++----- .../extensions/DynamicProjectExtension.java | 2 +- .../vanilla/runtime/VanillaRuntimeDefinition.java | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/common/src/main/java/net/neoforged/gradle/common/runtime/definition/CommonRuntimeDefinition.java b/common/src/main/java/net/neoforged/gradle/common/runtime/definition/CommonRuntimeDefinition.java index 48541944..e88fce31 100644 --- a/common/src/main/java/net/neoforged/gradle/common/runtime/definition/CommonRuntimeDefinition.java +++ b/common/src/main/java/net/neoforged/gradle/common/runtime/definition/CommonRuntimeDefinition.java @@ -193,7 +193,7 @@ public void configureRun(RunImpl run) { protected void buildRunInterpolationData(RunImpl run, @NotNull MapProperty interpolationData) { interpolationData.put("runtime_name", specification.getVersionedName()); interpolationData.put("mc_version", specification.getMinecraftVersion()); - interpolationData.put("assets_root", DownloadAssets.getAssetsDirectory(specification.getProject(), this.getVersionJson()) + interpolationData.put("assets_root", DownloadAssets.getAssetsDirectory(specification.getProject()) .map(Directory::getAsFile) .map(File::getAbsolutePath)); diff --git a/common/src/main/java/net/neoforged/gradle/common/runtime/tasks/DownloadAssets.java b/common/src/main/java/net/neoforged/gradle/common/runtime/tasks/DownloadAssets.java index 4b3994a5..0b15739b 100644 --- a/common/src/main/java/net/neoforged/gradle/common/runtime/tasks/DownloadAssets.java +++ b/common/src/main/java/net/neoforged/gradle/common/runtime/tasks/DownloadAssets.java @@ -1,14 +1,14 @@ package net.neoforged.gradle.common.runtime.tasks; import com.google.common.collect.Maps; +import net.neoforged.gradle.common.runtime.tasks.action.DownloadFileAction; import net.neoforged.gradle.common.services.caching.CachedExecutionService; import net.neoforged.gradle.common.services.caching.jobs.ICacheableJob; import net.neoforged.gradle.common.util.FileCacheUtils; -import net.neoforged.gradle.dsl.common.tasks.WithWorkspace; -import net.neoforged.gradle.util.TransformerUtils; -import net.neoforged.gradle.common.runtime.tasks.action.DownloadFileAction; import net.neoforged.gradle.common.util.SerializationUtils; import net.neoforged.gradle.common.util.VersionJson; +import net.neoforged.gradle.dsl.common.tasks.WithWorkspace; +import net.neoforged.gradle.util.TransformerUtils; import org.gradle.api.DefaultTask; import org.gradle.api.Project; import org.gradle.api.file.Directory; @@ -35,7 +35,7 @@ public abstract class DownloadAssets extends DefaultTask implements WithWorkspac private final Provider assetsObjects; public DownloadAssets() { - this.assetsCache = getAssetsDirectory(getProject(), getVersionJson()); + this.assetsCache = getAssetsDirectory(getProject()); this.assetsObjects = assetsCache.map(directory -> directory.dir("objects")); getAssetIndex().convention("asset-index"); @@ -47,8 +47,13 @@ public DownloadAssets() { getIsOffline().convention(getProject().getGradle().getStartParameter().isOffline()); } + public static @NotNull Provider getAssetsDirectory(final Project project) { + return FileCacheUtils.getAssetsCacheDirectory(project).map(TransformerUtils.ensureExists()); + } + + @Deprecated public static @NotNull Provider getAssetsDirectory(final Project project, final Provider versionJsonProvider) { - return FileCacheUtils.getAssetsCacheDirectory(project).flatMap(assetsDir -> assetsDir.dir(versionJsonProvider.map(VersionJson::getId))).map(TransformerUtils.ensureExists()); + return getAssetsDirectory(project); } protected Provider getFileInAssetsDirectory(final String fileName) { diff --git a/platform/src/main/java/net/neoforged/gradle/platform/extensions/DynamicProjectExtension.java b/platform/src/main/java/net/neoforged/gradle/platform/extensions/DynamicProjectExtension.java index 8a71e653..f60004e8 100644 --- a/platform/src/main/java/net/neoforged/gradle/platform/extensions/DynamicProjectExtension.java +++ b/platform/src/main/java/net/neoforged/gradle/platform/extensions/DynamicProjectExtension.java @@ -949,7 +949,7 @@ private void configureRun(final Run run, final RuntimeDevRuntimeDefinition runti ); }); - Provider assetsDir = DownloadAssets.getAssetsDirectory(project, runtimeDefinition.getVersionJson()).map(Directory::getAsFile).map(File::getAbsolutePath); + Provider assetsDir = DownloadAssets.getAssetsDirectory(project).map(Directory::getAsFile).map(File::getAbsolutePath); Provider assetIndex = runtimeDefinition.getAssets().flatMap(DownloadAssets::getAssetIndex); run.getArguments().addAll( diff --git a/vanilla/src/main/java/net/neoforged/gradle/vanilla/runtime/VanillaRuntimeDefinition.java b/vanilla/src/main/java/net/neoforged/gradle/vanilla/runtime/VanillaRuntimeDefinition.java index becbbadd..f0090d93 100644 --- a/vanilla/src/main/java/net/neoforged/gradle/vanilla/runtime/VanillaRuntimeDefinition.java +++ b/vanilla/src/main/java/net/neoforged/gradle/vanilla/runtime/VanillaRuntimeDefinition.java @@ -81,7 +81,7 @@ protected void buildRunInterpolationData(RunImpl run, MapProperty s.substring(0, s.lastIndexOf('.')))); interpolationData.put(InterpolationConstants.AUTH_ACCESS_TOKEN, "0"); interpolationData.put(InterpolationConstants.USER_TYPE, "legacy");