Compare commits

...

2 commits

Author SHA1 Message Date
Ell
9ebc8e9054 40.2 2024-05-16 18:32:06 +02:00
Ell
a11c21d503 fixed curios not being optional, and made patchouli a mods.toml dep
closes #354
2024-05-16 18:28:20 +02:00
4 changed files with 14 additions and 5 deletions

View file

@ -116,6 +116,7 @@ tasks.withType(ProcessResources).configureEach {
loader_version_range: loader_version_range, loader_version_range: loader_version_range,
mod_id : mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version, mod_id : mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version,
mod_authors : mod_authors, mod_description: mod_description, mod_authors : mod_authors, mod_description: mod_description,
patchouli_version : patchouli_version
] ]
inputs.properties replaceProperties inputs.properties replaceProperties

View file

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

View file

@ -16,9 +16,10 @@ import java.util.function.Supplier;
public final class Compat { public final class Compat {
@SuppressWarnings("Convert2MethodRef") // bleh classloading compat issues
private static final Map<String, Supplier<ICompat>> MODULE_TYPES = ImmutableMap.<String, Supplier<ICompat>>builder() private static final Map<String, Supplier<ICompat>> MODULE_TYPES = ImmutableMap.<String, Supplier<ICompat>>builder()
.put("patchouli", PatchouliCompat::new) .put("patchouli", () -> new PatchouliCompat())
.put("curios", CuriosCompat::new) .put("curios", () -> new CuriosCompat())
//.put("enchantability", EnchantibilityCompat::new) //.put("enchantability", EnchantibilityCompat::new)
.build(); .build();
private static final Map<String, ICompat> MODULES = new HashMap<>(); private static final Map<String, ICompat> MODULES = new HashMap<>();

View file

@ -72,3 +72,10 @@ side = "BOTH"
# stop your mod loading on the server for example. # stop your mod loading on the server for example.
#[features.${mod_id}] #[features.${mod_id}]
#openGLVersion="[3.2,)" #openGLVersion="[3.2,)"
[[dependencies.${mod_id}]]
modId="patchouli"
type = "required"
versionRange="[${patchouli_version},)"
ordering="NONE"
side="BOTH"