diff --git a/MareAPI b/MareAPI index 9c9b7d9..9387f02 160000 --- a/MareAPI +++ b/MareAPI @@ -1 +1 @@ -Subproject commit 9c9b7d90c1d242bfae3d1df6083409ed8786c841 +Subproject commit 9387f020dc21ac7795d2300ed99dea4704e76e2c diff --git a/MareSynchronos/Interop/GameChatHooks.cs b/MareSynchronos/Interop/GameChatHooks.cs index 5afb4d6..1ad9cb2 100644 --- a/MareSynchronos/Interop/GameChatHooks.cs +++ b/MareSynchronos/Interop/GameChatHooks.cs @@ -155,7 +155,7 @@ public unsafe sealed class GameChatHooks : IDisposable var pronounModule = UIModule.Instance()->GetPronounModule(); var chatString1 = pronounModule->ProcessString(message, true); var chatString2 = this.ProcessStringStep2(pronounModule, chatString1, 1); - var chatBytes = MemoryHelper.ReadRaw((nint)chatString2->StringPtr, chatString2->Length); + var chatBytes = MemoryHelper.ReadRaw((nint)chatString2->StringPtr.Value, chatString2->Length); if (chatBytes.Length > 0) this._chatChannelOverride.ChatMessageHandler?.Invoke(chatBytes); diff --git a/MareSynchronos/MareSynchronos.csproj b/MareSynchronos/MareSynchronos.csproj index a7c57e2..30224d3 100644 --- a/MareSynchronos/MareSynchronos.csproj +++ b/MareSynchronos/MareSynchronos.csproj @@ -1,24 +1,9 @@  - + - - - 1.9.0 - - - https://github.com/Penumbra-Sync/client - - - - net8.0-windows - x64 - enable - preview - true - false - false - true LoporritSync + 1.9.0 + https://github.com/loporrit/MareClient/ @@ -30,7 +15,6 @@ - @@ -38,15 +22,15 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + @@ -75,34 +59,6 @@ - - $(DalamudLibPath)FFXIVClientStructs.dll - false - - - $(DalamudLibPath)Newtonsoft.Json.dll - false - - - $(DalamudLibPath)Dalamud.dll - false - - - $(DalamudLibPath)ImGui.NET.dll - false - - - $(DalamudLibPath)ImGuiScene.dll - false - - - $(DalamudLibPath)Lumina.dll - false - - - $(DalamudLibPath)Lumina.Excel.dll - false - $(DalamudLibPath)CheapLoc.dll false diff --git a/MareSynchronos/Services/DalamudUtilService.cs b/MareSynchronos/Services/DalamudUtilService.cs index 67f6089..267a056 100644 --- a/MareSynchronos/Services/DalamudUtilService.cs +++ b/MareSynchronos/Services/DalamudUtilService.cs @@ -76,7 +76,7 @@ public class DalamudUtilService : IHostedService, IMediatorSubscriber UiColors = new(() => { return gameData.GetExcelSheet(Dalamud.Game.ClientLanguage.English)! - .Where(x => x.RowId != 0 && !(x.RowId >= 500 && (x.UIForeground & 0xFFFFFF00) == 0)) + .Where(x => x.RowId != 0 && !(x.RowId >= 500 && (x.Dark & 0xFFFFFF00) == 0)) .ToDictionary(x => (int)x.RowId); }); mediator.Subscribe(this, (msg) => diff --git a/MareSynchronos/UI/SettingsUi.cs b/MareSynchronos/UI/SettingsUi.cs index 9494b9f..d307834 100644 --- a/MareSynchronos/UI/SettingsUi.cs +++ b/MareSynchronos/UI/SettingsUi.cs @@ -432,8 +432,8 @@ public class SettingsUi : WindowMediatorSubscriberBase _uiShared.DrawColorCombo("Chat text color", Enumerable.Concat([0], uiColors.Keys), i => i switch { - 0 => (uiColors[ChatService.DefaultColor].UIForeground, "Plugin Default"), - _ => (uiColors[i].UIForeground, $"[{i}] Sample Text") + 0 => (uiColors[ChatService.DefaultColor].Dark, "Plugin Default"), + _ => (uiColors[i].Dark, $"[{i}] Sample Text") }, i => { _configService.Current.ChatColor = i; @@ -593,8 +593,8 @@ public class SettingsUi : WindowMediatorSubscriberBase _uiShared.DrawColorCombo($"Chat text color##{gid}", Enumerable.Concat([0], uiColors.Keys), i => i switch { - 0 => (uiColors[globalChatColor > 0 ? globalChatColor : ChatService.DefaultColor].UIForeground, "(use global setting)"), - _ => (uiColors[i].UIForeground, $"[{i}] Sample Text") + 0 => (uiColors[globalChatColor > 0 ? globalChatColor : ChatService.DefaultColor].Dark, "(use global setting)"), + _ => (uiColors[i].Dark, $"[{i}] Sample Text") }, i => { shellConfig.Color = i;