From 5982028eda23d82ef96d3c4686fc8c4500443c1e Mon Sep 17 00:00:00 2001
From: samo_lego <34912839+samolego@users.noreply.github.com>
Date: Mon, 29 Jun 2020 15:32:16 +0200
Subject: [PATCH] UTF-8 config support (#8)

---
 gradle.properties                                         | 2 +-
 src/main/java/org/samo_lego/simpleauth/SimpleAuth.java    | 6 +++---
 .../java/org/samo_lego/simpleauth/storage/AuthConfig.java | 8 +++-----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 9469734..3fb3ead 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,7 +10,7 @@ loader_version=0.8.8+build.202
 fabric_version=0.14.0+build.371-1.16
 
 # Mod Properties
-mod_version = 1.4.5
+mod_version = 1.4.6
 maven_group = org.samo_lego
 archives_base_name = simpleauth
 
diff --git a/src/main/java/org/samo_lego/simpleauth/SimpleAuth.java b/src/main/java/org/samo_lego/simpleauth/SimpleAuth.java
index a3bb42f..2cd00d5 100644
--- a/src/main/java/org/samo_lego/simpleauth/SimpleAuth.java
+++ b/src/main/java/org/samo_lego/simpleauth/SimpleAuth.java
@@ -3,8 +3,8 @@ package org.samo_lego.simpleauth;
 import com.google.gson.JsonObject;
 import net.fabricmc.api.DedicatedServerModInitializer;
 import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.fabric.api.event.player.*;
-import net.fabricmc.fabric.api.event.server.ServerStopCallback;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.MinecraftServer;
@@ -112,10 +112,10 @@ public class SimpleAuth implements DedicatedServerModInitializer {
         UseItemCallback.EVENT.register((player, world, hand) -> AuthEventHandler.onUseItem(player));
         AttackEntityCallback.EVENT.register((player, world, hand, entity, entityHitResult) -> AuthEventHandler.onAttackEntity(player));
 		UseEntityCallback.EVENT.register((player, world, hand, entity, entityHitResult) -> AuthEventHandler.onUseEntity(player));
-		ServerStopCallback.EVENT.register(minecraftServer -> SimpleAuth.onStopServer());
+		ServerLifecycleEvents.SERVER_STOPPING.register(minecraftServer -> this.onStopServer());
 	}
 
-	private static void onStopServer() {
+	private void onStopServer() {
 		LOGGER.info("[SimpleAuth] Shutting down SimpleAuth.");
 
 		WriteBatch batch = db.getLevelDBStore().createWriteBatch();
diff --git a/src/main/java/org/samo_lego/simpleauth/storage/AuthConfig.java b/src/main/java/org/samo_lego/simpleauth/storage/AuthConfig.java
index d8caf5e..6cf88a2 100644
--- a/src/main/java/org/samo_lego/simpleauth/storage/AuthConfig.java
+++ b/src/main/java/org/samo_lego/simpleauth/storage/AuthConfig.java
@@ -22,10 +22,8 @@ import com.google.gson.GsonBuilder;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
 
 public class AuthConfig {
     // If player is not authenticated, following conditions apply
@@ -146,7 +144,7 @@ public class AuthConfig {
         return config;
     }
     public void save(File file) {
-        try (FileWriter writer = new FileWriter(file)) {
+        try (Writer writer = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8)) {
             gson.toJson(this, writer);
         } catch (IOException e) {
             LOGGER.error("[SimpleAuth] Problem occurred when saving config: ", e);