perepare for merge

Author: ArifRios1st

.github/workflows/build.yml

@@ -1,31 +1,39 @@
-name: Build
-
-on: [push, pull_request]
+name: build
+on: [ pull_request, push ]
 
 jobs:
   build:
+    strategy:
+      matrix:
+        java: [ 21 ]
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
+
+      - name: checkout repository
+        uses: actions/checkout@v2
+
+      - name: setup jdk ${{ matrix.java }}
+        uses: actions/setup-java@v1
         with:
-          fetch-depth: 0
-          fetch-tags: true
+          java-version: ${{ matrix.java }}
 
-      - name: Setup JDK 21
-        uses: actions/setup-java@v4
+      - uses: actions/cache@v4
         with:
-          java-version: '21'
-          distribution: 'temurin'
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/loom-cache
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/gradle-wrapper.properties') }}
+          restore-keys: ${{ runner.os }}-gradle
 
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+      - name: make gradle wrapper executable
+        run: chmod +x ./gradlew
 
-      - name: Build with Gradle
+      - name: build
         run: ./gradlew build
 
-      - name: Capture Build Artifacts
+      - name: Upload Neoforge artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: Artifacts
+          name: neoforge-artifacts
           path: build/libs/

build.gradle

@@ -14,7 +14,10 @@ tasks.named('wrapper', Wrapper).configure {
     distributionType = Wrapper.DistributionType.BIN
 }
 
-version = mod_version
+// Formats the mod version to include the loader, Minecraft version, and build number (if present)
+// example: 1.0.0+fabric-1.18.2-100
+String buildNumber = System.getenv("GITHUB_RUN_NUMBER")
+version = "${mod_version}+neoforge-${minecraft_version}" + (buildNumber != null ? "-${buildNumber}" : "")
 group = mod_group_id
 
 repositories {
@@ -29,7 +32,7 @@ repositories {
 }
 
 base {
-    archivesName = mod_id
+    archivesName = archives_base_name
 }
 
 // Mojang ships Java 21 to end users in 1.21.1, so mods should target Java 21.
@@ -150,18 +153,18 @@ var generateModMetadata = tasks.register("generateModMetadata", ProcessResources
     var replaceProperties = [
             minecraft_version      : minecraft_version,
             minecraft_version_range: minecraft_version_range,
-            neo_version            : neo_version,
-            neo_version_range      : neo_version_range,
+            neo_version            : neo_version.split("\\.")[0],
             loader_version_range   : loader_version_range,
             mod_id                 : mod_id,
             mod_name               : mod_name,
             mod_license            : mod_license,
-            mod_version            : mod_version,
+            mod_version            : version,
             mod_authors            : mod_authors,
             mod_description        : mod_description,
             mod_logo               : mod_logo,
             mod_github             : mod_github,
-            create_version_range   : create_version_range
+            create_version         : create_version.split("-")[0],
+            create_until_version   : create_until_version
     ]
     inputs.properties replaceProperties
     expand replaceProperties