Namespace issues

This commit is contained in:
Nick 2023-03-25 15:21:07 -04:00
parent 3f2b34ac08
commit 219002bad8
53 changed files with 60 additions and 59 deletions

View File

@ -1,7 +1,7 @@
using NewHorizons.External; using NewHorizons.External;
using NewHorizons.External.Configs; using NewHorizons.External.Configs;
using NewHorizons.External.Modules; using NewHorizons.External.Modules;
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using NewHorizons.Handlers; using NewHorizons.Handlers;
using NewHorizons.Utility.OWML; using NewHorizons.Utility.OWML;
using OWML.Common; using OWML.Common;

View File

@ -10,7 +10,7 @@ using NewHorizons.Components.Volumes;
using NewHorizons.Builder.Props; using NewHorizons.Builder.Props;
using NewHorizons.Utility.OWML; using NewHorizons.Utility.OWML;
using NewHorizons.Utility.OuterWilds; using NewHorizons.Utility.OuterWilds;
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
namespace NewHorizons.Builder.Body namespace NewHorizons.Builder.Body
{ {

View File

@ -1,6 +1,6 @@
using NewHorizons.Builder.General; using NewHorizons.Builder.General;
using NewHorizons.External; using NewHorizons.External;
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using NewHorizons.External.Modules.VariableSize; using NewHorizons.External.Modules.VariableSize;
using NewHorizons.Utility; using NewHorizons.Utility;
using NewHorizons.Utility.OWML; using NewHorizons.Utility.OWML;

View File

@ -1,5 +1,5 @@
using NewHorizons.External.Modules; using NewHorizons.External.Modules;
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using NewHorizons.Utility; using NewHorizons.Utility;
using NewHorizons.Utility.OuterWilds; using NewHorizons.Utility.OuterWilds;
using NewHorizons.Utility.OWML; using NewHorizons.Utility.OWML;

View File

@ -2,7 +2,7 @@ using NewHorizons.Builder.Props.TranslatorText;
using NewHorizons.External; using NewHorizons.External;
using NewHorizons.External.Modules.Props; using NewHorizons.External.Modules.Props;
using NewHorizons.External.Modules.Props.Remote; using NewHorizons.External.Modules.Props.Remote;
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using NewHorizons.External.Modules.TranslatorText; using NewHorizons.External.Modules.TranslatorText;
using NewHorizons.Handlers; using NewHorizons.Handlers;
using NewHorizons.Utility; using NewHorizons.Utility;

View File

@ -1,6 +1,6 @@
using NewHorizons.External; using NewHorizons.External;
using NewHorizons.External.Modules.Props; using NewHorizons.External.Modules.Props;
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using NewHorizons.External.Modules.TranslatorText; using NewHorizons.External.Modules.TranslatorText;
using NewHorizons.Handlers; using NewHorizons.Handlers;
using NewHorizons.Utility; using NewHorizons.Utility;

View File

@ -1,7 +1,7 @@
using NewHorizons.Builder.Body; using NewHorizons.Builder.Body;
using NewHorizons.Components.Orbital; using NewHorizons.Components.Orbital;
using NewHorizons.Components.Stars; using NewHorizons.Components.Stars;
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using NewHorizons.External.Modules.VariableSize; using NewHorizons.External.Modules.VariableSize;
using NewHorizons.Handlers; using NewHorizons.Handlers;
using NewHorizons.Utility; using NewHorizons.Utility;

View File

@ -1,4 +1,4 @@
using NewHorizons.External.Modules.SerializableEnums; using NewHorizons.External.SerializableEnums;
using NewHorizons.Handlers; using NewHorizons.Handlers;
using NewHorizons.Utility.OWML; using NewHorizons.Utility.OWML;
using System.Collections; using System.Collections;

View File

@ -3,7 +3,7 @@ using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.Linq; using System.Linq;
using NewHorizons.External.Modules; using NewHorizons.External.Modules;
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using Newtonsoft.Json; using Newtonsoft.Json;
using static NewHorizons.External.Modules.ShipLogModule; using static NewHorizons.External.Modules.ShipLogModule;

View File

@ -1,6 +1,6 @@
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using Newtonsoft.Json; using Newtonsoft.Json;
namespace NewHorizons.External.Modules namespace NewHorizons.External.Modules

View File

@ -2,8 +2,8 @@ using System;
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.Runtime.Serialization; using System.Runtime.Serialization;
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using NewHorizons.External.Modules.SerializableEnums; using NewHorizons.External.SerializableEnums;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;

View File

@ -1,7 +1,7 @@
using System; using System;
using System.ComponentModel; using System.ComponentModel;
using System.Runtime.Serialization; using System.Runtime.Serialization;
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;

View File

@ -1,4 +1,4 @@
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;
using System; using System;

View File

@ -1,5 +1,5 @@
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using Newtonsoft.Json; using Newtonsoft.Json;
namespace NewHorizons.External.Modules namespace NewHorizons.External.Modules

View File

@ -1,4 +1,4 @@
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using Newtonsoft.Json; using Newtonsoft.Json;
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;

View File

@ -1,8 +1,8 @@
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using NewHorizons.Components.Orbital; using NewHorizons.Components.Orbital;
using NewHorizons.External.SerializableData; using NewHorizons.External.SerializableData;
using Newtonsoft.Json; using Newtonsoft.Json;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
namespace NewHorizons.External.Modules namespace NewHorizons.External.Modules
{ {

View File

@ -1,5 +1,5 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using Newtonsoft.Json; using Newtonsoft.Json;
namespace NewHorizons.External.Modules namespace NewHorizons.External.Modules

View File

@ -1,4 +1,4 @@
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using Newtonsoft.Json; using Newtonsoft.Json;
using System; using System;
using System.ComponentModel; using System.ComponentModel;

View File

@ -1,4 +1,4 @@
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using Newtonsoft.Json; using Newtonsoft.Json;
using System; using System;
using System.ComponentModel; using System.ComponentModel;

View File

@ -1,4 +1,4 @@
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using Newtonsoft.Json; using Newtonsoft.Json;
namespace NewHorizons.External.Modules.Props.EchoesOfTheEye namespace NewHorizons.External.Modules.Props.EchoesOfTheEye

View File

@ -1,4 +1,4 @@
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using Newtonsoft.Json; using Newtonsoft.Json;
using System.ComponentModel; using System.ComponentModel;

View File

@ -1,4 +1,4 @@
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using Newtonsoft.Json; using Newtonsoft.Json;
using System.ComponentModel; using System.ComponentModel;

View File

@ -1,5 +1,5 @@
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using NewHorizons.External.Modules.SerializableEnums; using NewHorizons.External.SerializableEnums;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;
using System; using System;

View File

@ -1,4 +1,4 @@
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;
using System; using System;

View File

@ -1,4 +1,4 @@
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using Newtonsoft.Json; using Newtonsoft.Json;
using System.ComponentModel; using System.ComponentModel;

View File

@ -1,4 +1,4 @@
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using Newtonsoft.Json; using Newtonsoft.Json;
using System.ComponentModel; using System.ComponentModel;

View File

@ -1,4 +1,4 @@
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using Newtonsoft.Json; using Newtonsoft.Json;
using System.ComponentModel; using System.ComponentModel;

View File

@ -1,5 +1,5 @@
using System.ComponentModel; using System.ComponentModel;
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using Newtonsoft.Json; using Newtonsoft.Json;
namespace NewHorizons.External.Modules namespace NewHorizons.External.Modules

View File

@ -1,6 +1,6 @@
using System; using System;
using System.ComponentModel; using System.ComponentModel;
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using Newtonsoft.Json; using Newtonsoft.Json;
namespace NewHorizons.External.Modules namespace NewHorizons.External.Modules

View File

@ -1,4 +1,4 @@
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using Newtonsoft.Json; using Newtonsoft.Json;
using System; using System;

View File

@ -1,6 +1,6 @@
using System.ComponentModel; using System.ComponentModel;
using System.Runtime.Serialization; using System.Runtime.Serialization;
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;

View File

@ -1,4 +1,4 @@
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using Newtonsoft.Json; using Newtonsoft.Json;
namespace NewHorizons.External.Modules.VariableSize namespace NewHorizons.External.Modules.VariableSize

View File

@ -1,4 +1,4 @@
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
namespace NewHorizons.External.Modules.VariableSize namespace NewHorizons.External.Modules.VariableSize
{ {

View File

@ -2,7 +2,7 @@ using System;
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.Runtime.Serialization; using System.Runtime.Serialization;
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;

View File

@ -1,4 +1,4 @@
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using Newtonsoft.Json; using Newtonsoft.Json;
using System.ComponentModel; using System.ComponentModel;

View File

@ -1,4 +1,4 @@
using NewHorizons.External.Modules.SerializableEnums; using NewHorizons.External.SerializableEnums;
using Newtonsoft.Json; using Newtonsoft.Json;
using System.ComponentModel; using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;

View File

@ -1,4 +1,4 @@
using NewHorizons.External.Modules.SerializableEnums; using NewHorizons.External.SerializableEnums;
using Newtonsoft.Json; using Newtonsoft.Json;
using System.ComponentModel; using System.ComponentModel;

View File

@ -1,4 +1,4 @@
using NewHorizons.External.Modules.SerializableEnums; using NewHorizons.External.SerializableEnums;
using Newtonsoft.Json; using Newtonsoft.Json;
using System.ComponentModel; using System.ComponentModel;

View File

@ -1,4 +1,4 @@
using NewHorizons.External.Modules.SerializableEnums; using NewHorizons.External.SerializableEnums;
using Newtonsoft.Json; using Newtonsoft.Json;
using System.ComponentModel; using System.ComponentModel;

View File

@ -1,7 +1,7 @@
using System.ComponentModel; using System.ComponentModel;
using Newtonsoft.Json; using Newtonsoft.Json;
using UnityEngine; using UnityEngine;
namespace NewHorizons.External.Modules.SerializableData namespace NewHorizons.External.SerializableData
{ {
[JsonObject] [JsonObject]
public class MColor public class MColor

View File

@ -1,6 +1,6 @@
using Newtonsoft.Json; using Newtonsoft.Json;
namespace NewHorizons.External.Modules.SerializableData namespace NewHorizons.External.SerializableData
{ {
[JsonObject] [JsonObject]
public class MGradient public class MGradient

View File

@ -1,7 +1,7 @@
using System.Linq; using System.Linq;
using Newtonsoft.Json; using Newtonsoft.Json;
using UnityEngine; using UnityEngine;
namespace NewHorizons.External.Modules.SerializableData namespace NewHorizons.External.SerializableData
{ {
[JsonObject] [JsonObject]
public class MMesh public class MMesh

View File

@ -1,11 +1,11 @@
#region #region
using Newtonsoft.Json; using Newtonsoft.Json;
using UnityEngine; using UnityEngine;
#endregion #endregion
namespace NewHorizons.External.Modules.SerializableData namespace NewHorizons.External.SerializableData
{ {
[JsonObject] [JsonObject]
public class MVector2 public class MVector2

View File

@ -1,6 +1,7 @@
using Newtonsoft.Json; using Newtonsoft.Json;
using UnityEngine; using UnityEngine;
namespace NewHorizons.External.Modules.SerializableData
namespace NewHorizons.External.SerializableData
{ {
[JsonObject] [JsonObject]
public class MVector3 public class MVector3

View File

@ -2,7 +2,7 @@ using Newtonsoft.Json;
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;
using System.Runtime.Serialization; using System.Runtime.Serialization;
namespace NewHorizons.External.Modules.SerializableEnums namespace NewHorizons.External.SerializableEnums
{ {
[JsonConverter(typeof(StringEnumConverter))] [JsonConverter(typeof(StringEnumConverter))]
public enum NHAudioMixerTrackName public enum NHAudioMixerTrackName

View File

@ -2,7 +2,7 @@ using Newtonsoft.Json;
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;
using System.Runtime.Serialization; using System.Runtime.Serialization;
namespace NewHorizons.External.Modules.SerializableEnums namespace NewHorizons.External.SerializableEnums
{ {
[JsonConverter(typeof(StringEnumConverter))] [JsonConverter(typeof(StringEnumConverter))]
public enum NHClipSelectionType public enum NHClipSelectionType

View File

@ -2,7 +2,7 @@ using Newtonsoft.Json;
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;
using System.Runtime.Serialization; using System.Runtime.Serialization;
namespace NewHorizons.External.Modules.SerializableEnums namespace NewHorizons.External.SerializableEnums
{ {
[JsonConverter(typeof(StringEnumConverter))] [JsonConverter(typeof(StringEnumConverter))]
public enum NHCreditsType public enum NHCreditsType

View File

@ -2,7 +2,7 @@ using Newtonsoft.Json;
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;
using System.Runtime.Serialization; using System.Runtime.Serialization;
namespace NewHorizons.External.Modules.SerializableEnums namespace NewHorizons.External.SerializableEnums
{ {
[JsonConverter(typeof(StringEnumConverter))] [JsonConverter(typeof(StringEnumConverter))]
public enum NHDeathType public enum NHDeathType

View File

@ -2,7 +2,7 @@ using Newtonsoft.Json;
using Newtonsoft.Json.Converters; using Newtonsoft.Json.Converters;
using System.Runtime.Serialization; using System.Runtime.Serialization;
namespace NewHorizons.External.Modules.SerializableEnums namespace NewHorizons.External.SerializableEnums
{ {
[JsonConverter(typeof(StringEnumConverter))] [JsonConverter(typeof(StringEnumConverter))]
public enum NHFluidType public enum NHFluidType

View File

@ -1,7 +1,7 @@
using NewHorizons.Builder.General; using NewHorizons.Builder.General;
using NewHorizons.Components; using NewHorizons.Components;
using NewHorizons.Components.Stars; using NewHorizons.Components.Stars;
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using NewHorizons.Utility; using NewHorizons.Utility;
using UnityEngine; using UnityEngine;

View File

@ -1,7 +1,7 @@
using HarmonyLib; using HarmonyLib;
using NewHorizons.External.Configs; using NewHorizons.External.Configs;
using NewHorizons.External.Modules; using NewHorizons.External.Modules;
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using NewHorizons.Utility.OWML; using NewHorizons.Utility.OWML;
using Newtonsoft.Json; using Newtonsoft.Json;
using System.Linq; using System.Linq;

View File

@ -1,5 +1,5 @@
using System.Linq; using System.Linq;
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using UnityEngine; using UnityEngine;
namespace NewHorizons.Utility.Geometry namespace NewHorizons.Utility.Geometry

View File

@ -1,6 +1,6 @@
using NewHorizons.External.Configs; using NewHorizons.External.Configs;
using NewHorizons.External.Modules.SerializableData; using NewHorizons.External.SerializableData;
using NewHorizons.External.Modules.SerializableEnums; using NewHorizons.External.SerializableEnums;
using NewHorizons.Utility.OWML; using NewHorizons.Utility.OWML;
using Newtonsoft.Json; using Newtonsoft.Json;
using OWML.Utils; using OWML.Utils;