merge upstream 26.2

build.gradle

@@ -1,14 +1,13 @@
 plugins {
-	id 'fabric-loom' version '1.6-SNAPSHOT'
-	id 'io.github.juuxel.loom-quiltflower' version '1.7.3'
+	id 'net.fabricmc.fabric-loom' version "${loom_version}"
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_21
-targetCompatibility = JavaVersion.VERSION_21
+base {
+	archivesName = project.archives_base_name
+}
 
-archivesBaseName = project.archives_base_name
-version = project.minecraft_version+'-'+project.mod_version+'+v'+new Date().format('yyMMdd')
+version = project.mod_version+'+v'+new Date().format('yyMMdd')
 group = project.maven_group
 
 loom {
@@ -19,25 +18,19 @@ loom {
 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}"
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	//modImplementation "net.fabricmc:fabric:${project.fabric_version}"
 	//modCompileOnly fabricApi.module("fabric-rendering-v1", project.fabric_version)
-
-	// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
-	// You may need to force-disable transitiveness on them.
-	compileOnly "com.google.code.findbugs:jsr305:${project.jsr305_version}"
-	
-	modImplementation 'me.lucko:fabric-permissions-api:0.3.1'
+	implementation 'me.lucko:fabric-permissions-api:0.7.0'
 }
 
 processResources {
-	inputs.property "version", project.version+'+v'+new Date().format('yyMMdd')
-
+	inputs.property "version", project.version
+	print("\nBuilding version: " + project.version + "\n")
 	filesMatching("fabric.mod.json") {
-		expand "version": project.mod_version+'+v'+new Date().format('yyMMdd')
+		expand "version": project.version
 	}
 }
 
@@ -50,7 +43,7 @@ tasks.withType(JavaCompile).configureEach {
 	it.options.encoding = "UTF-8"
 
 	// Minecraft 1.20.5 upwards uses Java 21.
-	it.options.release = 21
+	it.options.release = 25
 }
 
 java {
@@ -58,11 +51,14 @@ java {
 	// if it is present.
 	// If you remove this line, sources will not be generated.
 	withSourcesJar()
+
+	sourceCompatibility = JavaVersion.VERSION_25
+	targetCompatibility = JavaVersion.VERSION_25
 }
 
 jar {
 	from("LICENSE") {
-		rename { "${it}_${project.archivesBaseName}"}
+		rename { "${it}_${project.archives_base_name}"}
 	}
 }
 
@@ -79,7 +75,7 @@ publishing {
 	repositories {
 		// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
 		maven {
-			url "$projectDir/publish"
+			url = "$projectDir/publish"
 		}
 	}
 }