Backport

Author: 1foxy2

common/build.gradle

@@ -5,7 +5,6 @@ plugins {
 
 neoForge {
     neoFormVersion = neo_form_version
-    validateAccessTransformers = true
     // Automatically enable AccessTransformers if the file exists
     def at = file('src/main/resources/META-INF/accesstransformer.cfg')
     if (at.exists()) {

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

@@ -18,5 +18,11 @@ public interface StateCullingShapeCache {
      * @since 1.2.3
      */
     VoxelShape moreculling$getFaceCullingShape(Direction face);
+    /**
+     * Initialize the voxelshape used for culling
+     *
+     * @since 1.2.3
+     */
+    void moreculling$initShapeCache();
 
 }

common/src/main/java/ca/fxco/moreculling/api/model/BakedOpacity.java

@@ -53,7 +53,7 @@ public interface BakedOpacity {
      * When called this method will reset the translucency cache of the model.
      * This should be called if the texture of the model is ever changed!
      *
-     * @since 1.2.3
+     * @since 1.0.5
      */
     default void moreculling$resetTranslucencyCache(BlockState state) {}
 
@@ -85,10 +85,4 @@ public interface BakedOpacity {
     default boolean moreculling$canSetCullingShape() {
         return false;
     }
-
-    default boolean moreculling$isItem() {
-        return false;
-    }
-
-    default void moreculling$setIsItem() {}
 }

…derers/ExtendedItemStackRenderState.java …/api/renderers/ExtendedItemRenderer.javacommon/src/main/java/ca/fxco/moreculling/api/renderers/ExtendedItemStackRenderState.java renamed to common/src/main/java/ca/fxco/moreculling/api/renderers/ExtendedItemRenderer.java common/src/main/java/ca/fxco/moreculling/api/renderers/ExtendedItemStackRenderState.java renamed to common/src/main/java/ca/fxco/moreculling/api/renderers/ExtendedItemRenderer.java

@@ -4,30 +4,31 @@
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import net.minecraft.client.Camera;
 import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.entity.state.ItemFrameRenderState;
-import net.minecraft.client.renderer.item.ItemStackRenderState;
+import net.minecraft.client.renderer.entity.ItemRenderer;
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.core.Direction;
+import net.minecraft.world.entity.decoration.ItemFrame;
+import net.minecraft.world.item.ItemStack;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * This interface allows you to call the MoreCulling methods used for item rendering.
  * This gives you access to the custom MoreCulling rendering methods, in order to allow everyone to benefit from the
  * performance boost that MoreCulling can offer.<br/>
- * Use these methods over ones provided in {@link ItemStackRenderState}
+ * Use these methods over ones provided in {@link ItemRenderer}
  *
  * @since 0.8.0
  */
 
-public interface ExtendedItemStackRenderState {
+public interface ExtendedItemRenderer {
 
     /**
      * This will render a baked item model without a specific face. (Item Frame)
      * This can be used to skip the face of an item that cannot be seen
      *
      * @since 0.25.0
      */
-    void moreculling$renderBakedItemModelWithoutFace(BakedModel model, int light, int overlay,
+    void moreculling$renderBakedItemModelWithoutFace(BakedModel model, ItemStack stack, int light, int overlay,
                                                      PoseStack poseStack, VertexConsumer vertices,
                                                      @Nullable Direction withoutFace);
 
@@ -37,7 +38,7 @@ public interface ExtendedItemStackRenderState {
      *
      * @since 0.25.0
      */
-    void moreculling$renderBakedItemModelForFace(BakedModel model, int light, int overlay,
+    void moreculling$renderBakedItemModelForFace(BakedModel model, ItemStack stack, int light, int overlay,
                                                  PoseStack poseStack, VertexConsumer vertices, Direction face);
 
     /**
@@ -46,17 +47,16 @@ public interface ExtendedItemStackRenderState {
      *
      * @since 0.25.0
      */
-    void moreculling$renderBakedItemModelOnly3Faces(BakedModel model, int light, int overlay,
+    void moreculling$renderBakedItemModelOnly3Faces(BakedModel model, ItemStack stack, int light, int overlay,
                                                     PoseStack poseStack, VertexConsumer vertices,
                                                     Direction faceX, Direction faceY, Direction faceZ);
 
-
     /**
      * This will render an item as if it was in an item frame like MoreCulling, it will automatically include all of
      * MoreCulling's optimizations.
      *
      * @since 0.25.0
      */
-    void moreculling$renderItemFrameItem(PoseStack poseStack, MultiBufferSource multiBufferSource,
-                                         int light, ItemFrameRenderState frame, Camera camera);
+    void moreculling$renderItemFrameItem(ItemStack stack, PoseStack poseStack, MultiBufferSource multiBufferSource,
+                                         int light, ItemFrame frame, Camera camera);
 }

common/src/main/java/ca/fxco/moreculling/config/ModMenuConfig.java

@@ -227,42 +227,6 @@ public static Screen createConfigScreen(Screen parent) {
                 })
                 .build());
 
-        //dont cull list
-        generalCategory.addEntry(new StringListBuilder(
-                Component.translatable("text.cloth-config.reset_value"),
-                Component.translatable("moreculling.config.option.dontCull"), MoreCulling.CONFIG.dontCull)
-                .setDefaultValue(new ArrayList<>())
-                .setTooltip(Component.translatable("moreculling.config.option.dontCull.tooltip"))
-                .setSaveConsumer(
-                        value -> {
-                            MoreCulling.CONFIG.dontCull.forEach(prevBlockId -> {
-                                        Optional<Holder.Reference<Block>> optionalBlock =
-                                                BuiltInRegistries.BLOCK.get(ResourceLocation.parse(prevBlockId));
-
-                                        if (optionalBlock.isEmpty())
-                                            return;
-
-                                        ((MoreBlockCulling) optionalBlock.get().value()).moreculling$setCanCull(true);
-                                    }
-                            );
-
-                            value.forEach(blockId -> {
-                                Optional<Holder.Reference<Block>> optionalBlock = BuiltInRegistries.BLOCK.get(ResourceLocation.parse(blockId));
-
-                                if (optionalBlock.isEmpty()) {
-                                    MoreCulling.LOGGER.warn("Block with id {} doesn't exist", blockId);
-                                    return;
-                                }
-
-                                MoreBlockCulling block = (MoreBlockCulling) optionalBlock.get().value();
-                                if (block.moreculling$canCull())
-                                    block.moreculling$setCanCull(false);
-                            });
-
-                            MoreCulling.CONFIG.dontCull = value;
-                        }
-                ).build());
-
         // Item Frames
         DynamicBooleanListEntry itemFrameMapCulling = new DynamicBooleanBuilder("moreculling.config.option.itemFrameMapCulling")
                 .setValue(MoreCulling.CONFIG.itemFrameMapCulling)

common/src/main/java/ca/fxco/moreculling/config/MoreCullingConfig.java

@@ -18,8 +18,6 @@ public class MoreCullingConfig implements ConfigData {
     // You can disable the sodium menu in the config
     public boolean enableSodiumMenu = true;
 
-    public List<String> dontCull = new ArrayList<>();
-
     public boolean cloudCulling = true;
 
     public boolean signTextCulling = true;