From f109df35233b7f1cc2623de7c28f4b9db695b895 Mon Sep 17 00:00:00 2001
From: creeper123123321 <7974274+creeper123123321@users.noreply.github.com>
Date: Sat, 23 Apr 2022 07:17:36 -0300
Subject: [PATCH] update gradle, fix 1.8.9 runClient

---
 build.gradle                             | 16 ++++++++++++----
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 viafabric-mc18/build.gradle.kts          |  3 +++
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 685f5cc..c86496b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,17 +41,25 @@ allprojects {
     apply plugin: "maven-publish"
     apply plugin: "fabric-loom"
 
+    java {
+        toolchain {
+            // lwjgl2 works with Adoptium
+            languageVersion = JavaLanguageVersion.of(17)
+            vendor = JvmVendorSpec.ADOPTIUM
+        }
+        withSourcesJar()
+    }
+
     tasks.withType(JavaCompile).configureEach {
         it.options.release.set(8)
     }
+    tasks.withType(JavaExec).configureEach {
+        it.javaLauncher.set(javaToolchains.launcherFor(java.toolchain))
+    }
 
     version = rootProject.version
     group = rootProject.group
 
-    java {
-        withSourcesJar()
-    }
-
     repositories {
         mavenCentral()
         maven { url = "https://repo.viaversion.com/" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2e6e589..aa991fc 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-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/viafabric-mc18/build.gradle.kts b/viafabric-mc18/build.gradle.kts
index 6c2694f..27b175d 100644
--- a/viafabric-mc18/build.gradle.kts
+++ b/viafabric-mc18/build.gradle.kts
@@ -6,6 +6,9 @@ dependencies {
     modImplementation("io.github.boogiemonster1o1:rewoven-modmenu:1.0.0+1.8.9") {
         isTransitive = false
     }
+
+    // fix newer java
+    implementation("io.netty:netty-all:4.0.56.Final")
 }
 
 loom {