From 5cca594f7df9d4685a4654ef2adadf4b07d92622 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sun, 9 Apr 2023 22:00:30 -0400 Subject: [PATCH] Fix incorrect shadow method --- .../dynamic_resources/ctm/CTMPackReloadListenerMixin.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ctm/CTMPackReloadListenerMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ctm/CTMPackReloadListenerMixin.java index 24a37681..f8ff1139 100644 --- a/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ctm/CTMPackReloadListenerMixin.java +++ b/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ctm/CTMPackReloadListenerMixin.java @@ -11,6 +11,7 @@ import net.minecraft.client.resources.model.WeightedBakedModel; import net.minecraft.core.Holder; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; +import net.minecraftforge.client.ChunkRenderTypeSet; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; @@ -35,7 +36,7 @@ public abstract class CTMPackReloadListenerMixin { @Shadow protected abstract Predicate getLayerCheck(BlockState state, BakedModel model); - @Shadow protected abstract Predicate getExistingRenderCheck(Block block); + @Shadow protected abstract ChunkRenderTypeSet getExistingRenderCheck(Block block); private Map locationToState = new Object2ObjectOpenHashMap<>(); @@ -69,7 +70,7 @@ public abstract class CTMPackReloadListenerMixin { return; Predicate newPredicate = this.getLayerCheck(state, event.getModel()); if(newPredicate != null) { - blockRenderChecks.put(delegate, this.getExistingRenderCheck(block)); + blockRenderChecks.put(delegate, this.getExistingRenderCheck(block)::contains); ItemBlockRenderTypes.setRenderLayer(block, newPredicate); } }