ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor: OnChatX -> ChatX

Browse source
This commit is contained in:
goat 2021-08-11 02:53:26 +02:00
parent ad9120fa39
commit 84d525a304
No known key found for this signature in database
GPG key ID: F18F057873895461
4 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Dalamud/Game/ChatHandlers.cs
View file

@ -104,8 +104,8 @@ namespace Dalamud.Game
{ {
this.dalamud = dalamud; this.dalamud = dalamud;
dalamud.Framework.Gui.Chat.OnCheckMessageHandled += this.OnCheckMessageHandled; dalamud.Framework.Gui.Chat.CheckMessageHandled += this.OnCheckMessageHandled;
dalamud.Framework.Gui.Chat.OnChatMessage += this.OnChatMessage; dalamud.Framework.Gui.Chat.ChatMessage += this.OnChatMessage;
this.openInstallerWindowLink = this.dalamud.Framework.Gui.Chat.AddChatLinkHandler("Dalamud", 1001, (i, m) => this.openInstallerWindowLink = this.dalamud.Framework.Gui.Chat.AddChatLinkHandler("Dalamud", 1001, (i, m) =>
{ {

2
Dalamud/Game/Command/CommandManager.cs
View file

@ -47,7 +47,7 @@ namespace Dalamud.Game.Command
break; break;
} }
dalamud.Framework.Gui.Chat.OnCheckMessageHandled += this.OnCheckMessageHandled; dalamud.Framework.Gui.Chat.CheckMessageHandled += this.OnCheckMessageHandled;
} }
/// <summary> /// <summary>

24
Dalamud/Game/Gui/ChatGui.cs
View file

@ -50,7 +50,7 @@ namespace Dalamud.Game.Gui
} }
/// <summary> /// <summary>
/// A delegate type used with the <see cref="OnChatMessage"/> event. /// A delegate type used with the <see cref="ChatGui.ChatMessage"/> event.
/// </summary> /// </summary>
/// <param name="type">The type of chat.</param> /// <param name="type">The type of chat.</param>
/// <param name="senderId">The sender ID.</param> /// <param name="senderId">The sender ID.</param>
@ -60,7 +60,7 @@ namespace Dalamud.Game.Gui
public delegate void OnMessageDelegate(XivChatType type, uint senderId, ref SeString sender, ref SeString message, ref bool isHandled); public delegate void OnMessageDelegate(XivChatType type, uint senderId, ref SeString sender, ref SeString message, ref bool isHandled);
/// <summary> /// <summary>
/// A delegate type used with the <see cref="OnCheckMessageHandled"/> event. /// A delegate type used with the <see cref="ChatGui.CheckMessageHandled"/> event.
/// </summary> /// </summary>
/// <param name="type">The type of chat.</param> /// <param name="type">The type of chat.</param>
/// <param name="senderId">The sender ID.</param> /// <param name="senderId">The sender ID.</param>
@ -70,7 +70,7 @@ namespace Dalamud.Game.Gui
public delegate void OnCheckMessageHandledDelegate(XivChatType type, uint senderId, ref SeString sender, ref SeString message, ref bool isHandled); public delegate void OnCheckMessageHandledDelegate(XivChatType type, uint senderId, ref SeString sender, ref SeString message, ref bool isHandled);
/// <summary> /// <summary>
/// A delegate type used with the <see cref="OnChatMessageHandled"/> event. /// A delegate type used with the <see cref="ChatGui.ChatMessageHandled"/> event.
/// </summary> /// </summary>
/// <param name="type">The type of chat.</param> /// <param name="type">The type of chat.</param>
/// <param name="senderId">The sender ID.</param> /// <param name="senderId">The sender ID.</param>
@ -79,7 +79,7 @@ namespace Dalamud.Game.Gui
public delegate void OnMessageHandledDelegate(XivChatType type, uint senderId, SeString sender, SeString message); public delegate void OnMessageHandledDelegate(XivChatType type, uint senderId, SeString sender, SeString message);
/// <summary> /// <summary>
/// A delegate type used with the <see cref="OnChatMessageUnhandled"/> event. /// A delegate type used with the <see cref="ChatGui.ChatMessageUnhandled"/> event.
/// </summary> /// </summary>
/// <param name="type">The type of chat.</param> /// <param name="type">The type of chat.</param>
/// <param name="senderId">The sender ID.</param> /// <param name="senderId">The sender ID.</param>
@ -99,22 +99,22 @@ namespace Dalamud.Game.Gui
/// <summary> /// <summary>
/// Event that will be fired when a chat message is sent to chat by the game. /// Event that will be fired when a chat message is sent to chat by the game.
/// </summary> /// </summary>
public event OnMessageDelegate OnChatMessage; public event OnMessageDelegate ChatMessage;
/// <summary> /// <summary>
/// Event that allows you to stop messages from appearing in chat by setting the isHandled parameter to true. /// Event that allows you to stop messages from appearing in chat by setting the isHandled parameter to true.
/// </summary> /// </summary>
public event OnCheckMessageHandledDelegate OnCheckMessageHandled; public event OnCheckMessageHandledDelegate CheckMessageHandled;
/// <summary> /// <summary>
/// Event that will be fired when a chat message is handled by Dalamud or a Plugin. /// Event that will be fired when a chat message is handled by Dalamud or a Plugin.
/// </summary> /// </summary>
public event OnMessageHandledDelegate OnChatMessageHandled; public event OnMessageHandledDelegate ChatMessageHandled;
/// <summary> /// <summary>
/// Event that will be fired when a chat message is not handled by Dalamud or a Plugin. /// Event that will be fired when a chat message is not handled by Dalamud or a Plugin.
/// </summary> /// </summary>
public event OnMessageUnhandledDelegate OnChatMessageUnhandled; public event OnMessageUnhandledDelegate ChatMessageUnhandled;
/// <summary> /// <summary>
/// Gets the ID of the last linked item. /// Gets the ID of the last linked item.
@ -365,11 +365,11 @@ namespace Dalamud.Game.Gui
// Call events // Call events
var isHandled = false; var isHandled = false;
this.OnCheckMessageHandled?.Invoke(chattype, senderid, ref parsedSender, ref parsedMessage, ref isHandled); this.CheckMessageHandled?.Invoke(chattype, senderid, ref parsedSender, ref parsedMessage, ref isHandled);
if (!isHandled) if (!isHandled)
{ {
this.OnChatMessage?.Invoke(chattype, senderid, ref parsedSender, ref parsedMessage, ref isHandled); this.ChatMessage?.Invoke(chattype, senderid, ref parsedSender, ref parsedMessage, ref isHandled);
} }
var newEdited = parsedMessage.Encode(); var newEdited = parsedMessage.Encode();
@ -395,12 +395,12 @@ namespace Dalamud.Game.Gui
// Print the original chat if it's handled. // Print the original chat if it's handled.
if (isHandled) if (isHandled)
{ {
this.OnChatMessageHandled?.Invoke(chattype, senderid, parsedSender, parsedMessage); this.ChatMessageHandled?.Invoke(chattype, senderid, parsedSender, parsedMessage);
} }
else else
{ {
retVal = this.printMessageHook.Original(manager, chattype, pSenderName, messagePtr, senderid, parameter); retVal = this.printMessageHook.Original(manager, chattype, pSenderName, messagePtr, senderid, parameter);
this.OnChatMessageUnhandled?.Invoke(chattype, senderid, parsedSender, parsedMessage); this.ChatMessageUnhandled?.Invoke(chattype, senderid, parsedSender, parsedMessage);
} }
if (this.baseAddress == IntPtr.Zero) if (this.baseAddress == IntPtr.Zero)

6
Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/ChatAgingStep.cs
View file

@ -33,12 +33,12 @@ namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
if (!this.subscribed) if (!this.subscribed)
{ {
this.subscribed = true; this.subscribed = true;
dalamud.Framework.Gui.Chat.OnChatMessage += this.ChatOnOnChatMessage; dalamud.Framework.Gui.Chat.ChatMessage += this.ChatOnOnChatMessage;
} }
if (this.hasPassed) if (this.hasPassed)
{ {
dalamud.Framework.Gui.Chat.OnChatMessage -= this.ChatOnOnChatMessage; dalamud.Framework.Gui.Chat.ChatMessage -= this.ChatOnOnChatMessage;
this.subscribed = false; this.subscribed = false;
return SelfTestStepResult.Pass; return SelfTestStepResult.Pass;
} }
@ -52,7 +52,7 @@ namespace Dalamud.Interface.Internal.Windows.SelfTest.AgingSteps
/// <inheritdoc/> /// <inheritdoc/>
public void CleanUp(Dalamud dalamud) public void CleanUp(Dalamud dalamud)
{ {
dalamud.Framework.Gui.Chat.OnChatMessage -= this.ChatOnOnChatMessage; dalamud.Framework.Gui.Chat.ChatMessage -= this.ChatOnOnChatMessage;
this.subscribed = false; this.subscribed = false;
} }