1.20.4

isXander · Jan 16, 2024 · f587062 · f587062
1 parent 28fb286
commit f587062
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 26 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,7 +4,6 @@ plugins {
     alias(libs.plugins.kotlin.plugin.serialization)
 
     alias(libs.plugins.loom)
-    alias(libs.plugins.loom.vineflower)
 
     id("com.modrinth.minotaur") version "2.7.+"
     id("me.hypherionmc.cursegradle") version "2.+"
@@ -15,7 +14,7 @@ plugins {
 }
 
 group = "dev.isxander"
-version = "2.12.0"
+version = "2.13.0"
 
 repositories {
     mavenCentral()
@@ -32,7 +31,9 @@ repositories {
 dependencies {
     minecraft(libs.minecraft)
     mappings(loom.layered {
-        mappings("org.quiltmc:quilt-mappings:${libs.versions.minecraft.get()}+build.${libs.versions.quilt.mappings.get()}:intermediary-v2")
+        val quiltMappings = libs.versions.quilt.mappings.get()
+        if (quiltMappings != "0")
+            mappings("org.quiltmc:quilt-mappings:${libs.versions.minecraft.get()}+build.$quiltMappings:intermediary-v2")
         officialMojangMappings()
     })
     modImplementation(libs.fabric.loader)
@@ -103,7 +104,7 @@ if (modrinthId.isNotEmpty()) {
         versionNumber.set("${project.version}")
         versionType.set("release")
         uploadFile.set(tasks["remapJar"])
-        gameVersions.set(listOf("1.20.2"))
+        gameVersions.set(listOf("1.20.3", "1.20.2"))
         loaders.set(listOf("fabric", "quilt"))
         changelog.set(changelogText)
         syncBodyFrom.set(file("README.md").readText())
@@ -127,6 +128,7 @@ if (hasProperty("curseforge.token") && curseforgeId.isNotEmpty()) {
 
             id = curseforgeId
             releaseType = "release"
+            addGameVersion("1.20.3")
             addGameVersion("1.20.2")
             addGameVersion("Fabric")
             addGameVersion("Quilt")

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,19 +1,18 @@
 [versions]
-kotlin = "1.9.10"
-loom = "1.3.+"
-loom_vineflower = "1.11.+"
-
-minecraft = "1.20.2"
-fabric_loader = "0.14.22"
-quilt_mappings = "2"
-
-fabric_api = "0.89.1+1.20.2"
-fabric_language_kotlin = "1.10.10+kotlin.1.9.10"
-ktoml = "0.5.0"
-yet_another_config_lib = "3.2.1+1.20.2"
-mod_menu = "8.0.0-beta.2"
-mixin_extras = "0.2.0-rc.4"
-controlify = "1.7.0-beta.2+1.20"
+kotlin = "1.9.22"
+loom = "1.5.+"
+
+minecraft = "1.20.4"
+fabric_loader = "0.15.5"
+quilt_mappings = "0"
+
+fabric_api = "0.94.0+1.20.4"
+fabric_language_kotlin = "1.10.17+kotlin.1.9.22"
+ktoml = "0.5.1"
+yet_another_config_lib = "3.3.1+1.20.4"
+mod_menu = "9.0.0"
+mixin_extras = "0.3.2"
+controlify = "1.7.0+1.20.4"
 
 settxi = "2.10.6"
 
@@ -26,7 +25,7 @@ fabric_language_kotlin = { module = "net.fabricmc:fabric-language-kotlin", versi
 ktoml_core = { module = "com.akuleshov7:ktoml-core-jvm", version.ref = "ktoml" }
 yet_another_config_lib = { module = "dev.isxander.yacl:yet-another-config-lib-fabric", version.ref = "yet_another_config_lib" }
 mod_menu = { module = "com.terraformersmc:modmenu", version.ref = "mod_menu" }
-mixin_extras = { module = "com.github.llamalad7.mixinextras:mixinextras-fabric", version.ref = "mixin_extras" }
+mixin_extras = { module = "io.github.llamalad7:mixinextras-fabric", version.ref = "mixin_extras" }
 controlify = { module = "dev.isxander:controlify", version.ref = "controlify" }
 settxi_core = { module = "dev.isxander.settxi:settxi-core", version.ref = "settxi" }
 settxi_serialization_kotlinx = { module = "dev.isxander.settxi:settxi-kotlinx-serialization", version.ref = "settxi" }
@@ -42,7 +41,6 @@ kotlin_jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin_plugin_serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 
 loom = { id = "fabric-loom", version.ref = "loom" }
-loom_vineflower = { id = "io.github.juuxel.loom-vineflower", version.ref = "loom_vineflower" }
 
 
 

diff --git 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.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/kotlin/dev/isxander/zoomify/Zoomify.kt b/src/main/kotlin/dev/isxander/zoomify/Zoomify.kt
@@ -231,7 +231,7 @@ object Zoomify : ClientModInitializer {
 
                     val toast = SystemToast.multiline(
                         minecraft,
-                        SystemToast.SystemToastIds.TUTORIAL_HINT, // doesn't do anything except toast duration
+                        SystemToast.SystemToastId.PERIODIC_NOTIFICATION, // doesn't do anything except toast duration
                         Component.translatable("zoomify.toast.unbindConflicting.name"),
                         Component.translatable("zoomify.toast.unbindConflicting.description",
                             Component.translatable(key.name)
@@ -256,7 +256,7 @@ object Zoomify : ClientModInitializer {
         if (minecraft.options.keyMappings.any { it != zoomKey && it.equals(zoomKey) }) {
             val toast = SystemToast.multiline(
                 minecraft,
-                SystemToast.SystemToastIds.UNSECURE_SERVER_WARNING,
+                SystemToast.SystemToastId.UNSECURE_SERVER_WARNING,
                 Component.translatable("zoomify.toast.conflictingKeybind.title"),
                 Component.translatable("zoomify.toast.conflictingKeybind.description",
                     Component.translatable("zoomify.gui.category.misc")

diff --git a/src/main/kotlin/dev/isxander/zoomify/config/SettingsGuiFactory.kt b/src/main/kotlin/dev/isxander/zoomify/config/SettingsGuiFactory.kt
@@ -452,7 +452,7 @@ fun createSettingsGui(parent: Screen? = null): Screen {
                         val minecraft = Minecraft.getInstance()
                         minecraft.toasts.addToast(SystemToast.multiline(
                             minecraft,
-                            SystemToast.SystemToastIds.TUTORIAL_HINT,
+                            SystemToast.SystemToastId.PERIODIC_NOTIFICATION,
                             Component.translatable("zoomify.gui.title"),
                             Component.translatable("zoomify.migrate.no_migrations")
                         ))
@@ -472,7 +472,7 @@ fun createSettingsGui(parent: Screen? = null): Screen {
                         action { screen, _ ->
                             val minecraft = Minecraft.getInstance()
                             preset.apply(ZoomifySettings)
-                            minecraft.toasts.addToast(SystemToast.multiline(minecraft, SystemToast.SystemToastIds.TUTORIAL_HINT, Component.translatable("zoomify.gui.preset.toast.title"), Component.translatable("zoomify.gui.preset.toast.description", Component.translatable(preset.displayName))))
+                            minecraft.toasts.addToast(SystemToast.multiline(minecraft, SystemToast.SystemToastId.PERIODIC_NOTIFICATION, Component.translatable("zoomify.gui.preset.toast.title"), Component.translatable("zoomify.gui.preset.toast.description", Component.translatable(preset.displayName))))
 
                             OptionUtils.forEachOptions(screen.config, Option<*>::forgetPendingValue)
                             ZoomifySettings.export()