Add logging to meta

2 files changed, 18 insertions, 15 deletions

diff --git a/meta/model/__init__.py b/meta/model/__init__.py
index 3d06f998ab..483a41e0c0 100644
--- a/meta/model/__init__.py
+++ b/meta/model/__init__.py
@@ -284,6 +284,21 @@ class MojangRules(MetaBase):
         return self.__root__[item]
 
 
+class MojangLoggingArtifact(MojangArtifactBase):
+    id: str
+
+
+class MojangLogging(MetaBase):
+    @validator("type")
+    def validate_type(cls, v):
+        assert v in ["log4j2-xml"]
+        return v
+
+    file: MojangLoggingArtifact
+    argument: str
+    type: str
+
+
 class Library(MetaBase):
     extract: Optional[MojangLibraryExtractRules]
     name: Optional[GradleSpecifier]
@@ -323,6 +338,7 @@ class MetaVersion(Versioned):
     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")
+    logging: Optional[MojangLogging]
 
 
 class MetaPackage(Versioned):
diff --git a/meta/model/mojang.py b/meta/model/mojang.py
index af639f469c..b1e2167550 100644
--- a/meta/model/mojang.py
+++ b/meta/model/mojang.py
@@ -10,6 +10,7 @@ from . import (
     MojangAssets,
     MojangArtifact,
     MojangLibraryDownloads,
+    MojangLogging,
     Library,
     MetaVersion,
     GradleSpecifier,
@@ -182,21 +183,6 @@ class MojangArguments(MetaBase):
     jvm: Optional[List[Any]]
 
 
-class MojangLoggingArtifact(MojangArtifactBase):
-    id: str
-
-
-class MojangLogging(MetaBase):
-    @validator("type")
-    def validate_type(cls, v):
-        assert v in ["log4j2-xml"]
-        return v
-
-    file: MojangLoggingArtifact
-    argument: str
-    type: str
-
-
 class MojangJavaComponent(StrEnum):
     JreLegacy = "jre-legacy"
     Alpha = "java-runtime-alpha"
@@ -353,4 +339,5 @@ class MojangVersion(MetaBase):
             compatible_java_name=javaName,
             additional_traits=addn_traits,
             main_jar=main_jar,
+            logging=(self.logging or {}).get("client")
         )