Compare commits

...

9 commits

Author SHA1 Message Date
github-actions[bot]
8ad74b5ef6 [NAK_CVR_Mods] Update mod list in README
Some checks are pending
Update Mod List / update-modlist (push) Waiting to run
2025-04-12 09:29:46 +00:00
NotAKidoS
134c8e7878 Merge branch 'main' of https://github.com/NotAKidoS/NAK_CVR_Mods 2025-04-12 04:29:32 -05:00
NotAKidoS
1f8435edb9 nvm 2025-04-12 04:29:25 -05:00
github-actions[bot]
446a89f35d [NAK_CVR_Mods] Update mod list in README 2025-04-12 09:06:01 +00:00
NotAKidoS
1f99312c22 [WindowFocusCheckFix] iniyial push 2025-04-12 04:05:48 -05:00
NotAKidoS
a6fa59d24c Merge branch 'main' of https://github.com/NotAKidoS/NAK_CVR_Mods 2025-04-12 03:33:12 -05:00
NotAKidoS
89b8f19288 [YouAreMyPropNowWeAreHavingSoftTacosLaterMod] added settingd 2025-04-12 03:33:10 -05:00
github-actions[bot]
8764339ac8 [NAK_CVR_Mods] Update mod list in README 2025-04-12 07:41:58 +00:00
NotAKidoS
a8e0553e53 [DoubleTapJumpToExitSeat] Initial push 2025-04-12 02:41:43 -05:00
7 changed files with 243 additions and 7 deletions

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<RootNamespace>YouAreMineNow</RootNamespace>
</PropertyGroup>
</Project>

View file

@ -0,0 +1,103 @@
using System.Reflection;
using ABI_RC.Core.InteractionSystem;
using ABI_RC.Core.Savior;
using ABI_RC.Systems.InputManagement;
using ABI_RC.Systems.Movement;
using HarmonyLib;
using MelonLoader;
using UnityEngine;
namespace NAK.DoubleTapJumpToExitSeat;
public class DoubleTapJumpToExitSeatMod : MelonMod
{
#region Melon Preferences
public static readonly MelonPreferences_Category Category =
MelonPreferences.CreateCategory(nameof(DoubleTapJumpToExitSeatMod));
public static readonly MelonPreferences_Entry<bool> EntryOnlyInVR =
Category.CreateEntry("only_in_vr", false, display_name: "Only In VR", description: "Should this behaviour only be active in VR?");
#endregion Melon Preferences
#region Melon Events
public override void OnInitializeMelon()
{
#region CVRSeat Patches
HarmonyInstance.Patch(
typeof(CVRSeat).GetMethod(nameof(CVRSeat.Update),
BindingFlags.NonPublic | BindingFlags.Instance),
prefix: new HarmonyMethod(typeof(DoubleTapJumpToExitSeatMod).GetMethod(nameof(OnPreCVRSeatUpdate),
BindingFlags.NonPublic | BindingFlags.Static))
);
#endregion CVRSeat Patches
#region ViewManager Patches
HarmonyInstance.Patch(
typeof(ViewManager).GetMethod(nameof(ViewManager.Update),
BindingFlags.NonPublic | BindingFlags.Instance),
prefix: new HarmonyMethod(typeof(DoubleTapJumpToExitSeatMod).GetMethod(nameof(OnPreViewManagerUpdate),
BindingFlags.NonPublic | BindingFlags.Static)),
postfix: new HarmonyMethod(typeof(DoubleTapJumpToExitSeatMod).GetMethod(nameof(OnPostViewManagerUpdate),
BindingFlags.NonPublic | BindingFlags.Static))
);
#endregion ViewManager Patches
}
#endregion Melon Events
#region Harmony Patches
private static float lastJumpTime = -1f;
private static bool wasJumping;
private static bool OnPreCVRSeatUpdate(CVRSeat __instance)
{
if (!__instance.occupied) return false;
// Crazy?
bool jumped = CVRInputManager.Instance.jump;
bool justJumped = jumped && !wasJumping;
wasJumping = jumped;
if (justJumped && (!EntryOnlyInVR.Value || MetaPort.Instance.isUsingVr))
{
float t = Time.time;
if (t - lastJumpTime <= BetterBetterCharacterController.DoubleJumpFlightTimeOut)
{
lastJumpTime = -1f;
__instance.ExitSeat();
return false;
}
lastJumpTime = t;
}
// Double update this frame (this ensures Extrapolate / Every Frame Updated objects are seated correctly)
if (__instance.vrSitPosition.position != __instance._lastPosition || __instance.vrSitPosition.rotation != __instance._lastRotation)
__instance.MovePlayerToSeat(__instance.vrSitPositionReady ? __instance.vrSitPosition : __instance.transform);
// Steal sync
if (__instance.lockControls)
{
if (__instance._spawnable != null) __instance._spawnable.ForceUpdate(4);
if (__instance._objectSync != null) __instance._objectSync.ForceUpdate(4);
}
return false; // don't call original method
}
// ReSharper disable once RedundantAssignment
private static void OnPreViewManagerUpdate(ref bool __state)
=> (__state, BetterBetterCharacterController.Instance._isSitting)
= (BetterBetterCharacterController.Instance._isSitting, false);
private static void OnPostViewManagerUpdate(ref bool __state)
=> BetterBetterCharacterController.Instance._isSitting = __state;
#endregion Harmony Patches
}

View file

@ -0,0 +1,32 @@
using MelonLoader;
using NAK.DoubleTapJumpToExitSeat.Properties;
using System.Reflection;
[assembly: AssemblyVersion(AssemblyInfoParams.Version)]
[assembly: AssemblyFileVersion(AssemblyInfoParams.Version)]
[assembly: AssemblyInformationalVersion(AssemblyInfoParams.Version)]
[assembly: AssemblyTitle(nameof(NAK.DoubleTapJumpToExitSeat))]
[assembly: AssemblyCompany(AssemblyInfoParams.Author)]
[assembly: AssemblyProduct(nameof(NAK.DoubleTapJumpToExitSeat))]
[assembly: MelonInfo(
typeof(NAK.DoubleTapJumpToExitSeat.DoubleTapJumpToExitSeatMod),
nameof(NAK.DoubleTapJumpToExitSeat),
AssemblyInfoParams.Version,
AssemblyInfoParams.Author,
downloadLink: "https://github.com/NotAKidoS/NAK_CVR_Mods/tree/main/DoubleTapJumpToExitSeat"
)]
[assembly: MelonGame("Alpha Blend Interactive", "ChilloutVR")]
[assembly: MelonPlatform(MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)]
[assembly: MelonPlatformDomain(MelonPlatformDomainAttribute.CompatibleDomains.MONO)]
[assembly: MelonColor(255, 246, 25, 99)] // red-pink
[assembly: MelonAuthorColor(255, 158, 21, 32)] // red
[assembly: HarmonyDontPatchAll]
namespace NAK.DoubleTapJumpToExitSeat.Properties;
internal static class AssemblyInfoParams
{
public const string Version = "1.0.0";
public const string Author = "NotAKidoS";
}

View file

@ -0,0 +1,14 @@
# DoubleTapJumpToExitSeat
Literally the mod name.
---
Here is the block of text where I tell you this mod is not affiliated with or endorsed by ABI.
https://documentation.abinteractive.net/official/legal/tos/#7-modding-our-games
> This mod is an independent creation not affiliated with, supported by, or approved by Alpha Blend Interactive.
> Use of this mod is done so at the user's own risk and the creator cannot be held responsible for any issues arising from its use.
> To the best of my knowledge, I have adhered to the Modding Guidelines established by Alpha Blend Interactive.

View file

@ -0,0 +1,23 @@
{
"_id": -1,
"name": "DoubleTapJumpToExitSeat",
"modversion": "1.0.0",
"gameversion": "2025r179",
"loaderversion": "0.6.1",
"modtype": "Mod",
"author": "NotAKidoS",
"description": "Literally the mod name.",
"searchtags": [
"double",
"jump",
"chair",
"seat"
],
"requirements": [
"None"
],
"downloadlink": "https://github.com/NotAKidoS/NAK_CVR_Mods/releases/download/r46/DoubleTapJumpToExitSeat.dll",
"sourcelink": "https://github.com/NotAKidoS/NAK_CVR_Mods/tree/main/DoubleTapJumpToExitSeat/",
"changelog": "- Initial Release",
"embedcolor": "#00FFFF"
}

View file

@ -9,6 +9,7 @@
| [ASTExtension](ASTExtension/README.md) | Extension mod for [Avatar Scale Tool](https://github.com/NotAKidoS/AvatarScaleTool): | [Download](https://github.com/NotAKidoS/NAK_CVR_Mods/releases/download/r46/ASTExtension.dll) |
| [AvatarQueueSystemTweaks](AvatarQueueSystemTweaks/README.md) | Small tweaks to the Avatar Queue System. | [Download](https://github.com/NotAKidoS/NAK_CVR_Mods/releases/download/r46/AvatarQueueSystemTweaks.dll) |
| [CustomSpawnPoint](CustomSpawnPoint/README.md) | Replaces the unused Images button in the World Details page with a button to set a custom spawn point. | [Download](https://github.com/NotAKidoS/NAK_CVR_Mods/releases/download/r46/CustomSpawnPoint.dll) |
| [DoubleTapJumpToExitSeat](DoubleTapJumpToExitSeat/README.md) | Literally the mod name. | No Download |
| [FuckToes](FuckToes/README.md) | Prevents VRIK from autodetecting toes in HalfbodyIK. | No Download |
| [KeepVelocityOnExitFlight](KeepVelocityOnExitFlight/README.md) | Keeps the player's velocity when exiting flight mode. Makes it possible to fling yourself like in Garry's Mod. | [Download](https://github.com/NotAKidoS/NAK_CVR_Mods/releases/download/r46/KeepVelocityOnExitFlight.dll) |
| [LazyPrune](LazyPrune/README.md) | Prevents loaded objects from immediately unloading on destruction. Should prevent needlessly unloading & reloading all avatars/props on world rejoin or GS reconnection. | [Download](https://github.com/NotAKidoS/NAK_CVR_Mods/releases/download/r46/LazyPrune.dll) |

View file

@ -21,6 +21,25 @@ namespace NAK.YouAreMyPropNowWeAreHavingSoftTacosLater;
public class YouAreMyPropNowWeAreHavingSoftTacosLaterMod : MelonMod
{
#region Melon Preferences
public static readonly MelonPreferences_Category Category =
MelonPreferences.CreateCategory(nameof(YouAreMyPropNowWeAreHavingSoftTacosLaterMod));
public static readonly MelonPreferences_Entry<bool> EntryTrackPickups =
Category.CreateEntry("track_pickups", true, display_name: "Track Pickups", description: "Should pickups be tracked?");
public static readonly MelonPreferences_Entry<bool> EntryTrackAttachments =
Category.CreateEntry("track_attachments", true, display_name: "Track Attachments", description: "Should attachments be tracked?");
public static readonly MelonPreferences_Entry<bool> EntryTrackSeats =
Category.CreateEntry("track_seats", true, display_name: "Track Seats", description: "Should seats be tracked?");
public static readonly MelonPreferences_Entry<bool> EntryOnlySpawnedByMe =
Category.CreateEntry("only_spawned_by_me", true, display_name: "Only Spawned By Me", description: "Should only props spawned by me be tracked?");
#endregion Melon Preferences
#region Melon Events
public override void OnInitializeMelon()
@ -58,6 +77,24 @@ public class YouAreMyPropNowWeAreHavingSoftTacosLaterMod : MelonMod
);
#endregion CVRAttachment Patches
#region CVRSeat Patches
HarmonyInstance.Patch(
typeof(CVRSeat).GetMethod(nameof(CVRSeat.SitDown),
BindingFlags.Public | BindingFlags.Instance),
postfix: new HarmonyMethod(typeof(YouAreMyPropNowWeAreHavingSoftTacosLaterMod).GetMethod(nameof(OnCVRSeatSitDown),
BindingFlags.NonPublic | BindingFlags.Static))
);
HarmonyInstance.Patch(
typeof(CVRSeat).GetMethod(nameof(CVRSeat.ExitSeat),
BindingFlags.Public | BindingFlags.Instance),
postfix: new HarmonyMethod(typeof(YouAreMyPropNowWeAreHavingSoftTacosLaterMod).GetMethod(nameof(OnCVRSeatExitSeat),
BindingFlags.NonPublic | BindingFlags.Static))
);
#endregion CVRSeat Patches
#region CVRSyncHelper Patches
@ -129,26 +166,41 @@ public class YouAreMyPropNowWeAreHavingSoftTacosLaterMod : MelonMod
private static void OnCVRPickupObjectOnGrab(CVRPickupObject __instance)
{
if (!GetPropData(__instance.GetComponentInParent<CVRSpawnable>(true), out CVRSyncHelper.PropData propData)) return;
if (!EntryTrackPickups.Value) return;
if (!TryGetPropData(__instance.GetComponentInParent<CVRSpawnable>(true), out CVRSyncHelper.PropData propData)) return;
if (!_heldPropData.Contains(propData)) _heldPropData.Add(propData);
}
private static void OnCVRPickupObjectOnDrop(CVRPickupObject __instance)
{
if (!GetPropData(__instance.GetComponentInParent<CVRSpawnable>(true), out CVRSyncHelper.PropData propData)) return;
if (!TryGetPropData(__instance.GetComponentInParent<CVRSpawnable>(true), out CVRSyncHelper.PropData propData)) return;
if (_heldPropData.Contains(propData)) _heldPropData.Remove(propData);
}
private static void OnCVRAttachmentAttachInternal(CVRAttachment __instance)
{
if (!GetPropData(__instance.GetComponentInParent<CVRSpawnable>(true), out CVRSyncHelper.PropData propData)) return;
if (!EntryTrackAttachments.Value) return;
if (!TryGetPropData(__instance.GetComponentInParent<CVRSpawnable>(true), out CVRSyncHelper.PropData propData)) return;
if (!_heldPropData.Contains(propData)) _heldPropData.Add(propData);
}
private static void OnCVRAttachmentDeAttach(CVRAttachment __instance)
{
if (!__instance._isAttached) return; // Can invoke DeAttach without being attached
if (!GetPropData(__instance.GetComponentInParent<CVRSpawnable>(true), out CVRSyncHelper.PropData propData)) return;
if (!TryGetPropData(__instance.GetComponentInParent<CVRSpawnable>(true), out CVRSyncHelper.PropData propData)) return;
if (_heldPropData.Contains(propData)) _heldPropData.Remove(propData);
}
private static void OnCVRSeatSitDown(CVRSeat __instance)
{
if (!EntryTrackSeats.Value) return;
if (!TryGetPropData(__instance.GetComponentInParent<CVRSpawnable>(true), out CVRSyncHelper.PropData propData)) return;
if (!_heldPropData.Contains(propData)) _heldPropData.Add(propData);
}
private static void OnCVRSeatExitSeat(CVRSeat __instance)
{
if (!TryGetPropData(__instance.GetComponentInParent<CVRSpawnable>(true), out CVRSyncHelper.PropData propData)) return;
if (_heldPropData.Contains(propData)) _heldPropData.Remove(propData);
}
@ -161,7 +213,7 @@ public class YouAreMyPropNowWeAreHavingSoftTacosLaterMod : MelonMod
if (type != DownloadTask.ObjectType.Prop) return true; // Only care about props
// toAttach is our instanceId, lets find the propData
if (!GetPropDataById(toAttach, out CVRSyncHelper.PropData newPropData)) return true;
if (!TryGetPropDataById(toAttach, out CVRSyncHelper.PropData newPropData)) return true;
// Check if this is a prop we requested to spawn
Vector3 identity = GetIdentityKeyFromPropData(newPropData);
@ -307,13 +359,18 @@ public class YouAreMyPropNowWeAreHavingSoftTacosLaterMod : MelonMod
#region Util
private static bool GetPropData(CVRSpawnable spawnable, out CVRSyncHelper.PropData propData)
private static bool TryGetPropData(CVRSpawnable spawnable, out CVRSyncHelper.PropData propData)
{
if (spawnable == null)
{
propData = null;
return false;
}
if (EntryOnlySpawnedByMe.Value && !spawnable.IsMine())
{
propData = null;
return false;
}
foreach (CVRSyncHelper.PropData data in CVRSyncHelper.Props)
{
if (data.InstanceId != spawnable.instanceId) continue;
@ -324,7 +381,7 @@ public class YouAreMyPropNowWeAreHavingSoftTacosLaterMod : MelonMod
return false;
}
private static bool GetPropDataById(string instanceId, out CVRSyncHelper.PropData propData)
private static bool TryGetPropDataById(string instanceId, out CVRSyncHelper.PropData propData)
{
foreach (CVRSyncHelper.PropData data in CVRSyncHelper.Props)
{