From a11c21d5034915a108674e6ad7695551b5e3f452 Mon Sep 17 00:00:00 2001
From: Ellpeck <me@ellpeck.de>
Date: Thu, 16 May 2024 18:28:20 +0200
Subject: [PATCH] fixed curios not being optional, and made patchouli a
 mods.toml dep closes #354

---
 build.gradle                                            | 3 ++-
 gradle.properties                                       | 2 +-
 src/main/java/de/ellpeck/naturesaura/compat/Compat.java | 5 +++--
 src/main/resources/META-INF/mods.toml                   | 7 +++++++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1bab577a..af2436c3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -116,6 +116,7 @@ tasks.withType(ProcessResources).configureEach {
             loader_version_range: loader_version_range,
             mod_id              : mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version,
             mod_authors         : mod_authors, mod_description: mod_description,
+            patchouli_version   : patchouli_version
     ]
     inputs.properties replaceProperties
 
@@ -145,4 +146,4 @@ publishing {
 
 tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
-}
\ No newline at end of file
+}
diff --git a/gradle.properties b/gradle.properties
index a1fb0a25..9a2c0989 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,7 +21,7 @@ loader_version_range=[2,)
 
 jei_version=17.3.0.48
 curios_version=7.2.0+1.20.4
-patchouli_version=1.20.4-85-NEOFORGE-SNAPSHOT
+patchouli_version=1.20.4-85-NEOFORGE
 
 ## Mod Properties
 # The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63}
diff --git a/src/main/java/de/ellpeck/naturesaura/compat/Compat.java b/src/main/java/de/ellpeck/naturesaura/compat/Compat.java
index 50a87f3d..bf2769ed 100644
--- a/src/main/java/de/ellpeck/naturesaura/compat/Compat.java
+++ b/src/main/java/de/ellpeck/naturesaura/compat/Compat.java
@@ -16,9 +16,10 @@ import java.util.function.Supplier;
 
 public final class Compat {
 
+    @SuppressWarnings("Convert2MethodRef") // bleh classloading compat issues
     private static final Map<String, Supplier<ICompat>> MODULE_TYPES = ImmutableMap.<String, Supplier<ICompat>>builder()
-            .put("patchouli", PatchouliCompat::new)
-            .put("curios", CuriosCompat::new)
+            .put("patchouli", () -> new PatchouliCompat())
+            .put("curios", () -> new CuriosCompat())
             //.put("enchantability", EnchantibilityCompat::new)
             .build();
     private static final Map<String, ICompat> MODULES = new HashMap<>();
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
index 16cf0a10..9cf96051 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -72,3 +72,10 @@ side = "BOTH"
 # stop your mod loading on the server for example.
 #[features.${mod_id}]
 #openGLVersion="[3.2,)"
+
+[[dependencies.${mod_id}]]
+modId="patchouli"
+type = "required"
+versionRange="[${patchouli_version},)"
+ordering="NONE"
+side="BOTH"