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

Better.

Browse source
This commit is contained in:
Ottermandias 2022-10-08 19:06:09 +02:00
parent 8f93df533a
commit e226b20953
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Penumbra.Api

@ -1 +1 @@
Subproject commit 0064bb82be9729676e7bf3202ff1407283e6f088 Subproject commit 162985704fa4e020443bf18f88dd17dd702c2312

8
Penumbra/Api/PenumbraApi.cs
View file

@ -31,13 +31,13 @@ public class PenumbraApi : IDisposable, IPenumbraApi
public event Action< string >? PreSettingsPanelDraw; public event Action< string >? PreSettingsPanelDraw;
public event Action< string >? PostSettingsPanelDraw; public event Action< string >? PostSettingsPanelDraw;
public event GameObjectRedrawn? GameObjectRedrawn public event GameObjectRedrawnDelegate? GameObjectRedrawn
{ {
add => _penumbra!.ObjectReloader.GameObjectRedrawn += value; add => _penumbra!.ObjectReloader.GameObjectRedrawn += value;
remove => _penumbra!.ObjectReloader.GameObjectRedrawn -= value; remove => _penumbra!.ObjectReloader.GameObjectRedrawn -= value;
} }
public event ModSettingChanged? ModSettingChanged; public event ModSettingChangedDelegate? ModSettingChanged;
public event CreatingCharacterBaseDelegate? CreatingCharacterBase public event CreatingCharacterBaseDelegate? CreatingCharacterBase
{ {
@ -260,10 +260,10 @@ public class PenumbraApi : IDisposable, IPenumbraApi
return ( obj, collection.ModCollection.Name ); return ( obj, collection.ModCollection.Name );
} }
public int GetCutsceneParentIndex( int actor ) public int GetCutsceneParentIndex( int actorIdx )
{ {
CheckInitialized(); CheckInitialized();
return _penumbra!.PathResolver.CutsceneActor( actor ); return _penumbra!.PathResolver.CutsceneActor( actorIdx );
} }
public IList< (string, string) > GetModList() public IList< (string, string) > GetModList()

4
Penumbra/Api/PenumbraIpcProviders.cs
View file

@ -163,7 +163,6 @@ public class PenumbraIpcProviders : IDisposable
SetModPath = Ipc.SetModPath.Provider( pi, Api.SetModPath ); SetModPath = Ipc.SetModPath.Provider( pi, Api.SetModPath );
// ModSettings // ModSettings
GetAvailableModSettings = Ipc.GetAvailableModSettings.Provider( pi, Api.GetAvailableModSettings ); GetAvailableModSettings = Ipc.GetAvailableModSettings.Provider( pi, Api.GetAvailableModSettings );
GetCurrentModSettings = Ipc.GetCurrentModSettings.Provider( pi, Api.GetCurrentModSettings ); GetCurrentModSettings = Ipc.GetCurrentModSettings.Provider( pi, Api.GetCurrentModSettings );
TryInheritMod = Ipc.TryInheritMod.Provider( pi, Api.TryInheritMod ); TryInheritMod = Ipc.TryInheritMod.Provider( pi, Api.TryInheritMod );
@ -190,6 +189,8 @@ public class PenumbraIpcProviders : IDisposable
public void Dispose() public void Dispose()
{ {
Tester.Dispose();
// Plugin State // Plugin State
Initialized.Dispose(); Initialized.Dispose();
ApiVersion.Dispose(); ApiVersion.Dispose();
@ -268,7 +269,6 @@ public class PenumbraIpcProviders : IDisposable
Disposed.Invoke(); Disposed.Invoke();
Disposed.Dispose(); Disposed.Dispose();
Tester.Dispose();
} }
// Wrappers // Wrappers

2
Penumbra/Interop/ObjectReloader.cs
View file

@ -109,7 +109,7 @@ public sealed unsafe partial class ObjectReloader : IDisposable
private readonly List< int > _afterGPoseQueue = new(GPoseSlots); private readonly List< int > _afterGPoseQueue = new(GPoseSlots);
private int _target = -1; private int _target = -1;
public event GameObjectRedrawn? GameObjectRedrawn; public event GameObjectRedrawnDelegate? GameObjectRedrawn;
public ObjectReloader() public ObjectReloader()
=> Dalamud.Framework.Update += OnUpdateEvent; => Dalamud.Framework.Update += OnUpdateEvent;