Merge pull request #19 from BUTR/dev

v1.1.2 #2
BUTR · Jan 16, 2021 · ff1038a · ff1038a
2 parents 4ed1de6 + 6844447
commit ff1038a
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/Bannerlord.UIExtenderEx/SubModule.cs b/src/Bannerlord.UIExtenderEx/SubModule.cs
@@ -32,7 +32,7 @@ public SubModule()
 
         private static void CheckLoadOrder()
         {
-            var loadedModules = ModuleUtils.GetLoadedModules().ToList();
+            var loadedModules = ModuleInfoHelper.GetLoadedModules().ToList();
 
             var sb = new StringBuilder();
 
@@ -41,34 +41,34 @@ private static void CheckLoadOrder()
             if (harmonyModuleIndex == -1)
             {
                 if (sb.Length != 0) sb.AppendLine();
-                sb.AppendLine(TextObjectUtils.Create(SErrorHarmonyNotFound)?.ToString() ?? "ERROR");
+                sb.AppendLine(TextObjectHelper.Create(SErrorHarmonyNotFound)?.ToString() ?? "ERROR");
             }
 
             var uiExtenderModule = loadedModules.SingleOrDefault(x => x.Id == "Bannerlord.UIExtenderEx");
             var uiExtenderIndex = uiExtenderModule is not null ? loadedModules.IndexOf(uiExtenderModule) : -1;
             if (uiExtenderIndex == -1)
             {
                 if (sb.Length != 0) sb.AppendLine();
-                sb.AppendLine(TextObjectUtils.Create(SErrorUIExtenderExNotFound)?.ToString() ?? "ERROR");
+                sb.AppendLine(TextObjectHelper.Create(SErrorUIExtenderExNotFound)?.ToString() ?? "ERROR");
             }
 
             var officialModules = loadedModules.Where(x => x.IsOfficial).Select(x => (Module: x, Index: loadedModules.IndexOf(x)));
             var modulesLoadedBefore = officialModules.Where(tuple => tuple.Index < uiExtenderIndex).ToList();
             if (modulesLoadedBefore.Count > 0)
             {
                 if (sb.Length != 0) sb.AppendLine();
-                sb.AppendLine(TextObjectUtils.Create(SErrorOfficialModulesLoadedBefore)?.ToString() ?? "ERROR");
-                sb.AppendLine(TextObjectUtils.Create(SErrorOfficialModules)?.ToString() ?? "ERROR");
+                sb.AppendLine(TextObjectHelper.Create(SErrorOfficialModulesLoadedBefore)?.ToString() ?? "ERROR");
+                sb.AppendLine(TextObjectHelper.Create(SErrorOfficialModules)?.ToString() ?? "ERROR");
                 foreach (var (module, _) in modulesLoadedBefore)
                     sb.AppendLine(module.Id);
             }
 
             if (sb.Length > 0)
             {
                 sb.AppendLine();
-                sb.AppendLine(TextObjectUtils.Create(SMessageContinue)?.ToString() ?? "ERROR");
+                sb.AppendLine(TextObjectHelper.Create(SMessageContinue)?.ToString() ?? "ERROR");
 
-                switch (MessageBox.Show(sb.ToString(), TextObjectUtils.Create(SWarningTitle)?.ToString() ?? "ERROR", MessageBoxButtons.YesNo))
+                switch (MessageBox.Show(sb.ToString(), TextObjectHelper.Create(SWarningTitle)?.ToString() ?? "ERROR", MessageBoxButtons.YesNo))
                 {
                     case DialogResult.Yes:
                         Environment.Exit(1);