mmi 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b06278de132f8f2d3579987335931bdafe56470aef8641b7157b78922d12bd99
-  data.tar.gz: 046a5c00f73f2ae5151411572978ef1af74662136d72a82ad30e2570e12c0523
+  metadata.gz: ac664a5f071c4eeb437b6e1f501130373baa722e3e97277bd627de91db6340b0
+  data.tar.gz: ec0937a098b99dd02302ee3c0256ad1d6e3e3e6f14e7ef72e76dfb7924e52beb
 SHA512:
-  metadata.gz: 252ff8dcf6dfc7ece06c47300903e4bd3cf50ede5c7b82b8bcaf8ef7bdbd63b35f72a9a02d553c050e2a81fd17941523d7814435eb3c34e55f0071e6a073d1c5
-  data.tar.gz: 57127da3df65211b4b4b1afa2899f404f95da5a9c14ba4067da24749ae5261ec6d0003d60e66d7f9eafcf3ad7b577b19b89600ef174e3d35276e64c79c5eb960
+  metadata.gz: 7eac5b99470ab80d174bdac020fd0f2872907d2bc2fc117ac102806d5dc6a2a58e410b6f96811376a0d8c32d8970c155b119ecf1d6620436211769b011676b4b
+  data.tar.gz: 600c32a227d7458a3f034e00c40347fd35bf11a4699f76ebd35521d9ee5a366e55740b70cfe8122ab96b468c9b985131cfc7218468231ed0c5c9edb8a04ce7ad

data/lib/mmi/interactive/assets.rb

@@ -160,7 +160,18 @@ module Mmi
 						end
 					when Mmi::Source::Modrinth
 						mod_version = CLI::UI::Prompt.ask('Choose a version.') do |handler|
-							asset.cached_mod_versions.select do |version|
+							version_filter_parameters =
+								case processor.parsed_modloader
+									when Mmi::Modloader::Fabric
+										{
+											loader:       'fabric',
+											game_version: processor.parsed_modloader.mcversion,
+										}
+									else
+										{}
+								end
+							
+							asset.cached_mod_versions(**version_filter_parameters).select do |version|
 								version['files'].any?
 							end.each do |version|
 								handler.option("#{version['name']} (for game versions #{version['game_versions'].join('/')})") do

data/lib/mmi/modrinth_api.rb

@@ -3,15 +3,11 @@ require 'open-uri'
 
 module Mmi
 	module ModrinthApi
-		BASE_URL = URI('https://api.modrinth.com/api/v1/')
+		BASE_URL = URI('https://api.modrinth.com/v2/')
 		
 		class << self
-			def mod(name)
-				JSON.parse((BASE_URL + "mod/#{CGI.escape(name)}").open.read)
-			end
-			
-			def mod_versions(mod_id)
-				JSON.parse((BASE_URL + "mod/#{mod_id}/version").open.read)
+			def project_versions(mod_slug, loader: nil, game_version: nil)
+				JSON.parse((BASE_URL + "project/#{mod_slug}/version?#{URI.encode_www_form(loaders: (%Q{["#{loader}"]} if loader), game_versions: (%Q{["#{game_version}"]} if game_version))}").open.read)
 			end
 		end
 	end

data/lib/mmi/source/modrinth.rb

@@ -42,18 +42,16 @@ module Mmi
 				end
 			end
 			
-			def cached_mod_id
-				@cached_mod_id ||= Mmi::ModrinthApi.mod(self.name)['id']
-			end
-			
-			def cached_mod_versions
-				@cached_mod_versions ||= Mmi::ModrinthApi.mod_versions(cached_mod_id)
+			def cached_mod_versions(loader: nil, game_version: nil)
+				(@cached_mod_versions ||= Hash.new)[{loader: loader, game_version: game_version}] ||= Mmi::ModrinthApi.project_versions(self.name, loader: loader, game_version: game_version)
 			end
 			
 			def download_url
 				cached_mod_versions.select do |version|
 					version['name'] == self.version
-				end.first['files'].select do |files|
+				end.map do |version|
+					version['files']
+				end.flatten(1).select do |files|
 					files['filename'] == self.version_file
 				end.first['url'].gsub(/ /, '%20')
 			end

data/lib/mmi/version.rb

@@ -1,3 +1,3 @@
 module Mmi
-	VERSION = '0.2.0'.freeze
+	VERSION = '0.2.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mmi
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - expeehaa
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2024-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cli-ui
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.22'
+- !ruby/object:Gem::Dependency
+  name: faraday-retry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -185,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Program to install minecraft modloaders, mods and other assets through a