Port to Minecraft 26.1.2 (Fabric-only)

.github/workflows/build.yml

@@ -6,31 +6,19 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 21
-        uses: actions/setup-java@v2
+      - uses: actions/checkout@v4
+      - name: Set up JDK 25
+        uses: actions/setup-java@v4
         with:
-          java-version: "21"
-          distribution: "adopt"
+          java-version: "25"
+          distribution: "temurin"
       - run: ./gradlew build
 
-      - name: Upload Forge Build
-        uses: actions/upload-artifact@v4
-        with:
-          name: Forge
-          path: dist/*-forge.jar
-
       - name: Upload Fabric Build
         uses: actions/upload-artifact@v4
         with:
           name: Fabric
-          path: dist/*-fabric.jar
-
-      - name: Upload Neoforge Build
-        uses: actions/upload-artifact@v4
-        with:
-          name: Neoforge
-          path: dist/*-neoforge.jar
+          path: build/libs/*.jar
 
       - name: Release Tag
         if: startsWith(github.ref, 'refs/tags/v')
@@ -39,6 +27,6 @@ jobs:
           prerelease: true
           fail_on_unmatched_files: true
           files: |
-            dist/*.jar
+            build/libs/*.jar
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -9,4 +9,4 @@ Load jalist, display snitch ranges, help place snitches.
 To download the most recent, unstable build:
 1. be logged into Github
 1. in the [Actions tab](https://github.com/Gjum/SnitchMod/actions), open the latest Workflow Run
-1. at the bottom, download the Forge/Fabric Artifact, and extract the mod jar from the zip file.
+1. at the bottom, download the Fabric Artifact, and extract the mod jar from the zip file.

build.gradle

@@ -1,53 +1,61 @@
 plugins {
-	id "architectury-plugin" version "3.4-SNAPSHOT"
-	id "dev.architectury.loom" version "1.13-SNAPSHOT" apply false
-}
-architectury {
-	minecraft = rootProject.minecraft_version
+	id 'net.fabricmc.fabric-loom' version "${loom_version}"
+	id 'maven-publish'
 }
 
-subprojects {
-	apply plugin: "dev.architectury.loom"
+version = project.mod_version
+group = project.maven_group
 
-	loom {
-		silentMojangMappingsLicense()
-	}
+base {
+	archivesName = project.archives_base_name
 }
 
-allprojects {
-	apply plugin: "java"
-	apply plugin: "architectury-plugin"
-	apply plugin: "maven-publish"
-
-	archivesBaseName = rootProject.archives_base_name
-	version = rootProject.mod_version
-	group = rootProject.maven_group
-
-	repositories {
-		// Add repositories to retrieve artifacts from in here.
-		// You should only use this when depending on other mods because
-		// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
-		// See https://docs.gradle.org/current/userguide/declaring_repositories.html
-		// for more information about repositories.
-		maven {
-			url "https://cursemaven.com"
-			content {
-				includeGroup "curse.maven"
-			}
-		}
-		maven {
-			name "Modrinth"
-			url "https://api.modrinth.com/maven"
-		}
-		maven { url "https://maven.neoforged.net/releases/" }
+repositories {
+	maven {
+		name "Modrinth"
+		url "https://api.modrinth.com/maven"
 	}
+	maven {
+		url "https://cursemaven.com"
+		content { includeGroup "curse.maven" }
+	}
+}
+
+dependencies {
+	minecraft "com.mojang:minecraft:${project.minecraft_version}"
+	implementation "net.fabricmc:fabric-loader:${project.loader_version}"
+	implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
+
+	// Bundle sqlite-jdbc inside the mod jar (Fabric jar-in-jar) so users don't install it separately.
+	implementation "org.xerial:sqlite-jdbc:3.47.0.0"
+	include "org.xerial:sqlite-jdbc:3.47.0.0"
+}
 
-	tasks.withType(JavaCompile).configureEach {
-		options.encoding = "UTF-8"
-		options.release = 21
+processResources {
+	inputs.property "version", project.version
+	inputs.property "minecraft_version", project.minecraft_version
+	inputs.property "fabric_loader_version", project.loader_version
+
+	filesMatching("fabric.mod.json") {
+		expand "version": project.version,
+				"minecraft_version": project.minecraft_version,
+				"fabric_loader_version": project.loader_version
 	}
+}
+
+tasks.withType(JavaCompile).configureEach {
+	it.options.encoding = "UTF-8"
+	it.options.release = 25
+}
+
+java {
+	withSourcesJar()
+	sourceCompatibility = JavaVersion.VERSION_25
+	targetCompatibility = JavaVersion.VERSION_25
+}
 
-	java {
-		withSourcesJar()
+jar {
+	from("LICENSE.txt") {
+		rename { "${it}_${project.archives_base_name}" }
 	}
 }