From 6d5e57c292060386e38a799fb1feeac74dc2676f Mon Sep 17 00:00:00 2001 From: Juuz <6596629+Juuxel@users.noreply.github.com> Date: Mon, 12 Jun 2023 18:45:07 +0300 Subject: [PATCH] Remove unused forgeNamed configuration It's been unused for multiple versions, and it's not a supported public API - it can be removed safely. --- .../net/fabricmc/loom/configuration/LoomConfigurations.java | 6 ------ src/main/java/net/fabricmc/loom/util/Constants.java | 1 - 2 files changed, 7 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/configuration/LoomConfigurations.java b/src/main/java/net/fabricmc/loom/configuration/LoomConfigurations.java index 727dba2f..fb73f824 100644 --- a/src/main/java/net/fabricmc/loom/configuration/LoomConfigurations.java +++ b/src/main/java/net/fabricmc/loom/configuration/LoomConfigurations.java @@ -124,7 +124,6 @@ public abstract class LoomConfigurations implements Runnable { registerNonTransitive(Constants.Configurations.FORGE_INSTALLER, Role.RESOLVABLE); registerNonTransitive(Constants.Configurations.FORGE_UNIVERSAL, Role.RESOLVABLE); register(Constants.Configurations.FORGE_DEPENDENCIES, Role.RESOLVABLE); - registerNonTransitive(Constants.Configurations.FORGE_NAMED, Role.RESOLVABLE); registerNonTransitive(Constants.Configurations.FORGE_EXTRA, Role.RESOLVABLE); registerNonTransitive(Constants.Configurations.MCP_CONFIG, Role.RESOLVABLE); register(Constants.Configurations.FORGE_RUNTIME_LIBRARY, Role.RESOLVABLE).configure(configuration -> { @@ -140,16 +139,11 @@ public abstract class LoomConfigurations implements Runnable { extendsFrom(Constants.Configurations.FORGE_RUNTIME_LIBRARY, Constants.Configurations.FORGE_DEPENDENCIES); extendsFrom(Constants.Configurations.FORGE_RUNTIME_LIBRARY, Constants.Configurations.MINECRAFT_RUNTIME_LIBRARIES); extendsFrom(Constants.Configurations.FORGE_RUNTIME_LIBRARY, Constants.Configurations.FORGE_EXTRA); - extendsFrom(Constants.Configurations.FORGE_RUNTIME_LIBRARY, Constants.Configurations.FORGE_NAMED); // Include any user-defined libraries on the runtime CP. // (All the other superconfigurations are already on there.) extendsFrom(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME, Constants.Configurations.FORGE_RUNTIME_LIBRARY); extendsFrom(JavaPlugin.TEST_RUNTIME_CLASSPATH_CONFIGURATION_NAME, Constants.Configurations.FORGE_RUNTIME_LIBRARY); - extendsFrom(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME, Constants.Configurations.FORGE_NAMED); - extendsFrom(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME, Constants.Configurations.FORGE_NAMED); - extendsFrom(JavaPlugin.TEST_COMPILE_CLASSPATH_CONFIGURATION_NAME, Constants.Configurations.FORGE_NAMED); - extendsFrom(JavaPlugin.TEST_RUNTIME_CLASSPATH_CONFIGURATION_NAME, Constants.Configurations.FORGE_NAMED); extendsFrom(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME, Constants.Configurations.FORGE_EXTRA); extendsFrom(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME, Constants.Configurations.FORGE_EXTRA); extendsFrom(JavaPlugin.TEST_COMPILE_CLASSPATH_CONFIGURATION_NAME, Constants.Configurations.FORGE_EXTRA); diff --git a/src/main/java/net/fabricmc/loom/util/Constants.java b/src/main/java/net/fabricmc/loom/util/Constants.java index 9c37b7d8..8efbd192 100644 --- a/src/main/java/net/fabricmc/loom/util/Constants.java +++ b/src/main/java/net/fabricmc/loom/util/Constants.java @@ -82,7 +82,6 @@ public class Constants { * {@link #FORGE_RUNTIME_LIBRARY forgeRuntimeLibrary} is for that instead. */ public static final String FORGE_DEPENDENCIES = "forgeDependencies"; - public static final String FORGE_NAMED = "forgeNamed"; /** * "Extra" runtime dependencies on Forge. Contains the Minecraft resources * and {@linkplain Dependencies#FORGE_RUNTIME the Architectury Loom runtime}.