From 219002bad8cba19dcaf1a41730ec582b7d0840be Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 25 Mar 2023 15:21:07 -0400 Subject: [PATCH] Namespace issues --- NewHorizons/Builder/Body/AsteroidBeltBuilder.cs | 2 +- NewHorizons/Builder/Body/SingularityBuilder.cs | 2 +- NewHorizons/Builder/Body/StellarRemnantBuilder.cs | 2 +- NewHorizons/Builder/Props/GeneralPropBuilder.cs | 2 +- NewHorizons/Builder/Props/RemoteBuilder.cs | 2 +- .../Builder/Props/TranslatorText/TranslatorTextBuilder.cs | 2 +- .../Components/SizeControllers/StarEvolutionController.cs | 2 +- NewHorizons/Components/Volumes/LoadCreditsVolume.cs | 2 +- NewHorizons/External/Configs/StarSystemConfig.cs | 2 +- NewHorizons/External/Modules/AmbientLightModule.cs | 2 +- NewHorizons/External/Modules/AtmosphereModule.cs | 4 ++-- NewHorizons/External/Modules/BaseModule.cs | 2 +- NewHorizons/External/Modules/BrambleModule.cs | 2 +- NewHorizons/External/Modules/GeneralPropInfo.cs | 2 +- NewHorizons/External/Modules/HeightMapModule.cs | 2 +- NewHorizons/External/Modules/OrbitModule.cs | 4 ++-- NewHorizons/External/Modules/ProcGenModule.cs | 2 +- NewHorizons/External/Modules/Props/DetailInfo.cs | 2 +- NewHorizons/External/Modules/Props/Dialogue/DialogueInfo.cs | 2 +- .../External/Modules/Props/EchoesOfTheEye/SlideInfo.cs | 2 +- NewHorizons/External/Modules/Props/GeyserInfo.cs | 2 +- NewHorizons/External/Modules/Props/ScatterInfo.cs | 2 +- NewHorizons/External/Modules/Props/TornadoInfo.cs | 4 ++-- .../External/Modules/Props/TranslatorText/NomaiTextArcInfo.cs | 2 +- .../External/Modules/Props/TranslatorText/NomaiTextInfo.cs | 2 +- .../Modules/Props/TranslatorText/TranslatorTextInfo.cs | 2 +- NewHorizons/External/Modules/Props/VolcanoInfo.cs | 2 +- NewHorizons/External/Modules/ReferenceFrameModule.cs | 2 +- NewHorizons/External/Modules/ShipLogModule.cs | 2 +- NewHorizons/External/Modules/SpawnModule.cs | 2 +- NewHorizons/External/Modules/VariableSize/FunnelModule.cs | 2 +- NewHorizons/External/Modules/VariableSize/LavaModule.cs | 2 +- NewHorizons/External/Modules/VariableSize/SandModule.cs | 2 +- NewHorizons/External/Modules/VariableSize/StarModule.cs | 2 +- NewHorizons/External/Modules/VariableSize/WaterModule.cs | 2 +- .../External/Modules/Volumes/VolumeInfos/AudioVolumeInfo.cs | 2 +- .../Modules/Volumes/VolumeInfos/DestructionVolumeInfo.cs | 2 +- .../External/Modules/Volumes/VolumeInfos/FluidVolumeInfo.cs | 2 +- .../Modules/Volumes/VolumeInfos/LoadCreditsVolumeInfo.cs | 2 +- NewHorizons/External/SerializableData/MColor.cs | 2 +- NewHorizons/External/SerializableData/MGradient.cs | 4 ++-- NewHorizons/External/SerializableData/MMesh.cs | 2 +- NewHorizons/External/SerializableData/MVector2.cs | 4 ++-- NewHorizons/External/SerializableData/MVector3.cs | 3 ++- .../External/SerializableEnums/NHAudioMixerTrackName.cs | 2 +- NewHorizons/External/SerializableEnums/NHClipSelectionType.cs | 2 +- NewHorizons/External/SerializableEnums/NHCreditsType.cs | 2 +- NewHorizons/External/SerializableEnums/NHDeathType.cs | 2 +- NewHorizons/External/SerializableEnums/NHFluidType.cs | 2 +- NewHorizons/Handlers/EyeSceneHandler.cs | 2 +- NewHorizons/Utility/DebugTools/Menu/DebugMenuShipLogs.cs | 2 +- NewHorizons/Utility/Geometry/MeshUtilities.cs | 2 +- NewHorizons/Utility/NewHorizonExtensions.cs | 4 ++-- 53 files changed, 60 insertions(+), 59 deletions(-) diff --git a/NewHorizons/Builder/Body/AsteroidBeltBuilder.cs b/NewHorizons/Builder/Body/AsteroidBeltBuilder.cs index 6ed7aa8f..8568f61b 100644 --- a/NewHorizons/Builder/Body/AsteroidBeltBuilder.cs +++ b/NewHorizons/Builder/Body/AsteroidBeltBuilder.cs @@ -1,7 +1,7 @@ using NewHorizons.External; using NewHorizons.External.Configs; using NewHorizons.External.Modules; -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using NewHorizons.Handlers; using NewHorizons.Utility.OWML; using OWML.Common; diff --git a/NewHorizons/Builder/Body/SingularityBuilder.cs b/NewHorizons/Builder/Body/SingularityBuilder.cs index d8f19786..4e403945 100644 --- a/NewHorizons/Builder/Body/SingularityBuilder.cs +++ b/NewHorizons/Builder/Body/SingularityBuilder.cs @@ -10,7 +10,7 @@ using NewHorizons.Components.Volumes; using NewHorizons.Builder.Props; using NewHorizons.Utility.OWML; using NewHorizons.Utility.OuterWilds; -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; namespace NewHorizons.Builder.Body { diff --git a/NewHorizons/Builder/Body/StellarRemnantBuilder.cs b/NewHorizons/Builder/Body/StellarRemnantBuilder.cs index b38ebe1e..0d30dae2 100644 --- a/NewHorizons/Builder/Body/StellarRemnantBuilder.cs +++ b/NewHorizons/Builder/Body/StellarRemnantBuilder.cs @@ -1,6 +1,6 @@ using NewHorizons.Builder.General; using NewHorizons.External; -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using NewHorizons.External.Modules.VariableSize; using NewHorizons.Utility; using NewHorizons.Utility.OWML; diff --git a/NewHorizons/Builder/Props/GeneralPropBuilder.cs b/NewHorizons/Builder/Props/GeneralPropBuilder.cs index 1ff551a3..70c164c2 100644 --- a/NewHorizons/Builder/Props/GeneralPropBuilder.cs +++ b/NewHorizons/Builder/Props/GeneralPropBuilder.cs @@ -1,5 +1,5 @@ using NewHorizons.External.Modules; -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using NewHorizons.Utility; using NewHorizons.Utility.OuterWilds; using NewHorizons.Utility.OWML; diff --git a/NewHorizons/Builder/Props/RemoteBuilder.cs b/NewHorizons/Builder/Props/RemoteBuilder.cs index 644b1faa..1a077368 100644 --- a/NewHorizons/Builder/Props/RemoteBuilder.cs +++ b/NewHorizons/Builder/Props/RemoteBuilder.cs @@ -2,7 +2,7 @@ using NewHorizons.Builder.Props.TranslatorText; using NewHorizons.External; using NewHorizons.External.Modules.Props; using NewHorizons.External.Modules.Props.Remote; -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using NewHorizons.External.Modules.TranslatorText; using NewHorizons.Handlers; using NewHorizons.Utility; diff --git a/NewHorizons/Builder/Props/TranslatorText/TranslatorTextBuilder.cs b/NewHorizons/Builder/Props/TranslatorText/TranslatorTextBuilder.cs index 2cdaab30..aeaa9878 100644 --- a/NewHorizons/Builder/Props/TranslatorText/TranslatorTextBuilder.cs +++ b/NewHorizons/Builder/Props/TranslatorText/TranslatorTextBuilder.cs @@ -1,6 +1,6 @@ using NewHorizons.External; using NewHorizons.External.Modules.Props; -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using NewHorizons.External.Modules.TranslatorText; using NewHorizons.Handlers; using NewHorizons.Utility; diff --git a/NewHorizons/Components/SizeControllers/StarEvolutionController.cs b/NewHorizons/Components/SizeControllers/StarEvolutionController.cs index 5e62c3d8..c55b44fd 100644 --- a/NewHorizons/Components/SizeControllers/StarEvolutionController.cs +++ b/NewHorizons/Components/SizeControllers/StarEvolutionController.cs @@ -1,7 +1,7 @@ using NewHorizons.Builder.Body; using NewHorizons.Components.Orbital; using NewHorizons.Components.Stars; -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using NewHorizons.External.Modules.VariableSize; using NewHorizons.Handlers; using NewHorizons.Utility; diff --git a/NewHorizons/Components/Volumes/LoadCreditsVolume.cs b/NewHorizons/Components/Volumes/LoadCreditsVolume.cs index 2746c7b2..6657d4c8 100644 --- a/NewHorizons/Components/Volumes/LoadCreditsVolume.cs +++ b/NewHorizons/Components/Volumes/LoadCreditsVolume.cs @@ -1,4 +1,4 @@ -using NewHorizons.External.Modules.SerializableEnums; +using NewHorizons.External.SerializableEnums; using NewHorizons.Handlers; using NewHorizons.Utility.OWML; using System.Collections; diff --git a/NewHorizons/External/Configs/StarSystemConfig.cs b/NewHorizons/External/Configs/StarSystemConfig.cs index c05e9d9a..b16a209e 100644 --- a/NewHorizons/External/Configs/StarSystemConfig.cs +++ b/NewHorizons/External/Configs/StarSystemConfig.cs @@ -3,7 +3,7 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.Linq; using NewHorizons.External.Modules; -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using Newtonsoft.Json; using static NewHorizons.External.Modules.ShipLogModule; diff --git a/NewHorizons/External/Modules/AmbientLightModule.cs b/NewHorizons/External/Modules/AmbientLightModule.cs index 80217c90..4d96f077 100644 --- a/NewHorizons/External/Modules/AmbientLightModule.cs +++ b/NewHorizons/External/Modules/AmbientLightModule.cs @@ -1,6 +1,6 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using Newtonsoft.Json; namespace NewHorizons.External.Modules diff --git a/NewHorizons/External/Modules/AtmosphereModule.cs b/NewHorizons/External/Modules/AtmosphereModule.cs index 25d8e2f1..b93fbb65 100644 --- a/NewHorizons/External/Modules/AtmosphereModule.cs +++ b/NewHorizons/External/Modules/AtmosphereModule.cs @@ -2,8 +2,8 @@ using System; using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.Runtime.Serialization; -using NewHorizons.External.Modules.SerializableData; -using NewHorizons.External.Modules.SerializableEnums; +using NewHorizons.External.SerializableData; +using NewHorizons.External.SerializableEnums; using Newtonsoft.Json; using Newtonsoft.Json.Converters; diff --git a/NewHorizons/External/Modules/BaseModule.cs b/NewHorizons/External/Modules/BaseModule.cs index 0d55d804..ffd754f5 100644 --- a/NewHorizons/External/Modules/BaseModule.cs +++ b/NewHorizons/External/Modules/BaseModule.cs @@ -1,7 +1,7 @@ using System; using System.ComponentModel; using System.Runtime.Serialization; -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using Newtonsoft.Json; using Newtonsoft.Json.Converters; diff --git a/NewHorizons/External/Modules/BrambleModule.cs b/NewHorizons/External/Modules/BrambleModule.cs index 723a9c4b..3351c6f5 100644 --- a/NewHorizons/External/Modules/BrambleModule.cs +++ b/NewHorizons/External/Modules/BrambleModule.cs @@ -1,4 +1,4 @@ -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using Newtonsoft.Json; using Newtonsoft.Json.Converters; using System; diff --git a/NewHorizons/External/Modules/GeneralPropInfo.cs b/NewHorizons/External/Modules/GeneralPropInfo.cs index 0831c48a..5b4d9b02 100644 --- a/NewHorizons/External/Modules/GeneralPropInfo.cs +++ b/NewHorizons/External/Modules/GeneralPropInfo.cs @@ -1,5 +1,5 @@ -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using Newtonsoft.Json; namespace NewHorizons.External.Modules diff --git a/NewHorizons/External/Modules/HeightMapModule.cs b/NewHorizons/External/Modules/HeightMapModule.cs index 5f247739..11d07830 100644 --- a/NewHorizons/External/Modules/HeightMapModule.cs +++ b/NewHorizons/External/Modules/HeightMapModule.cs @@ -1,4 +1,4 @@ -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using Newtonsoft.Json; using System.ComponentModel; using System.ComponentModel.DataAnnotations; diff --git a/NewHorizons/External/Modules/OrbitModule.cs b/NewHorizons/External/Modules/OrbitModule.cs index b59383cc..84fa1d89 100644 --- a/NewHorizons/External/Modules/OrbitModule.cs +++ b/NewHorizons/External/Modules/OrbitModule.cs @@ -1,8 +1,8 @@ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; using NewHorizons.Components.Orbital; using NewHorizons.External.SerializableData; using Newtonsoft.Json; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; namespace NewHorizons.External.Modules { diff --git a/NewHorizons/External/Modules/ProcGenModule.cs b/NewHorizons/External/Modules/ProcGenModule.cs index 8099cf97..6c54ced8 100644 --- a/NewHorizons/External/Modules/ProcGenModule.cs +++ b/NewHorizons/External/Modules/ProcGenModule.cs @@ -1,5 +1,5 @@ using System.ComponentModel.DataAnnotations; -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using Newtonsoft.Json; namespace NewHorizons.External.Modules diff --git a/NewHorizons/External/Modules/Props/DetailInfo.cs b/NewHorizons/External/Modules/Props/DetailInfo.cs index af5924c4..2ca4d99e 100644 --- a/NewHorizons/External/Modules/Props/DetailInfo.cs +++ b/NewHorizons/External/Modules/Props/DetailInfo.cs @@ -1,4 +1,4 @@ -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using Newtonsoft.Json; using System; using System.ComponentModel; diff --git a/NewHorizons/External/Modules/Props/Dialogue/DialogueInfo.cs b/NewHorizons/External/Modules/Props/Dialogue/DialogueInfo.cs index 25ef83b4..0cf3c823 100644 --- a/NewHorizons/External/Modules/Props/Dialogue/DialogueInfo.cs +++ b/NewHorizons/External/Modules/Props/Dialogue/DialogueInfo.cs @@ -1,4 +1,4 @@ -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using Newtonsoft.Json; using System; using System.ComponentModel; diff --git a/NewHorizons/External/Modules/Props/EchoesOfTheEye/SlideInfo.cs b/NewHorizons/External/Modules/Props/EchoesOfTheEye/SlideInfo.cs index 35520780..3b656dfd 100644 --- a/NewHorizons/External/Modules/Props/EchoesOfTheEye/SlideInfo.cs +++ b/NewHorizons/External/Modules/Props/EchoesOfTheEye/SlideInfo.cs @@ -1,4 +1,4 @@ -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using Newtonsoft.Json; namespace NewHorizons.External.Modules.Props.EchoesOfTheEye diff --git a/NewHorizons/External/Modules/Props/GeyserInfo.cs b/NewHorizons/External/Modules/Props/GeyserInfo.cs index 4ab5a1eb..92a1de74 100644 --- a/NewHorizons/External/Modules/Props/GeyserInfo.cs +++ b/NewHorizons/External/Modules/Props/GeyserInfo.cs @@ -1,4 +1,4 @@ -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using Newtonsoft.Json; using System.ComponentModel; diff --git a/NewHorizons/External/Modules/Props/ScatterInfo.cs b/NewHorizons/External/Modules/Props/ScatterInfo.cs index 5bb1ca26..b53cd4e8 100644 --- a/NewHorizons/External/Modules/Props/ScatterInfo.cs +++ b/NewHorizons/External/Modules/Props/ScatterInfo.cs @@ -1,4 +1,4 @@ -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using Newtonsoft.Json; using System.ComponentModel; diff --git a/NewHorizons/External/Modules/Props/TornadoInfo.cs b/NewHorizons/External/Modules/Props/TornadoInfo.cs index c389875f..60e9cbda 100644 --- a/NewHorizons/External/Modules/Props/TornadoInfo.cs +++ b/NewHorizons/External/Modules/Props/TornadoInfo.cs @@ -1,5 +1,5 @@ -using NewHorizons.External.Modules.SerializableData; -using NewHorizons.External.Modules.SerializableEnums; +using NewHorizons.External.SerializableData; +using NewHorizons.External.SerializableEnums; using Newtonsoft.Json; using Newtonsoft.Json.Converters; using System; diff --git a/NewHorizons/External/Modules/Props/TranslatorText/NomaiTextArcInfo.cs b/NewHorizons/External/Modules/Props/TranslatorText/NomaiTextArcInfo.cs index 7772c924..5616d003 100644 --- a/NewHorizons/External/Modules/Props/TranslatorText/NomaiTextArcInfo.cs +++ b/NewHorizons/External/Modules/Props/TranslatorText/NomaiTextArcInfo.cs @@ -1,4 +1,4 @@ -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using Newtonsoft.Json; using Newtonsoft.Json.Converters; using System; diff --git a/NewHorizons/External/Modules/Props/TranslatorText/NomaiTextInfo.cs b/NewHorizons/External/Modules/Props/TranslatorText/NomaiTextInfo.cs index 97b610fd..4300af65 100644 --- a/NewHorizons/External/Modules/Props/TranslatorText/NomaiTextInfo.cs +++ b/NewHorizons/External/Modules/Props/TranslatorText/NomaiTextInfo.cs @@ -1,4 +1,4 @@ -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using Newtonsoft.Json; using System.ComponentModel; diff --git a/NewHorizons/External/Modules/Props/TranslatorText/TranslatorTextInfo.cs b/NewHorizons/External/Modules/Props/TranslatorText/TranslatorTextInfo.cs index 17c0e8cf..960950af 100644 --- a/NewHorizons/External/Modules/Props/TranslatorText/TranslatorTextInfo.cs +++ b/NewHorizons/External/Modules/Props/TranslatorText/TranslatorTextInfo.cs @@ -1,4 +1,4 @@ -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using Newtonsoft.Json; using System.ComponentModel; diff --git a/NewHorizons/External/Modules/Props/VolcanoInfo.cs b/NewHorizons/External/Modules/Props/VolcanoInfo.cs index f6186871..b8a0a084 100644 --- a/NewHorizons/External/Modules/Props/VolcanoInfo.cs +++ b/NewHorizons/External/Modules/Props/VolcanoInfo.cs @@ -1,4 +1,4 @@ -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using Newtonsoft.Json; using System.ComponentModel; diff --git a/NewHorizons/External/Modules/ReferenceFrameModule.cs b/NewHorizons/External/Modules/ReferenceFrameModule.cs index 43d12bd4..42b4015a 100644 --- a/NewHorizons/External/Modules/ReferenceFrameModule.cs +++ b/NewHorizons/External/Modules/ReferenceFrameModule.cs @@ -1,5 +1,5 @@ using System.ComponentModel; -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using Newtonsoft.Json; namespace NewHorizons.External.Modules diff --git a/NewHorizons/External/Modules/ShipLogModule.cs b/NewHorizons/External/Modules/ShipLogModule.cs index 9badb727..10828598 100644 --- a/NewHorizons/External/Modules/ShipLogModule.cs +++ b/NewHorizons/External/Modules/ShipLogModule.cs @@ -1,6 +1,6 @@ using System; using System.ComponentModel; -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using Newtonsoft.Json; namespace NewHorizons.External.Modules diff --git a/NewHorizons/External/Modules/SpawnModule.cs b/NewHorizons/External/Modules/SpawnModule.cs index 9dd583ca..9a613bc7 100644 --- a/NewHorizons/External/Modules/SpawnModule.cs +++ b/NewHorizons/External/Modules/SpawnModule.cs @@ -1,4 +1,4 @@ -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using Newtonsoft.Json; using System; diff --git a/NewHorizons/External/Modules/VariableSize/FunnelModule.cs b/NewHorizons/External/Modules/VariableSize/FunnelModule.cs index 6cb7a5b4..25409b64 100644 --- a/NewHorizons/External/Modules/VariableSize/FunnelModule.cs +++ b/NewHorizons/External/Modules/VariableSize/FunnelModule.cs @@ -1,6 +1,6 @@ using System.ComponentModel; using System.Runtime.Serialization; -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using Newtonsoft.Json; using Newtonsoft.Json.Converters; diff --git a/NewHorizons/External/Modules/VariableSize/LavaModule.cs b/NewHorizons/External/Modules/VariableSize/LavaModule.cs index e3abd0f2..0d1b6013 100644 --- a/NewHorizons/External/Modules/VariableSize/LavaModule.cs +++ b/NewHorizons/External/Modules/VariableSize/LavaModule.cs @@ -1,4 +1,4 @@ -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using Newtonsoft.Json; namespace NewHorizons.External.Modules.VariableSize diff --git a/NewHorizons/External/Modules/VariableSize/SandModule.cs b/NewHorizons/External/Modules/VariableSize/SandModule.cs index d5a19dff..e1d0c858 100644 --- a/NewHorizons/External/Modules/VariableSize/SandModule.cs +++ b/NewHorizons/External/Modules/VariableSize/SandModule.cs @@ -1,4 +1,4 @@ -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; namespace NewHorizons.External.Modules.VariableSize { diff --git a/NewHorizons/External/Modules/VariableSize/StarModule.cs b/NewHorizons/External/Modules/VariableSize/StarModule.cs index 8313fcae..3476b867 100644 --- a/NewHorizons/External/Modules/VariableSize/StarModule.cs +++ b/NewHorizons/External/Modules/VariableSize/StarModule.cs @@ -2,7 +2,7 @@ using System; using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.Runtime.Serialization; -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using Newtonsoft.Json; using Newtonsoft.Json.Converters; diff --git a/NewHorizons/External/Modules/VariableSize/WaterModule.cs b/NewHorizons/External/Modules/VariableSize/WaterModule.cs index 03617034..baa348b7 100644 --- a/NewHorizons/External/Modules/VariableSize/WaterModule.cs +++ b/NewHorizons/External/Modules/VariableSize/WaterModule.cs @@ -1,4 +1,4 @@ -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using Newtonsoft.Json; using System.ComponentModel; diff --git a/NewHorizons/External/Modules/Volumes/VolumeInfos/AudioVolumeInfo.cs b/NewHorizons/External/Modules/Volumes/VolumeInfos/AudioVolumeInfo.cs index dc8c0640..6334ace0 100644 --- a/NewHorizons/External/Modules/Volumes/VolumeInfos/AudioVolumeInfo.cs +++ b/NewHorizons/External/Modules/Volumes/VolumeInfos/AudioVolumeInfo.cs @@ -1,4 +1,4 @@ -using NewHorizons.External.Modules.SerializableEnums; +using NewHorizons.External.SerializableEnums; using Newtonsoft.Json; using System.ComponentModel; using System.ComponentModel.DataAnnotations; diff --git a/NewHorizons/External/Modules/Volumes/VolumeInfos/DestructionVolumeInfo.cs b/NewHorizons/External/Modules/Volumes/VolumeInfos/DestructionVolumeInfo.cs index 14f4bd37..e8b022ad 100644 --- a/NewHorizons/External/Modules/Volumes/VolumeInfos/DestructionVolumeInfo.cs +++ b/NewHorizons/External/Modules/Volumes/VolumeInfos/DestructionVolumeInfo.cs @@ -1,4 +1,4 @@ -using NewHorizons.External.Modules.SerializableEnums; +using NewHorizons.External.SerializableEnums; using Newtonsoft.Json; using System.ComponentModel; diff --git a/NewHorizons/External/Modules/Volumes/VolumeInfos/FluidVolumeInfo.cs b/NewHorizons/External/Modules/Volumes/VolumeInfos/FluidVolumeInfo.cs index e0632738..a1177973 100644 --- a/NewHorizons/External/Modules/Volumes/VolumeInfos/FluidVolumeInfo.cs +++ b/NewHorizons/External/Modules/Volumes/VolumeInfos/FluidVolumeInfo.cs @@ -1,4 +1,4 @@ -using NewHorizons.External.Modules.SerializableEnums; +using NewHorizons.External.SerializableEnums; using Newtonsoft.Json; using System.ComponentModel; diff --git a/NewHorizons/External/Modules/Volumes/VolumeInfos/LoadCreditsVolumeInfo.cs b/NewHorizons/External/Modules/Volumes/VolumeInfos/LoadCreditsVolumeInfo.cs index f804507c..60be21d5 100644 --- a/NewHorizons/External/Modules/Volumes/VolumeInfos/LoadCreditsVolumeInfo.cs +++ b/NewHorizons/External/Modules/Volumes/VolumeInfos/LoadCreditsVolumeInfo.cs @@ -1,4 +1,4 @@ -using NewHorizons.External.Modules.SerializableEnums; +using NewHorizons.External.SerializableEnums; using Newtonsoft.Json; using System.ComponentModel; diff --git a/NewHorizons/External/SerializableData/MColor.cs b/NewHorizons/External/SerializableData/MColor.cs index b1d07e98..0f08bd69 100644 --- a/NewHorizons/External/SerializableData/MColor.cs +++ b/NewHorizons/External/SerializableData/MColor.cs @@ -1,7 +1,7 @@ using System.ComponentModel; using Newtonsoft.Json; using UnityEngine; -namespace NewHorizons.External.Modules.SerializableData +namespace NewHorizons.External.SerializableData { [JsonObject] public class MColor diff --git a/NewHorizons/External/SerializableData/MGradient.cs b/NewHorizons/External/SerializableData/MGradient.cs index ac6825ce..09a6f751 100644 --- a/NewHorizons/External/SerializableData/MGradient.cs +++ b/NewHorizons/External/SerializableData/MGradient.cs @@ -1,6 +1,6 @@ -using Newtonsoft.Json; +using Newtonsoft.Json; -namespace NewHorizons.External.Modules.SerializableData +namespace NewHorizons.External.SerializableData { [JsonObject] public class MGradient diff --git a/NewHorizons/External/SerializableData/MMesh.cs b/NewHorizons/External/SerializableData/MMesh.cs index 95abd1bb..e3934365 100644 --- a/NewHorizons/External/SerializableData/MMesh.cs +++ b/NewHorizons/External/SerializableData/MMesh.cs @@ -1,7 +1,7 @@ using System.Linq; using Newtonsoft.Json; using UnityEngine; -namespace NewHorizons.External.Modules.SerializableData +namespace NewHorizons.External.SerializableData { [JsonObject] public class MMesh diff --git a/NewHorizons/External/SerializableData/MVector2.cs b/NewHorizons/External/SerializableData/MVector2.cs index abcceb29..77c3eccc 100644 --- a/NewHorizons/External/SerializableData/MVector2.cs +++ b/NewHorizons/External/SerializableData/MVector2.cs @@ -1,11 +1,11 @@ -#region +#region using Newtonsoft.Json; using UnityEngine; #endregion -namespace NewHorizons.External.Modules.SerializableData +namespace NewHorizons.External.SerializableData { [JsonObject] public class MVector2 diff --git a/NewHorizons/External/SerializableData/MVector3.cs b/NewHorizons/External/SerializableData/MVector3.cs index 62c81d9e..91319224 100644 --- a/NewHorizons/External/SerializableData/MVector3.cs +++ b/NewHorizons/External/SerializableData/MVector3.cs @@ -1,6 +1,7 @@ using Newtonsoft.Json; using UnityEngine; -namespace NewHorizons.External.Modules.SerializableData + +namespace NewHorizons.External.SerializableData { [JsonObject] public class MVector3 diff --git a/NewHorizons/External/SerializableEnums/NHAudioMixerTrackName.cs b/NewHorizons/External/SerializableEnums/NHAudioMixerTrackName.cs index 3765c636..393dd2e0 100644 --- a/NewHorizons/External/SerializableEnums/NHAudioMixerTrackName.cs +++ b/NewHorizons/External/SerializableEnums/NHAudioMixerTrackName.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; using System.Runtime.Serialization; -namespace NewHorizons.External.Modules.SerializableEnums +namespace NewHorizons.External.SerializableEnums { [JsonConverter(typeof(StringEnumConverter))] public enum NHAudioMixerTrackName diff --git a/NewHorizons/External/SerializableEnums/NHClipSelectionType.cs b/NewHorizons/External/SerializableEnums/NHClipSelectionType.cs index 8273d4e4..2a7c17d1 100644 --- a/NewHorizons/External/SerializableEnums/NHClipSelectionType.cs +++ b/NewHorizons/External/SerializableEnums/NHClipSelectionType.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; using System.Runtime.Serialization; -namespace NewHorizons.External.Modules.SerializableEnums +namespace NewHorizons.External.SerializableEnums { [JsonConverter(typeof(StringEnumConverter))] public enum NHClipSelectionType diff --git a/NewHorizons/External/SerializableEnums/NHCreditsType.cs b/NewHorizons/External/SerializableEnums/NHCreditsType.cs index c61fd19e..fe4d08be 100644 --- a/NewHorizons/External/SerializableEnums/NHCreditsType.cs +++ b/NewHorizons/External/SerializableEnums/NHCreditsType.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; using System.Runtime.Serialization; -namespace NewHorizons.External.Modules.SerializableEnums +namespace NewHorizons.External.SerializableEnums { [JsonConverter(typeof(StringEnumConverter))] public enum NHCreditsType diff --git a/NewHorizons/External/SerializableEnums/NHDeathType.cs b/NewHorizons/External/SerializableEnums/NHDeathType.cs index 1428664b..d01b9beb 100644 --- a/NewHorizons/External/SerializableEnums/NHDeathType.cs +++ b/NewHorizons/External/SerializableEnums/NHDeathType.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; using System.Runtime.Serialization; -namespace NewHorizons.External.Modules.SerializableEnums +namespace NewHorizons.External.SerializableEnums { [JsonConverter(typeof(StringEnumConverter))] public enum NHDeathType diff --git a/NewHorizons/External/SerializableEnums/NHFluidType.cs b/NewHorizons/External/SerializableEnums/NHFluidType.cs index 70f89dd5..f9eb0c83 100644 --- a/NewHorizons/External/SerializableEnums/NHFluidType.cs +++ b/NewHorizons/External/SerializableEnums/NHFluidType.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; using System.Runtime.Serialization; -namespace NewHorizons.External.Modules.SerializableEnums +namespace NewHorizons.External.SerializableEnums { [JsonConverter(typeof(StringEnumConverter))] public enum NHFluidType diff --git a/NewHorizons/Handlers/EyeSceneHandler.cs b/NewHorizons/Handlers/EyeSceneHandler.cs index b19cae29..15ee0e76 100644 --- a/NewHorizons/Handlers/EyeSceneHandler.cs +++ b/NewHorizons/Handlers/EyeSceneHandler.cs @@ -1,7 +1,7 @@ using NewHorizons.Builder.General; using NewHorizons.Components; using NewHorizons.Components.Stars; -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using NewHorizons.Utility; using UnityEngine; diff --git a/NewHorizons/Utility/DebugTools/Menu/DebugMenuShipLogs.cs b/NewHorizons/Utility/DebugTools/Menu/DebugMenuShipLogs.cs index 081fa5ab..77053a88 100644 --- a/NewHorizons/Utility/DebugTools/Menu/DebugMenuShipLogs.cs +++ b/NewHorizons/Utility/DebugTools/Menu/DebugMenuShipLogs.cs @@ -1,7 +1,7 @@ using HarmonyLib; using NewHorizons.External.Configs; using NewHorizons.External.Modules; -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using NewHorizons.Utility.OWML; using Newtonsoft.Json; using System.Linq; diff --git a/NewHorizons/Utility/Geometry/MeshUtilities.cs b/NewHorizons/Utility/Geometry/MeshUtilities.cs index d4f10583..7bbc2f48 100644 --- a/NewHorizons/Utility/Geometry/MeshUtilities.cs +++ b/NewHorizons/Utility/Geometry/MeshUtilities.cs @@ -1,5 +1,5 @@ using System.Linq; -using NewHorizons.External.Modules.SerializableData; +using NewHorizons.External.SerializableData; using UnityEngine; namespace NewHorizons.Utility.Geometry diff --git a/NewHorizons/Utility/NewHorizonExtensions.cs b/NewHorizons/Utility/NewHorizonExtensions.cs index b235f779..9321e804 100644 --- a/NewHorizons/Utility/NewHorizonExtensions.cs +++ b/NewHorizons/Utility/NewHorizonExtensions.cs @@ -1,6 +1,6 @@ using NewHorizons.External.Configs; -using NewHorizons.External.Modules.SerializableData; -using NewHorizons.External.Modules.SerializableEnums; +using NewHorizons.External.SerializableData; +using NewHorizons.External.SerializableEnums; using NewHorizons.Utility.OWML; using Newtonsoft.Json; using OWML.Utils;