mirror of
https://github.com/unmojang/meta.git
synced 2025-09-23 03:01:21 -04:00
Merge branch 'main' of github.com:PrismLauncher/meta into javas
This commit is contained in:
Trial97
commit
453c15ac77
@ -173,10 +173,7 @@ def version_from_modernized_installer(
|
||||
v.libraries = []
|
||||
|
||||
mc_filter = load_mc_version_filter(mc_version)
|
||||
for upstream_lib in installer.libraries:
|
||||
forge_lib = Library.parse_obj(
|
||||
upstream_lib.dict()
|
||||
) # "cast" MojangLibrary to Library
|
||||
for forge_lib in installer.libraries:
|
||||
if (
|
||||
forge_lib.name.is_lwjgl()
|
||||
or forge_lib.name.is_log4j()
|
||||
@ -270,8 +267,7 @@ def version_from_build_system_installer(
|
||||
)
|
||||
v.maven_files.append(installer_lib)
|
||||
|
||||
for upstream_lib in profile.libraries:
|
||||
forge_lib = Library.parse_obj(upstream_lib.dict())
|
||||
for forge_lib in profile.libraries:
|
||||
if forge_lib.name.is_log4j():
|
||||
continue
|
||||
|
||||
@ -289,19 +285,21 @@ def version_from_build_system_installer(
|
||||
|
||||
v.libraries.append(FORGEWRAPPER_LIBRARY)
|
||||
|
||||
for upstream_lib in installer.libraries:
|
||||
forge_lib = Library.parse_obj(upstream_lib.dict())
|
||||
for forge_lib in installer.libraries:
|
||||
if forge_lib.name.is_log4j():
|
||||
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
|
||||
@ -313,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
|
||||
|
||||
|
||||
@ -72,44 +72,20 @@ def version_from_build_system_installer(
|
||||
)
|
||||
v.maven_files.append(installer_lib)
|
||||
|
||||
for upstream_lib in profile.libraries:
|
||||
forge_lib = Library.parse_obj(upstream_lib.dict())
|
||||
for forge_lib in profile.libraries:
|
||||
if forge_lib.name.is_log4j():
|
||||
continue
|
||||
|
||||
if (
|
||||
forge_lib.name.group == "net.neoforged"
|
||||
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
|
||||
# See https://github.com/neoforged/NeoGradle/issues/23
|
||||
download_name = forge_lib.name
|
||||
if version.artifact == "neoforge":
|
||||
download_name = deepcopy(forge_lib.name)
|
||||
download_name.version = version.long_version
|
||||
forge_lib.downloads.artifact.url = (
|
||||
"https://maven.neoforged.net/%s" % download_name.path()
|
||||
)
|
||||
v.maven_files.append(forge_lib)
|
||||
|
||||
v.libraries = []
|
||||
|
||||
v.libraries.append(FORGEWRAPPER_LIBRARY)
|
||||
|
||||
for upstream_lib in installer.libraries:
|
||||
forge_lib = Library.parse_obj(upstream_lib.dict())
|
||||
for forge_lib in installer.libraries:
|
||||
if forge_lib.name.is_log4j():
|
||||
continue
|
||||
|
||||
if forge_lib.name.group == "net.neoforged":
|
||||
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 = (
|
||||
"https://maven.neoforged.net/%s" % forge_lib.name.path()
|
||||
)
|
||||
forge_lib.name = forge_lib.name
|
||||
v.libraries.append(forge_lib)
|
||||
|
||||
v.release_time = installer.release_time
|
||||
|
||||
@ -16,8 +16,8 @@ STATIC_LEGACYINFO_FILE = join(BASE_DIR, "forge-legacyinfo.json")
|
||||
FORGE_COMPONENT = "net.minecraftforge"
|
||||
|
||||
FORGEWRAPPER_LIBRARY = make_launcher_library(
|
||||
GradleSpecifier("io.github.zekerzhayard", "ForgeWrapper", "1.5.7-prism"),
|
||||
"29139276224c3b8eac414607ade28b90ba9113ba",
|
||||
35062,
|
||||
GradleSpecifier("io.github.zekerzhayard", "ForgeWrapper", "1.5.8-prism"),
|
||||
"acd024c0448ec2c577a3f41aaa471acf6d9cda9b",
|
||||
36229,
|
||||
)
|
||||
BAD_VERSIONS = ["1.12.2-14.23.5.2851"]
|
||||
|
||||
@ -284,15 +284,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")
|
||||
|
||||
|
||||
@ -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")
|
||||
|
||||
|
||||
@ -8,7 +8,6 @@ from . import (
|
||||
MetaBase,
|
||||
MojangArtifactBase,
|
||||
MojangAssets,
|
||||
MojangLibrary,
|
||||
MojangArtifact,
|
||||
MojangLibraryDownloads,
|
||||
Library,
|
||||
@ -138,8 +137,6 @@ class LegacyOverrideEntry(MetaBase):
|
||||
if legacy:
|
||||
# remove all libraries - they are not needed for legacy
|
||||
meta_version.libraries = None
|
||||
# remove minecraft arguments - we use our own hardcoded ones
|
||||
meta_version.minecraft_arguments = None
|
||||
|
||||
|
||||
class LegacyOverrideIndex(MetaBase):
|
||||
@ -278,7 +275,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]
|
||||
|
||||
@ -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")
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user