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

Make Archon happy.

Browse source
This commit is contained in:
Ottermandias 2023-10-07 15:55:30 +02:00
parent 363d1619bc
commit 36d90e7a87
4 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Glamourer/Events/GPoseService.cs
View file

@ -5,7 +5,7 @@ using OtterGui.Classes;
namespace Glamourer.Events; namespace Glamourer.Events;
public class GPoseService : EventWrapper<Action<bool>, GPoseService.Priority> public sealed class GPoseService : EventWrapper<Action<bool>, GPoseService.Priority>
{ {
private readonly IFramework _framework; private readonly IFramework _framework;
private readonly IClientState _state; private readonly IClientState _state;
@ -30,11 +30,8 @@ public class GPoseService : EventWrapper<Action<bool>, GPoseService.Priority>
_framework.Update += OnFramework; _framework.Update += OnFramework;
} }
public new void Dispose() protected override void Dispose(bool _)
{ => _framework.Update -= OnFramework;
_framework.Update -= OnFramework;
base.Dispose();
}
public void AddActionOnLeave(Action onLeave) public void AddActionOnLeave(Action onLeave)
{ {

5
Glamourer/Interop/ChangeCustomizeService.cs
View file

@ -17,7 +17,7 @@ namespace Glamourer.Interop;
/// Changes in Race, body type or Gender are probably ignored. /// Changes in Race, body type or Gender are probably ignored.
/// This operates on draw objects, not game objects. /// This operates on draw objects, not game objects.
/// </summary> /// </summary>
public unsafe class ChangeCustomizeService : EventWrapper<Action<Model, Ref<Customize>>, ChangeCustomizeService.Priority>, IDisposable public unsafe class ChangeCustomizeService : EventWrapper<Action<Model, Ref<Customize>>, ChangeCustomizeService.Priority>
{ {
private readonly PenumbraReloaded _penumbraReloaded; private readonly PenumbraReloaded _penumbraReloaded;
private readonly IGameInteropProvider _interop; private readonly IGameInteropProvider _interop;
@ -40,9 +40,8 @@ public unsafe class ChangeCustomizeService : EventWrapper<Action<Model, Ref<Cust
_penumbraReloaded.Subscribe(Restore, PenumbraReloaded.Priority.ChangeCustomizeService); _penumbraReloaded.Subscribe(Restore, PenumbraReloaded.Priority.ChangeCustomizeService);
} }
public new void Dispose() protected override void Dispose(bool _)
{ {
base.Dispose();
_changeCustomizeHook.Dispose(); _changeCustomizeHook.Dispose();
_penumbraReloaded.Unsubscribe(Restore); _penumbraReloaded.Unsubscribe(Restore);
} }

1
Glamourer/Services/ServiceManager.cs
View file

@ -26,6 +26,7 @@ public static class ServiceManager
{ {
public static ServiceProvider CreateProvider(DalamudPluginInterface pi, Logger log) public static ServiceProvider CreateProvider(DalamudPluginInterface pi, Logger log)
{ {
EventWrapper.ChangeLogger(log);
var services = new ServiceCollection() var services = new ServiceCollection()
.AddSingleton(log) .AddSingleton(log)
.AddDalamud(pi) .AddDalamud(pi)

2
OtterGui

@ -1 +1 @@
Subproject commit 44ec7c38442dad765746abcc0dc838ad3936a0b7 Subproject commit 34042b15f2dfbb44eb60d3f43e382d3b752d177f