Clean up and organization

ckosmic · Sep 6, 2021 · 120ed43 · 120ed43
1 parent 05ffcaa
commit 120ed43
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 14 deletions.
diff --git a/IForgor/IForgor.csproj b/IForgor/IForgor.csproj
@@ -104,12 +104,12 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="NoteRecorder.cs" />
-    <Compile Include="PauseUIManager.cs" />
+    <Compile Include="Recorders\NoteRecorder.cs" />
+    <Compile Include="UI\PauseUIManager.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SaberRecorder.cs" />
-    <Compile Include="UIGroup.cs" />
+    <Compile Include="Recorders\SaberRecorder.cs" />
+    <Compile Include="UI\UIGroup.cs" />
     <Compile Include="Utils\ResourceUtilities.cs" />
   </ItemGroup>
   <ItemGroup>

diff --git a/IForgor/NoteRecorder.cs → IForgor/Recorders/NoteRecorder.cs b/IForgor/NoteRecorder.cs → IForgor/Recorders/NoteRecorder.cs
diff --git a/IForgor/SaberRecorder.cs → IForgor/Recorders/SaberRecorder.cs b/IForgor/SaberRecorder.cs → IForgor/Recorders/SaberRecorder.cs
@@ -26,14 +26,9 @@ private void Awake() {
 		}
 
 		private void OnEnable() {
-			Saber[] sabers = Resources.FindObjectsOfTypeAll<Saber>();
-			if (sabers[0].saberType == SaberType.SaberA) {
-				_saberA = sabers[0];
-				_saberB = sabers[1];
-			} else {
-				_saberA = sabers[1];
-				_saberB = sabers[0];
-			}
+			SaberManager saberManager = Resources.FindObjectsOfTypeAll<SaberManager>().First();
+			_saberA = saberManager.leftSaber;
+			_saberB = saberManager.rightSaber;
 		}
 
 		public void RecordSaberAngles() {

diff --git a/IForgor/PauseUIManager.cs → IForgor/UI/PauseUIManager.cs b/IForgor/PauseUIManager.cs → IForgor/UI/PauseUIManager.cs
diff --git a/IForgor/UIGroup.cs → IForgor/UI/UIGroup.cs b/IForgor/UIGroup.cs → IForgor/UI/UIGroup.cs
diff --git a/IForgor/manifest.json b/IForgor/manifest.json
@@ -3,11 +3,11 @@
   "id": "I Forgor",
   "name": "IForgor",
   "author": "ckosmic",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "A mod that displays the last notes and saber angles before you paused in the pause menu.",
   "gameVersion": "1.16.3",
   "dependsOn": {
-    "BSIPA": "^4.1.6",
+    "BSIPA": "^4.2.0",
     "BeatSaberMarkupLanguage": "^1.5.3",
     "BS Utils": "^1.10.0"
   },