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

Merge branch 'mtrl-preview-extension'

Browse source
This commit is contained in:
Ottermandias 2023-09-21 02:16:22 +02:00
commit 2c0650614f
42 changed files with 155 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Penumbra.GameData

@ -1 +1 @@
Subproject commit 7c483764678c6edb5efd55f056aeaecae144d5fe
Subproject commit ef403be979bfac5ef805030ce76066151d36f112

11
Penumbra/Api/IpcTester.cs
View file

@ -4,7 +4,6 @@ using ImGuiNET;
using OtterGui;
using OtterGui.Raii;
using Penumbra.Mods;
using System.Globalization;
using Dalamud.Utility;
using Penumbra.Api.Enums;
using Penumbra.Api.Helpers;
@ -17,7 +16,7 @@ using Penumbra.UI;
using Penumbra.Collections.Manager;
using Dalamud.Plugin.Services;
using Penumbra.GameData.Enums;
using System.Diagnostics;
using Penumbra.GameData.Structs;
namespace Penumbra.Api;
@ -1450,7 +1449,7 @@ public class IpcTester : IDisposable
_lastCallDuration = _stopwatch.Elapsed;
_lastGameObjectResourcePaths = gameObjects
.Select(GameObjectToString)
.Select(i => GameObjectToString(i))
.Zip(resourcePaths)
.ToArray();
@ -1482,7 +1481,7 @@ public class IpcTester : IDisposable
_lastCallDuration = _stopwatch.Elapsed;
_lastGameObjectResourcesOfType = gameObjects
.Select(GameObjectToString)
.Select(i => GameObjectToString(i))
.Zip(resourcesOfType)
.ToArray();
@ -1630,9 +1629,9 @@ public class IpcTester : IDisposable
.SelectWhere(index => (ushort.TryParse(index.Trim(), out var i), i))
.ToArray();
private unsafe string GameObjectToString(ushort gameObjectIndex)
private unsafe string GameObjectToString(ObjectIndex gameObjectIndex)
{
var gameObject = _objects[gameObjectIndex];
var gameObject = _objects[gameObjectIndex.Index];
return gameObject != null
? $"[{gameObjectIndex}] {gameObject.Name} ({gameObject.ObjectKind})"

1
Penumbra/Api/PenumbraApi.cs
View file

@ -7,7 +7,6 @@ using Penumbra.Interop.PathResolving;
using Penumbra.Interop.Structs;
using Penumbra.Meta.Manipulations;
using Penumbra.Mods;
using System.Diagnostics.CodeAnalysis;
using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
using OtterGui.Compression;
using Penumbra.Api.Enums;

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

@ -1,4 +1,3 @@
using System.Diagnostics.CodeAnalysis;
using Penumbra.Meta;
using Penumbra.Meta.Files;
using Penumbra.Meta.Manipulations;

1
Penumbra/Collections/Cache/MetaCache.cs
View file

@ -1,4 +1,3 @@
using System.Diagnostics.CodeAnalysis;
using Penumbra.GameData.Enums;
using Penumbra.Interop.Services;
using Penumbra.Interop.Structs;

1
Penumbra/Collections/Manager/CollectionStorage.cs
View file

@ -1,4 +1,3 @@
using System.Diagnostics.CodeAnalysis;
using Dalamud.Interface.Internal.Notifications;
using OtterGui;
using OtterGui.Filesystem;

1
Penumbra/Collections/Manager/IndividualCollections.Access.cs
View file

@ -1,4 +1,3 @@
using System.Diagnostics.CodeAnalysis;
using Dalamud.Game.ClientState.Objects.Enums;
using Dalamud.Game.ClientState.Objects.Types;
using Penumbra.GameData.Actors;

1
Penumbra/Collections/Manager/IndividualCollections.cs
View file

@ -1,4 +1,3 @@
using System.Diagnostics.CodeAnalysis;
using Dalamud.Game.ClientState.Objects.Enums;
using OtterGui.Filesystem;
using Penumbra.GameData.Actors;

1
Penumbra/Collections/Manager/TempCollectionManager.cs
View file

@ -1,4 +1,3 @@
using System.Diagnostics.CodeAnalysis;
using Penumbra.Api;
using Penumbra.Communication;
using Penumbra.GameData.Actors;

1
Penumbra/Collections/ModCollection.Cache.Access.cs
View file

@ -1,7 +1,6 @@
using OtterGui.Classes;
using Penumbra.GameData.Enums;
using Penumbra.Mods;
using System.Diagnostics.CodeAnalysis;
using Penumbra.Interop.Structs;
using Penumbra.Meta.Files;
using Penumbra.Meta.Manipulations;

5
Penumbra/GlobalUsings.cs
View file

@ -5,12 +5,17 @@ global using System.Collections;
global using System.Collections.Concurrent;
global using System.Collections.Generic;
global using System.Diagnostics;
global using System.Diagnostics.CodeAnalysis;
global using System.Globalization;
global using System.IO;
global using System.IO.Compression;
global using System.Linq;
global using System.Numerics;
global using System.Reflection;
global using System.Runtime.CompilerServices;
global using System.Runtime.InteropServices;
global using System.Security.Cryptography;
global using System.Text;
global using System.Text.RegularExpressions;
global using System.Threading;
global using System.Threading.Tasks;

1
Penumbra/Import/Structs/MetaFileInfo.cs
View file

@ -1,5 +1,4 @@
using Penumbra.GameData.Enums;
using System.Text.RegularExpressions;
using Penumbra.GameData;
namespace Penumbra.Import.Structs;

2
Penumbra/Import/TexToolsImport.cs
View file

@ -1,8 +1,6 @@
using System.Text;
using Newtonsoft.Json;
using OtterGui.Compression;
using Penumbra.Import.Structs;
using Penumbra.Mods;
using Penumbra.Mods.Editor;
using Penumbra.Mods.Manager;
using FileMode = System.IO.FileMode;

2
Penumbra/Import/TexToolsImporter.Archives.cs
View file

@ -7,9 +7,9 @@ using Penumbra.Mods;
using SharpCompress.Archives;
using SharpCompress.Archives.Rar;
using SharpCompress.Archives.SevenZip;
using SharpCompress.Archives.Zip;
using SharpCompress.Common;
using SharpCompress.Readers;
using ZipArchive = SharpCompress.Archives.Zip.ZipArchive;
namespace Penumbra.Import;

2
Penumbra/Import/TexToolsImporter.ModPack.cs
View file

@ -4,7 +4,7 @@ using Penumbra.Import.Structs;
using Penumbra.Mods;
using Penumbra.Mods.Subclasses;
using Penumbra.Util;
using SharpCompress.Archives.Zip;
using ZipArchive = SharpCompress.Archives.Zip.ZipArchive;
namespace Penumbra.Import;

1
Penumbra/Import/TexToolsMeta.Export.cs
View file

@ -1,4 +1,3 @@
using System.Text;
using Penumbra.GameData.Enums;
using Penumbra.GameData.Structs;
using Penumbra.Meta;

1
Penumbra/Import/TexToolsMeta.cs
View file

@ -1,4 +1,3 @@
using System.Text;
using Penumbra.GameData;
using Penumbra.Import.Structs;
using Penumbra.Meta;

88
Penumbra/Interop/MaterialPreview/MaterialInfo.cs
View file

@ -2,6 +2,7 @@ using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.Game.Character;
using FFXIVClientStructs.FFXIV.Client.Graphics.Render;
using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
using Penumbra.GameData.Structs;
using Penumbra.Interop.ResourceTree;
using Penumbra.String;
@ -9,41 +10,20 @@ namespace Penumbra.Interop.MaterialPreview;
public enum DrawObjectType
{
PlayerCharacter,
PlayerMainhand,
PlayerOffhand,
PlayerVfx,
MinionCharacter,
MinionUnk1,
MinionUnk2,
MinionUnk3,
Character,
Mainhand,
Offhand,
Vfx,
};
public readonly record struct MaterialInfo(DrawObjectType Type, int ModelSlot, int MaterialSlot)
public readonly record struct MaterialInfo(ObjectIndex ObjectIndex, DrawObjectType Type, int ModelSlot, int MaterialSlot)
{
public nint GetCharacter(IObjectTable objects)
=> GetCharacter(Type, objects);
public static nint GetCharacter(DrawObjectType type, IObjectTable objects)
=> type switch
{
DrawObjectType.PlayerCharacter => objects.GetObjectAddress(0),
DrawObjectType.PlayerMainhand => objects.GetObjectAddress(0),
DrawObjectType.PlayerOffhand => objects.GetObjectAddress(0),
DrawObjectType.PlayerVfx => objects.GetObjectAddress(0),
DrawObjectType.MinionCharacter => objects.GetObjectAddress(1),
DrawObjectType.MinionUnk1 => objects.GetObjectAddress(1),
DrawObjectType.MinionUnk2 => objects.GetObjectAddress(1),
DrawObjectType.MinionUnk3 => objects.GetObjectAddress(1),
_ => nint.Zero,
};
=> objects.GetObjectAddress(ObjectIndex.Index);
public nint GetDrawObject(nint address)
=> GetDrawObject(Type, address);
public static nint GetDrawObject(DrawObjectType type, IObjectTable objects)
=> GetDrawObject(type, GetCharacter(type, objects));
public static unsafe nint GetDrawObject(DrawObjectType type, nint address)
{
var gameObject = (Character*)address;
@ -52,18 +32,17 @@ public readonly record struct MaterialInfo(DrawObjectType Type, int ModelSlot, i
return type switch
{
DrawObjectType.PlayerCharacter => (nint)gameObject->GameObject.GetDrawObject(),
DrawObjectType.PlayerMainhand => *((nint*)&gameObject->DrawData.MainHand + 1),
DrawObjectType.PlayerOffhand => *((nint*)&gameObject->DrawData.OffHand + 1),
DrawObjectType.PlayerVfx => *((nint*)&gameObject->DrawData.UnkF0 + 1),
DrawObjectType.MinionCharacter => (nint)gameObject->GameObject.GetDrawObject(),
DrawObjectType.MinionUnk1 => *((nint*)&gameObject->DrawData.MainHand + 1),
DrawObjectType.MinionUnk2 => *((nint*)&gameObject->DrawData.OffHand + 1),
DrawObjectType.MinionUnk3 => *((nint*)&gameObject->DrawData.UnkF0 + 1),
_ => nint.Zero,
DrawObjectType.Character => (nint)gameObject->GameObject.GetDrawObject(),
DrawObjectType.Mainhand => *((nint*)&gameObject->DrawData.MainHand + 1),
DrawObjectType.Offhand => *((nint*)&gameObject->DrawData.OffHand + 1),
DrawObjectType.Vfx => *((nint*)&gameObject->DrawData.UnkF0 + 1),
_ => nint.Zero,
};
}
public unsafe Material* GetDrawObjectMaterial(IObjectTable objects)
=> GetDrawObjectMaterial((CharacterBase*)GetDrawObject(GetCharacter(objects)));
public unsafe Material* GetDrawObjectMaterial(CharacterBase* drawObject)
{
if (drawObject == null)
@ -82,33 +61,42 @@ public readonly record struct MaterialInfo(DrawObjectType Type, int ModelSlot, i
return model->Materials[MaterialSlot];
}
public static unsafe List<MaterialInfo> FindMaterials(IObjectTable objects, string materialPath)
public static unsafe List<MaterialInfo> FindMaterials(IEnumerable<nint> gameObjects, string materialPath)
{
var needle = ByteString.FromString(materialPath.Replace('\\', '/'), out var m, true) ? m : ByteString.Empty;
var result = new List<MaterialInfo>(Enum.GetValues<DrawObjectType>().Length);
foreach (var type in Enum.GetValues<DrawObjectType>())
foreach (var objectPtr in gameObjects)
{
var drawObject = (CharacterBase*)GetDrawObject(type, objects);
if (drawObject == null)
var gameObject = (Character*)objectPtr;
if (gameObject == null)
continue;
for (var i = 0; i < drawObject->SlotCount; ++i)
var index = (ObjectIndex) gameObject->GameObject.ObjectIndex;
foreach (var type in Enum.GetValues<DrawObjectType>())
{
var model = drawObject->Models[i];
if (model == null)
var drawObject = (CharacterBase*)GetDrawObject(type, objectPtr);
if (drawObject == null)
continue;
for (var j = 0; j < model->MaterialCount; ++j)
for (var i = 0; i < drawObject->SlotCount; ++i)
{
var material = model->Materials[j];
if (material == null)
var model = drawObject->Models[i];
if (model == null)
continue;
var mtrlHandle = material->MaterialResourceHandle;
var path = ResolveContext.GetResourceHandlePath((Structs.ResourceHandle*)mtrlHandle);
if (path == needle)
result.Add(new MaterialInfo(type, i, j));
for (var j = 0; j < model->MaterialCount; ++j)
{
var material = model->Materials[j];
if (material == null)
continue;
var mtrlHandle = material->MaterialResourceHandle;
var path = ResolveContext.GetResourceHandlePath((Structs.ResourceHandle*)mtrlHandle);
if (path == needle)
result.Add(new MaterialInfo(index, type, i, j));
}
}
}
}

1
Penumbra/Interop/PathResolving/PathResolver.cs
View file

@ -1,4 +1,3 @@
using System.Diagnostics.CodeAnalysis;
using FFXIVClientStructs.FFXIV.Client.System.Resource;
using Penumbra.Api.Enums;
using Penumbra.Collections;

1
Penumbra/Interop/ResourceLoading/CreateFileWHook.cs
View file

@ -1,4 +1,3 @@
using System.Text;
using Dalamud.Hooking;
using Penumbra.String;
using Penumbra.String.Classes;

44
Penumbra/Interop/ResourceTree/ResourceTreeFactory.cs
View file

@ -30,21 +30,20 @@ public class ResourceTreeFactory
_actors = actors;
}
private TreeBuildCache CreateTreeBuildCache(bool withCharacters)
=> new(_objects, _gameData, _actors, withCharacters);
private TreeBuildCache CreateTreeBuildCache()
=> new(_objects, _gameData, _actors);
public IEnumerable<Dalamud.Game.ClientState.Objects.Types.Character> GetLocalPlayerRelatedCharacters()
{
var cache = CreateTreeBuildCache(true);
return cache.Characters.Where(cache.IsLocalPlayerRelated);
var cache = CreateTreeBuildCache();
return cache.GetLocalPlayerRelatedCharacters();
}
public IEnumerable<(Dalamud.Game.ClientState.Objects.Types.Character Character, ResourceTree ResourceTree)> FromObjectTable(
Flags flags)
{
var cache = CreateTreeBuildCache(true);
var characters = (flags & Flags.LocalPlayerRelatedOnly) != 0 ? cache.Characters.Where(cache.IsLocalPlayerRelated) : cache.Characters;
var cache = CreateTreeBuildCache();
var characters = (flags & Flags.LocalPlayerRelatedOnly) != 0 ? cache.GetLocalPlayerRelatedCharacters() : cache.GetCharacters();
foreach (var character in characters)
{
@ -57,7 +56,7 @@ public class ResourceTreeFactory
public IEnumerable<(Dalamud.Game.ClientState.Objects.Types.Character Character, ResourceTree ResourceTree)> FromCharacters(
IEnumerable<Dalamud.Game.ClientState.Objects.Types.Character> characters, Flags flags)
{
var cache = CreateTreeBuildCache((flags & Flags.WithOwnership) != 0);
var cache = CreateTreeBuildCache();
foreach (var character in characters)
{
var tree = FromCharacter(character, cache, flags);
@ -67,7 +66,7 @@ public class ResourceTreeFactory
}
public ResourceTree? FromCharacter(Dalamud.Game.ClientState.Objects.Types.Character character, Flags flags)
=> FromCharacter(character, CreateTreeBuildCache((flags & Flags.WithOwnership) != 0), flags);
=> FromCharacter(character, CreateTreeBuildCache(), flags);
private unsafe ResourceTree? FromCharacter(Dalamud.Game.ClientState.Objects.Types.Character character, TreeBuildCache cache, Flags flags)
{
@ -216,27 +215,22 @@ public class ResourceTreeFactory
private unsafe (string Name, bool PlayerRelated) GetCharacterName(Dalamud.Game.ClientState.Objects.Types.Character character,
TreeBuildCache cache)
{
var identifier = _actors.AwaitedService.FromObject((GameObject*)character.Address, out var owner, true, false, false);
string name;
bool playerRelated;
var identifier = _actors.AwaitedService.FromObject((GameObject*)character.Address, out var owner, true, false, false);
switch (identifier.Type)
{
case IdentifierType.Player:
name = identifier.PlayerName.ToString();
playerRelated = true;
break;
case IdentifierType.Owned when cache.CharactersById.TryGetValue(owner->ObjectID, out var ownerChara):
var ownerName = GetCharacterName(ownerChara, cache);
name = $"[{ownerName.Name}] {character.Name} ({identifier.Kind.ToName()})";
playerRelated = ownerName.PlayerRelated;
break;
default:
name = $"{character.Name} ({identifier.Kind.ToName()})";
playerRelated = false;
case IdentifierType.Player: return (identifier.PlayerName.ToString(), true);
case IdentifierType.Owned:
var ownerChara = _objects.CreateObjectReference((nint)owner) as Dalamud.Game.ClientState.Objects.Types.Character;
if (ownerChara != null)
{
var ownerName = GetCharacterName(ownerChara, cache);
return ($"[{ownerName.Name}] {character.Name} ({identifier.Kind.ToName()})", ownerName.PlayerRelated);
}
break;
}
return (name, playerRelated);
return ($"{character.Name} ({identifier.Kind.ToName()})", false);
}
[Flags]

106
Penumbra/Interop/ResourceTree/TreeBuildCache.cs
View file

@ -1,55 +1,103 @@
using Dalamud.Game.ClientState.Objects.Types;
using Dalamud.Plugin.Services;
using Penumbra.GameData.Actors;
using Penumbra.GameData.Files;
using Penumbra.Interop.Services;
using Penumbra.GameData.Structs;
using Penumbra.Services;
using Penumbra.String;
using Penumbra.String.Classes;
namespace Penumbra.Interop.ResourceTree;
internal class TreeBuildCache
internal readonly struct TreeBuildCache
{
private readonly IDataManager _dataManager;
private readonly ActorService _actors;
private readonly Dictionary<FullPath, ShpkFile?> _shaderPackages = new();
private readonly uint _localPlayerId;
public readonly List<Character> Characters;
public readonly Dictionary<uint, Character> CharactersById;
private readonly IObjectTable _objects;
public TreeBuildCache(IObjectTable objects, IDataManager dataManager, ActorService actors, bool withCharacters)
public TreeBuildCache(IObjectTable objects, IDataManager dataManager, ActorService actors)
{
_dataManager = dataManager;
_actors = actors;
_localPlayerId = objects[0]?.ObjectId ?? GameObject.InvalidGameObjectId;
if (withCharacters)
{
Characters = objects.OfType<Character>().Where(ch => ch.IsValid()).ToList();
CharactersById = Characters
.Where(c => c.ObjectId != GameObject.InvalidGameObjectId)
.GroupBy(c => c.ObjectId)
.ToDictionary(c => c.Key, c => c.First());
}
else
{
Characters = new();
CharactersById = new();
}
_dataManager = dataManager;
_objects = objects;
_actors = actors;
}
public unsafe bool IsLocalPlayerRelated(Character character)
{
if (_localPlayerId == GameObject.InvalidGameObjectId)
var player = _objects[0];
if (player == null)
return false;
// Index 0 is the local player, index 1 is the mount/minion/accessory.
if (character.ObjectIndex < 2 || character.ObjectIndex == RedrawService.GPosePlayerIdx)
return true;
var gameObject = (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)character.Address;
var parent = _actors.AwaitedService.ToCutsceneParent(gameObject->ObjectIndex);
var actualIndex = parent >= 0 ? (ushort)parent : gameObject->ObjectIndex;
return actualIndex switch
{
< 2 => true,
< (int)ScreenActor.CutsceneStart => gameObject->OwnerID == player.ObjectId,
_ => false,
};
}
if (!_actors.AwaitedService.FromObject(character, out var owner, true, false, false).IsValid)
public IEnumerable<Character> GetCharacters()
=> _objects.OfType<Character>();
public IEnumerable<Character> GetLocalPlayerRelatedCharacters()
{
var player = _objects[0];
if (player == null)
yield break;
yield return (Character)player;
var minion = _objects[1];
if (minion != null)
yield return (Character)minion;
var playerId = player.ObjectId;
for (var i = 2; i < ObjectIndex.CutsceneStart.Index; i += 2)
{
if (_objects[i] is Character owned && owned.OwnerId == playerId)
yield return owned;
}
for (var i = ObjectIndex.CutsceneStart.Index; i < ObjectIndex.CharacterScreen.Index; ++i)
{
var character = _objects[i] as Character;
if (character == null)
continue;
var parent = _actors.AwaitedService.ToCutsceneParent(i);
if (parent < 0)
continue;
if (parent is 0 or 1 || _objects[parent]?.OwnerId == playerId)
yield return character;
}
}
private unsafe ByteString GetPlayerName(GameObject player)
{
var gameObject = (FFXIVClientStructs.FFXIV.Client.Game.Object.GameObject*)player.Address;
return new ByteString(gameObject->Name);
}
private unsafe bool GetOwnedId(ByteString playerName, uint playerId, int idx, [NotNullWhen(true)] out Character? character)
{
character = _objects[idx] as Character;
if (character == null)
return false;
// Check for SMN/SCH pet, chocobo and other owned NPCs.
return owner != null && owner->ObjectID == _localPlayerId;
var actorId = _actors.AwaitedService.FromObject(character, out var owner, true, true, true);
if (!actorId.IsValid)
return false;
if (owner != null && owner->OwnerID != playerId)
return false;
if (actorId.Type is not IdentifierType.Player || !actorId.PlayerName.Equals(playerName))
return false;
return true;
}
/// <summary> Try to read a shpk file from the given path and cache it on success. </summary>

1
Penumbra/Mods/Editor/FileRegistry.cs
View file

@ -1,4 +1,3 @@
using System.Diagnostics.CodeAnalysis;
using Penumbra.Mods.Subclasses;
using Penumbra.String.Classes;

2
Penumbra/Mods/Editor/MdlMaterialEditor.cs
View file

@ -1,5 +1,3 @@
using System.Text;
using System.Text.RegularExpressions;
using OtterGui;
using OtterGui.Compression;
using Penumbra.GameData.Enums;

1
Penumbra/Mods/Editor/ModBackup.cs
View file

@ -1,4 +1,3 @@
using System.IO.Compression;
using OtterGui.Tasks;
using Penumbra.Mods.Manager;

2
Penumbra/Mods/ItemSwap/ItemSwap.cs
View file

@ -1,5 +1,3 @@
using System.Diagnostics.CodeAnalysis;
using System.Text.RegularExpressions;
using Penumbra.Api.Enums;
using Penumbra.GameData.Data;
using Penumbra.GameData.Enums;

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

@ -1,5 +1,3 @@
using System.Diagnostics.CodeAnalysis;
using System.Text.RegularExpressions;
using Newtonsoft.Json.Linq;
using OtterGui.Classes;
using OtterGui.Filesystem;

1
Penumbra/Mods/Manager/ModImportManager.cs
View file

@ -1,4 +1,3 @@
using System.Diagnostics.CodeAnalysis;
using Dalamud.Interface.Internal.Notifications;
using Penumbra.Import;
using Penumbra.Mods.Editor;

1
Penumbra/Mods/Manager/ModMigration.cs
View file

@ -1,4 +1,3 @@
using System.Text.RegularExpressions;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using OtterGui;

1
Penumbra/Mods/Manager/ModStorage.cs
View file

@ -1,4 +1,3 @@
using System.Diagnostics.CodeAnalysis;
using OtterGui.Classes;
using OtterGui.Widgets;

2
Penumbra/Mods/ModCreator.cs
View file

@ -1,5 +1,3 @@
using System.Text;
using System.Text.RegularExpressions;
using Dalamud.Interface.Internal.Notifications;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;

1
Penumbra/Penumbra.cs
View file

@ -1,4 +1,3 @@
using System.Text;
using Dalamud.Plugin;
using ImGuiNET;
using Lumina.Excel.GeneratedSheets;

1
Penumbra/UI/AdvancedWindow/ModEditWindow.Materials.ConstantEditor.cs
View file

@ -1,4 +1,3 @@
using System.Globalization;
using ImGuiNET;
using OtterGui.Raii;
using OtterGui;

5
Penumbra/UI/AdvancedWindow/ModEditWindow.Materials.MtrlTab.cs
View file

@ -454,13 +454,12 @@ public partial class ModEditWindow
{
UnbindFromMaterialInstances();
var instances = MaterialInfo.FindMaterials(_edit._dalamud.Objects, FilePath);
var instances = MaterialInfo.FindMaterials(_edit._resourceTreeFactory.GetLocalPlayerRelatedCharacters().Select(ch => ch.Address), FilePath);
var foundMaterials = new HashSet<nint>();
foreach (var materialInfo in instances)
{
var drawObject = (CharacterBase*)MaterialInfo.GetDrawObject(materialInfo.Type, _edit._dalamud.Objects);
var material = materialInfo.GetDrawObjectMaterial(drawObject);
var material = materialInfo.GetDrawObjectMaterial(_edit._dalamud.Objects);
if (foundMaterials.Contains((nint)material))
continue;

1
Penumbra/UI/AdvancedWindow/ModEditWindow.Materials.Shpk.cs
View file

@ -1,4 +1,3 @@
using System.Text;
using Dalamud.Interface;
using ImGuiNET;
using OtterGui;

1
Penumbra/UI/AdvancedWindow/ModEditWindow.Models.cs
View file

@ -3,7 +3,6 @@ using OtterGui;
using OtterGui.Raii;
using Penumbra.GameData.Files;
using Penumbra.String.Classes;
using System.Globalization;
namespace Penumbra.UI.AdvancedWindow;

1
Penumbra/UI/AdvancedWindow/ModEditWindow.QuickImport.cs
View file

@ -14,6 +14,7 @@ namespace Penumbra.UI.AdvancedWindow;
public partial class ModEditWindow
{
private readonly ResourceTreeFactory _resourceTreeFactory;
private readonly ResourceTreeViewer _quickImportViewer;
private readonly Dictionary<FullPath, IWritable?> _quickImportWritables = new();
private readonly Dictionary<(Utf8GamePath, IWritable?), QuickImportAction> _quickImportActions = new();

1
Penumbra/UI/AdvancedWindow/ModEditWindow.ShaderPackages.cs
View file

@ -1,4 +1,3 @@
using System.Text;
using Dalamud.Interface.Internal.Notifications;
using Dalamud.Interface;
using ImGuiNET;

1
Penumbra/UI/AdvancedWindow/ModEditWindow.Textures.cs
View file

@ -1,4 +1,3 @@
using System.Diagnostics.CodeAnalysis;
using ImGuiNET;
using OtterGui;
using OtterGui.Raii;

8
Penumbra/UI/AdvancedWindow/ModEditWindow.cs
View file

@ -1,4 +1,3 @@
using System.Text;
using Dalamud.Interface;
using Dalamud.Interface.Components;
using Dalamud.Interface.DragDrop;
@ -576,9 +575,10 @@ public partial class ModEditWindow : Window, IDisposable
_shaderPackageTab = new FileEditor<ShpkTab>(this, gameData, config, _editor.Compactor, _fileDialog, "Shaders", ".shpk",
() => _editor.Files.Shpk, DrawShaderPackagePanel, () => _mod?.ModPath.FullName ?? string.Empty,
(bytes, _, _) => new ShpkTab(_fileDialog, bytes));
_center = new CombinedTexture(_left, _right);
_textureSelectCombo = new TextureDrawer.PathSelectCombo(textures, editor);
_quickImportViewer =
_center = new CombinedTexture(_left, _right);
_textureSelectCombo = new TextureDrawer.PathSelectCombo(textures, editor);
_resourceTreeFactory = resourceTreeFactory;
_quickImportViewer =
new ResourceTreeViewer(_config, resourceTreeFactory, changedItemDrawer, 2, OnQuickImportRefresh, DrawQuickImportActions);
_communicator.ModPathChanged.Subscribe(OnModPathChanged, ModPathChanged.Priority.ModEditWindow);
}

1
Penumbra/UI/ResourceWatcher/ResourceWatcher.cs
View file

@ -1,4 +1,3 @@
using System.Text.RegularExpressions;
using FFXIVClientStructs.FFXIV.Client.Game.Object;
using FFXIVClientStructs.FFXIV.Client.System.Resource;
using ImGuiNET;

1
Penumbra/Util/PenumbraSqPackStream.cs
View file

@ -1,4 +1,3 @@
using System.IO.Compression;
using Lumina.Data.Structs;
using Lumina.Extensions;