diff --git a/ASTExtension/Properties/AssemblyInfo.cs b/ASTExtension/Properties/AssemblyInfo.cs index 5c617e2..faa1dc6 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.2"; + public const string Version = "1.0.1"; public const string Author = "NotAKidoS"; } \ No newline at end of file diff --git a/ASTExtension/format.json b/ASTExtension/format.json index 5ad14ea..55315d6 100644 --- a/ASTExtension/format.json +++ b/ASTExtension/format.json @@ -1,8 +1,8 @@ { "_id": 223, "name": "ASTExtension", - "modversion": "1.0.2", - "gameversion": "2025r178", + "modversion": "1.0.1", + "gameversion": "2024r175", "loaderversion": "0.6.1", "modtype": "Mod", "author": "NotAKidoS", @@ -17,8 +17,8 @@ "requirements": [ "BTKUILib" ], - "downloadlink": "https://github.com/NotAKidoS/NAK_CVR_Mods/releases/download/r45/ASTExtension.dll", + "downloadlink": "https://github.com/NotAKidoS/NAK_CVR_Mods/releases/download/r35/ASTExtension.dll", "sourcelink": "https://github.com/NotAKidoS/NAK_CVR_Mods/tree/main/ASTExtension/", - "changelog": "- Fixes for 2025r178", + "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.", "embedcolor": "#f61963" } \ No newline at end of file diff --git a/RCCVirtualSteeringWheel/Patches.cs b/RCCVirtualSteeringWheel/Patches.cs index b9745d9..c4824ce 100644 --- a/RCCVirtualSteeringWheel/Patches.cs +++ b/RCCVirtualSteeringWheel/Patches.cs @@ -24,9 +24,6 @@ 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 616aa81..c82b5de 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.3"; + public const string Version = "1.0.0"; 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 0154bd5..b8008b8 100644 --- a/RCCVirtualSteeringWheel/RCCVirtualSteeringWheel/Components/SteeringWheelRoot.cs +++ b/RCCVirtualSteeringWheel/RCCVirtualSteeringWheel/Components/SteeringWheelRoot.cs @@ -27,6 +27,7 @@ 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 438f31f..3f0654c 100644 --- a/RCCVirtualSteeringWheel/format.json +++ b/RCCVirtualSteeringWheel/format.json @@ -1,8 +1,8 @@ { - "_id": 248, + "_id": -1, "name": "RCCVirtualSteeringWheel", - "modversion": "1.0.3", - "gameversion": "2025r178", + "modversion": "1.0.0", + "gameversion": "2024r177", "loaderversion": "0.6.1", "modtype": "Mod", "author": "NotAKidoS", @@ -14,10 +14,10 @@ "car" ], "requirements": [ - "None" + "BTKUILib" ], - "downloadlink": "https://github.com/NotAKidoS/NAK_CVR_Mods/releases/download/r45/RCCVirtualSteeringWheel.dll", + "downloadlink": "https://github.com/NotAKidoS/NAK_CVR_Mods/releases/download/r44/RCCVirtualSteeringWheel.dll", "sourcelink": "https://github.com/NotAKidoS/NAK_CVR_Mods/tree/main/RCCVirtualSteeringWheel/", - "changelog": "- Fixes for 2025r178", + "changelog": "- Initial release", "embedcolor": "#f61963" } \ No newline at end of file diff --git a/ShareBubbles/Patches.cs b/ShareBubbles/Patches.cs index 162c75b..4f705e3 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 07120d8..8a1996f 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.4"; + public const string Version = "1.0.3"; 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 ad2b4f4..d389a41 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(InteractionContext context, ControllerRay controllerRay) + public override void OnInteractDown(ControllerRay controllerRay) { // Not used } - public override void OnInteractUp(InteractionContext context, ControllerRay controllerRay) + public override void OnInteractUp(ControllerRay controllerRay) { if (PlayerSetup.Instance.GetCurrentPropSelectionMode() != PlayerSetup.PropSelectionMode.None) @@ -39,12 +39,12 @@ public class BubbleInteract : Interactable GetComponentInParent().ViewDetailsPage(); } - public override void OnHoverEnter(InteractionContext context, ControllerRay controllerRay) + public override void OnHoverEnter() { // Not used } - public override void OnHoverExit(InteractionContext context, ControllerRay controllerRay) + public override void OnHoverExit() { // Not used } diff --git a/ShareBubbles/ShareBubbles/UI/ReturnOnRelease.cs b/ShareBubbles/ShareBubbles/UI/ReturnOnRelease.cs index b6e1eda..9c2416c 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(InteractionContext _) + public void OnPickupGrabbed() { isReturning = false; } - public void OnPickupRelease(InteractionContext _) + public void OnPickupRelease() { isReturning = true; } diff --git a/ShareBubbles/format.json b/ShareBubbles/format.json index be28ae9..a17aa7b 100644 --- a/ShareBubbles/format.json +++ b/ShareBubbles/format.json @@ -1,8 +1,8 @@ { - "_id": 244, + "_id": -1, "name": "ShareBubbles", - "modversion": "1.0.4", - "gameversion": "2025r178", + "modversion": "1.0.2", + "gameversion": "2024r177", "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/r45/ShareBubbles.dll", + "downloadlink": "https://github.com/NotAKidoS/NAK_CVR_Mods/releases/download/r43/ShareBubbles.dll", "sourcelink": "https://github.com/NotAKidoS/NAK_CVR_Mods/tree/main/ShareBubbles/", - "changelog": "- Fixes for 2025r178", + "changelog": "- Initial release.", "embedcolor": "#f61963" } \ No newline at end of file diff --git a/MutualMute/Main.cs b/TwoWayMute/Main.cs similarity index 84% rename from MutualMute/Main.cs rename to TwoWayMute/Main.cs index d02924b..8d6de3e 100644 --- a/MutualMute/Main.cs +++ b/TwoWayMute/Main.cs @@ -3,16 +3,16 @@ using ABI_RC.Systems.Communications.Audio.Components; using HarmonyLib; using MelonLoader; -namespace NAK.MutualMute; +namespace NAK.TwoWayMute; -public class MutualMuteMod : MelonMod +public class TwoWayMuteMod : MelonMod { public override void OnInitializeMelon() { HarmonyInstance.Patch( typeof(Comms_ParticipantPipeline).GetMethod(nameof(Comms_ParticipantPipeline.SetFlowControlState), BindingFlags.NonPublic | BindingFlags.Instance), - prefix: new HarmonyMethod(typeof(MutualMuteMod).GetMethod(nameof(OnSetFlowControlState), + prefix: new HarmonyMethod(typeof(TwoWayMuteMod).GetMethod(nameof(OnSetFlowControlState), BindingFlags.NonPublic | BindingFlags.Static)) ); } diff --git a/MutualMute/Properties/AssemblyInfo.cs b/TwoWayMute/Properties/AssemblyInfo.cs similarity index 74% rename from MutualMute/Properties/AssemblyInfo.cs rename to TwoWayMute/Properties/AssemblyInfo.cs index 6db6d18..0c53769 100644 --- a/MutualMute/Properties/AssemblyInfo.cs +++ b/TwoWayMute/Properties/AssemblyInfo.cs @@ -1,20 +1,20 @@ -using NAK.MutualMute.Properties; +using NAK.TwoWayMute.Properties; using MelonLoader; using System.Reflection; [assembly: AssemblyVersion(AssemblyInfoParams.Version)] [assembly: AssemblyFileVersion(AssemblyInfoParams.Version)] [assembly: AssemblyInformationalVersion(AssemblyInfoParams.Version)] -[assembly: AssemblyTitle(nameof(NAK.MutualMute))] +[assembly: AssemblyTitle(nameof(NAK.TwoWayMute))] [assembly: AssemblyCompany(AssemblyInfoParams.Author)] -[assembly: AssemblyProduct(nameof(NAK.MutualMute))] +[assembly: AssemblyProduct(nameof(NAK.TwoWayMute))] [assembly: MelonInfo( - typeof(NAK.MutualMute.MutualMuteMod), - nameof(NAK.MutualMute), + typeof(NAK.TwoWayMute.TwoWayMuteMod), + nameof(NAK.TwoWayMute), AssemblyInfoParams.Version, AssemblyInfoParams.Author, - downloadLink: "https://github.com/NotAKidoS/NAK_CVR_Mods/tree/main/MutualMute" + downloadLink: "https://github.com/NotAKidoS/NAK_CVR_Mods/tree/main/TwoWayMute" )] [assembly: MelonGame("Alpha Blend Interactive", "ChilloutVR")] @@ -24,9 +24,9 @@ using System.Reflection; [assembly: MelonAuthorColor(255, 158, 21, 32)] // red [assembly: HarmonyDontPatchAll] -namespace NAK.MutualMute.Properties; +namespace NAK.TwoWayMute.Properties; internal static class AssemblyInfoParams { - public const string Version = "1.0.1"; + public const string Version = "1.0.0"; public const string Author = "NotAKidoS"; } \ No newline at end of file diff --git a/MutualMute/README.md b/TwoWayMute/README.md similarity index 84% rename from MutualMute/README.md rename to TwoWayMute/README.md index 599d292..560a022 100644 --- a/MutualMute/README.md +++ b/TwoWayMute/README.md @@ -1,11 +1,9 @@ -# MutualMute +# TwoWayMute 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/MutualMute/MutualMute.csproj b/TwoWayMute/TwoWayMute.csproj similarity index 86% rename from MutualMute/MutualMute.csproj rename to TwoWayMute/TwoWayMute.csproj index 267718d..4e44ed3 100644 --- a/MutualMute/MutualMute.csproj +++ b/TwoWayMute/TwoWayMute.csproj @@ -2,7 +2,6 @@ net48 - TwoWayMute diff --git a/MutualMute/format.json b/TwoWayMute/format.json similarity index 55% rename from MutualMute/format.json rename to TwoWayMute/format.json index e815ba1..a2ed4f6 100644 --- a/MutualMute/format.json +++ b/TwoWayMute/format.json @@ -1,12 +1,12 @@ { - "_id": 246, - "name": "MutualMute", - "modversion": "1.0.1", - "gameversion": "2025r178", + "_id": -1, + "name": "TwoWayMute", + "modversion": "1.0.0", + "gameversion": "2024r177", "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.\n-# This will work even of the other user does not have the mod installed, as it modifies the BBC Flow Control system.", + "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.", "searchtags": [ "mute", "communication", @@ -16,8 +16,8 @@ "requirements": [ "None" ], - "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", + "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", "embedcolor": "#f61963" } \ No newline at end of file diff --git a/copy_and_nstrip_dll.ps1 b/copy_and_nstrip_dll.ps1 index 0f2c7f3..aa4cb97 100644 --- a/copy_and_nstrip_dll.ps1 +++ b/copy_and_nstrip_dll.ps1 @@ -35,10 +35,6 @@ 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 } } @@ -143,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() @@ -160,10 +156,6 @@ 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 } } @@ -177,6 +169,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()