Skip to content

[WIP] Support --quickPlayMultiplayer option for the instance with server #1020

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 17, 2025
Merged

[WIP] Support --quickPlayMultiplayer option for the instance with server #1020

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
391984b
Initial plan
Copilot Jul 17, 2025
4b57e31
Add quickPlayMultiplayer support to LaunchOptions and core library
Copilot Jul 17, 2025
5a85f33
Complete quickPlayMultiplayer integration with UI and instance schema
Copilot Jul 17, 2025
a931b7f
Address feedback: Remove quickPlayMultiplayer from instance schema, g…
Copilot Jul 17, 2025
21430c4
Move quickPlayMultiplayer logic from launch utility to LaunchService
Copilot Jul 17, 2025
85a3663
Address feedback: restore server options, remove quickPlayMultiplayer…
Copilot Jul 17, 2025
ad25f69
Update xmcl submodule to latest master branch
Copilot Jul 17, 2025
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
5 changes: 5 additions & 0 deletions xmcl-runtime-api/src/services/LaunchService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ export interface LaunchOptions {
host: string
port?: number
}
/**
* Quick play multiplayer server for Minecraft 1.20+
* Format: "server:port" or just "server" for default port 25565
*/
quickPlayMultiplayer?: string
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed quickPlayMultiplayer property from the LaunchService interface. (85a3663)

/**
* Support yushi's yggdrasil agent https://github.com/to2mbn/authlib-injector/wiki
*/
Expand Down
1 change: 1 addition & 0 deletions xmcl-runtime-api/src/util/launch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ export async function generateLaunchOptionsWithGlobal(
side,
resolution: inst.resolution ?? globalResolution,
server: inst.server ?? undefined,
quickPlayMultiplayer: inst.server ? `${inst.server.host}${inst.server.port ? `:${inst.server.port}` : ''}` : undefined,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move this logic to LaunchServer.ts. You don't need to add an extra prop to here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Moved the quickPlayMultiplayer logic from launch utility to LaunchService.ts where the server handling is processed. The logic now generates quickPlayMultiplayer from the server property when not explicitly provided, and handles direct quickPlayMultiplayer options. (21430c4)

...overrides,
}
return options
Expand Down
1 change: 1 addition & 0 deletions xmcl-runtime/launch/LaunchService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ export class LaunchService extends AbstractService implements ILaunchService {
port: options.server.port,
}
: undefined,
quickPlayMultiplayer: options.quickPlayMultiplayer,
extraExecOption: {
shell: prepend && prepend.length > 0,
detached: true,
Expand Down
Loading