feat: use osmi

GodSeekerPlus/GodSeekerPlus.cs

@@ -4,7 +4,14 @@ public sealed partial class GodSeekerPlus : Mod, ITogglableMod {
 	public static GodSeekerPlus? Instance { get; private set; }
 	public static GodSeekerPlus UnsafeInstance => Instance!;
 
-	public override string GetVersion() => VersionUtil.Version.Value;
+	private static readonly Lazy<string> version = AssemblyUtil
+#if DEBUG
+		.GetMyDefaultVersionWithHash();
+#else
+		.GetMyDefaultVersion();
+#endif
+
+	public override string GetVersion() => version.Value;
 
 	internal static bool satchelPresent = false;
 

GodSeekerPlus/GodSeekerPlus.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<AssemblyTitle>GodSeekerPlus</AssemblyTitle>
-		<Version>0.19.5</Version>
+		<Version>0.19.6</Version>
 		<Description>A Hollow Knight mod to enhance your Godhome experience</Description>
 		<Authors>Clazex</Authors>
 

GodSeekerPlus/Imports.cs

@@ -9,7 +9,7 @@
 
 global using GodSeekerPlus.Modules;
 global using GodSeekerPlus.Settings;
-global using GodSeekerPlus.Util;
+global using GodSeekerPlus.Utils;
 
 global using HutongGames.PlayMaker;
 global using HutongGames.PlayMaker.Actions;
@@ -18,6 +18,9 @@
 
 global using Newtonsoft.Json;
 
+global using Osmi.FsmActions;
+global using Osmi.Utils;
+
 global using Satchel;
 global using Satchel.Futils;
 
@@ -27,7 +30,7 @@
 global using UnityEngine.UI;
 
 global using Module = GodSeekerPlus.Modules.Module;
-global using Logger = GodSeekerPlus.Util.Logger;
+global using Logger = GodSeekerPlus.Utils.Logger;
 global using Lang = Language.Language;
 global using ReflectionHelper = Modding.ReflectionHelper;
 global using UObject = UnityEngine.Object;

GodSeekerPlus/Modules/BossChallenge/ForceGreyPrinceEnterType.cs

@@ -25,6 +25,6 @@ private void ModifyGPFSM(On.PlayMakerFSM.orig_Start orig, PlayMakerFSM self) {
 	private static void ModifyGPFSM(PlayMakerFSM fsm) =>
 		fsm.AddCustomAction(
 			"Enter 1",
-			() => fsm.FsmVariables.FindFsmBool("Faced Zote").Value = Ref.GS.gpzEnterType
+			() => fsm.GetVariable<FsmBool>("Faced Zote").Value = Ref.GS.gpzEnterType
 		);
 }

GodSeekerPlus/Modules/BossChallenge/InfiniteRadianceClimbing.cs

@@ -1,3 +1,5 @@
+using InvokeMethod = Osmi.FsmActions.InvokeMethod;
+
 namespace GodSeekerPlus.Modules.BossChallenge;
 
 [ToggleableLevel(ToggleableLevel.ChangeScene)]
@@ -63,25 +65,19 @@ private void ModifyAbsRadFSM(PlayMakerFSM fsm) {
 		// Spawn P2 plats before appearance
 		fsm.ChangeTransition("Set Arena 1", "FINISHED", "Climb Plats1");
 
-		fsm.InsertAction("Set Arena 1", new CustomFsmAction() {
-			method = () => fsm.StartCoroutine(TeleportSetup())
-		}, 0);
+		fsm.InsertAction("Set Arena 1", new InvokeCoroutine(TeleportSetup), 0);
 
 		FsmState spawnPlatsState = fsm.GetState("Climb Plats1");
 		spawnPlatsState.Actions = new[] {
 			spawnPlatsState.Actions[2], // Spawn plats
-			new CustomFsmAction() {
-				method = () => fsm.gameObject.manageHealth(1100)
-			}
+			new InvokeMethod(() => fsm.gameObject.manageHealth(int.MaxValue))
 		};
 		(spawnPlatsState.Actions[0] as SendEventByName)!.delay = 0;
 
 		FsmState screamState = fsm.GetState("Scream");
 		screamState.Actions = new[] {
 			screamState.Actions[0], // Play audio clip
-			new CustomFsmAction() {
-				method = () => rewindCoro ??= radCtrl!.StartCoroutine(Rewind())
-			},
+			new InvokeMethod(() => rewindCoro ??= radCtrl!.StartCoroutine(Rewind())),
 			new Wait() { time = 60f } // Wait for Rewind coroutine
 		};
 	}
@@ -118,8 +114,8 @@ private IEnumerator Rewind() {
 		beam.SetActive(false); // Remove last beam
 
 		// Reset abyss pit
-		pitCtrl!.FsmVariables.FindFsmFloat("Hero Y").Value = 33f;
-		pitCtrl.SendEvent("ASCEND");
+		pitCtrl!.GetVariable<FsmFloat>("Hero Y").Value = 33f;
+		pitCtrl!.SendEvent("ASCEND");
 
 		// Teleport hero back
 		Ref.PD.isInvincible = true;

GodSeekerPlus/Modules/BossChallenge/SegmentedP5.cs

@@ -261,8 +261,7 @@ string playerData
 
 		int firstSceneIndex = BossSequenceController.BossIndex;
 		segP5!.GetComponent<BossSequenceDoor>()
-			.challengeFSM.FsmVariables
-			.FindFsmString("To Scene")
+			.challengeFSM.GetVariable<FsmString>("To Scene")
 			.Value = sequence.GetSceneAt(firstSceneIndex);
 
 		if (firstSceneIndex != 0) {

GodSeekerPlus/Modules/Misc/LocalizeMenu.cs

@@ -2,6 +2,9 @@ namespace GodSeekerPlus.Modules.Misc;
 
 [Hidden]
 internal sealed class LocalizeMenu : Module {
+	private static readonly Lazy<string> versionWithHash = AssemblyUtil
+		.GetMyDefaultVersionWithHash();
+
 	private protected override void Load() =>
 		Ref.GM.StartCoroutine(WaitForTitle());
 
@@ -28,7 +31,7 @@ private static void EditText() {
 			"ModName".Localize() + ' ' + "Settings".Localize();
 
 		btn.Child("Description")!.GetComponent<Text>().text =
-			'v' + VersionUtil.VersionWithHash.Value;
+			'v' + versionWithHash.Value;
 
 		Logger.LogDebug("Menu localized");
 	}

GodSeekerPlus/Modules/QoL/EternalOrdealPlatform.cs

@@ -17,7 +17,7 @@ private void AddPlatform(Scene _, Scene next) {
 		GameObject origPlat = next.GetRootGameObjects()
 			.First(go => go.name == "gg_plat_float_wide");
 
-		var plat = GameObject.Instantiate(origPlat);
+		GameObject plat = UObject.Instantiate(origPlat);
 		plat.transform.SetPosition2D(204.15f, 42.3f);
 	}
 }

GodSeekerPlus/Modules/QoL/FastDash.cs

@@ -9,7 +9,7 @@ private protected override void Unload() =>
 		USceneManager.activeSceneChanged -= HookDash;
 
 	// Hook only when needed for zero performance impact
-	private void HookDash(Scene prev, Scene next) {
+	private void HookDash(Scene _, Scene next) {
 		On.HeroController.HeroDash -= CancelCooldown;
 
 		if (next.name == "GG_Workshop") {

GodSeekerPlus/Modules/QoL/P5Teleport.cs

@@ -28,7 +28,7 @@ private static IEnumerator Teleport() {
 			.ForEach(state => ReflectionHelper.CallMethod(state, "ActivateActions", 0));
 
 		Ref.HC.gameObject.LocateMyFSM("Roar Lock")
-			.FsmVariables.FindFsmBool("No Roar")
+			.GetVariable<FsmBool>("No Roar")
 			.Value = false;
 		StaticVariableList.SetValue("skipRemoveDreamOrbs", true);
 

GodSeekerPlus/Settings/LocalSettings.cs

@@ -21,7 +21,7 @@ public int RABCompletion {
 	[JsonProperty(PropertyName = "selectedP5Segment")]
 	public int SelectedP5Segment {
 		get => selectedP5Segment;
-		set => selectedP5Segment = MiscUtil.Clamp(value, 0, Modules.BossChallenge.SegmentedP5.segments.Length - 1);
+		set => selectedP5Segment = value.Clamp(0, Modules.BossChallenge.SegmentedP5.segments.Length - 1);
 	}
 
 	#region RAB Completions Getter/Setter

GodSeekerPlus/Utils/L11nUtil.cs

@@ -0,0 +1,25 @@
+using Language;
+
+namespace GodSeekerPlus.Utils;
+
+internal static class L11nUtil {
+	private const string langPrefix = "GodSeekerPlus.Resources.Lang.";
+	private const string langSuffix = ".json";
+
+	internal static Lazy<Dictionary<string, Lazy<Dictionary<string, string>>>> Dict = new(() => {
+		Assembly asm = typeof(GodSeekerPlus).Assembly;
+		return LangUtil.LoadLangs(asm, asm
+			.GetManifestResourceNames()
+			.Filter(name => name.EnclosedWith(langPrefix, langSuffix))
+			.Map(name => (
+				name.StripStart(langPrefix).StripEnd(langSuffix),
+				name
+			)));
+	});
+
+	internal static string Localize(this string key) {
+		Dict.Value.TryGetValue(LangUtil.CurrentLang, out Lazy<Dictionary<string, string>>? table);
+		table ??= Dict.Value[LanguageCode.EN.ToIdentifier()];
+		return table.Value.TryGetValue(key, out string value) ? value : key;
+	}
+}

GodSeekerPlus/Util/Logger.cs → GodSeekerPlus/Utils/Logger.cs

@@ -1,6 +1,6 @@
 using L = Modding.Logger;
 
-namespace GodSeekerPlus.Util;
+namespace GodSeekerPlus.Utils;
 
 internal static class Logger {
 	private static readonly string prefix = $"[{nameof(GodSeekerPlus)}] - ";