From 30dad769dea747cfaf901a1f005817ad60e3d116 Mon Sep 17 00:00:00 2001 From: pdcook Date: Sun, 12 Jun 2022 11:23:23 -0400 Subject: [PATCH] BUG: revert breaking changes from #76 --- UnboundLib/Networking/PingMonitor.cs | 3 ++- UnboundLib/Utils/MonoBehaviourExtensions.cs | 2 +- UnboundLib/Utils/UI/InfoPopup.cs | 2 +- UnboundLib/Utils/UI/ModalHandler.cs | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/UnboundLib/Networking/PingMonitor.cs b/UnboundLib/Networking/PingMonitor.cs index 4610f37..891c83e 100644 --- a/UnboundLib/Networking/PingMonitor.cs +++ b/UnboundLib/Networking/PingMonitor.cs @@ -3,9 +3,10 @@ using System; using System.Collections.Generic; using System.Linq; +using UnboundLib.Networking; using UnityEngine; -namespace UnboundLib.Networking +namespace UnboundLib { [DisallowMultipleComponent] public class PingMonitor : MonoBehaviourPunCallbacks diff --git a/UnboundLib/Utils/MonoBehaviourExtensions.cs b/UnboundLib/Utils/MonoBehaviourExtensions.cs index 38bd8fe..cdd75d8 100644 --- a/UnboundLib/Utils/MonoBehaviourExtensions.cs +++ b/UnboundLib/Utils/MonoBehaviourExtensions.cs @@ -7,7 +7,7 @@ using UnboundLib.Networking; using UnityEngine; -namespace UnboundLib.Utils +namespace UnboundLib { // stolen from RWF public static class MonoBehaviourExtensions diff --git a/UnboundLib/Utils/UI/InfoPopup.cs b/UnboundLib/Utils/UI/InfoPopup.cs index ad8ecdd..28f2d7f 100644 --- a/UnboundLib/Utils/UI/InfoPopup.cs +++ b/UnboundLib/Utils/UI/InfoPopup.cs @@ -2,7 +2,7 @@ using UnityEngine; using UnityEngine.UI; -namespace UnboundLib.Utils.UI +namespace UnboundLib { [RequireComponent(typeof(VerticalLayoutGroup), typeof(ContentSizeFitter), typeof(CanvasGroup))] public class InfoPopup : Image diff --git a/UnboundLib/Utils/UI/ModalHandler.cs b/UnboundLib/Utils/UI/ModalHandler.cs index 25797ff..c3998e3 100644 --- a/UnboundLib/Utils/UI/ModalHandler.cs +++ b/UnboundLib/Utils/UI/ModalHandler.cs @@ -3,7 +3,7 @@ using UnityEngine.Events; using UnityEngine.UI; -namespace UnboundLib.Utils.UI +namespace UnboundLib { public class ModalHandler : MonoBehaviour {