Merge remote-tracking branch 'origin/master' into 1.21.1-multiloader

# Conflicts:
#	.github/workflows/devbuild.yml
#	.github/workflows/publish.yml
#	build.gradle
#	common/src/main/java/ca/fxco/moreculling/MoreCulling.java
#	common/src/main/java/ca/fxco/moreculling/api/block/MoreBlockCulling.java
#	common/src/main/java/ca/fxco/moreculling/api/blockstate/MoreStateCulling.java
#	common/src/main/java/ca/fxco/moreculling/mixin/blocks/EndRodBlock_cullMixin.java
#	common/src/main/java/ca/fxco/moreculling/mixin/blockstates/Block_drawSideMixin.java
#	common/src/main/java/ca/fxco/moreculling/mixin/blockstates/Minecraft_loadBlocksMixin.java
#	common/src/main/java/ca/fxco/moreculling/mixin/compat/BambooStalkBlock_clientTweaksMixin.java
#	common/src/main/java/ca/fxco/moreculling/mixin/models/SimpleBakedModel_cacheMixin.java
#	common/src/main/java/ca/fxco/moreculling/platform/services/IPlatformHelper.java
#	common/src/main/java/ca/fxco/moreculling/utils/CullingUtils.java
#	common/src/main/java/ca/fxco/moreculling/utils/VertexUtils.java
#	common/src/main/resources/assets/moreculling/lang/uk_ua.json
#	fabric/src/main/java/ca/fxco/moreculling/mixin/compat/AbstractBlockRenderContext_vulkanModMixin.java
#	fabric/src/main/java/ca/fxco/moreculling/platform/FabricPlatformHelper.java
#	fabric/src/main/resources/moreculling.fabric.mixins.json
#	gradle.properties
#	gradle/wrapper/gradle-wrapper.properties
#	neoforge/src/main/java/ca/fxco/moreculling/MoreCullingNeoforge.java
#	neoforge/src/main/java/ca/fxco/moreculling/platform/NeoForgePlatformHelper.java

Author: 1foxy2

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     // see https://fabricmc.net/develop/ for new versions
-    id 'fabric-loom' version '1.8-SNAPSHOT' apply false
+    id 'fabric-loom' version '1.9-SNAPSHOT' apply false
     // see https://projects.neoforged.net/neoforged/moddevgradle for new versions
     id 'net.neoforged.moddev' version '2.0.74' apply false
 }

buildSrc/src/main/groovy/multiloader-common.gradle

@@ -16,15 +16,6 @@ java {
 repositories {
     mavenCentral()
     // https://docs.gradle.org/current/userguide/declaring_repositories.html#declaring_content_exclusively_found_in_one_repository
-    exclusiveContent {
-        forRepository {
-            maven {
-                name = 'Sponge'
-                url = 'https://repo.spongepowered.org/repository/maven-public'
-            }
-        }
-        filter { includeGroupAndSubgroups('org.spongepowered') }
-    }
     exclusiveContent {
         forRepositories(
                 maven {
@@ -49,16 +40,13 @@ repositories {
             includeGroup "curse.maven"
         }
     }
-    maven {
-        name = 'BlameJared'
-        url = 'https://maven.blamejared.com'
-    }
     maven { //AutoConfig
         name = "Shedaniel's Maven"
         url = "https://maven.shedaniel.me/"
     }
     maven { url 'https://maven.fallenbreath.me/releases' }
     maven { url 'https://maven.bawnorton.com/releases' }
+    maven { url 'https://libraries.minecraft.net/' }
 }
 
 // Declare capabilities on the outgoing configurations.
@@ -74,17 +62,7 @@ repositories {
     }
 }
 
-sourcesJar {
-    from(rootProject.file('LICENSE')) {
-        rename { "${it}_${mod_name}" }
-    }
-}
-
 jar {
-    from(rootProject.file('LICENSE')) {
-        rename { "${it}_${mod_name}" }
-    }
-
     manifest {
         attributes([
                 'Specification-Title'   : mod_name,

common/build.gradle

@@ -5,6 +5,7 @@ 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()) {
@@ -17,12 +18,13 @@ neoForge {
 }
 
 dependencies {
-    compileOnly group: 'org.spongepowered', name: 'mixin', version: '0.8.5'
+    compileOnly group: 'net.fabricmc', name: 'sponge-mixin', version: '0.15.3+mixin.0.8.7'
 
     compileOnly group: 'io.github.llamalad7', name: 'mixinextras-common', version: '0.3.5'
     annotationProcessor group: 'io.github.llamalad7', name: 'mixinextras-common', version: '0.3.5'
 
-    implementation "maven.modrinth:sodium:${project.sodium_version}-neoforge"
+    compileOnly "maven.modrinth:sodium:${project.sodium_version}-neoforge"
+    //implementation "maven.modrinth:client-tweaks:${project.clienttweaks_version}+neoforge-${project.minecraft_version}"
 
     api "me.shedaniel.cloth:cloth-config-neoforge:${project.cloth_config_version}"
 

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

@@ -0,0 +1,22 @@
+package ca.fxco.moreculling.api.blockstate;
+
+import net.minecraft.core.Direction;
+import net.minecraft.world.phys.shapes.VoxelShape;
+
+/**
+ * StateCullingShapeCache is an interface to access the shape cache.
+ *
+ * @since 1.2.3
+ */
+public interface StateCullingShapeCache {
+
+    /**
+     * Get the voxelshape of a culling face
+     *
+     * @param face The face to get the shape from
+     * @return The VoxelShape for the face.
+     * @since 1.2.3
+     */
+    VoxelShape moreculling$getFaceCullingShape(Direction face);
+
+}

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

@@ -53,9 +53,9 @@ 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 0.25.0
+     * @since 1.2.3
      */
-    default void moreculling$resetTranslucencyCache() {}
+    default void moreculling$resetTranslucencyCache(BlockState state) {}
 
     /**
      * Gets the VoxelShape culling shape for the baked model.
@@ -85,4 +85,10 @@ public interface BakedOpacity {
     default boolean moreculling$canSetCullingShape() {
         return false;
     }
+
+    default boolean moreculling$isItem() {
+        return false;
+    }
+
+    default void moreculling$setIsItem() {}
 }

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

@@ -19,28 +19,32 @@ public interface ExtendedUnbakedModel {
      *
      * @since 0.25.0
      */
-    void moreculling$setCullShapeElements(List<CullShapeElement> cullShapeElements);
+    default void moreculling$setCullShapeElements(List<CullShapeElement> cullShapeElements) {}
 
     /**
      * Gets the CullShapeElement for the extended unbaked model
      *
      * @since 0.25.0
      */
-    List<CullShapeElement> moreculling$getCullShapeElements(ResourceLocation id);
+    default List<CullShapeElement> moreculling$getCullShapeElements(ResourceLocation id) {
+        return List.of();
+    }
 
     /**
      * When set to true, the cull shape is completely ignored and instead the model will be used as the cull shape
      *
      * @since 0.25.0
      */
-    void moreculling$setUseModelShape(boolean useModelShape);
+    default void moreculling$setUseModelShape(boolean useModelShape) {}
 
     /**
      * Returns if it should use the model shape instead of the cull shape
      *
      * @since 0.25.0
      */
-    boolean moreculling$getUseModelShape(ResourceLocation id);
+    default boolean moreculling$getUseModelShape(ResourceLocation id) {
+        return false;
+    }
 
     /**
      * ModelElementFace is just final's, that should not change. However, you can create a new ModelElementFace or wrap

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

@@ -4,31 +4,30 @@
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import net.minecraft.client.Camera;
 import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.entity.ItemRenderer;
+import net.minecraft.client.renderer.entity.state.ItemFrameRenderState;
+import net.minecraft.client.renderer.item.ItemStackRenderState;
 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 ItemRenderer}
+ * Use these methods over ones provided in {@link ItemStackRenderState}
  *
  * @since 0.8.0
  */
 
-public interface ExtendedItemRenderer {
+public interface ExtendedItemStackRenderState {
 
     /**
      * 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, ItemStack stack, int light, int overlay,
+    void moreculling$renderBakedItemModelWithoutFace(BakedModel model, int light, int overlay,
                                                      PoseStack poseStack, VertexConsumer vertices,
                                                      @Nullable Direction withoutFace);
 
@@ -38,7 +37,7 @@ public interface ExtendedItemRenderer {
      *
      * @since 0.25.0
      */
-    void moreculling$renderBakedItemModelForFace(BakedModel model, ItemStack stack, int light, int overlay,
+    void moreculling$renderBakedItemModelForFace(BakedModel model, int light, int overlay,
                                                  PoseStack poseStack, VertexConsumer vertices, Direction face);
 
     /**
@@ -47,16 +46,17 @@ public interface ExtendedItemRenderer {
      *
      * @since 0.25.0
      */
-    void moreculling$renderBakedItemModelOnly3Faces(BakedModel model, ItemStack stack, int light, int overlay,
+    void moreculling$renderBakedItemModelOnly3Faces(BakedModel model, 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(ItemStack stack, PoseStack poseStack, MultiBufferSource multiBufferSource,
-                                         int light, ItemFrame frame, Camera camera);
+    void moreculling$renderItemFrameItem(PoseStack poseStack, MultiBufferSource multiBufferSource,
+                                         int light, ItemFrameRenderState frame, Camera camera);
 }

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

@@ -227,6 +227,42 @@ 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)
@@ -277,6 +313,16 @@ public static Screen createConfigScreen(Screen parent) {
         generalCategory.addEntry(itemFrame3FaceCulling);
         generalCategory.addEntry(itemFrame3FaceCullingRange);
 
+        // BlockStates
+        generalCategory.addEntry(new DynamicBooleanBuilder("moreculling.config.option.paintingCulling")
+                .setValue(MoreCulling.CONFIG.paintingCulling)
+                .setDefaultValue(true)
+                .setTooltip(Component.translatable("moreculling.config.option.paintingCulling.tooltip"))
+                .setSaveConsumer(newValue -> {
+                    MoreCulling.CONFIG.paintingCulling = newValue;
+                })
+                .build());
+
         generalCategory.addEntry(leavesCullingMode);
         generalCategory.addEntry(leavesCullingAmount);
         generalCategory.addEntry(includeMangroveRoots);

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

@@ -18,6 +18,8 @@ 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;
@@ -40,6 +42,8 @@ public class MoreCullingConfig implements ConfigData {
 
     public float itemFrame3FaceCullingRange = 4F; // default 4 blocks away
 
+    public boolean paintingCulling = true;
+
     public LeavesCullingMode leavesCullingMode = LeavesCullingMode.DEFAULT;
 
     public int leavesCullingAmount = 2;