7.1 updates

Meddle/Meddle.Plugin/Meddle.Plugin.csproj

@@ -22,7 +22,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="DalamudPackager" Version="2.1.13"/>
+        <PackageReference Include="DalamudPackager" Version="11.0.0" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0"/>
         <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0"/>
         <PackageReference Include="Vortice.Direct3D11" Version="3.5.0"/>

Meddle/Meddle.Plugin/Models/Layout/ParsedInstance.cs

@@ -1,7 +1,7 @@
 using System.Numerics;
 using FFXIVClientStructs.FFXIV.Client.Game.Object;
 using FFXIVClientStructs.FFXIV.Client.LayoutEngine;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 using Meddle.Plugin.Models.Skeletons;
 using Meddle.Plugin.Models.Structs;
 using Meddle.Plugin.Services;
@@ -168,18 +168,20 @@ private bool SearchInternal(string query, HashSet<ParsedInstance> visited)
 public class ParsedHousingInstance : ParsedSharedInstance, ISearchableInstance
 {
     public ParsedHousingInstance(nint id, Transform transform, string path, string name, 
-                                 ObjectKind kind, Stain? stain, Stain defaultStain, Item? item, IReadOnlyList<ParsedInstance> children) : base(id, ParsedInstanceType.Housing, transform, path, children)
+                                 ObjectKind kind, Stain? stain, Stain defaultStain, 
+                                 /*Item? item,*/ 
+                                 IReadOnlyList<ParsedInstance> children) : base(id, ParsedInstanceType.Housing, transform, path, children)
     {
         Name = name;
         Kind = kind;
         Stain = stain;
         DefaultStain = defaultStain;
-        Item = item;
+        //Item = item;
     }
 
     public Stain? Stain { get; }
     public Stain DefaultStain { get; }
-    public Item? Item { get; }
+    // public Item? Item { get; }
     public string Name { get; }
     public ObjectKind Kind { get; }
 

Meddle/Meddle.Plugin/Models/StructExtensions.cs

@@ -12,9 +12,9 @@ namespace Meddle.Plugin.Models;
 public static class StructExtensions
 {
     public const int CharacterBaseAttachOffset = 0xD0; // CharacterBase + 0xD0 -> Attach
-
-    public const int ModelEnabledAttributeIndexMaskOffset = 0xAC; // Model + 0xAC -> EnabledAttributeIndexMask
-    public const int ModelEnabledShapeKeyIndexMaskOffset = 0xC8;  // Model + 0xC8 -> EnabledShapeKeyIndexMask
+    //
+    // public const int ModelEnabledAttributeIndexMaskOffset = 0xAC; // Model + 0xAC -> EnabledAttributeIndexMask
+    // public const int ModelEnabledShapeKeyIndexMaskOffset = 0xC8;  // Model + 0xC8 -> EnabledShapeKeyIndexMask
 
     public const int PartialSkeletonFlagsOffset = 0x8; // PartialSkeleton + 0x8 -> Flags
 
@@ -69,25 +69,25 @@ private static unsafe ParsedSkeleton GetParsedSkeleton(this Pointer<Skeleton> sk
         return new ParsedSkeleton(skeleton.Value);
     }
 
-    public static unsafe (uint EnabledAttributeIndexMask, uint EnabledShapeKeyIndexMask) GetModelMasks(
-        this Pointer<Model> model)
-    {
-        if (model == null) throw new ArgumentNullException(nameof(model));
-        if (model.Value == null) throw new ArgumentNullException(nameof(model));
-
-        var modelBase = model.Value;
-        var enabledAttributeIndexMask = *(uint*)((nint)modelBase + ModelEnabledAttributeIndexMaskOffset);
-        var enabledShapeKeyIndexMask = *(uint*)((nint)modelBase + ModelEnabledShapeKeyIndexMaskOffset);
-        return (enabledAttributeIndexMask, enabledShapeKeyIndexMask);
-    }
+    // public static unsafe (uint EnabledAttributeIndexMask, uint EnabledShapeKeyIndexMask) GetModelMasks(
+    //     this Pointer<Model> model)
+    // {
+    //     if (model == null) throw new ArgumentNullException(nameof(model));
+    //     if (model.Value == null) throw new ArgumentNullException(nameof(model));
+    //
+    //     var modelBase = model.Value;
+    //     var enabledAttributeIndexMask = *(uint*)((nint)modelBase + ModelEnabledAttributeIndexMaskOffset);
+    //     var enabledShapeKeyIndexMask = *(uint*)((nint)modelBase + ModelEnabledShapeKeyIndexMaskOffset);
+    //     return (enabledAttributeIndexMask, enabledShapeKeyIndexMask);
+    // }
 
     public static unsafe Meddle.Utils.Export.Model.ShapeAttributeGroup ParseModelShapeAttributes(
         Pointer<Model> modelPointer)
     {
         if (modelPointer == null) throw new ArgumentNullException(nameof(modelPointer));
         if (modelPointer.Value == null) throw new ArgumentNullException(nameof(modelPointer));
         var model = modelPointer.Value;
-        var (enabledAttributeIndexMask, enabledShapeKeyIndexMask) = modelPointer.GetModelMasks();
+        // var (enabledAttributeIndexMask, enabledShapeKeyIndexMask) = modelPointer.GetModelMasks();
         var shapes = new List<(string, short)>();
         foreach (var shape in model->ModelResourceHandle->Shapes)
         {
@@ -101,7 +101,8 @@ public static unsafe Meddle.Utils.Export.Model.ShapeAttributeGroup ParseModelSha
         }
 
         var shapeAttributeGroup = new Meddle.Utils.Export.Model.ShapeAttributeGroup(
-            enabledShapeKeyIndexMask, enabledAttributeIndexMask, shapes.ToArray(), attributes.ToArray());
+            model->EnabledShapeKeyIndexMask, model->EnabledAttributeIndexMask, 
+            shapes.ToArray(), attributes.ToArray());
 
         return shapeAttributeGroup;
     }

Meddle/Meddle.Plugin/Plugin.cs

@@ -3,6 +3,7 @@
 using Dalamud.Configuration;
 using Dalamud.IoC;
 using Dalamud.Plugin;
+//using InteropGenerator.Runtime;
 using Meddle.Plugin.Models;
 using Meddle.Plugin.Services;
 using Meddle.Plugin.UI.Layout;
@@ -26,6 +27,10 @@ public Plugin(IDalamudPluginInterface pluginInterface)
     {
         try
         {
+            // FFXIVClientStructs.Interop.Generated.Addresses.Register();
+            // Resolver.GetInstance.Setup();
+            // Resolver.GetInstance.Resolve();
+
             var config = pluginInterface.GetPluginConfig() as Configuration ?? new Configuration();
             pluginInterface.Inject(config);
             config.Migrate();

Meddle/Meddle.Plugin/Services/LayoutService.cs

@@ -1,6 +1,4 @@
-using System.Collections.Concurrent;
-using System.Diagnostics;
-using System.Numerics;
+using System.Numerics;
 using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using FFXIVClientStructs.FFXIV.Client.Game.Object;
@@ -9,8 +7,7 @@
 using FFXIVClientStructs.FFXIV.Client.LayoutEngine.Layer;
 using FFXIVClientStructs.FFXIV.Client.LayoutEngine.Terrain;
 using FFXIVClientStructs.Interop;
-using ImGuiNET;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 using Meddle.Plugin.Models.Layout;
 using Meddle.Plugin.Models.Structs;
 using Meddle.Plugin.Utils;
@@ -22,7 +19,7 @@ namespace Meddle.Plugin.Services;
 
 public class LayoutService : IService, IDisposable
 {
-    private readonly Dictionary<uint, Item> itemDict;
+    // private readonly Dictionary<uint, Item> itemDict;
     private readonly Dictionary<uint, Stain> stainDict;
     private readonly ILogger<LayoutService> logger;
     private readonly IFramework framework;
@@ -38,9 +35,9 @@ public LayoutService(
         this.logger = logger;
         this.framework = framework;
         stainDict = dataManager.GetExcelSheet<Stain>()!.ToDictionary(row => row.RowId, row => row);
-        itemDict = dataManager.GetExcelSheet<Item>()!
-                              .Where(item => item.AdditionalData != 0 && item.ItemSearchCategory.Row is 65 or 66)
-                              .ToDictionary(row => row.AdditionalData, row => row);
+        // itemDict = dataManager.GetExcelSheet<Item>()!
+        //                       .Where(item => item.AdditionalData.RowId != 0 && item.ItemSearchCategory.Value.RowId is 65 or 66)
+        //                       .ToDictionary(row => row.AdditionalData.RowId, row => row);
         this.framework.Update += Update;
     }
 
@@ -264,13 +261,13 @@ private unsafe ParsedInstanceSet[] ParseLayout(LayoutManager* activeLayout, Pars
                                              furnitureMatch.GameObject->ObjectKind,
                                              furnitureMatch.Stain,
                                              furnitureMatch.DefaultStain,
-                                             furnitureMatch.Item, children);
+                                             /*furnitureMatch.Item,*/ children);
             foreach (var child in housing.Flatten())
             {
                 if (child is ParsedBgPartsInstance parsedBgPartsInstance)
                 {
                     parsedBgPartsInstance.StainColor = furnitureMatch.Stain != null ? 
-                                                           UiUtil.ConvertU32ColorToVector4(furnitureMatch.Stain.Color) : 
+                                                           UiUtil.ConvertU32ColorToVector4(furnitureMatch.Stain.Value.Color) : 
                                                            UiUtil.ConvertU32ColorToVector4(furnitureMatch.DefaultStain.Color);
                 }
             }
@@ -395,7 +392,7 @@ private unsafe Furniture[] ParseTerritoryFurniture(HousingTerritory* territory)
                 HousingFurniture = item,
                 Stain = item.Stain != 0 ? stainDict[item.Stain] : null,
                 DefaultStain = stainDict[housingSettings.Value->DefaultColorId],
-                Item = itemDict.GetValueOrDefault(item.Id)
+                //Item = itemDict.GetValueOrDefault(item.Id)
             });
         }
 
@@ -416,7 +413,7 @@ public unsafe class Furniture
     {
         public HousingObject* GameObject;
         public HousingFurniture HousingFurniture;
-        public Item? Item;
+        //public Item? Item;
         public SharedGroupLayoutInstance* LayoutInstance;
         public Stain? Stain;
         public Stain DefaultStain;

Meddle/Meddle.Plugin/Services/ParseService.cs

@@ -86,23 +86,23 @@ public unsafe IColorTableSet ParseColorTableTexture(Texture* colorTableTexture)
                 $"Color table is not R16G16B16A16F ({(TexFile.TextureFormat)colorTableTexture->TextureFormat})");
         }
 
-        if (colorTableTexture->Width == 4 && colorTableTexture->Height == 16)
+        if (colorTableTexture->ActualWidth == 4 && colorTableTexture->ActualHeight == 16)
         {
             // legacy table
-            var stridedData = ImageUtils.AdjustStride(stride, (int)colorTableTexture->Width * 8,
-                                                      (int)colorTableTexture->Height, colorTableRes.Data);
+            var stridedData = ImageUtils.AdjustStride(stride, (int)colorTableTexture->ActualWidth * 8,
+                                                      (int)colorTableTexture->ActualHeight, colorTableRes.Data);
             var reader = new SpanBinaryReader(stridedData);
             return new LegacyColorTableSet
             {
                 ColorTable = new LegacyColorTable(ref reader)
             };
         }
 
-        if (colorTableTexture->Width == 8 && colorTableTexture->Height == 32)
+        if (colorTableTexture->ActualWidth == 8 && colorTableTexture->ActualHeight == 32)
         {
             // new table
-            var stridedData = ImageUtils.AdjustStride(stride, (int)colorTableTexture->Width * 8,
-                                                      (int)colorTableTexture->Height, colorTableRes.Data);
+            var stridedData = ImageUtils.AdjustStride(stride, (int)colorTableTexture->ActualWidth * 8,
+                                                      (int)colorTableTexture->ActualHeight, colorTableRes.Data);
             var reader = new SpanBinaryReader(stridedData);
             return new ColorTableSet
             {
@@ -111,6 +111,6 @@ public unsafe IColorTableSet ParseColorTableTexture(Texture* colorTableTexture)
         }
 
         throw new ArgumentException(
-            $"Color table is not 4x16 or 8x32 ({colorTableTexture->Width}x{colorTableTexture->Height})");
+            $"Color table is not 4x16 or 8x32 ({colorTableTexture->ActualWidth}x{colorTableTexture->ActualHeight})");
     }
 }