mirror of
https://github.com/unmojang/meta.git
synced 2025-09-24 03:31:03 -04:00
Change function names
This commit is contained in:
txtsd
parent
287c0d6649
commit
c99552e58c
@ -14,7 +14,7 @@ from cachecontrol import CacheControl
|
||||
from cachecontrol.caches import FileCache
|
||||
|
||||
#with open('polymc/index.json', 'r', encoding='utf-8') as index:
|
||||
#packages = MultiMCPackageIndex(json.load(index))
|
||||
#packages = PolyMCPackageIndex(json.load(index))
|
||||
|
||||
#for entry in packages.packages:
|
||||
#print (entry)
|
||||
@ -54,12 +54,12 @@ class MojangLibrary (JsonObject):
|
||||
natives = DictProperty(StringProperty, exclude_if_none=True, default=None)
|
||||
rules = ListProperty(MojangRule, exclude_if_none=True, default=None)
|
||||
|
||||
class MultiMCLibrary (MojangLibrary):
|
||||
class PolyMCLibrary (MojangLibrary):
|
||||
url = StringProperty(exclude_if_none=True, default=None)
|
||||
mmcHint = StringProperty(name="MMC-hint", exclude_if_none=True, default=None)
|
||||
|
||||
|
||||
def GetLibraryDownload (library : MultiMCLibrary):
|
||||
def GetLibraryDownload (library : PolyMCLibrary):
|
||||
if library.natives:
|
||||
raise Exception('Natives are not handled yet')
|
||||
|
||||
@ -87,7 +87,7 @@ def GetLibraryDownload (library : MultiMCLibrary):
|
||||
return DownloadEntry(url, kind, name)
|
||||
|
||||
with open('polymc/net.minecraftforge/index.json', 'r', encoding='utf-8') as forgeIndex:
|
||||
forgeVersions = MultiMCVersionIndex(json.load(forgeIndex))
|
||||
forgeVersions = PolyMCVersionIndex(json.load(forgeIndex))
|
||||
|
||||
urlSet = set()
|
||||
|
||||
@ -95,7 +95,7 @@ for entry in forgeVersions.versions:
|
||||
versionString = entry.version
|
||||
versionPath = "polymc/net.minecraftforge/%s.json" % versionString
|
||||
with open(versionPath, 'r') as infile:
|
||||
forgeVersion = MultiMCVersionFile(json.load(infile))
|
||||
forgeVersion = PolyMCVersionFile(json.load(infile))
|
||||
if forgeVersion.libraries:
|
||||
for entry in forgeVersion.libraries:
|
||||
urlSet.add(GetLibraryDownload(entry))
|
||||
|
||||
@ -10,9 +10,9 @@ class FabricInstallerLaunchwrapper(JsonObject):
|
||||
tweakers = ObjectProperty(FabricInstallerArguments, required=True)
|
||||
|
||||
class FabricInstallerLibraries(JsonObject):
|
||||
client = ListProperty(MultiMCLibrary)
|
||||
common = ListProperty(MultiMCLibrary)
|
||||
server = ListProperty(MultiMCLibrary)
|
||||
client = ListProperty(PolyMCLibrary)
|
||||
common = ListProperty(PolyMCLibrary)
|
||||
server = ListProperty(PolyMCLibrary)
|
||||
|
||||
class FabricInstallerDataV1(JsonObject):
|
||||
version = IntegerProperty(required=True)
|
||||
|
||||
@ -27,7 +27,7 @@ def processLoaderVersion(loaderVersion, it, loaderData):
|
||||
if (len(loaderRecommended) < 1) and verStable:
|
||||
loaderRecommended.append(loaderVersion)
|
||||
versionJarInfo = loadJarInfo(it["maven"])
|
||||
version = MultiMCVersionFile(name="Fabric Loader", uid="net.fabricmc.fabric-loader", version=loaderVersion)
|
||||
version = PolyMCVersionFile(name="Fabric Loader", uid="net.fabricmc.fabric-loader", version=loaderVersion)
|
||||
version.releaseTime = versionJarInfo.releaseTime
|
||||
version.requires = [DependencyEntry(uid='net.fabricmc.intermediary')]
|
||||
version.order = 10
|
||||
@ -39,21 +39,21 @@ def processLoaderVersion(loaderVersion, it, loaderData):
|
||||
version.libraries = []
|
||||
version.libraries.extend(loaderData.libraries.common)
|
||||
version.libraries.extend(loaderData.libraries.client)
|
||||
loaderLib = MultiMCLibrary(name=GradleSpecifier(it["maven"]), url="https://maven.fabricmc.net")
|
||||
loaderLib = PolyMCLibrary(name=GradleSpecifier(it["maven"]), url="https://maven.fabricmc.net")
|
||||
version.libraries.append(loaderLib)
|
||||
loaderVersions.append(version)
|
||||
|
||||
def processIntermediaryVersion(it):
|
||||
intermediaryRecommended.append(it["version"])
|
||||
versionJarInfo = loadJarInfo(it["maven"])
|
||||
version = MultiMCVersionFile(name="Intermediary Mappings", uid="net.fabricmc.intermediary", version=it["version"])
|
||||
version = PolyMCVersionFile(name="Intermediary Mappings", uid="net.fabricmc.intermediary", version=it["version"])
|
||||
version.releaseTime = versionJarInfo.releaseTime
|
||||
version.requires = [DependencyEntry(uid='net.minecraft', equals=it["version"])]
|
||||
version.order = 11
|
||||
version.type = "release"
|
||||
version.libraries = []
|
||||
version.volatile = True
|
||||
mappingLib = MultiMCLibrary(name=GradleSpecifier(it["maven"]), url="https://maven.fabricmc.net")
|
||||
mappingLib = PolyMCLibrary(name=GradleSpecifier(it["maven"]), url="https://maven.fabricmc.net")
|
||||
version.libraries.append(mappingLib)
|
||||
intermediaryVersions.append(version)
|
||||
|
||||
@ -76,7 +76,7 @@ for version in loaderVersions:
|
||||
with open(outFilepath, 'w') as outfile:
|
||||
json.dump(version.to_json(), outfile, sort_keys=True, indent=4)
|
||||
|
||||
sharedData = MultiMCSharedPackageData(uid = 'net.fabricmc.fabric-loader', name = 'Fabric Loader')
|
||||
sharedData = PolyMCSharedPackageData(uid = 'net.fabricmc.fabric-loader', name = 'Fabric Loader')
|
||||
sharedData.recommended = loaderRecommended
|
||||
sharedData.description = "Fabric Loader is a tool to load Fabric-compatible mods in game environments."
|
||||
sharedData.projectUrl = "https://fabricmc.net"
|
||||
@ -88,7 +88,7 @@ for version in intermediaryVersions:
|
||||
with open(outFilepath, 'w') as outfile:
|
||||
json.dump(version.to_json(), outfile, sort_keys=True, indent=4)
|
||||
|
||||
sharedData = MultiMCSharedPackageData(uid = 'net.fabricmc.intermediary', name = 'Intermediary Mappings')
|
||||
sharedData = PolyMCSharedPackageData(uid = 'net.fabricmc.intermediary', name = 'Intermediary Mappings')
|
||||
sharedData.recommended = intermediaryRecommended
|
||||
sharedData.description = "Intermediary mappings allow using Fabric Loader with mods for Minecraft in a more compatible manner."
|
||||
sharedData.projectUrl = "https://fabricmc.net"
|
||||
|
||||
@ -18,7 +18,7 @@ def loadMcVersionFilter(version):
|
||||
return mcVersionCache[version]
|
||||
libSet = set()
|
||||
with open("polymc/net.minecraft/%s.json" % version, 'r', encoding='utf-8') as mcFile:
|
||||
mcVersion = MultiMCVersionFile(json.load(mcFile))
|
||||
mcVersion = PolyMCVersionFile(json.load(mcFile))
|
||||
for lib in mcVersion.libraries:
|
||||
libSet.add(lib.name)
|
||||
mcVersionCache[version] = libSet
|
||||
@ -46,7 +46,7 @@ def shouldIgnoreArtifact(libSet, match):
|
||||
return False
|
||||
|
||||
def versionFromProfile(profile, version):
|
||||
result = MultiMCVersionFile({"name":"Forge", "version":version.rawVersion, "uid":"net.minecraftforge" })
|
||||
result = PolyMCVersionFile({"name":"Forge", "version":version.rawVersion, "uid":"net.minecraftforge" })
|
||||
mcversion = profile.install.minecraft
|
||||
result.requires = [DependencyEntry(uid='net.minecraft', equals=mcversion)]
|
||||
result.mainClass = profile.versionInfo.mainClass
|
||||
@ -80,7 +80,7 @@ def versionFromProfile(profile, version):
|
||||
fixedName.version = "%s-%s" % (mcversion, fixedName.version)
|
||||
elif fixedName.artifact == "forge":
|
||||
fixedName.classifier = "universal"
|
||||
ourLib = MultiMCLibrary(name=fixedName)
|
||||
ourLib = PolyMCLibrary(name=fixedName)
|
||||
if forgeLib.url == "http://files.minecraftforge.net/maven/":
|
||||
ourLib.url = "https://maven.minecraftforge.net/"
|
||||
else:
|
||||
@ -94,7 +94,7 @@ def versionFromProfile(profile, version):
|
||||
|
||||
def versionFromModernizedInstaller(installerVersion : MojangVersionFile, version: ForgeVersion):
|
||||
eprint("Generating Modernized Forge %s." % version.longVersion)
|
||||
result = MultiMCVersionFile({"name":"Forge", "version":version.rawVersion, "uid":"net.minecraftforge" })
|
||||
result = PolyMCVersionFile({"name":"Forge", "version":version.rawVersion, "uid":"net.minecraftforge" })
|
||||
mcversion = version.mcversion
|
||||
result.requires = [DependencyEntry(uid='net.minecraft', equals=mcversion)]
|
||||
result.mainClass = installerVersion.mainClass
|
||||
@ -114,7 +114,7 @@ def versionFromModernizedInstaller(installerVersion : MojangVersionFile, version
|
||||
libs = []
|
||||
mcFilter = loadMcVersionFilter(mcversion)
|
||||
for upstreamLib in installerVersion.libraries:
|
||||
mmcLib = MultiMCLibrary(upstreamLib.to_json())
|
||||
mmcLib = PolyMCLibrary(upstreamLib.to_json())
|
||||
if mmcLib.name.isLwjgl():
|
||||
continue
|
||||
if mmcLib.name.isLog4j():
|
||||
@ -147,7 +147,7 @@ def versionFromModernizedInstaller(installerVersion : MojangVersionFile, version
|
||||
return result
|
||||
|
||||
def versionFromLegacy(version, legacyinfo : ForgeLegacyInfo):
|
||||
result = MultiMCVersionFile({"name":"Forge", "version":version.rawVersion, "uid":"net.minecraftforge" })
|
||||
result = PolyMCVersionFile({"name":"Forge", "version":version.rawVersion, "uid":"net.minecraftforge" })
|
||||
mcversion = version.mcversion_sane
|
||||
result.requires = [DependencyEntry(uid='net.minecraft', equals=mcversion)]
|
||||
result.releaseTime = legacyinfo.releaseTime
|
||||
@ -161,7 +161,7 @@ def versionFromLegacy(version, legacyinfo : ForgeLegacyInfo):
|
||||
else:
|
||||
classifier = "client"
|
||||
coord = GradleSpecifier("net.minecraftforge:forge:%s:%s" % (version.longVersion,classifier))
|
||||
mainmod = MultiMCLibrary(name = coord)
|
||||
mainmod = PolyMCLibrary(name = coord)
|
||||
mainmod.downloads = MojangLibraryDownloads()
|
||||
mainmod.downloads.artifact = MojangArtifact()
|
||||
mainmod.downloads.artifact.path = None
|
||||
@ -173,7 +173,7 @@ def versionFromLegacy(version, legacyinfo : ForgeLegacyInfo):
|
||||
|
||||
def versionFromBuildSystemInstaller(installerVersion : MojangVersionFile, installerProfile: ForgeInstallerProfileV2, version: ForgeVersion):
|
||||
eprint("Generating Forge %s." % version.longVersion)
|
||||
result = MultiMCVersionFile({"name":"Forge", "version":version.rawVersion, "uid":"net.minecraftforge" })
|
||||
result = PolyMCVersionFile({"name":"Forge", "version":version.rawVersion, "uid":"net.minecraftforge" })
|
||||
result.requires = [DependencyEntry(uid='net.minecraft', equals=version.mcversion_sane)]
|
||||
result.mainClass = "io.github.zekerzhayard.forgewrapper.installer.Main"
|
||||
|
||||
@ -183,7 +183,7 @@ def versionFromBuildSystemInstaller(installerVersion : MojangVersionFile, instal
|
||||
# load the locally cached installer file info and use it to add the installer entry in the json
|
||||
with open("upstream/forge/installer_info/%s.json" % version.longVersion, 'r', encoding='utf-8') as f:
|
||||
installerInfo = InstallerInfo(json.load(f))
|
||||
InstallerLib = MultiMCLibrary(name=GradleSpecifier("net.minecraftforge:forge:%s:installer" % (version.longVersion)))
|
||||
InstallerLib = PolyMCLibrary(name=GradleSpecifier("net.minecraftforge:forge:%s:installer" % (version.longVersion)))
|
||||
InstallerLib.downloads = MojangLibraryDownloads()
|
||||
InstallerLib.downloads.artifact = MojangArtifact()
|
||||
InstallerLib.downloads.artifact.url = "https://files.minecraftforge.net/maven/%s" % (InstallerLib.name.getPath())
|
||||
@ -192,7 +192,7 @@ def versionFromBuildSystemInstaller(installerVersion : MojangVersionFile, instal
|
||||
mavenLibs.append(InstallerLib)
|
||||
|
||||
for upstreamLib in installerProfile.libraries:
|
||||
mmcLib = MultiMCLibrary(upstreamLib.to_json())
|
||||
mmcLib = PolyMCLibrary(upstreamLib.to_json())
|
||||
if mmcLib.name.group == "net.minecraftforge":
|
||||
if mmcLib.name.artifact == "forge":
|
||||
if mmcLib.name.classifier == "universal":
|
||||
@ -206,7 +206,7 @@ def versionFromBuildSystemInstaller(installerVersion : MojangVersionFile, instal
|
||||
result.mavenFiles = mavenLibs
|
||||
|
||||
libraries = []
|
||||
#wrapperLib = MultiMCLibrary(name=GradleSpecifier("io.github.zekerzhayard:ForgeWrapper:1.4.1"))
|
||||
#wrapperLib = PolyMCLibrary(name=GradleSpecifier("io.github.zekerzhayard:ForgeWrapper:1.4.1"))
|
||||
#wrapperLib.downloads = MojangLibraryDownloads()
|
||||
#wrapperLib.downloads.artifact = MojangArtifact()
|
||||
#wrapperLib.downloads.artifact.url = "https://meta.polymc.org/maven/%s" % (wrapperLib.name.getPath())
|
||||
@ -214,7 +214,7 @@ def versionFromBuildSystemInstaller(installerVersion : MojangVersionFile, instal
|
||||
#wrapperLib.downloads.artifact.size = 14351
|
||||
#libraries.append(wrapperLib)
|
||||
|
||||
#wrapperLib = MultiMCLibrary(name=GradleSpecifier("io.github.zekerzhayard:ForgeWrapper:1.4.2"))
|
||||
#wrapperLib = PolyMCLibrary(name=GradleSpecifier("io.github.zekerzhayard:ForgeWrapper:1.4.2"))
|
||||
#wrapperLib.downloads = MojangLibraryDownloads()
|
||||
#wrapperLib.downloads.artifact = MojangArtifact()
|
||||
#wrapperLib.downloads.artifact.url = "https://meta.polymc.org/maven/%s" % (wrapperLib.name.getPath())
|
||||
@ -222,7 +222,7 @@ def versionFromBuildSystemInstaller(installerVersion : MojangVersionFile, instal
|
||||
#wrapperLib.downloads.artifact.size = 22346
|
||||
#libraries.append(wrapperLib)
|
||||
|
||||
#wrapperLib = MultiMCLibrary(name=GradleSpecifier("io.github.zekerzhayard:ForgeWrapper:1.5.1"))
|
||||
#wrapperLib = PolyMCLibrary(name=GradleSpecifier("io.github.zekerzhayard:ForgeWrapper:1.5.1"))
|
||||
#wrapperLib.downloads = MojangLibraryDownloads()
|
||||
#wrapperLib.downloads.artifact = MojangArtifact()
|
||||
#wrapperLib.downloads.artifact.url = "https://meta.polymc.org/maven/%s" % (wrapperLib.name.getPath())
|
||||
@ -230,7 +230,7 @@ def versionFromBuildSystemInstaller(installerVersion : MojangVersionFile, instal
|
||||
#wrapperLib.downloads.artifact.size = 29892
|
||||
#libraries.append(wrapperLib)
|
||||
|
||||
#wrapperLib = MultiMCLibrary(name=GradleSpecifier("io.github.zekerzhayard:ForgeWrapper:1.5.3"))
|
||||
#wrapperLib = PolyMCLibrary(name=GradleSpecifier("io.github.zekerzhayard:ForgeWrapper:1.5.3"))
|
||||
#wrapperLib.downloads = MojangLibraryDownloads()
|
||||
#wrapperLib.downloads.artifact = MojangArtifact()
|
||||
#wrapperLib.downloads.artifact.url = "https://meta.polymc.org/maven/%s" % (wrapperLib.name.getPath())
|
||||
@ -238,7 +238,7 @@ def versionFromBuildSystemInstaller(installerVersion : MojangVersionFile, instal
|
||||
#wrapperLib.downloads.artifact.size = 30486
|
||||
#libraries.append(wrapperLib)
|
||||
|
||||
#wrapperLib = MultiMCLibrary(name=GradleSpecifier("io.github.zekerzhayard:ForgeWrapper:1.5.4"))
|
||||
#wrapperLib = PolyMCLibrary(name=GradleSpecifier("io.github.zekerzhayard:ForgeWrapper:1.5.4"))
|
||||
#wrapperLib.downloads = MojangLibraryDownloads()
|
||||
#wrapperLib.downloads.artifact = MojangArtifact()
|
||||
#wrapperLib.downloads.artifact.url = "https://meta.polymc.org/maven/%s" % (wrapperLib.name.getPath())
|
||||
@ -246,7 +246,7 @@ def versionFromBuildSystemInstaller(installerVersion : MojangVersionFile, instal
|
||||
#wrapperLib.downloads.artifact.size = 34299
|
||||
#libraries.append(wrapperLib)
|
||||
|
||||
#wrapperLib = MultiMCLibrary(name=GradleSpecifier("io.github.zekerzhayard:ForgeWrapper:mmc1"))
|
||||
#wrapperLib = PolyMCLibrary(name=GradleSpecifier("io.github.zekerzhayard:ForgeWrapper:mmc1"))
|
||||
#wrapperLib.downloads = MojangLibraryDownloads()
|
||||
#wrapperLib.downloads.artifact = MojangArtifact()
|
||||
#wrapperLib.downloads.artifact.url = "https://meta.polymc.org/maven/%s" % (wrapperLib.name.getPath())
|
||||
@ -254,7 +254,7 @@ def versionFromBuildSystemInstaller(installerVersion : MojangVersionFile, instal
|
||||
#wrapperLib.downloads.artifact.size = 34628
|
||||
#libraries.append(wrapperLib)
|
||||
|
||||
#wrapperLib = MultiMCLibrary(name=GradleSpecifier("io.github.zekerzhayard:ForgeWrapper:1.5.5"))
|
||||
#wrapperLib = PolyMCLibrary(name=GradleSpecifier("io.github.zekerzhayard:ForgeWrapper:1.5.5"))
|
||||
#wrapperLib.downloads = MojangLibraryDownloads()
|
||||
#wrapperLib.downloads.artifact = MojangArtifact()
|
||||
#wrapperLib.downloads.artifact.url = "https://meta.polymc.org/maven/%s" % (wrapperLib.name.getPath())
|
||||
@ -262,7 +262,7 @@ def versionFromBuildSystemInstaller(installerVersion : MojangVersionFile, instal
|
||||
#wrapperLib.downloads.artifact.size = 34331
|
||||
#libraries.append(wrapperLib)
|
||||
|
||||
wrapperLib = MultiMCLibrary(name=GradleSpecifier("io.github.zekerzhayard:ForgeWrapper:mmc2"))
|
||||
wrapperLib = PolyMCLibrary(name=GradleSpecifier("io.github.zekerzhayard:ForgeWrapper:mmc2"))
|
||||
wrapperLib.downloads = MojangLibraryDownloads()
|
||||
wrapperLib.downloads.artifact = MojangArtifact()
|
||||
wrapperLib.downloads.artifact.url = "https://meta.polymc.org/maven/%s" % (wrapperLib.name.getPath())
|
||||
@ -271,7 +271,7 @@ def versionFromBuildSystemInstaller(installerVersion : MojangVersionFile, instal
|
||||
libraries.append(wrapperLib)
|
||||
|
||||
for upstreamLib in installerVersion.libraries:
|
||||
mmcLib = MultiMCLibrary(upstreamLib.to_json())
|
||||
mmcLib = PolyMCLibrary(upstreamLib.to_json())
|
||||
if mmcLib.name.group == "net.minecraftforge":
|
||||
if mmcLib.name.artifact == "forge":
|
||||
fixedName = mmcLib.name
|
||||
@ -423,7 +423,7 @@ recommendedVersions.sort()
|
||||
|
||||
print ('Recommended versions:', recommendedVersions)
|
||||
|
||||
sharedData = MultiMCSharedPackageData(uid = 'net.minecraftforge', name = "Forge")
|
||||
sharedData = PolyMCSharedPackageData(uid = 'net.minecraftforge', name = "Forge")
|
||||
sharedData.projectUrl = 'https://www.minecraftforge.net/forum/'
|
||||
sharedData.recommended = recommendedVersions
|
||||
sharedData.write()
|
||||
|
||||
@ -21,7 +21,7 @@ def processArtefacts(mcVersion, liteloader, notSnapshots):
|
||||
if id == 'latest':
|
||||
latestVersion = artefact.version
|
||||
continue
|
||||
version = MultiMCVersionFile(name="LiteLoader", uid="com.mumfrey.liteloader", version=artefact.version)
|
||||
version = PolyMCVersionFile(name="LiteLoader", uid="com.mumfrey.liteloader", version=artefact.version)
|
||||
version.requires = [DependencyEntry(uid='net.minecraft', equals=mcVersion)]
|
||||
version.releaseTime = datetime.utcfromtimestamp(int(artefact.timestamp))
|
||||
version.addTweakers = [artefact.tweakClass]
|
||||
@ -39,7 +39,7 @@ def processArtefacts(mcVersion, liteloader, notSnapshots):
|
||||
lib.url = "https://repo.maven.apache.org/maven2/"
|
||||
if lib.name == GradleSpecifier("org.ow2.asm:asm-all:5.2"):
|
||||
lib.url = "http://repo.liteloader.com/"
|
||||
liteloaderLib = MultiMCLibrary(
|
||||
liteloaderLib = PolyMCLibrary(
|
||||
name=GradleSpecifier("com.mumfrey:liteloader:%s" % version.version),
|
||||
url = "http://dl.liteloader.com/versions/"
|
||||
)
|
||||
@ -80,7 +80,7 @@ for version in allVersions:
|
||||
with open(outFilepath, 'w') as outfile:
|
||||
json.dump(version.to_json(), outfile, sort_keys=True, indent=4)
|
||||
|
||||
sharedData = MultiMCSharedPackageData(uid = 'com.mumfrey.liteloader', name = 'LiteLoader')
|
||||
sharedData = PolyMCSharedPackageData(uid = 'com.mumfrey.liteloader', name = 'LiteLoader')
|
||||
sharedData.recommended = recommended
|
||||
sharedData.description = remoteVersionlist.meta.description
|
||||
sharedData.projectUrl = remoteVersionlist.meta.url
|
||||
|
||||
@ -28,7 +28,7 @@ def addOrGetBucket(buckets, rules):
|
||||
if ruleHash in buckets:
|
||||
bucket = buckets[ruleHash]
|
||||
else:
|
||||
bucket = MultiMCVersionFile(
|
||||
bucket = PolyMCVersionFile(
|
||||
{
|
||||
"name": "LWJGL",
|
||||
"version": "undetermined",
|
||||
@ -122,12 +122,12 @@ for filename in os.listdir('upstream/mojang/versions'):
|
||||
with open("upstream/mojang/versions/" + filename) as json_file:
|
||||
print("Processing", filename)
|
||||
mojangVersionFile = MojangVersionFile(json.load(json_file))
|
||||
versionFile = MojangToMultiMC(mojangVersionFile, "Minecraft", "net.minecraft", mojangVersionFile.id)
|
||||
versionFile = MojangToPolyMC(mojangVersionFile, "Minecraft", "net.minecraft", mojangVersionFile.id)
|
||||
libs_minecraft = []
|
||||
is_lwjgl_3 = False
|
||||
buckets = {}
|
||||
for lib in versionFile.libraries:
|
||||
mmcLib = MultiMCLibrary(lib.to_json())
|
||||
mmcLib = PolyMCLibrary(lib.to_json())
|
||||
removePathsFromLib(mmcLib)
|
||||
specifier = mmcLib.name
|
||||
ruleHash = None
|
||||
@ -157,7 +157,7 @@ for filename in os.listdir('upstream/mojang/versions'):
|
||||
if mmcLib.name.version == '2.0-beta9':
|
||||
log4jVersion = '2.0-beta9-fixed'
|
||||
|
||||
replacementLib = MultiMCLibrary(name=GradleSpecifier("org.apache.logging.log4j:%s:%s" % (mmcLib.name.artifact, log4jVersion)))
|
||||
replacementLib = PolyMCLibrary(name=GradleSpecifier("org.apache.logging.log4j:%s:%s" % (mmcLib.name.artifact, log4jVersion)))
|
||||
replacementLib.downloads = MojangLibraryDownloads()
|
||||
replacementLib.downloads.artifact = MojangArtifact()
|
||||
replacementLib.downloads.artifact.url = "https://meta.polymc.org/maven/%s" % (replacementLib.name.getPath())
|
||||
@ -353,18 +353,18 @@ for lwjglVersionVariant in lwjglVersionVariants:
|
||||
else:
|
||||
raise Exception("No variant decided for version %s out of %d possible ones and %d unknown ones." % (lwjglVersionVariant, passedVariants, unknownVariants))
|
||||
|
||||
lwjglSharedData = MultiMCSharedPackageData(uid = 'org.lwjgl', name = 'LWJGL 2')
|
||||
lwjglSharedData = PolyMCSharedPackageData(uid = 'org.lwjgl', name = 'LWJGL 2')
|
||||
lwjglSharedData.recommended = ['2.9.4-nightly-20150209']
|
||||
lwjglSharedData.write()
|
||||
|
||||
if found_any_lwjgl3:
|
||||
lwjglSharedData = MultiMCSharedPackageData(uid = 'org.lwjgl3', name = 'LWJGL 3')
|
||||
lwjglSharedData = PolyMCSharedPackageData(uid = 'org.lwjgl3', name = 'LWJGL 3')
|
||||
lwjglSharedData.recommended = ['3.1.2']
|
||||
lwjglSharedData.write()
|
||||
|
||||
with open("upstream/mojang/version_manifest_v2.json", 'r', encoding='utf-8') as localIndexFile:
|
||||
localVersionlist = MojangIndexWrap(json.load(localIndexFile))
|
||||
|
||||
mcSharedData = MultiMCSharedPackageData(uid = 'net.minecraft', name = 'Minecraft')
|
||||
mcSharedData = PolyMCSharedPackageData(uid = 'net.minecraft', name = 'Minecraft')
|
||||
mcSharedData.recommended = [localVersionlist.latest['release']]
|
||||
mcSharedData.write()
|
||||
|
||||
10
index.py
10
index.py
@ -19,7 +19,7 @@ def HashFile(hash, fname):
|
||||
ignore = set(["index.json", "package.json", ".git"])
|
||||
|
||||
# initialize output structures - package list level
|
||||
packages = MultiMCPackageIndex()
|
||||
packages = PolyMCPackageIndex()
|
||||
|
||||
# walk thorugh all the package folders
|
||||
for package in sorted(os.listdir('polymc')):
|
||||
@ -32,7 +32,7 @@ for package in sorted(os.listdir('polymc')):
|
||||
recommendedVersions = set(sharedData.recommended)
|
||||
|
||||
# initialize output structures - version list level
|
||||
versionList = MultiMCVersionIndex()
|
||||
versionList = PolyMCVersionIndex()
|
||||
versionList.uid = package
|
||||
versionList.name = sharedData.name
|
||||
|
||||
@ -46,10 +46,10 @@ for package in sorted(os.listdir('polymc')):
|
||||
filehash = HashFile(hashlib.sha256, filepath)
|
||||
versionFile = None
|
||||
with open(filepath) as json_file:
|
||||
versionFile = MultiMCVersionFile(json.load(json_file))
|
||||
versionFile = PolyMCVersionFile(json.load(json_file))
|
||||
|
||||
# pull information from the version file
|
||||
versionEntry = MultiMCVersionIndexEntry()
|
||||
versionEntry = PolyMCVersionIndexEntry()
|
||||
if versionFile.version in recommendedVersions:
|
||||
versionEntry.recommended = True
|
||||
versionEntry.version = versionFile.version
|
||||
@ -70,7 +70,7 @@ for package in sorted(os.listdir('polymc')):
|
||||
json.dump(versionList.to_json(), outfile, sort_keys=True, indent=4)
|
||||
|
||||
# insert entry into the package index
|
||||
packageEntry = MultiMCPackageIndexEntry(
|
||||
packageEntry = PolyMCPackageIndexEntry(
|
||||
{
|
||||
"uid" : package,
|
||||
"name" : sharedData.name,
|
||||
|
||||
@ -37,7 +37,7 @@ class LiteloaderRepo(JsonObject):
|
||||
'''
|
||||
class LiteloaderArtefact(JsonObject):
|
||||
tweakClass = StringProperty(required=True)
|
||||
libraries = ListProperty(MultiMCLibrary, required=True)
|
||||
libraries = ListProperty(PolyMCLibrary, required=True)
|
||||
stream = StringProperty(required=True)
|
||||
file = StringProperty(required=True)
|
||||
version = StringProperty(required=True)
|
||||
@ -59,7 +59,7 @@ class LiteloaderSnapshot(LiteloaderArtefact):
|
||||
lastSuccessfulBuild = IntegerProperty()
|
||||
|
||||
class LiteloaderSnapshots(JsonObject):
|
||||
libraries = ListProperty(MultiMCLibrary, required=True)
|
||||
libraries = ListProperty(PolyMCLibrary, required=True)
|
||||
liteloader = DictProperty(LiteloaderSnapshot, name="com.mumfrey:liteloader", required=True)
|
||||
|
||||
'''
|
||||
|
||||
50
metautil.py
50
metautil.py
@ -236,24 +236,24 @@ class MojangVersionFile (JsonObject):
|
||||
complianceLevel = IntegerProperty(exclude_if_none=True, default=None)
|
||||
javaVersion = ObjectProperty(JavaVersion, exclude_if_none=True, default=None)
|
||||
|
||||
CurrentMultiMCFormatVersion = 1
|
||||
def validateSupportedMultiMCVersion(version):
|
||||
if version > CurrentMultiMCFormatVersion:
|
||||
raise UnknownVersionException("Unsupported MultiMC format version: %d. Max supported is: %d" % (version, CurrentMultiMCFormatVersion))
|
||||
CurrentPolyMCFormatVersion = 1
|
||||
def validateSupportedPolyMCVersion(version):
|
||||
if version > CurrentPolyMCFormatVersion:
|
||||
raise UnknownVersionException("Unsupported PolyMC format version: %d. Max supported is: %d" % (version, CurrentPolyMCFormatVersion))
|
||||
|
||||
class MultiMCLibrary (MojangLibrary):
|
||||
class PolyMCLibrary (MojangLibrary):
|
||||
url = StringProperty(exclude_if_none=True, default=None)
|
||||
mmcHint = StringProperty(name="MMC-hint", exclude_if_none=True, default=None)
|
||||
|
||||
class VersionedJsonObject(JsonObject):
|
||||
formatVersion = IntegerProperty(default=CurrentMultiMCFormatVersion, validators=validateSupportedMultiMCVersion)
|
||||
formatVersion = IntegerProperty(default=CurrentPolyMCFormatVersion, validators=validateSupportedPolyMCVersion)
|
||||
|
||||
class DependencyEntry (JsonObject):
|
||||
uid = StringProperty(required=True)
|
||||
equals = StringProperty(exclude_if_none=True, default=None)
|
||||
suggests = StringProperty(exclude_if_none=True, default=None)
|
||||
|
||||
class MultiMCVersionFile (VersionedJsonObject):
|
||||
class PolyMCVersionFile (VersionedJsonObject):
|
||||
name = StringProperty(required=True)
|
||||
version = StringProperty(required=True)
|
||||
uid = StringProperty(required=True)
|
||||
@ -261,10 +261,10 @@ class MultiMCVersionFile (VersionedJsonObject):
|
||||
conflicts = ListProperty(DependencyEntry, exclude_if_none=True, default=None)
|
||||
volatile = BooleanProperty(exclude_if_none=True, default=None)
|
||||
assetIndex = ObjectProperty(MojangAssets, exclude_if_none=True, default=None)
|
||||
libraries = ListProperty(MultiMCLibrary, exclude_if_none=True, default=None)
|
||||
mavenFiles = ListProperty(MultiMCLibrary, exclude_if_none=True, default=None)
|
||||
mainJar = ObjectProperty(MultiMCLibrary, exclude_if_none=True, default=None)
|
||||
jarMods = ListProperty(MultiMCLibrary, exclude_if_none=True, default=None)
|
||||
libraries = ListProperty(PolyMCLibrary, exclude_if_none=True, default=None)
|
||||
mavenFiles = ListProperty(PolyMCLibrary, exclude_if_none=True, default=None)
|
||||
mainJar = ObjectProperty(PolyMCLibrary, exclude_if_none=True, default=None)
|
||||
jarMods = ListProperty(PolyMCLibrary, exclude_if_none=True, default=None)
|
||||
mainClass = StringProperty(exclude_if_none=True, default=None)
|
||||
appletClass = StringProperty(exclude_if_none=True, default=None)
|
||||
minecraftArguments = StringProperty(exclude_if_none=True, default=None)
|
||||
@ -284,9 +284,9 @@ class UnknownComplianceLevelException(Exception):
|
||||
self.message = message
|
||||
|
||||
|
||||
# Convert Mojang version file object to a MultiMC version file object
|
||||
def MojangToMultiMC (file, name, uid, version):
|
||||
mmcFile = MultiMCVersionFile(
|
||||
# Convert Mojang version file object to a PolyMC version file object
|
||||
def MojangToPolyMC (file, name, uid, version):
|
||||
mmcFile = PolyMCVersionFile(
|
||||
{
|
||||
"name": name,
|
||||
"uid": uid,
|
||||
@ -297,7 +297,7 @@ def MojangToMultiMC (file, name, uid, version):
|
||||
mmcFile.libraries = file.libraries
|
||||
mmcFile.mainClass = file.mainClass
|
||||
if file.id:
|
||||
mainJar = MultiMCLibrary(
|
||||
mainJar = PolyMCLibrary(
|
||||
{
|
||||
"name": "com.mojang:minecraft:%s:client" % file.id,
|
||||
}
|
||||
@ -327,7 +327,7 @@ def MojangToMultiMC (file, name, uid, version):
|
||||
raise UnknownComplianceLevelException("Unsupported Mojang compliance level: %d. Max supported is: %d" % (file.complianceLevel, maxSupportedLevel))
|
||||
return mmcFile
|
||||
|
||||
class MultiMCSharedPackageData(VersionedJsonObject):
|
||||
class PolyMCSharedPackageData(VersionedJsonObject):
|
||||
name = StringProperty(required=True)
|
||||
uid = StringProperty(required=True)
|
||||
recommended = ListProperty(StringProperty, exclude_if_none=True, default=None)
|
||||
@ -343,7 +343,7 @@ class MultiMCSharedPackageData(VersionedJsonObject):
|
||||
print("Error while trying to save shared packaged data for %s:" % self.uid, e)
|
||||
|
||||
def writeSharedPackageData(uid, name):
|
||||
desc = MultiMCSharedPackageData({
|
||||
desc = PolyMCSharedPackageData({
|
||||
'name': name,
|
||||
'uid': uid
|
||||
})
|
||||
@ -352,9 +352,9 @@ def writeSharedPackageData(uid, name):
|
||||
|
||||
def readSharedPackageData(uid):
|
||||
with open("polymc/%s/package.json" % uid, 'r') as file:
|
||||
return MultiMCSharedPackageData(json.load(file))
|
||||
return PolyMCSharedPackageData(json.load(file))
|
||||
|
||||
class MultiMCVersionIndexEntry(JsonObject):
|
||||
class PolyMCVersionIndexEntry(JsonObject):
|
||||
version = StringProperty()
|
||||
type = StringProperty(exclude_if_none=True, default=None)
|
||||
releaseTime = ISOTimestampProperty()
|
||||
@ -364,21 +364,21 @@ class MultiMCVersionIndexEntry(JsonObject):
|
||||
volatile = BooleanProperty(exclude_if_none=True, default=None)
|
||||
sha256 = StringProperty()
|
||||
|
||||
class MultiMCVersionIndex(VersionedJsonObject):
|
||||
class PolyMCVersionIndex(VersionedJsonObject):
|
||||
name = StringProperty()
|
||||
uid = StringProperty()
|
||||
versions = ListProperty(MultiMCVersionIndexEntry)
|
||||
versions = ListProperty(PolyMCVersionIndexEntry)
|
||||
|
||||
class MultiMCPackageIndexEntry(JsonObject):
|
||||
class PolyMCPackageIndexEntry(JsonObject):
|
||||
name = StringProperty()
|
||||
uid = StringProperty()
|
||||
sha256 = StringProperty()
|
||||
|
||||
class MultiMCPackageIndex(VersionedJsonObject):
|
||||
packages = ListProperty(MultiMCPackageIndexEntry)
|
||||
class PolyMCPackageIndex(VersionedJsonObject):
|
||||
packages = ListProperty(PolyMCPackageIndexEntry)
|
||||
|
||||
'''
|
||||
The MultiMC static override file for legacy looks like this:
|
||||
The PolyMC static override file for legacy looks like this:
|
||||
{
|
||||
"versions": [
|
||||
...
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user