Added a "ModifiesAddedAssets" variable to IModCustomHandler

FrostyModSupport/FrostyModExecutor.cs

@@ -301,9 +301,12 @@ private void ProcessModResources(IResourceContainer fmod)
 
                                 // add in existing bundles
                                 var ebxEntry = am.GetEbxEntry(resource.Name);
-                                foreach (int bid in ebxEntry.Bundles)
+                                if (ebxEntry != null)
                                 {
-                                    bundles.Add(HashBundle(am.GetBundleEntry(bid)));
+                                    foreach (int bid in ebxEntry.Bundles)
+                                    {
+                                        bundles.Add(HashBundle(am.GetBundleEntry(bid)));
+                                    }
                                 }
 
                                 entry.ExtraData = extraData;

FrostyPlugin/Handlers/LegacyCustomActionHandler.cs

@@ -15,6 +15,8 @@ public sealed class LegacyCustomActionHandler : ILegacyCustomActionHandler
     {
         public HandlerUsage Usage => HandlerUsage.Merge;
 
+        public bool ModifiesAddedAssets => false;
+
         private class ModLegacyFileEntry
         {
             public int Hash { get; set; }

FrostyPlugin/IO/FrostyModWriter.cs

@@ -330,7 +330,7 @@ int HashBundle(BundleEntry bentry)
                     if (entry.HasModifiedData)
                     {
                         ICustomActionHandler actionHandler = App.PluginManager.GetCustomHandler(entry.Type);
-                        if (actionHandler != null && !entry.IsAdded)
+                        if (actionHandler != null && (!entry.IsAdded || actionHandler.ModifiesAddedAssets == true))
                         {
                             // use custom action handler to save asset to mod
                             actionHandler.SaveToMod(this, entry);

FrostyPlugin/Mod/IModCustomHandler.cs

@@ -15,6 +15,11 @@ public interface IModCustomActionHandler
         /// </summary>
         HandlerUsage Usage { get; }
 
+        /// <summary>
+        /// Allows custom handlers to be used on duplicated assets which will make them mergable in FMM.
+        /// </summary>
+        bool ModifiesAddedAssets { get; }
+
         /// <summary>
         /// Handles the loading and merging of the custom data.
         /// </summary>

Plugins/BiowareLocalizationPlugin/BiowareLocalizationCustomActionHandler.cs

@@ -18,6 +18,8 @@ public class BiowareLocalizationCustomActionHandler : ICustomActionHandler
 
         public HandlerUsage Usage => HandlerUsage.Merge;
 
+        public bool ModifiesAddedAssets => false;
+
         // A mod is comprised of a series of base resources, embedded, ebx, res, and chunks. Embedded are used internally
         // for the icon and images of a mod. Ebx/Res/Chunks are the core resources used for applying data to the game.
         // When you create a custom handler, you need to provide your own resources for your custom handled data. This

Plugins/DifficultyWeaponTableDataPlugin/Handlers/DifficultyWeaponTableActionHandler.cs

@@ -22,6 +22,8 @@ public class DifficultyWeaponTableActionHandler : ICustomActionHandler
         // data from one mod with another, or does it merge the two together.
         public HandlerUsage Usage => HandlerUsage.Merge;
 
+        public bool ModifiesAddedAssets => false;
+
         // A mod is comprised of a series of base resources, embedded, ebx, res, and chunks. Embedded are used internally
         // for the icon and images of a mod. Ebx/Res/Chunks are the core resources used for applying data to the game.
         // When you create a custom handler, you need to provide your own resources for your custom handled data. This

Plugins/FsLocalizationPlugin/FsLocalizationCustomActionHandler.cs

@@ -18,6 +18,8 @@ public class FsLocalizationCustomActionHandler : ICustomActionHandler
     {
         public HandlerUsage Usage => HandlerUsage.Merge;
 
+        public bool ModifiesAddedAssets => false;
+
         private class FsLocalizationResource : EditorModResource
         {
             public override ModResourceType Type => ModResourceType.Ebx;

Plugins/MeshSetPlugin/Handlers/ShaderBlockDepotCustomActionHandler.cs

@@ -13,6 +13,8 @@ public class ShaderBlockDepotCustomActionHandler : ICustomActionHandler
     {
         public HandlerUsage Usage => HandlerUsage.Merge;
 
+        public bool ModifiesAddedAssets => false;
+
         private class ShaderBlockDepotResource : EditorModResource
         {
             public static uint Hash => 0x89ef2205;

Plugins/TestPlugin/Handlers/DifficultyWeaponTableActionHandler.cs

@@ -18,6 +18,8 @@ public class DifficultyWeaponTableActionHandler : ICustomActionHandler
         // data from one mod with another, or does it merge the two together.
         public HandlerUsage Usage => HandlerUsage.Merge;
 
+        public bool ModifiesAddedAssets => false;
+
         // A mod is comprised of a series of base resources, embedded, ebx, res, and chunks. Embedded are used internally
         // for the icon and images of a mod. Ebx/Res/Chunks are the core resources used for applying data to the game.
         // When you create a custom handler, you need to provide your own resources for your custom handled data. This

Plugins/TestPlugin/Handlers/SvgImageCustomActionHandler.cs

@@ -18,6 +18,8 @@ public class SvgImageCustomActionHandler : ICustomActionHandler
         // data from one mod with another, or does it merge the two together.
         public HandlerUsage Usage => HandlerUsage.Modify;
 
+        public bool ModifiesAddedAssets => false;
+
         // A mod is comprised of a series of base resources, embedded, ebx, res, and chunks. Embedded are used internally
         // for the icon and images of a mod. Ebx/Res/Chunks are the core resources used for applying data to the game.
         // When you create a custom handler, you need to provide your own resources for your custom handled data. This