diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/dynresources/ModernFixCTMPredicate.java b/forge/src/main/java/org/embeddedt/modernfix/forge/dynresources/ModernFixCTMPredicate.java new file mode 100644 index 00000000..da75b047 --- /dev/null +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/dynresources/ModernFixCTMPredicate.java @@ -0,0 +1,16 @@ +package org.embeddedt.modernfix.forge.dynresources; + +import net.minecraft.client.renderer.RenderType; + +import java.util.function.Predicate; + +public class ModernFixCTMPredicate implements Predicate { + public Predicate ctmOverride; + public Predicate defaultPredicate = type -> type == RenderType.solid(); + + @Override + public boolean test(RenderType renderType) { + Predicate override = ctmOverride; + return override != null ? override.test(renderType) : defaultPredicate.test(renderType); + } +} diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ctm/CTMPackReloadListenerMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ctm/CTMPackReloadListenerMixin.java index 478ce77f..8c747333 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ctm/CTMPackReloadListenerMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ctm/CTMPackReloadListenerMixin.java @@ -32,7 +32,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; @Mixin(CTMPackReloadListener.class) -@RequiresMod("ctm") +@RequiresMod("ctm_but_dont_actually_enable") @ClientOnlyMixin public abstract class CTMPackReloadListenerMixin implements ModernFixClientIntegration { /* caches the original render checks */