Fixes for the "Living Large" update.

A first draft for the "Living Large" update. Tested successfully with the updated version of QMM (v4.5.0) & Cyclops Docking Mod.
SubnauticaModding · Dec 18, 2022 · 25da9bf · 25da9bf
1 parent 4124baa
commit 25da9bf
Show file tree

Hide file tree

Showing 48 changed files with 90 additions and 265 deletions.
diff --git a/Dependencies/Subnautica.exp/Unity.ResourceManager.dll b/Dependencies/Subnautica.exp/Unity.ResourceManager.dll
diff --git a/Dependencies/Subnautica.exp/Unity.TextMeshPro.dll b/Dependencies/Subnautica.exp/Unity.TextMeshPro.dll
diff --git a/Dependencies/Subnautica.stable/FMODUnity.dll b/Dependencies/Subnautica.stable/FMODUnity.dll
diff --git a/Dependencies/Subnautica.stable/Newtonsoft.Json.dll b/Dependencies/Subnautica.stable/Newtonsoft.Json.dll
diff --git a/Dependencies/Subnautica.stable/Unity.ResourceManager.dll b/Dependencies/Subnautica.stable/Unity.ResourceManager.dll
diff --git a/Dependencies/Subnautica.stable/Unity.TextMeshPro.dll b/Dependencies/Subnautica.stable/Unity.TextMeshPro.dll
diff --git a/Dependencies/Subnautica.stable/UnityEngine.AudioModule.dll b/Dependencies/Subnautica.stable/UnityEngine.AudioModule.dll
diff --git a/Dependencies/Subnautica.stable/UnityEngine.TextRenderingModule.dll b/Dependencies/Subnautica.stable/UnityEngine.TextRenderingModule.dll
diff --git a/Example mod/mod.json b/Example mod/mod.json
@@ -2,11 +2,11 @@
   "Id": "SMLHelperExampleMod",
   "DisplayName": "Example Mod For SMLHelper",
   "Author": "The SMLHelper Dev Team",
-  "Version": "2.14.1",
+  "Version": "2.15.0",
   "Enable": true,
   "AssemblyName": "Example mod.dll",
   "VersionDependencies": {
-    "SMLHelper": "2.14.1"
+    "SMLHelper": "2.15.0"
   },
   "Game": "Both",
   "NitroxCompat": true

diff --git a/SMLHelper/Assets/CustomFabricator.cs b/SMLHelper/Assets/CustomFabricator.cs
@@ -151,15 +151,15 @@ protected CustomFabricator(string classId, string friendlyName, string descripti
         /// <returns></returns>
         public override GameObject GetGameObject()
         {
-#if SUBNAUTICA_EXP || BELOWZERO
+#if BELOWZERO
             return null;
 #else
             GameObject prefab = this.Model switch
             {
-                Models.Fabricator => GameObject.Instantiate(CraftData.GetPrefabForTechType(TechType.Fabricator)),
-                Models.Workbench => GameObject.Instantiate(CraftData.GetPrefabForTechType(TechType.Workbench)),
+                Models.Fabricator => GameObject.Instantiate(CraftData.GetPrefabForTechTypeAsync(TechType.Fabricator).GetResult()),
+                Models.Workbench => GameObject.Instantiate(CraftData.GetPrefabForTechTypeAsync(TechType.Workbench).GetResult()),
 #if SUBNAUTICA
-                Models.MoonPool => GameObject.Instantiate(Resources.Load<GameObject>("Submarine/Build/CyclopsFabricator")),
+                Models.MoonPool => GameObject.Instantiate(GetCyclopsFabricatorPrefab()),
 #endif
                 Models.Custom => GetCustomCrafterPreFab(),
                 _ => null
@@ -169,6 +169,20 @@ public override GameObject GetGameObject()
 #endif
         }
 
+#if SUBNAUTICA
+        private static GameObject _loadedCyclopsFabricatorPrefab = null;
+        private GameObject GetCyclopsFabricatorPrefab(bool forceReload = false)
+        {
+            if (_loadedCyclopsFabricatorPrefab == null || forceReload)
+            {
+                var cyclopsFabricatorRequest = AddressablesUtility.LoadAsync<GameObject>("Submarine/Build/CyclopsFabricator.prefab");
+                cyclopsFabricatorRequest.WaitForCompletion();
+                _loadedCyclopsFabricatorPrefab = cyclopsFabricatorRequest.Result;
+            }
+            return _loadedCyclopsFabricatorPrefab;
+        }
+#endif
+
         /// <summary>
         /// The in-game <see cref="GameObject"/>, async way.
         /// </summary>
@@ -191,12 +205,7 @@ public override IEnumerator GetGameObjectAsync(IOut<GameObject> gameObject)
                     break;
 #if SUBNAUTICA
                 case Models.MoonPool:
-#pragma warning disable CS0618 // obsolete
-                    var request = UWE.PrefabDatabase.GetPrefabForFilenameAsync("Submarine/Build/CyclopsFabricator.prefab");
-#pragma warning restore CS0618
-                    yield return request;
-                    request.TryGetPrefab(out prefab);
-                    prefab = GameObject.Instantiate(prefab);
+                    prefab = GameObject.Instantiate(GetCyclopsFabricatorPrefab());
                     break;
 #endif
                 case Models.Custom:

diff --git a/SMLHelper/Assets/FishPrefab.cs b/SMLHelper/Assets/FishPrefab.cs
@@ -68,11 +68,7 @@ public sealed override GameObject GetGameObject()
             forces.handleGravity = true;
             forces.underwaterDrag = 1f;
             forces.underwaterGravity = 0;
-#if BELOWZERO || SUBNAUTICA_EXP
             forces.waterDepth = Ocean.GetOceanLevel();
-#else
-            forces.waterDepth = Ocean.main.GetOceanLevel();
-#endif
             forces.enabled = false;
             forces.enabled = true;
 

diff --git a/SMLHelper/Assets/ModPrefabRequest.cs b/SMLHelper/Assets/ModPrefabRequest.cs
@@ -50,10 +50,8 @@ public bool MoveNext()
 
         public void Reset() {}
 
-#if BELOWZERO || SUBNAUTICA_EXP
         public void Release()
         {
         }
-#endif
     }
 }
diff --git a/SMLHelper/Handlers/CoordinatedSpawnsHandler.cs b/SMLHelper/Handlers/CoordinatedSpawnsHandler.cs
@@ -1,11 +1,7 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine;
-#if SUBNAUTICA_STABLE
-using Oculus.Newtonsoft.Json;
-#else
 using Newtonsoft.Json;
-#endif
 
 namespace SMLHelper.V2.Handlers
 {

diff --git a/SMLHelper/Interfaces/IBasicText.cs b/SMLHelper/Interfaces/IBasicText.cs
@@ -1,8 +1,6 @@
-#if BELOWZERO
-using Text = TMPro.TextMeshPro;
+using Text = TMPro.TextMeshPro;
 using Font = TMPro.TMP_FontAsset;
 using FontStyle = TMPro.FontStyles;
-#endif
 
 using UnityEngine;
 

diff --git a/SMLHelper/Json/ConfigFile.cs b/SMLHelper/Json/ConfigFile.cs
@@ -2,13 +2,8 @@
 using System.IO;
 using System.Reflection;
 using System.Linq;
-#if SUBNAUTICA_STABLE
-using Oculus.Newtonsoft.Json;
-using Oculus.Newtonsoft.Json.Converters;
-#else
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-#endif
 
 namespace SMLHelper.V2.Json
 {

diff --git a/SMLHelper/Json/Converters/FloatConverter.cs b/SMLHelper/Json/Converters/FloatConverter.cs
@@ -2,11 +2,7 @@
 {
     using System;
     using System.Globalization;
-#if SUBNAUTICA_STABLE
-    using Oculus.Newtonsoft.Json;
-#else
     using Newtonsoft.Json;
-#endif
 
     /// <summary>
     /// A <see cref="JsonConverter"/> for rounding floats or doubles to a given number of decimal places,

diff --git a/SMLHelper/Json/Converters/KeyCodeConverter.cs b/SMLHelper/Json/Converters/KeyCodeConverter.cs
@@ -3,11 +3,7 @@
     using System;
     using SMLHelper.V2.Utility;
     using UnityEngine;
-#if SUBNAUTICA_STABLE
-    using Oculus.Newtonsoft.Json;
-#else
     using Newtonsoft.Json;
-#endif
 
     /// <summary>
     /// A <see cref="JsonConverter"/> for handling <see cref="KeyCode"/>s.

diff --git a/SMLHelper/Json/Converters/QuaternionConverter.cs b/SMLHelper/Json/Converters/QuaternionConverter.cs
@@ -1,10 +1,7 @@
 using System;
 using UnityEngine;
-#if SUBNAUTICA_STABLE
-    using Oculus.Newtonsoft.Json;
-#else
 using Newtonsoft.Json;
-#endif
+
 namespace SMLHelper.V2.Json.Converters
 {
     /// <summary>

diff --git a/SMLHelper/Json/Converters/Vector2Converter.cs b/SMLHelper/Json/Converters/Vector2Converter.cs
@@ -1,10 +1,7 @@
 using System;
 using UnityEngine;
-#if SUBNAUTICA_STABLE
-using Oculus.Newtonsoft.Json;
-#else
 using Newtonsoft.Json;
-#endif
+
 namespace SMLHelper.V2.Json.Converters
 {
     /// <summary>

diff --git a/SMLHelper/Json/Converters/Vector2IntConverter.cs b/SMLHelper/Json/Converters/Vector2IntConverter.cs
@@ -1,10 +1,7 @@
 using System;
 using UnityEngine;
-#if SUBNAUTICA_STABLE
-using Oculus.Newtonsoft.Json;
-#else
 using Newtonsoft.Json;
-#endif
+
 namespace SMLHelper.V2.Json.Converters
 {
     /// <summary>

diff --git a/SMLHelper/Json/Converters/Vector3Converter.cs b/SMLHelper/Json/Converters/Vector3Converter.cs
@@ -1,10 +1,7 @@
 using System;
 using UnityEngine;
-#if SUBNAUTICA_STABLE
-using Oculus.Newtonsoft.Json;
-#else
 using Newtonsoft.Json;
-#endif
+
 namespace SMLHelper.V2.Json.Converters
 {
     /// <summary>

diff --git a/SMLHelper/Json/Converters/Vector3IntConverter.cs b/SMLHelper/Json/Converters/Vector3IntConverter.cs
@@ -1,10 +1,7 @@
 using System;
 using UnityEngine;
-#if SUBNAUTICA_STABLE
-using Oculus.Newtonsoft.Json;
-#else
 using Newtonsoft.Json;
-#endif
+
 namespace SMLHelper.V2.Json.Converters
 {
     /// <summary>

diff --git a/SMLHelper/Json/Converters/Vector4Converter.cs b/SMLHelper/Json/Converters/Vector4Converter.cs
@@ -1,10 +1,7 @@
 using System;
 using UnityEngine;
-#if SUBNAUTICA_STABLE
-using Oculus.Newtonsoft.Json;
-#else
 using Newtonsoft.Json;
-#endif
+
 namespace SMLHelper.V2.Json.Converters
 {
     /// <summary>

diff --git a/SMLHelper/Json/ExtensionMethods/JsonExtensions.cs b/SMLHelper/Json/ExtensionMethods/JsonExtensions.cs
@@ -1,11 +1,7 @@
 namespace SMLHelper.V2.Json.ExtensionMethods
 {
     using SMLHelper.V2.Utility;
-#if SUBNAUTICA_STABLE
-    using Oculus.Newtonsoft.Json;
-#else
     using Newtonsoft.Json;
-#endif
 
     /// <summary>
     /// Extension methods for parsing objects as JSON data.

diff --git a/SMLHelper/Json/Interfaces/IJsonFile.cs b/SMLHelper/Json/Interfaces/IJsonFile.cs
@@ -1,10 +1,6 @@
 namespace SMLHelper.V2.Json.Interfaces
 {
-#if SUBNAUTICA_STABLE
-    using Oculus.Newtonsoft.Json;
-#else
     using Newtonsoft.Json;
-#endif
 
     /// <summary>
     /// A simple interface for a JSON file framework.

diff --git a/SMLHelper/Json/JsonFile.cs b/SMLHelper/Json/JsonFile.cs
@@ -1,12 +1,7 @@
 using System;
 using System.Linq;
-#if SUBNAUTICA_STABLE
-using Oculus.Newtonsoft.Json;
-using Oculus.Newtonsoft.Json.Converters;
-#else
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
-#endif
 
 namespace SMLHelper.V2.Json
 {

diff --git a/SMLHelper/Json/SaveDataCache.cs b/SMLHelper/Json/SaveDataCache.cs
@@ -2,11 +2,7 @@
 using System;
 using System.IO;
 using System.Reflection;
-#if SUBNAUTICA_STABLE
-using Oculus.Newtonsoft.Json;
-#else
 using Newtonsoft.Json;
-#endif
 
 namespace SMLHelper.V2.Json
 {

diff --git a/SMLHelper/Options/Attributes/ConfigFileMetadata.cs b/SMLHelper/Options/Attributes/ConfigFileMetadata.cs
@@ -11,16 +11,8 @@
     using System.Reflection;
     using UnityEngine;
     using Logger = Logger;
-#if SUBNAUTICA
-    using Text = UnityEngine.UI.Text;
-#elif BELOWZERO
     using Text = TMPro.TextMeshProUGUI;
-#endif
-#if SUBNAUTICA_STABLE
-    using Oculus.Newtonsoft.Json;
-#else
     using Newtonsoft.Json;
-#endif
 
     internal class ConfigFileMetadata<T> where T : ConfigFile, new()
     {

diff --git a/SMLHelper/Options/KeybindModOption.cs b/SMLHelper/Options/KeybindModOption.cs
@@ -6,11 +6,7 @@
     using SMLHelper.V2.Utility;
     using UnityEngine;
     using UnityEngine.Events;
-#if SUBNAUTICA
-    using Text = UnityEngine.UI.Text;
-#elif BELOWZERO
     using Text = TMPro.TextMeshProUGUI;
-#endif
 
     /// <summary>
     /// Contains all the information about a keybind changed event.
@@ -139,11 +135,6 @@ internal override void AddToPanel(uGUI_TabbedControlsPanel panel, int tabIndex)
             // Update bindings
             binding.device = Device;
             binding.value = KeyCodeUtils.KeyCodeToString(Key);
-#if SUBNAUTICA
-            binding.onValueChanged.RemoveAllListeners();
-            var callback = new UnityAction<KeyCode>((KeyCode key) => parentOptions.OnKeybindChange(Id, key));
-            binding.onValueChanged.AddListener(new UnityAction<string>((string s) => callback?.Invoke(KeyCodeUtils.StringToKeyCode(s))));
-#elif BELOWZERO
             binding.gameObject.EnsureComponent<ModBindingTag>();
             binding.bindingSet = GameInput.BindingSet.Primary;
             binding.bindCallback = new Action<GameInput.Device, GameInput.Button, GameInput.BindingSet, string>((_, _1, _2, s) =>
@@ -152,15 +143,11 @@ internal override void AddToPanel(uGUI_TabbedControlsPanel panel, int tabIndex)
                 parentOptions.OnKeybindChange(Id, KeyCodeUtils.StringToKeyCode(s));
                 binding.RefreshValue();
             });
-#endif
 
             base.AddToPanel(panel, tabIndex);
         }
 
-#if BELOWZERO
         internal class ModBindingTag: MonoBehaviour { };
-#endif
-
 
         private class BindingOptionAdjust: ModOptionAdjust
         {

diff --git a/SMLHelper/Options/ModOptionTooltip.cs b/SMLHelper/Options/ModOptionTooltip.cs
@@ -10,15 +10,11 @@ internal class ModOptionTooltip : MonoBehaviour, ITooltip
 
         void Awake() => Destroy(GetComponent<LayoutElement>());
 
-#if BELOWZERO
         public bool showTooltipOnDrag => true;
 
         public void GetTooltip(TooltipData tooltip)
         {
             tooltip.prefix.Append(Tooltip);
         }
-#else
-        public void GetTooltip(out string tooltipText, List<TooltipIcon> _) => tooltipText = Tooltip;
-#endif
     }
 }
diff --git a/SMLHelper/Options/SliderModOption.cs b/SMLHelper/Options/SliderModOption.cs
@@ -7,11 +7,7 @@
     using UnityEngine;
     using UnityEngine.UI;
     using UnityEngine.Events;
-#if SUBNAUTICA
-    using Text = UnityEngine.UI.Text;
-#elif BELOWZERO
     using Text = TMPro.TextMeshProUGUI;
-#endif
 
     /// <summary>
     /// Contains all the information about a slider changed event.
@@ -166,11 +162,7 @@ internal override void AddToPanel(uGUI_TabbedControlsPanel panel, int tabIndex)
             });
 #endif
 
-#if SUBNAUTICA
-            panel.AddSliderOption(tabIndex, Label, Value, MinValue, MaxValue, DefaultValue, callback);
-#elif BELOWZERO
             panel.AddSliderOption(tabIndex, Label, Value, MinValue, MaxValue, DefaultValue, Step, callback, SliderLabelMode.Default, "0.0");
-#endif
 
             // AddSliderOption for some reason doesn't return created GameObject, so we need this little hack
             Transform options = panel.tabs[tabIndex].container.transform;

diff --git a/SMLHelper/Patchers/CraftDataPatcher_Subnautica.cs b/SMLHelper/Patchers/CraftDataPatcher_Subnautica.cs
@@ -98,6 +98,8 @@ private static void GetUseEatSoundPrefix(TechType techType)
         {
             DictionaryPrefix(techType, CustomEatingSounds, CraftData.useEatSound);
         }
+
+        /*
         [PatchUtils.Prefix]
         [HarmonyPatch(typeof(CraftData), nameof(CraftData.IsInvUseable))]
         private static bool IsInvUseablePrefix(TechType techType, ref bool __result)
@@ -110,6 +112,14 @@ private static bool IsInvUseablePrefix(TechType techType, ref bool __result)
             __result = false;
             return true;
         }
+        */
+        [PatchUtils.Postfix]
+        [HarmonyPatch(typeof(Inventory), nameof(Inventory.GetAllItemActions))]
+        private static void GetAllItemActionsPostfix(InventoryItem item, ref ItemAction __result)
+        {
+            if (item != null && item.item != null && SurvivalPatcher.InventoryUseables.Contains(item.item.GetTechType()))
+                __result |= ItemAction.Use;
+        }
 
         private static void DictionaryPrefix<T>(TechType techType, IDictionary<TechType, T> smlCollection, IDictionary<TechType, T> craftDataCollection)
         {