26.1

.github/workflows/beta.yml

@@ -39,10 +39,10 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set jar name
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         if: ${{ !inputs.skip_modify_version }}
         with:
           result-encoding: string
@@ -63,28 +63,28 @@ jobs:
             file = file.toString().split("\n").map(e => e.trim().startsWith("mod_version") ? `${e}-${buildType}-${commitSha.substring(0, 7)}` : e).join("\n");
             fs.writeFileSync("./gradle.properties", file);
 
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
+      - name: Set up JDK 25
+        uses: actions/setup-java@v5
         with:
           distribution: 'microsoft'
-          java-version: '21'
+          java-version: '25'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
       - name: Build with Gradle
         run: ./gradlew build
 
       - name: Store reports
         if: failure()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: reports
           path: |
             **/build/reports/
             **/build/test-results/
 
       - name: Process artifacts
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         id: fname
         with:
           result-encoding: string
@@ -93,7 +93,7 @@ jobs:
             return fs.readdirSync("build/libs/").filter(e => !e.endsWith("dev.jar") && !e.endsWith("sources.jar") && e.endsWith(".jar"))[0].replace(".jar", "");
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ steps.fname.outputs.result }}
           path: build/libs/
@@ -103,21 +103,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/checkout@v6
+      - name: Set up JDK 25
+        uses: actions/setup-java@v5
         with:
           distribution: 'microsoft'
-          java-version: '21'
+          java-version: '25'
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
 
       - name: Run client gametest with Xvfb
         uses: modmuss50/xvfb-action@v1
         with:
           run: ./gradlew runClientGametest
       - name: Upload test screenshots
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         if: always()
         with:
           name: Test Screenshots

.github/workflows/buildrelease.yml

@@ -9,28 +9,28 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
+      - uses: actions/checkout@v6
+      - name: Set up JDK 25
+        uses: actions/setup-java@v5
         with:
           distribution: 'microsoft'
-          java-version: '21'
+          java-version: '25'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
       - name: Build with Gradle
         run: ./gradlew build
 
       - name: Process artifacts
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         id: fname
         with:
           result-encoding: string
           script: |
             const fs = require("fs")
             return fs.readdirSync("build/libs/").filter(e => !e.endsWith("dev.jar") && !e.endsWith("sources.jar") && e.endsWith(".jar"))[0].replace(".jar", "");
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: ${{ steps.fname.outputs.result }}
           path: build/libs/

.github/workflows/webhook_translate.yml

@@ -13,16 +13,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: '1.20'
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-pkg-mod-${{ hashFiles('go.sum') }}

.gitignore

@@ -32,3 +32,4 @@ bin/
 # fabric
 
 run/
+.fabric/

build.gradle

@@ -1,6 +1,6 @@
 plugins {
 	// Building
-	id 'net.fabricmc.fabric-loom-remap' version "${loom_version}"
+	id 'net.fabricmc.fabric-loom' version "${loom_version}"
 	id "de.hysky.skyblocker.annotation-processor"
 	id "com.diffplug.spotless" version "${spotless_version}"
 	id "checkstyle"
@@ -134,45 +134,43 @@ dependencies {
 	// To change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
 
-	mappings loom.officialMojangMappings()
-
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+	implementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
 	// Loom does not always add this
 	implementation "ca.weblite:java-objc-bridge:1.1"
 
 	// Fabric API
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
+	implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
 
 	// Dandelion (also shades in MoulConfig)
-	include modImplementation("net.azureaaron:dandelion:${project.dandelion_version}")
+	include implementation("net.azureaaron:dandelion:${project.dandelion_version}")
 
 	// YACL
-	include modImplementation("dev.isxander:yet-another-config-lib:${project.yacl_version}-fabric")
+	include implementation("dev.isxander:yet-another-config-lib:${project.yacl_version}-fabric")
 
 	// HM API (Hypixel Mod API Library)
-	include modImplementation("net.azureaaron:hm-api:${project.hm_api_version}")
+	include implementation("net.azureaaron:hm-api:${project.hm_api_version}")
 
 	// Mod Menu
-	modImplementation "com.terraformersmc:modmenu:${project.mod_menu_version}"
+	implementation "com.terraformersmc:modmenu:${project.mod_menu_version}"
 
 	// REI
-	modCompileOnly("me.shedaniel:RoughlyEnoughItems-api-fabric:${project.rei_version}") {
-		exclude group: "net.fabricmc.fabric-api" //Stop this from importing an old version of FAPI that crashes everything
-	}
-	//modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}"
+	//compileOnly("me.shedaniel:RoughlyEnoughItems-api-fabric:${project.rei_version}") {
+	//exclude group: "net.fabricmc.fabric-api" //Stop this from importing an old version of FAPI that crashes everything
+	//}
+	//runtimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}"
 
 	// EMI
-	modCompileOnly "dev.emi:emi-fabric:${project.emi_version}:api"
-	//modLocalRuntime "dev.emi:emi-fabric:${project.emi_version}"
+	//compileOnly "dev.emi:emi-fabric:${project.emi_version}:api"
+	//localRuntime "dev.emi:emi-fabric:${project.emi_version}"
 
 	// JEI (Using modrinth repo since official release is in mojmap and doesn't work)
-	modCompileOnly "maven.modrinth:jei:${project.jei_version}-fabric"
-	//modRuntimeOnly "maven.modrinth:jei:${project.jei_version}-fabric"
+	//compileOnly "maven.modrinth:jei:${project.jei_version}-fabric"
+	//runtimeOnly "maven.modrinth:jei:${project.jei_version}-fabric"
 
 	compileOnly "com.demonwav.mcdev:annotations:${project.mcdev_annotations_version}"
 
-	include modImplementation("meteordevelopment:discord-ipc:1.1")
+	include implementation("meteordevelopment:discord-ipc:1.1")
 
 	// NEU RepoParser
 	include implementation("moe.nea:neurepoparser:${project.repoparser_version}")
@@ -193,16 +191,12 @@ dependencies {
 	include implementation("org.apache.commons:commons-text:${project.commons_text_version}")
 
 	// Fabric Language Kotlin for using MoulConfig - we are still a Java-exclusive mod
-	modImplementation("net.fabricmc:fabric-language-kotlin:${project.flk_version}")
+	implementation("net.fabricmc:fabric-language-kotlin:${project.flk_version}")
 }
 
 loom {
 	accessWidenerPath = file("src/main/resources/skyblocker.classtweaker")
 
-	mixin {
-		useLegacyMixinAp = false
-	}
-
 	decompilers {
 		vineflower {
 			options.put(
@@ -213,6 +207,16 @@ loom {
 	}
 }
 
+sourceSets {
+	main {
+		java {
+			exclude("**/compatibility/rei/**")
+			exclude("**/compatibility/jei/**")
+			exclude("**/compatibility/emi/**")
+		}
+	}
+}
+
 fabricApi {
 	configureTests {
 		createSourceSet = true
@@ -235,12 +239,13 @@ tasks.withType(ProcessResources).configureEach {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	it.options.release = 21
+	it.options.release = 25
+	it.options.compilerArgs << "-Xmaxerrs" << "2000"
 }
 
 java {
-	sourceCompatibility = JavaVersion.VERSION_21
-	targetCompatibility = JavaVersion.VERSION_21
+	sourceCompatibility = JavaVersion.VERSION_25
+	targetCompatibility = JavaVersion.VERSION_25
 }
 
 jar {
@@ -343,7 +348,7 @@ def truncateChangelog = { String text, int limit ->
 }
 
 publishMods {
-	file = remapJar.archiveFile
+	file = jar.archiveFile
 	changelog = System.getenv('CHANGELOG_HIGHLIGHT')
 	version = "v${project.version}"
 	displayName = "Skyblocker ${mod_version} for ${minecraft_version}"

buildSrc/build.gradle

@@ -7,16 +7,23 @@ repositories {
 }
 
 dependencies {
-	implementation "org.ow2.asm:asm:${project.asm_version}"
-	implementation "org.ow2.asm:asm-tree:${project.asm_version}"
+	implementation "org.jspecify:jspecify:${project.jspecify_version}"
 }
 
 gradlePlugin {
 	plugins {
 		simplePlugin {
 			id = 'de.hysky.skyblocker.annotation-processor'
-			// The plugin entry point could be changed to a different class that then appropriately calls the different processors when there's more than one.
 			implementationClass = 'de.hysky.skyblocker.Processor'
 		}
 	}
 }
+
+tasks.withType(JavaCompile).configureEach {
+	it.options.release = 25
+}
+
+java {
+	sourceCompatibility = JavaVersion.VERSION_25
+	targetCompatibility = JavaVersion.VERSION_25
+}

buildSrc/gradle.properties

@@ -1 +1 @@
-asm_version=9.9
+jspecify_version=1.0.0