hotfix

Fix: correct optional parameters when using AddTabNode with stepstofabricator on a custom tree. Fix: Copy paste error causing custom workbenches to fail. Fix: Remove unused parameter from an internal method that was wasting compute cycles. Fix: Don't skip optional strings using named parameters because it actually sends null through instead of allowing the default.
SubnauticaModding · Oct 26, 2023 · cf77aea · cf77aea
1 parent d32b925
commit cf77aea
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/Nautilus/Assets/PrefabInfo.cs b/Nautilus/Assets/PrefabInfo.cs
@@ -37,7 +37,7 @@ public static PrefabInfo WithTechType(string classId, bool unlockAtStart = false
         (
             classId, 
             classId + "Prefab",
-            EnumHandler.AddEntry<TechType>(classId, techTypeOwner).WithPdaInfo(null, null, unlockAtStart: unlockAtStart)
+            EnumHandler.AddEntry<TechType>(classId, techTypeOwner).WithPdaInfo(null, null, "English", unlockAtStart)
         );
     }
 

diff --git a/Nautilus/Assets/PrefabTemplates/FabricatorTemplate.cs b/Nautilus/Assets/PrefabTemplates/FabricatorTemplate.cs
@@ -159,7 +159,7 @@ private IEnumerator GetReferenceTask(IOut<GameObject> prefab)
                 }
             case Model.Workbench:
                 {
-                    var task = PrefabDatabase.GetPrefabAsync(CraftData.GetClassIdForTechType(TechType.Fabricator));
+                    var task = PrefabDatabase.GetPrefabAsync(CraftData.GetClassIdForTechType(TechType.Workbench));
                     yield return task;
                     if (task.TryGetPrefab(out var obj))
                         prefab.Set(obj);

diff --git a/Nautilus/Crafting/TabNode.cs b/Nautilus/Crafting/TabNode.cs
@@ -15,7 +15,7 @@ internal class TabNode : Node
     internal string DisplayName { get; set; }
     internal string Name { get; set; }
 
-    internal TabNode(string[] path, CraftTree.Type scheme, Sprite sprite, string modName, string name, string displayName, string language = "English") : base(path, scheme)
+    internal TabNode(string[] path, CraftTree.Type scheme, Sprite sprite, string name, string displayName, string language = "English") : base(path, scheme)
     {
         Sprite = sprite;
         DisplayName = displayName;

diff --git a/Nautilus/Handlers/CraftTreeHandler.cs b/Nautilus/Handlers/CraftTreeHandler.cs
@@ -63,8 +63,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>
@@ -82,8 +81,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, new Atlas.Sprite(sprite), modName, name, displayName));
+        CraftTreePatcher.TabNodes.Add(new TabNode(new string[0], craftTree, new Atlas.Sprite(sprite), name, displayName));
     }
 
     /// <summary>
@@ -103,11 +101,10 @@ public static void AddTabNode(CraftTree.Type craftTree, string name, string disp
     {
         if(CraftTreePatcher.CustomTrees.TryGetValue(craftTree, out var root))
         {
-            root.AddTabNode(name, displayName, sprite, stepsToTab.LastOrDefault());
+            root.AddTabNode(name, displayName, sprite, "English", 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));
     }
 
     /// <summary>
@@ -127,11 +124,10 @@ public static void AddTabNode(CraftTree.Type craftTree, string name, string disp
     {
         if(CraftTreePatcher.CustomTrees.TryGetValue(craftTree, out var root))
         {
-            root.AddTabNode(name, displayName, sprite, stepsToTab.LastOrDefault());
+            root.AddTabNode(name, displayName, sprite, "English", stepsToTab.LastOrDefault());
             return;
         }
-        string modName = ReflectionHelper.CallingAssemblyNameByStackTrace();
-        CraftTreePatcher.TabNodes.Add(new TabNode(stepsToTab, craftTree, new Atlas.Sprite(sprite), modName, name, displayName));
+        CraftTreePatcher.TabNodes.Add(new TabNode(stepsToTab, craftTree, new Atlas.Sprite(sprite), name, displayName));
     }
 
 #elif BELOWZERO