Add compatibility with BONELAB Patch 3

Evanaellio · Aug 7, 2023 · 91488e1 · 91488e1
1 parent 727673f
commit 91488e1
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 11 deletions.
diff --git a/HyperJump/BonelabUtils.cs b/HyperJump/BonelabUtils.cs
@@ -18,9 +18,9 @@ public class BonelabUtils : IBoneUtils
         public ControllerRig ControllerRig => Player.controllerRig;
         public PhysGrounder PhysGrounder => Player.physicsRig.physG;
 
-        public MethodInfo GetControllerRigMethod(string methodName)
+        public MethodInfo GetJumpChargeMethod()
         {
-            return typeof(ControllerRig).GetMethod(methodName);
+            return typeof(RemapRig).GetMethod("JumpCharge");
         }
 
         public Vector3 GetPelvisVelocity()

diff --git a/HyperJump/BoneworksUtils.cs b/HyperJump/BoneworksUtils.cs
@@ -16,9 +16,9 @@ public class BoneworksUtils : IBoneUtils
         public ControllerRig ControllerRig => UnityObject.FindObjectOfType<ControllerRig>();
         public PhysGrounder PhysGrounder => UnityObject.FindObjectOfType<PhysGrounder>();
 
-        public MethodInfo GetControllerRigMethod(string methodName)
+        public MethodInfo GetJumpChargeMethod()
         {
-            return typeof(ControllerRig).GetMethod(methodName);
+            return typeof(ControllerRig).GetMethod("JumpCharge");
         }
 
         public Vector3 GetPelvisVelocity()

diff --git a/HyperJump/HyperJump.cs b/HyperJump/HyperJump.cs
@@ -16,14 +16,13 @@ public static class BuildInfo
         public const string Name = "Hyper Jump";
         public const string Author = "Evanaellio";
         public const string Company = null;
-        public const string Version = "3.0.0";
+        public const string Version = "3.1.0";
         public const string DownloadLink = "https://bonelab.thunderstore.io/package/Evanaellio/HyperJump/";
     }
 
     public class HyperJump : MelonMod
     {
         private const string HyperJumpCategory = nameof(HyperJump);
-        private const string CustomProfileCategory = "HyperJumpCustomProfile";
 
         private static readonly string[] CustomProfileCategories =
         {
@@ -145,7 +144,7 @@ public override void OnInitializeMelon()
             BoneUtils.SetupMenu(profileSetting, customProfileSettings);
 
             HarmonyMethod jumpChargePostfix = new HarmonyMethod(typeof(HyperJump).GetMethod(nameof(JumpChargePostfix)));
-            MethodInfo jumpChargeMethod = BoneUtils.GetControllerRigMethod("JumpCharge");
+            MethodInfo jumpChargeMethod = BoneUtils.GetJumpChargeMethod();
             HarmonyInstance.Patch(jumpChargeMethod, null, jumpChargePostfix);
         }
 

diff --git a/HyperJump/IBoneUtils.cs b/HyperJump/IBoneUtils.cs
@@ -20,7 +20,7 @@ public class CustomProfileSetting
 
     public interface IBoneUtils
     {
-        MethodInfo GetControllerRigMethod(string methodName);
+        MethodInfo GetJumpChargeMethod();
         Vector3 GetPelvisVelocity();
         Vector3 GetHeadDirection();
         void ApplyForceToPelvis(Vector3 force, ForceMode velocityChange);

diff --git a/HyperJump/Properties/AssemblyInfo.cs b/HyperJump/Properties/AssemblyInfo.cs
@@ -23,4 +23,7 @@
 // If no MelonModGameAttribute is found or any of the Values for any MelonModGame on the Mod is null or empty it will be assumed the Mod is Universal.
 // Values for MelonModGame can be found in the Game's app.info file or printed at the top of every log directly beneath the Unity version.
 [assembly: MelonGame("Stress Level Zero", "BONELAB")]
-[assembly: MelonGame("Stress Level Zero", "BONEWORKS")]
+[assembly: MelonGame("Stress Level Zero", "BONEWORKS")]
+
+// Mark as optional so that MelonLoader doesn't complain but ModThatIsNotMod is required for BONEWORKS and BoneLib is required for BONELAB
+[assembly: MelonOptionalDependencies("ModThatIsNotMod", "BoneLib")]
diff --git a/ThunderstorePackage/README.md b/ThunderstorePackage/README.md
@@ -4,6 +4,8 @@ Jump higher and leap further.
 
 To install the mod, copy the Mods folder inside the zip into your BONEWORKS or BONELAB directory.
 
+⚠ Use versions 3.0.x for BONELAB Patch 2 and versions 3.1.x for BONELAB Patch 3, and any of versions 3.x for BONEWORKS
+
 Hyper jumps and leaps are best used in exterior environments (unless you like fracturing your skull on the ceiling or smashing your face against a wall).
 
 Hyper leaps only apply when walking/running, and will propel you towards where you are looking.
@@ -29,6 +31,10 @@ ActiveProfile can take the following values :
 
 ## Changelogs
 
+#### v3.1.0
+
+- Add compatibility with BONELAB Patch 3
+
 #### v3.0.1
 
 - Fix dependency to BoneLib for compatibility with Patch 2

diff --git a/ThunderstorePackage/manifest.json b/ThunderstorePackage/manifest.json
@@ -1,7 +1,7 @@
 {
 	"name": "HyperJump",
-	"version_number": "3.0.1",
+	"version_number": "3.1.0",
 	"description": "Jump higher and leap further",
 	"website_url": "https://github.com/Evanaellio/HyperJump",
-	"dependencies": ["gnonme-ModThatIsNotMod-0.3.6", "gnonme-BoneLib-2.2.0"]
+	"dependencies": ["LavaGang-MelonLoader-0.5.7", "gnonme-ModThatIsNotMod-0.3.6", "gnonme-BoneLib-2.2.1"]
 }