From c7446a51801ebe825d63a7bf3af752998bb566b2 Mon Sep 17 00:00:00 2001 From: Paint_Ninja Date: Mon, 11 Dec 2023 21:08:50 +0000 Subject: [PATCH] Add impl. of `IModFileInfo#showAsDataPack` (#9802) --- .../fml/loading/moddiscovery/AbstractModProvider.java | 1 + .../fml/loading/moddiscovery/ModFileInfo.java | 9 +++++++++ settings.gradle | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractModProvider.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractModProvider.java index 8669dbd1fa..2003453b67 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractModProvider.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractModProvider.java @@ -132,6 +132,7 @@ public abstract class AbstractModProvider implements IModProvider { @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; } @Override public IModFile getFile() { return mod; } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFileInfo.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFileInfo.java index 31f3b6c5c7..6bfae72597 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFileInfo.java +++ b/fmlloader/src/main/java/net/minecraftforge/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 class ModFileInfo implements IModFileInfo, IConfigurable return this.showAsResourcePack; } + @Override + public boolean showAsDataPack() + { + return this.showAsDataPack; + } + @Override public Optional getConfigElement(final String... key) { diff --git a/settings.gradle b/settings.gradle index a7eda694d7..031639065a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -25,7 +25,7 @@ plugins { dependencyResolutionManagement { versionCatalogs { libs { - library('forgespi', 'net.minecraftforge:forgespi:7.1.1') // Needs modlauncher + library('forgespi', 'net.minecraftforge:forgespi:7.1.3') // Needs modlauncher library('bootstrap', 'net.minecraftforge:bootstrap:2.0.0') // Needs modlauncher library('bootstrap-api', 'net.minecraftforge:bootstrap-api:2.0.0') library('bootstrap-shim', 'net.minecraftforge:bootstrap-shim:2.0.1')