Merge with upstream and general updating to suit 26.1

Author: cev-api

.github/workflows/build.yml

@@ -6,6 +6,7 @@ on:
   pull_request:
     branches:
       - master
+  create: # for Git tag creations
 
 jobs:
   compile-cubiomes:
@@ -16,7 +17,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: 'true'
 
@@ -65,19 +66,19 @@ jobs:
 
       - name: Capture shared library (ubuntu-latest)
         if: matrix.os == 'ubuntu-latest'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: libcubiomes.so
           path: src/main/resources/libcubiomes.so
       - name: Capture shared library (macos-latest)
         if: matrix.os == 'macos-latest'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: libcubiomes.dylib
           path: src/main/resources/libcubiomes.dylib
       - name: Capture shared library (windows-latest)
         if: matrix.os == 'windows-latest'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: cubiomes.dll
           path: src/main/resources/cubiomes.dll
@@ -90,20 +91,20 @@ jobs:
       LLVM_HOME: /usr/lib/llvm-13
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           submodules: 'true'
       - name: Capture shared library
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           merge-multiple: true
           path: src/main/resources/
       - name: Validate gradle wrapper
-        uses: gradle/actions/wrapper-validation@v4
-      - name: Setup JDK 23
-        uses: actions/setup-java@v4
+        uses: gradle/actions/wrapper-validation@v5
+      - name: Setup JDK 25
+        uses: actions/setup-java@v5
         with:
-          java-version: 23
+          java-version: 25
           distribution: 'temurin'
       - name: Make Gradle wrapper executable
         run: |
@@ -120,7 +121,52 @@ jobs:
       - name: Build
         run: ./gradlew build
       - name: Capture build artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: SeedMapper
           path: build/libs/
+
+  # if a Git tag was created, verify it is for a stable version to make a release
+  validate-tag:
+    name: Validate tag
+    needs: build
+    if: github.ref_type == 'tag'
+    runs-on: ubuntu-latest
+    outputs:
+      valid: ${{ steps.check_tag.outputs.valid }}
+    steps:
+      - name: Check tag format
+        id: check_tag
+        run: |
+          TAG="${GITHUB_REF_NAME}"
+          if [[ "$TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            echo "valid=true" >> $GITHUB_OUTPUT
+          else
+            echo "valid=false" >> $GITHUB_OUTPUT
+          fi
+
+  release:
+    name: Release SeedMapper
+    needs: validate-tag
+    if: needs.validate-tag.outputs.valid == 'true'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+      - name: Capture JAR
+        uses: actions/download-artifact@v8
+        with:
+          name: SeedMapper
+          path: build/libs/
+      - name: Setup JDK 25
+        uses: actions/setup-java@v5
+        with:
+          java-version: 25
+          distribution: 'temurin'
+      - name: Make Gradle wrapper executable
+        run: chmod +x ./gradlew
+      - name: Release artifact
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
+        run: ./gradlew publishMods --stacktrace

README.md

@@ -1,4 +1,4 @@
-# Seedmapper 2.21.x (MC1.21.11) - Modified by CevAPI
+# Seedmapper 2.22.x (MC26.1) - Modified by CevAPI
 
 Original Repo: https://github.com/xpple/SeedMapper/
 

build.gradle

@@ -3,69 +3,60 @@ import dev.xpple.seedmapper.buildscript.GenerateBuildInfoTask
 import net.fabricmc.loom.task.prod.ClientProductionRunTask
 
 plugins {
-	id 'fabric-loom' version "${fabric_loom_version}"
-	id 'maven-publish'
+    id 'net.fabricmc.fabric-loom' version "${fabric_loom_version}"
+    id 'me.modmuss50.mod-publish-plugin' version "${mod_publish_plugin_version}"
 }
 
+version = project.mod_version
+group = project.maven_group
+
 base {
-	archivesName = project.archives_base_name
-	version = project.mod_version
-	group = project.maven_group
+    archivesName = project.archives_base_name
 }
 
 loom {
-	accessWidenerPath = file('src/main/resources/seedmapper.aw')
+    accessWidenerPath = file('src/main/resources/seedmapper.aw')
 }
 
 repositories {
-	mavenCentral()
-	maven {
-		name = 'xpple'
-		url = 'https://maven.xpple.dev/maven2'
-	}
-	maven {
-		name = 'ParchmentMC'
-		url = 'https://maven.parchmentmc.org'
-	}
-	maven {
-		name = 'DJtheRedstoner'
-		url = 'https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1'
-	}
-	maven {
-		name = 'MeteorDevelopment'
-		url = 'https://maven.meteordev.org/snapshots'
-	}
+    mavenCentral()
+    maven {
+        name = 'xpple'
+        url = 'https://maven.xpple.dev/maven2'
+    }
+    maven {
+        name = 'DJtheRedstoner'
+        url = 'https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1'
+    }
+    maven {
+        name = 'MeteorDevelopment'
+        url = 'https://maven.meteordev.org/snapshots'
+    }
 }
 
 dependencies {
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings loom.layered {
-		officialMojangMappings {
-			nameSyntheticMembers = true
-		}
-		parchment "org.parchmentmc.data:${project.parchment_mappings}"
-	}
-	modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}"
-
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
-	productionRuntimeMods "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
-
-	include modImplementation("dev.xpple:clientarguments:${project.clientarguments_version}")
-	include modImplementation("dev.xpple:betterconfig-fabric:${project.betterconfig_version}")
-	include modImplementation("dev.xpple:simplewaypoints:${project.simplewaypoints_version}")
-
-	modRuntimeOnly("me.djtheredstoner:DevAuth-fabric:${project.devauth_version}") {
-		exclude group: 'net.fabricmc', module: 'fabric-loader'
-	}
-	productionRuntimeMods("me.djtheredstoner:DevAuth-fabric:${project.devauth_version}") {
-		exclude group: 'net.fabricmc', module: 'fabric-loader'
-	}
-
-	modCompileOnly "meteordevelopment:baritone:${project.baritone_version}"
-
-	testImplementation platform("org.junit:junit-bom:${project.junit_version}")
-	testImplementation 'org.junit.jupiter:junit-jupiter'
-	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
+    implementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}"
+
+    implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
+    productionRuntimeMods "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
+
+    include implementation("dev.xpple:clientarguments:${project.clientarguments_version}")
+    include implementation("dev.xpple:betterconfig-fabric:${project.betterconfig_version}")
+    include implementation("dev.xpple:simplewaypoints:${project.simplewaypoints_version}")
+
+    runtimeOnly("me.djtheredstoner:DevAuth-fabric:${project.devauth_version}") {
+        exclude group: 'net.fabricmc', module: 'fabric-loader'
+    }
+    productionRuntimeMods("me.djtheredstoner:DevAuth-fabric:${project.devauth_version}") {
+        exclude group: 'net.fabricmc', module: 'fabric-loader'
+    }
+
+    compileOnly "meteordevelopment:baritone:${project.baritone_version}"
+
+    testImplementation platform("org.junit:junit-bom:${project.junit_version}")
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 clean {
@@ -80,63 +71,92 @@ compileJava.dependsOn('createJavaBindings')
 createJavaBindings.dependsOn(clean)
 
 tasks.register('generateBuildInfo', GenerateBuildInfoTask) {
-	outputFile = new File(temporaryDir, "build_info.json")
+    outputFile = new File(temporaryDir, "build_info.json")
 }
 
 tasks.register("prodClient", ClientProductionRunTask) {
-	runDir = file("run")
+    runDir = file("run")
 
-	jvmArgs.add("-Ddevauth.enabled=true")
+    jvmArgs.add("-Ddevauth.enabled=true")
 
-	javaLauncher = javaToolchains.launcherFor {
-		languageVersion = JavaLanguageVersion.of(23)
-	}
+    javaLauncher = javaToolchains.launcherFor {
+        languageVersion = JavaLanguageVersion.of(25)
+    }
 }
 
 processResources {
-	def props = [version: project.mod_version, minecraft_version_dependency: project.minecraft_version_dependency, loader_version: project.fabric_loader_version]
-	inputs.properties props
-	filteringCharset "UTF-8"
+    def props = [version: project.mod_version, minecraft_version_dependency: project.minecraft_version_dependency, loader_version: project.fabric_loader_version]
+    inputs.properties props
+    filteringCharset "UTF-8"
 
-	filesMatching("fabric.mod.json") {
-		expand props
-	}
+    filesMatching("fabric.mod.json") {
+        expand props
+    }
 
-	from("LICENSE") {
-		rename {"${it}_${project.base.archivesName.get()}"}
-	}
+    from("LICENSE") {
+        rename {"${it}_${project.base.archivesName.get()}"}
+    }
 
-	from("src/main/c/cubiomes/LICENSE") {
-		rename {"${it}_cubiomes"}
-	}
+    from("src/main/c/cubiomes/LICENSE") {
+        rename {"${it}_cubiomes"}
+    }
 
-	from("src/main/c/cubiomes/loot/LICENSE_loot_library.h.txt")
+    from("src/main/c/cubiomes/loot/LICENSE_loot_library.h.txt")
 
-	from generateBuildInfo
+    from generateBuildInfo
 }
 
 tasks.withType(JavaCompile).configureEach {
-	it.options.release = 23
+    it.options.release = 25
 }
 
 java {
-	sourceCompatibility = JavaVersion.VERSION_23
-	targetCompatibility = JavaVersion.VERSION_23
+    sourceCompatibility = JavaVersion.VERSION_25
+    targetCompatibility = JavaVersion.VERSION_25
 }
 
 test {
-	useJUnitPlatform()
+    useJUnitPlatform()
 }
 
-publishing {
-	publications {
-		mavenJava(MavenPublication) {
-			artifactId = project.base.archivesName.get()
-			from components.java
-		}
-	}
+publishMods {
+    def artifactFile = base.getLibsDirectory().file(jar.archiveFileName)
+    if (!artifactFile.isPresent()) {
+        logger.lifecycle("Artifact not present!")
+        return
+    }
+    def changeLogText = providers.fileContents(layout.projectDirectory.file("changelog.md")).asText
+    if (!changeLogText.isPresent()) {
+        logger.lifecycle("Changelog file not found!")
+        return
+    }
+
+    displayName = "Release ${project.mod_version}"
+    type = STABLE
+    modLoaders.add('fabric')
+    github {
+        changelog = changeLogText.map {"Download available [on Modrinth](https://modrinth.com/mod/seedmapper/version/${project.mod_version}).\n\n${it}"}
 
-	repositories {
+        repository = 'xpple/SeedMapper'
+        accessToken = providers.environmentVariable("GITHUB_TOKEN")
+        commitish = 'master'
+        tagName = "v${project.mod_version}"
 
-	}
+        allowEmptyFiles = true
+    }
+    modrinth {
+        file = artifactFile
+        changelog = changeLogText
+
+        projectId = "C4GbEnuY"
+        accessToken = providers.environmentVariable("MODRINTH_TOKEN")
+        project.minecraft_version_list.split('\\s*,\\s*').toList().forEach {minecraftVersions.add(it)}
+
+        embeds {
+            slug = 'betterconfig'
+        }
+        embeds {
+            slug = 'simplewaypoints'
+        }
+    }
 }