SHA256
forked from ADOFAIEditorForum/ADOFAIRenderer
Improve Code Consistency Between RenderMod and RenderManager
This commit is contained in:
1 parent
d4b9e4b89c
commit
ddd0cc1d39
18 files changed
+225
-269
No files matched your search
@@ -1,4 +1,5 @@
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using ADOFAIRenderer.Component;
|
||||
using HarmonyLib;
|
||||
|
||||
namespace ADOFAIRenderer.Patch.ClassPatch
|
||||
@@ -12,7 +13,7 @@ namespace ADOFAIRenderer.Patch.ClassPatch
|
||||
[SuppressMessage("ReSharper", "InconsistentNaming")]
|
||||
public static bool PrefixShow(EndscreenLanterns __instance, ref int __result)
|
||||
{
|
||||
if (!RenderMod.IsRendering) return true;
|
||||
if (!RenderManager.IsActive) return true;
|
||||
if (__instance != null)
|
||||
{
|
||||
__instance.Hide();
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
using ADOFAIRenderer.Component;
|
||||
using HarmonyLib;
|
||||
|
||||
namespace ADOFAIRenderer.Patch.ClassPatch
|
||||
@@ -8,7 +9,7 @@ namespace ADOFAIRenderer.Patch.ClassPatch
|
||||
// ReSharper disable once InconsistentNaming
|
||||
public static void Postfix(ref SkipIntroBehavior __result)
|
||||
{
|
||||
if (RenderMod.IsRendering &&
|
||||
if (RenderManager.IsActive &&
|
||||
scrConductor.instance != null &&
|
||||
!scrConductor.instance.hasSongStarted)
|
||||
{
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
using ADOFAIRenderer.Component;
|
||||
using HarmonyLib;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
@@ -22,7 +23,7 @@ namespace ADOFAIRenderer.Patch.ClassPatch
|
||||
var button = buttonObj.GetComponent<Button>()!;
|
||||
// Clear persistent and non-persistent listeners from the original button
|
||||
button.onClick = new Button.ButtonClickedEvent();
|
||||
button.onClick.AddListener(RenderMod.StartRender);
|
||||
button.onClick.AddListener(RenderManager.StartRender);
|
||||
|
||||
// The button root has an Image component for the background (rounded box).
|
||||
// We want to change the icon sprite, which is on a child GameObject.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
using ADOFAIRenderer.Component;
|
||||
using HarmonyLib;
|
||||
using MelonLoader;
|
||||
|
||||
namespace ADOFAIRenderer.Patch.ClassPatch
|
||||
{
|
||||
@@ -11,35 +11,35 @@ namespace ADOFAIRenderer.Patch.ClassPatch
|
||||
[HarmonyPatch("TogglePauseGame")]
|
||||
public static bool PreventPause()
|
||||
{
|
||||
return !RenderMod.IsRendering;
|
||||
return !RenderManager.IsActive;
|
||||
}
|
||||
|
||||
[HarmonyPrefix]
|
||||
[HarmonyPatch("PortalTravelAction")]
|
||||
public static bool PreventPortalTravel()
|
||||
{
|
||||
return !RenderMod.IsRendering;
|
||||
return !RenderManager.IsActive;
|
||||
}
|
||||
|
||||
[HarmonyPrefix]
|
||||
[HarmonyPatch("FailAction")]
|
||||
public static bool PreventFailAction()
|
||||
{
|
||||
return !RenderMod.IsRendering;
|
||||
return !RenderManager.IsActive;
|
||||
}
|
||||
|
||||
[HarmonyPrefix]
|
||||
[HarmonyPatch("Fail2Action")]
|
||||
public static bool PreventFail2Action()
|
||||
{
|
||||
return !RenderMod.IsRendering;
|
||||
return !RenderManager.IsActive;
|
||||
}
|
||||
|
||||
[HarmonyPrefix]
|
||||
[HarmonyPatch("OnPlayerDied")]
|
||||
public static bool PreventPlayerDied()
|
||||
{
|
||||
return !RenderMod.IsRendering;
|
||||
return !RenderManager.IsActive;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,3 +1,4 @@
|
||||
using ADOFAIRenderer.Component;
|
||||
using HarmonyLib;
|
||||
|
||||
namespace ADOFAIRenderer.Patch.ClassPatch
|
||||
@@ -10,7 +11,7 @@ namespace ADOFAIRenderer.Patch.ClassPatch
|
||||
[HarmonyPatch("SaveCustom")]
|
||||
public static bool PreventSaveCustom()
|
||||
{
|
||||
return !RenderMod.IsRendering;
|
||||
return !RenderManager.IsActive;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -12,7 +12,7 @@ namespace ADOFAIRenderer.Patch.ClassPatch
|
||||
// ReSharper disable once InconsistentNaming
|
||||
private static bool IgnoreInput(ref bool __result)
|
||||
{
|
||||
if (!RenderMod.IsRendering) return true;
|
||||
if (!RenderManager.IsActive) return true;
|
||||
|
||||
__result = RenderManager.Instance && RenderManager.Instance.frameCount == 0 && RenderManager.Instance.countdown == 0;
|
||||
return false;
|
||||
|
||||
@@ -15,7 +15,7 @@ namespace ADOFAIRenderer.Patch.ClassPatch
|
||||
[SuppressMessage("ReSharper", "InconsistentNaming")]
|
||||
private static void IgnoreInput(Text ___txt, Color ___defaultColor)
|
||||
{
|
||||
if (!RenderMod.IsRendering) return;
|
||||
if (!RenderManager.IsActive) return;
|
||||
|
||||
___txt.text = "Render";
|
||||
if (RenderManager.Instance)
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
using ADOFAIRenderer.Component;
|
||||
using HarmonyLib;
|
||||
|
||||
namespace ADOFAIRenderer.Patch.ClassPatch
|
||||
@@ -11,7 +12,7 @@ namespace ADOFAIRenderer.Patch.ClassPatch
|
||||
// ReSharper disable once InconsistentNaming
|
||||
public static void PreventEndscreenLanternsPostfix(scrUIController __instance)
|
||||
{
|
||||
if (RenderMod.IsRendering && __instance != null)
|
||||
if (RenderManager.IsActive && __instance != null)
|
||||
{
|
||||
__instance.HideEndscreenLanterns();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user