Update, DGT & DeftuLib and add 1.21 support

Deftu · Jun 13, 2024 · c46e33c · c46e33c
1 parent 3bf1480
commit c46e33c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,11 +7,10 @@ import dev.deftu.gradle.utils.GameSide
 plugins {
     java
     kotlin("jvm")
-    kotlin("plugin.serialization")
     id("dev.deftu.gradle.multiversion")
     id("dev.deftu.gradle.tools")
     id("dev.deftu.gradle.tools.resources")
-    id("dev.deftu.gradle.tools.blossom")
+    id("dev.deftu.gradle.tools.bloom")
     id("dev.deftu.gradle.tools.minecraft.loom")
     id("dev.deftu.gradle.tools.minecraft.releases")
 }
@@ -36,7 +35,7 @@ dependencies {
     modImplementation("net.fabricmc.fabric-api:fabric-api:${mcData.fabricApiVersion}")
     modImplementation(mcData.modMenuDependency)
     modImplementation("net.fabricmc:fabric-language-kotlin:1.7.4+kotlin.1.6.21")
-    modImplementation("dev.deftu:DeftuLib-${mcData.versionStr}-${mcData.loader.name}:1.8.0")
+    modImplementation("dev.deftu:DeftuLib-${mcData.versionStr}-${mcData.loader.name}:1.8.2")
 
     api(include("ca.weblite:java-objc-bridge:1.2")!!)
 }

diff --git a/root.gradle.kts b/root.gradle.kts
@@ -3,6 +3,7 @@ plugins {
 }
 
 preprocess {
+    val fabric_1_21 = createNode("1.21-fabric", 1_21_00, "yarn")
     val fabric_1_20_06 = createNode("1.20.6-fabric", 1_20_06, "yarn")
     val fabric_1_20_04 = createNode("1.20.4-fabric", 1_20_04, "yarn")
     val fabric_1_20_02 = createNode("1.20.2-fabric", 1_20_02, "yarn")
@@ -11,6 +12,7 @@ preprocess {
     val fabric_1_19_02 = createNode("1.19.2-fabric", 1_19_02, "yarn")
     val fabric_1_18_02 = createNode("1.18.2-fabric", 1_18_02, "yarn")
 
+    fabric_1_21.link(fabric_1_20_06)
     fabric_1_20_06.link(fabric_1_20_04)
     fabric_1_20_04.link(fabric_1_20_02)
     fabric_1_20_02.link(fabric_1_20_01)

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -22,11 +22,10 @@ pluginManagement {
     }
 
     plugins {
-        val kotlin = "1.9.0"
+        val kotlin = "2.0.0"
         kotlin("jvm") version(kotlin)
-        kotlin("plugin.serialization") version(kotlin)
 
-        val dgt = "1.26.3"
+        val dgt = "1.28.1"
         id("dev.deftu.gradle.multiversion-root") version(dgt)
     }
 }
@@ -42,7 +41,8 @@ listOf(
     "1.20.1-fabric",
     "1.20.2-fabric",
     "1.20.4-fabric",
-    "1.20.6-fabric"
+    "1.20.6-fabric",
+    "1.21-fabric"
 ).forEach { version ->
     include(":$version")
     project(":$version").apply {

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -41,6 +41,6 @@
         "fabric-language-kotlin": ">=1.7.4+kotlin.1.6.21",
         "minecraft": "~${mc_version}",
         "java": ">=17",
-        "deftulib": ">=1.8.0"
+        "deftulib": ">=1.8.2"
     }
 }