Merge remote-tracking branch 'upstream/master' into fork/SleepyPopp/feat/26.1

# Conflicts:
#	gradle/libs.versions.toml

Author: onebeastchris

build-logic/build.gradle.kts

@@ -8,6 +8,13 @@ repositories {
     maven("https://maven.architectury.dev/")
     maven("https://maven.fabricmc.net/")
     maven("https://maven.neoforged.net/releases/")
+    maven("https://jitpack.io/")
+}
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
 }
 
 dependencies {

build-logic/settings.gradle.kts

@@ -8,4 +8,8 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "build-logic"
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version ("1.0.0")
+}
+
+rootProject.name = "build-logic"

build-logic/src/main/kotlin/floodgate-modded.platform-conventions.gradle.kts

@@ -30,6 +30,12 @@ loom {
     silentMojangMappingsLicense()
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
 configurations {
     create("includeTransitive").isTransitive = true
 }

gradle/libs.versions.toml

@@ -33,7 +33,8 @@ geyser-mod = { group = "org.geysermc.geyser", name = "mod", version.ref = "geyse
 geyser-core = { group = "org.geysermc.geyser", name = "core", version.ref = "geyser" }
 indra = { group = "net.kyori", name  = "indra-common", version.ref = "indra" }
 shadow = { group = "com.gradleup.shadow", name = "com.gradleup.shadow.gradle.plugin", version.ref = "shadow" }
-architectury-plugin = { group = "architectury-plugin", name = "architectury-plugin.gradle.plugin", version.ref = "architectury-plugin" }
+# architectury-plugin = { group = "architectury-plugin", name = "architectury-plugin.gradle.plugin", version.ref = "architectury-plugin" }
+architectury-plugin = { group = "dev.kastle.architectury-plugin", name = "architectury-plugin.gradle.plugin", version = "5ffb79eb20" }
 architectury-loom = { group = "dev.architectury.loom-no-remap", name = "dev.architectury.loom-no-remap.gradle.plugin", version.ref = "architectury-loom" }
 guice = { group = "com.google.inject", name = "guice", version.ref = "guice" }
 bstats = { group = "org.bstats", name = "bstats-base", version.ref = "bstats" }

settings.gradle.kts

@@ -6,15 +6,16 @@ pluginManagement {
     repositories {
         gradlePluginPortal()
         maven("https://repo.opencollab.dev/main/")
-        maven("https://jitpack.io") {
-            content {
-                includeGroupByRegex("com\\.github\\..*")
-            }
-        }
+//        maven("https://jitpack.io") {
+//            content {
+//                includeGroupByRegex("com\\.github\\..*")
+//            }
+//        }
 
         maven("https://maven.architectury.dev/")
         maven("https://maven.neoforged.net/releases")
         maven("https://maven.fabricmc.net/")
+        maven("https://jitpack.io/")
     }
 
     plugins {
@@ -32,3 +33,8 @@ rootProject.name = "floodgate-modded"
 include(":mod")
 include(":fabric")
 include(":neoforge")
+
+// Allow to download JVMs for toolchains
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version ("1.0.0")
+}