From 114b33eb5562d63deab0642306afd88d47b1c3cf Mon Sep 17 00:00:00 2001 From: Jonathon Fitch Date: Sat, 5 Nov 2022 19:57:29 +0000 Subject: [PATCH] Fix for game version 1.25.x --- .../ColorSchemeWithEditableName.cs | 27 ++++++++----------- .../ColorSchemeWithEditableNameConverter.cs | 5 ++-- .../HarmonyPatches/ColorSchemesSettings.cs | 4 +-- .../HarmonyPatches/PlayerDataFileManagerSO.cs | 2 +- ExtendedColorSchemes/manifest.json | 4 +-- 5 files changed, 18 insertions(+), 24 deletions(-) diff --git a/ExtendedColorSchemes/ColorSchemeWithEditableName.cs b/ExtendedColorSchemes/ColorSchemeWithEditableName.cs index 71b1d7c..a5d33b5 100644 --- a/ExtendedColorSchemes/ColorSchemeWithEditableName.cs +++ b/ExtendedColorSchemes/ColorSchemeWithEditableName.cs @@ -1,21 +1,16 @@ using UnityEngine; -namespace ExtendedColorSchemes +namespace ExtendedColorSchemes; + +public class ColorSchemeWithEditableName : PlayerSaveData.ColorScheme { - public class ColorSchemeWithEditableName : PlayerSaveData.ColorScheme - { - public string colorSchemeName; - public bool supportsEnvironmentColorBoost; - public Color environmentColor0Boost; - public Color environmentColor1Boost; + public readonly string ColorSchemeName; + public readonly bool SupportsEnvironmentColorBoost; - public ColorSchemeWithEditableName(string colorSchemeName, string colorSchemeId, Color saberAColor, Color saberBColor, Color environmentColor0, Color environmentColor1, Color obstaclesColor, bool supportsEnvironmentColorBoost, Color environmentColor0Boost, Color environmentColor1Boost) - : base(colorSchemeId, saberAColor, saberBColor, environmentColor0, environmentColor1, obstaclesColor) - { - this.colorSchemeName = colorSchemeName; - this.supportsEnvironmentColorBoost = supportsEnvironmentColorBoost; - this.environmentColor0Boost = environmentColor0Boost; - this.environmentColor1Boost = environmentColor1Boost; - } + public ColorSchemeWithEditableName(string colorSchemeName, string colorSchemeId, Color saberAColor, Color saberBColor, Color environmentColor0, Color environmentColor1, Color obstaclesColor, bool supportsEnvironmentColorBoost, Color environmentColor0Boost, Color environmentColor1Boost) + : base(colorSchemeId, saberAColor, saberBColor, environmentColor0, environmentColor1, obstaclesColor, environmentColor0Boost, environmentColor1Boost) + { + ColorSchemeName = colorSchemeName; + SupportsEnvironmentColorBoost = supportsEnvironmentColorBoost; } -} +} \ No newline at end of file diff --git a/ExtendedColorSchemes/Converters/ColorSchemeWithEditableNameConverter.cs b/ExtendedColorSchemes/Converters/ColorSchemeWithEditableNameConverter.cs index 8053f40..774bd12 100644 --- a/ExtendedColorSchemes/Converters/ColorSchemeWithEditableNameConverter.cs +++ b/ExtendedColorSchemes/Converters/ColorSchemeWithEditableNameConverter.cs @@ -55,18 +55,17 @@ internal class ColorSchemeWithEditableNameConverter : ValueConverter { - {"colorSchemeName", Value.From(obj.colorSchemeName)}, + {"colorSchemeName", Value.From(obj.ColorSchemeName)}, {"colorSchemeId", Value.From(obj.colorSchemeId)}, {"saberAColor", CustomValueTypeConverter.Serialize(obj.saberAColor)}, {"saberBColor", CustomValueTypeConverter.Serialize(obj.saberBColor)}, {"environmentColor0", CustomValueTypeConverter.Serialize(obj.environmentColor0)}, {"environmentColor1", CustomValueTypeConverter.Serialize(obj.environmentColor1)}, {"obstaclesColor", CustomValueTypeConverter.Serialize(obj.obstaclesColor)}, - {"supportsEnvironmentColorBoost", Value.From(obj.supportsEnvironmentColorBoost)}, + {"supportsEnvironmentColorBoost", Value.From(obj.SupportsEnvironmentColorBoost)}, {"environmentColor0Boost", CustomValueTypeConverter.Serialize(obj.environmentColor0Boost)}, {"environmentColor1Boost", CustomValueTypeConverter.Serialize(obj.environmentColor1Boost)} }); } } - } diff --git a/ExtendedColorSchemes/HarmonyPatches/ColorSchemesSettings.cs b/ExtendedColorSchemes/HarmonyPatches/ColorSchemesSettings.cs index 5c17c7f..876b94b 100644 --- a/ExtendedColorSchemes/HarmonyPatches/ColorSchemesSettings.cs +++ b/ExtendedColorSchemes/HarmonyPatches/ColorSchemesSettings.cs @@ -35,13 +35,13 @@ internal static void Prefix(ref ColorScheme[] colorSchemes) $"User{i + NumberOfDefaultUserColorSchemes}", $"_UNLOCALIZED_", true, - !string.IsNullOrWhiteSpace(savedColorScheme?.colorSchemeName) ? savedColorScheme?.colorSchemeName : regex.Replace(translation, (i + NumberOfDefaultUserColorSchemes).ToString()), + !string.IsNullOrWhiteSpace(savedColorScheme?.ColorSchemeName) ? savedColorScheme?.ColorSchemeName : regex.Replace(translation, (i + NumberOfDefaultUserColorSchemes).ToString()), first.isEditable, savedColorScheme?.saberAColor ?? first.saberAColor, savedColorScheme?.saberBColor ?? first.saberBColor, savedColorScheme?.environmentColor0 ?? first.environmentColor0, savedColorScheme?.environmentColor1 ?? first.environmentColor1, - savedColorScheme?.supportsEnvironmentColorBoost ?? firstWithBoostColors?.supportsEnvironmentColorBoost ?? first.supportsEnvironmentColorBoost, + savedColorScheme?.SupportsEnvironmentColorBoost ?? firstWithBoostColors?.supportsEnvironmentColorBoost ?? first.supportsEnvironmentColorBoost, savedColorScheme?.environmentColor0Boost ?? firstWithBoostColors?.environmentColor0Boost ?? first.environmentColor0Boost, savedColorScheme?.environmentColor1Boost ?? firstWithBoostColors?.environmentColor1Boost ?? first.environmentColor1Boost, savedColorScheme?.obstaclesColor ?? first.obstaclesColor)); diff --git a/ExtendedColorSchemes/HarmonyPatches/PlayerDataFileManagerSO.cs b/ExtendedColorSchemes/HarmonyPatches/PlayerDataFileManagerSO.cs index 734a920..bc91793 100644 --- a/ExtendedColorSchemes/HarmonyPatches/PlayerDataFileManagerSO.cs +++ b/ExtendedColorSchemes/HarmonyPatches/PlayerDataFileManagerSO.cs @@ -63,7 +63,7 @@ private static void GetColorSchemes(ColorSchemesSettings colorSchemesSettings, r { ColorSchemeWithEditableName? savedColorScheme = Plugin.Config.colorSchemes.FirstOrDefault(x => x.colorSchemeId == colorScheme.colorSchemeId); ColorSchemeWithEditableName colorSchemeWithEditableName = new( - savedColorScheme?.colorSchemeName ?? string.Empty, + savedColorScheme?.ColorSchemeName ?? string.Empty, colorScheme.colorSchemeId, colorScheme.saberAColor, colorScheme.saberBColor, diff --git a/ExtendedColorSchemes/manifest.json b/ExtendedColorSchemes/manifest.json index a4fe3f7..8e6f089 100644 --- a/ExtendedColorSchemes/manifest.json +++ b/ExtendedColorSchemes/manifest.json @@ -3,9 +3,9 @@ "id": "ExtendedColorSchemes", "name": "ExtendedColorSchemes", "author": "Meivyn", - "version": "1.1.0", + "version": "1.1.1", "description": "Adds additional custom slots to color schemes.", - "gameVersion": "1.24.0", + "gameVersion": "1.25.0", "dependsOn": { "BSIPA": "^4.2.1" }