From 373f965dec46059853f002369cab7e6bf913d2d7 Mon Sep 17 00:00:00 2001 From: Arne Kiesewetter Date: Wed, 10 Jul 2024 15:48:27 +0200 Subject: [PATCH 1/3] Update dependencies --- .../MonkeyLoader.GamePacks.ResoniteModLoader.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MonkeyLoader.GamePacks.ResoniteModLoader/MonkeyLoader.GamePacks.ResoniteModLoader.csproj b/MonkeyLoader.GamePacks.ResoniteModLoader/MonkeyLoader.GamePacks.ResoniteModLoader.csproj index ba876b7..1c44006 100644 --- a/MonkeyLoader.GamePacks.ResoniteModLoader/MonkeyLoader.GamePacks.ResoniteModLoader.csproj +++ b/MonkeyLoader.GamePacks.ResoniteModLoader/MonkeyLoader.GamePacks.ResoniteModLoader.csproj @@ -12,7 +12,7 @@ MonkeyLoader.GamePacks.ResoniteModLoader ResoniteModLoader Banane9, Nytra - 2.6.8 + 2.7.0 This MonkeyLoader Game Pack for Resonite enables loading ResoniteModLoader mods as MonkeyLoader mods. README.md LGPL-3.0-or-later @@ -34,8 +34,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive From 23a58621d0432c24b78c4ed48dc3ca38dc17b27d Mon Sep 17 00:00:00 2001 From: Arne Kiesewetter Date: Wed, 10 Jul 2024 15:48:47 +0200 Subject: [PATCH 2/3] Adapts initial changes, ignores removed enum member --- .../ModConfigurationKey.cs | 4 ++++ MonkeyLoader.GamePacks.ResoniteModLoader/ModLoader.cs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/MonkeyLoader.GamePacks.ResoniteModLoader/ModConfigurationKey.cs b/MonkeyLoader.GamePacks.ResoniteModLoader/ModConfigurationKey.cs index 6cf453b..04e592b 100644 --- a/MonkeyLoader.GamePacks.ResoniteModLoader/ModConfigurationKey.cs +++ b/MonkeyLoader.GamePacks.ResoniteModLoader/ModConfigurationKey.cs @@ -56,6 +56,10 @@ internal ModConfigurationKey() /// public abstract override int GetHashCode(); + /// + public override string ToString() + => $"ConfigKey Name: {Name}, Description: {Description}, InternalAccessOnly: {InternalAccessOnly}, Type: {ValueType()}, Value: {UntypedKey.GetValue()}"; + /// /// Tries to compute the default value for this key, if a default provider was set. /// diff --git a/MonkeyLoader.GamePacks.ResoniteModLoader/ModLoader.cs b/MonkeyLoader.GamePacks.ResoniteModLoader/ModLoader.cs index 6bbf894..848f33c 100644 --- a/MonkeyLoader.GamePacks.ResoniteModLoader/ModLoader.cs +++ b/MonkeyLoader.GamePacks.ResoniteModLoader/ModLoader.cs @@ -27,7 +27,7 @@ public sealed class ModLoader : ResoniteMonkey /// public static readonly string VERSION = VERSION_CONSTANT; - internal const string VERSION_CONSTANT = "2.6.0"; + internal const string VERSION_CONSTANT = "2.7.0"; private static readonly Lazy _isHeadless = new(() => AccessTools.AllTypes().Any(type => type.Namespace == "FrooxEngine.Headless")); From 3c704fcf4b12aaf29720cc3417ad1bbae47f5d7f Mon Sep 17 00:00:00 2001 From: Nytra <14206961+Nytra@users.noreply.github.com> Date: Wed, 10 Jul 2024 18:35:31 +0100 Subject: [PATCH 3/3] Remove obsolete FORCE_LOAD IncompatibleConfigurationHandlingOption --- .../ModConfiguration.cs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/MonkeyLoader.GamePacks.ResoniteModLoader/ModConfiguration.cs b/MonkeyLoader.GamePacks.ResoniteModLoader/ModConfiguration.cs index 1e82bc5..bbb02fa 100644 --- a/MonkeyLoader.GamePacks.ResoniteModLoader/ModConfiguration.cs +++ b/MonkeyLoader.GamePacks.ResoniteModLoader/ModConfiguration.cs @@ -48,12 +48,6 @@ public enum IncompatibleConfigurationHandlingOption /// CLOBBER, - /// - /// Ignore the version number and attempt to load the config from disk. - /// - [Obsolete("Use IncompatibleConfigurationHandlingOption.FORCELOAD Instead")] - FORCE_LOAD, - /// /// Ignore the version number and attempt to load the config from disk. ///