From 8cf0296284b4b143e05a65ff35797afd698d9a5e Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Thu, 23 Jul 2026 09:34:41 -0700 Subject: [PATCH] Properly gate end flash (#1954) --- .../angelica/compat/etfuturum/EndFlashCompat.java | 2 +- .../net/coderbot/iris/uniforms/IrisExclusiveUniforms.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/etfuturum/EndFlashCompat.java b/src/main/java/com/gtnewhorizons/angelica/compat/etfuturum/EndFlashCompat.java index 8e39e9c0d..160fbb1a5 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/etfuturum/EndFlashCompat.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/etfuturum/EndFlashCompat.java @@ -8,7 +8,7 @@ import ganymedes01.etfuturum.api.client.EndFlashAPI; */ public final class EndFlashCompat { - private static final boolean AVAILABLE = Loader.isModLoaded("etfuturum"); + private static final boolean AVAILABLE = Loader.isModLoaded("etfuturum") && EndFlashCompat.class.getResource("/ganymedes01/etfuturum/api/client/EndFlashAPI.class") != null; private EndFlashCompat() {} diff --git a/src/main/java/net/coderbot/iris/uniforms/IrisExclusiveUniforms.java b/src/main/java/net/coderbot/iris/uniforms/IrisExclusiveUniforms.java index 36c374780..ab8d63e39 100644 --- a/src/main/java/net/coderbot/iris/uniforms/IrisExclusiveUniforms.java +++ b/src/main/java/net/coderbot/iris/uniforms/IrisExclusiveUniforms.java @@ -1,5 +1,6 @@ package net.coderbot.iris.uniforms; +import com.gtnewhorizons.angelica.compat.etfuturum.EndFlashCompat; import com.gtnewhorizons.angelica.compat.etfuturum.EtFuturumCompat; import com.gtnewhorizons.angelica.compat.mojang.Camera; import com.gtnewhorizons.angelica.compat.mojang.GameModeUtil; @@ -46,7 +47,9 @@ public class IrisExclusiveUniforms { // Et Futurum Requiem backports the End Flash final EndFlashStorage endFlashStorage = new EndFlashStorage(); - updateNotifier.addListener(endFlashStorage::tick); + if (EndFlashCompat.isAvailable()) { + updateNotifier.addListener(endFlashStorage::tick); + } //All Iris-exclusive uniforms (uniforms which do not exist in either OptiFine or ShadersMod) should be registered here. uniforms.uniform1f(UniformUpdateFrequency.PER_FRAME, "thunderStrength", IrisExclusiveUniforms::getThunderStrength);