From db3b4ee42e5e4e9e0ba77f749c6ef794d7d82a50 Mon Sep 17 00:00:00 2001
From: BlayTheNinth <1933180+BlayTheNinth@users.noreply.github.com>
Date: Sat, 18 May 2024 17:31:06 +0200
Subject: [PATCH] wip: Some gradle cleanup + Fabric now runs

---
 .../main/resources/balm.fabric.mixins.json    |  2 +-
 gradle.properties                             |  2 +-
 .../main/resources/balm.neoforge.mixins.json  |  2 +-
 settings.gradle                               | 55 +++++++++++++++----
 shared/src/main/resources/balm.mixins.json    |  2 +-
 5 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/fabric/src/main/resources/balm.fabric.mixins.json b/fabric/src/main/resources/balm.fabric.mixins.json
index 4041e873..abbc2fc5 100644
--- a/fabric/src/main/resources/balm.fabric.mixins.json
+++ b/fabric/src/main/resources/balm.fabric.mixins.json
@@ -3,7 +3,7 @@
   "minVersion": "0.8",
   "package": "net.blay09.mods.balm.mixin",
   "refmap": "${mod_id}.refmap.json",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_21",
   "mixins": [
     "ChunkMapMixin",
     "CropBlockMixin",
diff --git a/gradle.properties b/gradle.properties
index 97a43b91..4355cf08 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -39,7 +39,7 @@ jei_minecraft_version = 1.19.2
 jei_version = 11.4.0.288
 rei_version = 10.0.581
 mixin_version = 0.8.5
-modmenu_version = 9.0.0
+modmenu_version = 10.0.0-beta.1
 
 # Gradle
 org.gradle.jvmargs = -Xmx3G
diff --git a/neoforge/src/main/resources/balm.neoforge.mixins.json b/neoforge/src/main/resources/balm.neoforge.mixins.json
index 018071d1..4d5ce9a7 100644
--- a/neoforge/src/main/resources/balm.neoforge.mixins.json
+++ b/neoforge/src/main/resources/balm.neoforge.mixins.json
@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "net.blay09.mods.balm.mixin",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_21",
   "mixins": [
     "CropBlockMixin",
     "StemBlockMixin",
diff --git a/settings.gradle b/settings.gradle
index ea2267a7..45a3b68d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,21 +1,52 @@
 pluginManagement {
     repositories {
         gradlePluginPortal()
-        maven {
-            name = 'Fabric'
-            url = 'https://maven.fabricmc.net/'
+        mavenCentral()
+        exclusiveContent {
+            forRepository {
+                maven {
+                    name = 'Fabric'
+                    url = uri("https://maven.fabricmc.net")
+                }
+            }
+            filter {
+                includeGroup("net.fabricmc")
+                includeGroup("fabric-loom")
+            }
         }
-        maven {
-            name = 'NeoForge'
-            url = 'https://maven.neoforged.net/releases/'
+        exclusiveContent {
+            forRepository {
+                maven {
+                    name = 'NeoForge'
+                    url = uri("https://maven.neoforged.net/releases")
+                }
+            }
+            filter {
+                includeGroupAndSubgroups("net.neoforged")
+                includeGroup("codechicken")
+            }
         }
-        maven {
-            name = 'Forge'
-            url = 'https://maven.minecraftforge.net/'
+        exclusiveContent {
+            forRepository {
+                maven {
+                    name = 'Forge'
+                    url = uri("https://maven.minecraftforge.net")
+                }
+            }
+            filter {
+                includeGroupAndSubgroups("net.minecraftforge")
+            }
         }
-        maven {
-            name = 'Sponge Snapshots'
-            url = 'https://repo.spongepowered.org/repository/maven-public/'
+        exclusiveContent {
+            forRepository {
+                maven {
+                    name = 'Sponge Snapshots'
+                    url = uri("https://repo.spongepowered.org/repository/maven-public")
+                }
+            }
+            filter {
+                includeGroupAndSubgroups("org.spongepowered")
+            }
         }
     }
 }
diff --git a/shared/src/main/resources/balm.mixins.json b/shared/src/main/resources/balm.mixins.json
index 1874d57a..e1e5e7db 100644
--- a/shared/src/main/resources/balm.mixins.json
+++ b/shared/src/main/resources/balm.mixins.json
@@ -3,7 +3,7 @@
   "minVersion": "0.8",
   "package": "net.blay09.mods.balm.mixin",
   "refmap": "${mod_id}.refmap.json",
-  "compatibilityLevel": "JAVA_17",
+  "compatibilityLevel": "JAVA_21",
   "mixins": [
   ],
   "client": [