From b67207555fd4ab0efd7e83e9e35ea1a15bfac550 Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Wed, 8 Jun 2022 13:38:04 -0700 Subject: [PATCH] use annotation instead of yucky manual way --- NewHorizons/Main.cs | 5 +---- NewHorizons/Patches/LocatorPatches.cs | 6 ++++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/NewHorizons/Main.cs b/NewHorizons/Main.cs index 852686b5..49c6690f 100644 --- a/NewHorizons/Main.cs +++ b/NewHorizons/Main.cs @@ -116,10 +116,7 @@ namespace NewHorizons public void Start() { // Patches - Harmony harmony = Harmony.CreateAndPatchAll(Assembly.GetExecutingAssembly()); - harmony.Patch(typeof(CloakFieldController).GetMethod("get_" + nameof(CloakFieldController.isPlayerInsideCloak), BindingFlags.Public | BindingFlags.Instance), postfix: new HarmonyMethod(typeof(Patches.LocatorPatches).GetMethod(nameof(Patches.LocatorPatches.CloakFieldController_isPlayerInsideCloak), BindingFlags.Static | BindingFlags.Public))); - harmony.Patch(typeof(CloakFieldController).GetMethod("get_" + nameof(CloakFieldController.isProbeInsideCloak), BindingFlags.Public | BindingFlags.Instance), postfix: new HarmonyMethod(typeof(Patches.LocatorPatches).GetMethod(nameof(Patches.LocatorPatches.CloakFieldController_isProbeInsideCloak), BindingFlags.Static | BindingFlags.Public))); - harmony.Patch(typeof(CloakFieldController).GetMethod("get_" + nameof(CloakFieldController.isShipInsideCloak), BindingFlags.Public | BindingFlags.Instance), postfix: new HarmonyMethod(typeof(Patches.LocatorPatches).GetMethod(nameof(Patches.LocatorPatches.CloakFieldController_isShipInsideCloak), BindingFlags.Static | BindingFlags.Public))); + Harmony.CreateAndPatchAll(Assembly.GetExecutingAssembly()); OnChangeStarSystem = new StarSystemEvent(); OnStarSystemLoaded = new StarSystemEvent(); diff --git a/NewHorizons/Patches/LocatorPatches.cs b/NewHorizons/Patches/LocatorPatches.cs index e826ba06..30c76cf2 100644 --- a/NewHorizons/Patches/LocatorPatches.cs +++ b/NewHorizons/Patches/LocatorPatches.cs @@ -11,16 +11,22 @@ namespace NewHorizons.Patches return Locator._cloakFieldController == null; } + [HarmonyPostfix] + [HarmonyPatch(typeof(CloakFieldController), nameof(CloakFieldController.isPlayerInsideCloak), MethodType.Getter)] public static void CloakFieldController_isPlayerInsideCloak(CloakFieldController __instance, ref bool __result) { __result = __result || Components.CloakSectorController.isPlayerInside; } + [HarmonyPostfix] + [HarmonyPatch(typeof(CloakFieldController), nameof(CloakFieldController.isProbeInsideCloak), MethodType.Getter)] public static void CloakFieldController_isProbeInsideCloak(CloakFieldController __instance, ref bool __result) { __result = __result || Components.CloakSectorController.isProbeInside; } + [HarmonyPostfix] + [HarmonyPatch(typeof(CloakFieldController), nameof(CloakFieldController.isShipInsideCloak), MethodType.Getter)] public static void CloakFieldController_isShipInsideCloak(CloakFieldController __instance, ref bool __result) { __result = __result || Components.CloakSectorController.isShipInside;