Merge pull request #404 from wbonbon/master

version up
anoyetta · Aug 3, 2024 · fb159de · fb159de
2 parents 819b0e6 + 8790219
commit fb159de
Show file tree

Hide file tree

Showing 23 changed files with 146 additions and 59 deletions.
diff --git a/source/@MasterVersion.txt b/source/@MasterVersion.txt
@@ -1 +1 @@
-v10.3.4
+v10.3.6
diff --git a/source/ACT.Hojoring.Common/Version.cs b/source/ACT.Hojoring.Common/Version.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("10.3.0.4")]
-[assembly: AssemblyFileVersion("10.3.0.4")]
+[assembly: AssemblyVersion("10.3.0.6")]
+[assembly: AssemblyFileVersion("10.3.0.6")]
diff --git a/source/ACT.Hojoring.sln b/source/ACT.Hojoring.sln
@@ -46,8 +46,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ACT.Hojoring.Debug", "ACT.H
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ACT.Hojoring.Shared", "ACT.Hojoring.Shared\ACT.Hojoring.Shared.shproj", "{9DD140FA-30BD-4E10-B61A-F8A5B8837643}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sharlayan", "..\..\sharlayan\Sharlayan\Sharlayan.csproj", "{4C436487-78FF-4899-9F19-2323AB0CA6BC}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -184,14 +182,6 @@ Global
 		{466C29AA-D69A-4D20-AA75-F559D9528634}.Release|Any CPU.Build.0 = Release|Any CPU
 		{466C29AA-D69A-4D20-AA75-F559D9528634}.Release|x86.ActiveCfg = Release|Any CPU
 		{466C29AA-D69A-4D20-AA75-F559D9528634}.Release|x86.Build.0 = Release|Any CPU
-		{4C436487-78FF-4899-9F19-2323AB0CA6BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4C436487-78FF-4899-9F19-2323AB0CA6BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4C436487-78FF-4899-9F19-2323AB0CA6BC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4C436487-78FF-4899-9F19-2323AB0CA6BC}.Debug|x86.Build.0 = Debug|Any CPU
-		{4C436487-78FF-4899-9F19-2323AB0CA6BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4C436487-78FF-4899-9F19-2323AB0CA6BC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4C436487-78FF-4899-9F19-2323AB0CA6BC}.Release|x86.ActiveCfg = Release|Any CPU
-		{4C436487-78FF-4899-9F19-2323AB0CA6BC}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -210,8 +200,8 @@ Global
 		{C1BC2D6E-E10D-4A7F-900B-5FD84F39BF0A} = {EC98C548-6268-4B67-BC45-88DCD9B63960}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {91001FDF-B748-4513-A399-35F7E9BD37F8}
 		        SolutionGuid = {2A11DDD1-7A46-4236-969A-3942CBE6A01A}
+		SolutionGuid = {91001FDF-B748-4513-A399-35F7E9BD37F8}
 	EndGlobalSection
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		ACT.Hojoring.Shared\ACT.Hojoring.Shared.projitems*{450f38fa-7f7d-41b9-9bbb-503efc6c0a72}*SharedItemsImports = 4

diff --git a/source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/ACT.SpecialSpellTimer.Core.csproj b/source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/ACT.SpecialSpellTimer.Core.csproj
@@ -337,6 +337,9 @@
     <PackageReference Include="RazorEngine">
       <Version>3.10.0</Version>
     </PackageReference>
+    <PackageReference Include="Sharlayan">
+      <Version>8.0.1</Version>
+    </PackageReference>
     <PackageReference Include="System.Text.RegularExpressions">
       <Version>4.3.1</Version>
     </PackageReference>
@@ -1525,10 +1528,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\sharlayan\Sharlayan\Sharlayan.csproj">
-      <Project>{4c436487-78ff-4899-9f19-2323ab0ca6bc}</Project>
-      <Name>Sharlayan</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\ACT.SpecialSpellTimer.RazorModel\ACT.SpecialSpellTimer.RazorModel.csproj">
       <Project>{450f38fa-7f7d-41b9-9bbb-503efc6c0a72}</Project>
       <Name>ACT.SpecialSpellTimer.RazorModel</Name>

diff --git a/source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/LogBuffer.cs b/source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/LogBuffer.cs
@@ -11,7 +11,7 @@
 using FFXIV.Framework.Common;
 using FFXIV.Framework.Extensions;
 using FFXIV.Framework.XIVHelper;
-using FFXIV_ACT_Plugin.Logfile;
+using static FFXIV.Framework.XIVHelper.LogMessageTypeExtensions;
 
 namespace ACT.SpecialSpellTimer
 {

diff --git a/source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/PluginCore.cs b/source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/PluginCore.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Drawing;
+using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
@@ -34,7 +36,24 @@ public class PluginCore
         [MethodImpl(MethodImplOptions.NoInlining)]
         public static void Initialize(
             IActPluginV1 plugin)
-        {
+        {
+            try
+            {
+                DirectoryInfo temp = new DirectoryInfo(Path.GetTempPath());
+
+                var folders = temp.EnumerateDirectories("RazorEngine_*");
+
+                foreach (var folder in folders)
+                {
+                    Directory.Delete(temp.FullName + folder.Name, true);
+                }
+
+            }
+            catch
+            {
+                Logger.Write("FAILD delete temp RazorEngine folder");
+            }
+
             instance = new PluginCore();
             instance.PluginRoot = plugin;
         }

diff --git a/source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/RaidTimeline/CombatAnalyzer.cs b/source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/RaidTimeline/CombatAnalyzer.cs
@@ -378,7 +378,7 @@ private void StoreLogPoller()
             foreach (var log in logs)
             {
                 // ログメッセージタイプの文言を除去する
-                if (log.detectedType <= 0xFF)
+                if (log.detectedType <= LogMessageTypeExtensions.max_messagetype)
                 {
                     log.logLine = LogMessageTypeExtensions.RemoveLogMessageType(
                         log.detectedType,

diff --git a/source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/RaidTimeline/ConstantKeywords.cs b/source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/RaidTimeline/ConstantKeywords.cs
@@ -5,7 +5,7 @@
 using FFXIV.Framework.Common;
 using FFXIV.Framework.Globalization;
 using FFXIV.Framework.XIVHelper;
-using FFXIV_ACT_Plugin.Logfile;
+using static FFXIV.Framework.XIVHelper.LogMessageTypeExtensions;
 
 namespace ACT.SpecialSpellTimer.RaidTimeline
 {

diff --git a/source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/RaidTimeline/TimelineModel.cs b/source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/RaidTimeline/TimelineModel.cs
@@ -27,6 +27,7 @@
 using RazorEngine.Configuration;
 using RazorEngine.Templating;
 using RazorEngine.Text;
+using static Sharlayan.Core.Enums.Actor;
 
 namespace ACT.SpecialSpellTimer.RaidTimeline
 {
@@ -689,6 +690,15 @@ private static IRazorEngineService CreateTimelineEngine()
             config.Namespaces.Add("FFXIV.Framework.Extensions");
             config.Namespaces.Add("ACT.SpecialSpellTimer.RazorModel");
 
+            //You can use config.DisableTempFileLocking = true as well.
+            //This will work in any AppDomain (including the default one).
+            //To remove the RazorEngine warnings you can additionally use config.CachingProvider = new DefaultCachingProvider(t => {}).
+            // See also https://github.com/Antaris/RazorEngine/issues/244 for more details.
+
+//            config.DisableTempFileLocking = true;
+//            config.CachingProvider = new DefaultCachingProvider(t => { });
+
+
             config.EncodedStringFactory = new RawStringFactory();
 
             config.TemplateManager = new DelegateTemplateManager((name) =>

diff --git a/source/ACT.TTSYukkuri/ACT.TTSYukkuri.Core/ACT.TTSYukkuri.Core.csproj b/source/ACT.TTSYukkuri/ACT.TTSYukkuri.Core/ACT.TTSYukkuri.Core.csproj
@@ -309,10 +309,6 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\sharlayan\Sharlayan\Sharlayan.csproj">
-      <Project>{4c436487-78ff-4899-9f19-2323ab0ca6bc}</Project>
-      <Name>Sharlayan</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\FFXIV.Framework\FFXIV.Framework\FFXIV.Framework.csproj">
       <Project>{22ebf8a4-eed1-4cd1-99eb-99665163a315}</Project>
       <Name>FFXIV.Framework</Name>

diff --git a/source/ACT.TTSYukkuri/ACT.TTSYukkuri.Core/Config/Views/CevioTrayWindow.xaml.cs b/source/ACT.TTSYukkuri/ACT.TTSYukkuri.Core/Config/Views/CevioTrayWindow.xaml.cs
@@ -17,13 +17,14 @@ public static class CevioTrayManager
         private static CevioTrayWindow trayWindow;
 
         private static SasaraConfig Config => Settings.Default.SasaraSettings;
+        private static CevioAIConfig CeVIOAI_Config => Settings.Default.CevioAISettings;
 
         private static readonly double Interval = 5 * 1000;
         private static readonly double IdleInterval = 15 * 1000;
 
         private static readonly ThreadWorker CevioSubscriber = new ThreadWorker(() =>
         {
-            if (!Config.IsHideCevioWindow)
+            if (!Config.IsHideCevioWindow && !CeVIOAI_Config.IsHideCevioWindow)
             {
                 CevioSubscriber.Interval = IdleInterval;
                 return;
@@ -55,7 +56,7 @@ public static void Start()
                 CevioSubscriber.Run();
             }
 
-            if (!Config.IsHideCevioWindow)
+            if (!Config.IsHideCevioWindow && !CeVIOAI_Config.IsHideCevioWindow)
             {
                 return;
             }
@@ -99,7 +100,7 @@ public static void End()
 
         public static void ToIcon()
         {
-            if (!Config.IsHideCevioWindow)
+            if (!Config.IsHideCevioWindow && !CeVIOAI_Config.IsHideCevioWindow)
             {
                 return;
             }

diff --git a/source/ACT.TTSYukkuri/ACT.TTSYukkuri.Core/PluginCore.cs b/source/ACT.TTSYukkuri/ACT.TTSYukkuri.Core/PluginCore.cs
@@ -522,7 +522,7 @@ public void DeInitPlugin()
             try
             {
                 // CeVIO のアイコン化を解除する
-                if (Settings.Default.SasaraSettings.IsHideCevioWindow)
+                if (Settings.Default.SasaraSettings.IsHideCevioWindow || Settings.Default.CevioAISettings.IsHideCevioWindow)
                 {
                     CevioTrayManager.RestoreWindow();
                     CevioTrayManager.End();

diff --git a/source/ACT.UltraScouter/ACT.UltraScouter.Core/ACT.UltraScouter.Core.csproj b/source/ACT.UltraScouter/ACT.UltraScouter.Core/ACT.UltraScouter.Core.csproj
@@ -482,10 +482,6 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\sharlayan\Sharlayan\Sharlayan.csproj">
-      <Project>{4c436487-78ff-4899-9f19-2323ab0ca6bc}</Project>
-      <Name>Sharlayan</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\FFXIV.Framework\FFXIV.Framework\FFXIV.Framework.csproj">
       <Project>{22ebf8a4-eed1-4cd1-99eb-99665163a315}</Project>
       <Name>FFXIV.Framework</Name>

diff --git a/source/ACT.XIVLog/ACT.XIVLog.csproj b/source/ACT.XIVLog/ACT.XIVLog.csproj
@@ -81,10 +81,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\sharlayan\Sharlayan\Sharlayan.csproj">
-      <Project>{4c436487-78ff-4899-9f19-2323ab0ca6bc}</Project>
-      <Name>Sharlayan</Name>
-    </ProjectReference>
     <ProjectReference Include="..\FFXIV.Framework\FFXIV.Framework\FFXIV.Framework.csproj">
       <Project>{22EBF8A4-EED1-4CD1-99EB-99665163A315}</Project>
       <Name>FFXIV.Framework</Name>

diff --git a/source/ACT.XIVLog/Config.cs b/source/ACT.XIVLog/Config.cs
@@ -29,6 +29,12 @@ private Config()
         {
             this.PropertyChanged += async (_, __) =>
             {
+                // 初期化中に自動保存しない
+                if (isInitializing)
+                {
+                    return;
+                }
+
                 if (this.isAutoSaving)
                 {
                     return;

diff --git a/source/FFXIV.Framework/FFXIV.Framework/Config.cs b/source/FFXIV.Framework/FFXIV.Framework/Config.cs
@@ -14,7 +14,7 @@
 using FFXIV.Framework.Globalization;
 using FFXIV.Framework.WPF.Views;
 using FFXIV.Framework.XIVHelper;
-using FFXIV_ACT_Plugin.Logfile;
+using static FFXIV.Framework.XIVHelper.LogMessageTypeExtensions;
 using Prism.Mvvm;
 
 namespace FFXIV.Framework

diff --git a/source/FFXIV.Framework/FFXIV.Framework/FFXIV.Framework.csproj b/source/FFXIV.Framework/FFXIV.Framework/FFXIV.Framework.csproj
@@ -343,10 +343,6 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\sharlayan\Sharlayan\Sharlayan.csproj">
-      <Project>{4c436487-78ff-4899-9f19-2323ab0ca6bc}</Project>
-      <Name>Sharlayan</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\ACT.Hojoring.Activator\ACT.Hojoring.Activator.csproj">
       <Project>{c1bc2d6e-e10d-4a7f-900b-5fd84f39bf0a}</Project>
       <Name>ACT.Hojoring.Activator</Name>
@@ -418,6 +414,9 @@
       <Version>3.4.0</Version>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="Sharlayan">
+      <Version>8.0.1</Version>
+    </PackageReference>
     <PackageReference Include="System.Text.RegularExpressions">
       <Version>4.3.1</Version>
     </PackageReference>

diff --git a/source/FFXIV.Framework/FFXIV.Framework/XIVHelper/LogMessageTypeExtensions.cs b/source/FFXIV.Framework/FFXIV.Framework/XIVHelper/LogMessageTypeExtensions.cs
@@ -1,12 +1,71 @@
-using FFXIV_ACT_Plugin.Logfile;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
 namespace FFXIV.Framework.XIVHelper
 {
     public static class LogMessageTypeExtensions
     {
+        public enum LogMessageType
+        {
+            ChatLog = 0,
+            Territory = 1,
+            ChangePrimaryPlayer = 2,
+            AddCombatant = 3,
+            RemoveCombatant = 4,
+            PartyList = 11,
+            PlayerStats = 12,
+            StartsCasting = 20,
+            ActionEffect = 21,
+            AOEActionEffect = 22,
+            CancelAction = 23,
+            DoTHoT = 24,
+            Death = 25,
+            StatusAdd = 26,
+            TargetIcon = 27,
+            WaymarkMarker = 28,
+            SignMarker = 29,
+            StatusRemove = 30,
+            Gauge = 31,
+            World = 32,
+            Director = 33,
+            NameToggle = 34,
+            Tether = 35,
+            LimitBreak = 36,
+            EffectResult = 37,
+            StatusList = 38,
+            UpdateHp = 39,
+            ChangeMap = 40,
+            SystemLogMessage = 41,
+            StatusList3 = 42,
+            Settings = 249,
+            Process = 250,
+            Debug = 251,
+            PacketDump = 252,
+            Version = 253,
+            Error = 254,
+
+            LineRegistration = 256,
+            MapEffect = 257,
+            FateDirector = 258,
+            CEDirector = 259,
+            InCombat = 260,
+            CombatantMemory = 261,
+            RSVData = 262,
+            StartsUsingExtra = 263,
+            AbilityExtra = 264,
+            ContentFinderSettings = 265,
+            NpcYell = 266,
+            BattleTalk2 = 267,
+            Countdown = 268,
+            CountdownCancel = 269,
+            ActorMove = 270,
+            ActorSetPos = 271,
+            SpawnNpcExtra = 272,
+            ActorControlExtra = 273,
+            ActorControlSelfExtra = 274
+        }
+
         private static readonly Lazy<Dictionary<LogMessageType, string>> LazyLogMessageTypeTextStore =
             new Lazy<Dictionary<LogMessageType, string>>(() =>
             {
@@ -20,6 +79,8 @@ public static class LogMessageTypeExtensions
                 return d;
             });
 
+        public static int max_messagetype = 274;
+
         public static string[] GetNames()
             => LazyLogMessageTypeTextStore.Value.Select(x => x.Value).ToArray();
 

diff --git a/source/FFXIV.Framework/FFXIV.Framework/XIVHelper/LogParser.RaiseLog.cs b/source/FFXIV.Framework/FFXIV.Framework/XIVHelper/LogParser.RaiseLog.cs
@@ -2,7 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using Advanced_Combat_Tracker;
-using FFXIV_ACT_Plugin.Logfile;
+using static FFXIV.Framework.XIVHelper.LogMessageTypeExtensions;
+
 
 namespace FFXIV.Framework.XIVHelper
 {
@@ -54,7 +55,7 @@ public static void RaiseLog(
 
             foreach (var line in lines)
             {
-                output.WriteLine(LogMessageType.ChatLog, timestamp, line);
+                output.WriteLine(FFXIV_ACT_Plugin.Logfile.LogMessageType.ChatLog, timestamp, line);
             }
         }
 
@@ -91,7 +92,7 @@ public static void RaiseLog(
                 WriteLineDebugLogDelegate?.Invoke(timestamp, $"{ChatLogCode}|{line}");
             }
 
-            output.WriteLine(LogMessageType.ChatLog, timestamp, line);
+            output.WriteLine(FFXIV_ACT_Plugin.Logfile.LogMessageType.ChatLog, timestamp, line);
         }
 
         private static readonly string ChatLogCode = LogMessageType.ChatLog.ToHex();

diff --git a/source/FFXIV.Framework/FFXIV.Framework/XIVHelper/LogParser.cs b/source/FFXIV.Framework/FFXIV.Framework/XIVHelper/LogParser.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Globalization;
 using System.Linq;
-using FFXIV_ACT_Plugin.Logfile;
+using static FFXIV.Framework.XIVHelper.LogMessageTypeExtensions;
 
 namespace FFXIV.Framework.XIVHelper
 {

diff --git a/source/FFXIV.Framework/FFXIV.Framework/XIVHelper/XIVLog.cs b/source/FFXIV.Framework/FFXIV.Framework/XIVHelper/XIVLog.cs
@@ -1,5 +1,5 @@
 using System;
-using FFXIV_ACT_Plugin.Logfile;
+using static FFXIV.Framework.XIVHelper.LogMessageTypeExtensions;
 
 namespace FFXIV.Framework.XIVHelper
 {