From dfb3a5181506f0e01c111a225c973f079f76ebae Mon Sep 17 00:00:00 2001
From: Maruno17 <serialcolour@hotmail.com>
Date: Mon, 20 Dec 2021 21:46:29 +0000
Subject: [PATCH] Forced encoding of text to UTF-8

---
 Data/Scripts/001_Technical/001_MKXP_Compatibility.rb | 2 ++
 Data/Scripts/001_Technical/005_PluginManager.rb      | 2 +-
 Data/Scripts/021_Compiler/001_Compiler.rb            | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Data/Scripts/001_Technical/001_MKXP_Compatibility.rb b/Data/Scripts/001_Technical/001_MKXP_Compatibility.rb
index bc99bda46..97213c36b 100644
--- a/Data/Scripts/001_Technical/001_MKXP_Compatibility.rb
+++ b/Data/Scripts/001_Technical/001_MKXP_Compatibility.rb
@@ -2,6 +2,8 @@
 $VERBOSE = nil
 Font.default_shadow = false if Font.respond_to?(:default_shadow)
 Graphics.frame_rate = 40
+Encoding.default_internal = Encoding::UTF_8
+Encoding.default_external = Encoding::UTF_8
 
 def pbSetWindowText(string)
   System.set_window_title(string || System.game_title)
diff --git a/Data/Scripts/001_Technical/005_PluginManager.rb b/Data/Scripts/001_Technical/005_PluginManager.rb
index 4b6287a9c..89abe749d 100644
--- a/Data/Scripts/001_Technical/005_PluginManager.rb
+++ b/Data/Scripts/001_Technical/005_PluginManager.rb
@@ -726,8 +726,8 @@ module PluginManager
         end
       end
     end
+    echoln ""
     if scripts.length > 0
-      echoln ""
       Console.echo_h2("Successfully loaded #{scripts.length} plugin(s)", text: :green)
     else
       Console.echo_h2("No plugins found", text: :green)
diff --git a/Data/Scripts/021_Compiler/001_Compiler.rb b/Data/Scripts/021_Compiler/001_Compiler.rb
index 366db7ba8..f5c1744c0 100644
--- a/Data/Scripts/021_Compiler/001_Compiler.rb
+++ b/Data/Scripts/021_Compiler/001_Compiler.rb
@@ -101,6 +101,7 @@ module Compiler
       if lineno == 1 && line[0].ord == 0xEF && line[1].ord == 0xBB && line[2].ord == 0xBF
         line = line[3, line.length - 3]
       end
+      line.force_encoding(Encoding::UTF_8)
       if !line[/^\#/] && !line[/^\s*$/]
         line = prepline(line)
         if line[/^\s*\[\s*(.*)\s*\]\s*$/]   # Of the format: [something]
@@ -159,6 +160,7 @@ module Compiler
       if lineno == 1 && line[0].ord == 0xEF && line[1].ord == 0xBB && line[2].ord == 0xBF
         line = line[3, line.length - 3]
       end
+      line.force_encoding(Encoding::UTF_8)
       if !line[/^\#/] && !line[/^\s*$/]
         if line[/^\s*\[\s*(.+?)\s*\]\s*$/]
           yield lastsection, sectionname  if havesection
@@ -185,6 +187,7 @@ module Compiler
       if lineno == 1 && line[0].ord == 0xEF && line[1].ord == 0xBB && line[2].ord == 0xBF
         line = line[3, line.length - 3]
       end
+      line.force_encoding(Encoding::UTF_8)
       yield line, lineno if !line[/^\#/] && !line[/^\s*$/]
       lineno += 1
     }
@@ -199,6 +202,7 @@ module Compiler
         if lineno == 1 && line[0].ord == 0xEF && line[1].ord == 0xBB && line[2].ord == 0xBF
           line = line[3, line.length - 3]
         end
+        line.force_encoding(Encoding::UTF_8)
         if !line[/^\#/] && !line[/^\s*$/]
           FileLineData.setLine(line, lineno)
           yield line, lineno
@@ -215,6 +219,7 @@ module Compiler
       if lineno == 1 && line[0].ord == 0xEF && line[1].ord == 0xBB && line[2].ord == 0xBF
         line = line[3, line.length - 3]
       end
+      line.force_encoding(Encoding::UTF_8)
       line = prepline(line)
       yield line, lineno if !line[/^\#/] && !line[/^\s*$/]
       lineno += 1
@@ -230,6 +235,7 @@ module Compiler
         if lineno == 1 && line[0].ord == 0xEF && line[1].ord == 0xBB && line[2].ord == 0xBF
           line = line[3, line.length - 3]
         end
+        line.force_encoding(Encoding::UTF_8)
         line = prepline(line)
         if !line[/^\#/] && !line[/^\s*$/]
           FileLineData.setLine(line, lineno)