From 1d75d084a787e7c3577ab144447f1e3c9d38084c Mon Sep 17 00:00:00 2001
From: rtm516 <rtm516@users.noreply.github.com>
Date: Sat, 30 Sep 2023 22:18:57 +0100
Subject: [PATCH] Force loading help-text using utf-8 to fix encoding errors
 (#4165)

---
 core/src/main/java/org/geysermc/geyser/GeyserMain.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/geysermc/geyser/GeyserMain.java b/core/src/main/java/org/geysermc/geyser/GeyserMain.java
index 8726c1b24..4e60a79b8 100644
--- a/core/src/main/java/org/geysermc/geyser/GeyserMain.java
+++ b/core/src/main/java/org/geysermc/geyser/GeyserMain.java
@@ -28,6 +28,7 @@ package org.geysermc.geyser;
 import javax.swing.*;
 import java.io.InputStream;
 import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
 import java.util.Locale;
 import java.util.Scanner;
 
@@ -60,7 +61,7 @@ public class GeyserMain {
             helpStream = GeyserMain.class.getClassLoader().getResourceAsStream("languages/run-help/en_US.txt");
         }
 
-        Scanner help = new Scanner(helpStream).useDelimiter("\\Z");
+        Scanner help = new Scanner(helpStream, StandardCharsets.UTF_8).useDelimiter("\\Z");
         String line = "";
         while (help.hasNext()) {
             line = help.next();