v1.0.7

Author: nitrog0d

Buttons/SingleButton.cs

@@ -4,6 +4,11 @@
 using DesktopCamera.Utils;
 
 namespace DesktopCamera.Buttons {
+
+    // Based on https://github.com/DubyaDude/RubyButtonAPI
+    // Thanks DubyaDude and Emilia (yoshifan#9550) <3
+    // I promise that one day I'll actually use the repo above, I just don't feel like rewriting the buttons codes in Main.cs right now :c
+
     class SingleButton {
 
         public Transform button;

DesktopCamera.csproj

@@ -96,6 +96,10 @@
     <Reference Include="UnityEngine.Networking">
       <HintPath>D:\SteamLibrary\steamapps\common\VRChat\MelonLoader\Managed\UnityEngine.Networking.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEngine.PhysicsModule, Version=3.7.1.6, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>D:\SteamLibrary\steamapps\common\VRChat\MelonLoader\Managed\UnityEngine.PhysicsModule.dll</HintPath>
+    </Reference>
     <Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\SteamLibrary\steamapps\common\VRChat\MelonLoader\Managed\UnityEngine.UI.dll</HintPath>

Main.cs

@@ -17,7 +17,7 @@ public static class ModBuildInfo {
         public const string Name = "DesktopCamera";
         public const string Author = "nitro.";
         public const string Company = null;
-        public const string Version = "1.0.6";
+        public const string Version = "1.0.7";
         public const string DownloadLink = "https://github.com/nitrog0d/DesktopCamera/releases/latest/download/DesktopCamera.dll";
         public const string GameDeveloper = "VRChat";
         public const string Game = "VRChat";
@@ -46,6 +46,8 @@ private IEnumerator Setup() {
             request.downloadHandler = new DownloadHandlerBuffer();
             request.SetRequestHeader("Content-Type", "application/json");
 
+            //yield return request.SendWebRequest();
+
             var asyncOperation = request.SendWebRequest();
 
             // yield return doesn't work for now, so I had to change it to this.
@@ -85,6 +87,19 @@ private IEnumerator Setup() {
             var screenshotButton = cameraMenu.Find("Screenshot");
             screenshotButton.localPosition = SingleButton.getButtonPositionFor(4, 1);
 
+            // Thank you Janni9009#1751 <3
+            quickMenu.GetComponent<BoxCollider>().size += new Vector3(0f, 840f, 0f);
+
+            var photoModeButton = cameraMenu.Find("PhotoMode");
+            photoModeButton.localPosition = SingleButton.getButtonPositionFor(0, 3);
+
+            var videoModeButton = cameraMenu.Find("VideoMode");
+            videoModeButton.localPosition = SingleButton.getButtonPositionFor(1, 3);
+
+            var disableCameraButton = cameraMenu.Find("DisableCamera");
+            disableCameraButton.localPosition = SingleButton.getButtonPositionFor(2, 3);
+
+
             var cameraButton = new SingleButton("Camera", "Camera\n<color=red>Off</color>", "Toggles the Camera", 0, 0, cameraMenu);
             cameraButton.setAction((Action)(() => {
                 Settings.cameraEnabled = !Settings.cameraEnabled;
@@ -164,8 +179,8 @@ private IEnumerator Setup() {
                             break;
                     }
                     switchPinButton.setText("Cycle Pin\n<color=#845bff>" + pin + "</color>");
-                    // Eventually change this to the same way I do the other buttons
-                    VRCUtils.GetUserCameraController().Method_Public_Void_Int32_0(newPin);
+                    // Eventually change this to the same way I do the other buttons, I suppose it changes every VRChat update so yeah as soon as possible please Lucas...
+                    VRCUtils.GetUserCameraController().Method_Public_Void_Int32_3(newPin);
                 }
             }));
 
@@ -278,8 +293,8 @@ private IEnumerator Setup() {
                 var button = new SingleButton("Filter" + filter.Value, filter.Key, "Sets the filter to " + filter.Key.Replace("\n", " "), position, row, filtersMenu);
                 button.setAction((Action)(() => {
                     if (Settings.cameraEnabled) {
-                        // Eventually change this to the same way I do the other buttons
-                        VRCUtils.GetUserCameraController().Method_Public_Void_Int32_1(filter.Value);
+                        // Eventually change this to the same way I do the other buttons, I suppose it changes every VRChat update so yeah as soon as possible please Lucas...
+                        VRCUtils.GetUserCameraController().Method_Public_Void_Int32_0(filter.Value);
                     }
                 }));
                 position++;
@@ -306,6 +321,11 @@ private IEnumerator Setup() {
         // This is a mess please don't look
         // and also pull request to improve it thx
         public override void OnUpdate() {
+            //if (Input.GetKeyDown(KeyCode.F1)) {
+            //    var quickMenu = VRCUtils.GetQuickMenu();
+            //    var cameraMenu = quickMenu.transform.Find("CameraMenu");
+            //    VRCUtils.ShowQuickMenuPage(quickMenu, cameraMenu);
+            //}
             if (Settings.cameraEnabled && Settings.arrowKeysEnabled) {
                 if (Input.GetKey(KeyCode.LeftArrow)) {
                     if (Settings.moveCamera) {

README.md

@@ -6,7 +6,7 @@ A mod that allows Desktop users use the VRChat Camera feature, yay!
 * **USE IT AT YOUR OWN RISK**, I am not responsible for any bans or any punishments you may get by using this mod!
 
 ## Installation
-* **Make sure you have run the [MelonLoader Auto Installer](https://github.com/Slaynash/MelonLoaderAutoInstaller) by [Slaynash](https://github.com/Slaynash) first.**
+* **Make sure you have run the [MelonLoader Installer](https://github.com/HerpDerpinstine/MelonLoader/releases/latest/download/MelonLoader.Installer.exe) by [HerpDerpinstine](https://github.com/HerpDerpinstine) first (please check [MelonLoader Wiki](https://melonwiki.xyz) for more help!).**
 * Download the [latest version](https://github.com/nitrog0d/DesktopCamera/releases/latest/download/DesktopCamera.dll) of the mod.
 * Drag/copy the DLL file that you have downloaded into the Mods folder.
 * That's it! Now just run the game and the mod should be installed!
@@ -33,5 +33,9 @@ A mod that allows Desktop users use the VRChat Camera feature, yay!
 * The Viewer is the Camera view, if it's not obvious.  
 * **Warning: The Camera Space must be in "World" mode, or else the camera won't move**.
 
-*Brought to you by the VRChat Modding Group.*  
-*Thanks to [Emilia](https://github.com/thetrueyoshifan) (for letting me use the README from [VRCDiscordRichPresence-ML](https://github.com/thetrueyoshifan/VRCDiscordRichPresence-ML)), who helped me and who contributed to MelonLoader!*
+*Thanks to everyone in the VRChat Modding community!*  
+
+*Special thanks to:*  
+*[Emilia](https://github.com/thetrueyoshifan) for letting me use the README from [VRCDiscordRichPresence-ML](https://github.com/thetrueyoshifan/VRCDiscordRichPresence-ML) and helping me with opening new pages in the QuickMenu.*  
+*[DubyaDude](https://github.com/DubyaDude) and [Emilia](https://github.com/thetrueyoshifan) for [RubyButtonAPI](https://github.com/DubyaDude/RubyButtonAPI).*  
+*[Janni9009](https://github.com/Janni9009) for helping me with resizing the QuickMenu Collider.*

Utils/VRCUtils.cs

@@ -11,10 +11,11 @@ namespace DesktopCamera.Utils {
     public static class VRCUtils {
 
         private static FieldInfo currentPageGetter;
+        // Thanks Emilia (yoshifan#9550) <3
         public static void ShowQuickMenuPage(QuickMenu quickMenu, Transform pageTransform, string currentMenu = "ShortcutMenu") {
             if (currentPageGetter == null) {
                 var menu = quickMenu.transform.Find(currentMenu).gameObject;
-                var fis = Il2CppTypeOf<QuickMenu>.Type.GetFields(BindingFlags.NonPublic | BindingFlags.Instance).Where(f => f.FieldType == Il2CppTypeOf<GameObject>.Type).ToArray();
+                var fis = Il2CppType.Of<QuickMenu>().GetFields(BindingFlags.NonPublic | BindingFlags.Instance).Where(f => f.FieldType == Il2CppType.Of<GameObject>()).ToArray();
                 int count = 0;
                 foreach (FieldInfo fi in fis) {
                     var value = fi.GetValue(quickMenu)?.TryCast<GameObject>();
@@ -55,7 +56,6 @@ public static UserCameraController GetUserCameraController() {
         }
 
         public static Player GetPlayer() {
-            // This *probably* needs to be updated every VRChat has an update that changes the code
             return PlayerManager.Method_Public_Static_Player_String_1(APIUser.CurrentUser.id);
         }
 
@@ -64,7 +64,7 @@ public static VRCUiManager GetVRCUiManager() {
         }
 
         public static void QueueHudMessage(string message) {
-            GetVRCUiManager().Method_Public_Void_String_3(message);
+            GetVRCUiManager().Method_Public_Void_String_2(message);
         }
     }
 }