From 942752001357c5f2237ddb8f4581f61e78704ac9 Mon Sep 17 00:00:00 2001
From: isXander <xandersmith2008@gmail.com>
Date: Wed, 25 Oct 2023 20:40:55 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=98=20Update=20to=20Loom=201.4=20+=20o?=
 =?UTF-8?q?ther=20deps?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle.kts                         |  9 ++++-----
 gradle/libs.versions.toml                | 12 +++++-------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index ba0d2e6..aa115d2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,7 +2,6 @@ plugins {
     java
 
     alias(libs.plugins.loom)
-    alias(libs.plugins.loom.vineflower)
 
     alias(libs.plugins.mod.publish.plugin)
     alias(libs.plugins.machete)
@@ -15,8 +14,8 @@ group = "dev.isxander"
 version = "1.7.0-beta.2+1.20"
 val isAlpha = "alpha" in version.toString()
 val isBeta = "beta" in version.toString()
-if (isAlpha) println("Alpha version detected.")
-if (isBeta) println("Beta version detected.")
+if (isAlpha) println("Controlify alpha version detected.")
+if (isBeta) println("Controlify beta version detected.")
 
 repositories {
     mavenCentral()
@@ -87,7 +86,7 @@ dependencies {
         modRuntimeOnly(fabricApi.module(it, libs.versions.fabric.api.get()))
     }
 
-    modImplementation(libs.yet.another.config.lib)
+    modApi(libs.yet.another.config.lib)
     modImplementation(libs.mod.menu)
 
     api(libs.mixin.extras)
@@ -98,7 +97,7 @@ dependencies {
     implementation(libs.hid4java)
     include(libs.hid4java)
 
-    // controller rumble
+    // lots of controller stuff
     implementation(libs.libsdl4j)
     include(libs.libsdl4j)
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 45af1d6..6eb1ce9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,5 @@
 [versions]
-loom = "1.3.+"
-loom_vineflower = "1.11.+"
+loom = "1.4.+"
 mod_publish_plugin = "0.2.+"
 machete = "2.+"
 grgit = "5.0.+"
@@ -9,10 +8,10 @@ blossom = "1.3.+"
 minecraft = "1.20.2"
 quilt_mappings = "2"
 fabric_loader = "0.14.22"
-fabric_api = "0.89.2+1.20.2"
-mixin_extras = "0.2.0-beta.9"
-yet_another_config_lib = "3.2.0+1.20.2"
-mod_menu = "8.0.0-beta.2"
+fabric_api = "0.90.4+1.20.2"
+mixin_extras = "0.2.0"
+yet_another_config_lib = "3.2.1+1.20.2"
+mod_menu = "8.0.0"
 hid4java = "0.7.0"
 quilt_json5 = "1.0.3"
 sodium = "mc1.20.2-0.5.3"
@@ -41,7 +40,6 @@ test_fabric_loader = { module = "net.fabricmc:fabric-loader-junit", version.ref
 
 [plugins]
 loom = { id = "fabric-loom", version.ref = "loom" }
-loom_vineflower = { id = "io.github.juuxel.loom-vineflower", version.ref = "loom_vineflower" }
 
 mod_publish_plugin = { id = "me.modmuss50.mod-publish-plugin", version.ref = "mod_publish_plugin" }
 machete = { id = "io.github.p03w.machete", version.ref = "machete" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 37aef8d..309b4e1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists