Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions apps/oneclient/frontend/src/bindings.gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -303,10 +303,8 @@ export type VersionType =
*/
"old_beta"

const ARGS_MAP = { 'debug':'{"getArch":[],"getBuildTimestamp":[],"getPlatform":[],"getType":[],"getLocale":[],"getOsVersion":[],"openDevTools":[],"getGitCommitHash":[],"isInDev":[],"getPackageVersion":[],"getFamily":[]}', 'folders':'{"fromCluster":["folder_name"],"openCluster":["folder_name"]}', 'events':'{"process":["event"],"ingress":["event"],"message":["event"]}', 'core':'{"getLogByName":["id","name"],"getClusterById":["id"],"getLogs":["id"],"setDiscordRPCMessage":["message"],"getClusters":[],"getWorlds":["id"],"createSettingsProfile":["name"],"getUsers":[],"isClusterRunning":["cluster_id"],"fetchMinecraftProfile":["uuid"],"getPackage":["provider","slug"],"getScreenshots":["id"],"getRunningProcessesByClusterId":["cluster_id"],"getUsersFromAuthor":["provider","author"],"getLinkedPackages":["cluster_id"],"openMsaLogin":[],"getDefaultUser":["fallback"],"downloadExternalPackage":["package","cluster_id","force","skip_compatibility"],"writeSettings":["setting"],"getUser":["uuid"],"readSettings":[],"fetchLoggedInProfile":["access_token"],"getLoadersForVersion":["mc_version"],"open":["input"],"killProcess":["pid"],"installModpack":["modpack","cluster_id"],"setClusterStage":["id","stage"],"getRunningProcesses":[],"getProfileOrDefault":["name"],"updateClusterProfile":["name","profile"],"removeCluster":["id"],"getGameVersions":[],"getPackageBody":["provider","body"],"getMultiplePackages":["provider","slugs"],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"],"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"changeSkin":["access_token","skin_url","skin_variant"],"changeCape":["access_token","cape_uuid"],"removeUser":["uuid"],"setDefaultUser":["uuid"],"launchCluster":["id","uuid","search_for_java"],"updateClusterById":["id","request"],"createCluster":["options"],"getGlobalProfile":[],"searchPackages":["provider","query"],"removePackage":["cluster_id","package_hash"],"uploadSkinBytes":["access_token","skin_data","image_format","skin_variant"],"removeCape":["access_token"],"convertUsernameUUID":["username_uuid"]}', 'oneclient':'{"installUpdate":[],"getClustersGroupedByMajor":[],"checkForUpdate":[],"getBundlesFor":["cluster_id"],"getVersions":[]}' }
export type Router = { 'folders': { fromCluster: (folderName: string) => Promise<string>,
openCluster: (folderName: string) => Promise<null> },
'debug': { openDevTools: () => Promise<void>,
const ARGS_MAP = { 'oneclient':'{"installUpdate":[],"getClustersGroupedByMajor":[],"checkForUpdate":[],"getBundlesFor":["cluster_id"],"getVersions":[]}', 'events':'{"process":["event"],"ingress":["event"],"message":["event"]}', 'core':'{"getLogByName":["id","name"],"getClusterById":["id"],"getLogs":["id"],"setDiscordRPCMessage":["message"],"getClusters":[],"getWorlds":["id"],"createSettingsProfile":["name"],"getUsers":[],"isClusterRunning":["cluster_id"],"fetchMinecraftProfile":["uuid"],"getPackage":["provider","slug"],"getScreenshots":["id"],"getRunningProcessesByClusterId":["cluster_id"],"getUsersFromAuthor":["provider","author"],"getLinkedPackages":["cluster_id"],"openMsaLogin":[],"getDefaultUser":["fallback"],"downloadExternalPackage":["package","cluster_id","force","skip_compatibility"],"writeSettings":["setting"],"getUser":["uuid"],"readSettings":[],"fetchLoggedInProfile":["access_token"],"getLoadersForVersion":["mc_version"],"open":["input"],"killProcess":["pid"],"installModpack":["modpack","cluster_id"],"setClusterStage":["id","stage"],"getRunningProcesses":[],"getProfileOrDefault":["name"],"updateClusterProfile":["name","profile"],"removeCluster":["id"],"getGameVersions":[],"getPackageBody":["provider","body"],"getMultiplePackages":["provider","slugs"],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"],"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"changeSkin":["access_token","skin_url","skin_variant"],"changeCape":["access_token","cape_uuid"],"removeUser":["uuid"],"setDefaultUser":["uuid"],"launchCluster":["id","uuid","search_for_java"],"updateClusterById":["id","request"],"createCluster":["options"],"getGlobalProfile":[],"searchPackages":["provider","query"],"removePackage":["cluster_id","package_hash"],"uploadSkinBytes":["access_token","skin_data","image_format","skin_variant"],"removeCape":["access_token"],"convertUsernameUUID":["username_uuid"]}', 'folders':'{"fromCluster":["folder_name"],"openCluster":["folder_name"]}', 'debug':'{"getArch":[],"getBuildTimestamp":[],"getPlatform":[],"getType":[],"getLocale":[],"getOsVersion":[],"openDevTools":[],"getGitCommitHash":[],"isInDev":[],"getPackageVersion":[],"getFamily":[]}' }
export type Router = { 'debug': { openDevTools: () => Promise<void>,
isInDev: () => Promise<boolean>,
getArch: () => Promise<string>,
getFamily: () => Promise<string>,
Expand All @@ -317,11 +315,11 @@ getOsVersion: () => Promise<string>,
getGitCommitHash: () => Promise<string>,
getBuildTimestamp: () => Promise<string>,
getPackageVersion: () => Promise<string> },
'oneclient': { getClustersGroupedByMajor: () => Promise<Partial<{ [key in number]: ClusterModel[] }>>,
getBundlesFor: (clusterId: number) => Promise<ModpackArchive[]>,
getVersions: () => Promise<OnlineClusterManifest>,
checkForUpdate: () => Promise<Update | null>,
installUpdate: () => Promise<null> },
'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[]>,
getClusterById: (id: number) => Promise<ClusterModel | null>,
removeCluster: (id: number) => Promise<null>,
Expand Down Expand Up @@ -371,9 +369,11 @@ removeCape: (accessToken: string) => Promise<MojangFullPlayerProfile>,
convertUsernameUUID: (usernameUuid: string) => Promise<MowojangProfile>,
setDiscordRPCMessage: (message: string) => Promise<null>,
open: (input: string) => Promise<null> },
'events': { ingress: (event: IngressPayload) => Promise<void>,
message: (event: MessagePayload) => Promise<void>,
process: (event: ProcessPayload) => Promise<void> } };
'oneclient': { getClustersGroupedByMajor: () => Promise<Partial<{ [key in number]: ClusterModel[] }>>,
getBundlesFor: (clusterId: number) => Promise<ModpackArchive[]>,
getVersions: () => Promise<OnlineClusterManifest>,
checkForUpdate: () => Promise<Update | null>,
installUpdate: () => Promise<null> } };


export type { InferCommandOutput }
Expand Down
28 changes: 20 additions & 8 deletions apps/oneclient/frontend/src/routes/app/cluster/settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,20 +73,24 @@ function RouteComponent() {
<div className="grid grid-cols-[70px_16px_70px] gap-2 grid-justify-center grid-items-center">
<TextField
className="text-center"
min={1}
onChange={(e) => {
updateProfile({ res: { height: profile.res?.height ?? 720, width: Number(e.currentTarget.value) } });
const width = Math.max(1, Number(e.currentTarget.value));
updateProfile({ res: { width, height: profile.res?.height ?? 480 } });
}}
type="number"
value={profile.res?.width}
value={profile.res?.width ?? 640}
/>
<XIcon className="size-4 self-center" />
<TextField
className="text-center"
min={1}
onChange={(e) => {
updateProfile({ res: { width: profile.res?.height ?? 1280, height: Number(e.currentTarget.value) } });
const height = Math.max(1, Number(e.currentTarget.value));
updateProfile({ res: { width: profile.res?.width ?? 640, height } });
}}
type="number"
value={profile.res?.height}
value={profile.res?.height ?? 480}
/>
</div>
</SettingsRow>
Expand All @@ -97,15 +101,23 @@ function RouteComponent() {
title="Memory"
>
<div className="flex items-center gap-x-4 flex-justify-center">
<div className="flex flex-row items-center gap-x-2">
<div className="flex flex-row items-center gap-x-2 relative">
<TextField
className="text-center"
className="text-center pr-10"
min={0}
onBlur={() => {
updateProfile({ mem_max: profile.mem_max ?? 0 });
}}
onChange={(e) => {
updateProfile({ mem_max: Number(e.currentTarget.value) });
const raw = e.currentTarget.value;
updateProfile({ mem_max: raw === '' ? undefined : Math.max(0, Number(raw)) });
}}
type="number"
value={profile.mem_max ?? undefined}
value={profile.mem_max ?? ''}
/>
<div className="absolute inset-y-0 right-3 flex items-center">
<p className="text-sm text-fg-secondary">MB</p>
</div>
</div>
</div>
</SettingsRow>
Expand Down
27 changes: 19 additions & 8 deletions apps/oneclient/frontend/src/routes/app/settings/minecraft.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,20 +77,24 @@ export function GameSettings() {
<div className="grid grid-cols-[70px_16px_70px] gap-2 grid-justify-center grid-items-center">
<TextField
className="text-center"
min={1}
onChange={(e) => {
setSetting('res', { height: gameSettings.res?.height ?? 720, width: Number(e.currentTarget.value) });
const width = Math.max(1, Number(e.currentTarget.value));
setSetting('res', { width, height: gameSettings.res?.height ?? 480 });
}}
type="number"
value={gameSettings.res?.width}
value={gameSettings.res?.width ?? 640}
/>
<XIcon className="size-4 self-center" />
<TextField
className="text-center"
min={1}
onChange={(e) => {
setSetting('res', { width: gameSettings.res?.height ?? 1280, height: Number(e.currentTarget.value) });
const height = Math.max(1, Number(e.currentTarget.value));
setSetting('res', { width: gameSettings.res?.width ?? 640, height });
}}
type="number"
value={gameSettings.res?.height}
value={gameSettings.res?.height ?? 480}
/>
</div>
</SettingsRow>
Expand All @@ -101,15 +105,22 @@ export function GameSettings() {
title="Memory"
>
<div className="flex items-center gap-x-4 flex-justify-center">
<div className="flex flex-row items-center gap-x-2">
<div className="flex flex-row items-center gap-x-2 relative">
<TextField
className="text-center"
className="text-center pr-10"
onBlur={() => {
setSetting('mem_max', gameSettings.mem_max ?? 0);
}}
onChange={(e) => {
setSetting('mem_max', Number(e.currentTarget.value));
const raw = e.currentTarget.value;
setSetting('mem_max', raw === '' ? null : Math.max(0, Number(raw)));
}}
type="number"
value={gameSettings.mem_max ?? undefined}
value={gameSettings.mem_max ?? ''}
/>
<div className="absolute inset-y-0 right-3 flex items-center">
<p className="text-sm text-fg-secondary">MB</p>
</div>
</div>
</div>
</SettingsRow>
Expand Down
Loading