From 183bcfbf416deca116de91901d0a8dbd4884065a Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 6 Jun 2026 15:38:05 -0700 Subject: [PATCH] Narrow more transformer exclusions (#1827) --- .../glsm/loading/EcosystemNarrowRules.java | 19 +++++++++++++++++++ .../angelica/config/AngelicaConfig.java | 10 ++++++++++ .../loading/AngelicaClientTweaker.java | 2 ++ 3 files changed, 31 insertions(+) diff --git a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/loading/EcosystemNarrowRules.java b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/loading/EcosystemNarrowRules.java index 9314c2b5c..d7450144e 100644 --- a/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/loading/EcosystemNarrowRules.java +++ b/glsm/src/main/java/com/gtnewhorizons/angelica/glsm/loading/EcosystemNarrowRules.java @@ -35,11 +35,30 @@ public final class EcosystemNarrowRules { "com.fiskmods.lightsabers.asm.transformers" )), + new NarrowRule("FiskHeroes", "com.fiskmods.heroes.asm", List.of( + "com.fiskmods.heroes.asm.SHLoadingPlugin", + "com.fiskmods.heroes.asm.transformers" + )), + new NarrowRule("Ears", "com.unascribed.ears", List.of( "com.unascribed.ears.asm", "com.unascribed.ears.common.agent" )), + new NarrowRule("FoamFix", "pl.asie.foamfix", List.of( + "pl.asie.foamfix.bugfixmod", + "pl.asie.foamfix.coremod", + "pl.asie.foamfix.forkage", + "pl.asie.foamfix.ghostbuster", + "pl.asie.foamfix.FoamFixMod", + "pl.asie.foamfix.HackyMessageFactoryWrapper", + "pl.asie.foamfix.LaunchWrapperRuntimeFix", + "pl.asie.foamfix.ProxyClient", + "pl.asie.foamfix.ProxyCommon", + "pl.asie.foamfix.repack.com.unascribed.ears.asm", + "pl.asie.foamfix.repack.com.unascribed.ears.common.agent" + )), + new NarrowRule("Alfheim", "alfheim.common.core.asm.hook", List.of( "alfheim.common.core.asm.hook.AlfheimFieldHookHandler", "alfheim.common.core.asm.hook.AlfheimHPHooks", diff --git a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java index f152c6ba4..33e23af1a 100644 --- a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java +++ b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java @@ -310,6 +310,16 @@ public class AngelicaConfig { @Config.DefaultBoolean(true) @Config.RequiresMcRestart public boolean narrowEars; + + @Config.Comment("Narrow Fisk's Superheroes transformer exclusions to allow GL redirection") + @Config.DefaultBoolean(true) + @Config.RequiresMcRestart + public boolean narrowFiskHeroes; + + @Config.Comment("Narrow FoamFix transformer exclusions to allow GL redirection in its repackaged Ears") + @Config.DefaultBoolean(true) + @Config.RequiresMcRestart + public boolean narrowFoamFix; } @Config.Comment("Renders chunks before neighbors are ready. Improves loading at render distance edges, useful for low render distance servers.") diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaClientTweaker.java b/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaClientTweaker.java index a7f452a6e..6bae3b15e 100644 --- a/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaClientTweaker.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaClientTweaker.java @@ -186,6 +186,8 @@ public final class AngelicaClientTweaker implements IFMLLoadingPlugin, IEarlyMix narrowTransformerConfig("AdvancedLightsabers", AngelicaConfig.transformerCompat.narrowAdvancedLightsabers); narrowTransformerConfig("Alfheim", AngelicaConfig.transformerCompat.narrowAlfheim); narrowTransformerConfig("Ears", AngelicaConfig.transformerCompat.narrowEars); + narrowTransformerConfig("FiskHeroes", AngelicaConfig.transformerCompat.narrowFiskHeroes); + narrowTransformerConfig("FoamFix", AngelicaConfig.transformerCompat.narrowFoamFix); tweaks.add("com.gtnewhorizons.angelica.loading.fml.tweakers.IncompatibleModsDisablerTweaker"); if (AngelicaConfig.enableHudCaching) {