build.gradle

@@ -116,7 +116,6 @@ 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
 
@@ -146,4 +145,4 @@ publishing {
 
 tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
-}
+}

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
+patchouli_version=1.20.4-85-NEOFORGE-SNAPSHOT
 
 ## 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}
@@ -32,7 +32,7 @@ mod_name=NaturesAura
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=MIT
 # The mod version. See https://semver.org/
-mod_version=40.2
+mod_version=40.1
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

src/main/java/de/ellpeck/naturesaura/compat/Compat.java

@@ -16,10 +16,9 @@ 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", () -> new PatchouliCompat())
-            .put("curios", () -> new CuriosCompat())
+            .put("patchouli", PatchouliCompat::new)
+            .put("curios", CuriosCompat::new)
             //.put("enchantability", EnchantibilityCompat::new)
             .build();
     private static final Map<String, ICompat> MODULES = new HashMap<>();

src/main/resources/META-INF/mods.toml

@@ -72,10 +72,3 @@ 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"