Merge branch 'master' into master

Author: Goobwabber

MultiplayerExtensions/Assets/IconMeta64.png

@@ -100,16 +100,23 @@ private void HandleMpexData(IConnectedPlayer player, MpexPlayerData data)
 
         private void SetPlatformData(MpPlayerData data)
         {
+            Sprite icon = null;
             switch (data.Platform)
             {
                 case Platform.Steam:
-                    SetIcon(PlayerIconSlot.Platform, _spriteManager.IconSteam64);
+                    icon = _spriteManager.IconSteam64;
                     break;
                 case Platform.OculusQuest:
+                    icon = _spriteManager.IconMeta64;
+                    break;
                 case Platform.OculusPC:
-                    SetIcon(PlayerIconSlot.Platform, _spriteManager.IconOculus64);
+                    icon = _spriteManager.IconOculus64;
+                    break;
+                default:
+                    icon = _spriteManager.IconToaster64;
                     break;
             }
+            SetIcon(PlayerIconSlot.Platform, icon);
         }
 
         private void SetIcon(PlayerIconSlot slot, Sprite sprite)

MultiplayerExtensions/Assets/IconToaster64.png

@@ -178,8 +178,12 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Assets\IconMeta64.png" />
+    <EmbeddedResource Include="Assets\IconToaster64.png" />
     <EmbeddedResource Include="manifest.json" />
+    <None Remove="Assets\IconMeta64.png" />
     <None Remove="Assets\IconSteam64.png" />
+    <None Remove="Assets\IconToaster64.png" />
     <None Remove="UI\MpexEnvironmentViewController.bsml" />
     <None Remove="UI\MpexGameplaySetup.bsml" />
     <None Remove="UI\MpexMiscViewController.bsml" />
@@ -205,7 +209,7 @@
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
-    <ItemGroup>
+  <ItemGroup>
     <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.1" PrivateAssets="all" />
     <!-- Publicize directly when referencing -->
     <Reference Include="$(BeatSaberDir)\Plugins\MultiplayerCore.dll" Publicize="true" />

MultiplayerExtensions/Environment/MpexAvatarNameTag.cs

@@ -1,15 +1,18 @@
 using SiraUtil.Logging;
 using System;
 using System.Reflection;
+using System.Security.Policy;
 using UnityEngine;
 using Zenject;
 
 namespace MultiplayerExtensions.Utilities
 {
-    public class SpriteManager : IInitializable
+    public class SpriteManager : IInitializable, IDisposable
     {
         public Sprite IconOculus64 { get; private set; } = null!;
         public Sprite IconSteam64 { get; private set; } = null!;
+        public Sprite IconMeta64 { get; private set; } = null!;
+        public Sprite IconToaster64 { get; private set; } = null!;
 
         private readonly SiraLog _logger;
 
@@ -23,6 +26,20 @@ public void Initialize()
         {
             IconOculus64 = GetSpriteFromResources("MultiplayerExtensions.Assets.IconOculus64.png");
             IconSteam64 = GetSpriteFromResources("MultiplayerExtensions.Assets.IconSteam64.png");
+            IconMeta64 = GetSpriteFromResources("MultiplayerExtensions.Assets.IconMeta64.png");
+            IconToaster64 = GetSpriteFromResources("MultiplayerExtensions.Assets.IconToaster64.png");
+        }
+
+        public void Dispose()
+        {
+            if (IconOculus64 != null) Sprite.Destroy(IconOculus64);
+            IconOculus64 = null;
+            if (IconSteam64 != null) Sprite.Destroy(IconSteam64);
+            IconSteam64 = null;
+            if (IconMeta64 != null) Sprite.Destroy(IconMeta64);
+            IconMeta64 = null;
+            if (IconToaster64 != null) Sprite.Destroy(IconToaster64);
+            IconToaster64 = null;
         }
 
         private Sprite GetSpriteFromResources(string resourcePath, float pixelsPerUnit = 10.0f)