diff --git a/loader/src/main/java/net/minecraftforge/fml/loading/FMLServiceProvider.java b/loader/src/main/java/net/minecraftforge/fml/loading/FMLServiceProvider.java index 06a1f0943..3e8cf93e1 100644 --- a/loader/src/main/java/net/minecraftforge/fml/loading/FMLServiceProvider.java +++ b/loader/src/main/java/net/minecraftforge/fml/loading/FMLServiceProvider.java @@ -33,7 +33,6 @@ public class FMLServiceProvider implements ITransformationService private ArgumentAcceptingOptionSpec fmlOption; private ArgumentAcceptingOptionSpec forgeOption; private ArgumentAcceptingOptionSpec mcOption; - private ArgumentAcceptingOptionSpec forgeGroupOption; private ArgumentAcceptingOptionSpec mcpOption; private ArgumentAcceptingOptionSpec mappingsOption; private List modsArgumentList; @@ -44,7 +43,6 @@ public class FMLServiceProvider implements ITransformationService private String targetMcVersion; private String targetMcpVersion; private String targetMcpMappings; - private String targetForgeGroup; private Map arguments; public FMLServiceProvider() @@ -73,7 +71,6 @@ public void initialize(IEnvironment environment) { arguments.put("mavenRoots", mavenRootsArgumentList); arguments.put("forgeVersion", targetForgeVersion); arguments.put("fmlVersion", targetFMLVersion); - arguments.put("forgeGroup", targetForgeGroup); arguments.put("mcVersion", targetMcVersion); arguments.put("mcpVersion", targetMcpVersion); arguments.put("mcpMappings", targetMcpMappings); @@ -108,7 +105,6 @@ public void arguments(BiFunction argumentBuil { forgeOption = argumentBuilder.apply("forgeVersion", "Forge Version number").withRequiredArg().ofType(String.class).required(); fmlOption = argumentBuilder.apply("fmlVersion", "FML Version number").withRequiredArg().ofType(String.class).required(); - forgeGroupOption = argumentBuilder.apply("forgeGroup", "Forge Group (for testing)").withRequiredArg().ofType(String.class).defaultsTo("net.minecraftforge"); mcOption = argumentBuilder.apply("mcVersion", "Minecraft Version number").withRequiredArg().ofType(String.class).required(); mcpOption = argumentBuilder.apply("mcpVersion", "MCP Version number").withRequiredArg().ofType(String.class).required(); mappingsOption = argumentBuilder.apply("mcpMappings", "MCP Mappings Channel and Version").withRequiredArg().ofType(String.class); @@ -125,7 +121,6 @@ public void argumentValues(OptionResult option) mavenRootsArgumentList = option.values(mavenRootsOption); targetFMLVersion = option.value(fmlOption); targetForgeVersion = option.value(forgeOption); - targetForgeGroup = option.value(forgeGroupOption); targetMcVersion = option.value(mcOption); targetMcpVersion = option.value(mcpOption); targetMcpMappings = option.value(mappingsOption); diff --git a/loader/src/main/java/net/minecraftforge/fml/loading/VersionInfo.java b/loader/src/main/java/net/minecraftforge/fml/loading/VersionInfo.java index 1a888f9f8..8679c049e 100644 --- a/loader/src/main/java/net/minecraftforge/fml/loading/VersionInfo.java +++ b/loader/src/main/java/net/minecraftforge/fml/loading/VersionInfo.java @@ -7,9 +7,9 @@ import java.util.Map; -public record VersionInfo(String forgeVersion, String fmlVersion, String mcVersion, String mcpVersion, String forgeGroup) { +public record VersionInfo(String forgeVersion, String fmlVersion, String mcVersion, String mcpVersion) { VersionInfo(Map arguments) { - this((String) arguments.get("forgeVersion"), (String) arguments.get("fmlVersion"), (String) arguments.get("mcVersion"), (String) arguments.get("mcpVersion"), (String) arguments.get("forgeGroup")); + this((String) arguments.get("forgeVersion"), (String) arguments.get("fmlVersion"), (String) arguments.get("mcVersion"), (String) arguments.get("mcpVersion")); } public String mcAndForgeVersion() { diff --git a/loader/src/main/java/net/minecraftforge/fml/loading/targets/FMLClientLaunchHandler.java b/loader/src/main/java/net/minecraftforge/fml/loading/targets/FMLClientLaunchHandler.java index 264e4f9f6..fa131cd1a 100644 --- a/loader/src/main/java/net/minecraftforge/fml/loading/targets/FMLClientLaunchHandler.java +++ b/loader/src/main/java/net/minecraftforge/fml/loading/targets/FMLClientLaunchHandler.java @@ -17,7 +17,7 @@ public class FMLClientLaunchHandler extends CommonClientLaunchHandler { @Override protected void processMCStream(VersionInfo versionInfo, Stream.Builder mc, Stream.Builder> mods) { - var fmlonly = LibraryFinder.findPathForMaven(versionInfo.forgeGroup(), "fmlonly", "", "universal", versionInfo.mcAndFmlVersion()); + var fmlonly = LibraryFinder.findPathForMaven("net.neoforged.fml", "fmlonly", "", "universal", versionInfo.mcAndFmlVersion()); mods.add(List.of(fmlonly)); } } diff --git a/loader/src/main/java/net/minecraftforge/fml/loading/targets/FMLServerLaunchHandler.java b/loader/src/main/java/net/minecraftforge/fml/loading/targets/FMLServerLaunchHandler.java index 0a5f658c7..2dfe54f20 100644 --- a/loader/src/main/java/net/minecraftforge/fml/loading/targets/FMLServerLaunchHandler.java +++ b/loader/src/main/java/net/minecraftforge/fml/loading/targets/FMLServerLaunchHandler.java @@ -19,7 +19,7 @@ public class FMLServerLaunchHandler extends CommonServerLaunchHandler implements @Override protected BiPredicate processMCStream(VersionInfo versionInfo, Stream.Builder mc, BiPredicate filter, Stream.Builder> mods) { - var fmlonly = LibraryFinder.findPathForMaven(versionInfo.forgeGroup(), "fmlonly", "", "universal", versionInfo.mcAndFmlVersion()); + var fmlonly = LibraryFinder.findPathForMaven("net.neoforged.fml", "fmlonly", "", "universal", versionInfo.mcAndFmlVersion()); mods.add(List.of(fmlonly)); return filter; }