Merge pull request #22 from OffsetMods538/v5

V5

Author: OffsetMonkey538

.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

@@ -12,26 +12,32 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - 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
-
-      - name: Delete common libs
-        run: rm -r ./common/build/libs
+          VERSION_SUFFIX: ${{ env.short_commit_hash }}
 
       - name: Upload build artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: Artifacts
-          path: ./*/build/libs/
+          name: Build Artifacts
+          path: ./loader/*/*/build/libs/

.github/workflows/publish.yml

@@ -14,35 +14,39 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - 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
+          VERSION_SUFFIX: ""
 
       - name: Upload to Modrinth
         run: ./gradlew modrinth
         env:
+          IS_RELEASE: true
+          DISABLE_PROPERTIES_UPDATE: true
+          VERSION_SUFFIX: ""
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
           VERSION_NAME: ${{ github.event.release.name }}
           VERSION_IS_PRERELEASE: ${{ github.event.release.prerelease }}
           VERSION_CHANGELOG: ${{ github.event.release.body }}
 
-      - name: Delete common libs
-        run: rm -r ./common/build/libs
-
       - name: Upload to GitHub
         uses: softprops/action-gh-release@v2
         with:
-          files: ./*/build/libs/*.jar
+          files: ./loader/*/*/build/libs/*.jar

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "buildSrc"]
+	path = buildSrc
+	url = https://github.com/OffsetMods538/multiversion-buildscripts

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023,2024,2025 OffsetMonkey538
+Copyright (c) 2023-2026 OffsetMonkey538
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,7 +1,19 @@
-# GitHub Resourcepack Manager
-[![discord-singular](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/social/discord-singular_vector.svg)](https://discord.offsetmonkey538.top/)
-[![modrinth](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/available/modrinth_vector.svg)](https://modrinth.com/mod/github-resourcepack-manager)  
-[![requires-monkeylib538](https://raw.githubusercontent.com/OffsetMods538/MonkeyLib538/master/images/requires_monkeylib538.png)](https://modrinth.com/mod/monkeylib538)
-[![Requires Fabric API](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/requires/fabric-api_vector.svg)](https://modrinth.com/mod/fabric-api)
+# Git Pack Manager
+[![Chat with me on Discord](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/social/discord-singular_vector.svg)](https://discord.offsetmonkey538.top/)
+[![Available on Modrinth](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/available/modrinth_vector.svg)](https://modrinth.com/mod/git-pack-manager)
+[![Available on GitHub](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/available/github_vector.svg)](https://github.com/OffsetMods538/Git-Pack-Manager)    
+[![Requires MonkeyLib538](https://raw.githubusercontent.com/OffsetMods538/MonkeyLib538/master/images/requires_badge.svg)](https://modrinth.com/mod/monkeylib538)
+[![Requires MESH Lib](https://raw.githubusercontent.com/OffsetMods538/MESH-Lib/refs/heads/master/images/requires_badge.svg)](https://modrinth.com/mod/mesh-lib)  
+[![Read the Documentation](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/documentation/ghpages_vector.svg)](https://git-pack-manager.docs.offsetmonkey538.top/)
 
-Please read the documentation located [here](https://github-resourcepack-manager.docs.offsetmonkey538.top) and if you have any questions, feel free to contact me on [discord](https://discord.offsetmonkey538.top/)
+## What's this?
+Git Pack Manager is a mod/plugin for dedicated servers that allows for handling resource and data packs with git.  
+Using git allows for easier management and collaboration.  
+The mod also supports automatically updating the packs as soon as modifications are made with git.  
+Resource packs are automatically combined based on their priorities.
+
+See the [boring showcase for Git Pack Manager](https://www.youtube.com/watch?v=S-ei-7u6yCI) video for an example of what it can do. 
+This allows for easier management of the packs and makes collaboration easier.
+
+## Using
+Please read the documentation located [here](https://git-pack-manager.docs.offsetmonkey538.top) and if you have any questions, feel free to contact me on [Discord](https://discord.offsetmonkey538.top/)

build.gradle

@@ -1,64 +1,43 @@
-import dex.plugins.outlet.v2.util.ReleaseType
-
 plugins {
-	id 'fabric-loom' version '1.10-SNAPSHOT' apply false
-	id 'io.github.dexman545.outlet' version '1.6.1' apply false
-	id 'com.modrinth.minotaur' version '2.+' apply false
+	id 'multiloader-root'
+	id 'java'
+	id 'net.neoforged.moddev'           version "${neoforged_moddev}"            apply false
+	id 'fabric-loom'                    version "${fabric_loom}"                 apply false
+	id 'io.papermc.paperweight.userdev' version "${papermc_paperweight_userdev}" apply false
+	id 'xyz.jpenilla.run-paper'         version "${jpenilla_run_task}"           apply false
+	id 'com.gradleup.shadow'            version "${gradleup_shadow}"             apply false
+	id 'xyz.jpenilla.resource-factory'  version "${jpenilla_resource_factory}"   apply false
+	id 'io.github.dexman545.outlet'     version "${dexman_outlet}"               apply false
+	id 'com.modrinth.minotaur'          version "${modrinth_minotaur}"           apply false
+	id 'hamburg.janove.elevator-music'  version "0.1"
 }
 
-allprojects {
-	group = "top.offsetmonkey538.githubresourcepackmanager"
-
-	repositories {
-		mavenLocal()
-	}
-}
+//elevatorMusic {
+//    if (Boolean.parseBoolean(System.getenv("DISABLE_MUSIC"))) return
+//    waitMusic = file("${rootProject.projectDir}/veryImportant/music.wav")
+//    successSound = file("${rootProject.projectDir}/veryImportant/done.wav")
+//}
 
 subprojects {
-	apply plugin: "java"
-
-	archivesBaseName = "github-resourcepack-manager-${project.nameSuffix}"
-	version = "${project.mod_version}+${project.minecraft_version}"
-
-	java {
-		withSourcesJar()
-	}
+	apply plugin: "java-library"
 
-	jar {
-		from("${rootProject.projectDir}/LICENSE") {
-			rename { "${it}" }
+	repositories {
+		mavenCentral()
+		mavenLocal()
+		exclusiveContent {
+			forRepository {
+				maven {
+					name = "OffsetMods538"
+					url = "https://maven.offsetmonkey538.top/releases"
+				}
+			}
+			filter {
+				includeGroupAndSubgroups "top.offsetmonkey538"
+			}
 		}
 	}
-}
 
-configure(subprojects.findAll { it.name != "common" }) {
-	apply plugin: 'com.modrinth.minotaur'
-	apply plugin: 'io.github.dexman545.outlet'
-
-	outlet {
-		mcVersionRange = rootProject.supported_minecraft_versions
-		allowedReleaseTypes = Set.of(ReleaseType.RELEASE)
+	dependencies {
+		compileOnlyApi "org.jspecify:jspecify:${rootProject.jspecify_version}"
 	}
-
-	modrinth {
-		token = System.getenv("MODRINTH_TOKEN")
-		projectId = "github-resourcepack-manager"
-		def customVersionName = System.getenv("VERSION_NAME")
-		if (customVersionName != null) versionName = customVersionName
-		versionNumber = "${project.version}"
-		versionType = "alpha"
-		def isPreRelease = System.getenv("VERSION_IS_PRERELEASE")
-		versionType = !"false".equals(isPreRelease) ? "beta" : "release"
-		additionalFiles = [sourcesJar.archiveFile]
-		gameVersions = outlet.mcVersions()
-		syncBodyFrom = rootProject.file("README.md").text
-		def changelogEnv = System.getenv("VERSION_CHANGELOG")
-		if (changelogEnv != null) changelog = changelogEnv
-
-		dependencies {
-			embedded.version "mesh-lib", "${project.meshlib_version}"
-		}
-	}
-	tasks.modrinth.dependsOn(tasks.modrinthSyncBody)
-
 }

buildSrc

@@ -1,30 +1,36 @@
 plugins {
-    id 'com.gradleup.shadow' version '9.0.0-beta4'
+    id 'multiloader-base'
 }
 
 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}"
+    compileOnlyApi("top.offsetmonkey538.monkeylib538:monkeylib538-common:${rootProject.monkeylib538_version}+common") {
+        exclude(group: "net.kyori")
+    }
+    compileOnlyApi("top.offsetmonkey538.meshlib:mesh-lib-common:${rootProject.meshlib_version}+common") {
+        exclude(group: "net.kyori")
+    }
 
-    shadow compileOnly("top.offsetmonkey538.meshlib:mesh-lib-api:${project.meshlib_version}")
+    compileOnlyApi "net.kyori:adventure-api:${project.adventure_api_version}"
+    compileOnlyApi "net.kyori:adventure-text-minimessage:${project.adventure_api_version}"
 
-    // should be bundeled with minecraft
-    shadow compileOnly("com.google.guava:guava:${project.guava_version}")
-    shadow compileOnly("commons-io:commons-io:${project.commons_version}")
-    shadow compileOnly("com.google.code.gson:gson:${project.gson_version}")
+    api("org.eclipse.jgit:org.eclipse.jgit:${rootProject.jgit_version}") {
+        transitive = false
+    }
 
-    // Jetbrains annotations for gud code
-    shadow compileOnly("org.jetbrains:annotations:24.0.0")
+    // should be bundled with minecraft
+    compileOnly "com.mojang:brigadier:${rootProject.brigadier_version}"
+    compileOnly "com.google.guava:guava:${rootProject.guava_version}"
+    compileOnly "commons-io:commons-io:${rootProject.commonsio_version}"
+    compileOnly "org.apache.commons:commons-lang3:${rootProject.commonslang_version}"
+    compileOnly "com.google.code.gson:gson:${rootProject.gson_version}"
 }
-tasks.build.dependsOn(shadowJar)

common/build.gradle

@@ -1,8 +1,5 @@
-jgit_version = 6.9.0.202403050737-r
-guava_version = 33.4.0-jre
-commons_version = 2.18.0
-gson_version = 2.11.0
-# Jankson, check at https://github.com/falkreon/Jankson
-jankson_version              = 1.2.3
+project_name          = common
 
-nameSuffix   = api
+# Dependencies
+## Adventure
+adventure_api_version = 4.26.1