From 1b25dbbcd0b2b7f2a1170289406874d8f954b1c2 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Tue, 12 Dec 2023 18:54:52 +0100 Subject: [PATCH] fix: attempt fixing Forge 49.0 Signed-off-by: Sefa Eyeoglu --- generateForge.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/generateForge.py b/generateForge.py index 6bc5edd..9359dd4 100755 --- a/generateForge.py +++ b/generateForge.py @@ -290,13 +290,16 @@ def version_from_build_system_installer( continue if forge_lib.name.group == "net.minecraftforge": - if forge_lib.name.artifact == "forge": + if forge_lib.name.artifact == "forge" and not forge_lib.name.classifier: forge_lib.name.classifier = "launcher" forge_lib.downloads.artifact.path = forge_lib.name.path() forge_lib.downloads.artifact.url = ( "https://maven.minecraftforge.net/%s" % forge_lib.name.path() ) forge_lib.name = forge_lib.name + # net.minecraftforge.forge:client doesn't exist??? (49.0.x) + if not len(forge_lib.downloads.artifact.url): + continue v.libraries.append(forge_lib) v.release_time = installer.release_time @@ -308,6 +311,12 @@ def version_from_build_system_installer( ) for arg in installer.arguments.game: mc_args += f" {arg}" + if "--fml.forgeGroup" not in installer.arguments.game: + mc_args += f" --fml.forgeGroup net.minecraftforge" + if "--fml.forgeVersion" not in installer.arguments.game: + mc_args += f" --fml.forgeVersion {version.rawVersion}" + if "--fml.mcVersion" not in installer.arguments.game: + mc_args += f" --fml.mcVersion {version.mc_version}" v.minecraft_arguments = mc_args return v