diff --git a/NewHorizons/OtherMods/CommonCameraUtility/CommonCameraHandler.cs b/NewHorizons/OtherMods/CommonCameraUtility/CommonCameraHandler.cs deleted file mode 100644 index 2aab1526..00000000 --- a/NewHorizons/OtherMods/CommonCameraUtility/CommonCameraHandler.cs +++ /dev/null @@ -1,16 +0,0 @@ -using NewHorizons.OtherMods.MenuFramework; - -namespace NewHorizons.OtherMods.CommonCameraUtility -{ - public static class CommonCameraHandler - { - private static ICommonCameraAPI _cameraAPI; - - static CommonCameraHandler() - { - _cameraAPI = Main.Instance.ModHelper.Interaction.TryGetModApi("xen.CommonCameraUtility"); - } - - public static void RegisterCustomCamera(OWCamera camera) => _cameraAPI.RegisterCustomCamera(camera); - } -} diff --git a/NewHorizons/OtherMods/CommonCameraUtility/ICommonCameraAPI.cs b/NewHorizons/OtherMods/CommonCameraUtility/ICommonCameraAPI.cs deleted file mode 100644 index bd49375b..00000000 --- a/NewHorizons/OtherMods/CommonCameraUtility/ICommonCameraAPI.cs +++ /dev/null @@ -1,13 +0,0 @@ -using UnityEngine; -using UnityEngine.Events; - -namespace NewHorizons.OtherMods.CommonCameraUtility -{ - public interface ICommonCameraAPI - { - void RegisterCustomCamera(OWCamera OWCamera); - (OWCamera, Camera) CreateCustomCamera(string name); - UnityEvent EquipTool(); - UnityEvent UnequipTool(); - } -} diff --git a/NewHorizons/Patches/CameraPatches/NomaiRemoteCameraPatches.cs b/NewHorizons/Patches/CameraPatches/NomaiRemoteCameraPatches.cs deleted file mode 100644 index 29719c0e..00000000 --- a/NewHorizons/Patches/CameraPatches/NomaiRemoteCameraPatches.cs +++ /dev/null @@ -1,24 +0,0 @@ -using HarmonyLib; -using NewHorizons.OtherMods.CommonCameraUtility; -using UnityEngine; - -namespace NewHorizons.Patches.CameraPatches -{ - [HarmonyPatch] - public static class NomaiRemoteCameraPatches - { - [HarmonyPostfix] - [HarmonyPatch(typeof(NomaiRemoteCamera), nameof(NomaiRemoteCamera.Awake))] - public static void NomaiRemoteCamera_Awake(NomaiRemoteCamera __instance) - { - // Ensures that if the player is visible from the remote camera they look normal - CommonCameraHandler.RegisterCustomCamera(__instance._camera); - - // These layers were left on because it doesnt come up in base game (Dreamworld is inactive, player is far away) - __instance._camera.mainCamera.cullingMask &= ~(1 << LayerMask.NameToLayer("DreamSimulation")); - __instance._camera.mainCamera.cullingMask &= ~(1 <