Merge remote-tracking branch 'origin/1.18' into 1.19.2
This commit is contained in:
commit
ba6103bbc7
|
|
@ -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<RenderType> {
|
||||
public Predicate<RenderType> ctmOverride;
|
||||
public Predicate<RenderType> defaultPredicate = type -> type == RenderType.solid();
|
||||
|
||||
@Override
|
||||
public boolean test(RenderType renderType) {
|
||||
Predicate<RenderType> override = ctmOverride;
|
||||
return override != null ? override.test(renderType) : defaultPredicate.test(renderType);
|
||||
}
|
||||
}
|
||||
|
|
@ -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 */
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user