Fixed config switching being broken

Regression caused by the fix for the tutorial scene crash
ErisApps · Dec 23, 2021 · af70425 · af70425
1 parent b918d50
commit af70425
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/HitScoreVisualizer/Installers/HsvAppInstaller.cs b/HitScoreVisualizer/Installers/HsvAppInstaller.cs
@@ -5,7 +5,7 @@
 
 namespace HitScoreVisualizer.Installers
 {
-	internal class HsvAppInstaller : Installer<HSVConfig, HsvAppInstaller>
+	internal sealed class HsvAppInstaller : Installer
 	{
 		private readonly HSVConfig _hsvConfig;
 
@@ -19,7 +19,6 @@ public override void InstallBindings()
 			Container.BindInstance(_hsvConfig);
 			Container.BindInterfacesAndSelfTo<ConfigProvider>().AsSingle();
 			Container.BindInterfacesAndSelfTo<BloomFontProvider>().AsSingle();
-			Container.Bind<JudgmentService>().AsSingle();
 
 			Container.BindInterfacesTo<FlyingScoreEffectPatch>().AsSingle();
 		}

diff --git a/HitScoreVisualizer/Installers/HsvGameInstaller.cs b/HitScoreVisualizer/Installers/HsvGameInstaller.cs
@@ -0,0 +1,13 @@
+using HitScoreVisualizer.Services;
+using Zenject;
+
+namespace HitScoreVisualizer.Installers
+{
+	internal sealed class HsvGameInstaller : Installer
+	{
+		public override void InstallBindings()
+		{
+			Container.Bind<JudgmentService>().AsSingle();
+		}
+	}
+}
diff --git a/HitScoreVisualizer/Installers/HsvMenuInstaller.cs b/HitScoreVisualizer/Installers/HsvMenuInstaller.cs
@@ -3,7 +3,7 @@
 
 namespace HitScoreVisualizer.Installers
 {
-	internal class HsvMenuInstaller : Installer<HsvMenuInstaller>
+	internal sealed class HsvMenuInstaller : Installer
 	{
 		public override void InstallBindings()
 		{

diff --git a/HitScoreVisualizer/Plugin.cs b/HitScoreVisualizer/Plugin.cs
@@ -25,6 +25,7 @@ public void Init(Logger logger, Config config, PluginMetadata pluginMetadata, Ze
 
 			zenject.Install<HsvAppInstaller>(Location.App, config.Generated<HSVConfig>());
 			zenject.Install<HsvMenuInstaller>(Location.Menu);
+			zenject.Install<HsvGameInstaller>(Location.Tutorial | Location.Player);
 		}
 	}
 }