From edeacbb19dea88bada24ba9464bd070d10f7eefd Mon Sep 17 00:00:00 2001 From: Juuz <6596629+Juuxel@users.noreply.github.com> Date: Mon, 22 Aug 2022 01:11:49 +0300 Subject: [PATCH] Fix logged deprecation warning for internal forge.localMods usage, part 2 --- .../loom/configuration/providers/forge/ForgeRunsProvider.java | 3 ++- .../java/net/fabricmc/loom/extension/ForgeExtensionImpl.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeRunsProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeRunsProvider.java index 212c8755..5ecf6925 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeRunsProvider.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeRunsProvider.java @@ -46,6 +46,7 @@ import net.fabricmc.loom.api.ForgeLocalMod; import net.fabricmc.loom.api.ModSettings; import net.fabricmc.loom.configuration.ide.RunConfigSettings; import net.fabricmc.loom.configuration.launch.LaunchProviderSettings; +import net.fabricmc.loom.extension.ForgeExtensionImpl; import net.fabricmc.loom.util.Constants; import net.fabricmc.loom.util.DependencyDownloader; import net.fabricmc.loom.util.gradle.SourceSetHelper; @@ -170,7 +171,7 @@ public class ForgeRunsProvider { } } - for (ForgeLocalMod localMod : extension.getForge().getLocalMods()) { + for (ForgeLocalMod localMod : ((ForgeExtensionImpl) extension.getForge()).localMods) { String sourceSetName = localMod.getName(); localMod.getSourceSets().flatMap(sourceSet -> Stream.concat( diff --git a/src/main/java/net/fabricmc/loom/extension/ForgeExtensionImpl.java b/src/main/java/net/fabricmc/loom/extension/ForgeExtensionImpl.java index 483e225c..a3301f9d 100644 --- a/src/main/java/net/fabricmc/loom/extension/ForgeExtensionImpl.java +++ b/src/main/java/net/fabricmc/loom/extension/ForgeExtensionImpl.java @@ -51,7 +51,7 @@ public class ForgeExtensionImpl implements ForgeExtensionAPI { private final SetProperty mixinConfigs; private final Property useCustomMixin; private final List dataGenMods = new ArrayList<>(); // not a property because it has custom adding logic - private final NamedDomainObjectContainer localMods; + public final NamedDomainObjectContainer localMods; // public to avoid deprecation warnings for internal calls @Inject public ForgeExtensionImpl(Project project, LoomGradleExtension extension) {