From d551b0d81141fda91551544d45b4a4f299ccb068 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 16 Nov 2022 16:22:55 +0100 Subject: feat: add support for +jvmArgs on meta Signed-off-by: Sefa Eyeoglu --- meta/model/__init__.py | 1 + meta/model/mojang.py | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/meta/model/__init__.py b/meta/model/__init__.py index 7a6d368c05..dc466c3b0b 100644 --- a/meta/model/__init__.py +++ b/meta/model/__init__.py @@ -283,6 +283,7 @@ class MetaVersion(Versioned): compatible_java_majors: Optional[List[int]] = Field(alias="compatibleJavaMajors") additional_traits: Optional[List[str]] = Field(alias="+traits") additional_tweakers: Optional[List[str]] = Field(alias="+tweakers") + additional_jvm_args: Optional[List[str]] = Field(alias="+jvmArgs") class MetaPackage(Versioned): diff --git a/meta/model/mojang.py b/meta/model/mojang.py index 6d308b1586..d10dce3c30 100644 --- a/meta/model/mojang.py +++ b/meta/model/mojang.py @@ -103,6 +103,7 @@ class LegacyOverrideEntry(MetaBase): applet_class: Optional[str] = Field(alias="appletClass") release_time: Optional[datetime] = Field(alias="releaseTime") additional_traits: Optional[List[str]] = Field(alias="+traits") + additional_jvm_args: Optional[List[str]] = Field(alias="+jvmArgs") def apply_onto_meta_version(self, meta_version: MetaVersion, legacy: bool = True): # simply hard override classes @@ -118,6 +119,11 @@ class LegacyOverrideEntry(MetaBase): meta_version.additional_traits = [] meta_version.additional_traits += self.additional_traits + if self.additional_jvm_args: + if not meta_version.additional_jvm_args: + meta_version.additional_jvm_args = [] + meta_version.additional_jvm_args += self.additional_jvm_args + if legacy: # remove all libraries - they are not needed for legacy meta_version.libraries = None -- cgit 0.0.5-2-1-g0f52