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

refactor: remove OnZonePacket API

Browse source
This commit is contained in:
goat 2020-04-28 02:33:25 +02:00
parent 017c30e107
commit fd18ba6e8e
3 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud/Game/Internal/Framework.cs
View file

@ -65,7 +65,7 @@ namespace Dalamud.Game.Internal {
Gui = new GameGui(Address.GuiManager, scanner, dalamud); Gui = new GameGui(Address.GuiManager, scanner, dalamud);
Network = new GameNetwork(dalamud, scanner); Network = new GameNetwork(scanner);
//Resource = new ResourceManager(dalamud, scanner); //Resource = new ResourceManager(dalamud, scanner);
} }

6
Dalamud/Game/Internal/Network/GameNetwork.cs
View file

@ -23,11 +23,6 @@ namespace Dalamud.Game.Internal.Network {
private GameNetworkAddressResolver Address { get; } private GameNetworkAddressResolver Address { get; }
private IntPtr baseAddress; private IntPtr baseAddress;
public delegate void OnZonePacketDelegate(IntPtr dataPtr);
[Obsolete("Please use OnNetworkMessage instead. For modifications, it will take precedence.")]
public OnZonePacketDelegate OnZonePacket;
public delegate void OnNetworkMessageDelegate(IntPtr dataPtr, NetworkMessageDirection direction); public delegate void OnNetworkMessageDelegate(IntPtr dataPtr, NetworkMessageDirection direction);
/// <summary> /// <summary>
@ -73,7 +68,6 @@ namespace Dalamud.Game.Internal.Network {
try { try {
// Call events // Call events
this.OnZonePacket?.Invoke(dataPtr);
this.OnNetworkMessage?.Invoke(dataPtr, NetworkMessageDirection.ZoneDown); this.OnNetworkMessage?.Invoke(dataPtr, NetworkMessageDirection.ZoneDown);
this.processZonePacketDownHook.Original(a, b, dataPtr); this.processZonePacketDownHook.Original(a, b, dataPtr);

8
Dalamud/Game/Network/NetworkHandlers.cs
View file

@ -5,6 +5,7 @@ using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Threading.Tasks; using System.Threading.Tasks;
using Dalamud.Data.TransientSheet; using Dalamud.Data.TransientSheet;
using Dalamud.Game.Internal.Network;
using Dalamud.Game.Network.MarketBoardUploaders; using Dalamud.Game.Network.MarketBoardUploaders;
using Dalamud.Game.Network.Structures; using Dalamud.Game.Network.Structures;
using Dalamud.Game.Network.Universalis.MarketBoardUploaders; using Dalamud.Game.Network.Universalis.MarketBoardUploaders;
@ -32,11 +33,14 @@ namespace Dalamud.Game.Network {
this.uploader = new UniversalisMarketBoardUploader(dalamud); this.uploader = new UniversalisMarketBoardUploader(dalamud);
dalamud.Framework.Network.OnZonePacket += OnZonePacket; dalamud.Framework.Network.OnNetworkMessage += OnNetworkMessage;
} }
private void OnZonePacket(IntPtr dataPtr) { private void OnNetworkMessage(IntPtr dataPtr, NetworkMessageDirection direction) {
if (direction != NetworkMessageDirection.ZoneDown)
return;
if (!this.dalamud.Data.IsDataReady) if (!this.dalamud.Data.IsDataReady)
return; return;