Fix incompat with modernfix

1foxy2 · 1foxy2 · commit e41b5f156de2 · 2025-12-29T23:39:07.000+01:00
Fixes: #414
diff --git a/common/build.gradle b/common/build.gradle
@@ -27,6 +27,7 @@ dependencies {
     //implementation "maven.modrinth:client-tweaks:${project.clienttweaks_version}+neoforge-${project.minecraft_version}"
 
     api "me.shedaniel.cloth:cloth-config-neoforge:${project.cloth_config_version}"
+    compileOnly "maven.modrinth:modernfix-mvus:${modernfix_version}-neoforge"
 
     implementation "me.fallenbreath:conditional-mixin-neoforge:${project.conditional_mixins_version}"
     implementation(annotationProcessor("com.github.bawnorton.mixinsquared:mixinsquared-common:${project.mixinsquared_version}"))
diff --git a/common/src/main/java/ca/fxco/moreculling/api/blockstate/StateCullingShapeCache.java b/common/src/main/java/ca/fxco/moreculling/api/blockstate/StateCullingShapeCache.java
@@ -1,5 +1,6 @@
 package ca.fxco.moreculling.api.blockstate;
 
+import net.minecraft.client.renderer.block.model.BlockStateModel;
 import net.minecraft.core.Direction;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
@@ -22,8 +23,8 @@ public interface StateCullingShapeCache {
     /**
      * Initialize custom culling shape on resource reload
      *
-     * @since 1.3.1
+     * @since 1.6.0
      */
-    void moreculling$initCustomCullingShape();
+    void moreculling$initCustomCullingShape(BlockStateModel model);
 
 }
diff --git a/common/src/main/java/ca/fxco/moreculling/mixin/blockstates/BlockStateBase_moreMixin.java b/common/src/main/java/ca/fxco/moreculling/mixin/blockstates/BlockStateBase_moreMixin.java
@@ -2,25 +2,30 @@
 
 import ca.fxco.moreculling.api.block.MoreBlockCulling;
 import ca.fxco.moreculling.api.blockstate.MoreStateCulling;
+import ca.fxco.moreculling.api.model.BakedOpacity;
 import ca.fxco.moreculling.utils.BitUtils;
+import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
 import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 
 import java.util.Optional;
 
+import static ca.fxco.moreculling.MoreCulling.blockRenderManager;
+
 @Mixin(BlockBehaviour.BlockStateBase.class)
 public abstract class BlockStateBase_moreMixin implements MoreStateCulling {
 
     @Unique
-    private byte moreculling$emptyFaces = 0;
+    private byte moreculling$emptyFaces = -1;
     @Unique
     private boolean moreculling$hasTextureTranslucency = true;
 
@@ -30,8 +35,18 @@ public abstract class BlockStateBase_moreMixin implements MoreStateCulling {
     @Shadow
     protected abstract BlockState asState();
 
+    @Shadow
+    @Final
+    private boolean canOcclude;
+
     @Override
     public boolean moreculling$hasQuadsOnSide(@Nullable Direction direction) {
+        if (moreculling$emptyFaces == -1) {
+            moreculling$emptyFaces = 0;
+            if (!canOcclude && blockRenderManager != null) {
+                ((BakedOpacity) blockRenderManager.getBlockModel(asState())).moreculling$resetTranslucencyCache(asState());
+            }
+        }
         if (direction == null) {
             return moreculling$emptyFaces != BitUtils.ALL_DIRECTIONS;
         }
diff --git a/common/src/main/java/ca/fxco/moreculling/mixin/models/cullshape/BlockStateBase_cullShapeMixin.java b/common/src/main/java/ca/fxco/moreculling/mixin/models/cullshape/BlockStateBase_cullShapeMixin.java
@@ -36,17 +36,14 @@ public abstract class BlockStateBase_cullShapeMixin implements StateCullingShape
 
 
     @Override
-    public void moreculling$initCustomCullingShape() {
+    public void moreculling$initCustomCullingShape(BlockStateModel model) {
         VoxelShape voxelShape = null;
-        if (blockRenderManager != null) {
-            BlockStateModel model = blockRenderManager.getBlockModel(this.asState());
-            if (model != null) {
-                if (((BakedOpacity) model).moreculling$getHasAutoModelShape() && this.canOcclude) {
-                    this.moreculling$cullingShapesByFace = occlusionShapesByFace;
-                    return;
-                }
-                voxelShape = ((BakedOpacity) model).moreculling$getCullingShape(this.asState());
+        if (model != null) {
+            if (((BakedOpacity) model).moreculling$getHasAutoModelShape() && this.canOcclude) {
+                this.moreculling$cullingShapesByFace = occlusionShapesByFace;
+                return;
             }
+            voxelShape = ((BakedOpacity) model).moreculling$getCullingShape(this.asState());
         }
 
         if (voxelShape == null) {
@@ -72,6 +69,17 @@ public abstract class BlockStateBase_cullShapeMixin implements StateCullingShape
 
     @Override
     public VoxelShape moreculling$getFaceCullingShape(Direction face) {
+        if (this.moreculling$cullingShapesByFace == null) {
+            this.moreculling$cullingShapesByFace = EMPTY_OCCLUSION_SHAPES;
+
+            BlockStateModel model = null;
+            if (blockRenderManager != null) {
+                model = blockRenderManager.getBlockModel(asState());
+            }
+
+            moreculling$initCustomCullingShape(model);
+
+        }
         return this.moreculling$cullingShapesByFace[face.ordinal()];
     }
 }
diff --git a/common/src/main/java/ca/fxco/moreculling/utils/CacheUtils.java b/common/src/main/java/ca/fxco/moreculling/utils/CacheUtils.java
@@ -1,10 +1,13 @@
 package ca.fxco.moreculling.utils;
 
 import ca.fxco.moreculling.MoreCulling;
+import ca.fxco.moreculling.api.blockstate.StateCullingShapeCache;
 import ca.fxco.moreculling.api.model.BakedOpacity;
 import ca.fxco.moreculling.mixin.accessors.BlockModelShaperAccessor;
 import net.minecraft.client.renderer.block.model.BlockStateModel;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
+import org.embeddedt.modernfix.core.ModernFixMixinPlugin;
 
 import java.util.Map;
 
@@ -18,12 +21,13 @@ public class CacheUtils {
      */
     public static void resetAllCache() {
         // Not really needed as ModernFix automatically caches and releases models, which is good enough.
-        if (IS_MODERNFIX_LOADED) {
+        if (IS_MODERNFIX_LOADED && ModernFixMixinPlugin.instance.isOptionEnabled("perf.dynamic_resources")) {
             return;
         }
         // Reset all model translucency cache
         Map<BlockState, BlockStateModel> allModels = ((BlockModelShaperAccessor) blockRenderManager.getBlockModelShaper()).getModels();
         allModels.forEach((state, model) -> {
+            ((StateCullingShapeCache) state).moreculling$initCustomCullingShape(model);
             if (!state.canOcclude()) {
                 ((BakedOpacity) model).moreculling$resetTranslucencyCache(state);
             }
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -26,6 +26,7 @@ dependencies {
     }
 
     modCompileOnly "maven.modrinth:vulkanmod:${vulkan_version}"
+    modCompileOnly "maven.modrinth:modernfix-mvus:${modernfix_version}-fabric"
 
     modImplementation("me.fallenbreath:conditional-mixin-fabric:${project.conditional_mixins_version}")
     include("me.fallenbreath:conditional-mixin-fabric:${project.conditional_mixins_version}")
diff --git a/fabric/src/main/java/ca/fxco/moreculling/mixin/Minecraft_registerReloadListenersMixin.java b/fabric/src/main/java/ca/fxco/moreculling/mixin/Minecraft_registerReloadListenersMixin.java
@@ -1,22 +1,17 @@
 package ca.fxco.moreculling.mixin;
 
-import ca.fxco.moreculling.api.blockstate.StateCullingShapeCache;
-import ca.fxco.moreculling.api.model.BakedOpacity;
-import ca.fxco.moreculling.mixin.accessors.BlockModelShaperAccessor;
+import ca.fxco.moreculling.utils.CacheUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.main.GameConfig;
 import net.minecraft.server.packs.resources.ReloadableResourceManager;
 import net.minecraft.server.packs.resources.ResourceManagerReloadListener;
-import net.minecraft.world.level.block.Block;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import static ca.fxco.moreculling.MoreCulling.blockRenderManager;
-
 @Mixin(Minecraft.class)
 public abstract class Minecraft_registerReloadListenersMixin {
 
@@ -33,15 +28,6 @@ public abstract class Minecraft_registerReloadListenersMixin {
             )
     )
     private void moreculling$onBlockRenderManagerInitialized(GameConfig args, CallbackInfo ci) {
-        this.resourceManager.registerReloadListener((ResourceManagerReloadListener) manager ->
-                Block.BLOCK_STATE_REGISTRY.forEach(state -> ((StateCullingShapeCache) state).moreculling$initCustomCullingShape()));
-
-        this.resourceManager.registerReloadListener((ResourceManagerReloadListener) manager ->
-                ((BlockModelShaperAccessor) blockRenderManager.getBlockModelShaper()).getModels()
-                        .forEach((state, model) -> {
-                                    if (!state.canOcclude())
-                                        ((BakedOpacity) model).moreculling$resetTranslucencyCache(state);
-                                }
-                        ));
+        this.resourceManager.registerReloadListener((ResourceManagerReloadListener) manager -> CacheUtils.resetAllCache());
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -50,6 +50,8 @@ sodium_version=0.8.0-beta.1+mc1.21.11-pre5
 # https://modrinth.com/mod/vulkanmod/versions
 vulkan_version=0.5.2-1.21.4
 
+modernfix_version=5.20.7
+
 # Client tweaks Compatibility
 # https://modrinth.com/mod/client-tweaks/versions
 clienttweaks_version=21.3.1
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -44,6 +44,7 @@ dependencies {
 
     implementation(jarJar("me.fallenbreath:conditional-mixin-neoforge:${project.conditional_mixins_version}"))
 
+    compileOnly "maven.modrinth:modernfix-mvus:${modernfix_version}-neoforge"
 
     compileOnly(annotationProcessor("com.github.bawnorton.mixinsquared:mixinsquared-common:${project.mixinsquared_version}"))
     implementation(jarJar("com.github.bawnorton.mixinsquared:mixinsquared-neoforge:${project.mixinsquared_version}"))
diff --git a/neoforge/src/main/java/ca/fxco/moreculling/MoreCullingNeoforge.java b/neoforge/src/main/java/ca/fxco/moreculling/MoreCullingNeoforge.java
@@ -1,22 +1,17 @@
 package ca.fxco.moreculling;
 
-import ca.fxco.moreculling.api.blockstate.StateCullingShapeCache;
-import ca.fxco.moreculling.api.model.BakedOpacity;
 import ca.fxco.moreculling.config.ModMenuConfig;
-import ca.fxco.moreculling.mixin.accessors.BlockModelShaperAccessor;
+import ca.fxco.moreculling.utils.CacheUtils;
 import net.minecraft.util.Unit;
 import net.minecraft.util.profiling.Profiler;
 import net.minecraft.util.profiling.ProfilerFiller;
-import net.minecraft.world.level.block.Block;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.ModContainer;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.neoforge.client.event.AddClientReloadListenersEvent;
 import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
 
-import static ca.fxco.moreculling.MoreCulling.blockRenderManager;
-
 @Mod(value = MoreCulling.MOD_ID, dist = Dist.CLIENT)
 public class MoreCullingNeoforge {
     public MoreCullingNeoforge(ModContainer container, IEventBus bus) {
@@ -36,14 +31,7 @@ public void registerReloadListener(AddClientReloadListenersEvent event) {
                     ProfilerFiller profilerfiller = Profiler.get();
                     profilerfiller.push("listener");
 
-                    Block.BLOCK_STATE_REGISTRY.forEach(state -> ((StateCullingShapeCache) state).moreculling$initCustomCullingShape());
-
-                    ((BlockModelShaperAccessor) blockRenderManager.getBlockModelShaper()).getModels()
-                            .forEach((state, model) -> {
-                                if (!state.canOcclude()) {
-                                    ((BakedOpacity) model).moreculling$resetTranslucencyCache(state);
-                                }
-                            });
+                    CacheUtils.resetAllCache();
 
                     profilerfiller.pop();
                 }, gameExecutor));

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package ca.fxco.moreculling.api.blockstate;`
`2`	`2`
	`3`	`+import net.minecraft.client.renderer.block.model.BlockStateModel;`
`3`	`4`	`import net.minecraft.core.Direction;`
`4`	`5`	`import net.minecraft.world.phys.shapes.VoxelShape;`
`5`	`6`
`@@ -22,8 +23,8 @@ public interface StateCullingShapeCache {`
`22`	`23`	`/**`
`23`	`24`	`* Initialize custom culling shape on resource reload`
`24`	`25`	`*`
`25`		`- * @since 1.3.1`
	`26`	`+ * @since 1.6.0`
`26`	`27`	`*/`
`27`		`- void moreculling$initCustomCullingShape();`
	`28`	`+ void moreculling$initCustomCullingShape(BlockStateModel model);`
`28`	`29`
`29`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ dependencies {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`modCompileOnly "maven.modrinth:vulkanmod:${vulkan_version}"`
	`29`	`+ modCompileOnly "maven.modrinth:modernfix-mvus:${modernfix_version}-fabric"`
`29`	`30`
`30`	`31`	`modImplementation("me.fallenbreath:conditional-mixin-fabric:${project.conditional_mixins_version}")`
`31`	`32`	`include("me.fallenbreath:conditional-mixin-fabric:${project.conditional_mixins_version}")`