Merge remote-tracking branch 'origin/master' into dev

1foxy2 · 1foxy2 · commit 9e7c9aa7c6a3 · 2025-03-26T03:52:53.000+01:00
# Conflicts:
#	common/src/main/java/ca/fxco/moreculling/mixin/models/MultiPartModel_cacheMixin.java
#	common/src/main/java/ca/fxco/moreculling/mixin/models/SingleVariant_cacheMixin.java
#	common/src/main/java/ca/fxco/moreculling/mixin/models/cullshape/BlockStateBase_cullShapeMixin.java
#	common/src/main/resources/moreculling.mixins.json
#	fabric/src/main/java/ca/fxco/moreculling/mixin/models/cullshape/BlockModel_fabricCullShapeMixin.java
#	gradle.properties
#	neoforge/src/main/java/ca/fxco/moreculling/mixin/models/cullshape/BlockModel_neoforgeCullShapeMixin.java
diff --git a/common/src/main/java/ca/fxco/moreculling/api/block/LeavesCulling.java b/common/src/main/java/ca/fxco/moreculling/api/block/LeavesCulling.java
@@ -0,0 +1,7 @@
+package ca.fxco.moreculling.api.block;
+
+/**
+ * implement this if your block should cull like leaves but doesn't extend leaves block
+ */
+public interface LeavesCulling {
+}
diff --git a/common/src/main/java/ca/fxco/moreculling/api/model/BakedOpacity.java b/common/src/main/java/ca/fxco/moreculling/api/model/BakedOpacity.java
@@ -76,6 +76,23 @@ public interface BakedOpacity {
     @ApiStatus.Internal
     default void moreculling$setCullingShape(@Nullable VoxelShape cullingShape) {}
 
+    /**
+     * When set to false, the cull shape is completely ignored and instead the model
+     * will be used as the cull shape even if block state can occlude
+     *
+     * @since 1.2.10
+     */
+    default void moreculling$setHasAutoModelShape(boolean hasAutoModelShape) {}
+
+    /**
+     * Returns if useModelShape was set automatically
+     *
+     * @since 1.2.10
+     */
+    default boolean moreculling$getHasAutoModelShape() {
+        return false;
+    }
+
     /**
      * Tells you if this model supports setting the culling shape
      *
diff --git a/common/src/main/java/ca/fxco/moreculling/api/model/ExtendedUnbakedModel.java b/common/src/main/java/ca/fxco/moreculling/api/model/ExtendedUnbakedModel.java
@@ -47,6 +47,23 @@ public interface ExtendedUnbakedModel {
         return false;
     }
 
+    /**
+     * When set to false, the cull shape is completely ignored and instead the model
+     * will be used as the cull shape even if block state can occlude
+     *
+     * @since 1.2.10
+     */
+    default void moreculling$setHasAutoModelShape(boolean hasAutoModelShape) {}
+
+    /**
+     * Returns if useModelShape was set automatically
+     *
+     * @since 1.2.10
+     */
+    default boolean moreculling$getHasAutoModelShape() {
+        return false;
+    }
+
     /**
      * ModelElementFace is just final's, that should not change. However, you can create a new ModelElementFace or wrap
      * it. Do this to modify the element face data.
diff --git a/common/src/main/java/ca/fxco/moreculling/config/ModMenuConfig.java b/common/src/main/java/ca/fxco/moreculling/config/ModMenuConfig.java
@@ -52,6 +52,9 @@ public static Screen createConfigScreen(Screen parent) {
             if (modId.equals("minecraft")) {
                 continue;
             }
+            if (!Services.PLATFORM.isModLoaded(modId)) {
+                continue;
+            }
             DynamicBooleanListEntry aMod = new DynamicBooleanBuilder(Services.PLATFORM.getModName(modId))
                     .setValue(entry.getBooleanValue())
                     .setDefaultValue(MoreCulling.CONFIG.useOnModdedBlocksByDefault)
diff --git a/common/src/main/java/ca/fxco/moreculling/mixin/blocks/LeavesBlock_typesMixin.java b/common/src/main/java/ca/fxco/moreculling/mixin/blocks/LeavesBlock_typesMixin.java
@@ -1,6 +1,7 @@
 package ca.fxco.moreculling.mixin.blocks;
 
 import ca.fxco.moreculling.MoreCulling;
+import ca.fxco.moreculling.api.block.LeavesCulling;
 import ca.fxco.moreculling.api.block.MoreBlockCulling;
 import ca.fxco.moreculling.config.option.LeavesCullingMode;
 import ca.fxco.moreculling.utils.CullingUtils;
@@ -22,7 +23,7 @@
 import static ca.fxco.moreculling.config.option.LeavesCullingMode.VERTICAL;
 
 @Mixin(value = LeavesBlock.class, priority = 1220)
-public class LeavesBlock_typesMixin extends Block implements MoreBlockCulling {
+public class LeavesBlock_typesMixin extends Block implements MoreBlockCulling, LeavesCulling {
 
     @Shadow
     @Final
@@ -36,7 +37,7 @@ public LeavesBlock_typesMixin(Properties settings) {
     public boolean skipRendering(BlockState state, BlockState stateFrom, Direction direction) {
         if (MoreCulling.CONFIG.leavesCullingMode == FAST || CullingUtils.areLeavesOpaque() ||
                 (MoreCulling.CONFIG.leavesCullingMode == VERTICAL && direction.getAxis() == Direction.Axis.Y)) {
-            return stateFrom.getBlock() instanceof LeavesBlock || super.skipRendering(state, stateFrom, direction);
+            return stateFrom.getBlock() instanceof LeavesCulling || super.skipRendering(state, stateFrom, direction);
         }
         return super.skipRendering(state, stateFrom, direction);
     }
diff --git a/common/src/main/java/ca/fxco/moreculling/mixin/blocks/MangroveRootsBlock_typesMixin.java b/common/src/main/java/ca/fxco/moreculling/mixin/blocks/MangroveRootsBlock_typesMixin.java
@@ -1,36 +1,44 @@
 package ca.fxco.moreculling.mixin.blocks;
 
 import ca.fxco.moreculling.MoreCulling;
+import ca.fxco.moreculling.api.block.LeavesCulling;
 import ca.fxco.moreculling.api.block.MoreBlockCulling;
 import ca.fxco.moreculling.config.option.LeavesCullingMode;
 import ca.fxco.moreculling.utils.CullingUtils;
 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.LeavesBlock;
 import net.minecraft.world.level.block.MangroveRootsBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.Optional;
 
 @Mixin(value = MangroveRootsBlock.class, priority = 1220)
-public class MangroveRootsBlock_typesMixin extends Block implements MoreBlockCulling {
+public class MangroveRootsBlock_typesMixin extends Block implements MoreBlockCulling, LeavesCulling {
 
     public MangroveRootsBlock_typesMixin(Properties settings) {
         super(settings);
     }
 
-    @Override
-    public boolean skipRendering(BlockState state, BlockState stateFrom, Direction direction) {
+    @Inject(
+            method = "skipRendering",
+            at = @At(value = "HEAD"),
+            cancellable = true
+    )
+    private void moreculling$skipRendering(BlockState thisState, BlockState sideState,
+                                           Direction face, CallbackInfoReturnable<Boolean> cir) {
         if (!MoreCulling.CONFIG.includeMangroveRoots) {
-            return super.skipRendering(state, stateFrom, direction);
+            return;
         }
         if (MoreCulling.CONFIG.leavesCullingMode == LeavesCullingMode.FAST || CullingUtils.areLeavesOpaque()) {
-            return stateFrom.getBlock() instanceof LeavesBlock || super.skipRendering(state, stateFrom, direction);
+            cir.setReturnValue(sideState.getBlock() instanceof LeavesCulling ||
+                    super.skipRendering(thisState, sideState, face));
         }
-        return super.skipRendering(state, stateFrom, direction);
     }
 
     @Override
diff --git a/common/src/main/java/ca/fxco/moreculling/mixin/compat/SignBlock_ebeMixin.java b/common/src/main/java/ca/fxco/moreculling/mixin/compat/SignBlock_ebeMixin.java
@@ -0,0 +1,26 @@
+package ca.fxco.moreculling.mixin.compat;
+
+import me.fallenbreath.conditionalmixin.api.annotation.Condition;
+import me.fallenbreath.conditionalmixin.api.annotation.Restriction;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.SignBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.shapes.VoxelShape;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+
+@Restriction(require = @Condition("enhancedblockentities"))
+@Mixin(SignBlock.class)
+public class SignBlock_ebeMixin extends Block {
+    @Unique
+    private static final VoxelShape moreculling$cullingShape = Block.box(7.3F, 0.0F, 7.3F, 8.7F, 16.0, 8.7F);
+
+    public SignBlock_ebeMixin(Properties p_49795_) {
+        super(p_49795_);
+    }
+
+    @Override
+    public VoxelShape getOcclusionShape(BlockState state) {
+        return moreculling$cullingShape;
+    }
+}
diff --git a/common/src/main/java/ca/fxco/moreculling/mixin/models/DelegateBakedModel_cullMixin.java b/common/src/main/java/ca/fxco/moreculling/mixin/models/DelegateBakedModel_cullMixin.java
@@ -38,6 +38,16 @@ public class DelegateBakedModel_cullMixin implements BakedOpacity {
         ((BakedOpacity) parent).moreculling$setCullingShape(cullingShape);
     }
 
+    @Override
+    public boolean moreculling$getHasAutoModelShape() {
+        return ((BakedOpacity) parent).moreculling$getHasAutoModelShape();
+    }
+
+    @Override
+    public void moreculling$setHasAutoModelShape(boolean hasAutoModelShape) {
+        ((BakedOpacity) parent).moreculling$setHasAutoModelShape(hasAutoModelShape);
+    }
+
     @Override
     public boolean moreculling$canSetCullingShape() {
         return ((BakedOpacity) parent).moreculling$canSetCullingShape();
diff --git a/common/src/main/java/ca/fxco/moreculling/mixin/models/MultiPartModel_cacheMixin.java b/common/src/main/java/ca/fxco/moreculling/mixin/models/MultiPartModel_cacheMixin.java
@@ -53,7 +53,7 @@ public abstract class MultiPartModel_cacheMixin implements BakedOpacity {
             } else {
                 solidFaces = BitUtils.set(solidFaces, face.ordinal());
                 for (BakedQuad quad : quads) {
-                    if (((QuadOpacity)  (Object) quad).moreculling$getTextureTranslucency()) {
+                    if (((QuadOpacity) (Object) quad).moreculling$getTextureTranslucency()) {
                         solidFaces = BitUtils.unset(solidFaces, face.ordinal());
                         break;
                     }
diff --git a/common/src/main/java/ca/fxco/moreculling/mixin/models/SingleVariant_cacheMixin.java b/common/src/main/java/ca/fxco/moreculling/mixin/models/SingleVariant_cacheMixin.java
@@ -37,6 +37,15 @@ public abstract class SingleVariant_cacheMixin implements BakedOpacity {
     @Override
     public void moreculling$resetTranslucencyCache(BlockState state) {
         moreculling$solidFaces.clear();
+
+        if (state.canOcclude()) {
+            if (moreculling$allStatesCanOcclude) {
+                moreculling$solidFaces.fill();
+            }
+        } else {
+            moreculling$allStatesCanOcclude = false;
+        }
+
         for (Direction direction : DirectionUtils.DIRECTIONS) {
             List<BakedQuad> layeredQuads = new ArrayList<>(model.getQuads(direction));
             if (!layeredQuads.isEmpty()) {
@@ -72,6 +81,16 @@ public abstract class SingleVariant_cacheMixin implements BakedOpacity {
         ((BakedOpacity) this.model).moreculling$setCullingShape(cullingShape);
     }
 
+    @Override
+    public boolean moreculling$getHasAutoModelShape() {
+        return moreculling$hasAutoModelShape;
+    }
+
+    @Override
+    public void moreculling$setHasAutoModelShape(boolean hasAutoModelShape) {
+        moreculling$hasAutoModelShape = hasAutoModelShape;
+    }
+
     @Override
     public boolean moreculling$canSetCullingShape() {
         return true;
diff --git a/common/src/main/java/ca/fxco/moreculling/mixin/models/cullshape/BlockModel_cullShapeMixin.java b/common/src/main/java/ca/fxco/moreculling/mixin/models/cullshape/BlockModel_cullShapeMixin.java
@@ -28,6 +28,8 @@ public abstract class BlockModel_cullShapeMixin implements ExtendedUnbakedModel
 
     @Unique
     private boolean moreculling$useModelShape = false;
+    @Unique
+    private boolean moreculling$hasAutoModelShape = true;
 
     @Override
     public void moreculling$setCullShapeElements(@Nullable List<CullShapeElement> cullShapeElements) {
@@ -53,6 +55,16 @@ public abstract class BlockModel_cullShapeMixin implements ExtendedUnbakedModel
         return this.moreculling$useModelShape;
     }
 
+    @Override
+    public void moreculling$setHasAutoModelShape(boolean hasAutoModelShape) {
+        this.moreculling$hasAutoModelShape = hasAutoModelShape;
+    }
+
+    @Override
+    public boolean moreculling$getHasAutoModelShape() {
+        return this.moreculling$hasAutoModelShape;
+    }
+
     @Override
     public BlockElementFace moreculling$modifyElementFace(BlockElementFace elementFace) {
         return elementFace;
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
@@ -2,11 +2,9 @@
 
 import ca.fxco.moreculling.api.blockstate.StateCullingShapeCache;
 import ca.fxco.moreculling.api.model.BakedOpacity;
-import com.mojang.logging.LogUtils;
-import net.minecraft.client.renderer.block.model.BlockStateModel;
+import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
@@ -37,8 +35,6 @@ public abstract class BlockStateBase_cullShapeMixin implements StateCullingShape
 
     @Shadow public abstract Block getBlock();
 
-    @Shadow public abstract boolean is(Block block);
-
     @Unique
     private VoxelShape[] moreculling$cullingShapesByFace;
 
@@ -49,24 +45,25 @@ public abstract class BlockStateBase_cullShapeMixin implements StateCullingShape
             )
     )
     private void moreculling$customCullingShape(CallbackInfo ci) {
-        if (this.canOcclude) {
-            this.moreculling$cullingShapesByFace = occlusionShapesByFace;
-            return;
-        }
-
         VoxelShape voxelShape = null;
         if (blockRenderManager != null) {
             BlockStateModel model = blockRenderManager.getBlockModel(this.asState());
-            if (model != null && !this.asState().hasProperty(BlockStateProperties.FACING)) {
-                voxelShape = ((BakedOpacity) model).moreculling$getCullingShape(this.asState());
-                if (this.is(Blocks.COPPER_GRATE)) {
-                    LogUtils.getLogger().warn(model.getClass().getName());
-                    LogUtils.getLogger().warn(String.valueOf(voxelShape));
+            if (model != null) {
+                if (((BakedOpacity) model).moreculling$getHasAutoModelShape() && this.canOcclude) {
+                    this.moreculling$cullingShapesByFace = occlusionShapesByFace;
+                    return;
+                }
+                if (!this.asState().hasProperty(BlockStateProperties.FACING)) {
+                    voxelShape = ((BakedOpacity) model).moreculling$getCullingShape(this.asState());
                 }
             }
         }
 
         if (voxelShape == null) {
+            if (this.canOcclude) {
+                this.moreculling$cullingShapesByFace = occlusionShapesByFace;
+                return;
+            }
             voxelShape = this.getBlock().getOcclusionShape(this.asState());
         }
 
diff --git a/common/src/main/java/ca/fxco/moreculling/mixin/models/cullshape/Deserializer_cullShapeMixin.java b/common/src/main/java/ca/fxco/moreculling/mixin/models/cullshape/Deserializer_cullShapeMixin.java
@@ -35,6 +35,7 @@ public class Deserializer_cullShapeMixin {
 
         if (jsonObj.has("useModelShape")) {
             unbakedModel.moreculling$setUseModelShape(jsonObj.get("useModelShape").getAsBoolean());
+            unbakedModel.moreculling$setHasAutoModelShape(false);
         }
     }
 
diff --git a/common/src/main/java/ca/fxco/moreculling/mixin/models/cullshape/ModelManager_cullShapeMixin.java b/common/src/main/java/ca/fxco/moreculling/mixin/models/cullshape/ModelManager_cullShapeMixin.java
@@ -30,7 +30,7 @@ public class ModelManager_cullShapeMixin {
                                                    Map.Entry<ResourceLocation, Resource> entry) {
         UnbakedModel model = (UnbakedModel) originalModel;
 
-        if (entry.getValue().sourcePackId().startsWith("file/")) {
+        if (entry.getValue().sourcePackId().startsWith("file/") && entry.getKey().getPath().contains("block/")) {
             ((ExtendedUnbakedModel) model).moreculling$setUseModelShape(true);
         }
 
diff --git a/common/src/main/java/ca/fxco/moreculling/utils/CullingUtils.java b/common/src/main/java/ca/fxco/moreculling/utils/CullingUtils.java
@@ -1,6 +1,7 @@
 package ca.fxco.moreculling.utils;
 
 import ca.fxco.moreculling.MoreCulling;
+import ca.fxco.moreculling.api.block.LeavesCulling;
 import ca.fxco.moreculling.api.blockstate.MoreStateCulling;
 import ca.fxco.moreculling.api.blockstate.StateCullingShapeCache;
 import it.unimi.dsi.fastutil.objects.Object2ByteLinkedOpenHashMap;
@@ -13,7 +14,6 @@
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.LeavesBlock;
 import net.minecraft.world.level.block.RenderShape;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec3;
@@ -99,15 +99,15 @@ public static boolean areLeavesOpaque() {
 
     public static Optional<Boolean> shouldDrawFaceCheck(BlockGetter view, BlockState sideState,
                                                         BlockPos thisPos, BlockPos sidePos, Direction side) {
-        if (sideState.getBlock() instanceof LeavesBlock ||
+        if (sideState.getBlock() instanceof LeavesCulling ||
                 (sideState.canOcclude() && ((StateCullingShapeCache) sideState)
                         .moreculling$getFaceCullingShape(side.getOpposite()) == Shapes.block())) {
             boolean isSurrounded = true;
             for (Direction dir : DirectionUtils.DIRECTIONS) {
                 if (dir != side) {
                     BlockPos pos = thisPos.relative(dir);
                     BlockState state = view.getBlockState(pos);
-                    isSurrounded &= state.getBlock() instanceof LeavesBlock ||
+                    isSurrounded &= state.getBlock() instanceof LeavesCulling ||
                             (state.canOcclude() && ((StateCullingShapeCache) state)
                                     .moreculling$getFaceCullingShape(dir.getOpposite()) == Shapes.block());
                 }
@@ -120,13 +120,13 @@ public static Optional<Boolean> shouldDrawFaceCheck(BlockGetter view, BlockState
     public static Optional<Boolean> shouldDrawFaceGap(BlockGetter view, BlockState sideState,
                                                       BlockPos sidePos, Direction side) {
         Direction oppositeSide = side.getOpposite();
-        if (sideState.getBlock() instanceof LeavesBlock ||
+        if (sideState.getBlock() instanceof LeavesCulling ||
                 (sideState.canOcclude() && ((StateCullingShapeCache) sideState)
                         .moreculling$getFaceCullingShape(oppositeSide) == Shapes.block())) {
             for (int i = 1; i < (5 - MoreCulling.CONFIG.leavesCullingAmount); i++) {
                 BlockPos pos = sidePos.relative(side, i);
                 BlockState state = view.getBlockState(pos);
-                if (state == null || !(state.getBlock() instanceof LeavesBlock ||
+                if (state == null || !(state.getBlock() instanceof LeavesCulling ||
                         (state.canOcclude() && ((StateCullingShapeCache) state)
                                 .moreculling$getFaceCullingShape(oppositeSide) == Shapes.block()))) {
                     return Optional.of(false);
@@ -138,7 +138,7 @@ public static Optional<Boolean> shouldDrawFaceGap(BlockGetter view, BlockState s
 
     public static Optional<Boolean> shouldDrawFaceDepth(BlockGetter view, BlockState sideState,
                                                         BlockPos sidePos, Direction side) {
-        if (sideState.getBlock() instanceof LeavesBlock ||
+        if (sideState.getBlock() instanceof LeavesCulling ||
                 (sideState.canOcclude() && ((StateCullingShapeCache) sideState)
                         .moreculling$getFaceCullingShape(side.getOpposite()) == Shapes.block())) {
             for (int i = 1; i < MoreCulling.CONFIG.leavesCullingAmount + 1; i++) {
@@ -154,7 +154,7 @@ public static Optional<Boolean> shouldDrawFaceDepth(BlockGetter view, BlockState
 
     public static Optional<Boolean> shouldDrawFaceRandom(BlockGetter view, BlockState sideState,
                                                          BlockPos sidePos, Direction side) {
-        if (sideState.getBlock() instanceof LeavesBlock ||
+        if (sideState.getBlock() instanceof LeavesCulling ||
                 (sideState.canOcclude() && ((StateCullingShapeCache) sideState)
                         .moreculling$getFaceCullingShape(side.getOpposite()) == Shapes.block())) {
             if (RANDOM.nextIntBetweenInclusive(1, MoreCulling.CONFIG.leavesCullingAmount + 1) == 1) {
diff --git a/common/src/main/resources/moreculling.mixins.json b/common/src/main/resources/moreculling.mixins.json
diff --git a/fabric/build.gradle b/fabric/build.gradle
diff --git a/neoforge/src/main/java/ca/fxco/moreculling/mixin/models/cullshape/BlockModel_neoforgeCullShapeMixin.java b/neoforge/src/main/java/ca/fxco/moreculling/mixin/models/cullshape/BlockModel_neoforgeCullShapeMixin.java

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public abstract class MultiPartModel_cacheMixin implements BakedOpacity {`
`53`	`53`	`} else {`
`54`	`54`	`solidFaces = BitUtils.set(solidFaces, face.ordinal());`
`55`	`55`	`for (BakedQuad quad : quads) {`
`56`		`- if (((QuadOpacity) (Object) quad).moreculling$getTextureTranslucency()) {`
	`56`	`+ if (((QuadOpacity) (Object) quad).moreculling$getTextureTranslucency()) {`
`57`	`57`	`solidFaces = BitUtils.unset(solidFaces, face.ordinal());`
`58`	`58`	`break;`
`59`	`59`	`}`