From cab269435e019b56e4fe67ab85f581e66197c2d8 Mon Sep 17 00:00:00 2001 From: Juuz <6596629+Juuxel@users.noreply.github.com> Date: Sat, 7 Jan 2023 02:22:59 +0200 Subject: [PATCH] Deprecate RunConfigSettings.data() --- .../net/fabricmc/loom/api/ForgeExtensionAPI.java | 9 +++++++++ .../loom/configuration/ide/RunConfigSettings.java | 12 +++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/fabricmc/loom/api/ForgeExtensionAPI.java b/src/main/java/net/fabricmc/loom/api/ForgeExtensionAPI.java index 3cb42e31..6f1dfa6d 100644 --- a/src/main/java/net/fabricmc/loom/api/ForgeExtensionAPI.java +++ b/src/main/java/net/fabricmc/loom/api/ForgeExtensionAPI.java @@ -110,20 +110,29 @@ public interface ForgeExtensionAPI { * {@link #dataGen(Action)}. * * @return the list + * @deprecated See {@link net.fabricmc.loom.configuration.ide.RunConfigSettings#data}. */ + @ApiStatus.ScheduledForRemoval(inVersion = "2.0") + @Deprecated(forRemoval = true) List getDataGenMods(); /** * Applies data generation settings. * * @param action the action to configure data generation + * @deprecated See {@link net.fabricmc.loom.configuration.ide.RunConfigSettings#data}. */ + @ApiStatus.ScheduledForRemoval(inVersion = "2.0") + @Deprecated(forRemoval = true) void dataGen(Action action); /** * Data generation config. + * @deprecated See {@link net.fabricmc.loom.configuration.ide.RunConfigSettings#data}. */ @ApiStatus.NonExtendable + @ApiStatus.ScheduledForRemoval(inVersion = "2.0") + @Deprecated(forRemoval = true) interface DataGenConsumer { /** * Adds mod IDs applied for data generation. diff --git a/src/main/java/net/fabricmc/loom/configuration/ide/RunConfigSettings.java b/src/main/java/net/fabricmc/loom/configuration/ide/RunConfigSettings.java index fc42fba2..821011eb 100644 --- a/src/main/java/net/fabricmc/loom/configuration/ide/RunConfigSettings.java +++ b/src/main/java/net/fabricmc/loom/configuration/ide/RunConfigSettings.java @@ -326,9 +326,19 @@ public final class RunConfigSettings implements Named { } /** - * Configure run config with the default server options. + * Configure run config with the default data options. + * + * @deprecated Use {@link #environment}("server") and {@link #forgeTemplate}("data") instead and + * configure the data generator manually. Deprecated for removal for two reasons: + *
    + *
  1. This method is only needed on Forge. Fabric setups should use {@link #server}. + *
  2. It's inflexible and hardcodes the output path as well as validation. + *
*/ + @ApiStatus.ScheduledForRemoval(inVersion = "2.0") + @Deprecated(forRemoval = true) public void data() { + extension.getDeprecationHelper().warn("RunConfigSettings.data() has been deprecated and replaced with forgeTemplate(\"data\"). This will be removed in Loom 2.0."); environment("data"); defaultMainClass(Constants.Knot.KNOT_SERVER);