diff --git a/RetainerTrack/Handlers/ContentIdToName.cs b/RetainerTrack/Handlers/ContentIdToName.cs index c9fdc4d..048b1d7 100644 --- a/RetainerTrack/Handlers/ContentIdToName.cs +++ b/RetainerTrack/Handlers/ContentIdToName.cs @@ -8,7 +8,7 @@ namespace RetainerTrack.Handlers public ulong ContentId { get; init; } public string PlayerName { get; init; } = string.Empty; - public static unsafe ContentIdToName Read(nint dataPtr) + public static unsafe ContentIdToName ReadFromNetworkPacket(nint dataPtr) { using UnmanagedMemoryStream input = new UnmanagedMemoryStream((byte*)dataPtr.ToPointer(), 40); using BinaryReader binaryReader = new BinaryReader(input); diff --git a/RetainerTrack/Handlers/NetworkHandler.cs b/RetainerTrack/Handlers/NetworkHandler.cs index 80076aa..8b5968d 100644 --- a/RetainerTrack/Handlers/NetworkHandler.cs +++ b/RetainerTrack/Handlers/NetworkHandler.cs @@ -68,7 +68,7 @@ namespace RetainerTrack.Handlers } else if (opcode == _contentIdMappingOpCode) { - var mapping = ContentIdToName.Read(dataPtr); + var mapping = ContentIdToName.ReadFromNetworkPacket(dataPtr); _logger.LogTrace("Content id {ContentId} belongs to player '{Name}'", mapping.ContentId, !string.IsNullOrEmpty(mapping.PlayerName) ? mapping.PlayerName : ""); Task.Run(() => _persistenceContext.HandleContentIdMapping(mapping)); diff --git a/RetainerTrack/RetainerTrack.csproj b/RetainerTrack/RetainerTrack.csproj index dc508f3..7808664 100644 --- a/RetainerTrack/RetainerTrack.csproj +++ b/RetainerTrack/RetainerTrack.csproj @@ -10,14 +10,19 @@ false false true + true portable $(SolutionDir)=X:\ - - dist + + $(appdata)\XIVLauncher\addon\Hooks\dev\ + + $(DALAMUD_HOME)/ + + @@ -26,33 +31,32 @@ - - $(AppData)\XIVLauncher\addon\Hooks\dev\Dalamud.dll + $(DalamudLibPath)Dalamud.dll false - $(AppData)\XIVLauncher\addon\Hooks\dev\ImGui.NET.dll + $(DalamudLibPath)ImGui.NET.dll false - $(AppData)\XIVLauncher\addon\Hooks\dev\ImGuiScene.dll + $(DalamudLibPath)ImGuiScene.dll false - $(AppData)\XIVLauncher\addon\Hooks\dev\Lumina.dll + $(DalamudLibPath)Lumina.dll false - $(AppData)\XIVLauncher\addon\Hooks\dev\Lumina.Excel.dll + $(DalamudLibPath)Lumina.Excel.dll false - $(AppData)\XIVLauncher\addon\Hooks\dev\Newtonsoft.Json.dll + $(DalamudLibPath)Newtonsoft.Json.dll false - $(AppData)\XIVLauncher\addon\Hooks\dev\FFXIVClientStructs.dll + $(DalamudLibPath)FFXIVClientStructs.dll false diff --git a/RetainerTrack/packages.lock.json b/RetainerTrack/packages.lock.json new file mode 100644 index 0000000..400cfe9 --- /dev/null +++ b/RetainerTrack/packages.lock.json @@ -0,0 +1,73 @@ +{ + "version": 1, + "dependencies": { + "net7.0-windows7.0": { + "Dalamud.Extensions.MicrosoftLogging": { + "type": "Direct", + "requested": "[1.0.0, )", + "resolved": "1.0.0", + "contentHash": "tia8fRydfXFoig0eLdacomxDPCiE7IUzWwIq1A2x8CNmXJlebwJ7puzip7/GmnmRuf2TyQv/87wkiQoavVyEpw==", + "dependencies": { + "Microsoft.Extensions.Logging": "7.0.0" + } + }, + "DalamudPackager": { + "type": "Direct", + "requested": "[2.1.10, )", + "resolved": "2.1.10", + "contentHash": "S6NrvvOnLgT4GDdgwuKVJjbFo+8ZEj+JsEYk9ojjOR/MMfv1dIFpT8aRJQfI24rtDcw1uF+GnSSMN4WW1yt7fw==" + }, + "LiteDB": { + "type": "Direct", + "requested": "[5.0.15, )", + "resolved": "5.0.15", + "contentHash": "nucyfCOGSATH553BxplxExP3BOqEwmHt0B57426EIaQjD3CC1Odb52VVCGgTxyYaD2oe3B/cJk8jDo6XiBJqPg==" + }, + "Microsoft.Extensions.DependencyInjection": { + "type": "Direct", + "requested": "[7.0.0, )", + "resolved": "7.0.0", + "contentHash": "elNeOmkeX3eDVG6pYVeV82p29hr+UKDaBhrZyWvWLw/EVZSYEkZlQdkp0V39k/Xehs2Qa0mvoCvkVj3eQxNQ1Q==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "h3j/QfmFN4S0w4C2A6X7arXij/M/OVw3uQHSOFxnND4DyAzO1F9eMX7Eti7lU/OkSthEE0WzRsfT/Dmx86jzCw==" + }, + "Microsoft.Extensions.Logging": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "Nw2muoNrOG5U5qa2ZekXwudUn2BJcD41e65zwmDHb1fQegTX66UokLWZkJRpqSSHXDOWZ5V0iqhbxOEky91atA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection": "7.0.0", + "Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0", + "Microsoft.Extensions.Logging.Abstractions": "7.0.0", + "Microsoft.Extensions.Options": "7.0.0" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "kmn78+LPVMOWeITUjIlfxUPDsI0R6G0RkeAMBmQxAJ7vBJn4q2dTva7pWi65ceN5vPGjJ9q/Uae2WKgvfktJAw==" + }, + "Microsoft.Extensions.Options": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "lP1yBnTTU42cKpMozuafbvNtQ7QcBjr/CcK3bYOGEMH55Fjt+iecXjT6chR7vbgCMqy3PG3aNQSZgo/EuY/9qQ==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0", + "Microsoft.Extensions.Primitives": "7.0.0" + } + }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "7.0.0", + "contentHash": "um1KU5kxcRp3CNuI8o/GrZtD4AIOXDk+RLsytjZ9QPok3ttLUelLKpilVPuaFT3TFjOhSibUAso0odbOaCDj3Q==" + } + }, + "net7.0-windows7.0/win-x64": {} + } +} \ No newline at end of file