Add zip artifact support for mods

Author: realdoomsboygaming

Natives/installer/modpack/CurseForgeAPI.m

@@ -8,6 +8,8 @@
 #define kCurseForgeGameIDMinecraft 432
 #define kCurseForgeClassIDModpack 4471
 #define kCurseForgeClassIDMod 6
+#define kCurseForgeClassIDResourcePack 12
+#define kCurseForgeClassIDShader 6552
 #define kCurseForgePageSize 50
 #define kCurseForgeModLoaderForge 1
 #define kCurseForgeModLoaderFabric 4
@@ -113,6 +115,19 @@ - (NSArray *)normalizedCurseForgeDependencies:(NSArray *)dependencies {
     return result;
 }
 
+- (NSString *)installDirectoryForProject:(NSDictionary *)project {
+    NSInteger classID = [project[@"classId"] respondsToSelector:@selector(integerValue)] ? [project[@"classId"] integerValue] : kCurseForgeClassIDMod;
+    NSDictionary *links = [project[@"links"] isKindOfClass:NSDictionary.class] ? project[@"links"] : nil;
+    NSString *websiteURL = [links[@"websiteUrl"] isKindOfClass:NSString.class] ? [links[@"websiteUrl"] lowercaseString] : @"";
+    if (classID == kCurseForgeClassIDResourcePack || [websiteURL containsString:@"/texture-packs/"]) {
+        return @"resourcepacks";
+    }
+    if (classID == kCurseForgeClassIDShader || [websiteURL containsString:@"/shaders/"]) {
+        return @"shaderpacks";
+    }
+    return @"mods";
+}
+
 - (NSDictionary *)modManagerRecordForFile:(NSDictionary *)file projectID:(NSNumber *)projectID fileName:(NSString *)fileName projectCache:(NSMutableDictionary *)projectCache {
     NSDictionary *project = [self projectInfoForProjectID:projectID cache:projectCache];
     NSDictionary *logo = [project[@"logo"] isKindOfClass:NSDictionary.class] ? project[@"logo"] : nil;
@@ -136,6 +151,8 @@ - (NSDictionary *)modManagerRecordForFile:(NSDictionary *)file projectID:(NSNumb
         @"gameVersion": [self minecraftVersionForFile:file],
         @"dependencies": [self normalizedCurseForgeDependencies:([file[@"dependencies"] isKindOfClass:NSArray.class] ? file[@"dependencies"] : @[])],
         @"dependencyMetadataCheckedAt": @([[NSDate date] timeIntervalSince1970]),
+        @"artifactType": @"mod",
+        @"installDirectory": @"mods",
         @"enabled": @YES
     };
 }
@@ -215,7 +232,14 @@ - (NSString *)manualDownloadPageURLForFile:(NSDictionary *)file projectID:(NSNum
     NSString *slug = project[@"slug"];
     if ([slug isKindOfClass:NSString.class] && slug.length > 0) {
         NSInteger classID = [project[@"classId"] respondsToSelector:@selector(integerValue)] ? [project[@"classId"] integerValue] : kCurseForgeClassIDMod;
-        NSString *section = classID == kCurseForgeClassIDModpack ? @"modpacks" : @"mc-mods";
+        NSString *section = @"mc-mods";
+        if (classID == kCurseForgeClassIDModpack) {
+            section = @"modpacks";
+        } else if (classID == kCurseForgeClassIDResourcePack) {
+            section = @"texture-packs";
+        } else if (classID == kCurseForgeClassIDShader) {
+            section = @"shaders";
+        }
         return [NSString stringWithFormat:@"https://www.curseforge.com/minecraft/%@/%@/download/%@", section, slug, fileID];
     }
 
@@ -368,7 +392,8 @@ - (NSMutableArray *)searchModWithFilters:(NSDictionary<NSString *, NSString *> *
             @"id": modID,
             @"title": title,
             @"description": description,
-            @"imageUrl": imageUrl
+            @"imageUrl": imageUrl,
+            @"classId": mod[@"classId"] ?: @0
         }.mutableCopy];
     }
 
@@ -574,7 +599,9 @@ - (void)downloader:(MinecraftResourceDownloadTask *)downloader submitDownloadTas
         return;
     }
 
-    [NSFileManager.defaultManager removeItemAtPath:[destPath stringByAppendingPathComponent:@"mods"] error:nil];
+    for (NSString *managedDirectory in @[@"mods", @"resourcepacks", @"shaderpacks"]) {
+        [NSFileManager.defaultManager removeItemAtPath:[destPath stringByAppendingPathComponent:managedDirectory] error:nil];
+    }
 
     NSMutableArray *manualDownloads = [NSMutableArray new];
     NSMutableArray *modManagerRecords = [NSMutableArray new];
@@ -600,14 +627,18 @@ - (void)downloader:(MinecraftResourceDownloadTask *)downloader submitDownloadTas
             return;
         }
 
-        NSString *relativePath = [@"mods" stringByAppendingPathComponent:fileName];
+        NSDictionary *project = [self projectInfoForProjectID:projectID cache:projectCache];
+        NSString *installDirectory = [self installDirectoryForProject:project];
+        NSString *relativePath = [installDirectory stringByAppendingPathComponent:fileName];
         NSString *path = [destPath stringByAppendingPathComponent:relativePath];
         NSUInteger size = [file[@"fileLength"] respondsToSelector:@selector(unsignedLongLongValue)] ? [file[@"fileLength"] unsignedLongLongValue] : 0;
         if (size == 0) {
             size = [file[@"fileSizeOnDisk"] respondsToSelector:@selector(unsignedLongLongValue)] ? [file[@"fileSizeOnDisk"] unsignedLongLongValue] : 0;
         }
         NSString *sha = [self sha1HashForFile:file];
-        [modManagerRecords addObject:[self modManagerRecordForFile:file projectID:projectID fileName:fileName projectCache:projectCache]];
+        if ([installDirectory isEqualToString:@"mods"]) {
+            [modManagerRecords addObject:[self modManagerRecordForFile:file projectID:projectID fileName:fileName projectCache:projectCache]];
+        }
         NSString *url = [self downloadURLForFile:file projectID:projectID];
         if (url.length == 0) {
             NSString *manualURL = [self manualDownloadPageURLForFile:file projectID:projectID cache:projectCache];

Natives/installer/modpack/ModrinthAPI.m

@@ -65,7 +65,8 @@ - (NSMutableArray *)searchModWithFilters:(NSDictionary<NSString *, NSString *> *
             @"id": projectID,
             @"title": title,
             @"description": description,
-            @"imageUrl": imageUrl
+            @"imageUrl": imageUrl,
+            @"projectType": hit[@"project_type"] ?: @""
         }.mutableCopy];
     }
     NSUInteger totalHits = [response[@"total_hits"] respondsToSelector:@selector(unsignedLongValue)] ? [response[@"total_hits"] unsignedLongValue] : result.count;
@@ -197,7 +198,9 @@ - (void)downloader:(MinecraftResourceDownloadTask *)downloader submitDownloadTas
         return;
     }
 
-    [NSFileManager.defaultManager removeItemAtPath:[destPath stringByAppendingPathComponent:@"mods"] error:nil];
+    for (NSString *managedDirectory in @[@"mods", @"resourcepacks", @"shaderpacks"]) {
+        [NSFileManager.defaultManager removeItemAtPath:[destPath stringByAppendingPathComponent:managedDirectory] error:nil];
+    }
 
     NSMutableArray *modManagerRecords = [NSMutableArray new];
     for (NSDictionary *indexFile in indexFiles) {
@@ -228,14 +231,18 @@ - (void)downloader:(MinecraftResourceDownloadTask *)downloader submitDownloadTas
             sha = nil;
         }
         NSString *fileName = relativePath.lastPathComponent;
-        if ([relativePath hasPrefix:@"mods/"] && [fileName.lowercaseString hasSuffix:@".jar"]) {
+        NSString *lowerFileName = fileName.lowercaseString;
+        if ([relativePath hasPrefix:@"mods/"] &&
+            ([lowerFileName hasSuffix:@".jar"] || [lowerFileName hasSuffix:@".zip"])) {
             NSString *source = [self modManagerSourceForDownloadURLs:downloads];
             [modManagerRecords addObject:@{
                 @"source": source,
                 @"fileName": fileName,
                 @"downloadUrl": url,
                 @"sha1": sha ?: @"",
                 @"size": [indexFile[@"fileSize"] respondsToSelector:@selector(unsignedLongLongValue)] ? indexFile[@"fileSize"] : @0,
+                @"artifactType": @"mod",
+                @"installDirectory": @"mods",
                 @"enabled": @YES
             }];
         }