Merge branch 'oneclient/main' into feat/mods-page

Author: Kathund

.gemini/config.yml

@@ -0,0 +1,4 @@
+code_review:
+  comment_severity_threshold: LOW
+ignore_patterns:
+  - '**/*.gen.ts'

apps/oneclient/frontend/src/bindings.gen.ts

@@ -25,7 +25,9 @@ export type DirectoryError = { type: "BaseDir"; data: string }
 
 export type DiscordError = { type: "MissingClientId"; data: string } | { type: "ConnectError"; data: string }
 
-export type ExternalPackage = { name: string; url: string; sha1: string; size: number; package_type: PackageType }
+export type ExternalPackage = { name: string; url: string; sha1: string; size: number; package_type: PackageType; overrides: ExternalPackageOverrides | null }
+
+export type ExternalPackageOverrides = { icon: string | null; name: string | null; authors: string[] | null; description: string | null }
 
 export type Filters = { game_versions: string[] | null; loaders: GameLoader[] | null; categories: PackageCategories | null; package_type: PackageType | null }
 
@@ -299,14 +301,8 @@ export type VersionType =
  */
 "old_beta"
 
-const ARGS_MAP = { 'events':'{"message":["event"],"process":["event"],"ingress":["event"]}', 'oneclient':'{"getVersions":[],"getClustersGroupedByMajor":[],"getBundlesFor":["cluster_id"],"openDevTools":[]}', 'folders':'{"openCluster":["folder_name"],"fromCluster":["folder_name"]}', 'core':'{"createCluster":["options"],"getGlobalProfile":[],"getScreenshots":["id"],"fetchMinecraftProfile":["uuid"],"getMods":["id"],"writeSettings":["setting"],"changeCape":["access_token","cape_uuid"],"updateClusterById":["id","request"],"getRunningProcesses":[],"createSettingsProfile":["name"],"getUsers":[],"openMsaLogin":[],"getPackageBody":["provider","body"],"getProfileOrDefault":["name"],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"],"removeCape":["access_token"],"setDefaultUser":["uuid"],"getGameVersions":[],"getRunningProcessesByClusterId":["cluster_id"],"getLogByName":["id","name"],"killProcess":["pid"],"removeUser":["uuid"],"getPackage":["provider","slug"],"getMultiplePackages":["provider","slugs"],"launchCluster":["id","uuid"],"readSettings":[],"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"updateClusterProfile":["name","profile"],"removeCluster":["id"],"isClusterRunning":["cluster_id"],"getLoadersForVersion":["mc_version"],"getUsersFromAuthor":["provider","author"],"getClusters":[],"getUser":["uuid"],"getWorlds":["id"],"fetchLoggedInProfile":["access_token"],"uploadSkinBytes":["access_token","skin_data","image_format","skin_variant"],"searchPackages":["provider","query"],"convertUsernameUUID":["username_uuid"],"getDefaultUser":["fallback"],"installModpack":["modpack","cluster_id"],"getClusterById":["id"],"getLogs":["id"],"changeSkin":["access_token","skin_url","skin_variant"],"open":["input"]}' }
-export type Router = { 'folders': { fromCluster: (folderName: string) => Promise<string>, 
-openCluster: (folderName: string) => Promise<null> },
-'oneclient': { openDevTools: () => Promise<void>, 
-getClustersGroupedByMajor: () => Promise<Partial<{ [key in number]: ClusterModel[] }>>, 
-getBundlesFor: (clusterId: number) => Promise<ModpackArchive[]>, 
-getVersions: () => Promise<OnlineClusterManifest> },
-'core': { getClusters: () => Promise<ClusterModel[]>, 
+const ARGS_MAP = { 'oneclient':'{"getClustersGroupedByMajor":[],"openDevTools":[],"getBundlesFor":["cluster_id"],"getVersions":[]}', 'events':'{"message":["event"],"ingress":["event"],"process":["event"]}', 'core':'{"getLogByName":["id","name"],"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"uploadSkinBytes":["access_token","skin_data","image_format","skin_variant"],"createCluster":["options"],"openMsaLogin":[],"getWorlds":["id"],"getLogs":["id"],"getGlobalProfile":[],"launchCluster":["id","uuid"],"killProcess":["pid"],"writeSettings":["setting"],"removeCluster":["id"],"updateClusterProfile":["name","profile"],"createSettingsProfile":["name"],"getClusters":[],"getPackage":["provider","slug"],"getMods":["id"],"getRunningProcesses":[],"getUsersFromAuthor":["provider","author"],"getPackageBody":["provider","body"],"installModpack":["modpack","cluster_id"],"setDefaultUser":["uuid"],"getUser":["uuid"],"getClusterById":["id"],"searchPackages":["provider","query"],"convertUsernameUUID":["username_uuid"],"getLoadersForVersion":["mc_version"],"changeSkin":["access_token","skin_url","skin_variant"],"isClusterRunning":["cluster_id"],"readSettings":[],"getProfileOrDefault":["name"],"open":["input"],"fetchMinecraftProfile":["uuid"],"changeCape":["access_token","cape_uuid"],"getScreenshots":["id"],"getGameVersions":[],"getUsers":[],"updateClusterById":["id","request"],"removeUser":["uuid"],"getDefaultUser":["fallback"],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"],"removeCape":["access_token"],"getMultiplePackages":["provider","slugs"],"getRunningProcessesByClusterId":["cluster_id"],"fetchLoggedInProfile":["access_token"]}', 'folders':'{"fromCluster":["folder_name"],"openCluster":["folder_name"]}' }
+export type Router = { 'core': { getClusters: () => Promise<ClusterModel[]>, 
 getClusterById: (id: number) => Promise<ClusterModel | null>, 
 removeCluster: (id: number) => Promise<null>, 
 createCluster: (options: CreateCluster) => Promise<ClusterModel>, 
@@ -351,9 +347,15 @@ changeCape: (accessToken: string, capeUuid: string) => Promise<MojangFullPlayerP
 removeCape: (accessToken: string) => Promise<MojangFullPlayerProfile>, 
 convertUsernameUUID: (usernameUuid: string) => Promise<MowojangProfile>, 
 open: (input: string) => Promise<null> },
+'oneclient': { openDevTools: () => Promise<void>, 
+getClustersGroupedByMajor: () => Promise<Partial<{ [key in number]: ClusterModel[] }>>, 
+getBundlesFor: (clusterId: number) => Promise<ModpackArchive[]>, 
+getVersions: () => Promise<OnlineClusterManifest> },
 'events': { ingress: (event: IngressPayload) => Promise<void>, 
 message: (event: MessagePayload) => Promise<void>, 
-process: (event: ProcessPayload) => Promise<void> } };
+process: (event: ProcessPayload) => Promise<void> },
+'folders': { fromCluster: (folderName: string) => Promise<string>, 
+openCluster: (folderName: string) => Promise<null> } };
 
 
 export type { InferCommandOutput }

packages/core/src/api/packages/data.rs

@@ -86,6 +86,16 @@ pub struct ExternalPackage {
 	pub sha1: String,
 	pub size: usize,
 	pub package_type: PackageType,
+	pub overrides: Option<ExternalPackageOverrides>,
+}
+
+#[onelauncher_macro::specta]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub struct ExternalPackageOverrides {
+	pub icon: Option<String>,
+	pub name: Option<String>,
+	pub authors: Option<Vec<String>>,
+	pub description: Option<String>,
 }
 
 #[onelauncher_macro::specta]

packages/core/src/api/packages/modpack/mrpack.rs

@@ -10,7 +10,9 @@ use serde::Deserialize;
 use tokio::sync::OnceCell;
 
 use crate::api::cluster::ClusterError;
-use crate::api::packages::data::{ExternalPackage, ManagedVersion, PackageSide};
+use crate::api::packages::data::{
+	ExternalPackage, ExternalPackageOverrides, ManagedVersion, PackageSide,
+};
 use crate::api::packages::modpack::data::{
 	ModpackArchive, ModpackFile, ModpackFileKind, ModpackManifest,
 };
@@ -344,6 +346,7 @@ async fn to_modpack_files(mrpack_files: &Vec<MrPackFile>) -> LauncherResult<Vec<
 					sha1: file.hashes.sha1.clone(),
 					size: file.file_size,
 					package_type,
+					overrides: file.overrides.clone(),
 				}),
 				enabled: true,
 			});
@@ -405,6 +408,8 @@ pub(super) struct MrPackFile {
 	pub env: MrPackFileEnv,
 	pub downloads: Vec<String>,
 	pub file_size: usize,
+	#[serde(default)]
+	pub overrides: Option<ExternalPackageOverrides>,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Deserialize)]

packages/core/src/api/packages/modpack/polymrpack.rs

@@ -260,6 +260,7 @@ async fn to_modpack_files(mrpack_files: &Vec<PolyMrPackFile>) -> LauncherResult<
 					sha1: file.base.hashes.sha1.clone(),
 					size: file.base.file_size,
 					package_type,
+					overrides: file.base.overrides.clone(),
 				}),
 			});
 		}