🐛 fix: old forge libraries and new fabric loader deps

Signed-off-by: Pauline <[email protected]>
pulseflow · Aug 22, 2024 · f873093 · f873093
1 parent e4fc495
commit f873093
Show file tree

Hide file tree

Showing 3 changed files with 93 additions and 105 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/interface/src/api/modded.rs b/crates/interface/src/api/modded.rs
@@ -96,6 +96,23 @@ pub struct Processor {
 /// Merges a partial version into a complete one
 pub fn merge_partial_version(partial: PartialVersionInfo, merge: VersionInfo) -> VersionInfo {
 	let merge_id = merge.id.clone();
+	let mut libraries = vec![];
+
+	for mut lib in merge.libraries {
+		let lib_artifact = lib.name.rsplit_once(':').map(|x| x.0);
+		if let Some(lib_artifact) = lib_artifact {
+			if !partial.libraries.iter().any(|x| {
+				let target_artifact = x.name.rsplit_once(':').map(|x| x.0);
+				target_artifact == Some(lib_artifact) && x.include_in_classpath
+			}) {
+				libraries.push(lib);
+			} else {
+				lib.include_in_classpath = false;
+			}
+		} else {
+			libraries.push(lib);
+		}
+	}
 
 	VersionInfo {
 		arguments: if let Some(partial_args) = partial.arguments {
@@ -132,13 +149,11 @@ pub fn merge_partial_version(partial: PartialVersionInfo, merge: VersionInfo) ->
 		downloads: merge.downloads,
 		id: partial.id.replace(DUMMY_REPLACE_STRING, &merge_id),
 		java_version: merge.java_version,
-		libraries: partial
-			.libraries
+		libraries: libraries
 			.into_iter()
-			.chain(merge.libraries)
+			.chain(partial.libraries)
 			.map(|mut x| {
 				x.name = x.name.replace(DUMMY_REPLACE_STRING, &merge_id);
-
 				x
 			})
 			.collect::<Vec<_>>(),