From 41888e33f64645c1e8f547c4f0ad8bb9a69e469f Mon Sep 17 00:00:00 2001
From: Brian Neumann-Fopiano <mypsn1550@gmail.com>
Date: Wed, 11 Feb 2026 00:01:23 -0500
Subject: [PATCH] Fixing fallbacks for macos Folk

Compiles fine, just stricter defaults
---
 build.gradle.kts          | 17 ++++++++++++-----
 buildSrc/build.gradle.kts | 18 +++++++++++++++++-
 core/build.gradle.kts     | 14 +++++++++++++-
 3 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index fc2dd0d5b..216677601 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,4 +1,5 @@
 import de.undercouch.gradle.tasks.download.Download
+import org.gradle.jvm.toolchain.JavaLanguageVersion
 import xyz.jpenilla.runpaper.task.RunServer
 import kotlin.system.exitProcess
 
@@ -50,7 +51,7 @@ registerCustomOutputTask("PixelFury", "C://Users/repix/workplace/Iris/1.21.3 - D
 registerCustomOutputTask("PixelFuryDev", "C://Users/repix/workplace/Iris/1.21 - Development-v3/plugins")
 // ========================== UNIX ==============================
 registerCustomOutputTaskUnix("CyberpwnLT", "/Users/danielmills/development/server/plugins")
-registerCustomOutputTaskUnix("PsychoLT", "/Users/brianfopiano/Developer/RemoteGit/Server/plugins")
+registerCustomOutputTaskUnix("PsychoLT", "/Users/brianfopiano/Developer/RemoteGit/[Minecraft Server]/plugins")
 registerCustomOutputTaskUnix("PixelMac", "/Users/test/Desktop/mcserver/plugins")
 registerCustomOutputTaskUnix("CrazyDev22LT", "/home/julian/Desktop/server/plugins")
 // ==============================================================
@@ -187,6 +188,12 @@ configurations.configureEach {
 allprojects {
     apply<JavaPlugin>()
 
+    java {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(21))
+        }
+    }
+
     repositories {
         mavenCentral()
         maven("https://repo.papermc.io/repository/maven-public/")
@@ -234,14 +241,14 @@ allprojects {
     }
 }
 
-if (JavaVersion.current().toString() != "21") {
+if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_21)) {
     System.err.println()
     System.err.println("=========================================================================================================")
-    System.err.println("You must run gradle on Java 21. You are using " + JavaVersion.current())
+    System.err.println("You must run gradle on Java 21 or newer. You are using " + JavaVersion.current())
     System.err.println()
     System.err.println("=== For IDEs ===")
-    System.err.println("1. Configure the project for Java 21")
-    System.err.println("2. Configure the bundled gradle to use Java 21 in settings")
+    System.err.println("1. Configure the project for Java 21 toolchain")
+    System.err.println("2. Configure the bundled gradle to use Java 21+ in settings")
     System.err.println()
     System.err.println("=== For Command Line (gradlew) ===")
     System.err.println("1. Install JDK 21 from https://www.oracle.com/java/technologies/javase/jdk21-archive-downloads.html")
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 192a8ab77..983ee94c1 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,7 +1,23 @@
+import org.gradle.jvm.toolchain.JavaLanguageVersion
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     kotlin("jvm") version embeddedKotlinVersion
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
+}
+
+kotlin {
+    jvmToolchain(21)
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_21)
+    }
+}
+
 repositories {
     mavenCentral()
     gradlePluginPortal()
@@ -13,4 +29,4 @@ dependencies {
     implementation("com.github.VolmitSoftware:NMSTools:c88961416f")
     implementation("io.papermc.paperweight:paperweight-userdev:2.0.0-beta.18")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
-}
\ No newline at end of file
+}
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index fe26f8981..a52d2689c 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -1,6 +1,8 @@
 import io.github.slimjar.func.slimjarHelper
 import io.github.slimjar.resolver.data.Mirror
 import org.ajoberstar.grgit.Grgit
+import org.gradle.jvm.toolchain.JavaLanguageVersion
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.net.URI
 
 /*
@@ -112,6 +114,16 @@ dependencies {
 
 java {
     disableAutoTargetJvm()
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
+}
+
+kotlin {
+    jvmToolchain(21)
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_21)
+    }
 }
 
 sentry {
@@ -216,4 +228,4 @@ rootProject.tasks.named("prepareKotlinBuildScriptModel") {
 
 sourceSets.main {
     java.srcDir(generateTemplates.map { it.outputs })
-}
\ No newline at end of file
+}