Fix issue with exception being thrown when selecting avatar

.gitignore

@@ -1,4 +1,5 @@
 /Output
 obj/
 .idea
-ModJsons/
+ModJsons/
+packages/

ActionMenuUtils/ActionMenuUtils.csproj

@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net472</TargetFramework>
         <VrcReferences>true</VrcReferences>
-        <Version>2.0.0.0</Version>
+        <Version>2.0.1.0</Version>
         <LangVersion>9</LangVersion>
         <CopyToMods>true</CopyToMods>
         <GenerateJson>true</GenerateJson>

ActionMenuUtils/Main.cs

@@ -11,7 +11,7 @@
 using Main = ActionMenuUtils.Main;
 
 [assembly: MelonGame("VRChat", "VRChat")]
-[assembly: MelonInfo(typeof(Main), "ActionMenuUtils", "2.0.0", "gompo", "https://github.com/gompoc/VRChatMods/releases/")]
+[assembly: MelonInfo(typeof(Main), "ActionMenuUtils", "2.0.1", "gompo", "https://github.com/gompoc/VRChatMods/releases/")]
 [assembly: VerifyLoaderVersion(0, 4, 3, true)]
 [assembly: ModJsonInfo(
         140, 
@@ -71,14 +71,14 @@ public override void OnApplicationStart()
             SetupAMAPIButtons();
             SetupUIXButtons();
         }
-
+        
         private static void SetupUIXButtons()
         {
             ExpansionKitApi.GetExpandedMenu(ExpandedMenu.AvatarMenu).AddSimpleButton("Set as reset avatar for ActionMenuUtils", 
                 () =>
                 {
                     var avatarId = GameObject.Find("UserInterface/MenuContent/Screens/Avatar/AvatarPreviewBase/MainRoot/MainModel").GetComponent<SimpleAvatarPedestal>().field_Internal_ApiAvatar_0.id;
-                    var fallbackAvatarId =GameObject.Find("UserInterface/MenuContent/Screens/Avatar/AvatarPreviewBase/FallbackRoot/FallbackModel").GetComponent<SimpleAvatarPedestal>().field_Internal_ApiAvatar_0.id;
+                    var fallbackAvatarId = GameObject.Find("UserInterface/MenuContent/Screens/Avatar/AvatarPreviewBase/FallbackRoot/FallbackModel").GetComponent<SimpleAvatarPedestal>().field_Internal_ApiAvatar_0?.id;
                     ModSettings.customAvatarId = avatarId;
                     ModSettings.fallbackAvatarId = fallbackAvatarId;
                     ModSettings.Save();

ActionMenuUtils/ModSettings.cs

@@ -51,7 +51,7 @@ public static void Apply()
             customAvatarId = CustomAvatarId.Value;
             fallbackAvatarId = FallbackAvatarId.Value;
 
-            if(Main.UIXAvatarMenuButton is {}) 
+            if(Main.UIXAvatarMenuButton is not null) 
                 Main.UIXAvatarMenuButton.active = enableCustomAvatarReset;
         }
 

ActionMenuUtils/Utils.cs

@@ -67,16 +67,25 @@ public static void ResetAvatar()
             //TODO: Pick your own avatar for reset
             if (ModSettings.enableCustomAvatarReset)
             {
-                if (!IsValidAvatarId(ModSettings.customAvatarId) || !IsValidAvatarId(ModSettings.fallbackAvatarId))
+                ApiAvatar avatar = null;
+                ApiAvatar fallbackAvatar = null;
+
+                if (IsValidAvatarId(ModSettings.customAvatarId))
+                {
+                    avatar = API.Fetch<ApiAvatar>(ModSettings.customAvatarId);
+                }
+                else
                 {
                     SwitchToRobot(true);
                     return;
                 }
 
-                var avatar = API.Fetch<ApiAvatar>(ModSettings.customAvatarId);
-                var fallbackAvatar = API.Fetch<ApiAvatar>(ModSettings.fallbackAvatarId);
+                if (IsValidAvatarId(ModSettings.fallbackAvatarId))
+                {
+                    fallbackAvatar = API.Fetch<ApiAvatar>(ModSettings.fallbackAvatarId);
+                }
 
-                if (avatar is null || fallbackAvatar is null)
+                if (avatar is null)
                 {
                     SwitchToRobot();
                     return;
@@ -90,11 +99,11 @@ public static void ResetAvatar()
             }
         }
 
-        private static void SwitchToRobot(bool valuesWereNull = false)
+        private static void SwitchToRobot(bool invalidId = false)
         {
             if (ModSettings.enableCustomAvatarReset)
             {
-                MelonLogger.Warning(valuesWereNull
+                MelonLogger.Warning(invalidId
                     ? "Couldn't switch to selected custom avatar. Make sure to select one first using the uix button on the left of the avatar page."
                     : "Couldn't switch to selected custom avatar. This likely means that the avatar you had selected before is no longer available.");
             }

CHANGELOG.md

@@ -1,3 +1,6 @@
+### ActionMenuUtils v2.0.1
+- Fixed exception being thrown when selecting an avatar
+
 ### ActionMenuUtils v2.0.0
 - Mod now depends on ActionMenuApi & UIExpansionKit, this just makes maintaining it easier for me when/if something breaks
 - New setting added that you can enable so you can now select which avatar you want to reset into. You can select avatar by going to the AvatarMenu and clicking the UIExpansionKit button on the left

RELEASE.md

@@ -1,8 +1,2 @@
-### ActionMenuUtils v2.0.0
-- Mod now depends on ActionMenuApi & UIExpansionKit, this just makes maintaining it easier for me when/if something breaks
-- New setting added that you can enable so you can now select which avatar you want to reset into. You can select avatar by going to the AvatarMenu and clicking the UIExpansionKit button on the left
-
-### StandaloneThirdPerson v1.3.0
-- Fixed issue with mod not showing when not launching through steam (--no-vr)
-- Added secondary keybinds for third person toggle and freeform toggle, you can leave these as `None` or set them to `LeftControl` for example
-- Added a setting to enable/disable freeform
+### ActionMenuUtils v2.0.1
+- Fixed exception being thrown when selecting an avatar

StandaloneThirdPerson/Main.cs

@@ -8,7 +8,7 @@
 using Main = StandaloneThirdPerson.Main;
 
 [assembly: MelonGame("VRChat", "VRChat")]
-[assembly: MelonInfo(typeof(Main), "StandaloneThirdPerson", "1.3.0", "gompo & ljoonal", "https://github.com/gompoc/VRChatMods/releases/")]
+[assembly: MelonInfo(typeof(Main), "StandaloneThirdPerson", "1.3.1", "gompo & ljoonal", "https://github.com/gompoc/VRChatMods/releases/")]
 [assembly: ModJsonInfo(
         242, 
     "A simple standalone third person mod\n" +

StandaloneThirdPerson/StandaloneThirdPerson.csproj

@@ -2,7 +2,7 @@
     <PropertyGroup>
         <TargetFramework>net472</TargetFramework>
         <VrcReferences>true</VrcReferences>
-        <Version>1.3.0.0</Version>
+        <Version>1.3.1.0</Version>
         <LangVersion>9</LangVersion>
         <CopyToMods>true</CopyToMods>
         <GenerateJson>true</GenerateJson>

StandaloneThirdPerson/Utils.cs

@@ -7,7 +7,8 @@
 
 namespace StandaloneThirdPerson
 {
-    public static class Utils
+    [PatchShield]
+    internal static class Utils
     {
         public static bool IsBigMenuOpen()
         {