Merge pull request #30 from BUTR/dev

v0.6.5
BUTR · Jun 28, 2022 · d276237 · d276237
2 parents d26751e + c296b38
commit d276237
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 14 deletions.
diff --git a/src/Bannerlord.YellToInspire/Bannerlord.YellToInspire.csproj b/src/Bannerlord.YellToInspire/Bannerlord.YellToInspire.csproj
@@ -8,7 +8,7 @@
     <!-- Module Name -->
     <ModuleName>BUTR's Yell To Inspire</ModuleName>
     <!-- Module Version -->
-    <Version>0.6.4</Version>
+    <Version>0.6.5</Version>
     <!-- Module manually override GameVersion -->
     <!-- <OverrideGameVersion>e1.6.2</OverrideGameVersion> -->
   </PropertyGroup>
@@ -24,9 +24,11 @@
     <!-- BUTRShared Version -->
     <BUTRSharedVersion>2.0.0.82</BUTRSharedVersion>
     <!-- ModuleManager Version -->
-    <BUTRModuleManagerVersion>3.0.94</BUTRModuleManagerVersion>
+    <BUTRModuleManagerVersion>3.0.97</BUTRModuleManagerVersion>
     <!-- ModuleLoader Version -->
-    <BUTRModuleLoaderVersion>1.0.1.24</BUTRModuleLoaderVersion>
+    <BUTRModuleLoaderVersion>1.0.1.36</BUTRModuleLoaderVersion>
+    <!-- Harmony Extensions Version -->
+    <HarmonyExtensionsVersion>3.1.0.61</HarmonyExtensionsVersion>
 
     <ExtendedBuild>false</ExtendedBuild>
   </PropertyGroup>

diff --git a/...ord.YellToInspire/MissionBehaviors/AgentComponents/InspireCooldownPlayerAgentComponent.cs b/...ord.YellToInspire/MissionBehaviors/AgentComponents/InspireCooldownPlayerAgentComponent.cs
@@ -1,4 +1,5 @@
 using Bannerlord.YellToInspire.HotKeys;
+using Bannerlord.YellToInspire.Utils;
 
 #if e172
 using TaleWorlds.Core;
@@ -35,9 +36,9 @@ public void OnTick(float dt)
 
                 var troopsStatistics = state.Inspire();
 
-                InformationManager.DisplayMessage(new(Utils.GetRandomAbilityPhrase().ToString()));
+                InformationManager.DisplayMessage(new(CommonUtils.GetRandomAbilityPhrase().ToString()));
                 if (settings.ShowDetailedMessage)
-                    Utils.ShowDetailedMessage(troopsStatistics, settings.ShowDetailedMessageText);
+                    CommonUtils.ShowDetailedMessage(troopsStatistics, settings.ShowDetailedMessageText);
             }
         }
     }

diff --git a/...lord.YellToInspire/MissionBehaviors/AgentComponents/InspireCooldownStateAgentComponent.cs b/...lord.YellToInspire/MissionBehaviors/AgentComponents/InspireCooldownStateAgentComponent.cs
@@ -1,4 +1,5 @@
 using Bannerlord.YellToInspire.Data;
+using Bannerlord.YellToInspire.Utils;
 
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.MountAndBlade;
@@ -33,7 +34,7 @@ public virtual bool CanInspire(out double cooldown)
         public virtual TroopStatistics Inspire()
         {
             _cooldownSnapshot = MissionTime.Now.ToSeconds;
-            return Utils.InspireAura(Agent);
+            return CommonUtils.InspireAura(Agent);
         }
     }
 }
diff --git a/...lord.YellToInspire/MissionBehaviors/AgentComponents/InspireKillingPlayerAgentComponent.cs b/...lord.YellToInspire/MissionBehaviors/AgentComponents/InspireKillingPlayerAgentComponent.cs
@@ -1,4 +1,5 @@
 using Bannerlord.YellToInspire.HotKeys;
+using Bannerlord.YellToInspire.Utils;
 
 #if e172
 using TaleWorlds.Core;
@@ -46,9 +47,9 @@ public void OnTick(float dt)
 
                 var troopsStatistics = state.Inspire();
 
-                InformationManager.DisplayMessage(new(Utils.GetRandomAbilityPhrase().ToString()));
+                InformationManager.DisplayMessage(new(CommonUtils.GetRandomAbilityPhrase().ToString()));
                 if (settings.ShowDetailedMessage)
-                    Utils.ShowDetailedMessage(troopsStatistics, settings.ShowDetailedMessageText);
+                    CommonUtils.ShowDetailedMessage(troopsStatistics, settings.ShowDetailedMessageText);
             }
         }
     }

diff --git a/...rlord.YellToInspire/MissionBehaviors/AgentComponents/InspireKillingStateAgentComponent.cs b/...rlord.YellToInspire/MissionBehaviors/AgentComponents/InspireKillingStateAgentComponent.cs
@@ -1,4 +1,5 @@
 using Bannerlord.YellToInspire.Data;
+using Bannerlord.YellToInspire.Utils;
 
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.Core;
@@ -21,7 +22,7 @@ public virtual bool CanInspire() => InspireMeter >= 100f &&
         public virtual TroopStatistics Inspire()
         {
             InspireMeter = 0f;
-            return Utils.InspireAura(Agent);
+            return CommonUtils.InspireAura(Agent);
         }
 
         public virtual void OnRemovedAgent(Agent affectedAgent, AgentState affectedAgentState, KillingBlow blow)

diff --git a/src/Bannerlord.YellToInspire/Utils.cs → ...erlord.YellToInspire/Utils/CommonUtils.cs b/src/Bannerlord.YellToInspire/Utils.cs → ...erlord.YellToInspire/Utils/CommonUtils.cs
@@ -1,5 +1,4 @@
 using Bannerlord.YellToInspire.Data;
-using Bannerlord.YellToInspire.MissionBehaviors;
 using Bannerlord.YellToInspire.MissionBehaviors.AgentComponents;
 
 using MCM;
@@ -10,15 +9,15 @@
 
 using TaleWorlds.CampaignSystem;
 using TaleWorlds.Core;
+using TaleWorlds.Localization;
+using TaleWorlds.MountAndBlade;
 #if e180
 using TaleWorlds.Library;
 #endif
-using TaleWorlds.Localization;
-using TaleWorlds.MountAndBlade;
 
-namespace Bannerlord.YellToInspire
+namespace Bannerlord.YellToInspire.Utils
 {
-    public static class Utils
+    public static class CommonUtils
     {
         private static readonly TextObject[] AbilityPhrases =
         {

diff --git a/src/Bannerlord.YellToInspire/Utils/LocalizedTextManagerUtils.cs b/src/Bannerlord.YellToInspire/Utils/LocalizedTextManagerUtils.cs
@@ -0,0 +1,41 @@
+using Bannerlord.BUTR.Shared.Helpers;
+
+using HarmonyLib.BUTR.Extensions;
+
+using System.IO;
+using System.Xml;
+
+using TaleWorlds.Engine;
+
+using Path = System.IO.Path;
+
+namespace Bannerlord.YellToInspire.Utils
+{
+    internal static class LocalizedTextManagerUtils
+    {
+        private delegate XmlDocument? LoadXmlFileDelegate(string path);
+        private static readonly LoadXmlFileDelegate? LoadXmlFile =
+            AccessTools2.GetDeclaredDelegate<LoadXmlFileDelegate>("TaleWorlds.Localization.LocalizedTextManager:LoadXmlFile");
+
+        private delegate void LoadFromXmlDelegate(XmlDocument doc, string modulePath);
+        private static readonly LoadFromXmlDelegate? LoadFromXml =
+            AccessTools2.GetDeclaredDelegate<LoadFromXmlDelegate>("TaleWorlds.Localization.LanguageData:LoadFromXml");
+
+        public static void LoadLanguageData()
+        {
+            if (LoadXmlFile is null || LoadFromXml is null) return;
+
+            var moduleInfo = ModuleInfoHelper.GetModuleByType(typeof(LocalizedTextManagerUtils));
+            if (moduleInfo is null) return;
+
+            var path = Path.Combine(Utilities.GetBasePath(), "Modules", moduleInfo.Id, "ModuleData", "Languages");
+            if (!Directory.Exists(path)) return;
+
+            foreach (var file in Directory.GetFiles(path, "language_data.xml_", SearchOption.AllDirectories))
+            {
+                if (LoadXmlFile(file) is { } xmlDocument)
+                    LoadFromXml(xmlDocument, path);
+            }
+        }
+    }
+}
diff --git a/...ModuleData/Languages/EN/language_data.xml → ...oduleData/Languages/EN/language_data.xml_ b/...ModuleData/Languages/EN/language_data.xml → ...oduleData/Languages/EN/language_data.xml_
diff --git a/src/Bannerlord.YellToInspire/changelog.txt b/src/Bannerlord.YellToInspire/changelog.txt
@@ -1,4 +1,8 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.6.5
+Game Versions: e1.7.2,e1.8.0
+* Workaround for the language issue
+---------------------------------------------------------------------------------------------------
 Version: 0.6.4
 Game Versions: e1.7.2,e1.8.0
 * string 1.8.0 fix