Fix incompat with litematica

Author: 1foxy2

common/src/main/java/ca/fxco/moreculling/api/blockstate/StateCullingShapeCache.java

@@ -25,6 +25,6 @@ public interface StateCullingShapeCache {
      *
      * @since 1.6.0
      */
-    void moreculling$initCustomCullingShape(BlockStateModel model);
+    void moreculling$initCustomCullingShape();
 
 }

common/src/main/java/ca/fxco/moreculling/mixin/models/cullshape/BlockStateBase_cullShapeMixin.java

@@ -36,14 +36,17 @@ public abstract class BlockStateBase_cullShapeMixin implements StateCullingShape
 
 
     @Override
-    public void moreculling$initCustomCullingShape(BlockStateModel model) {
+    public void moreculling$initCustomCullingShape() {
         VoxelShape voxelShape = null;
-        if (model != null) {
-            if (((BakedOpacity) model).moreculling$getHasAutoModelShape() && this.canOcclude) {
-                this.moreculling$cullingShapesByFace = occlusionShapesByFace;
-                return;
+        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());
             }
-            voxelShape = ((BakedOpacity) model).moreculling$getCullingShape(this.asState());
         }
 
         if (voxelShape == null) {
@@ -72,12 +75,7 @@ public abstract class BlockStateBase_cullShapeMixin implements StateCullingShape
         if (this.moreculling$cullingShapesByFace == null) {
             this.moreculling$cullingShapesByFace = EMPTY_OCCLUSION_SHAPES;
 
-            BlockStateModel model = null;
-            if (blockRenderManager != null) {
-                model = blockRenderManager.getBlockModel(asState());
-            }
-
-            moreculling$initCustomCullingShape(model);
+            moreculling$initCustomCullingShape();
 
         }
         return this.moreculling$cullingShapesByFace[face.ordinal()];

common/src/main/java/ca/fxco/moreculling/utils/CacheUtils.java

@@ -25,9 +25,9 @@ public static void resetAllCache() {
             return;
         }
         // Reset all model translucency cache
+        Block.BLOCK_STATE_REGISTRY.forEach(state -> ((StateCullingShapeCache) state).moreculling$initCustomCullingShape());
         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);
             }

fabric/build.gradle

@@ -11,8 +11,7 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}"
     modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
 
-    modCompileOnly "maven.modrinth:modmenu:${project.modmenu_version}"
-    //modImplementation "maven.modrinth:sodium:${project.sodium_version}-fabric"
+    modImplementation "maven.modrinth:modmenu:${project.modmenu_version}"
 
     modImplementation "net.caffeinemc:sodium-fabric:${project.sodium_version}"
     // ^ Change to `modCompileOnly` to test without sodium

gradle.properties

@@ -36,7 +36,7 @@ java_version=21
 
 # Mod Menu
 # https://modrinth.com/mod/modmenu/versions
-modmenu_version=16.0.0-rc.1
+modmenu_version=17.0.0-beta.1
 
 # Fabric Compatibility
 # https://fabricmc.net/develop/