Merge branch 'main' into breaks-clause

neoforged · Dec 14, 2023 · 05d5e9f · 05d5e9f
2 parents 37ee05f + d7d607e
commit 05d5e9f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git 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
@@ -99,6 +99,7 @@ public List<? extends IConfigurable> getConfigList(final String... strings)
         @Override public List<IModInfo> getMods() { return Collections.emptyList(); }
         @Override public List<LanguageSpec> requiredLanguageLoaders() { return Collections.emptyList(); }
         @Override public boolean showAsResourcePack() { return false; }
+        @Override public boolean showAsDataPack() { return false; }
         @Override public Map<String, Object> 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
@@ -45,6 +45,7 @@ public class ModFileInfo implements IModFileInfo, IConfigurable
     private final URL issueURL;
     private final List<LanguageSpec> languageSpecs;
     private final boolean showAsResourcePack;
+    private final boolean showAsDataPack;
     private final List<IModInfo> mods;
     private final Map<String,Object> properties;
     private final String license;
@@ -68,6 +69,8 @@ public class ModFileInfo implements IModFileInfo, IConfigurable
                 .orElse("");
         this.showAsResourcePack = config.<Boolean>getConfigElement("showAsResourcePack")
                 .orElse(false);
+        this.showAsDataPack = config.<Boolean>getConfigElement("showAsDataPack")
+                .orElse(false);
         this.usesServices = config.<List<String>>getConfigElement("services")
                 .orElse(List.of());
         this.properties = config.<Map<String, Object>>getConfigElement("properties")
@@ -126,6 +129,12 @@ public boolean showAsResourcePack()
         return this.showAsResourcePack;
     }
 
+    @Override
+    public boolean showAsDataPack()
+    {
+        return this.showAsDataPack;
+    }
+
     @Override
     public <T> Optional<T> getConfigElement(final String... key)
     {