Hotfix BZ modname optional removal

SubnauticaModding · Oct 29, 2023 · 485f5a3 · 485f5a3
1 parent 2582691
commit 485f5a3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/Nautilus/Crafting/TabNode.cs b/Nautilus/Crafting/TabNode.cs
@@ -1,12 +1,13 @@
+namespace Nautilus.Crafting;
+
 using Nautilus.Assets;
 using Nautilus.Patchers;
 
-namespace Nautilus.Crafting;
-
 #if SUBNAUTICA
 using Sprite = Atlas.Sprite;
 #else
 using Sprite = UnityEngine.Sprite;
+
 #endif
 
 internal class TabNode : Node

diff --git a/Nautilus/Handlers/CraftTreeHandler.cs b/Nautilus/Handlers/CraftTreeHandler.cs
@@ -145,8 +145,7 @@ public static void AddTabNode(CraftTree.Type craftTree, string name, string disp
                 root.AddTabNode(name, displayName, sprite);
                 return;
             }
-            string modName = ReflectionHelper.CallingAssemblyNameByStackTrace();
-            CraftTreePatcher.TabNodes.Add(new TabNode(new string[0], craftTree, sprite, modName, name, displayName));
+            CraftTreePatcher.TabNodes.Add(new TabNode(new string[0], craftTree, sprite, name, displayName));
         }
 
         /// <summary>
@@ -169,8 +168,7 @@ public static void AddTabNode(CraftTree.Type craftTree, string name, string disp
                 root.AddTabNode(name, displayName, sprite, stepsToTab.LastOrDefault());
                 return;
             }
-            string modName = ReflectionHelper.CallingAssemblyNameByStackTrace();
-            CraftTreePatcher.TabNodes.Add(new TabNode(stepsToTab, craftTree, sprite, modName, name, displayName));
+            CraftTreePatcher.TabNodes.Add(new TabNode(stepsToTab, craftTree, sprite, name, displayName));
         }
 
 #endif

diff --git a/Nautilus/Patchers/CraftTreePatcher.cs b/Nautilus/Patchers/CraftTreePatcher.cs
@@ -176,8 +176,8 @@ private static void PatchCraftTree(ref CraftNode __result, CraftTree.Type type)
         RemoveNodes(ref __result, ref removals, type);
 
         var tabNodes = TabNodes.Where(x => x.Scheme == type).ToList();
-        var craftingNodes = CraftingNodes.Where(x => x.Scheme == type).ToList();
         AddCustomTabs(ref __result, tabNodes, type);
+        var craftingNodes = CraftingNodes.Where(x => x.Scheme == type).ToList();
         PatchNodes(ref __result, craftingNodes, type);
 
         // Remove any nodes added by mods that were marked for removal by other mods.