diff --git a/NewHorizons/Builder/StarSystem/SkyboxBuilder.cs b/NewHorizons/Builder/StarSystem/SkyboxBuilder.cs index 368ec65d4..5d4b85489 100644 --- a/NewHorizons/Builder/StarSystem/SkyboxBuilder.cs +++ b/NewHorizons/Builder/StarSystem/SkyboxBuilder.cs @@ -51,7 +51,7 @@ public static GameObject BuildSkySphereFace(GameObject skySphere, string name, Q { if (!tex) { - NHLogger.LogError($"Failed to load texture for skybox {name.ToLower()} face"); + NHLogger.LogError($"Failed to load texture for skybox {name.ToLowerInvariant()} face"); return null; } diff --git a/NewHorizons/Handlers/PlanetGraphHandler.cs b/NewHorizons/Handlers/PlanetGraphHandler.cs index e58688a25..49d85c6d2 100644 --- a/NewHorizons/Handlers/PlanetGraphHandler.cs +++ b/NewHorizons/Handlers/PlanetGraphHandler.cs @@ -126,11 +126,11 @@ public static List ConstructStockGraph(NewHorizonsBody[] bod private static bool DetermineIfChildOfFocal(NewHorizonsBody body, FocalPointNode node) { - var name = body.Config.name.ToLower(); - var primary = (body.Config.Orbit?.primaryBody ?? "").ToLower(); - var primaryName = node.primary.body.Config.name.ToLower(); - var secondaryName = node.secondary.body.Config.name.ToLower(); - return name != primaryName && name != secondaryName && (primary == node.body.Config.name.ToLower() || primary == primaryName || primary == secondaryName); + var name = body.Config.name.ToLowerInvariant(); + var primary = (body.Config.Orbit?.primaryBody ?? "").ToLowerInvariant(); + var primaryName = node.primary.body.Config.name.ToLowerInvariant(); + var secondaryName = node.secondary.body.Config.name.ToLowerInvariant(); + return name != primaryName && name != secondaryName && (primary == node.body.Config.name.ToLowerInvariant() || primary == primaryName || primary == secondaryName); } diff --git a/NewHorizons/Main.cs b/NewHorizons/Main.cs index 1415a54c1..df767fe70 100644 --- a/NewHorizons/Main.cs +++ b/NewHorizons/Main.cs @@ -787,7 +787,7 @@ private void LoadTranslations(string folder, IModBehaviour mod) { if (language is TextTranslation.Language.UNKNOWN or TextTranslation.Language.TOTAL) continue; - var relativeFile = Path.Combine("translations", language.ToString().ToLower() + ".json"); + var relativeFile = Path.Combine("translations", language.ToString().ToLowerInvariant() + ".json"); if (File.Exists(Path.Combine(folder, relativeFile))) { diff --git a/NewHorizons/Utility/NewHorizonExtensions.cs b/NewHorizons/Utility/NewHorizonExtensions.cs index 9ded956b9..c34182e18 100644 --- a/NewHorizons/Utility/NewHorizonExtensions.cs +++ b/NewHorizons/Utility/NewHorizonExtensions.cs @@ -72,14 +72,14 @@ public static float GetFalloffExponent(this GravityVolume gv) public static string ToCamelCase(this string str) { StringBuilder strBuilder = new StringBuilder(str); - strBuilder[0] = strBuilder[0].ToString().ToLower().ToCharArray()[0]; + strBuilder[0] = strBuilder[0].ToString().ToLowerInvariant().ToCharArray()[0]; return strBuilder.ToString(); } public static string ToTitleCase(this string str) { StringBuilder strBuilder = new StringBuilder(str); - strBuilder[0] = strBuilder[0].ToString().ToUpper().ToCharArray()[0]; + strBuilder[0] = strBuilder[0].ToString().ToUpperInvariant().ToCharArray()[0]; return strBuilder.ToString(); } diff --git a/NewHorizons/Utility/OuterWilds/AstroObjectLocator.cs b/NewHorizons/Utility/OuterWilds/AstroObjectLocator.cs index b1aba93ec..c20aa7b6f 100644 --- a/NewHorizons/Utility/OuterWilds/AstroObjectLocator.cs +++ b/NewHorizons/Utility/OuterWilds/AstroObjectLocator.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Globalization; using System.Linq; using NewHorizons.Components.Orbital; using NewHorizons.Handlers; @@ -33,7 +34,7 @@ public static AstroObject GetAstroObject(string name, bool flag = false) } // Else check stock names - var stringID = name.ToUpper().Replace(" ", "_").Replace("'", ""); + var stringID = name.ToUpperInvariant().Replace(" ", "_").Replace("'", ""); if (stringID.Equals("ATTLEROCK")) stringID = "TIMBER_MOON"; if (stringID.Equals("HOLLOWS_LANTERN")) stringID = "VOLCANIC_MOON"; if (stringID.Equals("ASH_TWIN")) stringID = "TOWER_TWIN"; @@ -42,7 +43,7 @@ public static AstroObject GetAstroObject(string name, bool flag = false) if (stringID.Equals("EYE") || stringID.Equals("EYEOFTHEUNIVERSE")) stringID = "EYE_OF_THE_UNIVERSE"; string key; - if (stringID.ToUpper().Replace("_", "").Equals("MAPSATELLITE")) + if (stringID.ToUpperInvariant().Replace("_", "").Equals("MAPSATELLITE")) { key = AstroObject.Name.MapSatellite.ToString(); } diff --git a/NewHorizons/manifest.json b/NewHorizons/manifest.json index dc1e4dfe2..74ce1e6ee 100644 --- a/NewHorizons/manifest.json +++ b/NewHorizons/manifest.json @@ -4,7 +4,7 @@ "author": "xen, Bwc9876, JohnCorby, MegaPiggy, Clay, Trifid, and friends", "name": "New Horizons", "uniqueName": "xen.NewHorizons", - "version": "1.20.0", + "version": "1.20.1", "owmlVersion": "2.10.3", "dependencies": [ "JohnCorby.VanillaFix", "xen.CommonCameraUtility", "dgarro.CustomShipLogModes" ], "conflicts": [ "PacificEngine.OW_CommonResources" ],