diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..7778a14c2 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,149 @@ + +[*] +charset = utf-8 +end_of_line = crlf +trim_trailing_whitespace = false +insert_final_newline = false +indent_style = space +indent_size = 4 + +# Microsoft .NET properties +csharp_new_line_before_members_in_object_initializers = false +csharp_preferred_modifier_order = public, private, protected, internal, new, abstract, virtual, sealed, override, static, readonly, extern, unsafe, volatile, async:suggestion +csharp_space_after_cast = true + +# Always prefer 'var' if possible +csharp_style_var_elsewhere = true:suggestion +csharp_style_var_for_built_in_types = true:suggestion +csharp_style_var_when_type_is_apparent = true:suggestion + +# Enforce File-scoped namespace declaration +[*.cs] +csharp_style_namespace_declarations = file_scoped:error +dotnet_diagnostic.IDE0161.severity = error + +# Constants style +dotnet_naming_rule.constants_rule.severity = warning +dotnet_naming_rule.constants_rule.style = pascal_case_style +dotnet_naming_rule.constants_rule.symbols = constants_symbols +dotnet_naming_rule.private_constants_rule.severity = warning +dotnet_naming_rule.private_constants_rule.style = pascal_case_style +dotnet_naming_rule.private_constants_rule.symbols = private_constants_symbols + +# Private fields style +dotnet_naming_rule.private_instance_fields_rule.severity = warning +dotnet_naming_rule.private_instance_fields_rule.style = lower_camel_case_style_1 +dotnet_naming_rule.private_instance_fields_rule.symbols = private_instance_fields_symbols + +# Private static fields style +dotnet_naming_rule.private_static_fields_rule.severity = warning +dotnet_naming_rule.private_static_fields_rule.style = lower_camel_case_style_1 +dotnet_naming_rule.private_static_fields_rule.symbols = private_static_fields_symbols + +# Private static readonly fields style +dotnet_naming_rule.private_static_readonly_rule.severity = warning +dotnet_naming_rule.private_static_readonly_rule.style = lower_camel_case_style_1 +dotnet_naming_rule.private_static_readonly_rule.symbols = private_static_readonly_symbols + +# Public (static) fields style +dotnet_naming_rule.public_fields_rule.severity = warning +dotnet_naming_rule.public_fields_rule.style = lower_camel_case_style +dotnet_naming_rule.public_fields_rule.symbols = public_fields_symbols +dotnet_naming_rule.static_readonly_rule.severity = warning +dotnet_naming_rule.static_readonly_rule.style = pascal_case_style +dotnet_naming_rule.static_readonly_rule.symbols = static_readonly_symbols + +# Unity's serialized fields rule +dotnet_naming_rule.unity_serialized_field_rule.severity = warning +dotnet_naming_rule.unity_serialized_field_rule.style = lower_camel_case_style_1 +dotnet_naming_rule.unity_serialized_field_rule.symbols = private_static_fields_symbols + +# camelCase rule +dotnet_naming_style.lower_camel_case_style.capitalization = camel_case + +# PascalCase rule +dotnet_naming_style.pascal_case_style.capitalization = pascal_case + +# Private fields rule (_camelCase) +dotnet_naming_style.lower_camel_case_style_1.capitalization = camel_case +dotnet_naming_style.lower_camel_case_style_1.required_prefix = _ + +# Public constants symbols +dotnet_naming_symbols.constants_symbols.applicable_accessibilities = public,internal,protected,protected_internal,private_protected +dotnet_naming_symbols.constants_symbols.applicable_kinds = field +dotnet_naming_symbols.constants_symbols.required_modifiers = const + +# Private constants symbols +dotnet_naming_symbols.private_constants_symbols.applicable_accessibilities = private +dotnet_naming_symbols.private_constants_symbols.applicable_kinds = field +dotnet_naming_symbols.private_constants_symbols.required_modifiers = const + +# Private fields symbols +dotnet_naming_symbols.private_instance_fields_symbols.applicable_accessibilities = private +dotnet_naming_symbols.private_instance_fields_symbols.applicable_kinds = field +dotnet_naming_symbols.private_static_fields_symbols.applicable_accessibilities = private + +# Private static fields symbols +dotnet_naming_symbols.private_static_fields_symbols.applicable_kinds = field +dotnet_naming_symbols.private_static_fields_symbols.required_modifiers = static + +# Private static readonly symbols +dotnet_naming_symbols.private_static_readonly_symbols.applicable_accessibilities = private +dotnet_naming_symbols.private_static_readonly_symbols.applicable_kinds = field +dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = static,readonly + +# Public fields symbols +dotnet_naming_symbols.public_fields_symbols.applicable_accessibilities = public +dotnet_naming_symbols.public_fields_symbols.applicable_kinds = field + +# Non-public static readonly fields symbols +dotnet_naming_symbols.static_readonly_symbols.applicable_accessibilities = public,internal,protected,protected_internal,private_protected +dotnet_naming_symbols.static_readonly_symbols.applicable_kinds = field +dotnet_naming_symbols.static_readonly_symbols.required_modifiers = static,readonly + +# Avoid binary operators +dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:none +dotnet_style_parentheses_in_other_binary_operators = never_if_unnecessary:none +dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:none + +dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion +dotnet_style_predefined_type_for_member_access = true:suggestion + +# Avoid 'this.' if unnecessary +dotnet_style_qualification_for_event = false:suggestion +dotnet_style_qualification_for_field = false:suggestion +dotnet_style_qualification_for_method = false:suggestion +dotnet_style_qualification_for_property = false:suggestion + +# Prefer explicit access modifiers +dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion + +# ReSharper properties +resharper_autodetect_indent_settings = true +resharper_indent_preprocessor_directives = normal +resharper_space_within_single_line_array_initializer_braces = false +resharper_use_indent_from_vs = false + +# ReSharper inspection severities +resharper_arrange_redundant_parentheses_highlighting = hint +resharper_arrange_this_qualifier_highlighting = hint +resharper_arrange_type_member_modifiers_highlighting = hint +resharper_arrange_type_modifiers_highlighting = hint +resharper_built_in_type_reference_style_for_member_access_highlighting = hint +resharper_built_in_type_reference_style_highlighting = hint +resharper_redundant_base_qualifier_highlighting = warning +resharper_suggest_var_or_type_built_in_types_highlighting = hint +resharper_suggest_var_or_type_elsewhere_highlighting = hint +resharper_suggest_var_or_type_simple_types_highlighting = hint +resharper_web_config_module_not_resolved_highlighting = warning +resharper_web_config_type_not_resolved_highlighting = warning +resharper_web_config_wrong_module_highlighting = warning + +[{*.har,*.inputactions,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.stylelintrc,bowerrc,jest.config}] +indent_style = space +indent_size = 2 + +[*.{appxmanifest,asax,ascx,aspx,axaml,build,cg,cginc,compute,cs,cshtml,dtd,fs,fsi,fsscript,fsx,hlsl,hlsli,hlslinc,master,ml,mli,nuspec,paml,razor,resw,resx,shader,skin,usf,ush,vb,xaml,xamlx,xoml,xsd}] +indent_style = space +indent_size = 4 +tab_width = 4 diff --git a/.github/README.md b/.github/README.md deleted file mode 100644 index 447407a56..000000000 --- a/.github/README.md +++ /dev/null @@ -1,22 +0,0 @@ -# SMLHelper -SMLHelper is a complete library that helps you out on your Subnautica modding adventures by making adding new items, changing items, adding models, sprites a LOT easier. -Check out [the wiki page](https://github.com/SMLHelper/SMLHelper/wiki) for details on how to use it. - -## Contributing -We would love to have people contribute to SMLHelper. -To get started, first fork the repo and then clone it to your local environment. - -- As of version 2.8, SMLHelper has been updated for QModManager v4.0 and uses [HarmonyX](https://github.com/BepInEx/HarmonyX). - -Make sure to use the _publicized_ versions of `Assembly-CSharp.dll` and `Assembly-CSharp-firstpass.dll` (the originals being located in your `Subnautica_Data/Managed` folder). - -To create your own publicized DLLs, install the [BepinEx Plugin](https://github.com/elliotttate/Bepinex-Tools/releases) and run the game once to create the following files: - -* `Subnautica_Data\Managed\publicized_assemblies\Assembly-CSharp_publicized.dll` -* `Subnautica_Data\Managed\publicized_assemblies\Assembly-CSharp-firstpass_publicized.dll` - -Copy these DLLs into the `Dependencies` folder of SMLHelper so you can build it. Publicized version of the assemblies should make you able to call non-public members without reflection. - -- As of version 3.0, SMLHelper developers are required to have .NET 7 installed for the project to build. - -Then, load up the solution, make your edits, then create your Pull Request! diff --git a/.github/workflows/version-checker.yml b/.github/workflows/version-checker.yml deleted file mode 100644 index fbe411363..000000000 --- a/.github/workflows/version-checker.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: Version Checker - -on: - pull_request: - branches: - - master - -jobs: - analyse: - name: Analyse - runs-on: ubuntu-latest - steps: - - - name: Checkout pull request branch - uses: actions/checkout@v2 - - - name: Checkout master branch - uses: actions/checkout@v2 - with: - ref: master - path: ./master - - - name: Perform version check - id: version_check - uses: SubnauticaModding/Action-Version-Checker@master - with: - files: | - SMLHelper/Properties/AssemblyInfo.cs | /\[assembly: Assembly(?:File)?Version\("([0-9.]+)"\)\]/g - master_repo_path: ./master - - - name: Add annotations - uses: Attest/annotations-action@v1.0.7 - with: - path: ${{ steps.version_check.outputs.annotations_path }} - title: Annotate - token: ${{ secrets.GITHUB_TOKEN }} - - - name: Report status - run: | - if [[ -f ${{ steps.version_check.outputs.failed_check_path }} ]] ; then - exit 1 - else - exit 0 - fi diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..6eecff650 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,28 @@ +# Contributing + +## Preferred conventions and code style +* For commiting, we encourage [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/#summary). +* We encourage [access modifiers](https://learn.microsoft.com/en-us/dotnet/csharp/programming-guide/classes-and-structs/access-modifiers) to be specified explicitly with no exceptions. +* Keep access modifiers as strict as possible (E.G: Do not default everything to `public` when they're not meant for public access). +* Unity messages (Awake, Start, Update etc..) should always be `private`. +* Remove unused `using` statements. Many IDEs offer shortcuts to perform this action. +* For namespaces, use [File Scoped Namespaces](https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/proposals/csharp-10.0/file-scoped-namespaces). + +## Setup +1. Download and install [.NET 7](https://dotnet.microsoft.com/en-us/download/dotnet/7.0) +2. Fork & clone the repository +3. Open the solution (.sln) file with your favorite IDE +4. Restore the dependencies by performing a NuGet restore via your IDE or by simply executing `dotnet restore` in a terminal +5. Make your changes, then submit a pull request. + +## Submitting a Pull Request +We expect submitted PRs to be functional and thoroughly tested in the game. Please make sure of the following: +* Your changes do not break existing mods. Be it in a new world/save, or existing ones +* Follow our [Pull Request Template](.github/PULL_REQUEST_TEMPLATE.md) +* Run code refactoring automations to match our [preferred styles](#preferred-conventions-and-code-style). + +If you are new to pull requests, read through [GitHub's Guide](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests). + +## Docs Contribution +If you're looking to contribute to the [docs](https://subnauticamodding.github.io/Nautilus), refer to our [Docs Guidelines](Documentation/README.md). + diff --git a/Directory.Build.props b/Directory.Build.props index 84e9c21db..2714463b7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,10 +1,10 @@ - SMLHelperDevs + Subnautica Modding embedded true - https://github.com/SubnauticaModding/SMLHelper - https://github.com/SubnauticaModding/SMLHelper + https://github.com/SubnauticaModding/Nautilus + https://github.com/SubnauticaModding/Nautilus git false false diff --git a/Example mod/ConfigExamples.cs b/Example mod/ConfigExamples.cs index 9b271b23b..17f315881 100644 --- a/Example mod/ConfigExamples.cs +++ b/Example mod/ConfigExamples.cs @@ -1,19 +1,21 @@ -namespace SMLHelper.Examples; +using Nautilus.Commands; +using Nautilus.Handlers; +using Nautilus.Json; +using Nautilus.Json.Attributes; +using Nautilus.Options; +using Nautilus.Options.Attributes; +using Nautilus.Utility; + +namespace Nautilus.Examples; using HarmonyLib; -using Commands; using Handlers; -using Json; -using Json.Attributes; -using Options; -using Options.Attributes; using UnityEngine; using BepInEx; using BepInEx.Logging; -using Utility; -[BepInPlugin("com.snmodding.smlhelper.configexample", "SMLHelper Config Example Mod", PluginInfo.PLUGIN_VERSION)] -[BepInDependency("com.snmodding.smlhelper")] +[BepInPlugin("com.snmodding.nautilus.configexample", "Nautilus Config Example Mod", PluginInfo.PLUGIN_VERSION)] +[BepInDependency("com.snmodding.nautilus")] public class ConfigExamples : BaseUnityPlugin { internal static ManualLogSource LogSource { get; private set; } @@ -130,13 +132,13 @@ public enum CustomChoice { One, Two, Three } /// launch and is the recommended setting. /// /// Both of these values allow for bitwise combinations of their options, so -/// [Menu("SMLHelper Example Mod", LoadOn = MenuAttribute.LoadEvents.MenuRegistered | MenuAttribute.LoadEvents.MenuOpened)] +/// [Menu("Nautilus Example Mod", LoadOn = MenuAttribute.LoadEvents.MenuRegistered | MenuAttribute.LoadEvents.MenuOpened)] /// is valid and will result in the values being loaded both on game start and also whenever the menu is opened. /// /// We could also specify a here to customise the name of the config file /// (defaults to "config") and an optional subfolder for the config file to reside in. /// -[Menu("SMLHelper Example Mod")] +[Menu("Nautilus Example Mod")] public class Config: ConfigFile { /// diff --git a/Example mod/CustomFabricatorExample.cs b/Example mod/CustomFabricatorExample.cs index 796cba7e3..9df2e3f76 100644 --- a/Example mod/CustomFabricatorExample.cs +++ b/Example mod/CustomFabricatorExample.cs @@ -1,16 +1,16 @@ using BepInEx; -using SMLHelper.Assets; -using SMLHelper.Assets.Gadgets; -using SMLHelper.Assets.PrefabTemplates; -using SMLHelper.Crafting; +using Nautilus.Assets; +using Nautilus.Assets.Gadgets; +using Nautilus.Assets.PrefabTemplates; +using Nautilus.Crafting; #if SUBNAUTICA using Ingredient = CraftData.Ingredient; #endif -namespace SMLHelper.Examples; +namespace Nautilus.Examples; -[BepInPlugin("com.snmodding.smlhelper.customfabricator", "SMLHelper Custom Fabricator Example Mod", PluginInfo.PLUGIN_VERSION)] -[BepInDependency("com.snmodding.smlhelper")] +[BepInPlugin("com.snmodding.nautilus.customfabricator", "Nautilus Custom Fabricator Example Mod", PluginInfo.PLUGIN_VERSION)] +[BepInDependency("com.snmodding.nautilus")] public class CustomFabricatorExample : BaseUnityPlugin { private void Awake() diff --git a/Example mod/CustomPrefabExamples.cs b/Example mod/CustomPrefabExamples.cs index 8c61880d3..5989c0040 100644 --- a/Example mod/CustomPrefabExamples.cs +++ b/Example mod/CustomPrefabExamples.cs @@ -1,14 +1,14 @@ using BepInEx; -using SMLHelper.Assets; -using SMLHelper.Assets.Gadgets; -using SMLHelper.Assets.PrefabTemplates; +using Nautilus.Assets; +using Nautilus.Assets.Gadgets; +using Nautilus.Assets.PrefabTemplates; using UnityEngine; using BiomeData = LootDistributionData.BiomeData; -namespace SMLHelper.Examples; +namespace Nautilus.Examples; -[BepInPlugin("com.snmodding.smlhelper.customprefab", "SMLHelper Custom Prefab Example Mod", PluginInfo.PLUGIN_VERSION)] -[BepInDependency("com.snmodding.smlhelper")] +[BepInPlugin("com.snmodding.nautilus.customprefab", "Nautilus Custom Prefab Example Mod", Nautilus.PluginInfo.PLUGIN_VERSION)] +[BepInDependency("com.snmodding.nautilus")] public class CustomPrefabExamples : BaseUnityPlugin { private void Awake() diff --git a/Example mod/Example mod.csproj b/Example mod/Example mod.csproj index d7245de36..fa1791b48 100644 --- a/Example mod/Example mod.csproj +++ b/Example mod/Example mod.csproj @@ -4,78 +4,44 @@ net472 false false - SMLHelper.Examples - ExampleMod + Nautilus.Examples + Nautilus.Example true true AnyCPU latest - SN.STABLE;BZ.EXP;SN.EXP;BZ.STABLE + SN.STABLE;BZ.STABLE AnyCPU - Copyright © 2019 + Copyright © 2023 false false - false - None bin\SN.STABLE\ SUBNAUTICA;SUBNAUTICA_STABLE - - bin\SN.EXP\ - SUBNAUTICA;SUBNAUTICA_EXP - bin\BZ.STABLE\ BELOWZERO;BELOWZERO_STABLE - - bin\BZ.EXP\ - BELOWZERO;BELOWZERO_EXP - - - $(Dependencies)\0Harmony.dll - False - - - $(Dependencies)\Assembly-CSharp-firstpass_publicized.dll - False - - - $(Dependencies)\Assembly-CSharp_publicized.dll - False - - - $(Dependencies)\UnityEngine.dll - False - - - $(Dependencies)\UnityEngine.CoreModule.dll - False - - - $(Dependencies)\UnityEngine.UI.dll - False - - + False - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - + \ No newline at end of file diff --git a/Example mod/LocalizationExample.cs b/Example mod/LocalizationExample.cs index 70f3bc86f..b18cca555 100644 --- a/Example mod/LocalizationExample.cs +++ b/Example mod/LocalizationExample.cs @@ -1,13 +1,13 @@ using System.Collections.Generic; using BepInEx; -using SMLHelper.Assets; -using SMLHelper.Assets.PrefabTemplates; -using SMLHelper.Handlers; +using Nautilus.Assets; +using Nautilus.Assets.PrefabTemplates; +using Nautilus.Handlers; -namespace SMLHelper.Examples; +namespace Nautilus.Examples; -[BepInPlugin("com.snmodding.smlhelper.localizaion", "SMLHelper Localization Example Mod", PluginInfo.PLUGIN_VERSION)] -[BepInDependency("com.snmodding.smlhelper")] +[BepInPlugin("com.snmodding.nautilus.localizaion", "Nautilus Localization Example Mod", Nautilus.PluginInfo.PLUGIN_VERSION)] +[BepInDependency("com.snmodding.nautilus")] public class LocalizationExample : BaseUnityPlugin { /* @@ -38,7 +38,7 @@ private void Awake() * Registers a folder as localization folder. * This folder must contain json files that are named after the language they translate. * For example, English translation must be named English.json and Spanish translation must be named Spanish.json. - * SML expects this folder to be located in the mod folder at ModName/Localization by default. + * Nautilus expects this folder to be located in the mod folder at ModName/Localization by default. */ LanguageHandler.RegisterLocalizationFolder(); #else diff --git a/.github/LICENSE.md b/LICENSE.md similarity index 100% rename from .github/LICENSE.md rename to LICENSE.md diff --git a/Nautilus.sln b/Nautilus.sln new file mode 100644 index 000000000..f39b1f91a --- /dev/null +++ b/Nautilus.sln @@ -0,0 +1,42 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.1.32210.238 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nautilus", "Nautilus\Nautilus.csproj", "{418502DD-372D-4EF9-8021-B262552DFEDE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Example mod", "Example mod\Example mod.csproj", "{C8FB0981-77D2-47C7-BBEF-A3A9EBACACBF}" + ProjectSection(ProjectDependencies) = postProject + {418502DD-372D-4EF9-8021-B262552DFEDE} = {418502DD-372D-4EF9-8021-B262552DFEDE} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5152F028-6D03-43C0-88C5-986313017D4F}" + ProjectSection(SolutionItems) = preProject + common.props = common.props + Version.targets = Version.targets + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + BZ.STABLE|Any CPU = BZ.STABLE|Any CPU + SN.STABLE|Any CPU = SN.STABLE|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {418502DD-372D-4EF9-8021-B262552DFEDE}.BZ.STABLE|Any CPU.ActiveCfg = BZ.STABLE|Any CPU + {418502DD-372D-4EF9-8021-B262552DFEDE}.BZ.STABLE|Any CPU.Build.0 = BZ.STABLE|Any CPU + {418502DD-372D-4EF9-8021-B262552DFEDE}.SN.STABLE|Any CPU.ActiveCfg = SN.STABLE|Any CPU + {418502DD-372D-4EF9-8021-B262552DFEDE}.SN.STABLE|Any CPU.Build.0 = SN.STABLE|Any CPU + {C8FB0981-77D2-47C7-BBEF-A3A9EBACACBF}.BZ.STABLE|Any CPU.ActiveCfg = BZ.STABLE|Any CPU + {C8FB0981-77D2-47C7-BBEF-A3A9EBACACBF}.BZ.STABLE|Any CPU.Build.0 = BZ.STABLE|Any CPU + {C8FB0981-77D2-47C7-BBEF-A3A9EBACACBF}.SN.STABLE|Any CPU.ActiveCfg = SN.STABLE|Any CPU + {C8FB0981-77D2-47C7-BBEF-A3A9EBACACBF}.SN.STABLE|Any CPU.Build.0 = SN.STABLE|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {DA2C5D3D-5F61-4EA3-9399-FDEF43184299} + EndGlobalSection +EndGlobal diff --git a/SMLHelper/Assets/BelowZeroModSprite.cs b/Nautilus/Assets/BelowZeroModSprite.cs similarity index 99% rename from SMLHelper/Assets/BelowZeroModSprite.cs rename to Nautilus/Assets/BelowZeroModSprite.cs index 14eb6d40f..1ac2efe21 100644 --- a/SMLHelper/Assets/BelowZeroModSprite.cs +++ b/Nautilus/Assets/BelowZeroModSprite.cs @@ -1,5 +1,5 @@ #if BELOWZERO -namespace SMLHelper.Assets +namespace Nautilus.Assets { using System; using System.Collections.Generic; diff --git a/SMLHelper/Assets/CustomModelData.cs b/Nautilus/Assets/CustomModelData.cs similarity index 96% rename from SMLHelper/Assets/CustomModelData.cs rename to Nautilus/Assets/CustomModelData.cs index abd634f3c..8ece88cf4 100644 --- a/SMLHelper/Assets/CustomModelData.cs +++ b/Nautilus/Assets/CustomModelData.cs @@ -1,9 +1,9 @@ -namespace SMLHelper.Assets; +using UnityEngine; -using UnityEngine; +namespace Nautilus.Assets; /// -/// Custom Model data that SMLHelper will use to apply custom looks to certain prefabs. +/// Custom Model data that Nautilus will use to apply custom looks to certain prefabs. /// public class CustomModelData { diff --git a/SMLHelper/Assets/CustomPrefab.cs b/Nautilus/Assets/CustomPrefab.cs similarity index 96% rename from SMLHelper/Assets/CustomPrefab.cs rename to Nautilus/Assets/CustomPrefab.cs index 44b25686f..e593151ec 100644 --- a/SMLHelper/Assets/CustomPrefab.cs +++ b/Nautilus/Assets/CustomPrefab.cs @@ -2,21 +2,21 @@ using System.Collections; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using SMLHelper.Assets.Gadgets; -using SMLHelper.Assets.PrefabTemplates; -using SMLHelper.Handlers; -using SMLHelper.Utility; +using Nautilus.Assets.Gadgets; +using Nautilus.Assets.PrefabTemplates; +using Nautilus.Handlers; +using Nautilus.Utility; using UnityEngine; -namespace SMLHelper.Assets; +namespace Nautilus.Assets; /// -/// A delegate for prefab construction used by SMLHelper to create game objects dynamically. +/// A delegate for prefab construction used by Nautilus to create game objects dynamically. /// public delegate IEnumerator PrefabFactoryAsync(TaskResult gameObject); /// -/// Delegate used for SMLHelper's prefab post processing event to modify the processed prefab via a dynamic method. +/// Delegate used for Nautilus's prefab post processing event to modify the processed prefab via a dynamic method. /// public delegate IEnumerator PrefabPostProcessorAsync(GameObject gameObject); @@ -36,7 +36,7 @@ public interface ICustomPrefab PrefabFactoryAsync Prefab { get; } /// - /// Function that will be executed after the SMLHelper's basic processing for has been completed. + /// Function that will be executed after the Nautilus's basic processing for has been completed. /// PrefabPostProcessorAsync OnPrefabPostProcess { get; } diff --git a/SMLHelper/Assets/Gadgets/CraftingGadget.cs b/Nautilus/Assets/Gadgets/CraftingGadget.cs similarity index 96% rename from SMLHelper/Assets/Gadgets/CraftingGadget.cs rename to Nautilus/Assets/Gadgets/CraftingGadget.cs index 287af44d5..844ca879a 100644 --- a/SMLHelper/Assets/Gadgets/CraftingGadget.cs +++ b/Nautilus/Assets/Gadgets/CraftingGadget.cs @@ -1,10 +1,9 @@ using System.Diagnostics.CodeAnalysis; -using SMLHelper.Assets.Gadgets; -using SMLHelper.Crafting; -using SMLHelper.Handlers; -using SMLHelper.Utility; +using Nautilus.Crafting; +using Nautilus.Handlers; +using Nautilus.Utility; -namespace SMLHelper.Assets.Gadgets; +namespace Nautilus.Assets.Gadgets; /// /// Represents a crafting gadget diff --git a/SMLHelper/Assets/Gadgets/EquipmentGadget.cs b/Nautilus/Assets/Gadgets/EquipmentGadget.cs similarity index 95% rename from SMLHelper/Assets/Gadgets/EquipmentGadget.cs rename to Nautilus/Assets/Gadgets/EquipmentGadget.cs index 9dd521b5c..08aef1cc9 100644 --- a/SMLHelper/Assets/Gadgets/EquipmentGadget.cs +++ b/Nautilus/Assets/Gadgets/EquipmentGadget.cs @@ -1,8 +1,8 @@ using System.Diagnostics.CodeAnalysis; -using SMLHelper.Handlers; -using SMLHelper.Utility; +using Nautilus.Handlers; +using Nautilus.Utility; -namespace SMLHelper.Assets.Gadgets; +namespace Nautilus.Assets.Gadgets; /// /// Represents an equipment gadget diff --git a/SMLHelper/Assets/Gadgets/FabricatorGadget.cs b/Nautilus/Assets/Gadgets/FabricatorGadget.cs similarity index 97% rename from SMLHelper/Assets/Gadgets/FabricatorGadget.cs rename to Nautilus/Assets/Gadgets/FabricatorGadget.cs index acbe8503d..02aeed6e1 100644 --- a/SMLHelper/Assets/Gadgets/FabricatorGadget.cs +++ b/Nautilus/Assets/Gadgets/FabricatorGadget.cs @@ -1,15 +1,15 @@ using System; using System.Collections.Generic; -using SMLHelper.Crafting; -using SMLHelper.Handlers; -using SMLHelper.Utility; +using Nautilus.Crafting; +using Nautilus.Handlers; +using Nautilus.Utility; #if SUBNAUTICA using Sprite = Atlas.Sprite; #elif BELOWZERO using Sprite = UnityEngine.Sprite; #endif -namespace SMLHelper.Assets.Gadgets; +namespace Nautilus.Assets.Gadgets; /// /// Represents a craft tree/fabricator gadget. diff --git a/SMLHelper/Assets/Gadgets/Gadget.cs b/Nautilus/Assets/Gadgets/Gadget.cs similarity index 94% rename from SMLHelper/Assets/Gadgets/Gadget.cs rename to Nautilus/Assets/Gadgets/Gadget.cs index 8f7794c96..9ad1318a7 100644 --- a/SMLHelper/Assets/Gadgets/Gadget.cs +++ b/Nautilus/Assets/Gadgets/Gadget.cs @@ -1,6 +1,6 @@ -using SMLHelper.Utility; +using Nautilus.Utility; -namespace SMLHelper.Assets.Gadgets; +namespace Nautilus.Assets.Gadgets; /// /// Represents a class that handles registers to game code. diff --git a/SMLHelper/Assets/Gadgets/GadgetExtensions.cs b/Nautilus/Assets/Gadgets/GadgetExtensions.cs similarity index 98% rename from SMLHelper/Assets/Gadgets/GadgetExtensions.cs rename to Nautilus/Assets/Gadgets/GadgetExtensions.cs index 12b94900e..cbb5acc52 100644 --- a/SMLHelper/Assets/Gadgets/GadgetExtensions.cs +++ b/Nautilus/Assets/Gadgets/GadgetExtensions.cs @@ -1,13 +1,13 @@ using System.IO; +using Nautilus.Crafting; +using Nautilus.Handlers; +using Nautilus.Json.Converters; +using Nautilus.Utility; using Newtonsoft.Json; -using SMLHelper.Crafting; -using SMLHelper.Handlers; -using SMLHelper.Json.Converters; -using SMLHelper.Utility; using UnityEngine; using UWE; -namespace SMLHelper.Assets.Gadgets; +namespace Nautilus.Assets.Gadgets; /// /// Represents extension methods for the class. diff --git a/SMLHelper/Assets/Gadgets/ScanningGadget.cs b/Nautilus/Assets/Gadgets/ScanningGadget.cs similarity index 98% rename from SMLHelper/Assets/Gadgets/ScanningGadget.cs rename to Nautilus/Assets/Gadgets/ScanningGadget.cs index 16c61899c..f572cccbd 100644 --- a/SMLHelper/Assets/Gadgets/ScanningGadget.cs +++ b/Nautilus/Assets/Gadgets/ScanningGadget.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using SMLHelper.Handlers; -using SMLHelper.Patchers; -using SMLHelper.Utility; +using Nautilus.Handlers; +using Nautilus.Patchers; +using Nautilus.Utility; using Story; using UnityEngine; -namespace SMLHelper.Assets.Gadgets; +namespace Nautilus.Assets.Gadgets; /// /// Represents a scanning gadget. diff --git a/SMLHelper/Assets/ModPrefabCache.cs b/Nautilus/Assets/ModPrefabCache.cs similarity index 95% rename from SMLHelper/Assets/ModPrefabCache.cs rename to Nautilus/Assets/ModPrefabCache.cs index 266ed8149..aa223f768 100644 --- a/SMLHelper/Assets/ModPrefabCache.cs +++ b/Nautilus/Assets/ModPrefabCache.cs @@ -1,10 +1,9 @@ -namespace SMLHelper.Assets; - -using SMLHelper.Utility; -using System; +using System; using System.Collections.Generic; +using Nautilus.Utility; using UnityEngine; +namespace Nautilus.Assets; /// /// Class used by to store game objects that used as prefabs. @@ -52,7 +51,7 @@ private static void Init() return; } - root = new GameObject("SMLHelper.PrefabCache", typeof(SceneCleanerPreserve), typeof(CacheCleaner)); + root = new GameObject("Nautilus.PrefabCache", typeof(SceneCleanerPreserve), typeof(CacheCleaner)); UnityEngine.Object.DontDestroyOnLoad(root); root.EnsureComponent(); diff --git a/SMLHelper/Assets/ModPrefabRequest.cs b/Nautilus/Assets/ModPrefabRequest.cs similarity index 92% rename from SMLHelper/Assets/ModPrefabRequest.cs rename to Nautilus/Assets/ModPrefabRequest.cs index a7b3de5a9..ac7b8c984 100644 --- a/SMLHelper/Assets/ModPrefabRequest.cs +++ b/Nautilus/Assets/ModPrefabRequest.cs @@ -1,12 +1,11 @@ -using SMLHelper.Handlers; -using SMLHelper.Utility; - -namespace SMLHelper.Assets; - -using System.Collections; +using System.Collections; +using Nautilus.Handlers; +using Nautilus.Utility; using UnityEngine; using UWE; +namespace Nautilus.Assets; + // request for getting ModPrefab asynchronously internal class ModPrefabRequest: IPrefabRequest, IEnumerator { diff --git a/SMLHelper/Assets/PrefabInfo.cs b/Nautilus/Assets/PrefabInfo.cs similarity index 96% rename from SMLHelper/Assets/PrefabInfo.cs rename to Nautilus/Assets/PrefabInfo.cs index 4976cad49..51a911f0a 100644 --- a/SMLHelper/Assets/PrefabInfo.cs +++ b/Nautilus/Assets/PrefabInfo.cs @@ -1,11 +1,9 @@ -using System.Diagnostics; -using System.Reflection; -using SMLHelper.Utility; +using System.Reflection; +using Nautilus.Handlers; +using Nautilus.Utility; using UnityEngine; -namespace SMLHelper.Assets; - -using Handlers; +namespace Nautilus.Assets; /// /// Data class that represents information about a prefab. diff --git a/SMLHelper/Assets/PrefabTemplates/CloneTemplate.cs b/Nautilus/Assets/PrefabTemplates/CloneTemplate.cs similarity index 98% rename from SMLHelper/Assets/PrefabTemplates/CloneTemplate.cs rename to Nautilus/Assets/PrefabTemplates/CloneTemplate.cs index b11f45257..fa529a00c 100644 --- a/SMLHelper/Assets/PrefabTemplates/CloneTemplate.cs +++ b/Nautilus/Assets/PrefabTemplates/CloneTemplate.cs @@ -1,10 +1,10 @@ using System.Collections; using System.Collections.Generic; -using SMLHelper.Utility; +using Nautilus.Utility; using UnityEngine; using UWE; -namespace SMLHelper.Assets.PrefabTemplates; +namespace Nautilus.Assets.PrefabTemplates; /// /// Represents a prefab clone template. diff --git a/SMLHelper/Assets/PrefabTemplates/EnergySourceTemplate.cs b/Nautilus/Assets/PrefabTemplates/EnergySourceTemplate.cs similarity index 97% rename from SMLHelper/Assets/PrefabTemplates/EnergySourceTemplate.cs rename to Nautilus/Assets/PrefabTemplates/EnergySourceTemplate.cs index 890a397bf..5842f8ed3 100644 --- a/SMLHelper/Assets/PrefabTemplates/EnergySourceTemplate.cs +++ b/Nautilus/Assets/PrefabTemplates/EnergySourceTemplate.cs @@ -1,9 +1,9 @@ using System; using System.Collections; -using SMLHelper.Utility; +using Nautilus.Utility; using UnityEngine; -namespace SMLHelper.Assets.PrefabTemplates; +namespace Nautilus.Assets.PrefabTemplates; /// /// Represents an energy source template. This template is capable of returning a Battery or a Power Cell. diff --git a/SMLHelper/Assets/PrefabTemplates/FabricatorTemplate.cs b/Nautilus/Assets/PrefabTemplates/FabricatorTemplate.cs similarity index 99% rename from SMLHelper/Assets/PrefabTemplates/FabricatorTemplate.cs rename to Nautilus/Assets/PrefabTemplates/FabricatorTemplate.cs index ee38f1779..5d3354d45 100644 --- a/SMLHelper/Assets/PrefabTemplates/FabricatorTemplate.cs +++ b/Nautilus/Assets/PrefabTemplates/FabricatorTemplate.cs @@ -1,11 +1,11 @@ using System; using System.Collections; -using SMLHelper.Utility; +using Nautilus.Utility; using UnityEngine; using UWE; using Object = UnityEngine.Object; -namespace SMLHelper.Assets.PrefabTemplates; +namespace Nautilus.Assets.PrefabTemplates; /// /// Represents an fabricator template. This template is capable of returning a Fabricator or a Workbench. diff --git a/SMLHelper/Assets/PrefabTemplates/PrefabTemplate.cs b/Nautilus/Assets/PrefabTemplates/PrefabTemplate.cs similarity index 96% rename from SMLHelper/Assets/PrefabTemplates/PrefabTemplate.cs rename to Nautilus/Assets/PrefabTemplates/PrefabTemplate.cs index 31b40aa3f..7f0186b85 100644 --- a/SMLHelper/Assets/PrefabTemplates/PrefabTemplate.cs +++ b/Nautilus/Assets/PrefabTemplates/PrefabTemplate.cs @@ -1,7 +1,7 @@ using System.Collections; using UnityEngine; -namespace SMLHelper.Assets.PrefabTemplates; +namespace Nautilus.Assets.PrefabTemplates; /// /// Represents the contract for a prefab template. diff --git a/SMLHelper/Assets/SpawnLocation.cs b/Nautilus/Assets/SpawnLocation.cs similarity index 93% rename from SMLHelper/Assets/SpawnLocation.cs rename to Nautilus/Assets/SpawnLocation.cs index a730d8473..48d1be381 100644 --- a/SMLHelper/Assets/SpawnLocation.cs +++ b/Nautilus/Assets/SpawnLocation.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace SMLHelper.Assets; +namespace Nautilus.Assets; /// /// Defines the spawn location with world position and optional euler angles. Used in the Coordinated Spawns system. diff --git a/SMLHelper/Assets/SubnauticaModSprite.cs b/Nautilus/Assets/SubnauticaModSprite.cs similarity index 97% rename from SMLHelper/Assets/SubnauticaModSprite.cs rename to Nautilus/Assets/SubnauticaModSprite.cs index ef0407870..f05ed37e0 100644 --- a/SMLHelper/Assets/SubnauticaModSprite.cs +++ b/Nautilus/Assets/SubnauticaModSprite.cs @@ -1,10 +1,10 @@ -#if SUBNAUTICA -namespace SMLHelper.Assets -{ - using System; - using System.Collections.Generic; - using SMLHelper.Utility; +using System; +using System.Collections.Generic; +using Nautilus.Utility; +#if SUBNAUTICA +namespace Nautilus.Assets +{ /// /// A class that handles a custom sprite and what item it is associated to. /// diff --git a/SMLHelper/Commands/ConsoleCommand.cs b/Nautilus/Commands/ConsoleCommand.cs similarity index 99% rename from SMLHelper/Commands/ConsoleCommand.cs rename to Nautilus/Commands/ConsoleCommand.cs index 6cdced699..6955feb76 100644 --- a/SMLHelper/Commands/ConsoleCommand.cs +++ b/Nautilus/Commands/ConsoleCommand.cs @@ -1,10 +1,10 @@ -namespace SMLHelper.Commands; - -using HarmonyLib; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Reflection; +using HarmonyLib; + +namespace Nautilus.Commands; /// /// Represents a console command. diff --git a/SMLHelper/Commands/ConsoleCommandAttribute.cs b/Nautilus/Commands/ConsoleCommandAttribute.cs similarity index 96% rename from SMLHelper/Commands/ConsoleCommandAttribute.cs rename to Nautilus/Commands/ConsoleCommandAttribute.cs index 344bfb364..eb827fbb4 100644 --- a/SMLHelper/Commands/ConsoleCommandAttribute.cs +++ b/Nautilus/Commands/ConsoleCommandAttribute.cs @@ -1,7 +1,7 @@ -namespace SMLHelper.Commands; +using System; +using Nautilus.Handlers; -using Handlers; -using System; +namespace Nautilus.Commands; /// /// Attribute used to signify the decorated method should be called in response to a console command. @@ -15,7 +15,7 @@ /// /// If the method has a return type, it will be printed to both the screen and the log. /// -/// +/// /// /// /// diff --git a/SMLHelper/Commands/Parameter.cs b/Nautilus/Commands/Parameter.cs similarity index 97% rename from SMLHelper/Commands/Parameter.cs rename to Nautilus/Commands/Parameter.cs index 3b84eebe1..c24ee012e 100644 --- a/SMLHelper/Commands/Parameter.cs +++ b/Nautilus/Commands/Parameter.cs @@ -1,12 +1,12 @@  -namespace SMLHelper.Commands; - using System; using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Reflection; +namespace Nautilus.Commands; + internal struct Parameter { private static Dictionary> TypeConverters = new() diff --git a/SMLHelper/Crafting/CraftingNode.cs b/Nautilus/Crafting/CraftingNode.cs similarity index 87% rename from SMLHelper/Crafting/CraftingNode.cs rename to Nautilus/Crafting/CraftingNode.cs index 74ac43c82..110bb3f47 100644 --- a/SMLHelper/Crafting/CraftingNode.cs +++ b/Nautilus/Crafting/CraftingNode.cs @@ -1,4 +1,4 @@ -namespace SMLHelper.Crafting; +namespace Nautilus.Crafting; internal class CraftingNode : Node { diff --git a/SMLHelper/Crafting/ModCraftTreeCraft.cs b/Nautilus/Crafting/ModCraftTreeCraft.cs similarity index 91% rename from SMLHelper/Crafting/ModCraftTreeCraft.cs rename to Nautilus/Crafting/ModCraftTreeCraft.cs index 2be36dac4..19bccef7d 100644 --- a/SMLHelper/Crafting/ModCraftTreeCraft.cs +++ b/Nautilus/Crafting/ModCraftTreeCraft.cs @@ -1,4 +1,4 @@ -namespace SMLHelper.Crafting; +namespace Nautilus.Crafting; /// /// A crafting node of a CraftTree. This is the last node on a tree; The one that actually crafts something. diff --git a/SMLHelper/Crafting/ModCraftTreeLinkingNode.cs b/Nautilus/Crafting/ModCraftTreeLinkingNode.cs similarity index 98% rename from SMLHelper/Crafting/ModCraftTreeLinkingNode.cs rename to Nautilus/Crafting/ModCraftTreeLinkingNode.cs index 79ac458ae..0a132a9b6 100644 --- a/SMLHelper/Crafting/ModCraftTreeLinkingNode.cs +++ b/Nautilus/Crafting/ModCraftTreeLinkingNode.cs @@ -1,11 +1,9 @@ -using SMLHelper.Handlers; - -namespace SMLHelper.Crafting; - -using System.Collections.Generic; +using System.Collections.Generic; +using Nautilus.Handlers; using UnityEngine; using UnityEngine.Assertions; -using Utility; + +namespace Nautilus.Crafting; /// /// Abstract class that provides methods for adding new nodes into the crafting tree. diff --git a/SMLHelper/Crafting/ModCraftTreeNode.cs b/Nautilus/Crafting/ModCraftTreeNode.cs similarity index 97% rename from SMLHelper/Crafting/ModCraftTreeNode.cs rename to Nautilus/Crafting/ModCraftTreeNode.cs index f8d52d0c0..f41bc023e 100644 --- a/SMLHelper/Crafting/ModCraftTreeNode.cs +++ b/Nautilus/Crafting/ModCraftTreeNode.cs @@ -1,6 +1,6 @@ -namespace SMLHelper.Crafting; +using UnityEngine.Assertions; -using UnityEngine.Assertions; +namespace Nautilus.Crafting; /// /// Basic data structure of a crafting tree node. diff --git a/SMLHelper/Crafting/ModCraftTreeRoot.cs b/Nautilus/Crafting/ModCraftTreeRoot.cs similarity index 98% rename from SMLHelper/Crafting/ModCraftTreeRoot.cs rename to Nautilus/Crafting/ModCraftTreeRoot.cs index 8010c2c80..58b329d31 100644 --- a/SMLHelper/Crafting/ModCraftTreeRoot.cs +++ b/Nautilus/Crafting/ModCraftTreeRoot.cs @@ -1,12 +1,11 @@ -namespace SMLHelper.Crafting; - -using System; +using System; using System.Collections.Generic; -using SMLHelper.Assets; -using SMLHelper.Utility; using System.Linq; -using SMLHelper.Handlers; - +using Nautilus.Handlers; +using Nautilus.Utility; + +namespace Nautilus.Crafting; + /// /// The root node of a CraftTree. The whole tree starts here. /// Build up your custom crafting tree from this root node using the AddCraftingNode and AddTabNode methods.
diff --git a/SMLHelper/Crafting/ModCraftTreeTab.cs b/Nautilus/Crafting/ModCraftTreeTab.cs similarity index 95% rename from SMLHelper/Crafting/ModCraftTreeTab.cs rename to Nautilus/Crafting/ModCraftTreeTab.cs index 7eda6bbfd..c33327242 100644 --- a/SMLHelper/Crafting/ModCraftTreeTab.cs +++ b/Nautilus/Crafting/ModCraftTreeTab.cs @@ -1,12 +1,10 @@ -using SMLHelper.Handlers; -using SMLHelper.Utility; - -namespace SMLHelper.Crafting; - -using Assets; -using Patchers; +using Nautilus.Assets; +using Nautilus.Handlers; +using Nautilus.Utility; using UnityEngine; +namespace Nautilus.Crafting; + /// /// A tab node of a CraftTree. Tab nodes help organize crafting nodes by grouping them into categories. /// diff --git a/SMLHelper/Crafting/Node.cs b/Nautilus/Crafting/Node.cs similarity index 87% rename from SMLHelper/Crafting/Node.cs rename to Nautilus/Crafting/Node.cs index 547b716df..badaa445d 100644 --- a/SMLHelper/Crafting/Node.cs +++ b/Nautilus/Crafting/Node.cs @@ -1,4 +1,4 @@ -namespace SMLHelper.Crafting; +namespace Nautilus.Crafting; internal class Node { diff --git a/SMLHelper/Crafting/RecipeData.cs b/Nautilus/Crafting/RecipeData.cs similarity index 98% rename from SMLHelper/Crafting/RecipeData.cs rename to Nautilus/Crafting/RecipeData.cs index 2a956c807..f7d92a27e 100644 --- a/SMLHelper/Crafting/RecipeData.cs +++ b/Nautilus/Crafting/RecipeData.cs @@ -1,7 +1,8 @@ -namespace SMLHelper.Crafting; - -using System.Collections.Generic; +using System.Collections.Generic; using Newtonsoft.Json; + +namespace Nautilus.Crafting; + #if SUBNAUTICA using static CraftData; #endif diff --git a/SMLHelper/Crafting/TabNode.cs b/Nautilus/Crafting/TabNode.cs similarity index 89% rename from SMLHelper/Crafting/TabNode.cs rename to Nautilus/Crafting/TabNode.cs index 5d1ae3df5..b5c85ed0d 100644 --- a/SMLHelper/Crafting/TabNode.cs +++ b/Nautilus/Crafting/TabNode.cs @@ -1,7 +1,7 @@ -namespace SMLHelper.Crafting; +using Nautilus.Assets; +using Nautilus.Patchers; -using Assets; -using Patchers; +namespace Nautilus.Crafting; #if SUBNAUTICA using Sprite = Atlas.Sprite; diff --git a/SMLHelper/FMod/FModMultiSounds.cs b/Nautilus/FMod/FModMultiSounds.cs similarity index 97% rename from SMLHelper/FMod/FModMultiSounds.cs rename to Nautilus/FMod/FModMultiSounds.cs index df30d3080..dda463522 100644 --- a/SMLHelper/FMod/FModMultiSounds.cs +++ b/Nautilus/FMod/FModMultiSounds.cs @@ -1,13 +1,13 @@ -namespace SMLHelper.FMod; - -using System; using System.Linq; using FMOD; using FMOD.Studio; using FMODUnity; -using SMLHelper.FMod.Interfaces; -using SMLHelper.Utility; +using Nautilus.FMod.Interfaces; +using Nautilus.Utility; using UnityEngine; + +namespace Nautilus.FMod; + using Random = UnityEngine.Random; /// diff --git a/SMLHelper/FMod/Interfaces/IFModSound.cs b/Nautilus/FMod/Interfaces/IFModSound.cs similarity index 89% rename from SMLHelper/FMod/Interfaces/IFModSound.cs rename to Nautilus/FMod/Interfaces/IFModSound.cs index f1c80222d..c040075fb 100644 --- a/SMLHelper/FMod/Interfaces/IFModSound.cs +++ b/Nautilus/FMod/Interfaces/IFModSound.cs @@ -1,8 +1,7 @@ -namespace SMLHelper.FMod.Interfaces; - -using System; using FMOD; +namespace Nautilus.FMod.Interfaces; + /// /// This interface is used to integrate with . /// diff --git a/SMLHelper/Handlers/ConsoleCommandsHandler.cs b/Nautilus/Handlers/ConsoleCommandsHandler.cs similarity index 97% rename from SMLHelper/Handlers/ConsoleCommandsHandler.cs rename to Nautilus/Handlers/ConsoleCommandsHandler.cs index 16ea03200..b3fae50ce 100644 --- a/SMLHelper/Handlers/ConsoleCommandsHandler.cs +++ b/Nautilus/Handlers/ConsoleCommandsHandler.cs @@ -1,10 +1,10 @@ -namespace SMLHelper.Handlers; - -using HarmonyLib; -using Commands; -using SMLHelper.Patchers; -using System; +using System; using System.Reflection; +using HarmonyLib; +using Nautilus.Commands; +using Nautilus.Patchers; + +namespace Nautilus.Handlers; /// /// A handler class for registering your custom console commands. diff --git a/SMLHelper/Handlers/CoordinatedSpawnsHandler.cs b/Nautilus/Handlers/CoordinatedSpawnsHandler.cs similarity index 99% rename from SMLHelper/Handlers/CoordinatedSpawnsHandler.cs rename to Nautilus/Handlers/CoordinatedSpawnsHandler.cs index 9e904bf0b..b9e5466e8 100644 --- a/SMLHelper/Handlers/CoordinatedSpawnsHandler.cs +++ b/Nautilus/Handlers/CoordinatedSpawnsHandler.cs @@ -1,13 +1,12 @@ -using System.Linq; -using SMLHelper.Assets; - -namespace SMLHelper.Handlers; - using System; using System.Collections.Generic; -using UnityEngine; +using System.Linq; +using Nautilus.Assets; +using Nautilus.Patchers; using Newtonsoft.Json; -using Patchers; +using UnityEngine; + +namespace Nautilus.Handlers; /// /// a Handler that handles and registers Coordinated ( spawns). diff --git a/SMLHelper/Handlers/CraftDataHandler.cs b/Nautilus/Handlers/CraftDataHandler.cs similarity index 97% rename from SMLHelper/Handlers/CraftDataHandler.cs rename to Nautilus/Handlers/CraftDataHandler.cs index 370fa4d3f..847bde4d2 100644 --- a/SMLHelper/Handlers/CraftDataHandler.cs +++ b/Nautilus/Handlers/CraftDataHandler.cs @@ -1,6 +1,6 @@ -namespace SMLHelper.Handlers; +using Nautilus.Patchers; -using Patchers; +namespace Nautilus.Handlers; /// /// A handler class for adding and editing crafted items. diff --git a/SMLHelper/Handlers/CraftDataHandler_BelowZero.cs b/Nautilus/Handlers/CraftDataHandler_BelowZero.cs similarity index 93% rename from SMLHelper/Handlers/CraftDataHandler_BelowZero.cs rename to Nautilus/Handlers/CraftDataHandler_BelowZero.cs index 33e313fc2..67460eff2 100644 --- a/SMLHelper/Handlers/CraftDataHandler_BelowZero.cs +++ b/Nautilus/Handlers/CraftDataHandler_BelowZero.cs @@ -1,5 +1,5 @@ #if BELOWZERO -namespace SMLHelper.Handlers +namespace Nautilus.Handlers { using Crafting; using Patchers; @@ -54,22 +54,22 @@ public static void SetRecipeData(TechType techType, RecipeData recipeData) /// public static void SetIngredients(TechType techType, ICollection ingredients) { - if (!CraftDataPatcher.CustomRecipeData.TryGetValue(techType, out JsonValue smlJsonValue)) + if (!CraftDataPatcher.CustomRecipeData.TryGetValue(techType, out JsonValue jsonValue)) { - smlJsonValue = new JsonValue(); - CraftDataPatcher.CustomRecipeData.Add(techType, smlJsonValue); + jsonValue = new JsonValue(); + CraftDataPatcher.CustomRecipeData.Add(techType, jsonValue); } - if (!smlJsonValue.Contains(TechData.PropertyToID("ingredients"))) + if (!jsonValue.Contains(TechData.PropertyToID("ingredients"))) { - smlJsonValue.Add(TechData.PropertyToID("ingredients"), new JsonValue(JsonValue.Type.Array)); + jsonValue.Add(TechData.PropertyToID("ingredients"), new JsonValue(JsonValue.Type.Array)); } else { - smlJsonValue[TechData.PropertyToID("ingredients")] = new JsonValue(JsonValue.Type.Array); + jsonValue[TechData.PropertyToID("ingredients")] = new JsonValue(JsonValue.Type.Array); } - JsonValue ingredientslist = smlJsonValue[TechData.PropertyToID("ingredients")]; + JsonValue ingredientslist = jsonValue[TechData.PropertyToID("ingredients")]; int amount = TechData.PropertyToID("amount"); int tech = TechData.PropertyToID("techType"); @@ -96,22 +96,22 @@ public static void SetIngredients(TechType techType, ICollection ing /// public static void SetLinkedItems(TechType techType, ICollection linkedItems) { - if (!CraftDataPatcher.CustomRecipeData.TryGetValue(techType, out JsonValue smlJsonValue)) + if (!CraftDataPatcher.CustomRecipeData.TryGetValue(techType, out JsonValue jsonValue)) { CraftDataPatcher.CustomRecipeData.Add(techType, new JsonValue()); - smlJsonValue = CraftDataPatcher.CustomRecipeData[techType]; + jsonValue = CraftDataPatcher.CustomRecipeData[techType]; } - if (!smlJsonValue.Contains(TechData.PropertyToID("linkedItems"))) + if (!jsonValue.Contains(TechData.PropertyToID("linkedItems"))) { - smlJsonValue.Add(TechData.PropertyToID("linkedItems"), new JsonValue(JsonValue.Type.Array)); + jsonValue.Add(TechData.PropertyToID("linkedItems"), new JsonValue(JsonValue.Type.Array)); } else { - smlJsonValue[TechData.PropertyToID("linkedItems")] = new JsonValue(JsonValue.Type.Array); + jsonValue[TechData.PropertyToID("linkedItems")] = new JsonValue(JsonValue.Type.Array); } - JsonValue linkedItemslist = smlJsonValue[TechData.PropertyToID("linkedItems")]; + JsonValue linkedItemslist = jsonValue[TechData.PropertyToID("linkedItems")]; int current = 0; @@ -153,9 +153,9 @@ public static RecipeData GetRecipeData(TechType techType) } /// - /// Converts the Games JsonValue data into SMLHelpers RecipeData. + /// Converts the Games JsonValue data into Nautilus RecipeData. /// - /// public static RecipeData ConvertToRecipeData(JsonValue techData) { RecipeData currentRecipeData = new() @@ -221,7 +221,7 @@ public static void SetEquipmentType(TechType techType, EquipmentType equipmentTy /// /// Allows you to edit QuickSlotType for TechTypes. Can be used for existing TechTypes too. - /// Careful: This has to be called after . + /// Careful: This has to be called after . /// /// The TechType whose QuickSlotType you want to edit. /// The QuickSlotType for that TechType. diff --git a/SMLHelper/Handlers/CraftDataHandler_Subnautica.cs b/Nautilus/Handlers/CraftDataHandler_Subnautica.cs similarity index 97% rename from SMLHelper/Handlers/CraftDataHandler_Subnautica.cs rename to Nautilus/Handlers/CraftDataHandler_Subnautica.cs index bf1532c9b..9bb2da4af 100644 --- a/SMLHelper/Handlers/CraftDataHandler_Subnautica.cs +++ b/Nautilus/Handlers/CraftDataHandler_Subnautica.cs @@ -1,8 +1,9 @@ -#if SUBNAUTICA -namespace SMLHelper.Handlers +using Nautilus.Crafting; +using Nautilus.Patchers; + +#if SUBNAUTICA +namespace Nautilus.Handlers { - using Crafting; - using Patchers; #if SUBNAUTICA using static CraftData; #endif @@ -216,7 +217,7 @@ public static RecipeData GetRecipeData(TechType techType) } /// - /// Converts the games ITechData into SMLHelpers RecipeData. + /// Converts the games ITechData into Nautilus RecipeData. /// /// public static RecipeData ConvertToRecipeData(ITechData iTechData) @@ -226,8 +227,8 @@ public static RecipeData ConvertToRecipeData(ITechData iTechData) for (int i = 0; i < iTechData.ingredientCount; i++) { IIngredient ingredient = iTechData.GetIngredient(i); - var smlingredient = new Ingredient(ingredient.techType, ingredient.amount); - recipeData.Ingredients.Add(smlingredient); + var customIngredient = new Ingredient(ingredient.techType, ingredient.amount); + recipeData.Ingredients.Add(customIngredient); } for (int i = 0; i < iTechData.linkedItemCount; i++) diff --git a/SMLHelper/Handlers/CraftTreeHandler.cs b/Nautilus/Handlers/CraftTreeHandler.cs similarity index 98% rename from SMLHelper/Handlers/CraftTreeHandler.cs rename to Nautilus/Handlers/CraftTreeHandler.cs index 627132507..f98ba11ed 100644 --- a/SMLHelper/Handlers/CraftTreeHandler.cs +++ b/Nautilus/Handlers/CraftTreeHandler.cs @@ -1,10 +1,9 @@ -namespace SMLHelper.Handlers; +using System.Linq; +using Nautilus.Crafting; +using Nautilus.Patchers; +using Nautilus.Utility; -using System.Linq; -using Crafting; -using Patchers; -using UnityEngine; -using Utility; +namespace Nautilus.Handlers; /// /// A handler class for creating and editing of crafting trees. diff --git a/SMLHelper/Handlers/CustomSoundHandler.cs b/Nautilus/Handlers/CustomSoundHandler.cs similarity index 98% rename from SMLHelper/Handlers/CustomSoundHandler.cs rename to Nautilus/Handlers/CustomSoundHandler.cs index 86d1c4f78..cbb1289df 100644 --- a/SMLHelper/Handlers/CustomSoundHandler.cs +++ b/Nautilus/Handlers/CustomSoundHandler.cs @@ -1,13 +1,13 @@ -namespace SMLHelper.Handlers; - -using SMLHelper.FMod.Interfaces; -using FMOD; +using FMOD; using FMOD.Studio; using FMODUnity; -using SMLHelper.Patchers; +using Nautilus.FMod.Interfaces; +using Nautilus.Patchers; +using Nautilus.Utility; using UnityEngine; -using SMLHelper.Utility; - + +namespace Nautilus.Handlers; + /// /// A handler class for adding and overriding Sounds. /// diff --git a/SMLHelper/Handlers/EatableHandler.cs b/Nautilus/Handlers/EatableHandler.cs similarity index 97% rename from SMLHelper/Handlers/EatableHandler.cs rename to Nautilus/Handlers/EatableHandler.cs index 5b3639171..106b5a68b 100644 --- a/SMLHelper/Handlers/EatableHandler.cs +++ b/Nautilus/Handlers/EatableHandler.cs @@ -1,6 +1,6 @@ -namespace SMLHelper.Handlers; +using Nautilus.Patchers; -using Patchers; +namespace Nautilus.Handlers; /// /// A handler for editing values for eatable classes diff --git a/SMLHelper/Handlers/Enums/EnumBuilder.cs b/Nautilus/Handlers/Enums/EnumBuilder.cs similarity index 98% rename from SMLHelper/Handlers/Enums/EnumBuilder.cs rename to Nautilus/Handlers/Enums/EnumBuilder.cs index c131af735..2677e10d0 100644 --- a/SMLHelper/Handlers/Enums/EnumBuilder.cs +++ b/Nautilus/Handlers/Enums/EnumBuilder.cs @@ -2,10 +2,10 @@ using System.Linq; using System.Reflection; using BepInEx.Logging; -using SMLHelper.Utility; +using Nautilus.Utility; // ReSharper disable once CheckNamespace -namespace SMLHelper.Handlers; +namespace Nautilus.Handlers; /// /// Represents a custom enum object. This class cannot be inherited diff --git a/SMLHelper/Handlers/Enums/EnumHandler.cs b/Nautilus/Handlers/Enums/EnumHandler.cs similarity index 98% rename from SMLHelper/Handlers/Enums/EnumHandler.cs rename to Nautilus/Handlers/Enums/EnumHandler.cs index d1f620d28..134c1ddfb 100644 --- a/SMLHelper/Handlers/Enums/EnumHandler.cs +++ b/Nautilus/Handlers/Enums/EnumHandler.cs @@ -1,10 +1,9 @@ -using System.Diagnostics; - -namespace SMLHelper.Handlers; - -using System; +using System; using System.Reflection; -using SMLHelper.Utility; +using Nautilus.Utility; + +// Resharper +namespace Nautilus.Handlers; /// /// Class responsible to resolve anything related to adding custom enum objects. @@ -116,7 +115,7 @@ public static bool TryGetOwnerAssembly(TEnum modEnumValue, out Assembly a if (manager.TypesAddedBy.TryGetValue(modEnumValue.ToString(), out addedBy)) // Assembly Found return true; - // Was not added by a mod using SMLHelper. + // Was not added by a mod using Nautilus. return false; } diff --git a/SMLHelper/Handlers/Enums/Extensions/EnumExtensions.cs b/Nautilus/Handlers/Enums/Extensions/EnumExtensions.cs similarity index 85% rename from SMLHelper/Handlers/Enums/Extensions/EnumExtensions.cs rename to Nautilus/Handlers/Enums/Extensions/EnumExtensions.cs index 7d6db7bb5..a8288f2ea 100644 --- a/SMLHelper/Handlers/Enums/Extensions/EnumExtensions.cs +++ b/Nautilus/Handlers/Enums/Extensions/EnumExtensions.cs @@ -1,11 +1,10 @@ // ReSharper disable once CheckNamespace -namespace SMLHelper.Handlers; -using SMLHelper.Utility; +namespace Nautilus.Handlers; + using System; using System.Linq; -using System.Collections; -using System.Collections.Generic; +using Utility; /// /// Extensions to interact more with custom enum objects. @@ -13,14 +12,14 @@ namespace SMLHelper.Handlers; public static partial class EnumExtensions { /// - /// Checks if an enum value is defined by default or added using SMLHelper. + /// Checks if an enum value is defined by default or added using Nautilus. /// /// The enum value to look for. /// The type of the enum. /// if the specified enum value is defined by default, otherwise; . public static bool IsDefinedByDefault(this TEnum enumValue) where TEnum : Enum { - // We have not added any values to this enum so it must be vanilla or someone not using SMLHelper. + // We have not added any values to this enum so it must be vanilla or someone not using Nautilus. if (!EnumCacheProvider.TryGetManager(typeof(TEnum), out var manager)) { return true; diff --git a/SMLHelper/Handlers/Enums/Extensions/EnumExtensions_BackgroundType.cs b/Nautilus/Handlers/Enums/Extensions/EnumExtensions_BackgroundType.cs similarity index 96% rename from SMLHelper/Handlers/Enums/Extensions/EnumExtensions_BackgroundType.cs rename to Nautilus/Handlers/Enums/Extensions/EnumExtensions_BackgroundType.cs index 275180d0e..65d2e65ab 100644 --- a/SMLHelper/Handlers/Enums/Extensions/EnumExtensions_BackgroundType.cs +++ b/Nautilus/Handlers/Enums/Extensions/EnumExtensions_BackgroundType.cs @@ -6,7 +6,7 @@ #endif // ReSharper disable once CheckNamespace -namespace SMLHelper.Handlers; +namespace Nautilus.Handlers; public static partial class EnumExtensions { diff --git a/SMLHelper/Handlers/Enums/Extensions/EnumExtensions_CraftTreeType.cs b/Nautilus/Handlers/Enums/Extensions/EnumExtensions_CraftTreeType.cs similarity index 91% rename from SMLHelper/Handlers/Enums/Extensions/EnumExtensions_CraftTreeType.cs rename to Nautilus/Handlers/Enums/Extensions/EnumExtensions_CraftTreeType.cs index 3a6ce0bf5..6771acc20 100644 --- a/SMLHelper/Handlers/Enums/Extensions/EnumExtensions_CraftTreeType.cs +++ b/Nautilus/Handlers/Enums/Extensions/EnumExtensions_CraftTreeType.cs @@ -1,7 +1,8 @@ -namespace SMLHelper.Handlers; +using Nautilus.Crafting; +using Nautilus.Patchers; -using SMLHelper.Crafting; -using SMLHelper.Patchers; +// ReSharper disable once CheckNamespace +namespace Nautilus.Handlers; public static partial class EnumExtensions { diff --git a/SMLHelper/Handlers/Enums/Extensions/EnumExtensions_PingType.cs b/Nautilus/Handlers/Enums/Extensions/EnumExtensions_PingType.cs similarity index 97% rename from SMLHelper/Handlers/Enums/Extensions/EnumExtensions_PingType.cs rename to Nautilus/Handlers/Enums/Extensions/EnumExtensions_PingType.cs index bae467cb8..994d42f18 100644 --- a/SMLHelper/Handlers/Enums/Extensions/EnumExtensions_PingType.cs +++ b/Nautilus/Handlers/Enums/Extensions/EnumExtensions_PingType.cs @@ -1,7 +1,7 @@ -using SMLHelper.Assets; +using Nautilus.Assets; // ReSharper disable once CheckNamespace -namespace SMLHelper.Handlers; +namespace Nautilus.Handlers; public static partial class EnumExtensions { diff --git a/SMLHelper/Handlers/Enums/Extensions/EnumExtensions_TechCategory.cs b/Nautilus/Handlers/Enums/Extensions/EnumExtensions_TechCategory.cs similarity index 97% rename from SMLHelper/Handlers/Enums/Extensions/EnumExtensions_TechCategory.cs rename to Nautilus/Handlers/Enums/Extensions/EnumExtensions_TechCategory.cs index 906c5aed0..fbfb48816 100644 --- a/SMLHelper/Handlers/Enums/Extensions/EnumExtensions_TechCategory.cs +++ b/Nautilus/Handlers/Enums/Extensions/EnumExtensions_TechCategory.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; -using BepInEx.Logging; -using SMLHelper.Utility; +using Nautilus.Utility; // ReSharper disable once CheckNamespace -namespace SMLHelper.Handlers; +namespace Nautilus.Handlers; public static partial class EnumExtensions { diff --git a/SMLHelper/Handlers/Enums/Extensions/EnumExtensions_TechGroup.cs b/Nautilus/Handlers/Enums/Extensions/EnumExtensions_TechGroup.cs similarity index 95% rename from SMLHelper/Handlers/Enums/Extensions/EnumExtensions_TechGroup.cs rename to Nautilus/Handlers/Enums/Extensions/EnumExtensions_TechGroup.cs index 0f3f789ee..72ff88b28 100644 --- a/SMLHelper/Handlers/Enums/Extensions/EnumExtensions_TechGroup.cs +++ b/Nautilus/Handlers/Enums/Extensions/EnumExtensions_TechGroup.cs @@ -1,8 +1,9 @@ using System.Collections.Generic; -using SMLHelper.Utility; +using Nautilus.Handlers; +using Nautilus.Utility; // ReSharper disable once CheckNamespace -namespace SMLHelper.Handlers; +namespace Nautilus.Handlers; public static partial class EnumExtensions { diff --git a/SMLHelper/Handlers/Enums/Extensions/EnumExtensions_TechType.cs b/Nautilus/Handlers/Enums/Extensions/EnumExtensions_TechType.cs similarity index 94% rename from SMLHelper/Handlers/Enums/Extensions/EnumExtensions_TechType.cs rename to Nautilus/Handlers/Enums/Extensions/EnumExtensions_TechType.cs index efcfcc6bc..6ee0e9e78 100644 --- a/SMLHelper/Handlers/Enums/Extensions/EnumExtensions_TechType.cs +++ b/Nautilus/Handlers/Enums/Extensions/EnumExtensions_TechType.cs @@ -1,13 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Reflection; -using SMLHelper.Assets; -using SMLHelper.Patchers; -using SMLHelper.Utility; +using Nautilus.Assets; +using Nautilus.Patchers; +using Nautilus.Utility; // ReSharper disable once CheckNamespace -namespace SMLHelper.Handlers; +namespace Nautilus.Handlers; public static partial class EnumExtensions { diff --git a/SMLHelper/Handlers/ItemActionHandler.cs b/Nautilus/Handlers/ItemActionHandler.cs similarity index 97% rename from SMLHelper/Handlers/ItemActionHandler.cs rename to Nautilus/Handlers/ItemActionHandler.cs index d1407e1dc..676cfefee 100644 --- a/SMLHelper/Handlers/ItemActionHandler.cs +++ b/Nautilus/Handlers/ItemActionHandler.cs @@ -1,9 +1,8 @@ -using SMLHelper.Utility; +using System; +using Nautilus.Patchers; +using Nautilus.Utility; -namespace SMLHelper.Handlers; - -using SMLHelper.Patchers; -using System; +namespace Nautilus.Handlers; /// /// A handler class for registering your custom middle click actions for items diff --git a/SMLHelper/Handlers/KnownTechHandler.cs b/Nautilus/Handlers/KnownTechHandler.cs similarity index 99% rename from SMLHelper/Handlers/KnownTechHandler.cs rename to Nautilus/Handlers/KnownTechHandler.cs index 0b6671986..9a8c55740 100644 --- a/SMLHelper/Handlers/KnownTechHandler.cs +++ b/Nautilus/Handlers/KnownTechHandler.cs @@ -1,13 +1,11 @@ -using System.Linq; +using System.Collections.Generic; +using System.Linq; +using Nautilus.Patchers; +using Nautilus.Utility; using Story; - -namespace SMLHelper.Handlers; - -using SMLHelper.Utility; -using SMLHelper.Patchers; -using System.Collections.Generic; using UnityEngine; +namespace Nautilus.Handlers; /// /// A handler class for configuring custom unlocking conditions for item blueprints. diff --git a/SMLHelper/Handlers/LanguageHandler.cs b/Nautilus/Handlers/LanguageHandler.cs similarity index 98% rename from SMLHelper/Handlers/LanguageHandler.cs rename to Nautilus/Handlers/LanguageHandler.cs index 22c3e38fc..ae7510951 100644 --- a/SMLHelper/Handlers/LanguageHandler.cs +++ b/Nautilus/Handlers/LanguageHandler.cs @@ -2,13 +2,11 @@ using System.Collections.Generic; using System.IO; using System.Reflection; +using Nautilus.Patchers; +using Nautilus.Utility; using Newtonsoft.Json; -using UnityEngine; -namespace SMLHelper.Handlers; - -using Patchers; -using Utility; +namespace Nautilus.Handlers; /// /// A handler for adding custom language lines. diff --git a/SMLHelper/Handlers/LootDistributionHandler.cs b/Nautilus/Handlers/LootDistributionHandler.cs similarity index 98% rename from SMLHelper/Handlers/LootDistributionHandler.cs rename to Nautilus/Handlers/LootDistributionHandler.cs index f1b2c7e58..abdedaa64 100644 --- a/SMLHelper/Handlers/LootDistributionHandler.cs +++ b/Nautilus/Handlers/LootDistributionHandler.cs @@ -1,12 +1,12 @@ -namespace SMLHelper.Handlers; - -using System.Collections.Generic; +using System.Collections.Generic; using BepInEx.Logging; -using Patchers; -using Assets; -using Utility; +using Nautilus.Assets; +using Nautilus.Patchers; +using Nautilus.Utility; using UWE; +namespace Nautilus.Handlers; + /// /// A handler that manages Loot Distribution. /// diff --git a/SMLHelper/Handlers/OptionsPanelHandler.cs b/Nautilus/Handlers/OptionsPanelHandler.cs similarity index 91% rename from SMLHelper/Handlers/OptionsPanelHandler.cs rename to Nautilus/Handlers/OptionsPanelHandler.cs index 124be4816..2246bb0f9 100644 --- a/SMLHelper/Handlers/OptionsPanelHandler.cs +++ b/Nautilus/Handlers/OptionsPanelHandler.cs @@ -1,11 +1,11 @@ -namespace SMLHelper.Handlers; - -using Options; -using Options.Attributes; -using Patchers; -using Json; -using System.Reflection; -using SMLHelper.Utility; +using System.Reflection; +using Nautilus.Json; +using Nautilus.Options; +using Nautilus.Options.Attributes; +using Nautilus.Patchers; +using Nautilus.Utility; + +namespace Nautilus.Handlers; /// /// A handler class for registering your custom in-game mod options. diff --git a/SMLHelper/Handlers/PDAHandler.cs b/Nautilus/Handlers/PDAHandler.cs similarity index 97% rename from SMLHelper/Handlers/PDAHandler.cs rename to Nautilus/Handlers/PDAHandler.cs index caad3d53f..3c3fc8f95 100644 --- a/SMLHelper/Handlers/PDAHandler.cs +++ b/Nautilus/Handlers/PDAHandler.cs @@ -1,10 +1,10 @@ -namespace SMLHelper.Handlers; - -using BepInEx.Logging; -using Patchers; -using SMLHelper.Utility; +using BepInEx.Logging; +using Nautilus.Patchers; +using Nautilus.Utility; using UnityEngine; +namespace Nautilus.Handlers; + /// /// A handler class for various scanner related data. /// diff --git a/SMLHelper/Handlers/PrefabHandler.cs b/Nautilus/Handlers/PrefabHandler.cs similarity index 98% rename from SMLHelper/Handlers/PrefabHandler.cs rename to Nautilus/Handlers/PrefabHandler.cs index 311222c52..1a9306dd4 100644 --- a/SMLHelper/Handlers/PrefabHandler.cs +++ b/Nautilus/Handlers/PrefabHandler.cs @@ -1,12 +1,12 @@ using System; using System.Collections; using System.Collections.Generic; -using SMLHelper.Assets; -using SMLHelper.Patchers; -using SMLHelper.Utility; +using Nautilus.Assets; +using Nautilus.Patchers; +using Nautilus.Utility; using UnityEngine; -namespace SMLHelper.Handlers; +namespace Nautilus.Handlers; /// /// A handler for registering prefabs into the game. @@ -107,7 +107,7 @@ public class PrefabCollection : IEnumerable /// The prefab info to register. /// The function that constructs the game object for this prefab info. - /// The prefab post processor that will be invoked after SMLHelper's prefab processing. + /// The prefab post processor that will be invoked after Nautilus's prefab processing. public void Add(PrefabInfo info, PrefabFactoryAsync prefabFactory, PrefabPostProcessorAsync postProcessor = null) { if (_prefabs.ContainsKey(info)) diff --git a/SMLHelper/Handlers/SaveDataHandler.cs b/Nautilus/Handlers/SaveDataHandler.cs similarity index 91% rename from SMLHelper/Handlers/SaveDataHandler.cs rename to Nautilus/Handlers/SaveDataHandler.cs index f4f9a5d99..ffe3a094d 100644 --- a/SMLHelper/Handlers/SaveDataHandler.cs +++ b/Nautilus/Handlers/SaveDataHandler.cs @@ -1,7 +1,7 @@ -namespace SMLHelper.Handlers; +using Nautilus.Json; +using Nautilus.Utility; -using Json; -using SMLHelper.Utility; +namespace Nautilus.Handlers; /// /// A handler class for registering your . diff --git a/SMLHelper/Handlers/SpriteHandler.cs b/Nautilus/Handlers/SpriteHandler.cs similarity index 96% rename from SMLHelper/Handlers/SpriteHandler.cs rename to Nautilus/Handlers/SpriteHandler.cs index 4b2c183e5..c6f77c724 100644 --- a/SMLHelper/Handlers/SpriteHandler.cs +++ b/Nautilus/Handlers/SpriteHandler.cs @@ -1,8 +1,8 @@ -namespace SMLHelper.Handlers; - -using Assets; +using Nautilus.Assets; +using Nautilus.Utility; using UnityEngine; -using Utility; + +namespace Nautilus.Handlers; /// /// A handler class for adding custom sprites into the game. @@ -57,7 +57,7 @@ public static void RegisterSprite(TechType type, Sprite sprite) /// /// The techtype paired to this sprite. /// The file path to image to be converted into a sprite. - /// + /// public static void RegisterSprite(TechType type, string filePathToImage) { RegisterSprite(type, ImageUtils.LoadSpriteFromFile(filePathToImage, TextureFormat.BC7)); diff --git a/SMLHelper/Handlers/SurvivalHandler.cs b/Nautilus/Handlers/SurvivalHandler.cs similarity index 98% rename from SMLHelper/Handlers/SurvivalHandler.cs rename to Nautilus/Handlers/SurvivalHandler.cs index 9a002d58b..5bf83531f 100644 --- a/SMLHelper/Handlers/SurvivalHandler.cs +++ b/Nautilus/Handlers/SurvivalHandler.cs @@ -1,8 +1,8 @@ -namespace SMLHelper.Handlers; - using System; using System.Collections.Generic; -using Patchers; +using Nautilus.Patchers; + +namespace Nautilus.Handlers; /// /// a common handler for uses specified to the Survival component diff --git a/SMLHelper/Handlers/WorldEntityDatabaseHandler.cs b/Nautilus/Handlers/WorldEntityDatabaseHandler.cs similarity index 96% rename from SMLHelper/Handlers/WorldEntityDatabaseHandler.cs rename to Nautilus/Handlers/WorldEntityDatabaseHandler.cs index 61bf53c7b..307fc36dc 100644 --- a/SMLHelper/Handlers/WorldEntityDatabaseHandler.cs +++ b/Nautilus/Handlers/WorldEntityDatabaseHandler.cs @@ -1,11 +1,11 @@ -namespace SMLHelper.Handlers; - -using BepInEx.Logging; -using SMLHelper.Patchers; -using SMLHelper.Utility; +using BepInEx.Logging; +using Nautilus.Patchers; +using Nautilus.Utility; using UnityEngine; using UWE; +namespace Nautilus.Handlers; + /// /// A handler for the WorldEntityDatabase of the game. /// diff --git a/Nautilus/Initializer.cs b/Nautilus/Initializer.cs new file mode 100644 index 000000000..c72fa63d3 --- /dev/null +++ b/Nautilus/Initializer.cs @@ -0,0 +1,59 @@ +using System; +using BepInEx; +using HarmonyLib; +using Nautilus.Patchers; +using Nautilus.Utility; +using UnityEngine; + +namespace Nautilus; + +/// +/// WARNING: This class is for use only by BepInEx. +/// +[BepInPlugin(PluginInfo.PLUGIN_GUID, PluginInfo.PLUGIN_NAME, PluginInfo.PLUGIN_VERSION)] +public class Initializer : BaseUnityPlugin +{ + private static readonly Harmony _harmony = new(PluginInfo.PLUGIN_GUID); + + /// + /// WARNING: This method is for use only by BepInEx. + /// + [Obsolete("This method is for use only by Bepinex.", true)] + Initializer() + { + GameObject obj = UWE.Utils.GetEntityRoot(this.gameObject) ?? this.gameObject; + obj.EnsureComponent(); + + InternalLogger.Initialize(Logger); +#if SUBNAUTICA + InternalLogger.Info($"Loading v{PluginInfo.PLUGIN_VERSION} for Subnautica"); +#elif BELOWZERO + InternalLogger.Info($"Loading v{PluginInfo.PLUGIN_VERSION} for BelowZero"); +#endif + + PrefabDatabasePatcher.PrePatch(_harmony); + EnumPatcher.Patch(_harmony); + CraftDataPatcher.Patch(_harmony); + CraftTreePatcher.Patch(_harmony); + ConsoleCommandsPatcher.Patch(_harmony); + LanguagePatcher.Patch(_harmony); + PrefabDatabasePatcher.PostPatch(_harmony); + SpritePatcher.Patch(_harmony); + KnownTechPatcher.Patch(_harmony); + OptionsPanelPatcher.Patch(_harmony); + ItemsContainerPatcher.Patch(_harmony); + PDALogPatcher.Patch(_harmony); + PDAPatcher.Patch(_harmony); + PDAEncyclopediaPatcher.Patch(_harmony); + ItemActionPatcher.Patch(_harmony); + LootDistributionPatcher.Patch(_harmony); + WorldEntityDatabasePatcher.Patch(_harmony); + LargeWorldStreamerPatcher.Patch(_harmony); + SaveUtilsPatcher.Patch(_harmony); + TooltipPatcher.Patch(_harmony); + SurvivalPatcher.Patch(_harmony); + CustomSoundPatcher.Patch(_harmony); + EatablePatcher.Patch(_harmony); + MaterialUtils.Patch(); + } +} \ No newline at end of file diff --git a/SMLHelper/Json/Attributes/FileNameAttribute.cs b/Nautilus/Json/Attributes/FileNameAttribute.cs similarity index 91% rename from SMLHelper/Json/Attributes/FileNameAttribute.cs rename to Nautilus/Json/Attributes/FileNameAttribute.cs index b1aa15bb7..2538cbb36 100644 --- a/SMLHelper/Json/Attributes/FileNameAttribute.cs +++ b/Nautilus/Json/Attributes/FileNameAttribute.cs @@ -1,6 +1,6 @@ -namespace SMLHelper.Json.Attributes; +using System; -using System; +namespace Nautilus.Json.Attributes; /// /// Attribute used to specify a file name for use with a . diff --git a/SMLHelper/Json/ConfigFile.cs b/Nautilus/Json/ConfigFile.cs similarity index 97% rename from SMLHelper/Json/ConfigFile.cs rename to Nautilus/Json/ConfigFile.cs index 2baad8076..8a5bd6f1c 100644 --- a/SMLHelper/Json/ConfigFile.cs +++ b/Nautilus/Json/ConfigFile.cs @@ -1,14 +1,14 @@ -namespace SMLHelper.Json; - -using System; +using System; using System.IO; -using System.Reflection; using System.Linq; +using System.Reflection; +using Nautilus.Json.Converters; +using Nautilus.Json.ExtensionMethods; +using Nautilus.Json.Interfaces; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -using SMLHelper.Json.Converters; -using SMLHelper.Json.ExtensionMethods; -using SMLHelper.Json.Interfaces; + +namespace Nautilus.Json; /// /// A simple implementation of for use with config files. @@ -73,7 +73,7 @@ public ConfigFile() /// Optional subfolder for the . /// /// - /// using SMLHelper.Options; + /// using Nautilus.Options; /// using UnityEngine; /// /// public class MyConfig : ConfigFile diff --git a/SMLHelper/Json/ConfigFileAttribute.cs b/Nautilus/Json/ConfigFileAttribute.cs similarity index 95% rename from SMLHelper/Json/ConfigFileAttribute.cs rename to Nautilus/Json/ConfigFileAttribute.cs index 78e64acec..6ba611824 100644 --- a/SMLHelper/Json/ConfigFileAttribute.cs +++ b/Nautilus/Json/ConfigFileAttribute.cs @@ -1,6 +1,6 @@ -namespace SMLHelper.Json; +using System; -using System; +namespace Nautilus.Json; /// /// Attribute used to specify the filename and subfolder for a . @@ -10,7 +10,7 @@ /// /// /// -/// using SMLHelper.Json; +/// using Nautilus.Json; /// /// [ConfigFile("options", "configs")] /// public class Config : ConfigFile diff --git a/SMLHelper/Json/ConfigFileEventArgs.cs b/Nautilus/Json/ConfigFileEventArgs.cs similarity index 93% rename from SMLHelper/Json/ConfigFileEventArgs.cs rename to Nautilus/Json/ConfigFileEventArgs.cs index 1ddc5b669..946e10056 100644 --- a/SMLHelper/Json/ConfigFileEventArgs.cs +++ b/Nautilus/Json/ConfigFileEventArgs.cs @@ -1,6 +1,6 @@ -namespace SMLHelper.Json; +using System; -using System; +namespace Nautilus.Json; /// /// Contains basic information for a event. diff --git a/SMLHelper/Json/Converters/ColorConverter.cs b/Nautilus/Json/Converters/ColorConverter.cs similarity index 96% rename from SMLHelper/Json/Converters/ColorConverter.cs rename to Nautilus/Json/Converters/ColorConverter.cs index 4120855de..0cf2af7c8 100644 --- a/SMLHelper/Json/Converters/ColorConverter.cs +++ b/Nautilus/Json/Converters/ColorConverter.cs @@ -1,8 +1,8 @@ -namespace SMLHelper.Json.Converters; - -using System; -using UnityEngine; +using System; using Newtonsoft.Json; +using UnityEngine; + +namespace Nautilus.Json.Converters; /// /// A Color json converter that simplifies the Color to only r,g,b,a serialization. diff --git a/SMLHelper/Json/Converters/CustomEnumConverter.cs b/Nautilus/Json/Converters/CustomEnumConverter.cs similarity index 98% rename from SMLHelper/Json/Converters/CustomEnumConverter.cs rename to Nautilus/Json/Converters/CustomEnumConverter.cs index 39ebe8750..e989b2178 100644 --- a/SMLHelper/Json/Converters/CustomEnumConverter.cs +++ b/Nautilus/Json/Converters/CustomEnumConverter.cs @@ -1,7 +1,7 @@ using System; using Newtonsoft.Json; -namespace SMLHelper.Json.Converters; +namespace Nautilus.Json.Converters; /// /// An Enum json converter that supports custom enum conversions. diff --git a/SMLHelper/Json/Converters/FloatConverter.cs b/Nautilus/Json/Converters/FloatConverter.cs similarity index 98% rename from SMLHelper/Json/Converters/FloatConverter.cs rename to Nautilus/Json/Converters/FloatConverter.cs index 64747ffaf..5a505696f 100644 --- a/SMLHelper/Json/Converters/FloatConverter.cs +++ b/Nautilus/Json/Converters/FloatConverter.cs @@ -1,9 +1,9 @@ -namespace SMLHelper.Json.Converters; - -using System; +using System; using System.Globalization; using Newtonsoft.Json; +namespace Nautilus.Json.Converters; + /// /// A for rounding floats or doubles to a given number of decimal places, /// trimming trailing 0s. diff --git a/SMLHelper/Json/Converters/KeyCodeConverter.cs b/Nautilus/Json/Converters/KeyCodeConverter.cs similarity index 95% rename from SMLHelper/Json/Converters/KeyCodeConverter.cs rename to Nautilus/Json/Converters/KeyCodeConverter.cs index 4b713bfac..060a6f1df 100644 --- a/SMLHelper/Json/Converters/KeyCodeConverter.cs +++ b/Nautilus/Json/Converters/KeyCodeConverter.cs @@ -1,9 +1,9 @@ -namespace SMLHelper.Json.Converters; - -using System; -using SMLHelper.Utility; -using UnityEngine; +using System; +using Nautilus.Utility; using Newtonsoft.Json; +using UnityEngine; + +namespace Nautilus.Json.Converters; /// /// A for handling s. diff --git a/SMLHelper/Json/Converters/QuaternionConverter.cs b/Nautilus/Json/Converters/QuaternionConverter.cs similarity index 97% rename from SMLHelper/Json/Converters/QuaternionConverter.cs rename to Nautilus/Json/Converters/QuaternionConverter.cs index e97bbbc1d..4101199b2 100644 --- a/SMLHelper/Json/Converters/QuaternionConverter.cs +++ b/Nautilus/Json/Converters/QuaternionConverter.cs @@ -1,8 +1,8 @@ -namespace SMLHelper.Json.Converters; - -using System; -using UnityEngine; +using System; using Newtonsoft.Json; +using UnityEngine; + +namespace Nautilus.Json.Converters; /// /// A Quaternion json converter that simplifies the Vector3 to only x,y,z serialization. diff --git a/SMLHelper/Json/Converters/Vector2Converter.cs b/Nautilus/Json/Converters/Vector2Converter.cs similarity index 97% rename from SMLHelper/Json/Converters/Vector2Converter.cs rename to Nautilus/Json/Converters/Vector2Converter.cs index 023eca599..fdd735a62 100644 --- a/SMLHelper/Json/Converters/Vector2Converter.cs +++ b/Nautilus/Json/Converters/Vector2Converter.cs @@ -1,8 +1,8 @@ -namespace SMLHelper.Json.Converters; - using System; -using UnityEngine; using Newtonsoft.Json; +using UnityEngine; + +namespace Nautilus.Json.Converters; /// /// A Vector2 json converter that simplifies the Vector2 to only x,y serialization. diff --git a/SMLHelper/Json/Converters/Vector2IntConverter.cs b/Nautilus/Json/Converters/Vector2IntConverter.cs similarity index 97% rename from SMLHelper/Json/Converters/Vector2IntConverter.cs rename to Nautilus/Json/Converters/Vector2IntConverter.cs index b86f0e43f..89bc7f255 100644 --- a/SMLHelper/Json/Converters/Vector2IntConverter.cs +++ b/Nautilus/Json/Converters/Vector2IntConverter.cs @@ -1,8 +1,8 @@ -namespace SMLHelper.Json.Converters; - using System; -using UnityEngine; using Newtonsoft.Json; +using UnityEngine; + +namespace Nautilus.Json.Converters; /// /// A Vector2Int json converter that simplifies the Vector2Int to only x,y serialization. diff --git a/SMLHelper/Json/Converters/Vector3Converter.cs b/Nautilus/Json/Converters/Vector3Converter.cs similarity index 96% rename from SMLHelper/Json/Converters/Vector3Converter.cs rename to Nautilus/Json/Converters/Vector3Converter.cs index 053132333..e8a8c5596 100644 --- a/SMLHelper/Json/Converters/Vector3Converter.cs +++ b/Nautilus/Json/Converters/Vector3Converter.cs @@ -1,8 +1,8 @@ -namespace SMLHelper.Json.Converters; - -using System; -using UnityEngine; +using System; using Newtonsoft.Json; +using UnityEngine; + +namespace Nautilus.Json.Converters; /// /// A Vector3 json converter that simplifies the Vector3 to only x,y,z serialization. diff --git a/SMLHelper/Json/Converters/Vector3IntConverter.cs b/Nautilus/Json/Converters/Vector3IntConverter.cs similarity index 97% rename from SMLHelper/Json/Converters/Vector3IntConverter.cs rename to Nautilus/Json/Converters/Vector3IntConverter.cs index 503054822..29c465d30 100644 --- a/SMLHelper/Json/Converters/Vector3IntConverter.cs +++ b/Nautilus/Json/Converters/Vector3IntConverter.cs @@ -1,8 +1,8 @@ -namespace SMLHelper.Json.Converters; - using System; -using UnityEngine; using Newtonsoft.Json; +using UnityEngine; + +namespace Nautilus.Json.Converters; /// /// A Vector3Int json converter that simplifies the Vector3Int to only x,y,z serialization. diff --git a/SMLHelper/Json/Converters/Vector4Converter.cs b/Nautilus/Json/Converters/Vector4Converter.cs similarity index 97% rename from SMLHelper/Json/Converters/Vector4Converter.cs rename to Nautilus/Json/Converters/Vector4Converter.cs index 3a8e014bb..103b07815 100644 --- a/SMLHelper/Json/Converters/Vector4Converter.cs +++ b/Nautilus/Json/Converters/Vector4Converter.cs @@ -1,8 +1,8 @@ -namespace SMLHelper.Json.Converters; - using System; -using UnityEngine; using Newtonsoft.Json; +using UnityEngine; + +namespace Nautilus.Json.Converters; /// /// A Vector4 json converter that simplifies the Vector4 to only x,y,z,w serialization. diff --git a/SMLHelper/Json/ExtensionMethods/JsonExtensions.cs b/Nautilus/Json/ExtensionMethods/JsonExtensions.cs similarity index 96% rename from SMLHelper/Json/ExtensionMethods/JsonExtensions.cs rename to Nautilus/Json/ExtensionMethods/JsonExtensions.cs index 701f84a92..7894d54df 100644 --- a/SMLHelper/Json/ExtensionMethods/JsonExtensions.cs +++ b/Nautilus/Json/ExtensionMethods/JsonExtensions.cs @@ -1,8 +1,8 @@ -namespace SMLHelper.Json.ExtensionMethods; - -using SMLHelper.Utility; +using Nautilus.Utility; using Newtonsoft.Json; +namespace Nautilus.Json.ExtensionMethods; + /// /// Extension methods for parsing objects as JSON data. /// diff --git a/SMLHelper/Json/Interfaces/IJsonFile.cs b/Nautilus/Json/Interfaces/IJsonFile.cs similarity index 97% rename from SMLHelper/Json/Interfaces/IJsonFile.cs rename to Nautilus/Json/Interfaces/IJsonFile.cs index 5e4bd6d8a..7e7544717 100644 --- a/SMLHelper/Json/Interfaces/IJsonFile.cs +++ b/Nautilus/Json/Interfaces/IJsonFile.cs @@ -1,6 +1,6 @@ -namespace SMLHelper.Json.Interfaces; +using Newtonsoft.Json; -using Newtonsoft.Json; +namespace Nautilus.Json.Interfaces; /// /// A simple interface for a JSON file framework. diff --git a/SMLHelper/Json/JsonFile.cs b/Nautilus/Json/JsonFile.cs similarity index 97% rename from SMLHelper/Json/JsonFile.cs rename to Nautilus/Json/JsonFile.cs index ced214cd2..87b93c75d 100644 --- a/SMLHelper/Json/JsonFile.cs +++ b/Nautilus/Json/JsonFile.cs @@ -1,12 +1,12 @@ -namespace SMLHelper.Json; - -using System; +using System; using System.Linq; +using Nautilus.Json.Converters; +using Nautilus.Json.ExtensionMethods; +using Nautilus.Json.Interfaces; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -using SMLHelper.Json.Converters; -using SMLHelper.Json.ExtensionMethods; -using SMLHelper.Json.Interfaces; + +namespace Nautilus.Json; /// /// A simple abstract implementation of . diff --git a/SMLHelper/Json/JsonFileEventArgs.cs b/Nautilus/Json/JsonFileEventArgs.cs similarity index 93% rename from SMLHelper/Json/JsonFileEventArgs.cs rename to Nautilus/Json/JsonFileEventArgs.cs index aae0761f7..103fe5953 100644 --- a/SMLHelper/Json/JsonFileEventArgs.cs +++ b/Nautilus/Json/JsonFileEventArgs.cs @@ -1,6 +1,6 @@ -namespace SMLHelper.Json; +using System; -using System; +namespace Nautilus.Json; /// /// Contains basic information for a event. diff --git a/SMLHelper/Json/SaveDataCache.cs b/Nautilus/Json/SaveDataCache.cs similarity index 97% rename from SMLHelper/Json/SaveDataCache.cs rename to Nautilus/Json/SaveDataCache.cs index ffd093cf4..78dd44512 100644 --- a/SMLHelper/Json/SaveDataCache.cs +++ b/Nautilus/Json/SaveDataCache.cs @@ -1,12 +1,12 @@ -namespace SMLHelper.Json; - -using Attributes; -using Interfaces; -using System; +using System; using System.IO; using System.Reflection; +using Nautilus.Json.Attributes; +using Nautilus.Json.Interfaces; +using Nautilus.Utility; using Newtonsoft.Json; -using SMLHelper.Utility; + +namespace Nautilus.Json; /// /// An abstract implementation of intended for use with caching per-save data. diff --git a/SMLHelper/MonoBehaviours/EntitySpawner.cs b/Nautilus/MonoBehaviours/EntitySpawner.cs similarity index 91% rename from SMLHelper/MonoBehaviours/EntitySpawner.cs rename to Nautilus/MonoBehaviours/EntitySpawner.cs index 75afabd18..c94bb24ab 100644 --- a/SMLHelper/MonoBehaviours/EntitySpawner.cs +++ b/Nautilus/MonoBehaviours/EntitySpawner.cs @@ -1,12 +1,11 @@ -namespace SMLHelper.MonoBehaviours; - -using SMLHelper.Utility; using System.Collections; -using SMLHelper.Handlers; -using SMLHelper.Patchers; +using Nautilus.Handlers; +using Nautilus.Patchers; +using Nautilus.Utility; using UnityEngine; using UWE; +namespace Nautilus.MonoBehaviours; internal class EntitySpawner : MonoBehaviour { @@ -37,7 +36,7 @@ IEnumerator SpawnAsync() } - GameObject obj = Utils.InstantiateDeactivated(prefab, spawnInfo.SpawnPosition, spawnInfo.Rotation); + GameObject obj = UWE.Utils.InstantiateDeactivated(prefab, spawnInfo.SpawnPosition, spawnInfo.Rotation); LargeWorldEntity lwe = obj.GetComponent(); diff --git a/SMLHelper/SMLHelper.csproj b/Nautilus/Nautilus.csproj similarity index 58% rename from SMLHelper/SMLHelper.csproj rename to Nautilus/Nautilus.csproj index 095ec2ffd..4b7ef8afa 100644 --- a/SMLHelper/SMLHelper.csproj +++ b/Nautilus/Nautilus.csproj @@ -4,37 +4,27 @@ net472 false false - SMLHelper - SMLHelper - com.snmodding.smlhelper + Nautilus + Nautilus + com.snmodding.nautilus 11 true true - SN.STABLE;BZ.STABLE;SN.EXP;BZ.EXP + SN.STABLE;BZ.STABLE AnyCPU - Copyright @ 2019 - A library that helps making mods for Subnautica easier. + Copyright @ 2023 + Core library for modding Subnautica. bin\SN.STABLE\ SUBNAUTICA;SUBNAUTICA_STABLE - bin\SN.STABLE\SMLHelper.xml - - - bin\SN.EXP\ - SUBNAUTICA;SUBNAUTICA_EXP - bin\SN.EXP\SMLHelper.xml + bin\SN.STABLE\Nautilus.xml bin\BZ.STABLE\ BELOWZERO;BELOWZERO_STABLE - bin\BZ.STABLE\SMLHelper.xml - - - bin\BZ.EXP\ - BELOWZERO;BELOWZERO_EXP - bin\BZ.EXP\SMLHelper.xml + bin\BZ.STABLE\Nautilus.xml @@ -46,7 +36,7 @@ - + diff --git a/SMLHelper/Options/Attributes/ButtonAttribute.cs b/Nautilus/Options/Attributes/ButtonAttribute.cs similarity index 90% rename from SMLHelper/Options/Attributes/ButtonAttribute.cs rename to Nautilus/Options/Attributes/ButtonAttribute.cs index b3228bfe7..f3101f01e 100644 --- a/SMLHelper/Options/Attributes/ButtonAttribute.cs +++ b/Nautilus/Options/Attributes/ButtonAttribute.cs @@ -1,8 +1,8 @@ -namespace SMLHelper.Options.Attributes; +using System; +using Nautilus.Json; +using Nautilus.Utility; -using Json; -using System; -using SMLHelper.Utility; +namespace Nautilus.Options.Attributes; /// /// Attribute used to signify the decorated method should be represented in the mod's options menu @@ -11,8 +11,8 @@ /// /// /// -/// using SMLHelper.Json; -/// using SMLHelper.Options; +/// using Nautilus.Json; +/// using Nautilus.Options; /// using QModManager.Utility; /// /// [Menu("My Options Menu")] diff --git a/SMLHelper/Options/Attributes/ChoiceAttribute.cs b/Nautilus/Options/Attributes/ChoiceAttribute.cs similarity index 95% rename from SMLHelper/Options/Attributes/ChoiceAttribute.cs rename to Nautilus/Options/Attributes/ChoiceAttribute.cs index 239239eb8..7625127dc 100644 --- a/SMLHelper/Options/Attributes/ChoiceAttribute.cs +++ b/Nautilus/Options/Attributes/ChoiceAttribute.cs @@ -1,7 +1,7 @@ -namespace SMLHelper.Options.Attributes; +using System; +using Nautilus.Json; -using Json; -using System; +namespace Nautilus.Options.Attributes; /// /// Attribute used to signify the decorated member should be represented in the mod's options menu as a @@ -13,8 +13,8 @@ /// /// /// -/// using SMLHelper.Json; -/// using SMLHelper.Options; +/// using Nautilus.Json; +/// using Nautilus.Options; /// /// public enum CustomChoice { One, Two, Three } /// diff --git a/SMLHelper/Options/Attributes/ColorAttribute.cs b/Nautilus/Options/Attributes/ColorAttribute.cs similarity index 90% rename from SMLHelper/Options/Attributes/ColorAttribute.cs rename to Nautilus/Options/Attributes/ColorAttribute.cs index 19c9084eb..86fe3dccc 100644 --- a/SMLHelper/Options/Attributes/ColorAttribute.cs +++ b/Nautilus/Options/Attributes/ColorAttribute.cs @@ -1,7 +1,7 @@ -namespace SMLHelper.Options.Attributes; +using System; +using Nautilus.Json; -using Json; -using System; +namespace Nautilus.Options.Attributes; /// /// Attribute used to signify the decorated should be represented in the mod's @@ -9,8 +9,8 @@ /// /// /// -/// using SMLHelper.Json; -/// using SMLHelper.Options; +/// using Nautilus.Json; +/// using Nautilus.Options; /// /// [Menu("My Options Menu")] /// public class Config : ConfigFile diff --git a/SMLHelper/Options/Attributes/ConfigFileMetadata.cs b/Nautilus/Options/Attributes/ConfigFileMetadata.cs similarity index 99% rename from SMLHelper/Options/Attributes/ConfigFileMetadata.cs rename to Nautilus/Options/Attributes/ConfigFileMetadata.cs index 0026d941e..f78fdb336 100644 --- a/SMLHelper/Options/Attributes/ConfigFileMetadata.cs +++ b/Nautilus/Options/Attributes/ConfigFileMetadata.cs @@ -1,17 +1,16 @@ -namespace SMLHelper.Options.Attributes; - -using SMLHelper.Utility; -using SMLHelper.Json; -using System; +using System; using System.Collections; using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Reflection; -using UnityEngine; - +using Nautilus.Json; +using Nautilus.Utility; using Newtonsoft.Json; using TMPro; +using UnityEngine; + +namespace Nautilus.Options.Attributes; internal class ConfigFileMetadata where T : ConfigFile, new() { diff --git a/SMLHelper/Options/Attributes/IgnoreMemberAttribute.cs b/Nautilus/Options/Attributes/IgnoreMemberAttribute.cs similarity index 90% rename from SMLHelper/Options/Attributes/IgnoreMemberAttribute.cs rename to Nautilus/Options/Attributes/IgnoreMemberAttribute.cs index bab298ebf..115b9c204 100644 --- a/SMLHelper/Options/Attributes/IgnoreMemberAttribute.cs +++ b/Nautilus/Options/Attributes/IgnoreMemberAttribute.cs @@ -1,7 +1,7 @@ -namespace SMLHelper.Options.Attributes; +using System; +using Nautilus.Json; -using Json; -using System; +namespace Nautilus.Options.Attributes; /// /// Attribute used to signify the given property, field or method should be ignored when generating your mod options menu. @@ -12,8 +12,8 @@ /// /// /// -/// using SMLHelper.Json; -/// using SMLHelper.Options; +/// using Nautilus.Json; +/// using Nautilus.Options; /// /// [Menu("My Options Menu")] /// public class Config : ConfigFile diff --git a/SMLHelper/Options/Attributes/KeybindAttribute.cs b/Nautilus/Options/Attributes/KeybindAttribute.cs similarity index 90% rename from SMLHelper/Options/Attributes/KeybindAttribute.cs rename to Nautilus/Options/Attributes/KeybindAttribute.cs index 3e9c6bbd0..f3328adca 100644 --- a/SMLHelper/Options/Attributes/KeybindAttribute.cs +++ b/Nautilus/Options/Attributes/KeybindAttribute.cs @@ -1,17 +1,17 @@ -namespace SMLHelper.Options.Attributes; - -using Json; -using System; +using System; +using Nautilus.Json; using UnityEngine; +namespace Nautilus.Options.Attributes; + /// /// Attribute used to signify the decorated should be represented in the mod's /// option menu as a . /// /// /// -/// using SMLHelper.Json; -/// using SMLHelper.Options; +/// using Nautilus.Json; +/// using Nautilus.Options; /// using UnityEngine; /// /// [Menu("My Options Menu")] diff --git a/SMLHelper/Options/Attributes/MemberInfoMetadata.cs b/Nautilus/Options/Attributes/MemberInfoMetadata.cs similarity index 97% rename from SMLHelper/Options/Attributes/MemberInfoMetadata.cs rename to Nautilus/Options/Attributes/MemberInfoMetadata.cs index ece9b0b79..58d12bade 100644 --- a/SMLHelper/Options/Attributes/MemberInfoMetadata.cs +++ b/Nautilus/Options/Attributes/MemberInfoMetadata.cs @@ -1,11 +1,11 @@ -namespace SMLHelper.Options.Attributes; - -using HarmonyLib; -using Json; -using SMLHelper.Utility; -using System; +using System; using System.Linq; using System.Reflection; +using HarmonyLib; +using Nautilus.Json; +using Nautilus.Utility; + +namespace Nautilus.Options.Attributes; internal enum MemberType { Unknown, Field, Property, Method }; diff --git a/SMLHelper/Options/Attributes/MenuAttribute.cs b/Nautilus/Options/Attributes/MenuAttribute.cs similarity index 95% rename from SMLHelper/Options/Attributes/MenuAttribute.cs rename to Nautilus/Options/Attributes/MenuAttribute.cs index 8d16150eb..57cb3cd70 100644 --- a/SMLHelper/Options/Attributes/MenuAttribute.cs +++ b/Nautilus/Options/Attributes/MenuAttribute.cs @@ -1,8 +1,8 @@ -namespace SMLHelper.Options.Attributes; +using System; +using Nautilus.Json; +using Nautilus.Utility; -using Json; -using System; -using SMLHelper.Utility; +namespace Nautilus.Options.Attributes; /// /// Attribute used to signify a menu should be automatically generated from a @@ -11,12 +11,12 @@ /// /// /// -/// using SMLHelper.Json; -/// using SMLHelper.Options; +/// using Nautilus.Json; +/// using Nautilus.Options; /// using QModManager.Utility; /// using UnityEngine; /// -/// [Menu("SMLHelper Example Mod")] +/// [Menu("Nautilus Example Mod")] /// public class Config : ConfigFile /// { /// [Choice("My index-based choice", "Choice 1", "Choice 2", "Choice 3", Tooltip = "A simple tooltip")] @@ -126,7 +126,7 @@ public enum LoadEvents : byte /// None = 0, /// - /// Load when the menu is registered to SMLHelper via . + /// Load when the menu is registered to Nautilus via . /// /// /// In normal usage, this option is equivalent to loading when the game is launched. diff --git a/SMLHelper/Options/Attributes/ModOptionAttribute.cs b/Nautilus/Options/Attributes/ModOptionAttribute.cs similarity index 96% rename from SMLHelper/Options/Attributes/ModOptionAttribute.cs rename to Nautilus/Options/Attributes/ModOptionAttribute.cs index 4ed888dbf..aa80d02e7 100644 --- a/SMLHelper/Options/Attributes/ModOptionAttribute.cs +++ b/Nautilus/Options/Attributes/ModOptionAttribute.cs @@ -1,8 +1,8 @@ -namespace SMLHelper.Options.Attributes; +using System; +using Nautilus.Handlers; +using Nautilus.Json; -using Handlers; -using Json; -using System; +namespace Nautilus.Options.Attributes; /// /// Abstract base attribute used to signify the decorated public member should generate a diff --git a/SMLHelper/Options/Attributes/ModOptionAttributeMetadata.cs b/Nautilus/Options/Attributes/ModOptionAttributeMetadata.cs similarity index 76% rename from SMLHelper/Options/Attributes/ModOptionAttributeMetadata.cs rename to Nautilus/Options/Attributes/ModOptionAttributeMetadata.cs index 08a6e3b45..b39aa7d8d 100644 --- a/SMLHelper/Options/Attributes/ModOptionAttributeMetadata.cs +++ b/Nautilus/Options/Attributes/ModOptionAttributeMetadata.cs @@ -1,7 +1,7 @@ -namespace SMLHelper.Options.Attributes; +using System.Collections.Generic; +using Nautilus.Json; -using Json; -using System.Collections.Generic; +namespace Nautilus.Options.Attributes; internal class ModOptionAttributeMetadata where T : ConfigFile, new() { diff --git a/SMLHelper/Options/Attributes/ModOptionEventAttribute.cs b/Nautilus/Options/Attributes/ModOptionEventAttribute.cs similarity index 94% rename from SMLHelper/Options/Attributes/ModOptionEventAttribute.cs rename to Nautilus/Options/Attributes/ModOptionEventAttribute.cs index 763f99892..623b7d2c5 100644 --- a/SMLHelper/Options/Attributes/ModOptionEventAttribute.cs +++ b/Nautilus/Options/Attributes/ModOptionEventAttribute.cs @@ -1,6 +1,6 @@ -namespace SMLHelper.Options.Attributes; +using System; -using System; +namespace Nautilus.Options.Attributes; /// /// Abstract base attribute used to signify a method to call whenever the derivative event is invoked for the decorated member. diff --git a/SMLHelper/Options/Attributes/OnChangeAttribute.cs b/Nautilus/Options/Attributes/OnChangeAttribute.cs similarity index 95% rename from SMLHelper/Options/Attributes/OnChangeAttribute.cs rename to Nautilus/Options/Attributes/OnChangeAttribute.cs index 45b91d0b8..6561412f5 100644 --- a/SMLHelper/Options/Attributes/OnChangeAttribute.cs +++ b/Nautilus/Options/Attributes/OnChangeAttribute.cs @@ -1,8 +1,8 @@ -namespace SMLHelper.Options.Attributes; +using System; +using Nautilus.Json; +using Nautilus.Utility; -using Json; -using SMLHelper.Utility; -using System; +namespace Nautilus.Options.Attributes; /// /// Attribute used to signify a method to call whenever the decorated member's value changes. @@ -25,12 +25,12 @@ /// /// /// -/// using SMLHelper.Json; -/// using SMLHelper.Options; +/// using Nautilus.Json; +/// using Nautilus.Options; /// using QModManager.Utility; /// using UnityEngine; /// -/// [Menu("SMLHelper Example Mod")] +/// [Menu("Nautilus Example Mod")] /// public class Config : ConfigFile /// { /// [Toggle("My checkbox"), OnChange(nameof(MyCheckboxToggleEvent)), OnChange(nameof(MyGenericValueChangedEvent))] diff --git a/SMLHelper/Options/Attributes/OnGameObjectCreatedAttribute.cs b/Nautilus/Options/Attributes/OnGameObjectCreatedAttribute.cs similarity index 92% rename from SMLHelper/Options/Attributes/OnGameObjectCreatedAttribute.cs rename to Nautilus/Options/Attributes/OnGameObjectCreatedAttribute.cs index ca8f24fdd..e0bfd7b74 100644 --- a/SMLHelper/Options/Attributes/OnGameObjectCreatedAttribute.cs +++ b/Nautilus/Options/Attributes/OnGameObjectCreatedAttribute.cs @@ -1,7 +1,7 @@ -namespace SMLHelper.Options.Attributes; +using System; +using Nautilus.Utility; -using System; -using SMLHelper.Utility; +namespace Nautilus.Options.Attributes; /// /// Attribute used to signify a method to call whenever the for the @@ -19,12 +19,12 @@ /// /// /// -/// using SMLHelper.Json; -/// using SMLHelper.Options; +/// using Nautilus.Json; +/// using Nautilus.Options; /// using QModManager.Utility; /// using UnityEngine; /// -/// [Menu("SMLHelper Example Mod")] +/// [Menu("Nautilus Example Mod")] /// public class Config : ConfigFile /// { /// [Toggle("My checkbox"), OnGameObjectCreated(nameof(MyGameObjectCreatedEvent))] diff --git a/SMLHelper/Options/Attributes/OptionsMenuBuilder.cs b/Nautilus/Options/Attributes/OptionsMenuBuilder.cs similarity index 99% rename from SMLHelper/Options/Attributes/OptionsMenuBuilder.cs rename to Nautilus/Options/Attributes/OptionsMenuBuilder.cs index 13c570074..836d9064b 100644 --- a/SMLHelper/Options/Attributes/OptionsMenuBuilder.cs +++ b/Nautilus/Options/Attributes/OptionsMenuBuilder.cs @@ -1,13 +1,12 @@ -namespace SMLHelper.Options.Attributes; - -using SMLHelper.Utility; -using SMLHelper.Json; -using System; +using System; using System.Collections; using System.Collections.Generic; using System.Linq; +using Nautilus.Json; +using Nautilus.Utility; using UnityEngine; +namespace Nautilus.Options.Attributes; /// /// An internal derivative of for use in auto-generating a menu based on attributes diff --git a/SMLHelper/Options/Attributes/SliderAttribute.cs b/Nautilus/Options/Attributes/SliderAttribute.cs similarity index 95% rename from SMLHelper/Options/Attributes/SliderAttribute.cs rename to Nautilus/Options/Attributes/SliderAttribute.cs index 98337de15..92a63727a 100644 --- a/SMLHelper/Options/Attributes/SliderAttribute.cs +++ b/Nautilus/Options/Attributes/SliderAttribute.cs @@ -1,7 +1,7 @@ -namespace SMLHelper.Options.Attributes; +using System; +using Nautilus.Json; -using Json; -using System; +namespace Nautilus.Options.Attributes; /// /// Attribute used to signify the specified , or should be represented @@ -9,8 +9,8 @@ /// /// /// -/// using SMLHelper.Json; -/// using SMLHelper.Options; +/// using Nautilus.Json; +/// using Nautilus.Options; /// /// [Menu("My Options Menu")] /// public class Config : ConfigFile diff --git a/SMLHelper/Options/Attributes/ToggleAttribute.cs b/Nautilus/Options/Attributes/ToggleAttribute.cs similarity index 89% rename from SMLHelper/Options/Attributes/ToggleAttribute.cs rename to Nautilus/Options/Attributes/ToggleAttribute.cs index 8f295374e..97d57f20b 100644 --- a/SMLHelper/Options/Attributes/ToggleAttribute.cs +++ b/Nautilus/Options/Attributes/ToggleAttribute.cs @@ -1,7 +1,7 @@ -namespace SMLHelper.Options.Attributes; +using System; +using Nautilus.Json; -using Json; -using System; +namespace Nautilus.Options.Attributes; /// /// Attribute used to signify the decorated should be represented in the mod's @@ -9,8 +9,8 @@ /// /// /// -/// using SMLHelper.Json; -/// using SMLHelper.Options; +/// using Nautilus.Json; +/// using Nautilus.Options; /// /// [Menu("My Options Menu")] /// public class Config : ConfigFile diff --git a/SMLHelper/Options/ConfigEntryExtensions.cs b/Nautilus/Options/ConfigEntryExtensions.cs similarity index 99% rename from SMLHelper/Options/ConfigEntryExtensions.cs rename to Nautilus/Options/ConfigEntryExtensions.cs index 65b5f94e2..666858f0e 100644 --- a/SMLHelper/Options/ConfigEntryExtensions.cs +++ b/Nautilus/Options/ConfigEntryExtensions.cs @@ -1,11 +1,11 @@ -namespace SMLHelper.Options; - -using System; +using System; using System.Collections.Generic; using System.Linq; using BepInEx.Configuration; using UnityEngine; +namespace Nautilus.Options; + /// /// /// diff --git a/SMLHelper/Options/ModButtonOption.cs b/Nautilus/Options/ModButtonOption.cs similarity index 97% rename from SMLHelper/Options/ModButtonOption.cs rename to Nautilus/Options/ModButtonOption.cs index 4b073b2cd..b54a38cfc 100644 --- a/SMLHelper/Options/ModButtonOption.cs +++ b/Nautilus/Options/ModButtonOption.cs @@ -1,12 +1,11 @@ -namespace SMLHelper.Options; - -using System; +using System; using System.Collections.Generic; using System.Linq; -using System.Reflection; using UnityEngine.Events; using UnityEngine.UI; +namespace Nautilus.Options; + /// /// Contains all the information about a button click event. /// diff --git a/SMLHelper/Options/ModChoiceOption.cs b/Nautilus/Options/ModChoiceOption.cs similarity index 96% rename from SMLHelper/Options/ModChoiceOption.cs rename to Nautilus/Options/ModChoiceOption.cs index e5d970c30..9a9c179bb 100644 --- a/SMLHelper/Options/ModChoiceOption.cs +++ b/Nautilus/Options/ModChoiceOption.cs @@ -1,12 +1,11 @@ -namespace SMLHelper.Options; - -using System; +using System; using System.Collections; using System.Collections.Generic; -using SMLHelper.Options.Utility; +using Nautilus.Options.Utility; using UnityEngine; using UnityEngine.Events; -using static SMLHelper.Options.OptionItem; + +namespace Nautilus.Options; /// /// Contains all the information about a choice changed event. @@ -132,7 +131,7 @@ public static ModChoiceOption Create(string id, string label, T[] options, T /// public override Type AdjusterComponent => typeof(ChoiceOptionAdjust); } -internal class ChoiceOptionAdjust: ModOptionAdjust +internal class ChoiceOptionAdjust: OptionItem.ModOptionAdjust { private const float spacing = 10f; diff --git a/SMLHelper/Options/ModColorOption.cs b/Nautilus/Options/ModColorOption.cs similarity index 99% rename from SMLHelper/Options/ModColorOption.cs rename to Nautilus/Options/ModColorOption.cs index c55f71d6f..dda6a58a5 100644 --- a/SMLHelper/Options/ModColorOption.cs +++ b/Nautilus/Options/ModColorOption.cs @@ -2,7 +2,7 @@ using UnityEngine; using UnityEngine.Events; -namespace SMLHelper.Options; +namespace Nautilus.Options; /// /// Contains all the information about a color changed event. diff --git a/SMLHelper/Options/ModKeybindOption.cs b/Nautilus/Options/ModKeybindOption.cs similarity index 98% rename from SMLHelper/Options/ModKeybindOption.cs rename to Nautilus/Options/ModKeybindOption.cs index 42ad8da64..03624d5ce 100644 --- a/SMLHelper/Options/ModKeybindOption.cs +++ b/Nautilus/Options/ModKeybindOption.cs @@ -1,11 +1,10 @@ -namespace SMLHelper.Options; - -using System; +using System; using System.Collections; -using SMLHelper.Utility; -using UnityEngine; -using UnityEngine.Events; +using Nautilus.Utility; using TMPro; +using UnityEngine; + +namespace Nautilus.Options; /// /// Contains all the information about a keybind changed event. diff --git a/SMLHelper/Options/ModOptionTooltip.cs b/Nautilus/Options/ModOptionTooltip.cs similarity index 79% rename from SMLHelper/Options/ModOptionTooltip.cs rename to Nautilus/Options/ModOptionTooltip.cs index d8d2d3033..8cc4443dd 100644 --- a/SMLHelper/Options/ModOptionTooltip.cs +++ b/Nautilus/Options/ModOptionTooltip.cs @@ -1,9 +1,8 @@ -namespace SMLHelper.Options; - -using System.Collections.Generic; -using UnityEngine; +using UnityEngine; using UnityEngine.UI; +namespace Nautilus.Options; + internal class ModOptionTooltip : MonoBehaviour, ITooltip { public string Tooltip; diff --git a/SMLHelper/Options/ModOptions.cs b/Nautilus/Options/ModOptions.cs similarity index 99% rename from SMLHelper/Options/ModOptions.cs rename to Nautilus/Options/ModOptions.cs index d7916aae0..6d12fa73b 100644 --- a/SMLHelper/Options/ModOptions.cs +++ b/Nautilus/Options/ModOptions.cs @@ -1,12 +1,12 @@ -namespace SMLHelper.Options; - -using System; +using System; using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; -using SMLHelper.Utility; using System.Linq; using BepInEx.Logging; +using Nautilus.Utility; +using UnityEngine; +using UnityEngine.UI; + +namespace Nautilus.Options; /// /// Abstract class that provides the framework for your mod's in-game configuration options. diff --git a/SMLHelper/Options/ModSliderOption.cs b/Nautilus/Options/ModSliderOption.cs similarity index 99% rename from SMLHelper/Options/ModSliderOption.cs rename to Nautilus/Options/ModSliderOption.cs index 93e45cc1f..0a977a120 100644 --- a/SMLHelper/Options/ModSliderOption.cs +++ b/Nautilus/Options/ModSliderOption.cs @@ -1,14 +1,14 @@ -namespace SMLHelper.Options; - -using System; -using System.Reflection; +using System; using System.Collections; +using System.Reflection; +using BepInEx.Logging; +using Nautilus.Utility; +using TMPro; using UnityEngine; -using UnityEngine.UI; using UnityEngine.Events; -using TMPro; -using SMLHelper.Utility; -using BepInEx.Logging; +using UnityEngine.UI; + +namespace Nautilus.Options; /// /// Contains all the information about a slider changed event. diff --git a/SMLHelper/Options/ModToggleOption.cs b/Nautilus/Options/ModToggleOption.cs similarity index 98% rename from SMLHelper/Options/ModToggleOption.cs rename to Nautilus/Options/ModToggleOption.cs index e5e051759..d59b9f298 100644 --- a/SMLHelper/Options/ModToggleOption.cs +++ b/Nautilus/Options/ModToggleOption.cs @@ -1,10 +1,10 @@ -namespace SMLHelper.Options; - -using System; +using System; using System.Collections; using UnityEngine; using UnityEngine.Events; +namespace Nautilus.Options; + /// /// Contains all the information about a toggle changed event. /// diff --git a/SMLHelper/Options/OptionEventArgs.cs b/Nautilus/Options/OptionEventArgs.cs similarity index 96% rename from SMLHelper/Options/OptionEventArgs.cs rename to Nautilus/Options/OptionEventArgs.cs index 07cfc6d20..b6a7a801f 100644 --- a/SMLHelper/Options/OptionEventArgs.cs +++ b/Nautilus/Options/OptionEventArgs.cs @@ -1,6 +1,6 @@ -namespace SMLHelper.Options; +using System; -using System; +namespace Nautilus.Options; /// /// Interface for event arguments for a . diff --git a/SMLHelper/Options/Utility/Validator.cs b/Nautilus/Options/Utility/Validator.cs similarity index 95% rename from SMLHelper/Options/Utility/Validator.cs rename to Nautilus/Options/Utility/Validator.cs index 2f6c728ef..0b9aa8c9c 100644 --- a/SMLHelper/Options/Utility/Validator.cs +++ b/Nautilus/Options/Utility/Validator.cs @@ -1,8 +1,7 @@ -namespace SMLHelper.Options.Utility; +using BepInEx.Logging; +using Nautilus.Utility; -using System.Text.RegularExpressions; -using BepInEx.Logging; -using SMLHelper.Utility; +namespace Nautilus.Options.Utility; internal static class Validator { diff --git a/SMLHelper/Patchers/ConsoleCommandsPatcher.cs b/Nautilus/Patchers/ConsoleCommandsPatcher.cs similarity index 99% rename from SMLHelper/Patchers/ConsoleCommandsPatcher.cs rename to Nautilus/Patchers/ConsoleCommandsPatcher.cs index f1d06eab1..d96c84971 100644 --- a/SMLHelper/Patchers/ConsoleCommandsPatcher.cs +++ b/Nautilus/Patchers/ConsoleCommandsPatcher.cs @@ -1,16 +1,15 @@ -namespace SMLHelper.Patchers; - -using Commands; -using System; +using System; using System.Collections.Generic; -using HarmonyLib; -using System.Reflection; using System.Linq; +using System.Reflection; using System.Text.RegularExpressions; +using BepInEx.Logging; +using HarmonyLib; +using Nautilus.Commands; +using Nautilus.Utility; using UnityEngine; -using SMLHelper.Utility; -using BepInEx.Logging; +namespace Nautilus.Patchers; internal static class ConsoleCommandsPatcher { diff --git a/SMLHelper/Patchers/CraftDataPatcher.cs b/Nautilus/Patchers/CraftDataPatcher.cs similarity index 97% rename from SMLHelper/Patchers/CraftDataPatcher.cs rename to Nautilus/Patchers/CraftDataPatcher.cs index 8105a1572..7905786f5 100644 --- a/SMLHelper/Patchers/CraftDataPatcher.cs +++ b/Nautilus/Patchers/CraftDataPatcher.cs @@ -1,15 +1,12 @@ -using SMLHelper.Handlers; - -namespace SMLHelper.Patchers; - -using System; +using System; using System.Collections.Generic; -using Assets; using BepInEx.Logging; using HarmonyLib; -using Utility; +using Nautilus.Handlers; +using Nautilus.Utility; using UnityEngine; -using System.Linq; + +namespace Nautilus.Patchers; internal partial class CraftDataPatcher { diff --git a/SMLHelper/Patchers/CraftDataPatcher_BelowZero.cs b/Nautilus/Patchers/CraftDataPatcher_BelowZero.cs similarity index 83% rename from SMLHelper/Patchers/CraftDataPatcher_BelowZero.cs rename to Nautilus/Patchers/CraftDataPatcher_BelowZero.cs index 59c57aa93..31d3b18bb 100644 --- a/SMLHelper/Patchers/CraftDataPatcher_BelowZero.cs +++ b/Nautilus/Patchers/CraftDataPatcher_BelowZero.cs @@ -1,12 +1,12 @@ #if BELOWZERO -namespace SMLHelper.Patchers +namespace Nautilus.Patchers { using System; using System.Collections.Generic; using System.Text; using BepInEx.Logging; using HarmonyLib; - using SMLHelper.Utility; + using Nautilus.Utility; internal partial class CraftDataPatcher { @@ -23,10 +23,10 @@ private static void PatchForBelowZero(Harmony harmony) private static void CheckPatchRequired(TechType techType) { - if (CustomRecipeData.TryGetValue(techType, out JsonValue smlTechData)) + if (CustomRecipeData.TryGetValue(techType, out JsonValue customTechData)) { if (!TechData.entries.TryGetValue(techType, out JsonValue techData) || - smlTechData != techData) + customTechData != techData) { AddCustomTechDataToOriginalDictionary(); } @@ -37,24 +37,24 @@ private static void AddCustomTechDataToOriginalDictionary() { List added = new(); List updated = new(); - foreach (KeyValuePair customTechData in CustomRecipeData) + foreach (KeyValuePair customRecipe in CustomRecipeData) { - JsonValue smlTechData = customTechData.Value; - TechType techType = customTechData.Key; + JsonValue jsonValue = customRecipe.Value; + TechType techType = customRecipe.Key; if (TechData.entries.TryGetValue(techType, out JsonValue techData)) { - if (techData != smlTechData) + if (techData != jsonValue) { updated.Add(techType); - foreach (int key in smlTechData.Keys) + foreach (int key in jsonValue.Keys) { - techData[key] = smlTechData[key]; + techData[key] = jsonValue[key]; } } } else { - TechData.entries.Add(techType, smlTechData); + TechData.entries.Add(techType, jsonValue); added.Add(techType); } } diff --git a/SMLHelper/Patchers/CraftDataPatcher_Subnautica.cs b/Nautilus/Patchers/CraftDataPatcher_Subnautica.cs similarity index 78% rename from SMLHelper/Patchers/CraftDataPatcher_Subnautica.cs rename to Nautilus/Patchers/CraftDataPatcher_Subnautica.cs index 47aa65988..5cf601427 100644 --- a/SMLHelper/Patchers/CraftDataPatcher_Subnautica.cs +++ b/Nautilus/Patchers/CraftDataPatcher_Subnautica.cs @@ -1,12 +1,11 @@ -#if SUBNAUTICA -namespace SMLHelper.Patchers -{ - using HarmonyLib; - using SMLHelper.Utility; - using SMLHelper; - using System.Collections.Generic; - using BepInEx.Logging; +using System.Collections.Generic; +using BepInEx.Logging; +using HarmonyLib; +using Nautilus.Utility; +#if SUBNAUTICA +namespace Nautilus.Patchers +{ internal partial class CraftDataPatcher { internal static IDictionary CustomRecipeData = new SelfCheckingDictionary("CustomRecipeData", AsStringFunction); @@ -110,18 +109,18 @@ private static void GetAllItemActionsPostfix(InventoryItem item, ref ItemAction __result |= ItemAction.Use; } - private static void DictionaryPrefix(TechType techType, IDictionary smlCollection, IDictionary craftDataCollection) + private static void DictionaryPrefix(TechType techType, IDictionary customCollection, IDictionary craftDataCollection) { - if (smlCollection.TryGetValue(techType, out T sml)) + if (customCollection.TryGetValue(techType, out T custom)) { if (craftDataCollection.TryGetValue(techType, out T gameVal)) { - if (!sml.Equals(gameVal)) - craftDataCollection[techType] = sml; + if (!custom.Equals(gameVal)) + craftDataCollection[techType] = custom; } else { - PatchUtils.PatchDictionary(craftDataCollection, smlCollection); + PatchUtils.PatchDictionary(craftDataCollection, customCollection); } } } @@ -141,21 +140,21 @@ private static void NeedsPatchingCheckPrefix(TechType techType) bool techExists = CraftData.techData.TryGetValue(techType, out CraftData.TechData techData); bool sameData = false; - if (techExists && CustomRecipeData.TryGetValue(techType, out ITechData smlTechData)) + if (techExists && CustomRecipeData.TryGetValue(techType, out ITechData customTechData)) { - sameData = smlTechData.craftAmount == techData.craftAmount && - smlTechData.ingredientCount == techData.ingredientCount && - smlTechData.linkedItemCount == techData.linkedItemCount; + sameData = customTechData.craftAmount == techData.craftAmount && + customTechData.ingredientCount == techData.ingredientCount && + customTechData.linkedItemCount == techData.linkedItemCount; if (sameData) - for (int i = 0; i < smlTechData.ingredientCount; i++) + for (int i = 0; i < customTechData.ingredientCount; i++) { - if (smlTechData.GetIngredient(i).techType != techData.GetIngredient(i).techType) + if (customTechData.GetIngredient(i).techType != techData.GetIngredient(i).techType) { sameData = false; break; } - if (smlTechData.GetIngredient(i).amount != techData.GetIngredient(i).amount) + if (customTechData.GetIngredient(i).amount != techData.GetIngredient(i).amount) { sameData = false; break; @@ -163,9 +162,9 @@ private static void NeedsPatchingCheckPrefix(TechType techType) } if (sameData) - for (int i = 0; i < smlTechData.linkedItemCount; i++) + for (int i = 0; i < customTechData.linkedItemCount; i++) { - if (smlTechData.GetLinkedItem(i) != techData.GetLinkedItem(i)) + if (customTechData.GetLinkedItem(i) != techData.GetLinkedItem(i)) { sameData = false; break; @@ -186,25 +185,25 @@ private static void PatchCustomTechData() foreach (TechType techType in CustomRecipeData.Keys) { bool techExists = CraftData.techData.TryGetValue(techType, out CraftData.TechData techData); - ITechData smlTechData = CustomRecipeData[techType]; + ITechData customTechData = CustomRecipeData[techType]; bool sameData = false; - if (techExists && smlTechData != null) + if (techExists && customTechData != null) { - sameData = smlTechData.craftAmount == techData.craftAmount && - smlTechData.ingredientCount == techData.ingredientCount && - smlTechData.linkedItemCount == techData.linkedItemCount; + sameData = customTechData.craftAmount == techData.craftAmount && + customTechData.ingredientCount == techData.ingredientCount && + customTechData.linkedItemCount == techData.linkedItemCount; if (sameData) - for (int i = 0; i < smlTechData.ingredientCount; i++) + for (int i = 0; i < customTechData.ingredientCount; i++) { - if (smlTechData.GetIngredient(i).techType != techData.GetIngredient(i).techType) + if (customTechData.GetIngredient(i).techType != techData.GetIngredient(i).techType) { sameData = false; break; } - if (smlTechData.GetIngredient(i).amount != techData.GetIngredient(i).amount) + if (customTechData.GetIngredient(i).amount != techData.GetIngredient(i).amount) { sameData = false; break; @@ -212,9 +211,9 @@ private static void PatchCustomTechData() } if (sameData) - for (int i = 0; i < smlTechData.linkedItemCount; i++) + for (int i = 0; i < customTechData.linkedItemCount; i++) { - if (smlTechData.GetLinkedItem(i) != techData.GetLinkedItem(i)) + if (customTechData.GetLinkedItem(i) != techData.GetLinkedItem(i)) { sameData = false; break; @@ -227,29 +226,29 @@ private static void PatchCustomTechData() var techDataInstance = new CraftData.TechData { _techType = techType, - _craftAmount = smlTechData?.craftAmount ?? 0 + _craftAmount = customTechData?.craftAmount ?? 0 }; var ingredientsList = new CraftData.Ingredients(); - if (smlTechData?.ingredientCount > 0) + if (customTechData?.ingredientCount > 0) { - for (int i = 0; i < smlTechData.ingredientCount; i++) + for (int i = 0; i < customTechData.ingredientCount; i++) { - IIngredient smlIngredient = smlTechData.GetIngredient(i); + IIngredient customIngredient = customTechData.GetIngredient(i); - var ingredient = new CraftData.Ingredient(smlIngredient.techType, smlIngredient.amount); - ingredientsList.Add(smlIngredient.techType, smlIngredient.amount); + var ingredient = new CraftData.Ingredient(customIngredient.techType, customIngredient.amount); + ingredientsList.Add(customIngredient.techType, customIngredient.amount); } techDataInstance._ingredients = ingredientsList; } - if (smlTechData?.linkedItemCount > 0) + if (customTechData?.linkedItemCount > 0) { var linkedItems = new List(); - for (int l = 0; l < smlTechData.linkedItemCount; l++) + for (int l = 0; l < customTechData.linkedItemCount; l++) { - linkedItems.Add(smlTechData.GetLinkedItem(l)); + linkedItems.Add(customTechData.GetLinkedItem(l)); } techDataInstance._linkedItems = linkedItems; } diff --git a/SMLHelper/Patchers/CraftTreePatcher.cs b/Nautilus/Patchers/CraftTreePatcher.cs similarity index 98% rename from SMLHelper/Patchers/CraftTreePatcher.cs rename to Nautilus/Patchers/CraftTreePatcher.cs index ee4c8b3cc..838f78652 100644 --- a/SMLHelper/Patchers/CraftTreePatcher.cs +++ b/Nautilus/Patchers/CraftTreePatcher.cs @@ -1,12 +1,12 @@ -namespace SMLHelper.Patchers; - -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using System.Reflection; using BepInEx.Logging; -using Crafting; using HarmonyLib; -using SMLHelper.Utility; +using Nautilus.Crafting; +using Nautilus.Utility; + +namespace Nautilus.Patchers; internal class CraftTreePatcher { diff --git a/SMLHelper/Patchers/CustomSoundPatcher.cs b/Nautilus/Patchers/CustomSoundPatcher.cs similarity index 99% rename from SMLHelper/Patchers/CustomSoundPatcher.cs rename to Nautilus/Patchers/CustomSoundPatcher.cs index 85db6946c..2637b2d27 100644 --- a/SMLHelper/Patchers/CustomSoundPatcher.cs +++ b/Nautilus/Patchers/CustomSoundPatcher.cs @@ -1,14 +1,13 @@ -namespace SMLHelper.Patchers; - -using SMLHelper.FMod.Interfaces; -using SMLHelper.Utility; +using System.Collections.Generic; using FMOD; +using FMOD.Studio; using FMODUnity; using HarmonyLib; -using System.Collections.Generic; -using FMOD.Studio; +using Nautilus.FMod.Interfaces; +using Nautilus.Utility; using UnityEngine; +namespace Nautilus.Patchers; internal class CustomSoundPatcher { diff --git a/SMLHelper/Patchers/EatablePatcher.cs b/Nautilus/Patchers/EatablePatcher.cs similarity index 88% rename from SMLHelper/Patchers/EatablePatcher.cs rename to Nautilus/Patchers/EatablePatcher.cs index 84bec41cd..624cbd2b7 100644 --- a/SMLHelper/Patchers/EatablePatcher.cs +++ b/Nautilus/Patchers/EatablePatcher.cs @@ -1,9 +1,11 @@ -namespace SMLHelper.Patchers; - +using System.Collections.Generic; using HarmonyLib; -using SMLHelper.Utility; -using System.Collections.Generic; -using static Handlers.EatableHandler; +using Nautilus.Handlers; +using Nautilus.Utility; + +namespace Nautilus.Patchers; + +using static EatableHandler; internal class EatablePatcher { diff --git a/SMLHelper/Patchers/EnumPatcher.cs b/Nautilus/Patchers/EnumPatcher.cs similarity index 98% rename from SMLHelper/Patchers/EnumPatcher.cs rename to Nautilus/Patchers/EnumPatcher.cs index 7cc606157..353ac1977 100644 --- a/SMLHelper/Patchers/EnumPatcher.cs +++ b/Nautilus/Patchers/EnumPatcher.cs @@ -1,12 +1,11 @@ using System; using System.Collections; using System.Collections.Generic; -using System.Linq; using BepInEx.Logging; using HarmonyLib; -using SMLHelper.Utility; +using Nautilus.Utility; -namespace SMLHelper.Patchers; +namespace Nautilus.Patchers; internal static class EnumPatcher { diff --git a/SMLHelper/Patchers/ItemActionPatcher.cs b/Nautilus/Patchers/ItemActionPatcher.cs similarity index 98% rename from SMLHelper/Patchers/ItemActionPatcher.cs rename to Nautilus/Patchers/ItemActionPatcher.cs index e11b47ccf..9f627ed8e 100644 --- a/SMLHelper/Patchers/ItemActionPatcher.cs +++ b/Nautilus/Patchers/ItemActionPatcher.cs @@ -1,11 +1,11 @@ -namespace SMLHelper.Patchers; - -using BepInEx.Logging; -using HarmonyLib; -using SMLHelper.Utility; -using System; +using System; using System.Collections.Generic; using System.Text; +using BepInEx.Logging; +using HarmonyLib; +using Nautilus.Utility; + +namespace Nautilus.Patchers; internal class ItemActionPatcher { diff --git a/SMLHelper/Patchers/ItemsContainerPatcher.cs b/Nautilus/Patchers/ItemsContainerPatcher.cs similarity index 97% rename from SMLHelper/Patchers/ItemsContainerPatcher.cs rename to Nautilus/Patchers/ItemsContainerPatcher.cs index c365ec4c6..4cc2cfad8 100644 --- a/SMLHelper/Patchers/ItemsContainerPatcher.cs +++ b/Nautilus/Patchers/ItemsContainerPatcher.cs @@ -1,9 +1,9 @@ -namespace SMLHelper.Patchers; - +using System; using BepInEx.Logging; using HarmonyLib; -using SMLHelper.Utility; -using System; +using Nautilus.Utility; + +namespace Nautilus.Patchers; internal static class ItemsContainerPatcher { diff --git a/SMLHelper/Patchers/KnownTechPatcher.cs b/Nautilus/Patchers/KnownTechPatcher.cs similarity index 98% rename from SMLHelper/Patchers/KnownTechPatcher.cs rename to Nautilus/Patchers/KnownTechPatcher.cs index 599855b11..1bd1cf610 100644 --- a/SMLHelper/Patchers/KnownTechPatcher.cs +++ b/Nautilus/Patchers/KnownTechPatcher.cs @@ -1,9 +1,10 @@ -namespace SMLHelper.Patchers; - -using System; +using System; using System.Collections.Generic; using System.Linq; using HarmonyLib; +using Nautilus.Utility; + +namespace Nautilus.Patchers; internal class KnownTechPatcher { diff --git a/SMLHelper/Patchers/LanguagePatcher.cs b/Nautilus/Patchers/LanguagePatcher.cs similarity index 96% rename from SMLHelper/Patchers/LanguagePatcher.cs rename to Nautilus/Patchers/LanguagePatcher.cs index e3d09c2df..c990fd6ff 100644 --- a/SMLHelper/Patchers/LanguagePatcher.cs +++ b/Nautilus/Patchers/LanguagePatcher.cs @@ -1,15 +1,12 @@ -using System.Linq; - -namespace SMLHelper.Patchers; - -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; +using System.Linq; using BepInEx.Logging; using HarmonyLib; -using Newtonsoft.Json; -using Handlers; +using Nautilus.Utility; using UnityEngine; -using Utility; + +namespace Nautilus.Patchers; internal static class LanguagePatcher { diff --git a/SMLHelper/Patchers/LargeWorldStreamerPatcher.cs b/Nautilus/Patchers/LargeWorldStreamerPatcher.cs similarity index 93% rename from SMLHelper/Patchers/LargeWorldStreamerPatcher.cs rename to Nautilus/Patchers/LargeWorldStreamerPatcher.cs index a778c1d67..66ec97d13 100644 --- a/SMLHelper/Patchers/LargeWorldStreamerPatcher.cs +++ b/Nautilus/Patchers/LargeWorldStreamerPatcher.cs @@ -1,17 +1,16 @@ -namespace SMLHelper.Patchers; - -using SMLHelper.Utility; using System; -using System.Linq; - -using SMLHelper.Json.Converters; using System.Collections.Generic; using System.IO; +using System.Linq; using HarmonyLib; -using SMLHelper.Handlers; -using SMLHelper.MonoBehaviours; -using UnityEngine; +using Nautilus.Handlers; +using Nautilus.Json.Converters; +using Nautilus.MonoBehaviours; +using Nautilus.Utility; using Newtonsoft.Json; +using UnityEngine; + +namespace Nautilus.Patchers; // TODO: Add immediate spawner spawning to completely remove dependency before world init internal class LargeWorldStreamerPatcher @@ -34,7 +33,7 @@ private static void InitializePostfix() { InitializeSpawnInfos(); - string file = Path.Combine(SaveLoadManager.GetTemporarySavePath(), "CoordinatedSpawnsInitialized.smlhelper"); + string file = Path.Combine(SaveLoadManager.GetTemporarySavePath(), "CoordinatedSpawnsInitialized.nautilus"); if (File.Exists(file)) { InternalLogger.Debug("Coordinated Spawns already been spawned in the current save. Loading Data"); @@ -66,7 +65,7 @@ private static void InitializePostfix() private static void SaveData() { - string file = Path.Combine(SaveLoadManager.GetTemporarySavePath(), "CoordinatedSpawnsInitialized.smlhelper"); + string file = Path.Combine(SaveLoadManager.GetTemporarySavePath(), "CoordinatedSpawnsInitialized.nautilus"); using StreamWriter writer = new(file); try { diff --git a/SMLHelper/Patchers/LootDistributionPatcher.cs b/Nautilus/Patchers/LootDistributionPatcher.cs similarity index 98% rename from SMLHelper/Patchers/LootDistributionPatcher.cs rename to Nautilus/Patchers/LootDistributionPatcher.cs index a9af54790..858ed9f94 100644 --- a/SMLHelper/Patchers/LootDistributionPatcher.cs +++ b/Nautilus/Patchers/LootDistributionPatcher.cs @@ -1,9 +1,9 @@ -namespace SMLHelper.Patchers; - -using SMLHelper.Utility; -using System.Collections.Generic; -using HarmonyLib; +using System.Collections.Generic; using BepInEx.Logging; +using HarmonyLib; +using Nautilus.Utility; + +namespace Nautilus.Patchers; internal class LootDistributionPatcher { diff --git a/SMLHelper/Patchers/OptionsPanelPatcher.cs b/Nautilus/Patchers/OptionsPanelPatcher.cs similarity index 98% rename from SMLHelper/Patchers/OptionsPanelPatcher.cs rename to Nautilus/Patchers/OptionsPanelPatcher.cs index 370245330..493b9ac75 100644 --- a/SMLHelper/Patchers/OptionsPanelPatcher.cs +++ b/Nautilus/Patchers/OptionsPanelPatcher.cs @@ -1,17 +1,19 @@ -namespace SMLHelper.Patchers; - -using HarmonyLib; -using Options; +using System.Collections; +using System.Collections.Generic; using System.IO; using System.Reflection; -using System.Collections; -using System.Collections.Generic; +using HarmonyLib; +using Nautilus.Options; +using Nautilus.Utility; +using Newtonsoft.Json; +using TMPro; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; -using Newtonsoft.Json; -using static SMLHelper.Options.ModKeybindOption; -using TMPro; + +namespace Nautilus.Patchers; + +using static ModKeybindOption; internal class OptionsPanelPatcher { @@ -83,8 +85,8 @@ internal static void AddTabs_Postfix(uGUI_OptionsPanel __instance) modsTab = optionsPanel.AddTab("Mods"); } - // Maybe this could be split into its own file to handle smlhelper options, or maybe it could be removed alltogether - optionsPanel.AddHeading(modsTab, "SMLHelper"); + // Maybe this could be split into its own file to handle nautilus options, or maybe it could be removed alltogether + optionsPanel.AddHeading(modsTab, "Nautilus"); optionsPanel.AddToggleOption(modsTab, "Enable debug logs", Utility.InternalLogger.EnableDebugging, Utility.InternalLogger.SetDebugging); optionsPanel.AddChoiceOption(modsTab, "Extra item info", new string[] { diff --git a/SMLHelper/Patchers/PDAEncyclopediaPatcher.cs b/Nautilus/Patchers/PDAEncyclopediaPatcher.cs similarity index 93% rename from SMLHelper/Patchers/PDAEncyclopediaPatcher.cs rename to Nautilus/Patchers/PDAEncyclopediaPatcher.cs index d65fcaeb4..60d13ce36 100644 --- a/SMLHelper/Patchers/PDAEncyclopediaPatcher.cs +++ b/Nautilus/Patchers/PDAEncyclopediaPatcher.cs @@ -1,8 +1,8 @@ -namespace SMLHelper.Patchers; - +using System.Collections.Generic; using HarmonyLib; -using SMLHelper.Utility; -using System.Collections.Generic; +using Nautilus.Utility; + +namespace Nautilus.Patchers; internal class PDAEncyclopediaPatcher { diff --git a/SMLHelper/Patchers/PDALogPatcher.cs b/Nautilus/Patchers/PDALogPatcher.cs similarity index 93% rename from SMLHelper/Patchers/PDALogPatcher.cs rename to Nautilus/Patchers/PDALogPatcher.cs index 1f864d473..1f3e365fd 100644 --- a/SMLHelper/Patchers/PDALogPatcher.cs +++ b/Nautilus/Patchers/PDALogPatcher.cs @@ -1,6 +1,7 @@ -namespace SMLHelper.Patchers; - using HarmonyLib; +using Nautilus.Utility; + +namespace Nautilus.Patchers; internal class PDALogPatcher { diff --git a/SMLHelper/Patchers/PdaPatcher.cs b/Nautilus/Patchers/PdaPatcher.cs similarity index 97% rename from SMLHelper/Patchers/PdaPatcher.cs rename to Nautilus/Patchers/PdaPatcher.cs index 0cea47000..93ccd877f 100644 --- a/SMLHelper/Patchers/PdaPatcher.cs +++ b/Nautilus/Patchers/PdaPatcher.cs @@ -1,9 +1,9 @@ -namespace SMLHelper.Patchers; - +using System.Collections.Generic; using BepInEx.Logging; using HarmonyLib; -using SMLHelper.Utility; -using System.Collections.Generic; +using Nautilus.Utility; + +namespace Nautilus.Patchers; // Special thanks to Gorillazilla9 for sharing this method of fragment count patching // https://github.com/Gorillazilla9/SubnauticaFragReqBoost/blob/master/PDAScannerPatcher.cs diff --git a/SMLHelper/Patchers/PrefabDatabasePatcher.cs b/Nautilus/Patchers/PrefabDatabasePatcher.cs similarity index 98% rename from SMLHelper/Patchers/PrefabDatabasePatcher.cs rename to Nautilus/Patchers/PrefabDatabasePatcher.cs index 69d3e7576..6c112965b 100644 --- a/SMLHelper/Patchers/PrefabDatabasePatcher.cs +++ b/Nautilus/Patchers/PrefabDatabasePatcher.cs @@ -1,19 +1,17 @@ -using SMLHelper.Handlers; - -namespace SMLHelper.Patchers; - -using System; -using System.Reflection; -using System.Reflection.Emit; +using System; using System.Collections; using System.Collections.Generic; - -using Assets; +using System.Reflection; +using System.Reflection.Emit; +using BepInEx.Logging; using HarmonyLib; +using Nautilus.Assets; +using Nautilus.Handlers; +using Nautilus.Utility; using UnityEngine; using UWE; -using Utility; -using BepInEx.Logging; + +namespace Nautilus.Patchers; internal static class PrefabDatabasePatcher { diff --git a/SMLHelper/Patchers/SaveUtilsPatcher.cs b/Nautilus/Patchers/SaveUtilsPatcher.cs similarity index 98% rename from SMLHelper/Patchers/SaveUtilsPatcher.cs rename to Nautilus/Patchers/SaveUtilsPatcher.cs index 52aa98fb6..5842dd6ee 100644 --- a/SMLHelper/Patchers/SaveUtilsPatcher.cs +++ b/Nautilus/Patchers/SaveUtilsPatcher.cs @@ -1,10 +1,10 @@ -namespace SMLHelper.Patchers; - -using System; +using System; using System.Collections; using System.Collections.Generic; using HarmonyLib; +namespace Nautilus.Patchers; + internal class SaveUtilsPatcher { private static readonly List oneTimeUseOnSaveEvents = new(); diff --git a/SMLHelper/Patchers/SpritePatcher.cs b/Nautilus/Patchers/SpritePatcher.cs similarity index 95% rename from SMLHelper/Patchers/SpritePatcher.cs rename to Nautilus/Patchers/SpritePatcher.cs index 1fcc9cb05..85a16ba70 100644 --- a/SMLHelper/Patchers/SpritePatcher.cs +++ b/Nautilus/Patchers/SpritePatcher.cs @@ -1,15 +1,12 @@ -namespace SMLHelper.Patchers; - -using SMLHelper.Utility; -using System; -using System.Collections; +using System; using System.Collections.Generic; using System.Reflection; -using SMLHelper.Assets; -using SMLHelper.Handlers; using HarmonyLib; -using UnityEngine; -using UWE; +using Nautilus.Assets; +using Nautilus.Utility; +using Nautilus.Handlers; + +namespace Nautilus.Patchers; #if SUBNAUTICA using Sprite = Atlas.Sprite; diff --git a/SMLHelper/Patchers/SurvivalPatcher.cs b/Nautilus/Patchers/SurvivalPatcher.cs similarity index 97% rename from SMLHelper/Patchers/SurvivalPatcher.cs rename to Nautilus/Patchers/SurvivalPatcher.cs index 7ceb33dff..00ae3f77d 100644 --- a/SMLHelper/Patchers/SurvivalPatcher.cs +++ b/Nautilus/Patchers/SurvivalPatcher.cs @@ -1,11 +1,11 @@ -namespace SMLHelper.Patchers; - -using SMLHelper.Utility; using System; using System.Collections.Generic; +using BepInEx.Logging; using HarmonyLib; +using Nautilus.Utility; using UnityEngine; -using BepInEx.Logging; + +namespace Nautilus.Patchers; internal class SurvivalPatcher { diff --git a/SMLHelper/Patchers/TooltipPatcher.cs b/Nautilus/Patchers/TooltipPatcher.cs similarity index 93% rename from SMLHelper/Patchers/TooltipPatcher.cs rename to Nautilus/Patchers/TooltipPatcher.cs index a694cdf48..bb127747d 100644 --- a/SMLHelper/Patchers/TooltipPatcher.cs +++ b/Nautilus/Patchers/TooltipPatcher.cs @@ -1,15 +1,12 @@ -namespace SMLHelper.Patchers; - -using HarmonyLib; -using Handlers; -using System.IO; +using System.IO; using System.Reflection; using System.Text; -using System.Linq; -using System.Collections.Generic; -using Utility; using BepInEx.Logging; -using System; +using HarmonyLib; +using Nautilus.Handlers; +using Nautilus.Utility; + +namespace Nautilus.Patchers; internal class TooltipPatcher { @@ -60,7 +57,7 @@ internal static void CustomTooltip(StringBuilder sb, TechType techType) } else { - WriteModNameError(sb, "Unknown Mod", "Item added without SMLHelper"); + WriteModNameError(sb, "Unknown Mod", "Item added without Nautilus"); } } @@ -140,10 +137,10 @@ internal static void Initialize() Initialized = true; - var smlFolder = Path.Combine(BepInEx.Paths.ConfigPath, Assembly.GetExecutingAssembly().GetName().Name); - Directory.CreateDirectory(smlFolder); + var nautilusFolder = Path.Combine(BepInEx.Paths.ConfigPath, Assembly.GetExecutingAssembly().GetName().Name); + Directory.CreateDirectory(nautilusFolder); - var configPath = Path.Combine(smlFolder, "ExtraItemInfo.txt"); + var configPath = Path.Combine(nautilusFolder, "ExtraItemInfo.txt"); if (!File.Exists(configPath)) { diff --git a/SMLHelper/Patchers/WorldEntityDatabasePatcher.cs b/Nautilus/Patchers/WorldEntityDatabasePatcher.cs similarity index 91% rename from SMLHelper/Patchers/WorldEntityDatabasePatcher.cs rename to Nautilus/Patchers/WorldEntityDatabasePatcher.cs index 927cbfc5e..97ec3a685 100644 --- a/SMLHelper/Patchers/WorldEntityDatabasePatcher.cs +++ b/Nautilus/Patchers/WorldEntityDatabasePatcher.cs @@ -1,9 +1,10 @@ -namespace SMLHelper.Patchers; - -using System.Collections.Generic; +using System.Collections.Generic; using HarmonyLib; +using Nautilus.Utility; using UWE; +namespace Nautilus.Patchers; + internal class WorldEntityDatabasePatcher { internal static readonly SelfCheckingDictionary CustomWorldEntityInfos = new("CustomWorldEntityInfo"); diff --git a/SMLHelper/Properties/AssemblyInfo.cs b/Nautilus/Properties/AssemblyInfo.cs similarity index 91% rename from SMLHelper/Properties/AssemblyInfo.cs rename to Nautilus/Properties/AssemblyInfo.cs index 64c1aa26a..7319ae752 100644 --- a/SMLHelper/Properties/AssemblyInfo.cs +++ b/Nautilus/Properties/AssemblyInfo.cs @@ -9,5 +9,5 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("418502dd-372d-4ef9-8021-b262552dfede")] -[assembly: InternalsVisibleTo("SMLHelper.Tests")] +[assembly: InternalsVisibleTo("Nautilus.Tests")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] diff --git a/SMLHelper/Utility/AudioUtils.cs b/Nautilus/Utility/AudioUtils.cs similarity index 99% rename from SMLHelper/Utility/AudioUtils.cs rename to Nautilus/Utility/AudioUtils.cs index d3a437fe6..59750ea66 100644 --- a/SMLHelper/Utility/AudioUtils.cs +++ b/Nautilus/Utility/AudioUtils.cs @@ -1,6 +1,4 @@ -namespace SMLHelper.Utility; - -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Runtime.InteropServices; @@ -9,6 +7,8 @@ using FMODUnity; using UnityEngine; +namespace Nautilus.Utility; + /// /// Utilities for audio and sound /// diff --git a/SMLHelper/Utility/AudioUtils_BelowZero.cs b/Nautilus/Utility/AudioUtils_BelowZero.cs similarity index 98% rename from SMLHelper/Utility/AudioUtils_BelowZero.cs rename to Nautilus/Utility/AudioUtils_BelowZero.cs index 2f6daebbd..da97ad8ff 100644 --- a/SMLHelper/Utility/AudioUtils_BelowZero.cs +++ b/Nautilus/Utility/AudioUtils_BelowZero.cs @@ -1,5 +1,5 @@ #if BELOWZERO -namespace SMLHelper.Utility +namespace Nautilus.Utility { public static partial class AudioUtils { diff --git a/SMLHelper/Utility/AudioUtils_Subnautica.cs b/Nautilus/Utility/AudioUtils_Subnautica.cs similarity index 98% rename from SMLHelper/Utility/AudioUtils_Subnautica.cs rename to Nautilus/Utility/AudioUtils_Subnautica.cs index e0911d2f6..e63fff5d3 100644 --- a/SMLHelper/Utility/AudioUtils_Subnautica.cs +++ b/Nautilus/Utility/AudioUtils_Subnautica.cs @@ -1,5 +1,5 @@ #if SUBNAUTICA -namespace SMLHelper.Utility +namespace Nautilus.Utility { public static partial class AudioUtils { diff --git a/SMLHelper/Utility/BasicText.cs b/Nautilus/Utility/BasicText.cs similarity index 99% rename from SMLHelper/Utility/BasicText.cs rename to Nautilus/Utility/BasicText.cs index bfce51b1d..3bd467b45 100644 --- a/SMLHelper/Utility/BasicText.cs +++ b/Nautilus/Utility/BasicText.cs @@ -1,8 +1,8 @@ -namespace SMLHelper.Utility; - +using TMPro; using UnityEngine; using UnityEngine.UI; -using TMPro; + +namespace Nautilus.Utility; /// /// diff --git a/SMLHelper/Utility/EnumCacheManager.cs b/Nautilus/Utility/EnumCacheManager.cs similarity index 99% rename from SMLHelper/Utility/EnumCacheManager.cs rename to Nautilus/Utility/EnumCacheManager.cs index 769172f7b..d3b6cbab1 100644 --- a/SMLHelper/Utility/EnumCacheManager.cs +++ b/Nautilus/Utility/EnumCacheManager.cs @@ -1,6 +1,4 @@ -namespace SMLHelper.Utility; - -using System; +using System; using System.Collections; using System.Collections.Generic; using System.IO; @@ -9,6 +7,8 @@ using System.Text; using BepInEx; +namespace Nautilus.Utility; + internal class EnumTypeCache { internal int Index; diff --git a/SMLHelper/Utility/ExtBannedIdManager.cs b/Nautilus/Utility/ExtBannedIdManager.cs similarity index 98% rename from SMLHelper/Utility/ExtBannedIdManager.cs rename to Nautilus/Utility/ExtBannedIdManager.cs index 7b99ba59d..dd22f9d73 100644 --- a/SMLHelper/Utility/ExtBannedIdManager.cs +++ b/Nautilus/Utility/ExtBannedIdManager.cs @@ -1,12 +1,12 @@ -namespace SMLHelper.Utility; - -using System; +using System; using System.Collections; using System.Collections.Generic; using System.IO; using System.Reflection; using BepInEx.Logging; +namespace Nautilus.Utility; + /// /// This class is tasked with checking external txt files for banned IDs that are not to be isssued when patching in new enum entries. /// @@ -78,7 +78,7 @@ private static void LoadFromFiles() foreach (string filePath in files) // An empty directory will skip over this { - // Each file in this directory represents a list of enum IDs that have been patched from outside of SMLHelper. + // Each file in this directory represents a list of enum IDs that have been patched from outside of Nautilus. // Normally, this means that each file will represent one specific mod. // This would also be user configurable so warning must be issued to the user not to alter these files. diff --git a/SMLHelper/Utility/IOUtilities.cs b/Nautilus/Utility/IOUtilities.cs similarity index 92% rename from SMLHelper/Utility/IOUtilities.cs rename to Nautilus/Utility/IOUtilities.cs index ad6f90804..83202015c 100644 --- a/SMLHelper/Utility/IOUtilities.cs +++ b/Nautilus/Utility/IOUtilities.cs @@ -1,6 +1,6 @@ -namespace SMLHelper.Utility; +using System.IO; -using System.IO; +namespace Nautilus.Utility; /// /// Utilities for files and paths diff --git a/SMLHelper/Utility/ImageUtils.cs b/Nautilus/Utility/ImageUtils.cs similarity index 98% rename from SMLHelper/Utility/ImageUtils.cs rename to Nautilus/Utility/ImageUtils.cs index 8bb0bbb33..42d0ded36 100644 --- a/SMLHelper/Utility/ImageUtils.cs +++ b/Nautilus/Utility/ImageUtils.cs @@ -1,8 +1,9 @@ -namespace SMLHelper.Utility; - -using System.IO; +using System.IO; using BepInEx.Logging; using UnityEngine; + +namespace Nautilus.Utility; + using Logger = InternalLogger; #if SUBNAUTICA using Sprite = Atlas.Sprite; diff --git a/SMLHelper/Utility/InternalLogger.cs b/Nautilus/Utility/InternalLogger.cs similarity index 97% rename from SMLHelper/Utility/InternalLogger.cs rename to Nautilus/Utility/InternalLogger.cs index 9b85fe34f..a11fc0897 100644 --- a/SMLHelper/Utility/InternalLogger.cs +++ b/Nautilus/Utility/InternalLogger.cs @@ -1,12 +1,12 @@ -namespace SMLHelper.Utility; - +using System; using System.Linq; -using System; using System.Reflection; using BepInEx.Bootstrap; using BepInEx.Configuration; using BepInEx.Logging; +namespace Nautilus.Utility; + internal static class InternalLogger { internal static bool Initialized = false; @@ -120,7 +120,7 @@ internal static void Log(string text, LogLevel level = LogLevel.Info) { if(level >= LogLevel.Info || EnableDebugging) { - Console.WriteLine($"[SMLHelper/{level}] {text}"); + Console.WriteLine($"[Nautilus/{level}] {text}"); } return; diff --git a/SMLHelper/Utility/ItemStorageHelper.cs b/Nautilus/Utility/ItemStorageHelper.cs similarity index 99% rename from SMLHelper/Utility/ItemStorageHelper.cs rename to Nautilus/Utility/ItemStorageHelper.cs index bee09e908..2510116bb 100644 --- a/SMLHelper/Utility/ItemStorageHelper.cs +++ b/Nautilus/Utility/ItemStorageHelper.cs @@ -1,6 +1,6 @@ -namespace SMLHelper.Utility; +using System.Collections.Generic; -using System.Collections.Generic; +namespace Nautilus.Utility; /// /// A utility class that offers additional info about instances. diff --git a/SMLHelper/Utility/JsonUtils.cs b/Nautilus/Utility/JsonUtils.cs similarity index 99% rename from SMLHelper/Utility/JsonUtils.cs rename to Nautilus/Utility/JsonUtils.cs index 294488c91..40a9c8e87 100644 --- a/SMLHelper/Utility/JsonUtils.cs +++ b/Nautilus/Utility/JsonUtils.cs @@ -1,13 +1,13 @@ -namespace SMLHelper.Utility; - -using System; -using System.IO; +using System; using System.Globalization; +using System.IO; +using System.Reflection; using System.Text; using System.Threading; -using System.Reflection; -using Newtonsoft.Json; using BepInEx.Logging; +using Newtonsoft.Json; + +namespace Nautilus.Utility; /// /// A collection of utilities for interacting with JSON files. diff --git a/SMLHelper/Utility/KeyCodeUtils.cs b/Nautilus/Utility/KeyCodeUtils.cs similarity index 99% rename from SMLHelper/Utility/KeyCodeUtils.cs rename to Nautilus/Utility/KeyCodeUtils.cs index 46f471397..99ef0e670 100644 --- a/SMLHelper/Utility/KeyCodeUtils.cs +++ b/Nautilus/Utility/KeyCodeUtils.cs @@ -1,9 +1,9 @@ -namespace SMLHelper.Utility; - -using System; +using System; using BepInEx.Logging; using UnityEngine; +namespace Nautilus.Utility; + /// /// A collection of related utility methods. /// diff --git a/SMLHelper/Utility/MaterialModifiers/ColorModifier.cs b/Nautilus/Utility/MaterialModifiers/ColorModifier.cs similarity index 93% rename from SMLHelper/Utility/MaterialModifiers/ColorModifier.cs rename to Nautilus/Utility/MaterialModifiers/ColorModifier.cs index 723cab7dc..915b72aaf 100644 --- a/SMLHelper/Utility/MaterialModifiers/ColorModifier.cs +++ b/Nautilus/Utility/MaterialModifiers/ColorModifier.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace SMLHelper.Utility.MaterialModifiers; +namespace Nautilus.Utility.MaterialModifiers; /// /// Basic material modifier that sets the property on all materials. diff --git a/SMLHelper/Utility/MaterialModifiers/MaterialModifier.cs b/Nautilus/Utility/MaterialModifiers/MaterialModifier.cs similarity index 96% rename from SMLHelper/Utility/MaterialModifiers/MaterialModifier.cs rename to Nautilus/Utility/MaterialModifiers/MaterialModifier.cs index 0510da3be..801ebeb08 100644 --- a/SMLHelper/Utility/MaterialModifiers/MaterialModifier.cs +++ b/Nautilus/Utility/MaterialModifiers/MaterialModifier.cs @@ -1,6 +1,6 @@ -namespace SMLHelper.Utility.MaterialModifiers; +using UnityEngine; -using UnityEngine; +namespace Nautilus.Utility.MaterialModifiers; /// /// Base class for material modifiers. Can be overriden to implement custom behaviour. diff --git a/SMLHelper/Utility/MaterialUtils.cs b/Nautilus/Utility/MaterialUtils.cs similarity index 99% rename from SMLHelper/Utility/MaterialUtils.cs rename to Nautilus/Utility/MaterialUtils.cs index 4d0fbb100..cbbf91210 100644 --- a/SMLHelper/Utility/MaterialUtils.cs +++ b/Nautilus/Utility/MaterialUtils.cs @@ -1,8 +1,8 @@ -namespace SMLHelper.Utility; - -using MaterialModifiers; +using Nautilus.Utility.MaterialModifiers; using UnityEngine; +namespace Nautilus.Utility; + /// /// Utilities related to Materials and Shaders. /// diff --git a/SMLHelper/Utility/MaterialUtils_Subnautica.cs b/Nautilus/Utility/MaterialUtils_Subnautica.cs similarity index 98% rename from SMLHelper/Utility/MaterialUtils_Subnautica.cs rename to Nautilus/Utility/MaterialUtils_Subnautica.cs index f71b16058..6c3611c5d 100644 --- a/SMLHelper/Utility/MaterialUtils_Subnautica.cs +++ b/Nautilus/Utility/MaterialUtils_Subnautica.cs @@ -1,10 +1,10 @@ -#if SUBNAUTICA -namespace SMLHelper.Utility; - -using System.Collections; +using System.Collections; using UnityEngine; using UWE; +#if SUBNAUTICA +namespace Nautilus.Utility; + public static partial class MaterialUtils { private static void PatchInternal() diff --git a/SMLHelper/Utility/PatchUtils.cs b/Nautilus/Utility/PatchUtils.cs similarity index 85% rename from SMLHelper/Utility/PatchUtils.cs rename to Nautilus/Utility/PatchUtils.cs index 0e2598ed9..421bf609a 100644 --- a/SMLHelper/Utility/PatchUtils.cs +++ b/Nautilus/Utility/PatchUtils.cs @@ -1,25 +1,25 @@ -namespace SMLHelper; - -using System; -using System.Reflection; -using System.Diagnostics; +using System; using System.Collections.Generic; +using System.Diagnostics; +using System.Reflection; using System.Runtime.CompilerServices; using HarmonyLib; +namespace Nautilus.Utility; + internal static class PatchUtils { - internal static void PatchDictionary(IDictionary original, IDictionary patches) + internal static void PatchDictionary(IDictionary original, IDictionary patches) { - foreach (KeyValuePair entry in patches) + foreach (KeyValuePair entry in patches) { original[entry.Key] = entry.Value; } } - internal static void PatchList(IList original, IList patches) + internal static void PatchList(IList original, IList patches) { - foreach (ValueType entry in patches) + foreach (T entry in patches) { original.Add(entry); } diff --git a/SMLHelper/Utility/PlayerPrefsExtra.cs b/Nautilus/Utility/PlayerPrefsExtra.cs similarity index 99% rename from SMLHelper/Utility/PlayerPrefsExtra.cs rename to Nautilus/Utility/PlayerPrefsExtra.cs index 0ff290244..3a4e7690a 100644 --- a/SMLHelper/Utility/PlayerPrefsExtra.cs +++ b/Nautilus/Utility/PlayerPrefsExtra.cs @@ -1,6 +1,6 @@ -namespace SMLHelper.Utility; +using UnityEngine; -using UnityEngine; +namespace Nautilus.Utility; /// /// A collection of utility methods that simplify calls into for quick custom save data. diff --git a/SMLHelper/Utility/PrefabUtils.cs b/Nautilus/Utility/PrefabUtils.cs similarity index 98% rename from SMLHelper/Utility/PrefabUtils.cs rename to Nautilus/Utility/PrefabUtils.cs index 0ecde87ef..587401810 100644 --- a/SMLHelper/Utility/PrefabUtils.cs +++ b/Nautilus/Utility/PrefabUtils.cs @@ -1,7 +1,6 @@ -namespace SMLHelper.Utility; +using UnityEngine; -using System; -using UnityEngine; +namespace Nautilus.Utility; /// /// Defines how a constructable can be placed. diff --git a/SMLHelper/Utility/ReflectionHelper.cs b/Nautilus/Utility/ReflectionHelper.cs similarity index 97% rename from SMLHelper/Utility/ReflectionHelper.cs rename to Nautilus/Utility/ReflectionHelper.cs index 2284c6f8e..32e8dac14 100644 --- a/SMLHelper/Utility/ReflectionHelper.cs +++ b/Nautilus/Utility/ReflectionHelper.cs @@ -1,8 +1,8 @@ -namespace SMLHelper.Utility; - -using System.Diagnostics; +using System.Diagnostics; using System.Reflection; +namespace Nautilus.Utility; + /// /// An extension method class for simplifying reflection calls for improved readability. /// @@ -188,7 +188,7 @@ public static void CopyFields(this T original, T copy, BindingFlags bindingFl } } - private static readonly Assembly smlHelperAssembly = Assembly.GetExecutingAssembly(); + private static readonly Assembly nautilusAssembly = Assembly.GetExecutingAssembly(); internal static string CallingAssemblyNameByStackTrace() { @@ -203,14 +203,14 @@ internal static Assembly CallingAssemblyByStackTrace() { Assembly ownerAssembly = stackFrame.GetMethod().DeclaringType.Assembly; if(ownerAssembly.GetName().Name.StartsWith("Unity")) - return smlHelperAssembly; + return nautilusAssembly; - if (ownerAssembly != smlHelperAssembly) + if (ownerAssembly != nautilusAssembly) { return ownerAssembly; } } - return smlHelperAssembly; + return nautilusAssembly; } } \ No newline at end of file diff --git a/SMLHelper/Utility/SaveUtils.cs b/Nautilus/Utility/SaveUtils.cs similarity index 98% rename from SMLHelper/Utility/SaveUtils.cs rename to Nautilus/Utility/SaveUtils.cs index 3489c4201..143e5bccd 100644 --- a/SMLHelper/Utility/SaveUtils.cs +++ b/Nautilus/Utility/SaveUtils.cs @@ -1,7 +1,7 @@ -namespace SMLHelper.Utility; +using System; +using Nautilus.Patchers; -using System; -using SMLHelper.Patchers; +namespace Nautilus.Utility; /// /// A small collection of save data related utilities. diff --git a/SMLHelper/Utility/SelfCheckingDictionary.cs b/Nautilus/Utility/SelfCheckingDictionary.cs similarity index 99% rename from SMLHelper/Utility/SelfCheckingDictionary.cs rename to Nautilus/Utility/SelfCheckingDictionary.cs index 249dda10d..9bb929d6b 100644 --- a/SMLHelper/Utility/SelfCheckingDictionary.cs +++ b/Nautilus/Utility/SelfCheckingDictionary.cs @@ -1,9 +1,8 @@ -namespace SMLHelper.Patchers; - -using System; +using System; using System.Collections; using System.Collections.Generic; -using SMLHelper.Utility; + +namespace Nautilus.Utility; /// /// This dictionary strtucture automatically checks for duplicate keys as they are being added to the collection. diff --git a/SMLHelper/Utility/StorageHelperExtensions.cs b/Nautilus/Utility/StorageHelperExtensions.cs similarity index 98% rename from SMLHelper/Utility/StorageHelperExtensions.cs rename to Nautilus/Utility/StorageHelperExtensions.cs index f2350592d..77fff58b7 100644 --- a/SMLHelper/Utility/StorageHelperExtensions.cs +++ b/Nautilus/Utility/StorageHelperExtensions.cs @@ -1,6 +1,6 @@ -namespace SMLHelper.Utility; +using System.Collections.Generic; -using System.Collections.Generic; +namespace Nautilus.Utility; /// /// Extension methods to provide static calls for into methods. diff --git a/PostBuild.targets b/PostBuild.targets index 6c7c0b6a1..6b3968e5d 100644 --- a/PostBuild.targets +++ b/PostBuild.targets @@ -2,15 +2,12 @@ - SMLib - SMLHelper_BZ + Nautilus $(OutDir)\plugins $([System.IO.Path]::Combine('$(PluginsDir)', '$(BuildPath)')) - $([System.IO.Path]::Combine('$(TargetDir)', 'SMLHelper_$(ConfigurationName).zip')) - $([System.IO.Path]::Combine('$(TargetDir)', 'SMLHelper_$(ConfigurationName)_Thunderstore.zip')) + $([System.IO.Path]::Combine('$(TargetDir)', 'Nautilus_$(ConfigurationName).zip')) $([System.IO.Path]::Combine('$(OutDir)', 'TemporaryDir')) $([System.IO.Path]::Combine('$(TemporaryDir)', 'Build')) - $([System.IO.Path]::Combine('$(TemporaryDir)', 'Thunderstore')) @@ -27,30 +24,20 @@ - - - - - - + - - - \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 000000000..9119380d6 --- /dev/null +++ b/README.md @@ -0,0 +1,23 @@ +# Nautilus: Subnautica Modding API + +## About +Nautilus is a modding library that aims on enhancing developer productivity by offering common helper utilities as easy to use and robust as possible. + +Nautilus offers systems such as adding/editing items, icons, spawns, sounds and so much more! + +## Installation +1. Download [BepInEx](https://www.nexusmods.com/subnautica/mods/1108). + Install it by extracting the content of the zip into your Subnautica folder (usually `C:\Program Files (x86)\Steam\steamapps\common\Subnautica`) +2. Download Nautilus from either [Nexus Mods](https://www.youtube.com/watch?v=dQw4w9WgXcQ), [Submodica](https://www.youtube.com/watch?v=dQw4w9WgXcQ) or GitHub Releases. + Drag and drop the `plugins` folder in the zip into your BepInEx folder. + +If you got trouble installing the mod, please join our [Discord server](https://discord.gg/UpWuWwq). + +## Links +* [Documentation](https://subnauticamodding.github.io/Nautilus) ([source](https://github.com/SubnauticaModding/Nautilus/tree/docs/Nautilus/Documentation)) +* [Update To Nautilus From SMLHelper](https://subnauticamodding.github.io/Nautilus/guides/sml2-to-nautilus.html) +* [Subnautica Modding Discord Server](https://discord.gg/UpWuWwq) + +## Contributing +Please read through our [Contribution Guidelines](CONTRIBUTING.md) before submitting a pull request. We welcome all kinds of contributions. +If you have an idea for a feature or a bug fix to report but are not capable of writing code, [submit an issue](https://github.com/SubnauticaModding/Nautilus/issues/new) instead. \ No newline at end of file diff --git a/SMLHelper.sln b/SMLHelper.sln deleted file mode 100644 index 92b6f8599..000000000 --- a/SMLHelper.sln +++ /dev/null @@ -1,87 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.1.32210.238 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SMLHelper", "SMLHelper\SMLHelper.csproj", "{418502DD-372D-4EF9-8021-B262552DFEDE}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Example mod", "Example mod\Example mod.csproj", "{C8FB0981-77D2-47C7-BBEF-A3A9EBACACBF}" - ProjectSection(ProjectDependencies) = postProject - {418502DD-372D-4EF9-8021-B262552DFEDE} = {418502DD-372D-4EF9-8021-B262552DFEDE} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5152F028-6D03-43C0-88C5-986313017D4F}" - ProjectSection(SolutionItems) = preProject - common.props = common.props - Version.targets = Version.targets - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Thunderstore Metadata", "Thunderstore Metadata", "{3630BD6E-A8B0-4FE9-9027-E09666CFF9EA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BZ.EXP", "BZ.EXP", "{1C8C260D-E424-4CBD-B47B-A26809385EB1}" - ProjectSection(SolutionItems) = preProject - SMLHelper\ThunderstoreMetadata\BZ.EXP\icon.png = SMLHelper\ThunderstoreMetadata\BZ.EXP\icon.png - SMLHelper\ThunderstoreMetadata\BZ.EXP\manifest.json = SMLHelper\ThunderstoreMetadata\BZ.EXP\manifest.json - SMLHelper\ThunderstoreMetadata\BZ.EXP\README.md = SMLHelper\ThunderstoreMetadata\BZ.EXP\README.md - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BZ.STABLE", "BZ.STABLE", "{A31ABC1E-22A8-4F0E-AD41-8627F45A2882}" - ProjectSection(SolutionItems) = preProject - SMLHelper\ThunderstoreMetadata\BZ.STABLE\icon.png = SMLHelper\ThunderstoreMetadata\BZ.STABLE\icon.png - SMLHelper\ThunderstoreMetadata\BZ.STABLE\manifest.json = SMLHelper\ThunderstoreMetadata\BZ.STABLE\manifest.json - SMLHelper\ThunderstoreMetadata\BZ.STABLE\README.md = SMLHelper\ThunderstoreMetadata\BZ.STABLE\README.md - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SN.EXP", "SN.EXP", "{D04E3334-8652-492C-BD21-5D294D6246D9}" - ProjectSection(SolutionItems) = preProject - SMLHelper\ThunderstoreMetadata\SN.EXP\icon.png = SMLHelper\ThunderstoreMetadata\SN.EXP\icon.png - SMLHelper\ThunderstoreMetadata\SN.EXP\manifest.json = SMLHelper\ThunderstoreMetadata\SN.EXP\manifest.json - SMLHelper\ThunderstoreMetadata\SN.EXP\README.md = SMLHelper\ThunderstoreMetadata\SN.EXP\README.md - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SN.STABLE", "SN.STABLE", "{708BB5A4-9239-47D8-B73A-D124E994630B}" - ProjectSection(SolutionItems) = preProject - SMLHelper\ThunderstoreMetadata\SN.STABLE\icon.png = SMLHelper\ThunderstoreMetadata\SN.STABLE\icon.png - SMLHelper\ThunderstoreMetadata\SN.STABLE\manifest.json = SMLHelper\ThunderstoreMetadata\SN.STABLE\manifest.json - SMLHelper\ThunderstoreMetadata\SN.STABLE\README.md = SMLHelper\ThunderstoreMetadata\SN.STABLE\README.md - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - BZ.EXP|Any CPU = BZ.EXP|Any CPU - BZ.STABLE|Any CPU = BZ.STABLE|Any CPU - SN.EXP|Any CPU = SN.EXP|Any CPU - SN.STABLE|Any CPU = SN.STABLE|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {418502DD-372D-4EF9-8021-B262552DFEDE}.BZ.EXP|Any CPU.ActiveCfg = BZ.EXP|Any CPU - {418502DD-372D-4EF9-8021-B262552DFEDE}.BZ.EXP|Any CPU.Build.0 = BZ.EXP|Any CPU - {418502DD-372D-4EF9-8021-B262552DFEDE}.BZ.STABLE|Any CPU.ActiveCfg = BZ.STABLE|Any CPU - {418502DD-372D-4EF9-8021-B262552DFEDE}.BZ.STABLE|Any CPU.Build.0 = BZ.STABLE|Any CPU - {418502DD-372D-4EF9-8021-B262552DFEDE}.SN.EXP|Any CPU.ActiveCfg = SN.EXP|Any CPU - {418502DD-372D-4EF9-8021-B262552DFEDE}.SN.EXP|Any CPU.Build.0 = SN.EXP|Any CPU - {418502DD-372D-4EF9-8021-B262552DFEDE}.SN.STABLE|Any CPU.ActiveCfg = SN.STABLE|Any CPU - {418502DD-372D-4EF9-8021-B262552DFEDE}.SN.STABLE|Any CPU.Build.0 = SN.STABLE|Any CPU - {C8FB0981-77D2-47C7-BBEF-A3A9EBACACBF}.BZ.EXP|Any CPU.ActiveCfg = BZ.EXP|Any CPU - {C8FB0981-77D2-47C7-BBEF-A3A9EBACACBF}.BZ.EXP|Any CPU.Build.0 = BZ.EXP|Any CPU - {C8FB0981-77D2-47C7-BBEF-A3A9EBACACBF}.BZ.STABLE|Any CPU.ActiveCfg = BZ.STABLE|Any CPU - {C8FB0981-77D2-47C7-BBEF-A3A9EBACACBF}.BZ.STABLE|Any CPU.Build.0 = BZ.STABLE|Any CPU - {C8FB0981-77D2-47C7-BBEF-A3A9EBACACBF}.SN.EXP|Any CPU.ActiveCfg = SN.EXP|Any CPU - {C8FB0981-77D2-47C7-BBEF-A3A9EBACACBF}.SN.EXP|Any CPU.Build.0 = SN.EXP|Any CPU - {C8FB0981-77D2-47C7-BBEF-A3A9EBACACBF}.SN.STABLE|Any CPU.ActiveCfg = SN.STABLE|Any CPU - {C8FB0981-77D2-47C7-BBEF-A3A9EBACACBF}.SN.STABLE|Any CPU.Build.0 = SN.STABLE|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {3630BD6E-A8B0-4FE9-9027-E09666CFF9EA} = {5152F028-6D03-43C0-88C5-986313017D4F} - {1C8C260D-E424-4CBD-B47B-A26809385EB1} = {3630BD6E-A8B0-4FE9-9027-E09666CFF9EA} - {A31ABC1E-22A8-4F0E-AD41-8627F45A2882} = {3630BD6E-A8B0-4FE9-9027-E09666CFF9EA} - {D04E3334-8652-492C-BD21-5D294D6246D9} = {3630BD6E-A8B0-4FE9-9027-E09666CFF9EA} - {708BB5A4-9239-47D8-B73A-D124E994630B} = {3630BD6E-A8B0-4FE9-9027-E09666CFF9EA} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {DA2C5D3D-5F61-4EA3-9399-FDEF43184299} - EndGlobalSection -EndGlobal diff --git a/SMLHelper/Initializer.cs b/SMLHelper/Initializer.cs deleted file mode 100644 index 17adc7ef7..000000000 --- a/SMLHelper/Initializer.cs +++ /dev/null @@ -1,60 +0,0 @@ -namespace SMLHelper; - -using System; -using BepInEx; -using HarmonyLib; -using Patchers; -using Utility; -using UnityEngine; - - -/// -/// WARNING: This class is for use only by Bepinex. -/// -[BepInPlugin(PluginInfo.PLUGIN_GUID, PluginInfo.PLUGIN_NAME, PluginInfo.PLUGIN_VERSION)] -public class Initializer : BaseUnityPlugin -{ - internal static readonly Harmony harmony = new(PluginInfo.PLUGIN_GUID); - - /// - /// WARNING: This method is for use only by Bepinex. - /// - [Obsolete("This method is for use only by Bepinex.", true)] - Initializer() - { - GameObject obj = UWE.Utils.GetEntityRoot(this.gameObject) ?? this.gameObject; - obj.EnsureComponent(); - - InternalLogger.Initialize(Logger); -#if SUBNAUTICA - InternalLogger.Info($"Loading v{PluginInfo.PLUGIN_VERSION} for Subnautica"); -#elif BELOWZERO - InternalLogger.Info($"Loading v{PluginInfo.PLUGIN_VERSION} for BelowZero"); -#endif - - PrefabDatabasePatcher.PrePatch(harmony); - EnumPatcher.Patch(harmony); - CraftDataPatcher.Patch(harmony); - CraftTreePatcher.Patch(harmony); - ConsoleCommandsPatcher.Patch(harmony); - LanguagePatcher.Patch(harmony); - PrefabDatabasePatcher.PostPatch(harmony); - SpritePatcher.Patch(harmony); - KnownTechPatcher.Patch(harmony); - OptionsPanelPatcher.Patch(harmony); - ItemsContainerPatcher.Patch(harmony); - PDALogPatcher.Patch(harmony); - PDAPatcher.Patch(harmony); - PDAEncyclopediaPatcher.Patch(harmony); - ItemActionPatcher.Patch(harmony); - LootDistributionPatcher.Patch(harmony); - WorldEntityDatabasePatcher.Patch(harmony); - LargeWorldStreamerPatcher.Patch(harmony); - SaveUtilsPatcher.Patch(harmony); - TooltipPatcher.Patch(harmony); - SurvivalPatcher.Patch(harmony); - CustomSoundPatcher.Patch(harmony); - EatablePatcher.Patch(harmony); - MaterialUtils.Patch(); - } -} \ No newline at end of file diff --git a/SMLHelper/ThunderstoreMetadata/BZ.EXP/README.md b/SMLHelper/ThunderstoreMetadata/BZ.EXP/README.md deleted file mode 100644 index 96b7eba8b..000000000 --- a/SMLHelper/ThunderstoreMetadata/BZ.EXP/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# SMLHelper Experimental -SMLHelper is a modding library that helps making mods easier by helping with adding new items, changing items, adding models, sprites, etc. -This copy of SMLHelper is made for the Experimental Steam Branch and may break often as the Experimental branch gets updated. EXPECT BUGS! -Check out [the wiki page](https://github.com/SubnauticaModding/SMLHelper/wiki) for details on how to use it. - - diff --git a/SMLHelper/ThunderstoreMetadata/BZ.EXP/icon.png b/SMLHelper/ThunderstoreMetadata/BZ.EXP/icon.png deleted file mode 100644 index fe992a07e..000000000 Binary files a/SMLHelper/ThunderstoreMetadata/BZ.EXP/icon.png and /dev/null differ diff --git a/SMLHelper/ThunderstoreMetadata/BZ.EXP/manifest.json b/SMLHelper/ThunderstoreMetadata/BZ.EXP/manifest.json deleted file mode 100644 index 35f382fe4..000000000 --- a/SMLHelper/ThunderstoreMetadata/BZ.EXP/manifest.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "SMLHelper_BZ_Experimental", - "version_number": "3.0.0", - "website_url": "https://github.com/SubnauticaModding/SMLHelper/wiki", - "description": "SMLHelper is a modding library that helps making mods easier by helping with adding new items, changing items, adding models, sprites, etc.", - "dependencies": [ "Subnautica_Modding-BepInExPack-5.4.2101" ] -} \ No newline at end of file diff --git a/SMLHelper/ThunderstoreMetadata/BZ.STABLE/README.md b/SMLHelper/ThunderstoreMetadata/BZ.STABLE/README.md deleted file mode 100644 index 6038e4a04..000000000 --- a/SMLHelper/ThunderstoreMetadata/BZ.STABLE/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# SMLHelper -SMLHelper is a modding library that helps making mods easier by helping with adding new items, changing items, adding models, sprites, etc. -Check out [the wiki page](https://github.com/SubnauticaModding/SMLHelper/wiki) for details on how to use it. diff --git a/SMLHelper/ThunderstoreMetadata/BZ.STABLE/icon.png b/SMLHelper/ThunderstoreMetadata/BZ.STABLE/icon.png deleted file mode 100644 index fe992a07e..000000000 Binary files a/SMLHelper/ThunderstoreMetadata/BZ.STABLE/icon.png and /dev/null differ diff --git a/SMLHelper/ThunderstoreMetadata/BZ.STABLE/manifest.json b/SMLHelper/ThunderstoreMetadata/BZ.STABLE/manifest.json deleted file mode 100644 index f94dc63f7..000000000 --- a/SMLHelper/ThunderstoreMetadata/BZ.STABLE/manifest.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "SMLHelper_BZ", - "version_number": "3.0.0", - "website_url": "https://github.com/SubnauticaModding/SMLHelper/wiki", - "description": "SMLHelper is a modding library that helps making mods easier by helping with adding new items, changing items, adding models, sprites, etc.", - "dependencies": [ "Subnautica_Modding-BepInExPack-5.4.2101" ] -} \ No newline at end of file diff --git a/SMLHelper/ThunderstoreMetadata/SN.EXP/README.md b/SMLHelper/ThunderstoreMetadata/SN.EXP/README.md deleted file mode 100644 index 96b7eba8b..000000000 --- a/SMLHelper/ThunderstoreMetadata/SN.EXP/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# SMLHelper Experimental -SMLHelper is a modding library that helps making mods easier by helping with adding new items, changing items, adding models, sprites, etc. -This copy of SMLHelper is made for the Experimental Steam Branch and may break often as the Experimental branch gets updated. EXPECT BUGS! -Check out [the wiki page](https://github.com/SubnauticaModding/SMLHelper/wiki) for details on how to use it. - - diff --git a/SMLHelper/ThunderstoreMetadata/SN.EXP/icon.png b/SMLHelper/ThunderstoreMetadata/SN.EXP/icon.png deleted file mode 100644 index fe992a07e..000000000 Binary files a/SMLHelper/ThunderstoreMetadata/SN.EXP/icon.png and /dev/null differ diff --git a/SMLHelper/ThunderstoreMetadata/SN.EXP/manifest.json b/SMLHelper/ThunderstoreMetadata/SN.EXP/manifest.json deleted file mode 100644 index b167f4cd0..000000000 --- a/SMLHelper/ThunderstoreMetadata/SN.EXP/manifest.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "SMLHelper_Experimental", - "version_number": "3.0.0", - "website_url": "https://github.com/SubnauticaModding/SMLHelper/wiki", - "description": "SMLHelper is a modding library that helps making mods easier by helping with adding new items, changing items, adding models, sprites, etc.", - "dependencies": [ "Subnautica_Modding-BepInExPack-5.4.2101" ] -} \ No newline at end of file diff --git a/SMLHelper/ThunderstoreMetadata/SN.STABLE/README.md b/SMLHelper/ThunderstoreMetadata/SN.STABLE/README.md deleted file mode 100644 index 6038e4a04..000000000 --- a/SMLHelper/ThunderstoreMetadata/SN.STABLE/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# SMLHelper -SMLHelper is a modding library that helps making mods easier by helping with adding new items, changing items, adding models, sprites, etc. -Check out [the wiki page](https://github.com/SubnauticaModding/SMLHelper/wiki) for details on how to use it. diff --git a/SMLHelper/ThunderstoreMetadata/SN.STABLE/icon.png b/SMLHelper/ThunderstoreMetadata/SN.STABLE/icon.png deleted file mode 100644 index fe992a07e..000000000 Binary files a/SMLHelper/ThunderstoreMetadata/SN.STABLE/icon.png and /dev/null differ diff --git a/SMLHelper/ThunderstoreMetadata/SN.STABLE/manifest.json b/SMLHelper/ThunderstoreMetadata/SN.STABLE/manifest.json deleted file mode 100644 index 8ec96fdef..000000000 --- a/SMLHelper/ThunderstoreMetadata/SN.STABLE/manifest.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "SMLHelper", - "version_number": "3.0.0", - "website_url": "https://github.com/SubnauticaModding/SMLHelper/wiki", - "description": "SMLHelper is a modding library that helps making mods easier by helping with adding new items, changing items, adding models, sprites, etc.", - "dependencies": [ "Subnautica_Modding-BepInExPack-5.4.2101" ] -} \ No newline at end of file diff --git a/SMLHelper/packages.config b/SMLHelper/packages.config deleted file mode 100644 index 09dc10155..000000000 --- a/SMLHelper/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/Version.targets b/Version.targets index 156be53ff..a38ad1fb1 100644 --- a/Version.targets +++ b/Version.targets @@ -2,6 +2,6 @@ - 3.0.0.0 + 1.0.0.0 \ No newline at end of file diff --git a/common.props b/common.props index 08c3d6c5e..1a2dc3eaa 100644 --- a/common.props +++ b/common.props @@ -6,11 +6,4 @@ - - - ..\Dependencies\Subnautica.exp - - - ..\Dependencies\BelowZero.exp - \ No newline at end of file