From b294a1601fd2db7a59d3e9b4c2771b2edcfa9904 Mon Sep 17 00:00:00 2001
From: NotAKidoS <37721153+NotAKidOnSteam@users.noreply.github.com>
Date: Tue, 23 Apr 2024 18:47:11 -0500
Subject: [PATCH] [IKAdjustments] Fixed for 2024r175

---
 IKAdjustments/HarmonyPatches.cs          |  3 ++-
 IKAdjustments/IKAdjuster.cs              | 16 ++++++++--------
 IKAdjustments/Integrations/BTKUIAddon.cs | 14 +-------------
 3 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/IKAdjustments/HarmonyPatches.cs b/IKAdjustments/HarmonyPatches.cs
index 13f27bd..7357940 100644
--- a/IKAdjustments/HarmonyPatches.cs
+++ b/IKAdjustments/HarmonyPatches.cs
@@ -1,5 +1,6 @@
 using ABI_RC.Core.InteractionSystem;
 using ABI_RC.Systems.IK;
+using ABI_RC.Systems.IK.SubSystems;
 using HarmonyLib;
 using NAK.IKAdjustments.Systems;
 
@@ -15,7 +16,7 @@ internal static class IKSystemPatches
     }
 
     [HarmonyPostfix]
-    [HarmonyPatch(typeof(IKSystem), nameof(IKSystem.ResetIkSettings))]
+    [HarmonyPatch(typeof(BodySystem), nameof(BodySystem.ResetCalibration))]
     private static void Postfix_IKSystem_ResetIkSettings()
     {
         IKAdjuster.Instance.ResetAllOffsets();
diff --git a/IKAdjustments/IKAdjuster.cs b/IKAdjustments/IKAdjuster.cs
index a5ba4d0..0b7fb8d 100644
--- a/IKAdjustments/IKAdjuster.cs
+++ b/IKAdjustments/IKAdjuster.cs
@@ -71,9 +71,9 @@ public class IKAdjuster : MonoBehaviour
             return;
 
         isAdjustMode = true;
-        IKSystem.Instance.SetTrackingPointVisibility(true);
+        IKSystem.Instance.TrackingSystem.SetTrackingPointVisibility(true);
         CVR_MenuManager.Instance.ToggleQuickMenu(false);
-        foreach (TrackingPoint tracker in IKSystem.Instance.AllTrackingPoints) tracker.ClearLineTarget();
+        foreach (TrackingPoint tracker in IKSystem.Instance.TrackingSystem.AllTrackingPoints) tracker.ClearLineTarget();
     }
 
     public void ExitAdjustMode()
@@ -82,12 +82,12 @@ public class IKAdjuster : MonoBehaviour
             return;
 
         isAdjustMode = false;
-        IKSystem.Instance.SetTrackingPointVisibility(false);
+        IKSystem.Instance.TrackingSystem.SetTrackingPointVisibility(false);
     }
 
     public void ResetAllOffsets()
     {
-        foreach (TrackingPoint tracker in IKSystem.Instance.AllTrackingPoints)
+        foreach (TrackingPoint tracker in IKSystem.Instance.TrackingSystem.AllTrackingPoints)
         {
             tracker.offsetTransform.SetParent(tracker.displayObject.transform, true);
             tracker.displayObject.transform.localPosition = Vector3.zero;
@@ -117,8 +117,8 @@ public class IKAdjuster : MonoBehaviour
             ? CVRInputManager.Instance.interactLeftValue > 0.9f
             : CVRInputManager.Instance.interactRightValue > 0.9f;
         Transform handTracker = isLeft
-            ? IKSystem.Instance.leftHandTracker.transform
-            : IKSystem.Instance.rightHandTracker.transform;
+            ? IKSystem.Instance.leftController.transform
+            : IKSystem.Instance.rightController.transform;
 
         if (grabState.tracker == null && !grabState.handGrabbed && isGrabbing)
         {
@@ -145,7 +145,7 @@ public class IKAdjuster : MonoBehaviour
             Setting_MaxGrabDistance)
         {
             grabState.tracker =
-                IKSystem.Instance.AllTrackingPoints.Find(tp => tp.referenceTransform == nearestTransform);
+                IKSystem.Instance.TrackingSystem.AllTrackingPoints.Find(tp => tp.referenceTransform == nearestTransform);
             if (grabState.otherGrab.tracker == grabState.tracker) OnRelease(grabState.otherGrab);
             grabState.displayOffset = grabState.tracker.displayObject.transform.position - handTracker.position;
             grabState.displayOffsetRotation = Quaternion.Inverse(handTracker.rotation) *
@@ -194,7 +194,7 @@ public class IKAdjuster : MonoBehaviour
 
     private Transform FindNearestTransform(Transform handTransform)
     {
-        var validTrackingPointTransforms = IKSystem.ValidTrackingPointTransforms;
+        var validTrackingPointTransforms = TrackingSystem.ValidTrackingPointTransforms;
         if (validTrackingPointTransforms == null || validTrackingPointTransforms.Count == 0) return null;
         return validTrackingPointTransforms
             .OrderBy(t => Vector3.Distance(handTransform.position, t.GetChild(0).position)).FirstOrDefault();
diff --git a/IKAdjustments/Integrations/BTKUIAddon.cs b/IKAdjustments/Integrations/BTKUIAddon.cs
index f3cafb5..be549fd 100644
--- a/IKAdjustments/Integrations/BTKUIAddon.cs
+++ b/IKAdjustments/Integrations/BTKUIAddon.cs
@@ -24,20 +24,8 @@ public static class BTKUIAddon
         miscCategory.AddButton("Reset Offsets", "", "Reset all tracked point offsets.")
             .OnPress += () => { IKAdjuster.Instance.ResetAllOffsets(); };
 
-        // Cyle GrabMode Button
+        // Cycle GrabMode Button
         miscCategory.AddButton("Cycle Mode", "", "Cycle grab mode. Position, Rotation, or Both.")
             .OnPress += () => { IKAdjuster.Instance.CycleAdjustMode(); };
     }
-
-    private static void AddMelonToggle(ref Category category, MelonPreferences_Entry<bool> entry)
-    {
-        category.AddToggle(entry.DisplayName, entry.Description, entry.Value).OnValueUpdated += b => entry.Value = b;
-    }
-
-    private static void AddMelonSlider(ref Page page, MelonPreferences_Entry<float> entry, float min, float max,
-        int decimalPlaces = 2)
-    {
-        page.AddSlider(entry.DisplayName, entry.Description, entry.Value, min, max, decimalPlaces).OnValueUpdated +=
-            f => entry.Value = f;
-    }
 }
\ No newline at end of file