fixed curios not being optional, and made patchouli a mods.toml dep

closes #354

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
 

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}

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<>();

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"