From 8e47317406d9a104743f7764d2a47b07543ab49f Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 1 Nov 2023 11:03:31 +0100 Subject: [PATCH] fix: use new neoforge artifact in library names Signed-off-by: Sefa Eyeoglu --- generateNeoForge.py | 9 ++++++--- meta/model/neoforge.py | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/generateNeoForge.py b/generateNeoForge.py index 31df89a..d2f6ceb 100644 --- a/generateNeoForge.py +++ b/generateNeoForge.py @@ -60,7 +60,7 @@ def version_from_build_system_installer( ) installer_lib = Library( name=GradleSpecifier( - "net.neoforged", "forge", version.long_version, "installer" + "net.neoforged", version.artifact, version.long_version, "installer" ) ) installer_lib.downloads = MojangLibraryDownloads() @@ -78,9 +78,12 @@ def version_from_build_system_installer( if ( forge_lib.name.group == "net.neoforged" - and forge_lib.name.artifact == "forge" + and forge_lib.name.artifact == version.artifact and forge_lib.name.classifier == "universal" ): + # WORKAROUND: Early NeoForge 20.2 versions have an invalid version for universal jars. Instead of 1.20.2-20.2.20-beta it should just be 20.2.20-beta + if version.artifact == "neoforge": + forge_lib.name.version = version.long_version forge_lib.downloads.artifact.url = ( "https://maven.neoforged.net/%s" % forge_lib.name.path() ) @@ -96,7 +99,7 @@ def version_from_build_system_installer( continue if forge_lib.name.group == "net.neoforged": - if forge_lib.name.artifact == "forge": + if forge_lib.name.artifact == version.artifact: forge_lib.name.classifier = "launcher" forge_lib.downloads.artifact.path = forge_lib.name.path() forge_lib.downloads.artifact.url = ( diff --git a/meta/model/neoforge.py b/meta/model/neoforge.py index 4a110cf..853e433 100644 --- a/meta/model/neoforge.py +++ b/meta/model/neoforge.py @@ -180,9 +180,10 @@ class InstallerInfo(MetaBase): # A post-processed entry constructed from the reconstructed NeoForge version index class NeoForgeVersion: def __init__(self, entry: NeoForgeEntry): + self.artifact = entry.artifact self.build = entry.build self.rawVersion = entry.version - if entry.artifact == "neoforge": + if self.artifact == "neoforge": self.rawVersion = entry.long_version self.mc_version = entry.mc_version