summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/model/__init__.py5
-rw-r--r--meta/model/forge.py8
-rw-r--r--meta/model/mojang.py3
-rw-r--r--meta/model/neoforge.py8
4 files changed, 10 insertions, 14 deletions
diff --git a/meta/model/__init__.py b/meta/model/__init__.py
index 68cd034f1b..fb062f5d35 100644
--- a/meta/model/__init__.py
+++ b/meta/model/__init__.py
@@ -281,15 +281,12 @@ class MojangRules(MetaBase):
return self.__root__[item]
-class MojangLibrary(MetaBase):
+class Library(MetaBase):
extract: Optional[MojangLibraryExtractRules]
name: Optional[GradleSpecifier]
downloads: Optional[MojangLibraryDownloads]
natives: Optional[Dict[str, str]]
rules: Optional[MojangRules]
-
-
-class Library(MojangLibrary):
url: Optional[str]
mmcHint: Optional[str] = Field(None, alias="MMC-hint")
diff --git a/meta/model/forge.py b/meta/model/forge.py
index 937cc18cb5..a59b87aa5c 100644
--- a/meta/model/forge.py
+++ b/meta/model/forge.py
@@ -3,7 +3,7 @@ from typing import Optional, List, Dict
from pydantic import Field
-from . import MetaBase, GradleSpecifier, MojangLibrary
+from . import MetaBase, GradleSpecifier, Library
from .mojang import MojangVersion
@@ -46,7 +46,7 @@ class DerivedForgeIndex(MetaBase):
class FMLLib(
MetaBase
-): # old ugly stuff. Maybe merge this with Library or MojangLibrary later
+): # old ugly stuff. Maybe merge this with Library or Library later
filename: str
checksum: str
ours: bool
@@ -91,7 +91,7 @@ class ForgeInstallerProfileInstallSection(MetaBase):
mod_list: Optional[str] = Field(alias="modList")
-class ForgeLibrary(MojangLibrary):
+class ForgeLibrary(Library):
url: Optional[str]
server_req: Optional[bool] = Field(alias="serverreq")
client_req: Optional[bool] = Field(alias="clientreq")
@@ -176,7 +176,7 @@ class ForgeInstallerProfileV2(MetaBase):
welcome: Optional[str]
data: Optional[Dict[str, DataSpec]]
processors: Optional[List[ProcessorSpec]]
- libraries: Optional[List[MojangLibrary]]
+ libraries: Optional[List[Library]]
mirror_list: Optional[str] = Field(alias="mirrorList")
server_jar_path: Optional[str] = Field(alias="serverJarPath")
diff --git a/meta/model/mojang.py b/meta/model/mojang.py
index 04e9b608ed..25d71ae2bf 100644
--- a/meta/model/mojang.py
+++ b/meta/model/mojang.py
@@ -7,7 +7,6 @@ from . import (
MetaBase,
MojangArtifactBase,
MojangAssets,
- MojangLibrary,
MojangArtifact,
MojangLibraryDownloads,
Library,
@@ -216,7 +215,7 @@ class MojangVersion(MetaBase):
asset_index: Optional[MojangAssets] = Field(alias="assetIndex")
assets: Optional[str]
downloads: Optional[Dict[str, MojangArtifactBase]] # TODO improve this?
- libraries: Optional[List[MojangLibrary]] # TODO: optional?
+ libraries: Optional[List[Library]] # TODO: optional?
main_class: Optional[str] = Field(alias="mainClass")
applet_class: Optional[str] = Field(alias="appletClass")
processArguments: Optional[str]
diff --git a/meta/model/neoforge.py b/meta/model/neoforge.py
index 853e433068..5f5237fa5f 100644
--- a/meta/model/neoforge.py
+++ b/meta/model/neoforge.py
@@ -3,7 +3,7 @@ from typing import Optional, List, Dict
from pydantic import Field
-from . import MetaBase, GradleSpecifier, MojangLibrary
+from . import MetaBase, GradleSpecifier, Library
from .mojang import MojangVersion
@@ -53,7 +53,7 @@ class DerivedNeoForgeIndex(MetaBase):
class FMLLib(
MetaBase
-): # old ugly stuff. Maybe merge this with Library or MojangLibrary later
+): # old ugly stuff. Maybe merge this with Library or Library later
filename: str
checksum: str
ours: bool
@@ -98,7 +98,7 @@ class NeoForgeInstallerProfileInstallSection(MetaBase):
mod_list: Optional[str] = Field(alias="modList")
-class NeoForgeLibrary(MojangLibrary):
+class NeoForgeLibrary(Library):
url: Optional[str]
server_req: Optional[bool] = Field(alias="serverreq")
client_req: Optional[bool] = Field(alias="clientreq")
@@ -166,7 +166,7 @@ class NeoForgeInstallerProfileV2(MetaBase):
welcome: Optional[str]
data: Optional[Dict[str, DataSpec]]
processors: Optional[List[ProcessorSpec]]
- libraries: Optional[List[MojangLibrary]]
+ libraries: Optional[List[Library]]
mirror_list: Optional[str] = Field(alias="mirrorList")
server_jar_path: Optional[str] = Field(alias="serverJarPath")