V5

.github/dependabot.yml

@@ -0,0 +1,10 @@
+# Set update schedule for GitHub Actions
+
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every week
+      interval: "daily"

.github/workflows/build_artifacts.yml

@@ -14,24 +14,31 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '21'
           distribution: 'temurin'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v5
+        with:
+          cache-read-only: false
+
+      - name: Store short commit hash
+        run: echo "short_commit_hash=$(git rev-parse --short "$GITHUB_SHA")" >> "$GITHUB_ENV"
 
       - name: Build with Gradle
         run: ./gradlew build
         env:
+          PRESERVE_PRERELEASE_VERSION: true
           DISABLE_PROPERTIES_UPDATE: true
+          VERSION_SUFFIX: ${{ env.short_commit_hash }}
 
       - name: Delete common libs
         run: rm -r ./common/build/libs
 
       - name: Upload build artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: Artifacts
+          name: Build Artifacts
           path: ./*/build/libs/

.github/workflows/publish.yml

@@ -16,24 +16,27 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '21'
           distribution: 'temurin'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v5
         with:
           cache-read-only: false
 
       - name: Build with Gradle
         run: ./gradlew build
         env:
+          IS_RELEASE: true
           DISABLE_PROPERTIES_UPDATE: true
 
       - name: Upload to Modrinth
         run: ./gradlew modrinth
         env:
+          IS_RELEASE: true
+          DISABLE_PROPERTIES_UPDATE: true
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
           VERSION_NAME: ${{ github.event.release.name }}
           VERSION_IS_PRERELEASE: ${{ github.event.release.prerelease }}

build.gradle

@@ -1,24 +1,58 @@
 import dex.plugins.outlet.v2.util.ReleaseType
 
+import java.nio.file.Files
+
 plugins {
-	id 'fabric-loom' version '1.10-SNAPSHOT' apply false
+	id 'fabric-loom' version '1.14-SNAPSHOT' apply false
 	id 'io.github.dexman545.outlet' version '1.6.1' apply false
 	id 'com.modrinth.minotaur' version '2.+' apply false
 }
 
+ext {
+    versionPrefix = rootProject.mod_version
+    if (!Boolean.parseBoolean(System.getenv("IS_RELEASE"))) {
+        String preReleaseVersion = System.currentTimeMillis()
+
+        if (Boolean.parseBoolean(System.getenv("PRESERVE_PRERELEASE_VERSION"))) {
+            var preReleaseVersionFile = file("preReleaseVersion.txt").toPath()
+            if (Files.exists(preReleaseVersionFile)) preReleaseVersion = Files.readString(preReleaseVersionFile)
+            Files.writeString(preReleaseVersionFile, preReleaseVersion)
+        }
+
+        var separator = "-"
+        if (versionPrefix.contains("-")) separator = "."
+        versionPrefix = "${versionPrefix}${separator}${preReleaseVersion}"
+    }
+    final String versionSuffix = System.getenv("VERSION_SUFFIX")
+    if (versionSuffix != null && !versionSuffix.isEmpty()) {
+        versionPrefix = "${versionPrefix}+${versionSuffix}"
+    }
+
+    System.out.println("Version Prefix: " + versionPrefix)
+}
+
 allprojects {
 	group = "top.offsetmonkey538.githubresourcepackmanager"
 
 	repositories {
 		mavenLocal()
+        maven {
+            name = "OffsetMods538"
+            url = "https://maven.offsetmonkey538.top/releases"
+            content {
+                includeGroup "top.offsetmonkey538.meshlib"
+                includeGroup "top.offsetmonkey538.monkeylib538"
+                includeGroup "top.offsetmonkey538.offsetconfig538"
+            }
+        }
 	}
 }
 
 subprojects {
 	apply plugin: "java"
 
-	archivesBaseName = "github-resourcepack-manager-${project.nameSuffix}"
-	version = "${project.mod_version}+${project.minecraft_version}"
+	base.archivesName = "github-resourcepack-manager-${project.nameSuffix}"
+	version = "${rootProject.versionPrefix}+${project.minecraft_version}"
 
 	java {
 		withSourcesJar()
@@ -60,5 +94,4 @@ configure(subprojects.findAll { it.name != "common" }) {
 		}
 	}
 	tasks.modrinth.dependsOn(tasks.modrinthSyncBody)
-
 }

common/build.gradle

@@ -1,30 +1,46 @@
 plugins {
+    id 'java-library'
     id 'com.gradleup.shadow' version '9.0.0-beta4'
 }
 
 repositories {
     mavenCentral()
     maven {
-        name = "OffsetMods538"
-        url = "https://maven.offsetmonkey538.top/releases"
+        name = "Mojang Libraries"
+        url = "https://libraries.minecraft.net"
         content {
-            includeGroup "top.offsetmonkey538.meshlib"
+            includeGroup "com.mojang"
         }
     }
 }
 
 dependencies {
-    implementation "org.eclipse.jgit:org.eclipse.jgit:${project.jgit_version}"
-    implementation "blue.endless:jankson:${project.jankson_version}"
+    implementation "org.eclipse.jgit:org.eclipse.jgit:${rootProject.jgit_version}"
 
-    shadow compileOnly("top.offsetmonkey538.meshlib:mesh-lib-api:${project.meshlib_version}")
+    shadow compileOnlyApi("top.offsetmonkey538.monkeylib538:monkeylib538-common:${project.monkeylib538_version}")
 
-    // should be bundeled with minecraft
+    shadow compileOnly("top.offsetmonkey538.meshlib:mesh-lib-api:${project.meshlib_version}") {
+        exclude(group: "top.offsetmonkey538.monkeylib538")
+    }
+
+    // should be bundled with minecraft
+    shadow compileOnly("com.mojang:brigadier:1.3.10") //todo put in properties
     shadow compileOnly("com.google.guava:guava:${project.guava_version}")
-    shadow compileOnly("commons-io:commons-io:${project.commons_version}")
+    shadow compileOnly("commons-io:commons-io:${project.commonsio_version}")
+    shadow compileOnly("org.apache.commons:commons-lang3:${project.commonslang_version}")
     shadow compileOnly("com.google.code.gson:gson:${project.gson_version}")
 
     // Jetbrains annotations for gud code
     shadow compileOnly("org.jetbrains:annotations:24.0.0")
 }
 tasks.build.dependsOn(shadowJar)
+
+processResources {
+    final Map properties = [
+            "modVersion":                 project.version
+    ]
+    inputs.properties(properties)
+    filesMatching("META-INF/neoforge.mods.toml") {
+        expand(properties)
+    }
+}

common/gradle.properties

@@ -1,8 +1,6 @@
-jgit_version = 6.9.0.202403050737-r
 guava_version = 33.4.0-jre
-commons_version = 2.18.0
+commonsio_version = 2.18.0
+commonslang_version = 3.18.0
 gson_version = 2.11.0
-# Jankson, check at https://github.com/falkreon/Jankson
-jankson_version              = 1.2.3
 
 nameSuffix   = api