ADOFAIEditorForum/ADOFAIRenderer
SHA256
2
2 Fork 1
Code Issues Pull Requests Actions Packages Projects Releases 13 Wiki Activity

Improve Code Consistency Between RenderMod and RenderManager

Browse Source
This commit is contained in:
copecone committed 2026-05-28 14:27:02 +09:00
1 parent d4b9e4b89c
commit ddd0cc1d39
18 files changed
+225 -269
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Patch/ClassPatch/EndscreenLanternsPatch.cs
+2 -1
View File
@@ -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();
Patch/ClassPatch/PersistencePatch.cs
+2 -1
View File
@@ -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)
{
Patch/ClassPatch/scnEditorPatch.cs
+2 -1
View File
@@ -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.
Patch/ClassPatch/scrControllerPatch.cs
+6 -6
View File
@@ -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;
}
}
}
Patch/ClassPatch/scrMistakesManagerPatch.cs
+2 -1
View File
@@ -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;
}
}
}
Patch/ClassPatch/scrPlayerManagerPatch.cs
+1 -1
View File
@@ -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;
Patch/ClassPatch/scrShowIfDebugPatch.cs
+1 -1
View File
@@ -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)
Patch/ClassPatch/scrUIControllerPatch.cs
+2 -1
View File
@@ -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();
}
Patch/RenderEnvironmentPatches.cs
+18 -19
View File
@@ -15,8 +15,8 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref float __result)
{
if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
__result = (float)(RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderMod.TimeBase);
if (!RenderManager.IsCapturingActive || !RenderPatch || !RenderManager.Instance) return true;
__result = (float)(RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderManager.Instance.timeBase);
return false;
}
}
@@ -27,8 +27,8 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref double __result)
{
if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
__result = RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderMod.TimeBase;
if (!RenderManager.IsCapturingActive || !RenderPatch || !RenderManager.Instance) return true;
__result = RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderManager.Instance.timeBase;
return false;
}
}
@@ -39,8 +39,8 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref float __result)
{
if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
__result = (float)(RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderMod.UnscaledTimeBase);
if (!RenderManager.IsCapturingActive || !RenderPatch || !RenderManager.Instance) return true;
__result = (float)(RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderManager.Instance.unscaledTimeBase);
return false;
}
}
@@ -51,8 +51,8 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref double __result)
{
if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
__result = RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderMod.UnscaledTimeBase;
if (!RenderManager.IsCapturingActive || !RenderPatch || !RenderManager.Instance) return true;
__result = RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderManager.Instance.unscaledTimeBase;
return false;
}
}
@@ -63,10 +63,9 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref double __result)
{
if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
__result = RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderMod.DspTimeBase;
if (!RenderManager.IsCapturingActive || !RenderPatch || !RenderManager.Instance) return true;
__result = RenderManager.Instance.frameCount / RenderManager.Instance.Configuration.TargetFPS + RenderManager.Instance.dspTimeBase;
return false;
}
}
@@ -76,7 +75,7 @@ namespace ADOFAIRenderer.Patch
// ReSharper disable once InconsistentNaming
public static bool Prefix(AudioSource __instance, double time)
{
return !RenderMod.IsRendering || !RenderPatch;
return !RenderManager.IsActive || !RenderPatch;
}
}
@@ -86,8 +85,8 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref int __result)
{
if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
__result = (int)(RenderManager.Instance.frameCount + RenderMod.FrameCountBase);
if (!RenderManager.IsCapturingActive || !RenderPatch || !RenderManager.Instance) return true;
__result = (int)(RenderManager.Instance.frameCount + RenderManager.Instance.frameCountBase);
return false;
}
}
@@ -98,8 +97,8 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref float __result)
{
if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
__result = (float)(1 / RenderManager.Instance.Configuration.TargetFPS);
if (RenderManager.Instance && (!RenderManager.IsCapturingActive || !RenderPatch || !RenderManager.Instance)) return true;
__result = (float)(1 / RenderManager.Instance!.Configuration.TargetFPS);
return false;
}
}
@@ -110,7 +109,7 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref float __result)
{
if (!RenderMod.IsCapturing || !RenderPatch || !RenderManager.Instance) return true;
if (!RenderManager.IsCapturingActive || !RenderPatch || !RenderManager.Instance) return true;
__result = (float)(1 / RenderManager.Instance.Configuration.TargetFPS);
return false;
}
@@ -122,7 +121,7 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref int __result)
{
if (!RenderMod.IsRendering || !RenderPatch || !RenderManager.Instance) return true;
if (!RenderManager.IsActive || !RenderPatch || !RenderManager.Instance) return true;
__result = RenderManager.Instance.Configuration.RenderWidth;
return false;
}
@@ -134,7 +133,7 @@ namespace ADOFAIRenderer.Patch
[SuppressMessage("ReSharper", "InconsistentNaming")]
public static bool Prefix(ref int __result)
{
if (!RenderMod.IsRendering || !RenderPatch || !RenderManager.Instance) return true;
if (!RenderManager.IsActive || !RenderPatch || !RenderManager.Instance) return true;
__result = RenderManager.Instance.Configuration.RenderHeight;
return false;
}
Patch/ShowHitTextPatch.cs
+1 -1
View File
@@ -8,7 +8,7 @@ namespace ADOFAIRenderer.Patch
{
public static bool Prefix()
{
return !RenderMod.IsRendering || (RenderManager.Instance && RenderManager.Instance.Configuration.ShowHitText);
return !RenderManager.IsActive || RenderManager.Instance is { Configuration: { ShowHitText: true } };
}
}
}