Port to 1.20.6HEADmaster

1 files changed, 60 insertions, 56 deletions

diff --git a/build.gradle b/build.gradle
index b18923a..b6acd8b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,31 +1,31 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-	id 'fabric-loom' version '1.5-SNAPSHOT'
-	id 'maven-publish'
-  	id "org.jetbrains.kotlin.jvm" version "1.8.21"
-	id "org.jetbrains.kotlin.plugin.serialization" version "1.8.10"
+    id 'fabric-loom' version '1.6-SNAPSHOT'
+    id 'maven-publish'
+    id "org.jetbrains.kotlin.jvm" version "1.9.23"
+    id "org.jetbrains.kotlin.plugin.serialization" version "1.9.23"
 }
 
 version = project.mod_version
 group = project.maven_group
 
 base {
-	archivesName = project.archives_base_name
+    archivesName = project.archives_base_name
 }
 
 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://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1" }
-	maven { url "https://repo.nea.moe/mirror" }
-	maven { url "https://repo.nea.moe/releases/" }
-	maven { url "https://maven.shedaniel.me/" }
-	maven { url "https://maven.terraformersmc.com/releases/" }
-	maven { url = "https://jitpack.io/" }
+    // 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://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1" }
+    maven { url "https://repo.nea.moe/mirror" }
+    maven { url "https://repo.nea.moe/releases/" }
+    maven { url "https://maven.shedaniel.me/" }
+    maven { url "https://maven.terraformersmc.com/releases/" }
+    maven { url = "https://jitpack.io/" }
     maven {
         url "https://api.modrinth.com/maven"
         content {
@@ -35,65 +35,69 @@ repositories {
 }
 
 dependencies {
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
+    mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-	modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}"
-	modRuntimeOnly("me.djtheredstoner:DevAuth-fabric:1.1.2")
-	implementation "meteordevelopment:orbit:0.2.3"
-	include "meteordevelopment:orbit:0.2.3"
-	modApi "me.shedaniel.cloth:cloth-config-fabric:13.0.121"
-	include "me.shedaniel.cloth:cloth-config-fabric:13.0.121"
-	modImplementation("moe.nea.jarvis:jarvis-api:1.1.1")
-	include("moe.nea.jarvis:jarvis-fabric:1.1.1")
-	modLocalRuntime("moe.nea.jarvis:jarvis-fabric:1.1.1")
-    modImplementation "maven.modrinth:modmenu:9.0.0"
-    modLocalRuntime "maven.modrinth:modmenu:9.0.0"
+    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+    modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}"
+    modRuntimeOnly("me.djtheredstoner:DevAuth-fabric:1.1.2")
+    implementation "meteordevelopment:orbit:0.2.3"
+    include "meteordevelopment:orbit:0.2.3"
+    modApi "me.shedaniel.cloth:cloth-config-fabric:14.0.126"
+    include "me.shedaniel.cloth:cloth-config-fabric:14.0.126"
+    modImplementation("moe.nea.jarvis:jarvis-api:1.1.1")
+    include("moe.nea.jarvis:jarvis-fabric:1.1.1") {
+        exclude(group: "net.fabricmc.fabric-api")
+    }
+    modLocalRuntime("moe.nea.jarvis:jarvis-fabric:1.1.1") {
+        exclude(group: "net.fabricmc.fabric-api")
+    }
+    modImplementation "maven.modrinth:modmenu:10.0.0-beta.1"
+    modLocalRuntime "maven.modrinth:modmenu:10.0.0-beta.1"
 }
 
 loom {
-	runs {
-		removeIf { it.name != "client" }
-		named("client") {
-			property("devauth.enabled", "true")
-			property("fabric.log.level", "info")
-			vmArg("-ea")
-			vmArg("-XX:+AllowEnhancedClassRedefinition")
-		  /*vmArg("-XX:HotswapAgent=external")
-			vmArg("-javaagent:/home/ronald/Software-Packages/hotswap-agent-1.4.2-SNAPSHOT.jar")*/
-		}
-	}
-	accessWidenerPath = file("src/main/resources/dulkirmod.accesswidener")
+    runs {
+        removeIf { it.name != "client" }
+        named("client") {
+            property("devauth.enabled", "true")
+            property("fabric.log.level", "info")
+            vmArg("-ea")
+            vmArg("-XX:+AllowEnhancedClassRedefinition")
+            /*vmArg("-XX:HotswapAgent=external")
+              vmArg("-javaagent:/home/ronald/Software-Packages/hotswap-agent-1.4.2-SNAPSHOT.jar")*/
+        }
+    }
+    accessWidenerPath = file("src/main/resources/dulkirmod.accesswidener")
 }
 
 processResources {
-	inputs.property "version", project.version
+    inputs.property "version", project.version
 
-	filesMatching("fabric.mod.json") {
-		expand "version": project.version
-	}
+    filesMatching("fabric.mod.json") {
+        expand "version": project.version
+    }
 }
 
 tasks.withType(JavaCompile).configureEach {
-	it.options.encoding = "UTF-8"
-	it.options.release = 17
+    it.options.encoding = "UTF-8"
+    it.options.release = 21
 }
 
 tasks.withType(KotlinCompile).configureEach {
-	kotlinOptions.jvmTarget = 17
+    kotlinOptions.jvmTarget = 21
 }
 
 java {
-	withSourcesJar()
+    withSourcesJar()
 
-	sourceCompatibility = JavaVersion.VERSION_17
-	targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 jar {
-	from("LICENSE") {
-		rename { "${it}_${base.archivesName.get()}"}
-	}
+    from("LICENSE") {
+        rename { "${it}_${base.archivesName.get()}" }
+    }
 }
\ No newline at end of file