ToxicMushroom/Glamourer
1
0
Fork 0
mirror of https://github.com/Ottermandias/Glamourer.git synced 2025-12-12 10:17:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve Messaging.

Browse source
This commit is contained in:
Ottermandias 2023-10-05 16:00:53 +02:00
parent 5ad1be30a7
commit 520fc58e95
20 changed files with 100 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Glamourer/Automation/AutoDesignManager.cs
View file

@ -14,6 +14,7 @@ using Glamourer.Structs;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using OtterGui;
using OtterGui.Classes;
using OtterGui.Filesystem;
using Penumbra.GameData.Actors;
@ -359,7 +360,7 @@ public class AutoDesignManager : ISavable, IReadOnlyList<AutoDesignSet>, IDispos
{
case < 1:
case > CurrentVersion:
Glamourer.Chat.NotificationMessage("Failure to load automated designs: No valid version available.", "Error",
Glamourer.Messager.NotificationMessage("Failure to load automated designs: No valid version available.",
NotificationType.Error);
break;
case 1:
@ -369,8 +370,8 @@ public class AutoDesignManager : ISavable, IReadOnlyList<AutoDesignSet>, IDispos
}
catch (Exception ex)
{
Glamourer.Chat.NotificationMessage(ex, "Failure to load automated designs: Error during parsing.",
"Failure to load automated designs", "Error", NotificationType.Error);
Glamourer.Messager.NotificationMessage(ex, "Failure to load automated designs: Error during parsing.",
"Failure to load automated designs", NotificationType.Error);
}
}
@ -384,14 +385,14 @@ public class AutoDesignManager : ISavable, IReadOnlyList<AutoDesignSet>, IDispos
var name = obj["Name"]?.ToObject<string>() ?? string.Empty;
if (name.Length == 0)
{
Glamourer.Chat.NotificationMessage("Skipped loading Automation Set: No name provided.", "Warning", NotificationType.Warning);
Glamourer.Messager.NotificationMessage("Skipped loading Automation Set: No name provided.", NotificationType.Warning);
continue;
}
var id = _actors.AwaitedService.FromJson(obj["Identifier"] as JObject);
if (!IdentifierValid(id, out var group))
{
Glamourer.Chat.NotificationMessage("Skipped loading Automation Set: Invalid Identifier.", "Warning", NotificationType.Warning);
Glamourer.Messager.NotificationMessage("Skipped loading Automation Set: Invalid Identifier.", NotificationType.Warning);
continue;
}
@ -419,7 +420,8 @@ public class AutoDesignManager : ISavable, IReadOnlyList<AutoDesignSet>, IDispos
{
if (designObj is not JObject j)
{
Glamourer.Chat.NotificationMessage($"Skipped loading design in Automation Set for {id.Incognito(null)}: Unknown design.");
Glamourer.Messager.NotificationMessage(
$"Skipped loading design in Automation Set for {id.Incognito(null)}: Unknown design.");
continue;
}
@ -439,13 +441,13 @@ public class AutoDesignManager : ISavable, IReadOnlyList<AutoDesignSet>, IDispos
{
if (designIdentifier.Length == 0)
{
Glamourer.Chat.NotificationMessage("Error parsing automatically applied design: No design specified.");
Glamourer.Messager.NotificationMessage("Error parsing automatically applied design: No design specified.");
return null;
}
if (!Guid.TryParse(designIdentifier, out var guid))
{
Glamourer.Chat.NotificationMessage($"Error parsing automatically applied design: {designIdentifier} is not a valid GUID.");
Glamourer.Messager.NotificationMessage($"Error parsing automatically applied design: {designIdentifier} is not a valid GUID.");
return null;
}
@ -453,7 +455,8 @@ public class AutoDesignManager : ISavable, IReadOnlyList<AutoDesignSet>, IDispos
design = _designs.Designs.FirstOrDefault(d => d.Identifier == guid);
if (design == null)
{
Glamourer.Chat.NotificationMessage($"Error parsing automatically applied design: The specified design {guid} does not exist.");
Glamourer.Messager.NotificationMessage(
$"Error parsing automatically applied design: The specified design {guid} does not exist.");
return null;
}
}
@ -475,7 +478,7 @@ public class AutoDesignManager : ISavable, IReadOnlyList<AutoDesignSet>, IDispos
{
if (!_jobs.JobGroups.TryGetValue((ushort)jobs, out var jobGroup))
{
Glamourer.Chat.NotificationMessage($"Error parsing automatically applied design: The job condition {jobs} does not exist.");
Glamourer.Messager.NotificationMessage($"Error parsing automatically applied design: The job condition {jobs} does not exist.");
return null;
}

11
Glamourer/Automation/FixedDesignMigrator.cs
View file

@ -6,6 +6,7 @@ using Glamourer.Interop;
using Glamourer.Services;
using Glamourer.Structs;
using Newtonsoft.Json.Linq;
using OtterGui.Classes;
using Penumbra.GameData.Actors;
using Penumbra.String;
@ -45,7 +46,7 @@ public class FixedDesignMigrator
id = actors.AwaitedService.CreatePlayer(byteString, actors.AwaitedService.Data.Worlds.First().Key);
if (!id.IsValid)
{
Glamourer.Chat.NotificationMessage($"Could not migrate fixed design {data.Name}.", "Error", NotificationType.Error);
Glamourer.Messager.NotificationMessage($"Could not migrate fixed design {data.Name}.", NotificationType.Error);
allEnabled = false;
continue;
}
@ -58,7 +59,7 @@ public class FixedDesignMigrator
{
if (!designFileSystem.Find(design.Item1, out var child) || child is not DesignFileSystem.Leaf leaf)
{
Glamourer.Chat.NotificationMessage($"Could not find design with path {design.Item1}, skipped fixed design.", "Warning",
Glamourer.Messager.NotificationMessage($"Could not find design with path {design.Item1}, skipped fixed design.",
NotificationType.Warning);
continue;
}
@ -81,7 +82,7 @@ public class FixedDesignMigrator
var name = obj["Name"]?.ToObject<string>() ?? string.Empty;
if (name.Length == 0)
{
Glamourer.Chat.NotificationMessage("Could not semi-migrate fixed design: No character name available.", "Warning",
Glamourer.Messager.NotificationMessage("Could not semi-migrate fixed design: No character name available.",
NotificationType.Warning);
continue;
}
@ -89,7 +90,7 @@ public class FixedDesignMigrator
var path = obj["Path"]?.ToObject<string>() ?? string.Empty;
if (path.Length == 0)
{
Glamourer.Chat.NotificationMessage("Could not semi-migrate fixed design: No design path available.", "Warning",
Glamourer.Messager.NotificationMessage("Could not semi-migrate fixed design: No design path available.",
NotificationType.Warning);
continue;
}
@ -97,7 +98,7 @@ public class FixedDesignMigrator
var job = obj["JobGroups"]?.ToObject<int>() ?? -1;
if (job < 0 || !_jobs.JobGroups.TryGetValue((ushort)job, out var group))
{
Glamourer.Chat.NotificationMessage("Could not semi-migrate fixed design: Invalid job group specified.", "Warning",
Glamourer.Messager.NotificationMessage("Could not semi-migrate fixed design: Invalid job group specified.",
NotificationType.Warning);
continue;
}

4
Glamourer/Configuration.cs
View file

@ -93,9 +93,9 @@ public class Configuration : IPluginConfiguration, ISavable
}
catch (Exception ex)
{
Glamourer.Chat.NotificationMessage(ex,
Glamourer.Messager.NotificationMessage(ex,
"Error reading Configuration, reverting to default.\nYou may be able to restore your configuration using the rolling backups in the XIVLauncher/backups/Glamourer directory.",
"Error reading Configuration", "Error", NotificationType.Error);
"Error reading Configuration", NotificationType.Error);
}
migrator.Migrate(this);

5
Glamourer/Designs/Design.cs
View file

@ -146,7 +146,7 @@ public sealed class Design : DesignBase, ISavable
var enabled = tok["Enabled"]?.ToObject<bool>();
if (name == null || directory == null || enabled == null)
{
Glamourer.Chat.NotificationMessage("The loaded design contains an invalid mod, skipped.", "Warning", NotificationType.Warning);
Glamourer.Messager.NotificationMessage("The loaded design contains an invalid mod, skipped.", NotificationType.Warning);
continue;
}
@ -156,8 +156,7 @@ public sealed class Design : DesignBase, ISavable
settings.Add(key, value);
var priority = tok["Priority"]?.ToObject<int>() ?? 0;
if (!design.AssociatedMods.TryAdd(new Mod(name, directory), new ModSettings(settings, priority, enabled.Value)))
Glamourer.Chat.NotificationMessage("The loaded design contains a mod more than once, skipped.", "Warning",
NotificationType.Warning);
Glamourer.Messager.NotificationMessage("The loaded design contains a mod more than once, skipped.", NotificationType.Warning);
}
}

15
Glamourer/Designs/DesignBase.cs
View file

@ -286,7 +286,7 @@ public class DesignBase
if (equip == null)
{
design.DesignData.SetDefaultEquipment(items);
Glamourer.Chat.NotificationMessage("The loaded design does not contain any equipment data, reset to default.", "Warning",
Glamourer.Messager.NotificationMessage("The loaded design does not contain any equipment data, reset to default.",
NotificationType.Warning);
return;
}
@ -310,7 +310,7 @@ public class DesignBase
void PrintWarning(string msg)
{
if (msg.Length > 0 && name != "Temporary Design")
Glamourer.Chat.NotificationMessage($"{msg} ({name})", "Warning", NotificationType.Warning);
Glamourer.Messager.NotificationMessage($"{msg} ({name})", NotificationType.Warning);
}
foreach (var slot in EquipSlotExtensions.EqdpSlots)
@ -366,7 +366,7 @@ public class DesignBase
design.DesignData.ModelId = 0;
design.DesignData.IsHuman = true;
design.DesignData.Customize = Customize.Default;
Glamourer.Chat.NotificationMessage("The loaded design does not contain any customization data, reset to default.", "Warning",
Glamourer.Messager.NotificationMessage("The loaded design does not contain any customization data, reset to default.",
NotificationType.Warning);
return;
}
@ -374,9 +374,9 @@ public class DesignBase
void PrintWarning(string msg)
{
if (msg.Length > 0)
Glamourer.Chat.NotificationMessage(
$"{msg} ({name})\n\nThis change is not saved automatically. If you want this replacement to stick and the warning to stop appearing, please save the design manually once by changing something in it.",
"Warning", NotificationType.Warning);
Glamourer.Messager.NotificationMessage(
$"{msg} ({name})\nThis change is not saved automatically. If you want this replacement to stick and the warning to stop appearing, please save the design manually once by changing something in it.",
NotificationType.Warning);
}
var wetness = QuadBool.FromJObject(json["Wetness"], "Value", "Apply", QuadBool.NullFalse);
@ -451,8 +451,7 @@ public class DesignBase
}
catch (Exception ex)
{
Glamourer.Chat.NotificationMessage(ex, "Could not parse Base64 design.", "Could not parse Base64 design", "Failure",
NotificationType.Error);
Glamourer.Messager.NotificationMessage(ex, "Could not parse Base64 design.", NotificationType.Error);
}
}

5
Glamourer/Designs/DesignFileSystem.cs
View file

@ -10,6 +10,7 @@ using Glamourer.Interop.Penumbra;
using Glamourer.Services;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using OtterGui.Classes;
using OtterGui.Filesystem;
namespace Glamourer.Designs;
@ -111,9 +112,7 @@ public sealed class DesignFileSystem : FileSystem<Design>, IDisposable, ISavable
}
catch (Exception ex)
{
Glamourer.Chat.NotificationMessage(ex, $"Could not move design to {path} because the folder could not be created.",
$"Could not move design to {path} because the folder could not be created", "Error",
NotificationType.Error);
Glamourer.Messager.NotificationMessage(ex, $"Could not move design to {path} because the folder could not be created.", NotificationType.Error);
}
CreateDuplicateLeaf(parent, design.Name.Text, design);

4
Glamourer/Glamourer.cs
View file

@ -21,7 +21,7 @@ public class Glamourer : IDalamudPlugin
public static readonly Logger Log = new();
public static ChatService Chat { get; private set; } = null!;
public static MessageService Messager { get; private set; } = null!;
private readonly ServiceProvider _services;
@ -30,7 +30,7 @@ public class Glamourer : IDalamudPlugin
try
{
_services = ServiceManager.CreateProvider(pluginInterface, Log);
Chat = _services.GetRequiredService<ChatService>();
Messager = _services.GetRequiredService<MessageService>();
_services.GetRequiredService<GlamourerWindowSystem>(); // initialize ui.
_services.GetRequiredService<CommandService>(); // initialize commands.
_services.GetRequiredService<VisorService>();

13
Glamourer/Gui/MainWindow.cs
View file

@ -27,6 +27,7 @@ public class MainWindow : Window, IDisposable
Designs = 3,
Automation = 4,
Unlocks = 5,
Messages = 6,
}
private readonly Configuration _config;
@ -40,11 +41,13 @@ public class MainWindow : Window, IDisposable
public readonly DesignTab Designs;
public readonly AutomationTab Automation;
public readonly UnlocksTab Unlocks;
public readonly MessagesTab Messages;
public TabType SelectTab = TabType.None;
public MainWindow(DalamudPluginInterface pi, Configuration config, SettingsTab settings, ActorTab actors, DesignTab designs,
DebugTab debugTab, AutomationTab automation, UnlocksTab unlocks, TabSelected @event, ConvenienceRevertButtons convenienceButtons)
DebugTab debugTab, AutomationTab automation, UnlocksTab unlocks, TabSelected @event, ConvenienceRevertButtons convenienceButtons,
MessagesTab messages)
: base(GetLabel())
{
pi.UiBuilder.DisableGposeUiHide = true;
@ -61,6 +64,7 @@ public class MainWindow : Window, IDisposable
Unlocks = unlocks;
_event = @event;
_convenienceButtons = convenienceButtons;
Messages = messages;
_config = config;
_tabs = new ITab[]
{
@ -69,6 +73,7 @@ public class MainWindow : Window, IDisposable
designs,
automation,
unlocks,
messages,
debugTab,
};
_event.Subscribe(OnTabSelected, TabSelected.Priority.MainWindow);
@ -100,6 +105,7 @@ public class MainWindow : Window, IDisposable
TabType.Designs => Designs.Label,
TabType.Automation => Automation.Label,
TabType.Unlocks => Unlocks.Label,
TabType.Messages => Messages.Label,
_ => ReadOnlySpan<byte>.Empty,
};
@ -111,6 +117,7 @@ public class MainWindow : Window, IDisposable
if (label == Settings.Label) return TabType.Settings;
if (label == Automation.Label) return TabType.Automation;
if (label == Unlocks.Label) return TabType.Unlocks;
if (label == Messages.Label) return TabType.Messages;
if (label == Debug.Label) return TabType.Debug;
// @formatter:on
return TabType.None;
@ -126,10 +133,10 @@ public class MainWindow : Window, IDisposable
xPos -= ImGui.GetStyle().ScrollbarSize + ImGui.GetStyle().FramePadding.X;
ImGui.SetCursorPos(new Vector2(xPos, 0));
CustomGui.DrawDiscordButton(Glamourer.Chat, width);
CustomGui.DrawDiscordButton(Glamourer.Messager, width);
ImGui.SetCursorPos(new Vector2(xPos, ImGui.GetFrameHeightWithSpacing()));
CustomGui.DrawGuideButton(Glamourer.Chat, width);
CustomGui.DrawGuideButton(Glamourer.Messager, width);
ImGui.SetCursorPos(new Vector2(xPos, 2 * ImGui.GetFrameHeightWithSpacing()));
if (ImGui.Button("Show Changelogs", new Vector2(width, 0)))

9
Glamourer/Gui/Tabs/ActorTab/ActorPanel.cs
View file

@ -17,6 +17,7 @@ using Glamourer.Services;
using Glamourer.State;
using ImGuiNET;
using OtterGui;
using OtterGui.Classes;
using OtterGui.Raii;
using Penumbra.GameData.Actors;
using Penumbra.GameData.Enums;
@ -354,8 +355,8 @@ public class ActorPanel
}
catch (Exception ex)
{
Glamourer.Chat.NotificationMessage(ex, $"Could not apply clipboard to {_identifier}.",
$"Could not apply clipboard to design {_identifier.Incognito(null)}", "Failure", NotificationType.Error);
Glamourer.Messager.NotificationMessage(ex, $"Could not apply clipboard to {_identifier}.",
$"Could not apply clipboard to design {_identifier.Incognito(null)}", NotificationType.Error, false);
}
}
@ -369,8 +370,8 @@ public class ActorPanel
}
catch (Exception ex)
{
Glamourer.Chat.NotificationMessage(ex, $"Could not copy {_identifier} data to clipboard.",
$"Could not copy data from design {_identifier.Incognito(null)} to clipboard", "Failure", NotificationType.Error);
Glamourer.Messager.NotificationMessage(ex, $"Could not copy {_identifier} data to clipboard.",
$"Could not copy data from design {_identifier.Incognito(null)} to clipboard", NotificationType.Error);
}
}

6
Glamourer/Gui/Tabs/DesignTab/DesignDetailTab.cs
View file

@ -7,6 +7,7 @@ using Glamourer.Designs;
using Glamourer.Services;
using ImGuiNET;
using OtterGui;
using OtterGui.Classes;
using OtterGui.Raii;
using OtterGui.Widgets;
@ -88,8 +89,7 @@ public class DesignDetailTab
}
catch (Exception ex)
{
Glamourer.Chat.NotificationMessage(ex, $"Could not open file {fileName}.", $"Could not open file {fileName}", "Failure",
NotificationType.Warning);
Glamourer.Messager.NotificationMessage(ex, $"Could not open file {fileName}.", $"Could not open file {fileName}", NotificationType.Warning);
}
}
@ -114,7 +114,7 @@ public class DesignDetailTab
}
catch (Exception ex)
{
Glamourer.Chat.NotificationMessage(ex, ex.Message, "Could not rename or move design", "Error", NotificationType.Error);
Glamourer.Messager.NotificationMessage(ex, ex.Message, "Could not rename or move design", NotificationType.Error);
}
ImGuiUtil.DrawFrameColumn("Creation Date");

5
Glamourer/Gui/Tabs/DesignTab/DesignFileSystemSelector.cs
View file

@ -141,7 +141,7 @@ public sealed class DesignFileSystemSelector : FileSystemSelector<Design, Design
}
catch
{
Glamourer.Chat.NotificationMessage("Could not import data from clipboard.", "Failure", NotificationType.Error);
Glamourer.Messager.NotificationMessage("Could not import data from clipboard.", NotificationType.Error, false);
}
}
@ -173,8 +173,7 @@ public sealed class DesignFileSystemSelector : FileSystemSelector<Design, Design
else if (design != null)
_designManager.CreateClone(design, _newName, true);
else
Glamourer.Chat.NotificationMessage("Could not create a design, clipboard did not contain valid design data.", "Failure",
NotificationType.Error);
Glamourer.Messager.NotificationMessage("Could not create a design, clipboard did not contain valid design data.", NotificationType.Error, false);
_clipboardText = null;
}
else if (_cloneDesign != null)

9
Glamourer/Gui/Tabs/DesignTab/DesignPanel.cs
View file

@ -18,6 +18,7 @@ using Glamourer.State;
using Glamourer.Structs;
using ImGuiNET;
using OtterGui;
using OtterGui.Classes;
using OtterGui.Raii;
using Penumbra.GameData.Enums;
@ -405,8 +406,8 @@ public class DesignPanel
}
catch (Exception ex)
{
Glamourer.Chat.NotificationMessage(ex, $"Could not apply clipboard to {_selector.Selected!.Name}.",
$"Could not apply clipboard to design {_selector.Selected!.Identifier}", "Failure", NotificationType.Error);
Glamourer.Messager.NotificationMessage(ex, $"Could not apply clipboard to {_selector.Selected!.Name}.",
$"Could not apply clipboard to design {_selector.Selected!.Identifier}", NotificationType.Error, false);
}
}
@ -419,8 +420,8 @@ public class DesignPanel
}
catch (Exception ex)
{
Glamourer.Chat.NotificationMessage(ex, $"Could not copy {_selector.Selected!.Name} data to clipboard.",
$"Could not copy data from design {_selector.Selected!.Identifier} to clipboard", "Failure", NotificationType.Error);
Glamourer.Messager.NotificationMessage(ex, $"Could not copy {_selector.Selected!.Name} data to clipboard.",
$"Could not copy data from design {_selector.Selected!.Identifier} to clipboard", NotificationType.Error, false);
}
}

3
Glamourer/Gui/Tabs/DesignTab/ModAssociationsTab.cs
View file

@ -7,6 +7,7 @@ using Glamourer.Designs;
using Glamourer.Interop.Penumbra;
using ImGuiNET;
using OtterGui;
using OtterGui.Classes;
using OtterGui.Raii;
namespace Glamourer.Gui.Tabs.DesignTab;
@ -125,7 +126,7 @@ public class ModAssociationsTab
{
var text = _penumbra.SetMod(mod, settings);
if (text.Length > 0)
Glamourer.Chat.NotificationMessage(text, "Failure", NotificationType.Warning);
Glamourer.Messager.NotificationMessage(text, NotificationType.Warning, false);
}
DrawAssociatedModTooltip(settings);

22
Glamourer/Gui/Tabs/MessageTab.cs Normal file
View file

@ -0,0 +1,22 @@
using System;
using OtterGui.Classes;
using OtterGui.Widgets;
namespace Glamourer.Gui.Tabs;
public class MessagesTab : ITab
{
private readonly MessageService _messages;
public MessagesTab(MessageService messages)
=> _messages = messages;
public ReadOnlySpan<byte> Label
=> "Messages"u8;
public bool IsVisible
=> _messages.Count > 0;
public void DrawContent()
=> _messages.Draw();
}

7
Glamourer/Interop/DatFileService.cs
View file

@ -7,6 +7,7 @@ using Glamourer.Customization;
using Glamourer.Services;
using Glamourer.Unlocks;
using ImGuiNET;
using OtterGui.Classes;
namespace Glamourer.Interop;
@ -62,8 +63,7 @@ public class DatFileService
}
catch (Exception ex)
{
Glamourer.Chat.NotificationMessage(ex, $"Could not read character data file {path}.",
$"Could not read character data file {path}", "Failure", NotificationType.Error);
Glamourer.Messager.NotificationMessage(ex, $"Could not read character data file {path}.", NotificationType.Error);
file = default;
}
@ -94,8 +94,7 @@ public class DatFileService
}
catch (Exception ex)
{
Glamourer.Chat.NotificationMessage(ex, $"Could not save character data to file {path}.",
$"Could not save character data to file {path}", "Failure", NotificationType.Error);
Glamourer.Messager.NotificationMessage(ex, $"Could not save character data to file {path}.", "Failure", NotificationType.Error);
return false;
}
}

4
Glamourer/Interop/Penumbra/PenumbraService.cs
View file

@ -8,6 +8,7 @@ using Dalamud.Logging;
using Dalamud.Plugin;
using Glamourer.Events;
using Glamourer.Interop.Structs;
using OtterGui.Classes;
using Penumbra.Api;
using Penumbra.Api.Enums;
using Penumbra.Api.Helpers;
@ -147,8 +148,7 @@ public unsafe class PenumbraService : IDisposable
public void OpenModPage(Mod mod)
{
if (_openModPage.Invoke(TabType.Mods, mod.DirectoryName, mod.Name) == PenumbraApiEc.ModMissing)
Glamourer.Chat.NotificationMessage($"Could not open the mod {mod.Name}, no fitting mod was found in your Penumbra install.",
"Mod Missing", NotificationType.Info);
Glamourer.Messager.NotificationMessage($"Could not open the mod {mod.Name}, no fitting mod was found in your Penumbra install.", NotificationType.Info, false);
}
public string CurrentCollection

3
Glamourer/Services/ServiceManager.cs
View file

@ -48,7 +48,7 @@ public static class ServiceManager
}
private static IServiceCollection AddMeta(this IServiceCollection services)
=> services.AddSingleton<ChatService>()
=> services.AddSingleton<MessageService>()
.AddSingleton<FilenameService>()
.AddSingleton<BackupService>()
.AddSingleton<FrameworkManager>()
@ -115,6 +115,7 @@ public static class ServiceManager
private static IServiceCollection AddUi(this IServiceCollection services)
=> services.AddSingleton<DebugTab>()
.AddSingleton<MessagesTab>()
.AddSingleton<SettingsTab>()
.AddSingleton<ActorTab>()
.AddSingleton<ActorSelector>()

3
Glamourer/State/FunModule.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Linq;
using Dalamud.Game.ClientState.Objects.Enums;
using Dalamud.Interface.Internal.Notifications;
using Glamourer.Customization;
using Glamourer.Designs;
using Glamourer.Gui;
@ -247,7 +248,7 @@ public unsafe class FunModule : IDisposable
tmp.FixCustomizeApplication(_customizations, CustomizeFlagExtensions.AllRelevant);
var data = _designConverter.ShareBase64(tmp);
ImGui.SetClipboardText(data);
Glamourer.Chat.NotificationMessage($"Copied current actual design of {actor.Utf8Name} to clipboard.");
Glamourer.Messager.NotificationMessage($"Copied current actual design of {actor.Utf8Name} to clipboard.", NotificationType.Info, false);
}
catch
{

12
Glamourer/Unlocks/UnlockDictionaryHelpers.cs
View file

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.IO;
using Dalamud.Interface.Internal.Notifications;
using OtterGui.Classes;
namespace Glamourer.Unlocks;
@ -47,8 +48,7 @@ public static class UnlockDictionaryHelpers
revertEndian = true;
break;
default:
Glamourer.Chat.NotificationMessage($"Loading unlocked {type}s failed: Invalid magic number.", "Warning",
NotificationType.Warning);
Glamourer.Messager.NotificationMessage($"Loading unlocked {type}s failed: Invalid magic number.", NotificationType.Warning);
return -1;
}
@ -80,12 +80,12 @@ public static class UnlockDictionaryHelpers
}
if (skips > 0)
Glamourer.Chat.NotificationMessage($"Skipped {skips} unlocked {type}s while loading unlocked {type}s.", "Warning",
Glamourer.Messager.NotificationMessage($"Skipped {skips} unlocked {type}s while loading unlocked {type}s.",
NotificationType.Warning);
break;
default:
Glamourer.Chat.NotificationMessage($"Loading unlocked {type}s failed: Version {version} is unknown.", "Warning",
Glamourer.Messager.NotificationMessage($"Loading unlocked {type}s failed: Version {version} is unknown.",
NotificationType.Warning);
return version;
}
@ -95,8 +95,8 @@ public static class UnlockDictionaryHelpers
}
catch (Exception ex)
{
Glamourer.Chat.NotificationMessage(ex, $"Loading unlocked {type}s failed: Unknown Error.", $"Loading unlocked {type}s failed:\n",
"Error", NotificationType.Error);
Glamourer.Messager.NotificationMessage(ex, $"Loading unlocked {type}s failed: Unknown Error.",
$"Loading unlocked {type}s failed:\n", NotificationType.Error);
return -1;
}

2
OtterGui

@ -1 +1 @@
Subproject commit df07c4ed08e8e6c1188867c7863a19e02c8adb53
Subproject commit 96c9055a1d8a19d9cdb61f41ddfb372871e204ac