Merge remote-tracking branch 'refs/remotes/official/main' into featur…

…e3094/pr3094/support-2969

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -8,16 +8,16 @@ body:
  attributes:
  value: |
  提交前请确认：
- * 该问题确实是 **HMCL 的错误**，而**不是 Minecraft 非正常退出**，如果你的 Minecraft 非正常退出，请前往 [QQ 群](https://docs.hmcl.net/groups.html)/[KOOK 频道](https://kook.top/Kx7n3t)/[Discord 频道](https://discord.gg/jVvC7HfM6U) 中获取帮助。
- * 你的启动器版本是**最新的快照版本**，可以点击 [此处](https://github.com/burningtnt/HMCL-Snapshot-Update/raw/master/datas/HMCL-dev.jar) 下载最新快照版本。
+ * 该问题确实是 **HMCL 的错误**，而**不是 Minecraft 非正常退出**，如果你的 Minecraft 非正常退出，请前往 [QQ 群](https://docs.hmcl.net/groups.html)/[Discord 频道](https://discord.gg/jVvC7HfM6U) 中获取帮助。
+ * 你的启动器版本是**最新的快照版本**，可以点击 [此处](https://zkitefly.github.io/HMCL-Snapshot-Update/) 下载最新快照版本。
  
- 如果你的问题并不属于上述两类，你可以选取另一种 Issue 类型，或者直接前往 [QQ 群](https://docs.hmcl.net/groups.html)/[KOOK 频道](https://kook.top/Kx7n3t)/[Discord 频道](https://discord.gg/jVvC7HfM6U) 中获取帮助。
+ 如果你的问题并不属于上述两类，你可以选取另一种 Issue 类型，或者直接前往 [QQ 群](https://docs.hmcl.net/groups.html)/[Discord 频道](https://discord.gg/jVvC7HfM6U) 中获取帮助。
 
  Before submitting, please confirm:
- * The issue is indeed **an error of HMCL**, not **Minecraft abnormal exit**. If your Minecraft exits abnormally, please go to the [QQ group](https://docs.hmcl.net/groups.html) or [KOOK channel](https://kook.top/Kx7n3t) or [Discord channel](https://discord.gg/jVvC7HfM6U) for help.
+ * The issue is indeed **an error of HMCL**, not **Minecraft abnormal exit**. If your Minecraft exits abnormally, please go to the [QQ group](https://docs.hmcl.net/groups.html) or [Discord channel](https://discord.gg/jVvC7HfM6U) for help.
  * Your launcher version is **the latest snapshot version**. You can click [here](https://github.com/burningtnt/HMCL-Snapshot-Update/raw/master/datas/HMCL-dev.jar) to download the latest snapshot version.
 
- If your issue does not fall into the above two categories, you can choose another type of issue or directly go to the [QQ group](https://docs.hmcl.net/groups.html) or [KOOK channel](https://kook.top/Kx7n3t) or [Discord channel](https://discord.gg/jVvC7HfM6U) for help.
+ If your issue does not fall into the above two categories, you can choose another type of issue or directly go to the [QQ group](https://docs.hmcl.net/groups.html) or [Discord channel](https://discord.gg/jVvC7HfM6U) for help.
  - type: input
  id: platform
  attributes:

.github/ISSUE_TEMPLATE/config.yml

@@ -1,14 +1,11 @@
 blank_issues_enabled: false
 contact_links:
- - name: KOOK 频道 | KOOK Channel
- url: https://kook.top/Kx7n3t
- about: Hello Minecraft! Launcher 的官方 KOOK 频道。| The official KOOK channel of Hello Minecraft! Laucher.
- - name: Discord 频道 | Discord Channel
- url: https://discord.gg/jVvC7HfM6U
- about: Hello Minecraft! Launcher 的官方 Discord 频道。| The official Discord channel of Hello Minecraft! Launcher.
  - name: QQ 群 | QQ Groups
  url: https://docs.hmcl.net/groups.html
  about: Hello Minecraft! Launcher 的官方 QQ 交流群。| The official QQ groups of Hello Minecraft! Laucher.
+ - name: Discord 频道 | Discord Channel
+ url: https://discord.gg/jVvC7HfM6U
+ about: Hello Minecraft! Launcher 的官方 Discord 频道。| The official Discord channel of Hello Minecraft! Launcher.
  - name: 其他反馈 | Others
  url: https://github.com/HMCL-dev/HMCL/discussions/new/choose
  about: 通过 Discussions 反馈其他问题。| Report other problems in Discussions.

HMCL/src/main/java/org/jackhuang/hmcl/countly/CrashReport.java

@@ -5,39 +5,25 @@
 import org.jackhuang.hmcl.util.platform.Architecture;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 
-import java.io.File;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Map;
-
-import static org.jackhuang.hmcl.util.Lang.mapOf;
-import static org.jackhuang.hmcl.util.Pair.pair;
-import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 
 public class CrashReport {
 
  private final Thread thread;
  private final Throwable throwable;
  private final String stackTrace;
 
- private boolean nonFatal;
-
  public CrashReport(Thread thread, Throwable throwable) {
  this.thread = thread;
  this.throwable = throwable;
  stackTrace = StringUtils.getStackTrace(throwable);
- nonFatal = false;
  }
 
  public Throwable getThrowable() {
  return this.throwable;
  }
 
- public CrashReport setNonFatal() {
- nonFatal = true;
- return this;
- }
-
  public boolean shouldBeReport() {
  if (!stackTrace.contains("org.jackhuang"))
  return false;
@@ -48,23 +34,6 @@ public boolean shouldBeReport() {
  return true;
  }
 
- public Map<String, Object> getMetrics(long runningTime) {
- return mapOf(
- pair("_run", runningTime),
- pair("_app_version", Metadata.VERSION),
- pair("_os", OperatingSystem.SYSTEM_NAME),
- pair("_os_version", OperatingSystem.SYSTEM_VERSION),
- pair("_disk_current", getDiskAvailable()),
- pair("_disk_total", getDiskTotal()),
- pair("_ram_current", getMemoryAvailable()),
- pair("_ram_total", Runtime.getRuntime().maxMemory() / BYTES_IN_MB),
- pair("_error", stackTrace),
- pair("_logs", LOG.getLogs()),
- pair("_name", throwable.getLocalizedMessage()),
- pair("_nonfatal", nonFatal)
- );
- }
-
  public String getDisplayText() {
  return "---- Hello Minecraft! Crash Report ----\n" +
  " Version: " + Metadata.VERSION + "\n" +
@@ -82,29 +51,4 @@ public String getDisplayText() {
  " JVM Total Memory: " + Runtime.getRuntime().totalMemory() + "\n" +
  " JVM Free Memory: " + Runtime.getRuntime().freeMemory() + "\n";
  }
-
- private static final Long BYTES_IN_MB = 1024L * 1024;
-
- private static long getMemoryAvailable() {
- Long total = Runtime.getRuntime().totalMemory();
- Long availMem = Runtime.getRuntime().freeMemory();
- return (total - availMem) / BYTES_IN_MB;
- }
-
- private static long getDiskAvailable() {
- long total = 0, free = 0;
- for (File f : File.listRoots()) {
- total += f.getTotalSpace();
- free += f.getUsableSpace();
- }
- return (total - free) / BYTES_IN_MB;
- }
-
- private static long getDiskTotal() {
- long total = 0;
- for (File f : File.listRoots()) {
- total += f.getTotalSpace();
- }
- return total / BYTES_IN_MB;
- }
 }