diff --git a/gradle.properties b/gradle.properties index d6dbafbbe..bcc4b069f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -spi_version=9.0.6-breaks-clause +spi_version=9.0.2 mergetool_version=2.0.0 accesstransformers_version=10.0.1 coremods_version=6.0.0 diff --git a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/AbstractModProvider.java b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/AbstractModProvider.java index 3af0316dd..2553af652 100644 --- a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/AbstractModProvider.java +++ b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/AbstractModProvider.java @@ -99,6 +99,7 @@ public List getConfigList(final String... strings) @Override public List getMods() { return Collections.emptyList(); } @Override public List requiredLanguageLoaders() { return Collections.emptyList(); } @Override public boolean showAsResourcePack() { return false; } + @Override public boolean showAsDataPack() { return false; } @Override public Map getFileProperties() { return Collections.emptyMap(); } @Override public String getLicense() { return license; } diff --git a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModFileInfo.java b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModFileInfo.java index f33bbe60b..548cb3d88 100644 --- a/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModFileInfo.java +++ b/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModFileInfo.java @@ -45,6 +45,7 @@ public class ModFileInfo implements IModFileInfo, IConfigurable private final URL issueURL; private final List languageSpecs; private final boolean showAsResourcePack; + private final boolean showAsDataPack; private final List mods; private final Map properties; private final String license; @@ -68,6 +69,8 @@ public class ModFileInfo implements IModFileInfo, IConfigurable .orElse(""); this.showAsResourcePack = config.getConfigElement("showAsResourcePack") .orElse(false); + this.showAsDataPack = config.getConfigElement("showAsDataPack") + .orElse(false); this.usesServices = config.>getConfigElement("services") .orElse(List.of()); this.properties = config.>getConfigElement("properties") @@ -126,6 +129,12 @@ public boolean showAsResourcePack() return this.showAsResourcePack; } + @Override + public boolean showAsDataPack() + { + return this.showAsDataPack; + } + @Override public Optional getConfigElement(final String... key) {