From 3dbe1283445249d7d14bb81b6903e3ce4a7f4e8e Mon Sep 17 00:00:00 2001
From: Deftu <deftudev@gmail.com>
Date: Sat, 29 Jun 2024 04:45:43 +0200
Subject: [PATCH] Update DGT.

---
 build.gradle.kts    | 24 ++++++++++++++++++------
 settings.gradle.kts |  2 +-
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index b39723b..19b47af 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,6 +13,10 @@ plugins {
     id("dev.deftu.gradle.tools.minecraft.releases")
 }
 
+toolkitMultiversion {
+    moveBuildsToRootProject.set(true)
+}
+
 toolkitLoomHelper {
     if (!mcData.isNeoForge) {
         useMixinRefMap(modData.id)
@@ -29,8 +33,10 @@ toolkitLoomHelper {
 }
 
 dependencies {
-    modImplementation("dev.deftu:textile-$mcData:0.3.1")
-    modImplementation("dev.deftu:omnicore-$mcData:0.5.0")
+    val textileVersion = "0.3.1"
+    val omnicoreVersion = "0.6.0"
+    modImplementation("dev.deftu:textile-$mcData:$textileVersion")
+    modImplementation("dev.deftu:omnicore-$mcData:$omnicoreVersion")
 
     if (mcData.isFabric) {
         modImplementation("net.fabricmc.fabric-api:fabric-api:${mcData.dependencies.fabric.fabricApiVersion}")
@@ -40,13 +46,19 @@ dependencies {
         implementation(includeOrShade("org.jetbrains.kotlin:kotlin-reflect:1.6.10")!!)
 
         modImplementation(includeOrShade("org.spongepowered:mixin:0.7.11-SNAPSHOT")!!)
+
+        includeOrShade("dev.deftu:textile-$mcData:$textileVersion")
+        includeOrShade("dev.deftu:omnicore-$mcData:$omnicoreVersion")
     }
 }
 
 tasks {
-    withType<Jar> {
-        val buildDir = rootProject.layout.buildDirectory.asFile.get()
-        val jarsDir = buildDir.resolve("jars")
-        destinationDirectory.set(jarsDir)
+
+    fatJar {
+        if (mcData.isLegacyForge) {
+            relocate("dev.deftu.textile", "dev.deftu.favorita.textile")
+            relocate("dev.deftu.omnicore", "dev.deftu.favorita.omnicore")
+        }
     }
+
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7db802d..5e90d0e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -22,7 +22,7 @@ pluginManagement {
 
     plugins {
         kotlin("jvm") version("2.0.0")
-        id("dev.deftu.gradle.multiversion-root") version("2.0.9")
+        id("dev.deftu.gradle.multiversion-root") version("2.2.1")
     }
 }