From c3cf5288ba0775acef9745fbeb598d2566a3761a Mon Sep 17 00:00:00 2001
From: Naz <bluspringindohq@gmail.com>
Date: Wed, 18 Dec 2024 03:02:45 +0800
Subject: [PATCH] Update a bunch of dependencies

---
 build.gradle.kts                         | 12 +++++++-----
 gradle.properties                        | 20 ++++++++++----------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 1f0f1d6c..bcd626e4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,19 +1,21 @@
 import org.ajoberstar.grgit.Grgit
 import org.jetbrains.kotlin.daemon.common.toHexString
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName
 import xyz.bluspring.kilt.gradle.AccessTransformerRemapper
 import java.security.MessageDigest
 
 plugins {
     kotlin("jvm")
-    id ("fabric-loom") version "1.7-SNAPSHOT"
+    id ("fabric-loom") version "1.9-SNAPSHOT"
     id ("maven-publish")
     id ("org.ajoberstar.grgit") version "5.0.0" apply false
 }
 
 version = "${property("mod_version")}+mc${property("minecraft_version")}${getVersionMetadata()}"
 group = property("maven_group")!!
-archivesName.set(property("archives_base_name")!! as String)
+
+base {
+    archivesName.set(property("archives_base_name")!! as String)
+}
 
 sourceSets {
     getByName("main") {
@@ -135,7 +137,7 @@ dependencies {
     modImplementation ("dev.architectury:architectury-fabric:${property("architectury_version")}")
 
     // Cursed Fabric/Mixin stuff
-    implementation(include("com.github.thecatcore:CursedMixinExtensions:${property("cursedmixinextensions_version")}")!!)
+    implementation(include("com.github.FabricCompatibilityLayers:CursedMixinExtensions:${property("cursedmixinextensions_version")}")!!)
     modImplementation(include("com.github.Chocohead:Fabric-ASM:v${property("fabric_asm_version")}")!!)
     include(implementation(annotationProcessor("com.github.bawnorton.mixinsquared:mixinsquared-fabric:${property("mixin_squared_version")}")!!)!!)
     include(modImplementation("de.florianmichael:AsmFabricLoader:${property("asmfabricloader_version")}")!!)
@@ -146,7 +148,7 @@ dependencies {
 //modImplementation(include("io.github.tropheusj:serialization-hooks:${property("serialization_hooks_version")}")!!)
     modImplementation(include("com.jamieswhiteshirt:reach-entity-attributes:${property("reach_entity_attributes_version")}")!!)
     modImplementation("fuzs.forgeconfigapiport:forgeconfigapiport-fabric:${property("forgeconfigapiport_version")}")
-    include(implementation("com.moulberry:mixinconstraints:${property("mixinconstraints_version")}")!!)
+    include(implementation("xyz.bluspring.kiltmc:MixinConstraints:${property("mixinconstraints_version")}")!!)
 
     // Forge stuff
     implementation(include("xyz.bluspring:eventbus:${property("eventbus_version")}") {
diff --git a/gradle.properties b/gradle.properties
index 55b85627..83c73335 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://fabricmc.net/develop
 minecraft_version=1.20.1
-loader_version=0.16.8
+loader_version=0.16.9
 
 # Mod Properties
 mod_version=0.0.1
@@ -19,13 +19,13 @@ parchment_release=2023.09.03
 ### Dependencies
 
 # https://modrinth.com/mod/fabric-language-kotlin/versions
-fabric_kotlin_version=1.10.19+kotlin.1.9.23
+fabric_kotlin_version=1.13.0+kotlin.2.1.0
 
 # https://fabricmc.net/develop/
-fabric_version=0.92.1+1.20.1
+fabric_version=0.92.2+1.20.1
 
 # https://modrinth.com/mod/forge-config-api-port/versions
-forgeconfigapiport_version=8.0.0
+forgeconfigapiport_version=8.0.1
 
 # https://modrinth.com/mod/architectury-api/versions
 architectury_version=9.2.14
@@ -41,7 +41,7 @@ no_indium_version=1.1.0+1.20
 cursedmixinextensions_version=1.1.0
 
 # https://github.com/LlamaLad7/MixinExtras/releases
-mixinextras_version=0.5.0-beta.3
+mixinextras_version=0.5.0-beta.4
 
 # https://github.com/Chocohead/Fabric-ASM/blob/master/build.gradle#L29
 fabric_asm_version=2.3
@@ -50,14 +50,14 @@ fabric_asm_version=2.3
 mixin_squared_version=0.2.0
 
 # https://mvnrepository.com/artifact/de.florianmichael/AsmFabricLoader
-## Use 1.1.2 as 1.1.3 onward requires JDK 21
-asmfabricloader_version=1.1.6
+asmfabricloader_version=1.1.7
 
-# https://github.com/IThundxr/MixinConstraints
-mixinconstraints_version=1.0.1
+# original - https://github.com/Moulberry/MixinConstraints
+# custom fork - https://mvn.devos.one/#/snapshots/xyz/bluspring/kiltmc/MixinConstraints
+mixinconstraints_version=1.0.3
 
 # https://mvn.devos.one/#/releases/io/github/fabricators_of_create/Porting-Lib/base
-porting_lib_version=2.3.4+1.20.1
+porting_lib_version=2.3.8+1.20.1
 
 # https://mvn.devos.one/#/snapshots/io/github/tropheusj/serialization-hooks
 # serialization_hooks_version=0.4.27
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0d184210..e48eca57 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists