From bdac8c8924dea6f44ac5b1daa53915c0d9f06970 Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Mon, 5 Jun 2023 18:11:54 -0700 Subject: [PATCH] fix ConvertToOW for enums --- NewHorizons/External/SerializableEnums/NHFluidType.cs | 10 +++++----- NewHorizons/Utility/NewHorizonExtensions.cs | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/NewHorizons/External/SerializableEnums/NHFluidType.cs b/NewHorizons/External/SerializableEnums/NHFluidType.cs index f9eb0c83..f7b406f9 100644 --- a/NewHorizons/External/SerializableEnums/NHFluidType.cs +++ b/NewHorizons/External/SerializableEnums/NHFluidType.cs @@ -7,14 +7,14 @@ namespace NewHorizons.External.SerializableEnums [JsonConverter(typeof(StringEnumConverter))] public enum NHFluidType { - [EnumMember(Value = @"none")] None = 0, + [EnumMember(Value = @"none")] NONE = 0, - [EnumMember(Value = @"water")] Water = 1, + [EnumMember(Value = @"water")] WATER = 1, - [EnumMember(Value = @"cloud")] Cloud = 2, + [EnumMember(Value = @"cloud")] CLOUD = 2, - [EnumMember(Value = @"sand")] Sand = 3, + [EnumMember(Value = @"sand")] SAND = 3, - [EnumMember(Value = @"plasma")] Plasma = 4 + [EnumMember(Value = @"plasma")] PLASMA = 4 } } diff --git a/NewHorizons/Utility/NewHorizonExtensions.cs b/NewHorizons/Utility/NewHorizonExtensions.cs index a0a5303b..e8e2222c 100644 --- a/NewHorizons/Utility/NewHorizonExtensions.cs +++ b/NewHorizons/Utility/NewHorizonExtensions.cs @@ -255,13 +255,13 @@ namespace NewHorizons.Utility } public static FluidVolume.Type ConvertToOW(this NHFluidType fluidType, FluidVolume.Type @default = FluidVolume.Type.NONE) - => EnumUtils.Parse(fluidType.ToString().ToUpper(), @default); + => EnumUtils.Parse(fluidType.ToString(), @default); public static OWAudioMixer.TrackName ConvertToOW(this NHAudioMixerTrackName trackName, OWAudioMixer.TrackName @default = OWAudioMixer.TrackName.Environment) - => EnumUtils.Parse(trackName.ToString().ToUpper(), @default); + => EnumUtils.Parse(trackName.ToString(), @default); public static OWAudioSource.ClipSelectionOnPlay ConvertToOW(this NHClipSelectionType clipSelection, OWAudioSource.ClipSelectionOnPlay @default = OWAudioSource.ClipSelectionOnPlay.RANDOM) - => EnumUtils.Parse(clipSelection.ToString().ToUpper(), @default); + => EnumUtils.Parse(clipSelection.ToString(), @default); public static void SmoothLookDir(this GameObject go, Vector3 direction, float dt, float angularVelocity) {