From 4d4da68876d4e111c19f6a31ed566993a25befae Mon Sep 17 00:00:00 2001 From: Mysterious_Dev Date: Fri, 10 Mar 2023 17:32:36 +0100 Subject: [PATCH 1/2] Add minecraft version & loader version to processResources --- .../fileTemplates/j2ee/fabric/fabric_build.gradle.ft | 4 +++- .../resources/fileTemplates/j2ee/fabric/fabric_mod.json.ft | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/resources/fileTemplates/j2ee/fabric/fabric_build.gradle.ft b/src/main/resources/fileTemplates/j2ee/fabric/fabric_build.gradle.ft index 53cf6f99b..69ea245b2 100644 --- a/src/main/resources/fileTemplates/j2ee/fabric/fabric_build.gradle.ft +++ b/src/main/resources/fileTemplates/j2ee/fabric/fabric_build.gradle.ft @@ -32,10 +32,12 @@ dependencies { processResources { inputs.property "version", project.version + inputs.property "minecraft_version", project.minecraft_version + inputs.property "loader_version", project.loader_version filteringCharset "UTF-8" filesMatching("fabric.mod.json") { - expand "version": project.version + expand "version": project.version, 'minecraft_version': project.minecraft_version, 'loader_version': project.loader_version } } diff --git a/src/main/resources/fileTemplates/j2ee/fabric/fabric_mod.json.ft b/src/main/resources/fileTemplates/j2ee/fabric/fabric_mod.json.ft index 0ca281e30..e56e54d37 100644 --- a/src/main/resources/fileTemplates/j2ee/fabric/fabric_mod.json.ft +++ b/src/main/resources/fileTemplates/j2ee/fabric/fabric_mod.json.ft @@ -22,10 +22,10 @@ #end "depends": { - "fabricloader": ">=${LOADER_VERSION}", + "fabricloader": ">=${d}{loader_version}", #if (${API_VERSION}) "fabric": "*", #end - "minecraft": "${MC_VERSION}" + "minecraft": "${d}{minecraft_version}" } } From 23c0cc3f2167e929dc142b540dfaad8bec717655 Mon Sep 17 00:00:00 2001 From: Mysterious_Dev <40738104+Mysterious-Dev@users.noreply.github.com> Date: Sun, 19 Mar 2023 18:01:12 +0100 Subject: [PATCH 2/2] Apply suggestions Co-authored-by: RedNesto --- .../fileTemplates/j2ee/fabric/fabric_build.gradle.ft | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/fileTemplates/j2ee/fabric/fabric_build.gradle.ft b/src/main/resources/fileTemplates/j2ee/fabric/fabric_build.gradle.ft index 69ea245b2..24e501100 100644 --- a/src/main/resources/fileTemplates/j2ee/fabric/fabric_build.gradle.ft +++ b/src/main/resources/fileTemplates/j2ee/fabric/fabric_build.gradle.ft @@ -37,7 +37,9 @@ processResources { filteringCharset "UTF-8" filesMatching("fabric.mod.json") { - expand "version": project.version, 'minecraft_version': project.minecraft_version, 'loader_version': project.loader_version + expand "version": project.version, + "minecraft_version": project.minecraft_version, + "loader_version": project.loader_version } }