Merge pull request #97 from maggi373/1.12.2

update to 9.12.4
Thorfusion · Feb 20, 2023 · 672d9ba · 672d9ba
2 parents cadf20c + 1013fa2
commit 672d9ba
Show file tree

Hide file tree

Showing 4 changed files with 102 additions and 235 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -32,4 +32,4 @@ jobs:
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.MAVEN_TOKEN }}
           MAVEN_REPO: ${{ secrets.MAVEN_DEVREPO }}
-          BUILD_VER: '-${{ github.run_number }}'
+          BUILD_VER: ${{ github.run_number }}
diff --git a/build.gradle b/build.gradle
@@ -45,7 +45,12 @@ repositories {
 }
 
 
-version = "${minecraft_version}-${mod_version}"
+if (System.getenv("BUILD_VER") == null){
+    mod_version = mod_version
+} else {
+    mod_version = mod_version + "-" + System.getenv("BUILD_VER")
+}
+version = minecraft_version + "-" + mod_version
 group = "mekanism"
 archivesBaseName = "Mekanism-Community-Edition"
 libsDirName = "../output"
@@ -65,7 +70,7 @@ minecraft {
     runDir = "run"
     useDepAts = true
 
-    replace '${version}', project.version
+    replace '${version}', mod_version
     replaceIn "Mekanism.java"
     replaceIn "MekanismGenerators.java"
     replaceIn "MekanismTools.java"
@@ -109,14 +114,14 @@ dependencies {
 }
 
 processResources {
-    inputs.property "version", project.version
+    inputs.property "version", mod_version
     inputs.property "mc_version", minecraft_version
 
     from(sourceSets.main.resources.srcDirs) {
         include "mcmod.info"
 
         // replace version and mcversion
-        expand "version": project.version, "mc_version": minecraft_version
+        expand "version": mod_version, "mc_version": minecraft_version
     }
 
     // copy everything else, thats not the mcmod.info
@@ -145,7 +150,7 @@ task coreJar(type: Jar) {
 
     from('etc/core') {
         include '*.info'
-        expand 'version':project.version,'mc_version':minecraft_version,'mcmp_version':mcmp_version
+        expand 'version':mod_version,'mc_version':minecraft_version,'mcmp_version':mcmp_version
     }
 
     from zipTree(jar.outputs.getFiles().getSingleFile()).matching {
@@ -161,7 +166,7 @@ task alltJar(type: Jar) {
 
     from('etc/all') {
         include '*.info'
-        expand 'version':project.version,'mc_version':minecraft_version,'mcmp_version':mcmp_version
+        expand 'version':mod_version,'mc_version':minecraft_version,'mcmp_version':mcmp_version
     }
 
     from zipTree(jar.outputs.getFiles().getSingleFile()).matching {
@@ -177,7 +182,7 @@ task toolsJar(type: Jar) {
 
     from('etc/tools') {
         include '*.info'
-        expand 'version':project.version,'mc_version':minecraft_version,'mcmp_version':mcmp_version
+        expand 'version':mod_version,'mc_version':minecraft_version,'mcmp_version':mcmp_version
     }
 
     from zipTree(jar.outputs.getFiles().getSingleFile()).matching {
@@ -191,7 +196,7 @@ task generatorsJar(type: Jar) {
 
     from('etc/generators') {
         include '*.info'
-        expand 'version':project.version,'mc_version':minecraft_version,'mcmp_version':mcmp_version
+        expand 'version':mod_version,'mc_version':minecraft_version,'mcmp_version':mcmp_version
     }
 
     from zipTree(jar.outputs.getFiles().getSingleFile()).matching {
@@ -252,11 +257,7 @@ publishing {
         mavenJava(MavenPublication) {
             artifactId = project.archivesBaseName
             groupId = project.group
-            if (System.getenv("BUILD_VER") == null){
-                version = project.version
-            } else {
-                version = project.version + System.getenv("BUILD_VER")
-            }
+            version = project.version
             artifacts = [toolsJar, coreJar, generatorsJar, alltJar, apiJar]
             pom {
                 name.set("Mekanism Community Edition")

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 minecraft_version=1.12.2
 mappings_version=stable_39
 forge_version=14.23.5.2847
-mod_version=9.12.3
+mod_version=9.12.4
 
 mcmp_version=2.5.3
 jei_version=4.15.0.289