added sliders to initializer

Aeroluna · Apr 3, 2022 · 813628f · 813628f
1 parent 7da1373
commit 813628f
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 3 deletions.
diff --git a/Chroma/Colorizer/NoteColorizer.cs b/Chroma/Colorizer/NoteColorizer.cs
@@ -104,12 +104,12 @@ public ColorType ColorType
         {
             get
             {
-                if (_noteController is not GameNoteController gameNoteController)
+                if (_noteController is not NoteController noteController)
                 {
                     return ColorType.ColorA;
                 }
 
-                NoteData noteData = gameNoteController.noteData;
+                NoteData noteData = noteController.noteData;
                 return noteData?.colorType ?? ColorType.ColorA;
             }
         }

diff --git a/Chroma/HeckImplementation/ObjectInitializer.cs b/Chroma/HeckImplementation/ObjectInitializer.cs
@@ -4,6 +4,7 @@
 
 namespace Chroma
 {
+    // TODO: implement slider colorizers
     [UsedImplicitly]
     internal class ObjectInitializer : IGameNoteInitializer, IBombNoteInitializer, IObstacleInitializer
     {

diff --git a/Heck/HarmonyPatches/ObjectInitializer.cs b/Heck/HarmonyPatches/ObjectInitializer.cs
@@ -76,6 +76,12 @@ private static void FromInitializer(FactoryFromBinderBase binderBase, Object pre
                 case FactoryFromBinder<MultiplayerConnectedPlayerObstacleController> binder:
                     binder.FromResolveGetter<ObjectInitializerManager>(n => n.CreateObstacleController<MultiplayerConnectedPlayerObstacleController>(prefab));
                     break;
+                case FactoryFromBinder<BurstSliderGameNoteController> binder:
+                    binder.FromResolveGetter<ObjectInitializerManager>(n => n.CreateGameNoteController<BurstSliderGameNoteController>(prefab));
+                    break;
+                case FactoryFromBinder<SliderController> binder:
+                    binder.FromResolveGetter<ObjectInitializerManager>(n => n.CreateSliderController<SliderController>(prefab));
+                    break;
                 default:
                     // fallback
                     binderBase.FromComponentInNewPrefab(prefab);

diff --git a/Heck/Services/ObjectInitialize/InitializerManagers.cs b/Heck/Services/ObjectInitialize/InitializerManagers.cs
@@ -14,4 +14,9 @@ public interface IObstacleInitializer
     {
         public void InitializeObstacle(ObstacleControllerBase obstacleController);
     }
+
+    public interface ISliderInitializer
+    {
+        public void InitializeSlider(SliderControllerBase sliderController);
+    }
 }
diff --git a/Heck/Services/ObjectInitialize/ObjectInitializerManager.cs b/Heck/Services/ObjectInitialize/ObjectInitializerManager.cs
@@ -11,17 +11,20 @@ internal class ObjectInitializerManager
         private readonly List<IGameNoteInitializer> _gameNoteInitializers;
         private readonly List<IBombNoteInitializer> _bombNoteInitializers;
         private readonly List<IObstacleInitializer> _obstacleInitializers;
+        private readonly List<ISliderInitializer> _sliderInitializers;
         private readonly IInstantiator _instantiator;
 
         private ObjectInitializerManager(
             [InjectOptional] List<IGameNoteInitializer> gameNoteInitializers,
             [InjectOptional] List<IBombNoteInitializer> bombNoteInitializers,
             [InjectOptional] List<IObstacleInitializer> obstacleInitializers,
+            [InjectOptional] List<ISliderInitializer> sliderInitializers,
             IInstantiator instantiator)
         {
             _gameNoteInitializers = gameNoteInitializers;
             _bombNoteInitializers = bombNoteInitializers;
             _obstacleInitializers = obstacleInitializers;
+            _sliderInitializers = sliderInitializers;
             _instantiator = instantiator;
         }
 
@@ -48,5 +51,13 @@ internal T CreateObstacleController<T>(Object prefab)
             _obstacleInitializers.ForEach(n => n.InitializeObstacle(controller));
             return (T)controller;
         }
+
+        internal T CreateSliderController<T>(Object prefab)
+            where T : SliderControllerBase
+        {
+            SliderControllerBase controller = _instantiator.InstantiatePrefabForComponent<SliderControllerBase>(prefab);
+            _sliderInitializers.ForEach(n => n.InitializeSlider(controller));
+            return (T)controller;
+        }
     }
 }
diff --git a/Heck/manifest.json b/Heck/manifest.json
@@ -3,7 +3,7 @@
   "id": "_Heck",
   "name": "Heck",
   "author": "Aeroluna",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "description": "Library for Aeroluna's mods.",
   "gameVersion": "1.21.0",
   "dependsOn": {