From 04c4a4590dcf5c3e434232ef01b53650f3d6f242 Mon Sep 17 00:00:00 2001 From: SurprisinglySuspicious Date: Wed, 20 Nov 2024 16:07:52 -0500 Subject: [PATCH 1/6] Issue: If NStrip wasn't found in folder or PATH, it tries to show a message to user, but it doesn't wait for key input, so it just immediately closes. --- copy_and_nstrip_dll.ps1 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/copy_and_nstrip_dll.ps1 b/copy_and_nstrip_dll.ps1 index aa4cb97..d4b95db 100644 --- a/copy_and_nstrip_dll.ps1 +++ b/copy_and_nstrip_dll.ps1 @@ -139,7 +139,7 @@ if ($missingMods.Count -gt 0) { Write-Host "" Write-Host "Copied all libraries!" Write-Host "" -Write-Host "Press any key to strip the Dlls using NStrip" +Write-Host "Press any key to strip the DLLs using NStrip..." $HOST.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown") | OUT-NULL $HOST.UI.RawUI.Flushinputbuffer() @@ -156,6 +156,10 @@ else { # Display an error message if NStrip.exe could not be found Write-Host "Could not find NStrip.exe in the current directory nor in the PATH." -ForegroundColor Red Write-Host "Visit https://github.com/bbepis/NStrip/releases/latest to grab a copy." -ForegroundColor Red + Write-Host "" + Write-Host "Press any key to exit..." + $HOST.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown") | OUT-NULL + $HOST.UI.RawUI.Flushinputbuffer() return } } @@ -169,6 +173,6 @@ foreach($dllFile in $dllsToStrip) { Write-Host "" Write-Host "Copied all libraries and stripped the DLLs!" Write-Host "" -Write-Host "Press any key to exit" +Write-Host "Press any key to exit..." $HOST.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown") | OUT-NULL $HOST.UI.RawUI.Flushinputbuffer() From 70a54b632c819a75805851a44de4edd512fb3fab Mon Sep 17 00:00:00 2001 From: SurprisinglySuspicious <100347264+SurprisinglySuspicious@users.noreply.github.com> Date: Wed, 20 Nov 2024 16:59:19 -0500 Subject: [PATCH 2/6] Add it for PATH too --- copy_and_nstrip_dll.ps1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/copy_and_nstrip_dll.ps1 b/copy_and_nstrip_dll.ps1 index d4b95db..0f2c7f3 100644 --- a/copy_and_nstrip_dll.ps1 +++ b/copy_and_nstrip_dll.ps1 @@ -35,6 +35,10 @@ else { else { Write-Host "[ERROR] ChilloutVR.exe not found in CVRPATH or the default Steam location." Write-Host " Please define the Environment Variable CVRPATH pointing to the ChilloutVR folder!" + Write-Host "" + Write-Host "Press any key to exit..." + $HOST.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown") | OUT-NULL + $HOST.UI.RawUI.Flushinputbuffer() return } } From 621321c498938fa4d3778cc4a9629135bcd06f76 Mon Sep 17 00:00:00 2001 From: NotAKidoS <37721153+NotAKidoS@users.noreply.github.com> Date: Wed, 15 Jan 2025 16:41:37 -0600 Subject: [PATCH 3/6] ASTExtension: Fixes for 2025r178 --- ASTExtension/Properties/AssemblyInfo.cs | 2 +- ASTExtension/format.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ASTExtension/Properties/AssemblyInfo.cs b/ASTExtension/Properties/AssemblyInfo.cs index faa1dc6..5c617e2 100644 --- a/ASTExtension/Properties/AssemblyInfo.cs +++ b/ASTExtension/Properties/AssemblyInfo.cs @@ -27,6 +27,6 @@ using System.Reflection; namespace NAK.ASTExtension.Properties; internal static class AssemblyInfoParams { - public const string Version = "1.0.1"; + public const string Version = "1.0.2"; public const string Author = "NotAKidoS"; } \ No newline at end of file diff --git a/ASTExtension/format.json b/ASTExtension/format.json index 55315d6..5ad14ea 100644 --- a/ASTExtension/format.json +++ b/ASTExtension/format.json @@ -1,8 +1,8 @@ { "_id": 223, "name": "ASTExtension", - "modversion": "1.0.1", - "gameversion": "2024r175", + "modversion": "1.0.2", + "gameversion": "2025r178", "loaderversion": "0.6.1", "modtype": "Mod", "author": "NotAKidoS", @@ -17,8 +17,8 @@ "requirements": [ "BTKUILib" ], - "downloadlink": "https://github.com/NotAKidoS/NAK_CVR_Mods/releases/download/r35/ASTExtension.dll", + "downloadlink": "https://github.com/NotAKidoS/NAK_CVR_Mods/releases/download/r45/ASTExtension.dll", "sourcelink": "https://github.com/NotAKidoS/NAK_CVR_Mods/tree/main/ASTExtension/", - "changelog": "- Fixed an issue where the parameter calibration process would sometimes result in the mouth pointer being misplaced when generated.\n- Fixed IsGripping check for Knuckles controllers not requiring *both* hands as intended.", + "changelog": "- Fixes for 2025r178", "embedcolor": "#f61963" } \ No newline at end of file From 40bc88586e8b09fdc69c8023c5b851ec7e48931b Mon Sep 17 00:00:00 2001 From: NotAKidoS <37721153+NotAKidoS@users.noreply.github.com> Date: Wed, 15 Jan 2025 16:42:05 -0600 Subject: [PATCH 4/6] RCCVirtualSteeringWheel: Fixes for 2025r178 --- RCCVirtualSteeringWheel/Patches.cs | 3 +++ RCCVirtualSteeringWheel/Properties/AssemblyInfo.cs | 2 +- .../Components/SteeringWheelRoot.cs | 1 - RCCVirtualSteeringWheel/format.json | 12 ++++++------ 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/RCCVirtualSteeringWheel/Patches.cs b/RCCVirtualSteeringWheel/Patches.cs index c4824ce..b9745d9 100644 --- a/RCCVirtualSteeringWheel/Patches.cs +++ b/RCCVirtualSteeringWheel/Patches.cs @@ -24,6 +24,9 @@ internal static class RCCCarControllerV3_Patches { if (!result.IsValid) return; + + if (!__instance) + return; SteeringWheelRoot.SetupSteeringWheel(__instance, result.LocalBounds); }); diff --git a/RCCVirtualSteeringWheel/Properties/AssemblyInfo.cs b/RCCVirtualSteeringWheel/Properties/AssemblyInfo.cs index c82b5de..616aa81 100644 --- a/RCCVirtualSteeringWheel/Properties/AssemblyInfo.cs +++ b/RCCVirtualSteeringWheel/Properties/AssemblyInfo.cs @@ -28,6 +28,6 @@ using NAK.RCCVirtualSteeringWheel.Properties; namespace NAK.RCCVirtualSteeringWheel.Properties; internal static class AssemblyInfoParams { - public const string Version = "1.0.0"; + public const string Version = "1.0.3"; public const string Author = "NotAKidoS"; } \ No newline at end of file diff --git a/RCCVirtualSteeringWheel/RCCVirtualSteeringWheel/Components/SteeringWheelRoot.cs b/RCCVirtualSteeringWheel/RCCVirtualSteeringWheel/Components/SteeringWheelRoot.cs index b8008b8..0154bd5 100644 --- a/RCCVirtualSteeringWheel/RCCVirtualSteeringWheel/Components/SteeringWheelRoot.cs +++ b/RCCVirtualSteeringWheel/RCCVirtualSteeringWheel/Components/SteeringWheelRoot.cs @@ -27,7 +27,6 @@ public class SteeringWheelRoot : MonoBehaviour public static void SetupSteeringWheel(RCC_CarControllerV3 carController, Bounds steeringWheelBounds) { Transform steeringWheel = carController.SteeringWheel; - if (carController == null) return; SteeringWheelRoot wheel = steeringWheel.gameObject.AddComponent(); wheel._carController = carController; diff --git a/RCCVirtualSteeringWheel/format.json b/RCCVirtualSteeringWheel/format.json index 3f0654c..438f31f 100644 --- a/RCCVirtualSteeringWheel/format.json +++ b/RCCVirtualSteeringWheel/format.json @@ -1,8 +1,8 @@ { - "_id": -1, + "_id": 248, "name": "RCCVirtualSteeringWheel", - "modversion": "1.0.0", - "gameversion": "2024r177", + "modversion": "1.0.3", + "gameversion": "2025r178", "loaderversion": "0.6.1", "modtype": "Mod", "author": "NotAKidoS", @@ -14,10 +14,10 @@ "car" ], "requirements": [ - "BTKUILib" + "None" ], - "downloadlink": "https://github.com/NotAKidoS/NAK_CVR_Mods/releases/download/r44/RCCVirtualSteeringWheel.dll", + "downloadlink": "https://github.com/NotAKidoS/NAK_CVR_Mods/releases/download/r45/RCCVirtualSteeringWheel.dll", "sourcelink": "https://github.com/NotAKidoS/NAK_CVR_Mods/tree/main/RCCVirtualSteeringWheel/", - "changelog": "- Initial release", + "changelog": "- Fixes for 2025r178", "embedcolor": "#f61963" } \ No newline at end of file From ac9af46bd69ce6517e249439eba078ebfd71dfff Mon Sep 17 00:00:00 2001 From: NotAKidoS <37721153+NotAKidoS@users.noreply.github.com> Date: Wed, 15 Jan 2025 16:42:27 -0600 Subject: [PATCH 5/6] MutualMute: Stole name idea, now it's MutualMute --- {TwoWayMute => MutualMute}/Main.cs | 6 +++--- .../MutualMute.csproj | 1 + .../Properties/AssemblyInfo.cs | 16 ++++++++-------- {TwoWayMute => MutualMute}/README.md | 4 +++- {TwoWayMute => MutualMute}/format.json | 16 ++++++++-------- 5 files changed, 23 insertions(+), 20 deletions(-) rename {TwoWayMute => MutualMute}/Main.cs (84%) rename TwoWayMute/TwoWayMute.csproj => MutualMute/MutualMute.csproj (86%) rename {TwoWayMute => MutualMute}/Properties/AssemblyInfo.cs (74%) rename {TwoWayMute => MutualMute}/README.md (84%) rename {TwoWayMute => MutualMute}/format.json (55%) diff --git a/TwoWayMute/Main.cs b/MutualMute/Main.cs similarity index 84% rename from TwoWayMute/Main.cs rename to MutualMute/Main.cs index 8d6de3e..d02924b 100644 --- a/TwoWayMute/Main.cs +++ b/MutualMute/Main.cs @@ -3,16 +3,16 @@ using ABI_RC.Systems.Communications.Audio.Components; using HarmonyLib; using MelonLoader; -namespace NAK.TwoWayMute; +namespace NAK.MutualMute; -public class TwoWayMuteMod : MelonMod +public class MutualMuteMod : MelonMod { public override void OnInitializeMelon() { HarmonyInstance.Patch( typeof(Comms_ParticipantPipeline).GetMethod(nameof(Comms_ParticipantPipeline.SetFlowControlState), BindingFlags.NonPublic | BindingFlags.Instance), - prefix: new HarmonyMethod(typeof(TwoWayMuteMod).GetMethod(nameof(OnSetFlowControlState), + prefix: new HarmonyMethod(typeof(MutualMuteMod).GetMethod(nameof(OnSetFlowControlState), BindingFlags.NonPublic | BindingFlags.Static)) ); } diff --git a/TwoWayMute/TwoWayMute.csproj b/MutualMute/MutualMute.csproj similarity index 86% rename from TwoWayMute/TwoWayMute.csproj rename to MutualMute/MutualMute.csproj index 4e44ed3..267718d 100644 --- a/TwoWayMute/TwoWayMute.csproj +++ b/MutualMute/MutualMute.csproj @@ -2,6 +2,7 @@ net48 + TwoWayMute diff --git a/TwoWayMute/Properties/AssemblyInfo.cs b/MutualMute/Properties/AssemblyInfo.cs similarity index 74% rename from TwoWayMute/Properties/AssemblyInfo.cs rename to MutualMute/Properties/AssemblyInfo.cs index 0c53769..6db6d18 100644 --- a/TwoWayMute/Properties/AssemblyInfo.cs +++ b/MutualMute/Properties/AssemblyInfo.cs @@ -1,20 +1,20 @@ -using NAK.TwoWayMute.Properties; +using NAK.MutualMute.Properties; using MelonLoader; using System.Reflection; [assembly: AssemblyVersion(AssemblyInfoParams.Version)] [assembly: AssemblyFileVersion(AssemblyInfoParams.Version)] [assembly: AssemblyInformationalVersion(AssemblyInfoParams.Version)] -[assembly: AssemblyTitle(nameof(NAK.TwoWayMute))] +[assembly: AssemblyTitle(nameof(NAK.MutualMute))] [assembly: AssemblyCompany(AssemblyInfoParams.Author)] -[assembly: AssemblyProduct(nameof(NAK.TwoWayMute))] +[assembly: AssemblyProduct(nameof(NAK.MutualMute))] [assembly: MelonInfo( - typeof(NAK.TwoWayMute.TwoWayMuteMod), - nameof(NAK.TwoWayMute), + typeof(NAK.MutualMute.MutualMuteMod), + nameof(NAK.MutualMute), AssemblyInfoParams.Version, AssemblyInfoParams.Author, - downloadLink: "https://github.com/NotAKidoS/NAK_CVR_Mods/tree/main/TwoWayMute" + downloadLink: "https://github.com/NotAKidoS/NAK_CVR_Mods/tree/main/MutualMute" )] [assembly: MelonGame("Alpha Blend Interactive", "ChilloutVR")] @@ -24,9 +24,9 @@ using System.Reflection; [assembly: MelonAuthorColor(255, 158, 21, 32)] // red [assembly: HarmonyDontPatchAll] -namespace NAK.TwoWayMute.Properties; +namespace NAK.MutualMute.Properties; internal static class AssemblyInfoParams { - public const string Version = "1.0.0"; + public const string Version = "1.0.1"; public const string Author = "NotAKidoS"; } \ No newline at end of file diff --git a/TwoWayMute/README.md b/MutualMute/README.md similarity index 84% rename from TwoWayMute/README.md rename to MutualMute/README.md index 560a022..599d292 100644 --- a/TwoWayMute/README.md +++ b/MutualMute/README.md @@ -1,9 +1,11 @@ -# TwoWayMute +# MutualMute Adjusts the self moderation muting behaviour to also prevent the muted user from hearing you. Basically- if you mute someone, they will also not be able to hear you. +#### This will work even of the other user does not have the mod installed, as it modifies the BBC Flow Control system. + --- Here is the block of text where I tell you this mod is not affiliated with or endorsed by ABI. diff --git a/TwoWayMute/format.json b/MutualMute/format.json similarity index 55% rename from TwoWayMute/format.json rename to MutualMute/format.json index a2ed4f6..e815ba1 100644 --- a/TwoWayMute/format.json +++ b/MutualMute/format.json @@ -1,12 +1,12 @@ { - "_id": -1, - "name": "TwoWayMute", - "modversion": "1.0.0", - "gameversion": "2024r177", + "_id": 246, + "name": "MutualMute", + "modversion": "1.0.1", + "gameversion": "2025r178", "loaderversion": "0.6.1", "modtype": "Mod", "author": "NotAKidoS", - "description": "Adjusts the self moderation muting behaviour to also prevent the muted user from hearing you.\n\nBasically- if you mute someone, they will also not be able to hear you.", + "description": "Adjusts the self moderation muting behaviour to also prevent the muted user from hearing you.\n\nBasically- if you mute someone, they will also not be able to hear you.\n-# This will work even of the other user does not have the mod installed, as it modifies the BBC Flow Control system.", "searchtags": [ "mute", "communication", @@ -16,8 +16,8 @@ "requirements": [ "None" ], - "downloadlink": "https://github.com/NotAKidoS/NAK_CVR_Mods/releases/download/r44/TwoWayMute.dll", - "sourcelink": "https://github.com/NotAKidoS/NAK_CVR_Mods/tree/main/TwoWayMute/", - "changelog": "- Initial Release", + "downloadlink": "https://github.com/NotAKidoS/NAK_CVR_Mods/releases/download/r45/MutualMute.dll", + "sourcelink": "https://github.com/NotAKidoS/NAK_CVR_Mods/tree/main/MutualMute/", + "changelog": "- Stole name idea, now it's MutualMute", "embedcolor": "#f61963" } \ No newline at end of file From 6d30fe1f41340c942a903f0b0ce2f25adf865992 Mon Sep 17 00:00:00 2001 From: NotAKidoS <37721153+NotAKidoS@users.noreply.github.com> Date: Wed, 15 Jan 2025 16:42:53 -0600 Subject: [PATCH 6/6] ShareBubbles: Fixes for 2025r178 --- ShareBubbles/Patches.cs | 2 +- ShareBubbles/Properties/AssemblyInfo.cs | 2 +- ShareBubbles/ShareBubbles/UI/BubbleInteract.cs | 8 ++++---- ShareBubbles/ShareBubbles/UI/ReturnOnRelease.cs | 4 ++-- ShareBubbles/format.json | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ShareBubbles/Patches.cs b/ShareBubbles/Patches.cs index 4f705e3..162c75b 100644 --- a/ShareBubbles/Patches.cs +++ b/ShareBubbles/Patches.cs @@ -1462,7 +1462,7 @@ ContentShareMod.init(); public static void Postfix_ViewManager_Start(ViewManager __instance) { // Inject the details toolbar patches when the game menu view is loaded - __instance.gameMenuView.Listener.FinishLoad += _ => { + __instance.gameMenuView.Listener.FinishLoad += (_) => { __instance.gameMenuView.View._view.ExecuteScript(DETAILS_TOOLBAR_PATCHES); __instance.gameMenuView.View.BindCall("NAKCallShareContent", OnShareContent); __instance.gameMenuView.View.BindCall("NAKGetContentShares", OnGetContentShares); diff --git a/ShareBubbles/Properties/AssemblyInfo.cs b/ShareBubbles/Properties/AssemblyInfo.cs index 8a1996f..07120d8 100644 --- a/ShareBubbles/Properties/AssemblyInfo.cs +++ b/ShareBubbles/Properties/AssemblyInfo.cs @@ -27,6 +27,6 @@ using NAK.ShareBubbles.Properties; namespace NAK.ShareBubbles.Properties; internal static class AssemblyInfoParams { - public const string Version = "1.0.3"; + public const string Version = "1.0.4"; public const string Author = "NotAKidoS, Exterrata, Noachi, RaidShadowLily, Tejler"; } \ No newline at end of file diff --git a/ShareBubbles/ShareBubbles/UI/BubbleInteract.cs b/ShareBubbles/ShareBubbles/UI/BubbleInteract.cs index d389a41..ad2b4f4 100644 --- a/ShareBubbles/ShareBubbles/UI/BubbleInteract.cs +++ b/ShareBubbles/ShareBubbles/UI/BubbleInteract.cs @@ -14,12 +14,12 @@ public class BubbleInteract : Interactable return Vector3.Distance(transform.position, sourcePos) < 1.5f; } - public override void OnInteractDown(ControllerRay controllerRay) + public override void OnInteractDown(InteractionContext context, ControllerRay controllerRay) { // Not used } - public override void OnInteractUp(ControllerRay controllerRay) + public override void OnInteractUp(InteractionContext context, ControllerRay controllerRay) { if (PlayerSetup.Instance.GetCurrentPropSelectionMode() != PlayerSetup.PropSelectionMode.None) @@ -39,12 +39,12 @@ public class BubbleInteract : Interactable GetComponentInParent().ViewDetailsPage(); } - public override void OnHoverEnter() + public override void OnHoverEnter(InteractionContext context, ControllerRay controllerRay) { // Not used } - public override void OnHoverExit() + public override void OnHoverExit(InteractionContext context, ControllerRay controllerRay) { // Not used } diff --git a/ShareBubbles/ShareBubbles/UI/ReturnOnRelease.cs b/ShareBubbles/ShareBubbles/UI/ReturnOnRelease.cs index 9c2416c..b6e1eda 100644 --- a/ShareBubbles/ShareBubbles/UI/ReturnOnRelease.cs +++ b/ShareBubbles/ShareBubbles/UI/ReturnOnRelease.cs @@ -30,12 +30,12 @@ public class ReturnOnRelease : MonoBehaviour pickupable.onDrop.AddListener(OnPickupRelease); } - public void OnPickupGrabbed() + public void OnPickupGrabbed(InteractionContext _) { isReturning = false; } - public void OnPickupRelease() + public void OnPickupRelease(InteractionContext _) { isReturning = true; } diff --git a/ShareBubbles/format.json b/ShareBubbles/format.json index a17aa7b..be28ae9 100644 --- a/ShareBubbles/format.json +++ b/ShareBubbles/format.json @@ -1,8 +1,8 @@ { - "_id": -1, + "_id": 244, "name": "ShareBubbles", - "modversion": "1.0.2", - "gameversion": "2024r177", + "modversion": "1.0.4", + "gameversion": "2025r178", "loaderversion": "0.6.1", "modtype": "Mod", "author": "NotAKidoS, Exterrata, Noachi, RaidShadowLily, Tejler, Luc", @@ -17,8 +17,8 @@ "requirements": [ "None" ], - "downloadlink": "https://github.com/NotAKidoS/NAK_CVR_Mods/releases/download/r43/ShareBubbles.dll", + "downloadlink": "https://github.com/NotAKidoS/NAK_CVR_Mods/releases/download/r45/ShareBubbles.dll", "sourcelink": "https://github.com/NotAKidoS/NAK_CVR_Mods/tree/main/ShareBubbles/", - "changelog": "- Initial release.", + "changelog": "- Fixes for 2025r178", "embedcolor": "#f61963" } \ No newline at end of file