From 713de9a353bb97dea00844883eb204019fafaa7c Mon Sep 17 00:00:00 2001
From: Jacob <admin@kath.lol>
Date: Sat, 4 Oct 2025 12:08:45 +0800
Subject: [PATCH 1/3] feat: oneclient no account popup

Prompts the user for a login when they don't have an account added and
are trying to start the game
---
 apps/oneclient/frontend/src/bindings.gen.ts   | 22 +++++------
 .../frontend/src/components/LaunchButton.tsx  | 38 ++++++++++++++-----
 .../src/components/overlay/NoAccountPopup.tsx | 23 +++++++++++
 .../frontend/src/components/overlay/index.ts  |  1 +
 4 files changed, 64 insertions(+), 20 deletions(-)
 create mode 100644 apps/oneclient/frontend/src/components/overlay/NoAccountPopup.tsx

diff --git a/apps/oneclient/frontend/src/bindings.gen.ts b/apps/oneclient/frontend/src/bindings.gen.ts
index 782806a6..a19fd0cf 100644
--- a/apps/oneclient/frontend/src/bindings.gen.ts
+++ b/apps/oneclient/frontend/src/bindings.gen.ts
@@ -254,16 +254,8 @@ export type VersionType =
  */
 "old_beta"
 
-const ARGS_MAP = { 'events':'{"process":["event"],"ingress":["event"],"message":["event"]}', 'oneclient':'{"openDevTools":[],"getClustersGroupedByMajor":[],"getBundlesFor":["cluster_id"]}', 'core':'{"updateClusterById":["id","request"],"getRunningProcesses":[],"readSettings":[],"changeSkin":["access_token","skin_url","skin_variant"],"fetchMinecraftProfile":["uuid"],"uploadSkinBytes":["access_token","skin_data","image_format","skin_variant"],"searchPackages":["provider","query"],"getClusters":[],"getPackageBody":["provider","body"],"killProcess":["pid"],"createSettingsProfile":["name"],"installModpack":["modpack","cluster_id"],"getMultiplePackages":["provider","slugs"],"getUsers":[],"open":["input"],"getUsersFromAuthor":["provider","author"],"getUser":["uuid"],"launchCluster":["id","uuid"],"removeUser":["uuid"],"getLogByName":["id","name"],"getPackage":["provider","slug"],"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"removeCape":["access_token"],"writeSettings":["setting"],"getClusterById":["id"],"getLoadersForVersion":["mc_version"],"openMsaLogin":[],"updateClusterProfile":["name","profile"],"isClusterRunning":["cluster_id"],"getScreenshots":["id"],"getGlobalProfile":[],"createCluster":["options"],"getLogs":["id"],"getRunningProcessesByClusterId":["cluster_id"],"getProfileOrDefault":["name"],"getGameVersions":[],"getWorlds":["id"],"getDefaultUser":["fallback"],"setDefaultUser":["uuid"],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"],"fetchLoggedInProfile":["access_token"],"changeCape":["access_token","cape_uuid"],"removeCluster":["id"],"convertUsernameUUID":["username_uuid"]}', 'folders':'{"fromCluster":["folder_name"],"openCluster":["folder_name"]}' }
-export type Router = { 'oneclient': { openDevTools: () => Promise<void>, 
-getClustersGroupedByMajor: () => Promise<Partial<{ [key in number]: ClusterModel[] }>>, 
-getBundlesFor: (clusterId: number) => Promise<ModpackArchive[]> },
-'events': { ingress: (event: IngressPayload) => Promise<void>, 
-message: (event: MessagePayload) => Promise<void>, 
-process: (event: ProcessPayload) => Promise<void> },
-'folders': { fromCluster: (folderName: string) => Promise<string>, 
-openCluster: (folderName: string) => Promise<null> },
-'core': { getClusters: () => Promise<ClusterModel[]>, 
+const ARGS_MAP = { 'events':'{"process":["event"],"ingress":["event"],"message":["event"]}', 'folders':'{"fromCluster":["folder_name"],"openCluster":["folder_name"]}', 'core':'{"updateClusterById":["id","request"],"getRunningProcesses":[],"readSettings":[],"changeSkin":["access_token","skin_url","skin_variant"],"fetchMinecraftProfile":["uuid"],"uploadSkinBytes":["access_token","skin_data","image_format","skin_variant"],"searchPackages":["provider","query"],"getClusters":[],"getPackageBody":["provider","body"],"killProcess":["pid"],"createSettingsProfile":["name"],"installModpack":["modpack","cluster_id"],"getMultiplePackages":["provider","slugs"],"getUsers":[],"open":["input"],"getUsersFromAuthor":["provider","author"],"getUser":["uuid"],"launchCluster":["id","uuid"],"removeUser":["uuid"],"getLogByName":["id","name"],"getPackage":["provider","slug"],"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"removeCape":["access_token"],"writeSettings":["setting"],"getClusterById":["id"],"getLoadersForVersion":["mc_version"],"openMsaLogin":[],"updateClusterProfile":["name","profile"],"isClusterRunning":["cluster_id"],"getScreenshots":["id"],"getGlobalProfile":[],"createCluster":["options"],"getLogs":["id"],"getRunningProcessesByClusterId":["cluster_id"],"getProfileOrDefault":["name"],"getGameVersions":[],"getWorlds":["id"],"getDefaultUser":["fallback"],"setDefaultUser":["uuid"],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"],"fetchLoggedInProfile":["access_token"],"changeCape":["access_token","cape_uuid"],"removeCluster":["id"],"convertUsernameUUID":["username_uuid"]}', 'oneclient':'{"openDevTools":[],"getClustersGroupedByMajor":[],"getBundlesFor":["cluster_id"]}' }
+export type Router = { 'core': { getClusters: () => Promise<ClusterModel[]>, 
 getClusterById: (id: number) => Promise<ClusterModel | null>, 
 removeCluster: (id: number) => Promise<null>, 
 createCluster: (options: CreateCluster) => Promise<ClusterModel>, 
@@ -306,7 +298,15 @@ changeSkin: (accessToken: string, skinUrl: string, skinVariant: SkinVariant) =>
 changeCape: (accessToken: string, capeUuid: string) => Promise<MojangFullPlayerProfile>, 
 removeCape: (accessToken: string) => Promise<MojangFullPlayerProfile>, 
 convertUsernameUUID: (usernameUuid: string) => Promise<MowojangProfile>, 
-open: (input: string) => Promise<null> } };
+open: (input: string) => Promise<null> },
+'folders': { fromCluster: (folderName: string) => Promise<string>, 
+openCluster: (folderName: string) => Promise<null> },
+'events': { ingress: (event: IngressPayload) => Promise<void>, 
+message: (event: MessagePayload) => Promise<void>, 
+process: (event: ProcessPayload) => Promise<void> },
+'oneclient': { openDevTools: () => Promise<void>, 
+getClustersGroupedByMajor: () => Promise<Partial<{ [key in number]: ClusterModel[] }>>, 
+getBundlesFor: (clusterId: number) => Promise<ModpackArchive[]> } };
 
 
 export type { InferCommandOutput }
diff --git a/apps/oneclient/frontend/src/components/LaunchButton.tsx b/apps/oneclient/frontend/src/components/LaunchButton.tsx
index 571929d6..310227aa 100644
--- a/apps/oneclient/frontend/src/components/LaunchButton.tsx
+++ b/apps/oneclient/frontend/src/components/LaunchButton.tsx
@@ -1,8 +1,13 @@
 import type { ButtonProps } from '@onelauncher/common/components';
 import { useIsRunning } from '@/hooks/useClusters';
 import { useLaunchCluster } from '@/hooks/useLaunchCluster';
+import { bindings } from '@/main';
+import { useCommandSuspense } from '@onelauncher/common';
 import { Button } from '@onelauncher/common/components';
+import { useState } from 'react';
+import { DialogTrigger } from 'react-aria-components';
 import { tv } from 'tailwind-variants';
+import { NoAccountPopup, Overlay } from './overlay';
 
 export type LaunchButtonProps = Omit<ButtonProps, 'children' | 'onClick'> & {
 	clusterId: number | undefined | null;
@@ -22,17 +27,32 @@ export function LaunchButton({
 	className,
 	...rest
 }: LaunchButtonProps) {
-	const launch = useLaunchCluster(clusterId);
+	const { data: currentAccount } = useCommandSuspense(['getDefaultUser'], () => bindings.core.getDefaultUser(true));
+	const launchCluster = useLaunchCluster(clusterId);
 	const isRunning = useIsRunning(clusterId);
+	const [open, setOpen] = useState<boolean>(false);
+
+	const launch = () => {
+		if (currentAccount === null)
+			setOpen(true);
+		else
+			launchCluster();
+	};
 
 	return (
-		<Button
-			className={launchButtonVariants({ isRunning, className })}
-			isDisabled={isDisabled || isRunning}
-			onClick={launch}
-			{...rest}
-		>
-			{isRunning ? 'Running' : 'Launch'}
-		</Button>
+		<DialogTrigger isOpen={open} onOpenChange={setOpen}>
+			<Button
+				className={launchButtonVariants({ isRunning, className })}
+				isDisabled={isDisabled || isRunning}
+				onPress={launch}
+				{...rest}
+			>
+				{isRunning ? "Running" : "Launch"}
+			</Button>
+
+			<Overlay>
+				<NoAccountPopup />
+			</Overlay>
+		</DialogTrigger>
 	);
 }
diff --git a/apps/oneclient/frontend/src/components/overlay/NoAccountPopup.tsx b/apps/oneclient/frontend/src/components/overlay/NoAccountPopup.tsx
new file mode 100644
index 00000000..0132c22f
--- /dev/null
+++ b/apps/oneclient/frontend/src/components/overlay/NoAccountPopup.tsx
@@ -0,0 +1,23 @@
+import { Button } from '@onelauncher/common/components';
+import { DialogTrigger } from 'react-aria-components';
+import { AddAccountModal } from './AddAccountModal';
+import { Overlay } from './Overlay';
+
+export function NoAccountPopup() {
+	return (
+		<Overlay.Dialog>
+			<Overlay.Title>No Account</Overlay.Title>
+			<p>Please add an account before you start minecraft</p>
+
+			<DialogTrigger>
+				<Button className="w-full" size="large">
+					Add Account
+				</Button>
+
+				<Overlay>
+					<AddAccountModal />
+				</Overlay>
+			</DialogTrigger>
+		</Overlay.Dialog>
+	);
+}
diff --git a/apps/oneclient/frontend/src/components/overlay/index.ts b/apps/oneclient/frontend/src/components/overlay/index.ts
index c1f1c7e2..26e5d627 100644
--- a/apps/oneclient/frontend/src/components/overlay/index.ts
+++ b/apps/oneclient/frontend/src/components/overlay/index.ts
@@ -1,6 +1,7 @@
 export * from './AccountPopup';
 export * from './AddAccountModal';
 export * from './ImportSkinModal';
+export * from './NoAccountPopup';
 export * from './Overlay';
 export * from './Popup';
 export * from './RemoveAccountModal';

From b9282b2c58afc309a990965e1902d5f06c99d91e Mon Sep 17 00:00:00 2001
From: Jacob <admin@kath.lol>
Date: Sat, 4 Oct 2025 12:10:53 +0800
Subject: [PATCH 2/3] fix: formatting

---
 apps/oneclient/frontend/src/components/LaunchButton.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/oneclient/frontend/src/components/LaunchButton.tsx b/apps/oneclient/frontend/src/components/LaunchButton.tsx
index 310227aa..c4f8e4c7 100644
--- a/apps/oneclient/frontend/src/components/LaunchButton.tsx
+++ b/apps/oneclient/frontend/src/components/LaunchButton.tsx
@@ -47,7 +47,7 @@ export function LaunchButton({
 				onPress={launch}
 				{...rest}
 			>
-				{isRunning ? "Running" : "Launch"}
+				{isRunning ? 'Running' : 'Launch'}
 			</Button>
 
 			<Overlay>

From 620e056f8e7c4ea238496a9ec6a93218df40bd35 Mon Sep 17 00:00:00 2001
From: Jacob <admin@kath.lol>
Date: Sat, 4 Oct 2025 12:20:24 +0800
Subject: [PATCH 3/3] fix: account popup text color

---
 apps/oneclient/frontend/src/bindings.gen.ts          | 12 ++++++------
 .../src/components/overlay/NoAccountPopup.tsx        |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/oneclient/frontend/src/bindings.gen.ts b/apps/oneclient/frontend/src/bindings.gen.ts
index a19fd0cf..d105374f 100644
--- a/apps/oneclient/frontend/src/bindings.gen.ts
+++ b/apps/oneclient/frontend/src/bindings.gen.ts
@@ -254,7 +254,7 @@ export type VersionType =
  */
 "old_beta"
 
-const ARGS_MAP = { 'events':'{"process":["event"],"ingress":["event"],"message":["event"]}', 'folders':'{"fromCluster":["folder_name"],"openCluster":["folder_name"]}', 'core':'{"updateClusterById":["id","request"],"getRunningProcesses":[],"readSettings":[],"changeSkin":["access_token","skin_url","skin_variant"],"fetchMinecraftProfile":["uuid"],"uploadSkinBytes":["access_token","skin_data","image_format","skin_variant"],"searchPackages":["provider","query"],"getClusters":[],"getPackageBody":["provider","body"],"killProcess":["pid"],"createSettingsProfile":["name"],"installModpack":["modpack","cluster_id"],"getMultiplePackages":["provider","slugs"],"getUsers":[],"open":["input"],"getUsersFromAuthor":["provider","author"],"getUser":["uuid"],"launchCluster":["id","uuid"],"removeUser":["uuid"],"getLogByName":["id","name"],"getPackage":["provider","slug"],"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"removeCape":["access_token"],"writeSettings":["setting"],"getClusterById":["id"],"getLoadersForVersion":["mc_version"],"openMsaLogin":[],"updateClusterProfile":["name","profile"],"isClusterRunning":["cluster_id"],"getScreenshots":["id"],"getGlobalProfile":[],"createCluster":["options"],"getLogs":["id"],"getRunningProcessesByClusterId":["cluster_id"],"getProfileOrDefault":["name"],"getGameVersions":[],"getWorlds":["id"],"getDefaultUser":["fallback"],"setDefaultUser":["uuid"],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"],"fetchLoggedInProfile":["access_token"],"changeCape":["access_token","cape_uuid"],"removeCluster":["id"],"convertUsernameUUID":["username_uuid"]}', 'oneclient':'{"openDevTools":[],"getClustersGroupedByMajor":[],"getBundlesFor":["cluster_id"]}' }
+const ARGS_MAP = { 'folders':'{"fromCluster":["folder_name"],"openCluster":["folder_name"]}', 'events':'{"process":["event"],"ingress":["event"],"message":["event"]}', 'oneclient':'{"openDevTools":[],"getClustersGroupedByMajor":[],"getBundlesFor":["cluster_id"]}', 'core':'{"updateClusterById":["id","request"],"getRunningProcesses":[],"readSettings":[],"changeSkin":["access_token","skin_url","skin_variant"],"fetchMinecraftProfile":["uuid"],"uploadSkinBytes":["access_token","skin_data","image_format","skin_variant"],"searchPackages":["provider","query"],"getClusters":[],"getPackageBody":["provider","body"],"killProcess":["pid"],"createSettingsProfile":["name"],"installModpack":["modpack","cluster_id"],"getMultiplePackages":["provider","slugs"],"getUsers":[],"open":["input"],"getUsersFromAuthor":["provider","author"],"getUser":["uuid"],"launchCluster":["id","uuid"],"removeUser":["uuid"],"getLogByName":["id","name"],"getPackage":["provider","slug"],"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"removeCape":["access_token"],"writeSettings":["setting"],"getClusterById":["id"],"getLoadersForVersion":["mc_version"],"openMsaLogin":[],"updateClusterProfile":["name","profile"],"isClusterRunning":["cluster_id"],"getScreenshots":["id"],"getGlobalProfile":[],"createCluster":["options"],"getLogs":["id"],"getRunningProcessesByClusterId":["cluster_id"],"getProfileOrDefault":["name"],"getGameVersions":[],"getWorlds":["id"],"getDefaultUser":["fallback"],"setDefaultUser":["uuid"],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"],"fetchLoggedInProfile":["access_token"],"changeCape":["access_token","cape_uuid"],"removeCluster":["id"],"convertUsernameUUID":["username_uuid"]}' }
 export type Router = { 'core': { getClusters: () => Promise<ClusterModel[]>, 
 getClusterById: (id: number) => Promise<ClusterModel | null>, 
 removeCluster: (id: number) => Promise<null>, 
@@ -299,14 +299,14 @@ changeCape: (accessToken: string, capeUuid: string) => Promise<MojangFullPlayerP
 removeCape: (accessToken: string) => Promise<MojangFullPlayerProfile>, 
 convertUsernameUUID: (usernameUuid: string) => Promise<MowojangProfile>, 
 open: (input: string) => Promise<null> },
-'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[]> },
 'events': { ingress: (event: IngressPayload) => Promise<void>, 
 message: (event: MessagePayload) => Promise<void>, 
 process: (event: ProcessPayload) => Promise<void> },
-'oneclient': { openDevTools: () => Promise<void>, 
-getClustersGroupedByMajor: () => Promise<Partial<{ [key in number]: ClusterModel[] }>>, 
-getBundlesFor: (clusterId: number) => Promise<ModpackArchive[]> } };
+'folders': { fromCluster: (folderName: string) => Promise<string>, 
+openCluster: (folderName: string) => Promise<null> } };
 
 
 export type { InferCommandOutput }
diff --git a/apps/oneclient/frontend/src/components/overlay/NoAccountPopup.tsx b/apps/oneclient/frontend/src/components/overlay/NoAccountPopup.tsx
index 0132c22f..9459202d 100644
--- a/apps/oneclient/frontend/src/components/overlay/NoAccountPopup.tsx
+++ b/apps/oneclient/frontend/src/components/overlay/NoAccountPopup.tsx
@@ -7,7 +7,7 @@ export function NoAccountPopup() {
 	return (
 		<Overlay.Dialog>
 			<Overlay.Title>No Account</Overlay.Title>
-			<p>Please add an account before you start minecraft</p>
+			<p className="max-w-sm text-fg-secondary">Please add an account before you start minecraft</p>
 
 			<DialogTrigger>
 				<Button className="w-full" size="large">