Done rearranging volumes

NewHorizons/Builder/ShipLog/RevealBuilder.cs

@@ -1,6 +1,6 @@
 using NewHorizons.Builder.Props;
 using NewHorizons.Components.Achievement;
-using NewHorizons.External.Modules.Volumes;
+using NewHorizons.External.Modules.Volumes.VolumeInfos;
 using NewHorizons.Utility.OWUtilities;
 using OWML.Common;
 using UnityEngine;

NewHorizons/Builder/Volumes/AudioVolumeBuilder.cs

@@ -1,5 +1,5 @@
 using NewHorizons.Builder.Props;
-using NewHorizons.External.Modules.Volumes;
+using NewHorizons.External.Modules.Volumes.VolumeInfos;
 using NewHorizons.Utility;
 using NewHorizons.Utility.OWUtilities;
 using OWML.Common;

NewHorizons/Builder/Volumes/ChangeStarSystemVolumeBuilder.cs

@@ -1,5 +1,5 @@
 using NewHorizons.Components.Volumes;
-using NewHorizons.External.Modules.Volumes;
+using NewHorizons.External.Modules.Volumes.VolumeInfos;
 using UnityEngine;
 
 namespace NewHorizons.Builder.Volumes

NewHorizons/Builder/Volumes/CreditsVolumeBuilder.cs

@@ -1,5 +1,5 @@
 using NewHorizons.Components.Volumes;
-using NewHorizons.External.Modules.Volumes;
+using NewHorizons.External.Modules.Volumes.VolumeInfos;
 using OWML.Utils;
 using UnityEngine;
 

NewHorizons/Builder/Volumes/DestructionVolumeBuilder.cs

@@ -1,4 +1,4 @@
-using NewHorizons.External.Modules.Volumes;
+using NewHorizons.External.Modules.Volumes.VolumeInfos;
 using OWML.Utils;
 using UnityEngine;
 

NewHorizons/Builder/Volumes/FluidVolumeBuilder.cs

@@ -1,5 +1,5 @@
 using NewHorizons.Components.Volumes;
-using NewHorizons.External.Modules.Volumes;
+using NewHorizons.External.Modules.Volumes.VolumeInfos;
 using OWML.Utils;
 using UnityEngine;
 

NewHorizons/Builder/Volumes/HazardVolumeBuilder.cs

@@ -1,5 +1,5 @@
 using NewHorizons.Builder.Props;
-using NewHorizons.External.Modules.Volumes;
+using NewHorizons.External.Modules.Volumes.VolumeInfos;
 using NewHorizons.Utility.OWUtilities;
 using OWML.Common;
 using OWML.Utils;

NewHorizons/Builder/Volumes/NotificationVolumeBuilder.cs

@@ -1,5 +1,5 @@
 using NewHorizons.Builder.Props;
-using NewHorizons.External.Modules.Volumes;
+using NewHorizons.External.Modules.Volumes.VolumeInfos;
 using NewHorizons.Utility.OWUtilities;
 using OWML.Common;
 using UnityEngine;

NewHorizons/Builder/Volumes/OxygenVolumeBuilder.cs

@@ -1,4 +1,4 @@
-using NewHorizons.External.Modules.Volumes;
+using NewHorizons.External.Modules.Volumes.VolumeInfos;
 using UnityEngine;
 
 namespace NewHorizons.Builder.Volumes

NewHorizons/Builder/Volumes/PriorityVolumeBuilder.cs

@@ -1,4 +1,4 @@
-using NewHorizons.External.Modules.Volumes;
+using NewHorizons.External.Modules.Volumes.VolumeInfos;
 using UnityEngine;
 
 namespace NewHorizons.Builder.Volumes

NewHorizons/Builder/Volumes/Rulesets/PlayerImpactRulesetBuilder.cs

@@ -1,4 +1,5 @@
 using NewHorizons.External.Modules.Volumes;
+using NewHorizons.External.Modules.Volumes.VolumeInfos;
 using UnityEngine;
 
 namespace NewHorizons.Builder.Volumes.Rulesets

NewHorizons/Builder/Volumes/Rulesets/ProbeRulesetBuilder.cs

@@ -1,4 +1,5 @@
 using NewHorizons.External.Modules.Volumes;
+using NewHorizons.External.Modules.Volumes.VolumeInfos;
 using UnityEngine;
 
 namespace NewHorizons.Builder.Volumes.Rulesets

NewHorizons/Builder/Volumes/Rulesets/ThrustRulesetBuilder.cs

@@ -1,4 +1,5 @@
 using NewHorizons.External.Modules.Volumes;
+using NewHorizons.External.Modules.Volumes.VolumeInfos;
 using UnityEngine;
 
 namespace NewHorizons.Builder.Volumes.Rulesets

NewHorizons/Builder/Volumes/SpeedTrapVolumeBuilder.cs

@@ -1,4 +1,4 @@
-using NewHorizons.External.Modules.Volumes;
+using NewHorizons.External.Modules.Volumes.VolumeInfos;
 using UnityEngine;
 
 namespace NewHorizons.Builder.Volumes

NewHorizons/Builder/Volumes/VanishVolumeBuilder.cs

@@ -1,5 +1,5 @@
 using NewHorizons.Builder.Props;
-using NewHorizons.External.Modules.Volumes;
+using NewHorizons.External.Modules.Volumes.VolumeInfos;
 using NewHorizons.Utility.OWUtilities;
 using UnityEngine;
 

NewHorizons/Builder/Volumes/VisorEffects/VisorFrostEffectVolumeBuilder.cs

@@ -1,4 +1,5 @@
 using NewHorizons.External.Modules.Volumes;
+using NewHorizons.External.Modules.Volumes.VolumeInfos;
 using UnityEngine;
 
 namespace NewHorizons.Builder.Volumes.VisorEffects

NewHorizons/Builder/Volumes/VisorEffects/VisorRainEffectVolumeBuilder.cs

@@ -1,4 +1,5 @@
 using NewHorizons.External.Modules.Volumes;
+using NewHorizons.External.Modules.Volumes.VolumeInfos;
 using UnityEngine;
 
 namespace NewHorizons.Builder.Volumes.VisorEffects

NewHorizons/Builder/Volumes/VolumeBuilder.cs

@@ -1,5 +1,5 @@
 using NewHorizons.Builder.Props;
-using NewHorizons.External.Modules.Volumes;
+using NewHorizons.External.Modules.Volumes.VolumeInfos;
 using NewHorizons.Utility.OWUtilities;
 using UnityEngine;
 

NewHorizons/Builder/Volumes/ZeroGVolumeBuilder.cs

@@ -1,4 +1,4 @@
-using NewHorizons.External.Modules.Volumes;
+using NewHorizons.External.Modules.Volumes.VolumeInfos;
 using UnityEngine;
 
 namespace NewHorizons.Builder.Volumes

NewHorizons/Components/Volumes/LoadCreditsVolume.cs

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

NewHorizons/Components/Volumes/NotificationVolume.cs

@@ -1,4 +1,4 @@
-using NewHorizons.External.Modules.Volumes;
+using NewHorizons.External.Modules.Volumes.VolumeInfos;
 using NewHorizons.Handlers;
 using OWML.Utils;
 using UnityEngine;

NewHorizons/External/Configs/PlanetConfig.cs

@@ -4,6 +4,7 @@ using NewHorizons.External.Modules.Props.Dialogue;
 using NewHorizons.External.Modules.Props.Quantum;
 using NewHorizons.External.Modules.VariableSize;
 using NewHorizons.External.Modules.Volumes;
+using NewHorizons.External.Modules.Volumes.VolumeInfos;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;

NewHorizons/External/Modules/PropModule.cs

@@ -5,7 +5,7 @@ using NewHorizons.External.Modules.Props.Quantum;
 using NewHorizons.External.Modules.Props.Remote;
 using NewHorizons.External.Modules.TranslatorText;
 using NewHorizons.External.Modules.VariableSize;
-using NewHorizons.External.Modules.Volumes;
+using NewHorizons.External.Modules.Volumes.VolumeInfos;
 using NewHorizons.External.Modules.WarpPad;
 using Newtonsoft.Json;
 using System;

NewHorizons/External/Modules/SerializableEnums/CreditsType.cs

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

NewHorizons/External/Modules/SerializableEnums/DeathType.cs

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

NewHorizons/External/Modules/Volumes/ProbeModule.cs

@@ -0,0 +1,19 @@
+using NewHorizons.External.Modules.Volumes.VolumeInfos;
+using Newtonsoft.Json;
+
+namespace NewHorizons.External.Modules.Volumes
+{
+    [JsonObject]
+    public class ProbeModule
+    {
+        /// <summary>
+        /// Add probe destruction volumes to this planet. These will delete your probe.
+        /// </summary>
+        public VolumeInfo[] destructionVolumes;
+
+        /// <summary>
+        /// Add probe safety volumes to this planet. These will stop the probe destruction volumes from working.
+        /// </summary>
+        public VolumeInfo[] safetyVolumes;
+    }
+}

NewHorizons/External/Modules/Volumes/RulesetModule.cs

@@ -1,88 +1,9 @@
-using NewHorizons.External.Modules.Audio;
+using NewHorizons.External.Modules.Volumes.VolumeInfos;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
-using System.Runtime.Serialization;
 
 namespace NewHorizons.External.Modules.Volumes
 {
-    [JsonObject]
-    public class VolumeInfo : GeneralPointPropInfo
-    {
-        /// <summary>
-        /// The radius of this volume.
-        /// </summary>
-        [DefaultValue(1f)] public float radius = 1f;
-    }
-
-
-
-
-
-
-
-    [JsonObject]
-    public class ProbeModule
-    {
-        /// <summary>
-        /// Add probe destruction volumes to this planet. These will delete your probe.
-        /// </summary>
-        public VolumeInfo[] destructionVolumes;
-
-        /// <summary>
-        /// Add probe safety volumes to this planet. These will stop the probe destruction volumes from working.
-        /// </summary>
-        public VolumeInfo[] safetyVolumes;
-    }
-
-    [JsonObject]
-    public class VisorEffectModule
-    {
-        /// <summary>
-        /// Add visor frost effect volumes to this planet. This is the ghost matter effect.
-        /// </summary>
-        public FrostEffectVolumeInfo[] frostEffectVolumes;
-
-        /// <summary>
-        /// Add visor rain effect volumes to this planet. You can see this on Giant's Deep.
-        /// </summary>
-        public RainEffectVolumeInfo[] rainEffectVolumes;
-
-        [JsonObject]
-        public class FrostEffectVolumeInfo : PriorityVolumeInfo
-        {
-            /// <summary>
-            /// The rate at which the frost effect will get stronger
-            /// </summary>
-            [DefaultValue(0.5f)]
-            public float frostRate = 0.5f;
-
-            /// <summary>
-            /// The maximum strength of frost this volume can give
-            /// </summary>
-            [Range(0f, 1f)]
-            [DefaultValue(0.91f)]
-            public float maxFrost = 0.91f;
-        }
-
-        [JsonObject]
-        public class RainEffectVolumeInfo : PriorityVolumeInfo
-        {
-            /// <summary>
-            /// The rate at which the rain droplet effect will happen
-            /// </summary>
-            [DefaultValue(0.1f)]
-            public float dropletRate = 10f;
-
-            /// <summary>
-            /// The rate at which the rain streak effect will happen
-            /// </summary>
-            [DefaultValue(1f)]
-            public float streakRate = 1f;
-        }
-    }
-
     [JsonObject]
     public class RulesetModule
     {
@@ -166,19 +87,4 @@ namespace NewHorizons.External.Modules.Volumes
         }
     }
 
-    [JsonObject]
-    public class SpeedTrapVolumeInfo : VolumeInfo
-    {
-        /// <summary>
-        /// The speed the volume will slow you down to when you enter it.
-        /// </summary>
-        [DefaultValue(10f)]
-        public float speedLimit = 10f;
-
-        /// <summary>
-        /// How fast it will slow down the player to the speed limit.
-        /// </summary>
-        [DefaultValue(3f)]
-        public float acceleration = 3f;
-    }
 }

NewHorizons/External/Modules/Volumes/VisorEffectModule.cs

@@ -0,0 +1,55 @@
+using NewHorizons.External.Modules.Volumes.VolumeInfos;
+using Newtonsoft.Json;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+
+namespace NewHorizons.External.Modules.Volumes
+{
+    [JsonObject]
+    public class VisorEffectModule
+    {
+        /// <summary>
+        /// Add visor frost effect volumes to this planet. This is the ghost matter effect.
+        /// </summary>
+        public FrostEffectVolumeInfo[] frostEffectVolumes;
+
+        /// <summary>
+        /// Add visor rain effect volumes to this planet. You can see this on Giant's Deep.
+        /// </summary>
+        public RainEffectVolumeInfo[] rainEffectVolumes;
+
+        [JsonObject]
+        public class FrostEffectVolumeInfo : PriorityVolumeInfo
+        {
+            /// <summary>
+            /// The rate at which the frost effect will get stronger
+            /// </summary>
+            [DefaultValue(0.5f)]
+            public float frostRate = 0.5f;
+
+            /// <summary>
+            /// The maximum strength of frost this volume can give
+            /// </summary>
+            [Range(0f, 1f)]
+            [DefaultValue(0.91f)]
+            public float maxFrost = 0.91f;
+        }
+
+        [JsonObject]
+        public class RainEffectVolumeInfo : PriorityVolumeInfo
+        {
+            /// <summary>
+            /// The rate at which the rain droplet effect will happen
+            /// </summary>
+            [DefaultValue(0.1f)]
+            public float dropletRate = 10f;
+
+            /// <summary>
+            /// The rate at which the rain streak effect will happen
+            /// </summary>
+            [DefaultValue(1f)]
+            public float streakRate = 1f;
+        }
+    }
+
+}

NewHorizons/External/Modules/Volumes/VolumeInfos/AudioVolumeInfo.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace NewHorizons.External.Modules.Volumes
+namespace NewHorizons.External.Modules.Volumes.VolumeInfos
 {
     [JsonObject]
     public class AudioVolumeInfo : PriorityVolumeInfo

NewHorizons/External/Modules/Volumes/VolumeInfos/ChangeStarSystemVolumeInfo.cs

@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using System.ComponentModel;
 
-namespace NewHorizons.External.Modules.Volumes
+namespace NewHorizons.External.Modules.Volumes.VolumeInfos
 {
     [JsonObject]
     public class ChangeStarSystemVolumeInfo : VolumeInfo

NewHorizons/External/Modules/Volumes/VolumeInfos/DestructionVolumeInfo.cs

@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using System.ComponentModel;
 
-namespace NewHorizons.External.Modules.Volumes
+namespace NewHorizons.External.Modules.Volumes.VolumeInfos
 {
     [JsonObject]
     public class DestructionVolumeInfo : VanishVolumeInfo

NewHorizons/External/Modules/Volumes/VolumeInfos/FluidVolumeInfo.cs

@@ -2,7 +2,7 @@ using NewHorizons.External.Modules.SerializableEnums;
 using Newtonsoft.Json;
 using System.ComponentModel;
 
-namespace NewHorizons.External.Modules.Volumes
+namespace NewHorizons.External.Modules.Volumes.VolumeInfos
 {
     [JsonObject]
     public class FluidVolumeInfo : PriorityVolumeInfo

NewHorizons/External/Modules/Volumes/VolumeInfos/HazardVolumeInfo.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json.Converters;
 using System.ComponentModel;
 using System.Runtime.Serialization;
 
-namespace NewHorizons.External.Modules.Volumes
+namespace NewHorizons.External.Modules.Volumes.VolumeInfos
 {
 
     [JsonObject]

NewHorizons/External/Modules/Volumes/VolumeInfos/LoadCreditsVolumeInfo.cs

@@ -1,7 +1,8 @@
+using NewHorizons.External.Modules.SerializableEnums;
 using Newtonsoft.Json;
 using System.ComponentModel;
 
-namespace NewHorizons.External.Modules.Volumes
+namespace NewHorizons.External.Modules.Volumes.VolumeInfos
 {
     [JsonObject]
     public class LoadCreditsVolumeInfo : VolumeInfo

NewHorizons/External/Modules/Volumes/VolumeInfos/NotificationVolumeInfo.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json.Converters;
 using System.ComponentModel;
 using System.Runtime.Serialization;
 
-namespace NewHorizons.External.Modules.Volumes
+namespace NewHorizons.External.Modules.Volumes.VolumeInfos
 {
     [JsonObject]
     public class NotificationVolumeInfo : VolumeInfo

NewHorizons/External/Modules/Volumes/VolumeInfos/OxygenVolumeInfo.cs

@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using System.ComponentModel;
 
-namespace NewHorizons.External.Modules.Volumes
+namespace NewHorizons.External.Modules.Volumes.VolumeInfos
 {
     [JsonObject]
     public class OxygenVolumeInfo : VolumeInfo

NewHorizons/External/Modules/Volumes/VolumeInfos/PriorityVolumeInfo.cs

@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using System.ComponentModel;
 
-namespace NewHorizons.External.Modules.Volumes
+namespace NewHorizons.External.Modules.Volumes.VolumeInfos
 {
     [JsonObject]
     public class PriorityVolumeInfo : VolumeInfo

NewHorizons/External/Modules/Volumes/VolumeInfos/RevealVolumeInfo.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json.Converters;
 using System.ComponentModel;
 using System.Runtime.Serialization;
 
-namespace NewHorizons.External.Modules.Volumes
+namespace NewHorizons.External.Modules.Volumes.VolumeInfos
 {
     [JsonObject]
     public class RevealVolumeInfo : VolumeInfo

NewHorizons/External/Modules/Volumes/VolumeInfos/SpeedTrapVolumeInfo.cs

@@ -0,0 +1,21 @@
+using Newtonsoft.Json;
+using System.ComponentModel;
+
+namespace NewHorizons.External.Modules.Volumes.VolumeInfos
+{
+    [JsonObject]
+    public class SpeedTrapVolumeInfo : VolumeInfo
+    {
+        /// <summary>
+        /// The speed the volume will slow you down to when you enter it.
+        /// </summary>
+        [DefaultValue(10f)]
+        public float speedLimit = 10f;
+
+        /// <summary>
+        /// How fast it will slow down the player to the speed limit.
+        /// </summary>
+        [DefaultValue(3f)]
+        public float acceleration = 3f;
+    }
+}

NewHorizons/External/Modules/Volumes/VolumeInfos/VanishVolumeInfo.cs

@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using System.ComponentModel;
 
-namespace NewHorizons.External.Modules.Volumes
+namespace NewHorizons.External.Modules.Volumes.VolumeInfos
 {
     [JsonObject]
     public class VanishVolumeInfo : VolumeInfo

NewHorizons/External/Modules/Volumes/VolumeInfos/VolumeInfo.cs

@@ -0,0 +1,18 @@
+using NewHorizons.External.Modules.Audio;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.Runtime.Serialization;
+
+namespace NewHorizons.External.Modules.Volumes.VolumeInfos
+{
+    [JsonObject]
+    public class VolumeInfo : GeneralPointPropInfo
+    {
+        /// <summary>
+        /// The radius of this volume.
+        /// </summary>
+        [DefaultValue(1f)] public float radius = 1f;
+    }
+}

NewHorizons/External/Modules/Volumes/VolumesModule.cs

@@ -1,3 +1,4 @@
+using NewHorizons.External.Modules.Volumes.VolumeInfos;
 using Newtonsoft.Json;
 
 namespace NewHorizons.External.Modules.Volumes