Compare commits

..

No commits in common. "3eabe591dfb3e46b02e699f6e6381936961f3fb3" and "4d4e4669dd30ca0e5029972bb70f7da6a13d4f6a" have entirely different histories.

4 changed files with 7 additions and 7 deletions

View file

@ -51,7 +51,7 @@ public class PenumbraService : IDisposable
private readonly EventSubscriber<nint, Guid, nint> _createdCharacterBase;
private readonly EventSubscriber<ModSettingChange, Guid, string, bool> _modSettingChanged;
private readonly EventSubscriber<JObject, string, Guid> _pcpParsed;
private readonly EventSubscriber<JObject, ushort, string> _pcpCreated;
private readonly EventSubscriber<JObject, ushort> _pcpCreated;
private global::Penumbra.Api.IpcSubscribers.GetCollectionsByIdentifier? _collectionByIdentifier;
private global::Penumbra.Api.IpcSubscribers.GetCollections? _collections;
@ -140,7 +140,7 @@ public class PenumbraService : IDisposable
remove => _modSettingChanged.Event -= value;
}
public event Action<JObject, ushort, string> PcpCreated
public event Action<JObject, ushort> PcpCreated
{
add => _pcpCreated.Event += value;
remove => _pcpCreated.Event -= value;

View file

@ -96,7 +96,7 @@ public class PcpService : IRequiredService
}
}
private void OnPcpCreation(JObject jObj, ushort index, string path)
private void OnPcpCreation(JObject jObj, ushort index)
{
Glamourer.Log.Debug("[PCPService] Adding Glamourer data to PCP file.");
var actorIdentifier = _objects.Actors.FromJson(jObj["Actor"] as JObject);
@ -110,7 +110,7 @@ public class PcpService : IRequiredService
}
var design = _designConverter.Convert(state, ApplicationRules.All);
jObj["Glamourer"] = new JObject
jObj["Glamourer"] = new JObject()
{
["Version"] = 1,
["Design"] = design.JsonSerialize(),

@ -1 +1 @@
Subproject commit 297941bc22300f4a8368f4d0177f62943eb69727
Subproject commit 0a970295b2398683b1e49c46fd613541e2486210

View file

@ -18,7 +18,7 @@
],
"InternalName": "Glamourer",
"AssemblyVersion": "1.5.0.7",
"TestingAssemblyVersion": "1.5.0.9",
"TestingAssemblyVersion": "1.5.0.8",
"RepoUrl": "https://github.com/Ottermandias/Glamourer",
"ApplicableVersion": "any",
"DalamudApiLevel": 13,
@ -29,7 +29,7 @@
"LastUpdate": 1618608322,
"DownloadLinkInstall": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.0.7/Glamourer.zip",
"DownloadLinkUpdate": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.0.7/Glamourer.zip",
"DownloadLinkTesting": "https://github.com/Ottermandias/Glamourer/releases/download/testing_1.5.0.9/Glamourer.zip",
"DownloadLinkTesting": "https://github.com/Ottermandias/Glamourer/releases/download/testing_1.5.0.8/Glamourer.zip",
"IconUrl": "https://raw.githubusercontent.com/Ottermandias/Glamourer/main/images/icon.png"
}
]