Merge pull request #266 from RPMTW/fix/modrinth

fix: download mods on Modrinth
RPMTW · Jul 4, 2022 · 33b9f6e · 33b9f6e
2 parents 7376768 + e804192
commit 33b9f6e
Show file tree

Hide file tree

Showing 23 changed files with 208 additions and 220 deletions.
diff --git a/lib/account/microsoft_account_handler.dart b/lib/account/microsoft_account_handler.dart
@@ -5,7 +5,7 @@ import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart' as http;
 import 'package:oauth2/oauth2.dart';
-import 'package:rpmlauncher/launcher/APIs.dart';
+import 'package:rpmlauncher/launcher/apis.dart';
 import 'package:rpmlauncher/model/account/Account.dart';
 import 'package:rpmlauncher/model/account/MicrosoftEntitlements.dart';
 import 'package:rpmlauncher/util/data.dart';

diff --git a/lib/account/mojang_account_handler.dart b/lib/account/mojang_account_handler.dart
@@ -3,7 +3,7 @@ import 'dart:io';
 
 import 'package:dio/dio.dart';
 import 'package:http/http.dart' as http;
-import 'package:rpmlauncher/launcher/APIs.dart';
+import 'package:rpmlauncher/launcher/apis.dart';
 import 'package:rpmlauncher/util/data.dart';
 import 'package:rpmlauncher/util/I18n.dart';
 // ignore: depend_on_referenced_packages

diff --git a/lib/launcher/APIs.dart b/lib/launcher/APIs.dart
diff --git a/lib/launcher/Fabric/FabricAPI.dart b/lib/launcher/Fabric/FabricAPI.dart
@@ -1,5 +1,5 @@
 import 'package:dio/dio.dart';
-import 'package:rpmlauncher/launcher/APIs.dart';
+import 'package:rpmlauncher/launcher/apis.dart';
 import 'package:rpmlauncher/model/Game/FabricInstallerVersion.dart';
 import 'package:rpmlauncher/util/RPMHttpClient.dart';
 

diff --git a/lib/launcher/Fabric/FabricServer.dart b/lib/launcher/Fabric/FabricServer.dart
@@ -2,7 +2,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:flutter/material.dart';
-import 'package:rpmlauncher/launcher/APIs.dart';
+import 'package:rpmlauncher/launcher/apis.dart';
 import 'package:rpmlauncher/launcher/Fabric/FabricAPI.dart';
 import 'package:rpmlauncher/launcher/GameRepository.dart';
 import 'package:rpmlauncher/launcher/MinecraftServer.dart';

diff --git a/lib/launcher/Forge/ForgeAPI.dart b/lib/launcher/Forge/ForgeAPI.dart
@@ -7,7 +7,7 @@ import 'package:rpmlauncher/launcher/GameRepository.dart';
 import 'package:archive/archive.dart';
 import 'package:http/http.dart';
 import 'package:path/path.dart';
-import 'package:rpmlauncher/launcher/APIs.dart';
+import 'package:rpmlauncher/launcher/apis.dart';
 import 'package:rpmlauncher/mod/mod_loader.dart';
 import 'package:rpmlauncher/model/Game/Libraries.dart';
 import 'package:rpmlauncher/model/Game/MinecraftSide.dart';

diff --git a/lib/launcher/Forge/ForgeClient.dart b/lib/launcher/Forge/ForgeClient.dart
@@ -17,7 +17,7 @@ import 'package:rpmlauncher/util/I18n.dart';
 import 'package:rpmlauncher/widget/dialog/UnSupportedForgeVersion.dart';
 import 'package:rpmlauncher/widget/rpmtw_design/OkClose.dart';
 
-import '../APIs.dart';
+import '../apis.dart';
 import '../MinecraftClient.dart';
 import 'ForgeInstallProfile.dart';
 import 'Processors.dart';

diff --git a/lib/launcher/apis.dart b/lib/launcher/apis.dart
@@ -0,0 +1,21 @@
+String mojangMetaAPI = 'https://launchermeta.mojang.com/mc/game';
+String fabricApi = 'https://meta.fabricmc.net/v2';
+String forgeFilesAPI = 'https://files.minecraftforge.net';
+String forgeFilesMainAPI =
+    'https://files.minecraftforge.net/net/minecraftforge/forge';
+String forgeLatestVersionAPI = '$forgeFilesMainAPI/promotions_slim.json';
+String forgeMavenUrl = 'https://maven.minecraftforge.net';
+String forgeMavenMainUrl =
+    'https://maven.minecraftforge.net/net/minecraftforge/forge';
+String mojangJavaRuntimeAPI =
+    'https://launchermeta.mojang.com/v1/products/java-runtime/2ec0cc96c44e5a76b9c8b7c39df7210883d12871/all.json';
+String mojangAuthAPI = 'https://authserver.mojang.com';
+String microsoftProfileAPI =
+    'https://api.minecraftservices.com/minecraft/profile';
+String modrinthAPI = 'https://api.modrinth.com/v2';
+String ftbModPackAPI = 'https://api.modpacks.ch/public';
+String minecraftNewsRSS =
+    'https://www.minecraft.net/en-us/feeds/community-content/rss';
+String recommendedModpack =
+    'https://github.com/RPMTW/RPMTW-website-data/raw/main/data/RPMLauncher/recommend-modpack.json';
+String paperApi = 'https://papermc.io/api/v2';
diff --git a/lib/mod/FTB/Handler.dart b/lib/mod/FTB/Handler.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:rpmlauncher/launcher/APIs.dart';
+import 'package:rpmlauncher/launcher/apis.dart';
 import 'package:rpmlauncher/util/I18n.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart';

diff --git a/lib/mod/ModrinthHandler.dart b/lib/mod/ModrinthHandler.dart
diff --git a/lib/mod/modrinth_handler.dart b/lib/mod/modrinth_handler.dart
@@ -0,0 +1,78 @@
+import 'package:dio/dio.dart';
+import 'package:rpmlauncher/launcher/apis.dart';
+import 'package:rpmlauncher/util/I18n.dart';
+import 'package:flutter/material.dart';
+import 'package:rpmlauncher/util/RPMHttpClient.dart';
+
+class ModrinthHandler {
+  static Future<List<dynamic>> getModList(String versionID, String loader,
+      TextEditingController search, List beforeModList, int index, sort) async {
+    String searchFilter = '';
+    if (search.text.isNotEmpty) {
+      searchFilter = '&query=${search.text}';
+    }
+    List modList = beforeModList;
+    Response response = await RPMHttpClient().get(
+        '$modrinthAPI/search?facets=[["versions:$versionID"],["categories:$loader"],["project_type:mod"]]$searchFilter&offset=${20 * index}&limit=20&index=$sort');
+    Map body = RPMHttpClient.json(response);
+    modList.addAll(body['hits']);
+    return modList;
+  }
+
+  static Future<List<dynamic>> getModFilesInfo(
+      modrinthID, versionID, loader) async {
+    Response response =
+        await RPMHttpClient().get('$modrinthAPI/project/$modrinthID/version');
+    late List<dynamic> filesInfo = [];
+
+    List<Map> modVersions = RPMHttpClient.json(response).cast<Map>();
+    modVersions.forEach((versions) {
+      if (versions['game_versions'].any((element) => element == versionID) &&
+          versions['loaders'].any((element) => element == loader)) {
+        filesInfo.add(versions);
+      }
+    });
+    return filesInfo;
+  }
+
+  static Text parseReleaseType(String releaseType) {
+    late Text releaseTypeString;
+    if (releaseType == 'release') {
+      releaseTypeString = Text(I18n.format('edit.instance.mods.release'),
+          style: const TextStyle(color: Colors.lightGreen));
+    } else if (releaseType == 'beta') {
+      releaseTypeString = Text(I18n.format('edit.instance.mods.beta'),
+          style: const TextStyle(color: Colors.lightBlue));
+    } else if (releaseType == 'alpha') {
+      releaseTypeString = Text(I18n.format('edit.instance.mods.alpha'),
+          style: const TextStyle(color: Colors.red));
+    }
+    return releaseTypeString;
+  }
+
+  static Text parseSide(String sideString, String side, Map data) {
+    Text parse(sideName, type) {
+      late final Text sideText;
+      if (type == 'required') {
+        sideText = Text(
+          sideName + I18n.format('edit.instance.mods.side.required'),
+          style: const TextStyle(color: Colors.red),
+        );
+      } else if (type == 'optional') {
+        sideText = Text(
+          sideName + I18n.format('edit.instance.mods.side.optional'),
+          style: const TextStyle(color: Colors.lightGreenAccent),
+        );
+      } else if (type == 'unsupported') {
+        sideText = Text(
+          sideName + I18n.format('edit.instance.mods.side.unsupported'),
+          style: const TextStyle(color: Colors.grey),
+        );
+      }
+
+      return sideText;
+    }
+
+    return parse(sideString, data[side]);
+  }
+}
diff --git a/lib/model/Game/MinecraftNews.dart b/lib/model/Game/MinecraftNews.dart
@@ -1,7 +1,7 @@
 import 'dart:collection';
 
 import 'package:dio/dio.dart';
-import 'package:rpmlauncher/launcher/APIs.dart';
+import 'package:rpmlauncher/launcher/apis.dart';
 import 'package:rpmlauncher/util/RPMHttpClient.dart';
 import 'package:xml/xml.dart';
 

diff --git a/lib/model/Game/MinecraftVersion.dart b/lib/model/Game/MinecraftVersion.dart
@@ -1,6 +1,6 @@
 import 'package:dio/dio.dart';
 import 'package:pub_semver/pub_semver.dart';
-import 'package:rpmlauncher/launcher/APIs.dart';
+import 'package:rpmlauncher/launcher/apis.dart';
 import 'package:rpmlauncher/mod/mod_loader.dart';
 import 'package:rpmlauncher/model/Game/MinecraftMeta.dart';
 import 'package:rpmlauncher/util/RPMHttpClient.dart';

diff --git a/lib/pages/curseforge_addon_page.dart b/lib/pages/curseforge_addon_page.dart
@@ -35,7 +35,7 @@ class _CurseForgeAddonPageState extends State<CurseForgeAddonPage> {
       if ((scrollController.position.maxScrollExtent -
               scrollController.position.pixels) <
           50) {
-        //如果快要滑動到底部
+        // if scroll to bottom
         index += 20;
         setState(() {});
       }
@@ -76,7 +76,7 @@ class _CurseForgeAddonPageState extends State<CurseForgeAddonPage> {
                   crossAxisAlignment: CrossAxisAlignment.center,
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
-                    Text(I18n.format('edit.instance.mods.sort')),
+                    I18nText('edit.instance.mods.sort'),
                     DropdownButton<CurseForgeSortField>(
                       value: sortItem,
                       onChanged: (CurseForgeSortField? newValue) {
@@ -90,9 +90,8 @@ class _CurseForgeAddonPageState extends State<CurseForgeAddonPage> {
                               (CurseForgeSortField value) {
                         return DropdownMenuItem<CurseForgeSortField>(
                           value: value,
-                          child: Text(
-                            I18n.format(
-                                'edit.instance.mods.sort.curseforge.${value.name}'),
+                          child: I18nText(
+                            'edit.instance.mods.sort.curseforge.${value.name}',
                             textAlign: TextAlign.center,
                           ),
                         );