ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2026-02-23 08:17:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Some cleanup

Browse source
This commit is contained in:
Ottermandias 2024-06-17 16:39:10 +02:00
parent 91d9e465ed
commit be729afd4b
6 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Penumbra/Collections/Cache/ImcCache.cs
View file

@ -1,5 +1,3 @@
using FFXIVClientStructs.FFXIV.Client.Graphics.Render;
using Penumbra.Collections.Manager;
using Penumbra.GameData.Structs; using Penumbra.GameData.Structs;
using Penumbra.Interop.PathResolving; using Penumbra.Interop.PathResolving;
using Penumbra.Meta; using Penumbra.Meta;

3
Penumbra/Communication/CreatingCharacterBase.cs
View file

@ -1,5 +1,4 @@
using OtterGui.Classes; using OtterGui.Classes;
using Penumbra.Api;
using Penumbra.Api.Api; using Penumbra.Api.Api;
using Penumbra.Services; using Penumbra.Services;
@ -19,7 +18,7 @@ public sealed class CreatingCharacterBase()
{ {
public enum Priority public enum Priority
{ {
/// <seealso cref="PenumbraApi.CreatingCharacterBase"/> /// <seealso cref="GameStateApi.CreatingCharacterBase"/>
Api = 0, Api = 0,
/// <seealso cref="CrashHandlerService.OnCreatingCharacterBase"/> /// <seealso cref="CrashHandlerService.OnCreatingCharacterBase"/>

2
Penumbra/Interop/Hooks/Meta/EqdpAccessoryHook.cs
View file

@ -24,7 +24,7 @@ public unsafe class EqdpAccessoryHook : FastHook<EqdpAccessoryHook.Delegate>
if (_metaState.EqdpCollection.TryPeek(out var collection) if (_metaState.EqdpCollection.TryPeek(out var collection)
&& collection is { Valid: true, ModCollection.MetaCache: { } cache }) && collection is { Valid: true, ModCollection.MetaCache: { } cache })
*entry = cache.Eqdp.ApplyFullEntry(new PrimaryId((ushort)setId), (GenderRace)raceCode, true, *entry); *entry = cache.Eqdp.ApplyFullEntry(new PrimaryId((ushort)setId), (GenderRace)raceCode, true, *entry);
Penumbra.Log.Information( Penumbra.Log.Excessive(
$"[GetEqdpAccessoryEntry] Invoked on 0x{(ulong)utility:X} with {setId}, {(GenderRace)raceCode}, returned {(ushort)*entry:B10}."); $"[GetEqdpAccessoryEntry] Invoked on 0x{(ulong)utility:X} with {setId}, {(GenderRace)raceCode}, returned {(ushort)*entry:B10}.");
} }
} }

2
Penumbra/Interop/Hooks/Meta/EqdpEquipHook.cs
View file

@ -24,7 +24,7 @@ public unsafe class EqdpEquipHook : FastHook<EqdpEquipHook.Delegate>
if (_metaState.EqdpCollection.TryPeek(out var collection) if (_metaState.EqdpCollection.TryPeek(out var collection)
&& collection is { Valid: true, ModCollection.MetaCache: { } cache }) && collection is { Valid: true, ModCollection.MetaCache: { } cache })
*entry = cache.Eqdp.ApplyFullEntry(new PrimaryId((ushort)setId), (GenderRace)raceCode, false, *entry); *entry = cache.Eqdp.ApplyFullEntry(new PrimaryId((ushort)setId), (GenderRace)raceCode, false, *entry);
Penumbra.Log.Information( Penumbra.Log.Excessive(
$"[GetEqdpEquipEntry] Invoked on 0x{(ulong)utility:X} with {setId}, {(GenderRace)raceCode}, returned {(ushort)*entry:B10}."); $"[GetEqdpEquipEntry] Invoked on 0x{(ulong)utility:X} with {setId}, {(GenderRace)raceCode}, returned {(ushort)*entry:B10}.");
} }
} }

2
Penumbra/Interop/Hooks/Meta/RspBustHook.cs
View file

@ -59,7 +59,7 @@ public unsafe class RspBustHook : FastHook<RspBustHook.Delegate>
ret = Task.Result.Original(cmpResource, storage, race, gender, isSecondSubRace, bodyType, bustSize); ret = Task.Result.Original(cmpResource, storage, race, gender, isSecondSubRace, bodyType, bustSize);
} }
Penumbra.Log.Information( Penumbra.Log.Excessive(
$"[GetRspBust] Invoked on 0x{cmpResource:X} with {race}, {(Gender)(gender + 1)}, {isSecondSubRace == 1}, {bodyType}, {bustSize}, returned {storage[0]}, {storage[1]}, {storage[2]}."); $"[GetRspBust] Invoked on 0x{cmpResource:X} with {race}, {(Gender)(gender + 1)}, {isSecondSubRace == 1}, {bodyType}, {bustSize}, returned {storage[0]}, {storage[1]}, {storage[2]}.");
return ret; return ret;
} }

2
Penumbra/Mods/Manager/ModManager.cs
View file

@ -261,7 +261,7 @@ public sealed class ModManager : ModStorage, IDisposable
/// <summary> /// <summary>
/// Set the mod base directory. /// Set the mod base directory.
/// If its not the first time, check if it is the same directory as before. /// If it's not the first time, check if it is the same directory as before.
/// Also checks if the directory is available and tries to create it if it is not. /// Also checks if the directory is available and tries to create it if it is not.
/// </summary> /// </summary>
private void SetBaseDirectory(string newPath, bool firstTime, out string resultNewDir) private void SetBaseDirectory(string newPath, bool firstTime, out string resultNewDir)