feat(instance): add&delete game server through SJMCL by hbz114514 · Pull Request #1328 · UNIkeEN/SJMCL

hbz114514 · 2026-01-21T15:53:05Z

Checklist

Changes have been tested locally and work as expected.
All tests in workflows pass successfully.
Documentation has been updated if necessary.
Code formatting and commit messages align with the project's conventions.
Comments have been added for any complex logic or functionality if possible.

This PR is a ..

Related Issues

partly fix #1169

Description

Please insert your description here and provide info about the "what" this PR is solving.

Additional Context

modified: src-tauri/src/instance/models/misc.rs modified: src-tauri/src/lib.rs modified: src/enums/service-error.ts modified: src/locales/en.json modified: src/locales/zh-Hans.json modified: src/pages/instances/details/[id]/worlds.tsx modified: src/services/instance.ts

hbz114514 · 2026-01-21T15:59:24Z

改完了（大概（（
暂时没有加删除按钮（因为加上感觉很挤
把多余空行删掉了，错误内容放到了翻译文件的service部分，label和placeholder也修改了，把原来写在modal里的内容合并到了worlds.tsx里，新开一个分支重新提交PR，无conflict

hbz114514 · 2026-01-21T15:59:39Z

我去把上一个关掉

hbz114514 · 2026-01-27T13:02:48Z

添加了删除按钮和删除命令

hbz114514 · 2026-01-27T13:03:01Z

感谢在溪不然我都忘了（

hbz114514 · 2026-01-27T13:05:58Z

还要感谢在溪的部分代码（真的很有帮助（

UNIkeEN · 2026-01-27T15:06:30Z

src-tauri/src/instance/commands.rs

+
+  let mut existing_servers = load_servers_info_from_path(&servers_dat_path).await?;
+
+  let original_len = existing_servers.len();


这个变量用到了吗，还有这个函数为啥写一行空一行

UNIkeEN · 2026-01-27T15:07:21Z

src-tauri/src/instance/commands.rs

+  Ok(())
+}
+
+async fn save_servers_to_nbt(path: &PathBuf, servers: &[GameServerInfo]) -> SJMCLResult<()> {


请不要在 commands.rs 写非 command 函数

移动到helpers中了

UNIkeEN · 2026-01-27T15:08:14Z

src/pages/instances/details/[id]/worlds.tsx

 import { UNIXToISOString, formatRelativeTime } from "@/utils/datetime";
 import { base64ImgSrc } from "@/utils/string";

+const DeleteServerDialog: React.FC<{


请使用 openGenericConfirmDialog

UNIkeEN · 2026-01-27T15:09:16Z

src/pages/instances/details/[id]/worlds.tsx

+        });
+      }
+    } catch (error) {
+      toast({


不必要的错误 catch

UNIkeEN · 2026-01-27T15:09:40Z

src/pages/instances/details/[id]/worlds.tsx

+
+      if (response.status === "success") {
+        toast({
+          title: t("InstanceWorldsPage.serverList.deleteSuccess"),


service 函数的 toast 无需定义 key

UNIkeEN · 2026-01-27T15:11:01Z

src/pages/instances/details/[id]/worlds.tsx

          <Empty withIcon={false} size="sm" />
        )}
      </Section>
+      <Modal isOpen={isAddServerModalOpen} onClose={onAddServerModalClose}>


本项目中的所有复杂逻辑 modal 应该均为独立组件，且包含 handle 逻辑

刷新逻辑应作为 onSuccess 传入

已经将输入弹窗独立为函数组件
小问题：使用onSuccess时，短时间内添加多个服务器会导致重复刷新，有概率出现列表显示错误（目前还不知道什么原因），所以现在没有用onSuccess，而是在成功之后直接刷新，测试没有问题。

已经将输入弹窗独立为函数组件小问题：使用onSuccess时，短时间内添加多个服务器会导致重复刷新，有概率出现列表显示错误（目前还不知道什么原因），所以现在没有用onSuccess，而是在成功之后直接刷新，测试没有问题。

我没有看到此条 PR 在 modals/ 下新增了 add-server-modal.tsx？

是要单独放到\src\components\modals里面吗

UNIkeEN · 2026-01-27T15:11:52Z

src/pages/instances/details/[id]/worlds.tsx

+                autoFocus
+              />
+            </FormControl>
+            <FormControl isRequired>


isRequired 的 FormControl 是否需要添加 FormErrMsg，请参考其他 input 类 modal

添加了FormErrMsg,调整了服务器地址和服务器名称的顺序

modified: src-tauri/src/instance/helpers/server.rs modified: src/locales/en.json modified: src/locales/zh-Hans.json modified: src/pages/instances/details/[id]/worlds.tsx

UNIkeEN · 2026-01-29T05:52:47Z

src/locales/en.json

        "offline": "Offline"
      },
+      "delete": "Delete this Server",
+      "deleteConfirm": {


请与项目内现有删除 modal 的代码与翻译风格保持一致

修改为deletegameserveralertdialog部分

UNIkeEN · 2026-01-29T05:53:05Z

src/pages/instances/details/[id]/worlds.tsx

    handleRetrieveGameServerList(false);
    handleRetrieveGameServerList(true);

-    // refresh every minute to query server info


没看懂这行注释为什么要删除

补回去了

UNIkeEN · 2026-01-29T05:54:33Z

src/pages/instances/details/[id]/worlds.tsx

 import { UNIXToISOString, formatRelativeTime } from "@/utils/datetime";
 import { base64ImgSrc } from "@/utils/string";

+function AddGameServerModal(props: any) {


与现有项目内所有 modal 定义方式与代码文件结构不一致

Typescript 项目请勿使用 any

按照worldleveldata的格式改了一下，现在应该没问题（（？

globalsharedmodal和其他modal区别在能否用opensharedmodal调用吗（（上次没问清，我的问题

UNIkeEN · 2026-01-29T05:57:37Z

src/pages/instances/details/[id]/worlds.tsx

+                        btnOK: t("General.delete"),
+                        isAlert: true,
+                        onOKCallback: () => {
+                          setServerToDelete(server);


这个 state 不是一定需要的吧（？

哪一个（
如果是isAlert的话，删除服务器的行为是不是按钮也应该是红的（

删掉了，现在弹窗的是蓝色按钮了（

UNIkeEN · 2026-01-29T05:59:25Z

src/pages/instances/details/[id]/worlds.tsx

+        serverName={serverName}
+        onNameChange={(e: any) => setServerName(e.target.value)}
+        serverAddress={serverAddress}
+        onAddressChange={(e: any) => setServerAddress(e.target.value)}


请考虑这么多参数的设计是否合理，相同类型的 AddAuthServerModal 只需要传入 isOpen 和 onClose

modified: src/locales/en.json modified: src/locales/zh-Hans.json modified: src/pages/instances/details/[id]/worlds.tsx

hbz114514 · 2026-01-29T09:22:32Z

修改了addGameServerModal ,独立为modal文件夹下的文件，将国际化内容放到worldleveldatamodal后边了（应该没问题
onSuccess也是老问题，所以刷新逻辑一并放到onclose中

UNIkeEN · 2026-02-11T02:43:15Z

将国际化内容放到worldleveldatamodal后边了（应该没问题

可是国际化内容最外层是按照字母序排序的啊

Copilot

Pull request overview

This PR adds functionality to add and delete Minecraft game servers directly from the SJMCL launcher interface, addressing issue #1169. Users can now manage their server list through a dedicated modal dialog without manually editing the servers.dat file.

Changes:

Implements Rust backend commands (add_game_server, delete_game_server) to manipulate the servers.dat NBT file
Creates a new frontend modal (AddGameServerModal) for adding servers with address and name fields
Integrates server management UI into the instance worlds page with add/delete/launch buttons
Adds comprehensive localization support for both English and Chinese languages

Reviewed changes

Copilot reviewed 10 out of 10 changed files in this pull request and generated 6 comments.

Show a summary per file

File	Description
src-tauri/src/lib.rs	Registers new add_game_server and delete_game_server commands
src-tauri/src/instance/commands.rs	Implements add/delete server commands with duplicate checking and NBT file operations
src-tauri/src/instance/helpers/server.rs	Adds NBT conversion traits, path helper, and save function for server data
src-tauri/src/instance/models/misc.rs	Adds DuplicateServer and FileOperationError enum variants
src/services/instance.ts	Exposes TypeScript service methods for add/delete game server operations
src/components/modals/add-game-server-modal.tsx	New modal component for adding game servers with validation
src/pages/instances/details/[id]/worlds.tsx	Integrates add/delete server UI with confirmation dialogs and auto-refresh
src/enums/service-error.ts	Adds DuplicateServer and FileOperationError to frontend error enum
src/locales/en.json	English translations for server management UI and error messages
src/locales/zh-Hans.json	Chinese translations for server management UI and error messages

src-tauri/src/instance/commands.rs

+pub async fn delete_game_server(
+  app: AppHandle,
+  instance_id: String,
+  server_addr: String,
+) -> SJMCLResult<()> {
+  let nbt_path = match get_servers_nbt_path_by_instance_id(&app, &instance_id) {
+    Some(path) => path,
+    None => return Err(InstanceError::InstanceNotFoundByID.into()),
+  };
+  let mut existing_servers = load_servers_info_from_nbt(&nbt_path).await?;
+
+  existing_servers.retain(|server| server.ip != server_addr);
+  save_servers_to_nbt(&nbt_path, &existing_servers)
+    .await
+    .map_err(|_| InstanceError::FileOperationError)?;
+
+  Ok(())
+}


Copilot · 2026-02-22T02:44:20Z

src-tauri/src/instance/models/misc.rs

+  DuplicateServer,
  FileNotFoundError,
  InvalidSourcePath,
  FileCreationFailed,
  FileCopyFailed,
  FileMoveFailed,
+  FileOperationError,


The localization files define a SERVER_NOT_FOUND error message but the corresponding error variant is missing from the InstanceError enum. Either add the ServerNotFound variant to the enum (and use it in the delete_game_server command), or remove the unused error message from the localization files. For consistency with the error messages defined, adding the variant is recommended.

src/components/modals/add-game-server-modal.tsx

+        const urlObj = new URL(presetUrl);
+        const extractedName = urlObj.hostname || presetUrl;


Copilot · 2026-02-22T02:44:20Z

src/components/modals/add-game-server-modal.tsx

+              </FormLabel>
+              <Input
+                id="serverUrl"
+                type="url"


The input type "url" is semantically incorrect for Minecraft server addresses. These addresses are typically in the format "example.com" or "example.com:25565", which are not valid URLs (they lack a protocol like http:// or https://). Using type="url" may cause browser validation issues and confuse users.

Change the input type to "text" to properly accept Minecraft server address formats.

Suggested change

type="url"

type="text"

Copilot · 2026-02-22T02:44:20Z

src/components/modals/add-game-server-modal.tsx

+    (instanceId: string) => {
+      const finalServerName = serverName.trim() || serverNamePlaceholder;
+      setIsLoading(true);
+      InstanceService.addGameServer(instanceId, serverUrl, finalServerName)


The server address is not trimmed before being sent to the backend. If users accidentally include leading or trailing whitespace in the address field, it will be saved as-is, which could cause connection issues and duplicate entries (since "example.com" and " example.com" would be treated as different servers).

Consider trimming the serverUrl before sending it: InstanceService.addGameServer(instanceId, serverUrl.trim(), finalServerName)

Suggested change

InstanceService.addGameServer(instanceId, serverUrl, finalServerName)

InstanceService.addGameServer(instanceId, serverUrl.trim(), finalServerName)

Copilot · 2026-02-22T02:44:21Z

src/pages/instances/details/[id]/worlds.tsx

    }, 60000);
    return () => clearInterval(intervalId);
-  }, [instanceId, handleRetrieveGameServerList]);
+  }, [instanceId, handleRetrieveGameServerList, refreshGameServerList]);


The useEffect dependency array includes both handleRetrieveGameServerList and refreshGameServerList, but since refreshGameServerList only depends on handleRetrieveGameServerList, including both is redundant. The effect should depend only on the primitive dependency (if needed at all).

However, in this case, since the interval only calls handleRetrieveGameServerList(true) directly, the dependency array could be simplified to just [handleRetrieveGameServerList] and remove the refreshGameServerList() call from the effect body (or keep both but remove refreshGameServerList from the dependency array).

Suggested change

}, [instanceId, handleRetrieveGameServerList, refreshGameServerList]);

}, [handleRetrieveGameServerList]);

hbz114514 · 2026-02-22T05:48:57Z

测试没有问题。可以正常添加删除服务器，并且成功后会刷新列表。默认服务器名称正常。

3f649f5

UNIkeEN requested changes Jan 27, 2026

View reviewed changes

modified: src-tauri/src/instance/commands.rs

3d7e3b5

modified: src-tauri/src/instance/helpers/server.rs modified: src/locales/en.json modified: src/locales/zh-Hans.json modified: src/pages/instances/details/[id]/worlds.tsx

hbz114514 changed the title ~~feat(instance): add game server through SJMCL~~ feat(instance): add&delete game server through SJMCL Jan 28, 2026

UNIkeEN reviewed Jan 29, 2026

View reviewed changes

new file: src/components/modals/add-game-server-modal.tsx

26e1e57

modified: src/locales/en.json modified: src/locales/zh-Hans.json modified: src/pages/instances/details/[id]/worlds.tsx

UNIkeEN mentioned this pull request Feb 6, 2026

feat: enhance instance details and server management #1169 #1338

Closed

13 tasks

update

20c84cb

UNIkeEN force-pushed the feat-issue-1169 branch from f1e8bbc to 20c84cb Compare February 22, 2026 02:27

Merge branch 'main' into feat-issue-1169

562116f

UNIkeEN requested a review from Copilot February 22, 2026 02:40

Copilot started reviewing on behalf of UNIkeEN February 22, 2026 02:40 View session

Copilot AI reviewed Feb 22, 2026

View reviewed changes

UNIkeEN and others added 3 commits February 22, 2026 10:52

remove unuseful code

b056628

align locale key order

360e573

Merge branch 'UNIkeEN:main' into feat-issue-1169

1ee4c2e

UNIkeEN merged commit cdd9a7d into UNIkeEN:main Feb 22, 2026
2 checks passed


		let mut existing_servers = load_servers_info_from_path(&servers_dat_path).await?;

		let original_len = existing_servers.len();

		const urlObj = new URL(presetUrl);
		const extractedName = urlObj.hostname \|\| presetUrl;

	InstanceService.addGameServer(instanceId, serverUrl, finalServerName)
	InstanceService.addGameServer(instanceId, serverUrl.trim(), finalServerName)

	}, [instanceId, handleRetrieveGameServerList, refreshGameServerList]);
	}, [handleRetrieveGameServerList]);

Comments

Conversation

hbz114514 commented Jan 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Checklist

This PR is a ..

Related Issues

Description

Additional Context

Uh oh!

hbz114514 commented Jan 21, 2026

Uh oh!

hbz114514 commented Jan 21, 2026

Uh oh!

hbz114514 commented Jan 27, 2026

Uh oh!

hbz114514 commented Jan 27, 2026

Uh oh!

hbz114514 commented Jan 27, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hbz114514 commented Jan 29, 2026

Uh oh!

UNIkeEN commented Feb 11, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

This comment was marked as resolved.

Uh oh!

Copilot AI Feb 22, 2026

Choose a reason for hiding this comment

Uh oh!

hbz114514 commented Jan 21, 2026 •

edited

Loading