diff --git a/common/src/main/java/com/viaversion/viaversion/util/CommentStore.java b/common/src/main/java/com/viaversion/viaversion/util/CommentStore.java
index 610136983..026d78ff0 100644
--- a/common/src/main/java/com/viaversion/viaversion/util/CommentStore.java
+++ b/common/src/main/java/com/viaversion/viaversion/util/CommentStore.java
@@ -21,12 +21,13 @@ import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.io.CharStreams;
+import com.google.common.io.Files;
 
 import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -173,19 +174,7 @@ public class CommentStore {
         }
 
         // Write data to file
-        FileWriter writer = null;
-        try {
-            writer = new FileWriter(output);
-            writer.write(fileData.toString());
-            writer.flush();
-        } finally {
-            if (writer != null) {
-                try {
-                    writer.close();
-                } catch (IOException ignored) {
-                }
-            }
-        }
+        Files.write(fileData.toString(), output, StandardCharsets.UTF_8);
     }
 
     private String addHeaderTags(List<String> header, String indent) {