diff --git a/src/main/java/net/fabricmc/loom/providers/ForgeProvider.java b/src/main/java/net/fabricmc/loom/providers/ForgeProvider.java index 35c72021..a3fa8147 100644 --- a/src/main/java/net/fabricmc/loom/providers/ForgeProvider.java +++ b/src/main/java/net/fabricmc/loom/providers/ForgeProvider.java @@ -38,12 +38,12 @@ public class ForgeProvider extends DependencyProvider { @Override public void provide(DependencyInfo dependency, Consumer postPopulationScheduler) throws Exception { - addDependency(dependency.getDepString() + ":userdev", Constants.FORGE_USERDEV); - addDependency(dependency.getDepString() + ":installer", Constants.FORGE_INSTALLER); + addDependency(dependency.getDepString() + ":userdev", Constants.Configurations.FORGE_USERDEV); + addDependency(dependency.getDepString() + ":installer", Constants.Configurations.FORGE_INSTALLER); } @Override public String getTargetConfig() { - return Constants.FORGE; + return Constants.Configurations.FORGE; } } diff --git a/src/main/java/net/fabricmc/loom/providers/ForgeUniversalProvider.java b/src/main/java/net/fabricmc/loom/providers/ForgeUniversalProvider.java index bcff7704..93e54050 100644 --- a/src/main/java/net/fabricmc/loom/providers/ForgeUniversalProvider.java +++ b/src/main/java/net/fabricmc/loom/providers/ForgeUniversalProvider.java @@ -56,6 +56,6 @@ public class ForgeUniversalProvider extends DependencyProvider { @Override public String getTargetConfig() { - return Constants.FORGE_UNIVERSAL; + return Constants.Configurations.FORGE_UNIVERSAL; } } diff --git a/src/main/java/net/fabricmc/loom/providers/ForgeUserdevProvider.java b/src/main/java/net/fabricmc/loom/providers/ForgeUserdevProvider.java index e1e8a19b..bd6531cc 100644 --- a/src/main/java/net/fabricmc/loom/providers/ForgeUserdevProvider.java +++ b/src/main/java/net/fabricmc/loom/providers/ForgeUserdevProvider.java @@ -74,11 +74,11 @@ public class ForgeUserdevProvider extends DependencyProvider { json = new Gson().fromJson(reader, JsonObject.class); } - addDependency(json.get("mcp").getAsString(), Constants.MCP_CONFIG); - addDependency(json.get("universal").getAsString(), Constants.FORGE_UNIVERSAL); + addDependency(json.get("mcp").getAsString(), Constants.Configurations.MCP_CONFIG); + addDependency(json.get("universal").getAsString(), Constants.Configurations.FORGE_UNIVERSAL); for (JsonElement lib : json.get("libraries").getAsJsonArray()) { - addDependency(lib.getAsString(), Constants.FORGE_DEPENDENCIES); + addDependency(lib.getAsString(), Constants.Configurations.FORGE_DEPENDENCIES); } // TODO: Read launch configs from the JSON too @@ -92,6 +92,6 @@ public class ForgeUserdevProvider extends DependencyProvider { @Override public String getTargetConfig() { - return Constants.FORGE_USERDEV; + return Constants.Configurations.FORGE_USERDEV; } } diff --git a/src/main/java/net/fabricmc/loom/providers/McpConfigProvider.java b/src/main/java/net/fabricmc/loom/providers/McpConfigProvider.java index f4cde2ed..342d7ec3 100644 --- a/src/main/java/net/fabricmc/loom/providers/McpConfigProvider.java +++ b/src/main/java/net/fabricmc/loom/providers/McpConfigProvider.java @@ -83,6 +83,6 @@ public class McpConfigProvider extends DependencyProvider { @Override public String getTargetConfig() { - return Constants.MCP_CONFIG; + return Constants.Configurations.MCP_CONFIG; } } diff --git a/src/main/java/net/fabricmc/loom/providers/PatchProvider.java b/src/main/java/net/fabricmc/loom/providers/PatchProvider.java index 3a79d7b8..9b7cccbe 100644 --- a/src/main/java/net/fabricmc/loom/providers/PatchProvider.java +++ b/src/main/java/net/fabricmc/loom/providers/PatchProvider.java @@ -71,6 +71,6 @@ public class PatchProvider extends DependencyProvider { @Override public String getTargetConfig() { - return Constants.FORGE_INSTALLER; + return Constants.Configurations.FORGE_INSTALLER; } }