1.21: the CI fixes

Author: Kamefrede

.github/workflows/gradle.yml

@@ -29,8 +29,8 @@ jobs:
       - name: Calculate artifact names
         id: calculate_artifact_names
         run: |
-          MC=$(awk -F '=' '/mc_version/ { print $2; }' gradle.properties)
-          BUILD=$(awk -F '=' '/build_number/ { print $2; }' gradle.properties)
+          MC=$(awk -F '=' '/minecraft_version/ { print $2; }' gradle.properties)
+          BUILD=$(awk -F '=' '/mod_version/ { print $2; }' gradle.properties)
           echo "forge=build/libs/Psi-${MC}-${BUILD}.jar" >> "$GITHUB_OUTPUT"
 
       - name: Lint files

build.gradle

@@ -119,9 +119,32 @@ tasks.withType(ProcessResources).configureEach {
     filesMatching(['META-INF/neoforge.mods.toml']) {
         expand replaceProperties
     }
+
+    from(sourceSets.main.resources.srcDirs) {
+        exclude '**/psd/**'
+        duplicatesStrategy 'include'
+    }
+}
+
+jar {
+    archiveFileName = "${mod_name}-${minecraft_version}-${mod_version}.jar"
+
+    manifest {
+        attributes([
+                "Specification-Title": "${mod_id}",
+                "Specification-Vendor": "vazkii",
+                "Specification-Version": "1",
+                "Implementation-Title": "${mod_id}",
+                "Implementation-Version": "${mod_version}",
+                "Implementation-Vendor" :"vazkii",
+                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
+                "MixinConfigs": "psi.mixins.json"
+        ])
+    }
 }
 
 
+
 tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8'
 }

gradle.properties

@@ -19,7 +19,7 @@ patchouli_version=1.21-87
 mod_id=psi
 mod_name=Psi
 mod_license=Psi License
-mod_version=1.21.1
+mod_version=103
 mod_group_id=vazkii.psi
 mod_authors=Vazkii, Wiiv, WireSegal, Kamefrede, Williewillus, Hubry, Dudblockman, TheidenHD
 mod_description=Psionic Spellcasting Instruments

scripts/push_tag.py

@@ -8,13 +8,11 @@ def main():
     with open("gradle.properties", "rb") as f:
         build.load(f, "utf-8")
 
-    mc_version, mcv_meta = build["mc_version"]
-    version, v_meta = build["version"]
-    build_number, bn_meta = build["build_number"]
+    mc_version, mcv_meta = build["minecraft_version"]
+    version, v_meta = build["mod_version"]
 
     print("MC Version:", mc_version)
     print("Version:", version)
-    print("Build Number", build_number)
 
     changelog = ""
     with open("./web/changelog.txt", "r") as f:
@@ -24,11 +22,11 @@ def main():
         for line in lines[1:]:
             if not line.startswith("*"):
                 break
-            changelog = changelog + '-m "' + line + '" '
+            changelog = changelog + '-m "' + line + '\n" '
 
     tag_success = os.system(
-        "git tag -a release-{}-{}-{} {}".format(
-            mc_version, version, build_number, changelog
+        "git tag -a release-{}-{} {}".format(
+            mc_version, version, changelog
         )
     )
 
@@ -38,14 +36,14 @@ def main():
     else:
         print("Created tag")
 
-    build["build_number"] = str(int(build_number) + 1)
+    build["mod_version"] = str(int(mod_version) + 1)
     with open("gradle.properties", "wb") as f:
         build.store(f, encoding="utf-8")
 
     os.system("git commit -a -m build")
     os.system(
-        "git push origin master release-{}-{}-{}".format(
-            mc_version, version, build_number
+        "git push origin master release-{}-{}".format(
+            mc_version, version
         )
     )