Fixed log spams for buildables

Since buildables are never registered to a crafting tree, Nautilus always logs a warning for that interpreting it as a mistake, when in reality it isn't.
Metious · Oct 16, 2023 · 16b83ac · 16b83ac
1 parent 35d7ead
commit 16b83ac
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/Nautilus/Assets/Gadgets/CraftingGadget.cs b/Nautilus/Assets/Gadgets/CraftingGadget.cs
@@ -89,11 +89,8 @@ protected internal override void Build()
 
         CraftDataHandler.SetRecipeData(prefab.Info.TechType, RecipeData);
 
-        if (FabricatorType == CraftTree.Type.None)
-        {
-            InternalLogger.Log($"Prefab '{prefab.Info.ClassID}' was not automatically registered into a crafting tree.");
-        }
-        else
+
+        if (FabricatorType is not CraftTree.Type.None)
         {
             if (StepsToFabricatorTab == null || StepsToFabricatorTab.Length == 0)
             {
@@ -103,6 +100,11 @@ protected internal override void Build()
             {
                 CraftTreeHandler.AddCraftingNode(FabricatorType, prefab.Info.TechType, StepsToFabricatorTab);
             }
+
+        }
+        else if (!prefab.TryGetGadget(out ScanningGadget scanningGadget) || !scanningGadget.IsBuildable)
+        {
+            InternalLogger.Log($"Prefab '{prefab.Info.ClassID}' was not automatically registered into a crafting tree.");
         }
 
         if (CraftingTime >= 0f)

diff --git a/Nautilus/Assets/Gadgets/ScanningGadget.cs b/Nautilus/Assets/Gadgets/ScanningGadget.cs
@@ -14,7 +14,10 @@ namespace Nautilus.Assets.Gadgets;
 /// </summary>
 public class ScanningGadget : Gadget
 {
-    private bool _isBuildable;
+    /// <summary>
+    /// Classifies this item as buildable via the habitat builder.
+    /// </summary>
+    public bool IsBuildable { get; set; }
 
     /// <summary>
     /// The blueprint that must first be scanned or picked up to unlocked this item.
@@ -184,7 +187,7 @@ public ScanningGadget WithPdaGroupCategoryBefore(TechGroup group, TechCategory c
     /// <returns>A reference to this instance after the operation has completed.</returns>
     public ScanningGadget SetBuildable(bool isBuildable = true)
     {
-        _isBuildable = isBuildable;
+        IsBuildable = isBuildable;
         return this;
     }
 
@@ -320,7 +323,7 @@ protected internal override void Build()
                 InternalLogger.Error($"Failed to add {prefab.Info.TechType.AsString()} to {GroupForPda}/{CategoryForPda} as it is not a registered combination.");
             }
 
-            if (_isBuildable)
+            if (IsBuildable)
                 CraftDataHandler.AddBuildable(prefab.Info.TechType);
         }