Share version JARs (by hash)

Author: amesgen

src/HellSmack/Curse.hs

@@ -50,7 +50,6 @@ import Relude.Extra.Group
 import Text.Layout.Table qualified as TL
 import Text.Layout.Table.Cell.Formatted qualified as TL
 import UnliftIO.Directory qualified as FP
-import UnliftIO.Exception
 import UnliftIO.Temporary
 
 data ModpackManifest = ModpackManifest

src/HellSmack/ModLoader/Forge.hs

@@ -26,7 +26,6 @@ import HellSmack.Util.Meta qualified as Meta
 import HellSmack.Vanilla qualified as V
 import HellSmack.Yggdrasil
 import System.IO.Temp
-import UnliftIO.Exception
 import UnliftIO.IO
 
 -- $setup

src/HellSmack/Util/Exception.hs

@@ -1,7 +1,9 @@
 module HellSmack.Util.Exception
   ( -- * Exceptions
     rethrow,
+    throwString,
     reThrow,
+    throwStringM,
   )
 where
 
@@ -13,3 +15,6 @@ rethrow = either throwString pure
 
 reThrow :: MonadIO m => CatchT m a -> m a
 reThrow = runCatchT >=> either throwIO pure
+
+throwStringM :: (MonadThrow m, HasCallStack) => String -> m a
+throwStringM = throwM . stringException

src/HellSmack/Vanilla.hs

@@ -70,7 +70,6 @@ import HellSmack.Util
 import HellSmack.Util.Meta qualified as Meta
 import HellSmack.Yggdrasil
 import Text.Regex.Pcre2
-import UnliftIO.Exception
 
 data AllVersionsManifest = AllVersionsManifest
   { latest :: LatestVersion,
@@ -431,10 +430,11 @@ mainJarPath ::
 mainJarPath vm = do
   side <- mcSideName
   versionDir <- siehs @DirConfig #versionDir
-  let mcVersion = vm ^. #id . to unMCVersion . unpacked
-  vmid <- parseRelDir mcVersion
-  sideJar <- parseRelFile [i|$mcVersion-$side.jar|]
-  pure $ versionDir </> vmid </> sideJar
+  download <- maybe (throwStringM [i|unknown MC side: $side|]) pure =<< getMainDownload vm
+  -- the forge prefix exists due to a weird mechanic introduced in 1.17.1-37.0.29
+  -- also see 0d38e659d5969dd89cb6452758a48688dcf99b18
+  hashJar <- parseRelFile $ [i|forge-${}.jar|] $ download ^. #sha1 . to unSHA1
+  pure $ versionDir </> hashJar
 
 downloadMainJar ::
   (MonadUnliftIO m, MRHasAll r [DirConfig, MCSide, Manager] m) => VersionManifest -> m ()