diff --git a/MareSynchronos/MareSynchronos.csproj b/MareSynchronos/MareSynchronos.csproj index b21572c..e539a86 100644 --- a/MareSynchronos/MareSynchronos.csproj +++ b/MareSynchronos/MareSynchronos.csproj @@ -2,7 +2,7 @@ ClubPenguinSync - 1.7.1.8 + 1.7.2.0 https://github.com/Rawrington/ClubPenguinSync/ latest diff --git a/MareSynchronos/Services/CharaData/CharaDataManager.cs b/MareSynchronos/Services/CharaData/CharaDataManager.cs index d87a9ca..50b01e1 100644 --- a/MareSynchronos/Services/CharaData/CharaDataManager.cs +++ b/MareSynchronos/Services/CharaData/CharaDataManager.cs @@ -267,7 +267,7 @@ public sealed partial class CharaDataManager : DisposableMediatorSubscriberBase var obj = await _dalamudUtilService.GetGposeTargetGameObjectAsync().ConfigureAwait(false); string targetName = string.Empty; bool canApply = _dalamudUtilService.IsInGpose && obj != null - && obj.ObjectKind == Dalamud.Game.ClientState.Objects.Enums.ObjectKind.Player; + && obj.ObjectKind == Dalamud.Game.ClientState.Objects.Enums.ObjectKind.Pc; if (canApply) { targetName = obj!.Name.TextValue; diff --git a/MareSynchronos/UI/CompactUI.cs b/MareSynchronos/UI/CompactUI.cs index 2162136..a6840ec 100644 --- a/MareSynchronos/UI/CompactUI.cs +++ b/MareSynchronos/UI/CompactUI.cs @@ -3,6 +3,7 @@ using Dalamud.Interface; using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; +using Dalamud.Interface.Windowing; using Dalamud.Utility; using MareSynchronos.API.Data.Extensions; using MareSynchronos.API.Dto.User; diff --git a/MareSynchronos/UI/DataAnalysisUi.cs b/MareSynchronos/UI/DataAnalysisUi.cs index a905392..28b1c21 100644 --- a/MareSynchronos/UI/DataAnalysisUi.cs +++ b/MareSynchronos/UI/DataAnalysisUi.cs @@ -618,7 +618,7 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase string fileGroupText = fileGroup.Key + " [" + fileGroup.Count() + "]"; var requiresCompute = fileGroup.Any(k => !k.IsComputed); using var tabcol = ImRaii.PushColor(ImGuiCol.Tab, UiSharedService.Color(ImGuiColors.DalamudYellow), requiresCompute); - ImRaii.IEndObject fileTab; + ImRaii.TabItemDisposable fileTab; using (var textcol = ImRaii.PushColor(ImGuiCol.Text, UiSharedService.Color(new(0, 0, 0, 1)), requiresCompute && !string.Equals(_selectedFileTypeTab, fileGroup.Key, StringComparison.Ordinal))) { diff --git a/MareSynchronos/UI/DownloadUi.cs b/MareSynchronos/UI/DownloadUi.cs index c10fef2..43dcdd8 100644 --- a/MareSynchronos/UI/DownloadUi.cs +++ b/MareSynchronos/UI/DownloadUi.cs @@ -1,5 +1,6 @@ using Dalamud.Bindings.ImGui; using Dalamud.Interface.Colors; +using Dalamud.Interface.Windowing; using MareSynchronos.MareConfiguration; using MareSynchronos.PlayerData.Handlers; using MareSynchronos.Services; diff --git a/MareSynchronos/UI/IntroUI.cs b/MareSynchronos/UI/IntroUI.cs index f69e033..32ed891 100644 --- a/MareSynchronos/UI/IntroUI.cs +++ b/MareSynchronos/UI/IntroUI.cs @@ -2,6 +2,7 @@ using Dalamud.Interface; using Dalamud.Interface.Colors; using Dalamud.Interface.Utility.Raii; +using Dalamud.Interface.Windowing; using Dalamud.Utility; using MareSynchronos.API.Dto.Account; using MareSynchronos.FileCache; diff --git a/MareSynchronos/UI/PlayerAnalysisUI.cs b/MareSynchronos/UI/PlayerAnalysisUI.cs index ef2b778..66e98af 100644 --- a/MareSynchronos/UI/PlayerAnalysisUI.cs +++ b/MareSynchronos/UI/PlayerAnalysisUI.cs @@ -212,7 +212,7 @@ public class PlayerAnalysisUI : WindowMediatorSubscriberBase string fileGroupText = fileGroup.Key + " [" + fileGroup.Count() + "]"; var requiresCompute = fileGroup.Any(k => !k.IsComputed); using var tabcol = ImRaii.PushColor(ImGuiCol.Tab, UiSharedService.Color(ImGuiColors.DalamudYellow), requiresCompute); - ImRaii.IEndObject fileTab; + ImRaii.TabItemDisposable fileTab; using (var textcol = ImRaii.PushColor(ImGuiCol.Text, UiSharedService.Color(new(0, 0, 0, 1)), requiresCompute && !string.Equals(_selectedFileTypeTab, fileGroup.Key, StringComparison.Ordinal))) { diff --git a/MareSynchronos/UI/SyncshellAdminUI.cs b/MareSynchronos/UI/SyncshellAdminUI.cs index cf87eb9..d9fe7a2 100644 --- a/MareSynchronos/UI/SyncshellAdminUI.cs +++ b/MareSynchronos/UI/SyncshellAdminUI.cs @@ -3,6 +3,7 @@ using Dalamud.Interface; using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; +using Dalamud.Interface.Windowing; using MareSynchronos.API.Data.Enum; using MareSynchronos.API.Data.Extensions; using MareSynchronos.API.Dto.Group; diff --git a/MareSynchronos/UI/UISharedService.cs b/MareSynchronos/UI/UISharedService.cs index 7f1bed5..65c8747 100644 --- a/MareSynchronos/UI/UISharedService.cs +++ b/MareSynchronos/UI/UISharedService.cs @@ -113,7 +113,7 @@ public partial class UiSharedService : DisposableMediatorSubscriberBase UidFont = _pluginInterface.UiBuilder.FontAtlas.NewDelegateFontHandle(e => { - e.OnPreBuild(tk => tk.AddDalamudAssetFont(Dalamud.DalamudAsset.NotoSansJpMedium, new() + e.OnPreBuild(tk => tk.AddDalamudAssetFont(Dalamud.DalamudAsset.NotoSansCjkRegular, new() { SizePx = 35, GlyphRanges = [0x20, 0x7E, 0]