Revert "Quick hack to not hash check FOrge installers"

This reverts commit 339be79074cfd9d007054dc5dab5f2e337284e95.
MultiMC · Sep 1, 2023 · dd0c139 · dd0c139
1 parent faed223
commit dd0c139
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/enumerateForge.py b/enumerateForge.py
@@ -57,7 +57,6 @@ class MojangLibrary (JsonObject):
 class MultiMCLibrary (MojangLibrary):
     url = StringProperty(exclude_if_none=True, default=None)
     mmcHint = StringProperty(name="MMC-hint", exclude_if_none=True, default=None)
-    mmcAbsoluteURL = StringProperty(name="MMC-absoluteUrl", exclude_if_none=True, default=None)
 
 
 def GetLibraryDownload (library : MultiMCLibrary):

diff --git a/generateForge.py b/generateForge.py
@@ -185,11 +185,10 @@ def versionFromBuildSystemInstaller(installerVersion : MojangVersionFile, instal
         installerInfo = InstallerInfo(json.load(f))
         InstallerLib = MultiMCLibrary(name=GradleSpecifier("net.minecraftforge:forge:%s:installer" % (version.longVersion)))
         InstallerLib.downloads = MojangLibraryDownloads()
-        InstallerLib.mmcAbsoluteURL = "https://files.minecraftforge.net/maven/%s" % (InstallerLib.name.getPath())
-        # InstallerLib.downloads.artifact = MojangArtifact()
-        # InstallerLib.downloads.artifact.url = "https://files.minecraftforge.net/maven/%s" % (InstallerLib.name.getPath())
-        # InstallerLib.downloads.artifact.sha1 = installerInfo.sha1hash
-        # InstallerLib.downloads.artifact.size = installerInfo.size
+        InstallerLib.downloads.artifact = MojangArtifact()
+        InstallerLib.downloads.artifact.url = "https://files.minecraftforge.net/maven/%s" % (InstallerLib.name.getPath())
+        InstallerLib.downloads.artifact.sha1 = installerInfo.sha1hash
+        InstallerLib.downloads.artifact.size = installerInfo.size
         mavenLibs.append(InstallerLib)
 
     for upstreamLib in installerProfile.libraries:

diff --git a/metautil.py b/metautil.py
@@ -245,7 +245,6 @@ def validateSupportedMultiMCVersion(version):
 class MultiMCLibrary (MojangLibrary):
     url = StringProperty(exclude_if_none=True, default=None)
     mmcHint = StringProperty(name="MMC-hint", exclude_if_none=True, default=None)
-    mmcAbsoluteURL = StringProperty(name="MMC-absoluteUrl", exclude_if_none=True, default=None)
 
 class VersionedJsonObject(JsonObject):
     formatVersion = IntegerProperty(default=CurrentMultiMCFormatVersion, validators=validateSupportedMultiMCVersion)