Fix CC3 1.0.0.2 bug. (#507)

Fix: Correct Invalid Cast exception when trying to remove a node from a custom fabricator.
SubnauticaModding · Dec 17, 2023 · f006d4e · f006d4e
1 parent 73202da
commit f006d4e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 25 deletions.
diff --git a/Nautilus/Crafting/ModCraftTreeLinkingNode.cs b/Nautilus/Crafting/ModCraftTreeLinkingNode.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Nautilus.Handlers;
+using Nautilus.Utility;
 using UnityEngine;
 using UnityEngine.Assertions;
 
@@ -83,16 +84,15 @@ public ModCraftTreeTab AddTabNode(string nameID)
     /// <returns></returns>
     public ModCraftTreeTab GetTabNode(string nameID)
     {
-        foreach (ModCraftTreeTab node in ChildNodes)
+        foreach (var node in ChildNodes)
         {
             if (node == null)
             {
                 continue;
             }
 
-            if (node.Name == nameID && node.Action == TreeAction.Expand)
+            if (node.Name == nameID && node.Action == TreeAction.Expand && node is ModCraftTreeTab tab)
             {
-                ModCraftTreeTab tab = node;
                 return tab;
             }
         }
@@ -107,16 +107,15 @@ public ModCraftTreeTab GetTabNode(string nameID)
     /// <returns></returns>
     public ModCraftTreeCraft GetCraftingNode(TechType techType)
     {
-        foreach (ModCraftTreeNode node in ChildNodes)
+        foreach (var node in ChildNodes)
         {
             if (node == null)
             {
                 continue;
             }
 
-            if (node.TechType == techType && node.Action == TreeAction.Craft)
+            if (node.TechType == techType && node.Action == TreeAction.Craft && node is ModCraftTreeCraft craftNode)
             {
-                ModCraftTreeCraft craftNode = (ModCraftTreeCraft)node;
                 return craftNode;
             }
         }
@@ -131,7 +130,7 @@ public ModCraftTreeCraft GetCraftingNode(TechType techType)
     /// <returns></returns>
     public ModCraftTreeNode GetNode(string nameID)
     {
-        foreach (ModCraftTreeNode node in ChildNodes)
+        foreach (var node in ChildNodes)
         {
             if (node == null)
             {

diff --git a/Nautilus/Handlers/CraftTreeHandler.cs b/Nautilus/Handlers/CraftTreeHandler.cs
@@ -1,14 +1,13 @@
+namespace Nautilus.Handlers;
+
 using System.Linq;
 using Nautilus.Crafting;
 using Nautilus.Patchers;
-using Nautilus.Utility;
-
-namespace Nautilus.Handlers;
 
 /// <summary>
 /// A handler class for creating and modifying crafting trees.
 /// </summary>
-public static class CraftTreeHandler 
+public static class CraftTreeHandler
 {
     /// <summary>
     /// Adds a new crafting node to the root of the specified crafting tree, at the provided tab location.
@@ -23,7 +22,7 @@ public static class CraftTreeHandler
     /// </param>        
     public static void AddCraftingNode(CraftTree.Type craftTree, TechType craftingItem, params string[] stepsToTab)
     {
-        if(CraftTreePatcher.CustomTrees.TryGetValue(craftTree, out var root))
+        if (CraftTreePatcher.CustomTrees.TryGetValue(craftTree, out var root))
         {
             root.AddCraftNode(craftingItem, stepsToTab.LastOrDefault());
             return;
@@ -40,7 +39,7 @@ public static void AddCraftingNode(CraftTree.Type craftTree, TechType craftingIt
 
     public static void AddCraftingNode(CraftTree.Type craftTree, TechType craftingItem)
     {
-        if(CraftTreePatcher.CustomTrees.TryGetValue(craftTree, out var root))
+        if (CraftTreePatcher.CustomTrees.TryGetValue(craftTree, out var root))
         {
             root.AddCraftNode(craftingItem);
             return;
@@ -58,7 +57,7 @@ public static void AddCraftingNode(CraftTree.Type craftTree, TechType craftingIt
     /// <param name="sprite">The sprite of the tab.</param>        
     public static void AddTabNode(CraftTree.Type craftTree, string name, string displayName, Atlas.Sprite sprite)
     {
-        if(CraftTreePatcher.CustomTrees.TryGetValue(craftTree, out var root))
+        if (CraftTreePatcher.CustomTrees.TryGetValue(craftTree, out var root))
         {
             root.AddTabNode(name, displayName, sprite);
             return;
@@ -76,7 +75,7 @@ public static void AddTabNode(CraftTree.Type craftTree, string name, string disp
 
     public static void AddTabNode(CraftTree.Type craftTree, string name, string displayName, UnityEngine.Sprite sprite)
     {
-        if(CraftTreePatcher.CustomTrees.TryGetValue(craftTree, out var root))
+        if (CraftTreePatcher.CustomTrees.TryGetValue(craftTree, out var root))
         {
             root.AddTabNode(name, displayName, sprite);
             return;
@@ -99,7 +98,7 @@ public static void AddTabNode(CraftTree.Type craftTree, string name, string disp
     /// </param>        
     public static void AddTabNode(CraftTree.Type craftTree, string name, string displayName, Atlas.Sprite sprite, params string[] stepsToTab)
     {
-        if(CraftTreePatcher.CustomTrees.TryGetValue(craftTree, out var root))
+        if (CraftTreePatcher.CustomTrees.TryGetValue(craftTree, out var root))
         {
             root.AddTabNode(name, displayName, sprite, "English", stepsToTab.LastOrDefault());
             return;
@@ -122,7 +121,7 @@ public static void AddTabNode(CraftTree.Type craftTree, string name, string disp
     /// </param>        
     public static void AddTabNode(CraftTree.Type craftTree, string name, string displayName, UnityEngine.Sprite sprite, params string[] stepsToTab)
     {
-        if(CraftTreePatcher.CustomTrees.TryGetValue(craftTree, out var root))
+        if (CraftTreePatcher.CustomTrees.TryGetValue(craftTree, out var root))
         {
             root.AddTabNode(name, displayName, sprite, "English", stepsToTab.LastOrDefault());
             return;
@@ -188,15 +187,9 @@ public static void AddTabNode(CraftTree.Type craftTree, string name, string disp
 
     public static void RemoveNode(CraftTree.Type craftTree, params string[] stepsToNode)
     {
-        if(CraftTreePatcher.CustomTrees.TryGetValue(craftTree, out var root))
+        if (CraftTreePatcher.CustomTrees.TryGetValue(craftTree, out var root))
         {
-            var tab = root.GetTabNode(stepsToNode);
-            if(tab == null)
-            {
-                root.GetNode(stepsToNode)?.RemoveNode();
-                return;
-            }
-            tab.RemoveNode();
+            root.GetNode(stepsToNode)?.RemoveNode();
             return;
         }
         CraftTreePatcher.NodesToRemove.Add(new Node(stepsToNode, craftTree));