mirror/HMCL
2
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-01-24 14:34:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

tap/tun二选一，目前优先tun先看效果。 (#1713)

Browse Source 
* tap/tun二选一，目前优先tun先看效果。

* 描述修正

* 修正故障描述

Co-authored-by: Yuhui Huang <i@huangyuhui.net>
This commit is contained in:
Cato : Love the world and myself 2022-09-14 21:45:55 +08:00 committed by GitHub
parent a18bd0729b
commit cf5ccca42d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HMCL/src/main/java/org/jackhuang/hmcl/ui/multiplayer/MultiplayerManager.java
View File

@ -143,7 +143,7 @@ public final class MultiplayerManager {
tasks = Arrays.asList(
getFileDownloadTask.apply(String.format("%s/hiper.exe", HIPER_TARGET_NAME), "hiper.exe"),
getFileDownloadTask.apply(String.format("%s/wintun.dll", HIPER_TARGET_NAME), "wintun.dll"),
getFileDownloadTask.apply("tap-windows-9.21.2.exe", "tap-windows-9.21.2.exe")
// getFileDownloadTask.apply("tap-windows-9.21.2.exe", "tap-windows-9.21.2.exe")
);
} else {
if (!packagesHash.containsKey(String.format("%s/hiper", HIPER_TARGET_NAME))) {
@ -181,7 +181,7 @@ public final class MultiplayerManager {
if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
verifyChecksumAndDeleteIfNotMatched(getHiperLocalDirectory().resolve("hiper.exe"), packagesHash.get(String.format("%s/hiper.exe", HIPER_TARGET_NAME)));
verifyChecksumAndDeleteIfNotMatched(getHiperLocalDirectory().resolve("wintun.dll"), packagesHash.get(String.format("%s/wintun.dll", HIPER_TARGET_NAME)));
verifyChecksumAndDeleteIfNotMatched(getHiperLocalDirectory().resolve("tap-windows-9.21.2.exe"), packagesHash.get("tap-windows-9.21.2.exe"));
// verifyChecksumAndDeleteIfNotMatched(getHiperLocalDirectory().resolve("tap-windows-9.21.2.exe"), packagesHash.get("tap-windows-9.21.2.exe"));
} else {
verifyChecksumAndDeleteIfNotMatched(getHiperLocalDirectory().resolve("hiper"), packagesHash.get(String.format("%s/hiper", HIPER_TARGET_NAME)));
}

2
HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties
View File

@ -711,7 +711,7 @@ multiplayer.nat.type.restricted_cone=中（受限圆锥型）
multiplayer.nat.type.symmetric=差（对称型）
multiplayer.nat.type.symmetric_udp_firewall=差（对称型+防火墙）
multiplayer.nat.type.unknown=未知
multiplayer.powered_by=多人联机服务由 (<a href="https://mcer.cn">mcer.cn</a>) 提供。<a href="https://hmcl.huangyuhui.net/api/redirect/multiplayer-agreement">用户协议与免责声明</a>
multiplayer.powered_by=本由 (<a href="https://mcer.cn">速聚</a>) 授权提供 <a href="https://hmcl.huangyuhui.net/api/redirect/multiplayer-agreement">用户协议与免责声明</a>
multiplayer.report=违法违规举报
multiplayer.token=凭证
multiplayer.token.apply=申请凭证