From cf5ccca42dbc142748702c259847fc8926280e8f Mon Sep 17 00:00:00 2001
From: "Cato : Love the world and myself" <this@null.net>
Date: Wed, 14 Sep 2022 21:45:55 +0800
Subject: [PATCH] =?UTF-8?q?tap/tun=E4=BA=8C=E9=80=89=E4=B8=80=EF=BC=8C?=
 =?UTF-8?q?=E7=9B=AE=E5=89=8D=E4=BC=98=E5=85=88tun=E5=85=88=E7=9C=8B?=
 =?UTF-8?q?=E6=95=88=E6=9E=9C=E3=80=82=20(#1713)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

* 描述修正

* 修正故障描述

Co-authored-by: Yuhui Huang <i@huangyuhui.net>
---
 .../org/jackhuang/hmcl/ui/multiplayer/MultiplayerManager.java | 4 ++--
 HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/multiplayer/MultiplayerManager.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/multiplayer/MultiplayerManager.java
index 6243eda1c..07cf3dfeb 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/multiplayer/MultiplayerManager.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/multiplayer/MultiplayerManager.java
@@ -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)));
             }
diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties
index ec47935bd..90843c264 100644
--- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties
+++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties
@@ -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=申请凭证