diff --git a/dependencies.gradle b/dependencies.gradle index 4a6cd2cb8..6535eb1c3 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -101,6 +101,8 @@ dependencies { compileOnly(rfg.deobf("curse.maven:security-craft-64760:2818228")) runtimeOnlyNonPublishable(rfg.deobf("CoreTweaks:CoreTweaks:0.3.3.2")) + // For testing alternative splash screens, can be sourced from https://github.com/MalTeeez/ModernSplash/releases + //runtimeOnly(rfg.deobf(files("dependencies/modernsplash-1.7.10-1.2.2-dev.jar"))) // Hodgepodge transformedMod("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") diff --git a/src/main/java/com/gtnewhorizons/angelica/client/font/BatchingFontRenderer.java b/src/main/java/com/gtnewhorizons/angelica/client/font/BatchingFontRenderer.java index 6027e6f14..30372fd78 100644 --- a/src/main/java/com/gtnewhorizons/angelica/client/font/BatchingFontRenderer.java +++ b/src/main/java/com/gtnewhorizons/angelica/client/font/BatchingFontRenderer.java @@ -87,8 +87,7 @@ public class BatchingFontRenderer { } this.isSGA = Objects.equals(this.locationFontTexture.getResourcePath(), "textures/font/ascii_sga.png"); - // noinspection deprecation - this.isSplash = underlying instanceof SplashProgress.SplashFontRenderer; + this.isSplash = FontStrategist.isSplashFontRendererActive(underlying); FontProviderMC.get(this.isSGA).charWidth = this.charWidth; FontProviderMC.get(this.isSGA).locationFontTexture = this.locationFontTexture; diff --git a/src/main/java/com/gtnewhorizons/angelica/client/font/FontStrategist.java b/src/main/java/com/gtnewhorizons/angelica/client/font/FontStrategist.java index 933809bc1..639ff7857 100644 --- a/src/main/java/com/gtnewhorizons/angelica/client/font/FontStrategist.java +++ b/src/main/java/com/gtnewhorizons/angelica/client/font/FontStrategist.java @@ -3,8 +3,10 @@ package com.gtnewhorizons.angelica.client.font; import com.google.common.collect.HashMultiset; import com.gtnewhorizons.angelica.config.FontConfig; import com.gtnewhorizons.angelica.mixins.interfaces.ResourceAccessor; +import cpw.mods.fml.client.SplashProgress; import lombok.Getter; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.resources.DefaultResourcePack; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -125,4 +127,17 @@ public class FontStrategist { } customFontInUse = (FontConfig.enableCustomFont && (primaryFontFound || fallbackFontFound)); } + + public static boolean isSplashFontRendererActive(FontRenderer fontRenderer) { + // noinspection deprecation + boolean active = fontRenderer instanceof SplashProgress.SplashFontRenderer; + + try { + Class customSplashClass = Class.forName("gkappa.modernsplash.CustomSplash$SplashFontRenderer"); + active = active || customSplashClass.isInstance(fontRenderer); + } catch (ClassNotFoundException ignored) { + } + + return active; + } }