Merge branch 'master' into docs

SubnauticaModding · Jul 1, 2023 · 0e529d7 · 0e529d7
2 parents ad00f4f + 93d82c2
commit 0e529d7
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 108 deletions.
diff --git a/CLA/Signatures.json b/CLA/Signatures.json
@@ -23,6 +23,14 @@
       "created_at": "2023-06-27T22:17:50Z",
       "repoId": 123711758,
       "pullRequestNo": 391
+    },
+    {
+      "name": "jonahnm",
+      "id": 61718056,
+      "comment_id": 1616061135,
+      "created_at": "2023-07-01T19:37:09Z",
+      "repoId": 123711758,
+      "pullRequestNo": 426
     }
   ]
 }
diff --git a/Nautilus/Handlers/EatableHandler.cs b/Nautilus/Handlers/EatableHandler.cs
diff --git a/Nautilus/Initializer.cs b/Nautilus/Initializer.cs
@@ -54,7 +54,6 @@ public class Initializer : BaseUnityPlugin
         TooltipPatcher.Patch(_harmony);
         SurvivalPatcher.Patch(_harmony);
         CustomSoundPatcher.Patch(_harmony);
-        EatablePatcher.Patch(_harmony);
         MaterialUtils.Patch();
         FontReferencesPatcher.Patch(_harmony);
         VehicleUpgradesPatcher.Patch(_harmony);

diff --git a/Nautilus/Patchers/EatablePatcher.cs b/Nautilus/Patchers/EatablePatcher.cs
diff --git a/Nautilus/Patchers/VehicleUpgradesPatcher.cs b/Nautilus/Patchers/VehicleUpgradesPatcher.cs
@@ -65,7 +65,7 @@ private static void OnModuleChangeDelegate(Vehicle __instance, int slotID, TechT
     private static void OnModuleChangeCrushDepth(Vehicle __instance, int slotID, TechType techType, bool added)
     {
         Dictionary<TechType, float> CrushDepthUpgrades = new();
-        if(__instance is Exosuit)
+        if (__instance is Exosuit)
             ExosuitUpgradeModules.DoIf(
                 (KeyValuePair<TechType, ICustomPrefab> mapElem) => mapElem.Value.TryGetGadget(out UpgradeModuleGadget moduleGadget) && moduleGadget.CrushDepth > 0f,
                 (KeyValuePair<TechType, ICustomPrefab> mapElem) => CrushDepthUpgrades.Add(mapElem.Key, mapElem.Value.GetGadget<UpgradeModuleGadget>().CrushDepth)
@@ -88,7 +88,7 @@ private static void OnModuleChangeCrushDepth(Vehicle __instance, int slotID, Tec
                 if (crushDepthToCheck > newCrushDepth)
                 {
                     newCrushDepth = crushDepthToCheck;
-                    if(__instance is Exosuit)
+                    if (__instance is Exosuit)
                     {
                         if (ExosuitUpgradeModules[techTypeInSlot].TryGetGadget(out UpgradeModuleGadget moduleGadget))
                             absolute = moduleGadget.AbsoluteDepth;
@@ -239,7 +239,7 @@ private static void OnUpgradeModuleExoHull(Exosuit __instance, int slotID, TechT
             if (Exosuit.crushDepths.TryGetValue(techTypeInSlot, out depthToCheck) && depthToCheck > newCrushDepth)
             {
                 newCrushDepth = depthToCheck;
-                if (ExosuitUpgradeModules[techTypeInSlot].TryGetGadget(out UpgradeModuleGadget mdlGadget))
+                if (ExosuitUpgradeModules.TryGetValue(techTypeInSlot, out var gadget) && gadget.TryGetGadget(out UpgradeModuleGadget mdlGadget))
                     absolute = mdlGadget.AbsoluteDepth;
             }
         }
@@ -331,7 +331,7 @@ private static void SeamothOnUpgradeModuleHull(SeaMoth __instance, int slotID, T
                 if (crushDepthToCheck > newCrushDepth)
                 {
                     newCrushDepth = crushDepthToCheck;
-                    if(SeamothUpgradeModules[techTypeInSlot].TryGetGadget(out UpgradeModuleGadget moduleGadget))
+                    if (SeamothUpgradeModules.TryGetValue(techTypeInSlot, out var gadget) && gadget.TryGetGadget(out UpgradeModuleGadget moduleGadget))
                         absolute = moduleGadget.AbsoluteDepth;
                 }
             }
@@ -363,7 +363,7 @@ public static void SeamothDelegateUse(SeaMoth __instance, ref float cooldown, in
         moduleGadget.delegateOnUsed?.Invoke(__instance, slotID, quickSlotCharge, chargeScalar);
 
         if (moduleGadget.Cooldown > 0f)
-            cooldown = (float)moduleGadget.Cooldown;
+            cooldown = (float) moduleGadget.Cooldown;
     }
 
     [HarmonyTranspiler]
@@ -386,7 +386,7 @@ private static IEnumerable<CodeInstruction> OnUpgradeModuleUse(IEnumerable<CodeI
                 Transpilers.EmitDelegate(SeamothDelegateUse)
             );
 
-        return matcher.InstructionEnumeration(); 
+        return matcher.InstructionEnumeration();
     }
 
 
@@ -468,7 +468,7 @@ private static void OnUpgradeChangeDelegate(SeaTruckUpgrades __instance, int slo
             if (SeaTruckUpgrades.crushDepths.TryGetValue(techTypeInSlot, out depthToCheck) && depthToCheck > newCrushDepth)
             {
                 newCrushDepth = depthToCheck;
-                if (SeatruckUpgradeModules[techTypeInSlot].TryGetGadget(out UpgradeModuleGadget mdlGadget))
+                if (SeatruckUpgradeModules.TryGetValue(techTypeInSlot, out var gadget) && gadget.TryGetGadget(out UpgradeModuleGadget mdlGadget))
                     absolute = mdlGadget.AbsoluteDepth;
             }
         }