Adjust build process to not write minecraft version to mods.toml

BluSunrize · Mar 7, 2024 · ef926ee · ef926ee
1 parent 68ae225
commit ef926ee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
-version = buildVersionString()
+version = "${version_minecraft}-${buildVersionString()}"
 group = 'blusunrize.immersiveengineering' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'ImmersiveEngineering'
 
@@ -54,6 +54,7 @@ sourceSets {
 
 def version_replaces = [
         'version'      : project.version,
+        'ie_version'   : buildVersionString(),
         'mc_version'   : version_minecraft,
         'forge_version': version_neoforge,
         'jei_version'  : version_jei,
@@ -192,7 +193,7 @@ String buildVersionString() {
         if (pre_version > 0)
             ie_output_version = "${ie_output_version}.${pre_version}"
     }
-    return "${version_minecraft}-${ie_output_version}"
+    return ie_output_version
 }
 
 task datagenJar(type: Jar, dependsOn: datagenClasses) {

diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -8,7 +8,7 @@ license="Blu's License of Common Sense"
 
 [[mods]]
 modId = "immersiveengineering"
-version = "${version}"
+version = "${ie_version}"
 displayName = "Immersive Engineering"
 description = "A tech based mod focused on realism."
 authors = "BluSunrize and Damien A.W. Hazard"