Skip to content

Commit eddfc9d

Browse files
committed
fix: remove warnings about deprecated methods
1 parent 4cd35c9 commit eddfc9d

File tree

9 files changed

+19
-16
lines changed

9 files changed

+19
-16
lines changed

Assets/Scripts/CameraUtils/CameraController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ void Start()
1515

1616
private void AttachCamera()
1717
{
18-
m_MainCamera = GameObject.FindObjectOfType<CinemachineFreeLook>();
18+
m_MainCamera = FindAnyObjectByType<CinemachineFreeLook>();
1919
Assert.IsNotNull(m_MainCamera, "CameraController.AttachCamera: Couldn't find gameplay freelook camera");
2020

2121
if (m_MainCamera)

Assets/Scripts/Gameplay/DebugCheats/DebugCheatsManager.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ SwitchedDoor SwitchedDoor
4040
{
4141
if (m_SwitchedDoor == null)
4242
{
43-
m_SwitchedDoor = FindObjectOfType<SwitchedDoor>();
43+
m_SwitchedDoor = FindAnyObjectByType<SwitchedDoor>();
4444
}
4545
return m_SwitchedDoor;
4646
}
@@ -173,7 +173,7 @@ void ServerKillTargetRpc(RpcParams serverRpcParams = default)
173173
[Rpc(SendTo.Server, RequireOwnership = false)]
174174
void ServerKillAllEnemiesRpc(RpcParams serverRpcParams = default)
175175
{
176-
foreach (var serverCharacter in FindObjectsOfType<ServerCharacter>())
176+
foreach (var serverCharacter in FindObjectsByType<ServerCharacter>(FindObjectsSortMode.None))
177177
{
178178
if (serverCharacter.IsNpc && serverCharacter.LifeState == LifeState.Alive)
179179
{
@@ -268,7 +268,7 @@ void ServerToggleDoorRpc(RpcParams serverRpcParams = default)
268268
[Rpc(SendTo.Server, RequireOwnership = false)]
269269
void ServerTogglePortalsRpc(RpcParams serverRpcParams = default)
270270
{
271-
foreach (var portal in FindObjectsOfType<EnemyPortal>())
271+
foreach (var portal in FindObjectsByType<EnemyPortal>(FindObjectsSortMode.None))
272272
{
273273
if (m_DestroyPortalsOnNextToggle)
274274
{

Assets/Scripts/Gameplay/GameplayObjects/PublishMessageOnLifeChange.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public override void OnNetworkSpawn()
4040
m_NameState = GetComponent<NetworkNameState>();
4141
m_NetworkLifeState.LifeState.OnValueChanged += OnLifeStateChanged;
4242

43-
var gameState = FindObjectOfType<ServerBossRoomState>();
43+
var gameState = FindAnyObjectByType<ServerBossRoomState>();
4444
if (gameState != null)
4545
{
4646
gameState.Container.Inject(this);

Assets/Scripts/Gameplay/UI/UITooltipDetector.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ private void OnValidate()
100100
if (!m_TooltipPopup)
101101
{
102102
// typically there's only one tooltip popup in the scene, so pick that
103-
m_TooltipPopup = FindObjectOfType<UITooltipPopup>();
103+
m_TooltipPopup = FindAnyObjectByType<UITooltipPopup>();
104104
}
105105
}
106106
}

Assets/Scripts/Gameplay/UI/UITooltipPopup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private void OnValidate()
6767
if (!m_Canvas)
6868
{
6969
// typically there's only one canvas in the scene, so pick that
70-
m_Canvas = FindObjectOfType<Canvas>();
70+
m_Canvas = FindAnyObjectByType<Canvas>();
7171
}
7272
}
7373
}

Assets/Tests/Runtime/ConnectionManagementTests.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using UnityEngine.TestTools;
1616
using VContainer;
1717
using VContainer.Unity;
18+
using Object = UnityEngine.Object;
1819

1920
namespace Unity.BossRoom.Tests.Runtime
2021
{
@@ -149,9 +150,9 @@ protected override IEnumerator OnTearDown()
149150
m_ClientScopes[i].Dispose();
150151
}
151152

152-
foreach (var sceneGameObject in GameObject.FindObjectsOfType<GameObject>())
153+
foreach (var sceneGameObject in Object.FindObjectsByType<GameObject>(FindObjectsSortMode.None))
153154
{
154-
GameObject.DestroyImmediate(sceneGameObject);
155+
Object.DestroyImmediate(sceneGameObject);
155156
}
156157

157158
yield return base.OnTearDown();

Assets/Tests/Runtime/HostAndDisconnectTest.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using UnityEngine.SceneManagement;
1010
using UnityEngine.TestTools;
1111
using VContainer;
12+
using Object = UnityEngine.Object;
1213

1314
namespace Unity.BossRoom.Tests.Runtime
1415
{
@@ -81,13 +82,13 @@ IEnumerator WaitUntilBossRoomSceneIsLoaded()
8182
IEnumerator WaitUntilDisconnectedAndMainMenuSceneIsLoaded()
8283
{
8384
// once loaded into BossRoom scene, disconnect
84-
var uiSettingsCanvas = GameObject.FindObjectOfType<UISettingsCanvas>();
85+
var uiSettingsCanvas = Object.FindAnyObjectByType<UISettingsCanvas>();
8586
Assert.That(uiSettingsCanvas != null, $"{nameof(UISettingsCanvas)} component not found!");
8687
uiSettingsCanvas.OnClickQuitButton();
8788

8889
yield return new WaitForFixedUpdate();
8990

90-
var uiQuitPanel = GameObject.FindObjectOfType<UIQuitPanel>(true);
91+
var uiQuitPanel = Object.FindAnyObjectByType<UIQuitPanel>(FindObjectsInactive.Include);
9192
Assert.That(uiQuitPanel != null, $"{nameof(UIQuitPanel)} component not found!");
9293
uiQuitPanel.Quit();
9394

@@ -114,7 +115,7 @@ public IEnumerator IP_HostAndDisconnect_Valid([ValueSource(nameof(s_PlayerIndice
114115
{
115116
yield return WaitUntilMainMenuSceneIsLoaded();
116117

117-
var clientMainMenuState = GameObject.FindObjectOfType<ClientMainMenuState>();
118+
var clientMainMenuState = Object.FindAnyObjectByType<ClientMainMenuState>();
118119

119120
Assert.That(clientMainMenuState != null, $"{nameof(clientMainMenuState)} component not found!");
120121

@@ -156,9 +157,9 @@ public IEnumerator IP_HostAndDisconnect_Valid([ValueSource(nameof(s_PlayerIndice
156157
[UnityTearDown]
157158
public IEnumerator DestroySceneGameObjects()
158159
{
159-
foreach (var sceneGameObject in GameObject.FindObjectsOfType<GameObject>())
160+
foreach (var sceneGameObject in Object.FindObjectsByType<GameObject>(FindObjectsSortMode.None))
160161
{
161-
GameObject.DestroyImmediate(sceneGameObject);
162+
Object.DestroyImmediate(sceneGameObject);
162163
}
163164
yield break;
164165
}

Packages/com.unity.multiplayer.samples.coop/Utilities/EditorChildSceneLoader.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#endif
77
using UnityEngine;
88
using UnityEngine.SceneManagement;
9+
using Object = UnityEngine.Object;
910

1011
/// <summary>
1112
/// Allows setting a scene as a root scene and setting its child scenes. To use this, drag this component on any object in a scene to make that scene a root scene. In the background, ChildSceneLoader will automatically manage this.
@@ -88,7 +89,7 @@ static void OnSceneLoaded(Scene _, OpenSceneMode mode)
8889
{
8990
if (mode != OpenSceneMode.Single || BuildPipeline.isBuildingPlayer) return; // try to load child scenes only for root scenes or if not building
9091

91-
var scenesToLoadObjects = GameObject.FindObjectsOfType<EditorChildSceneLoader>();
92+
var scenesToLoadObjects = Object.FindObjectsByType<EditorChildSceneLoader>(FindObjectsSortMode.None);
9293
if (scenesToLoadObjects.Length > 1)
9394
{
9495
throw new Exception("Should only have one root scene at once loaded");

Packages/com.unity.multiplayer.samples.coop/Utilities/SceneManagement/LoadingProgressManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ void ClientUpdateTrackersRpc()
107107
if (!IsHost)
108108
{
109109
ProgressTrackers.Clear();
110-
foreach (var tracker in FindObjectsOfType<NetworkedLoadingProgressTracker>())
110+
foreach (var tracker in FindObjectsByType<NetworkedLoadingProgressTracker>(FindObjectsSortMode.None))
111111
{
112112
// If a tracker is despawned but not destroyed yet, don't add it
113113
if (tracker.IsSpawned)

0 commit comments

Comments
 (0)