mirror of
https://github.com/unmojang/meta.git
synced 2025-09-24 03:31:03 -04:00
Remove parentUid
This commit is contained in:
parent
d617563764
commit
1d695d1018
@ -48,7 +48,6 @@ def shouldIgnoreArtifact(libSet, match):
|
||||
def versionFromProfile(profile, version):
|
||||
result = MultiMCVersionFile({"name":"Forge", "version":version.rawVersion, "uid":"net.minecraftforge" })
|
||||
mcversion = profile.install.minecraft
|
||||
result.parentUid ='net.minecraft'
|
||||
result.requires = [DependencyEntry(uid='net.minecraft', equals=mcversion)]
|
||||
result.mainClass = profile.versionInfo.mainClass
|
||||
args = profile.versionInfo.minecraftArguments
|
||||
@ -91,7 +90,6 @@ def versionFromProfile(profile, version):
|
||||
def versionFromLegacy(version, legacyinfo : ForgeLegacyInfo):
|
||||
result = MultiMCVersionFile({"name":"Forge", "version":version.rawVersion, "uid":"net.minecraftforge" })
|
||||
mcversion = version.mcversion_sane
|
||||
result.parentUid ='net.minecraft'
|
||||
result.requires = [DependencyEntry(uid='net.minecraft', equals=mcversion)]
|
||||
result.releaseTime = legacyinfo.releaseTime
|
||||
result.order = 5
|
||||
@ -176,7 +174,7 @@ recommendedVersions.sort()
|
||||
|
||||
print ('Recommended versions:', recommendedVersions)
|
||||
|
||||
sharedData = MultiMCSharedPackageData(uid = 'net.minecraftforge', name = "Forge", parentUid = 'net.minecraft')
|
||||
sharedData = MultiMCSharedPackageData(uid = 'net.minecraftforge', name = "Forge")
|
||||
sharedData.projectUrl = 'http://www.minecraftforge.net/forum/'
|
||||
sharedData.recommended = recommendedVersions
|
||||
sharedData.write()
|
||||
|
@ -78,7 +78,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', parentUid = 'net.minecraft')
|
||||
sharedData = MultiMCSharedPackageData(uid = 'com.mumfrey.liteloader', name = 'LiteLoader')
|
||||
sharedData.recommended = recommended
|
||||
sharedData.description = remoteVersionlist.meta.description
|
||||
sharedData.projectUrl = remoteVersionlist.meta.url
|
||||
|
2
index.py
2
index.py
@ -34,7 +34,6 @@ for package in os.listdir('multimc'):
|
||||
# initialize output structures - version list level
|
||||
versionList = MultiMCVersionIndex()
|
||||
versionList.uid = package
|
||||
versionList.parentUid = sharedData.parentUid
|
||||
versionList.name = sharedData.name
|
||||
|
||||
# walk through all the versions of the package
|
||||
@ -78,7 +77,6 @@ for package in os.listdir('multimc'):
|
||||
"sha256": HashFile(hashlib.sha256, outFilePath)
|
||||
}
|
||||
)
|
||||
packageEntry.parentUid = sharedData.parentUid
|
||||
packages.packages.append(packageEntry)
|
||||
|
||||
# write the repository package index
|
||||
|
@ -230,7 +230,6 @@ class MultiMCVersionFile (VersionedJsonObject):
|
||||
name = StringProperty(required=True)
|
||||
version = StringProperty(required=True)
|
||||
uid = StringProperty(required=True)
|
||||
parentUid = StringProperty(exclude_if_none=True, default=None)
|
||||
requires = ListProperty(DependencyEntry, exclude_if_none=True, default=None)
|
||||
conflicts = ListProperty(DependencyEntry, exclude_if_none=True, default=None)
|
||||
volatile = BooleanProperty(exclude_if_none=True, default=None)
|
||||
@ -283,7 +282,6 @@ def MojangToMultiMC (file, name, uid, version):
|
||||
class MultiMCSharedPackageData(VersionedJsonObject):
|
||||
name = StringProperty(required=True)
|
||||
uid = StringProperty(required=True)
|
||||
parentUid = StringProperty(exclude_if_none=True, default=None)
|
||||
recommended = ListProperty(StringProperty, exclude_if_none=True, default=None)
|
||||
authors = ListProperty(StringProperty, exclude_if_none=True, default=None)
|
||||
description = StringProperty(exclude_if_none=True, default=None)
|
||||
@ -296,12 +294,11 @@ class MultiMCSharedPackageData(VersionedJsonObject):
|
||||
except EnvironmentError as e:
|
||||
print("Error while trying to save shared packaged data for %s:" % self.uid, e)
|
||||
|
||||
def writeSharedPackageData(uid, name, parentUid = None):
|
||||
def writeSharedPackageData(uid, name):
|
||||
desc = MultiMCSharedPackageData({
|
||||
'name': name,
|
||||
'uid': uid
|
||||
})
|
||||
desc.parentUid = parentUid
|
||||
with open("multimc/%s/package.json" % uid, 'w') as file:
|
||||
json.dump(desc.to_json(), file, sort_keys=True, indent=4)
|
||||
|
||||
@ -322,13 +319,11 @@ class MultiMCVersionIndexEntry(JsonObject):
|
||||
class MultiMCVersionIndex(VersionedJsonObject):
|
||||
name = StringProperty()
|
||||
uid = StringProperty()
|
||||
parentUid = StringProperty(exclude_if_none=True, default=None)
|
||||
versions = ListProperty(MultiMCVersionIndexEntry)
|
||||
|
||||
class MultiMCPackageIndexEntry(JsonObject):
|
||||
name = StringProperty()
|
||||
uid = StringProperty()
|
||||
parentUid = StringProperty(exclude_if_none=True, default=None)
|
||||
sha256 = StringProperty()
|
||||
|
||||
class MultiMCPackageIndex(VersionedJsonObject):
|
||||
|
Loading…
x
Reference in New Issue
Block a user