Skip to content

Commit aa9f7b8

Browse files
committed
fix(OneClient): Nonexistent Default Resolution
Closes: #444
1 parent 788660a commit aa9f7b8

File tree

3 files changed

+35
-27
lines changed

3 files changed

+35
-27
lines changed

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,24 @@ export type VersionType =
303303
*/
304304
"old_beta"
305305

306-
const ARGS_MAP = { '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"]}', 'debug':'{"getArch":[],"getBuildTimestamp":[],"getPlatform":[],"getType":[],"getLocale":[],"getOsVersion":[],"openDevTools":[],"getGitCommitHash":[],"isInDev":[],"getPackageVersion":[],"getFamily":[]}', 'oneclient':'{"installUpdate":[],"getClustersGroupedByMajor":[],"checkForUpdate":[],"getBundlesFor":["cluster_id"],"getVersions":[]}', 'events':'{"process":["event"],"ingress":["event"],"message":["event"]}', 'folders':'{"fromCluster":["folder_name"],"openCluster":["folder_name"]}' }
307-
export type Router = { 'core': { getClusters: () => Promise<ClusterModel[]>,
306+
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":[]}' }
307+
export type Router = { 'debug': { openDevTools: () => Promise<void>,
308+
isInDev: () => Promise<boolean>,
309+
getArch: () => Promise<string>,
310+
getFamily: () => Promise<string>,
311+
getLocale: () => Promise<string | null>,
312+
getType: () => Promise<string>,
313+
getPlatform: () => Promise<string>,
314+
getOsVersion: () => Promise<string>,
315+
getGitCommitHash: () => Promise<string>,
316+
getBuildTimestamp: () => Promise<string>,
317+
getPackageVersion: () => Promise<string> },
318+
'events': { ingress: (event: IngressPayload) => Promise<void>,
319+
message: (event: MessagePayload) => Promise<void>,
320+
process: (event: ProcessPayload) => Promise<void> },
321+
'folders': { fromCluster: (folderName: string) => Promise<string>,
322+
openCluster: (folderName: string) => Promise<null> },
323+
'core': { getClusters: () => Promise<ClusterModel[]>,
308324
getClusterById: (id: number) => Promise<ClusterModel | null>,
309325
removeCluster: (id: number) => Promise<null>,
310326
createCluster: (options: CreateCluster) => Promise<ClusterModel>,
@@ -357,23 +373,7 @@ open: (input: string) => Promise<null> },
357373
getBundlesFor: (clusterId: number) => Promise<ModpackArchive[]>,
358374
getVersions: () => Promise<OnlineClusterManifest>,
359375
checkForUpdate: () => Promise<Update | null>,
360-
installUpdate: () => Promise<null> },
361-
'events': { ingress: (event: IngressPayload) => Promise<void>,
362-
message: (event: MessagePayload) => Promise<void>,
363-
process: (event: ProcessPayload) => Promise<void> },
364-
'folders': { fromCluster: (folderName: string) => Promise<string>,
365-
openCluster: (folderName: string) => Promise<null> },
366-
'debug': { openDevTools: () => Promise<void>,
367-
isInDev: () => Promise<boolean>,
368-
getArch: () => Promise<string>,
369-
getFamily: () => Promise<string>,
370-
getLocale: () => Promise<string | null>,
371-
getType: () => Promise<string>,
372-
getPlatform: () => Promise<string>,
373-
getOsVersion: () => Promise<string>,
374-
getGitCommitHash: () => Promise<string>,
375-
getBuildTimestamp: () => Promise<string>,
376-
getPackageVersion: () => Promise<string> } };
376+
installUpdate: () => Promise<null> } };
377377

378378

379379
export type { InferCommandOutput }

apps/oneclient/frontend/src/routes/app/cluster/settings.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,20 +73,24 @@ function RouteComponent() {
7373
<div className="grid grid-cols-[70px_16px_70px] gap-2 grid-justify-center grid-items-center">
7474
<TextField
7575
className="text-center"
76+
min={1}
7677
onChange={(e) => {
77-
updateProfile({ res: { height: profile.res?.height ?? 720, width: Number(e.currentTarget.value) } });
78+
const width = Math.max(1, Number(e.currentTarget.value));
79+
updateProfile({ res: { width, height: profile.res?.height ?? 720 } });
7880
}}
7981
type="number"
80-
value={profile.res?.width}
82+
value={profile.res?.width ?? 1280}
8183
/>
8284
<XIcon className="size-4 self-center" />
8385
<TextField
8486
className="text-center"
87+
min={1}
8588
onChange={(e) => {
86-
updateProfile({ res: { width: profile.res?.height ?? 1280, height: Number(e.currentTarget.value) } });
89+
const height = Math.max(1, Number(e.currentTarget.value));
90+
updateProfile({ res: { width: profile.res?.width ?? 1280, height } });
8791
}}
8892
type="number"
89-
value={profile.res?.height}
93+
value={profile.res?.height ?? 720}
9094
/>
9195
</div>
9296
</SettingsRow>

apps/oneclient/frontend/src/routes/app/settings/minecraft.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,20 +77,24 @@ export function GameSettings() {
7777
<div className="grid grid-cols-[70px_16px_70px] gap-2 grid-justify-center grid-items-center">
7878
<TextField
7979
className="text-center"
80+
min={1}
8081
onChange={(e) => {
81-
setSetting('res', { height: gameSettings.res?.height ?? 720, width: Number(e.currentTarget.value) });
82+
const width = Math.max(1, Number(e.currentTarget.value));
83+
setSetting('res', { width, height: gameSettings.res?.height ?? 720 });
8284
}}
8385
type="number"
84-
value={gameSettings.res?.width}
86+
value={gameSettings.res?.width ?? 1280}
8587
/>
8688
<XIcon className="size-4 self-center" />
8789
<TextField
8890
className="text-center"
91+
min={1}
8992
onChange={(e) => {
90-
setSetting('res', { width: gameSettings.res?.height ?? 1280, height: Number(e.currentTarget.value) });
93+
const height = Math.max(1, Number(e.currentTarget.value));
94+
setSetting('res', { width: gameSettings.res?.width ?? 1280, height });
9195
}}
9296
type="number"
93-
value={gameSettings.res?.height}
97+
value={gameSettings.res?.height ?? 720}
9498
/>
9599
</div>
96100
</SettingsRow>

0 commit comments

Comments
 (0)