1.0.1

fix fabric loader crash by directly invoking mixin extras bootstrap before mixin is initialised (closes #9)
refactor SodiumOptionStorage
add more screenshots to README.md
make sodium options a bit clearer to people who don't know what Cull Less Leaves is (modpacks)
javadoc for some sodium compat mixins
optimize imports

Author: isXander

README.md

@@ -4,10 +4,20 @@ Cull Less Leaves is an improved version of [Cull Leaves](https://www.curseforge.
 Instead of leaving just the outer layer of leaves, Cull Less Leaves also renders a certain amount
 of layers defined in the config.
 
+**[Works best with Sodium](https://modrinth.com/mod/sodium)**
+
 Less Culling
 
 ![less culling](https://i.imgur.com/GjYFjJV.png)
 
 Fast Culling (identical to original cull leaves mod)
 
 ![fast culling](https://i.imgur.com/5SPxxYy.png)
+
+Sodium Configuration
+
+![sodium config](https://i.imgur.com/JE0uJ99.png)
+
+Mod Menu Configuration
+
+![mod menu config](https://i.imgur.com/RYNVj3b.png)

build.gradle.kts

@@ -1,4 +1,4 @@
-import com.modrinth.minotaur.dependencies.Dependency
+import com.modrinth.minotaur.dependencies.ModDependency
 
 plugins {
     java
@@ -14,7 +14,7 @@ plugins {
 }
 
 group = "dev.isxander"
-version = "1.0.0"
+version = "1.0.1"
 
 repositories {
     mavenCentral()
@@ -101,10 +101,10 @@ if (modrinthId.isNotEmpty()) {
         loaders.set(listOf("fabric", "quilt"))
         changelog.set(changelogText)
         syncBodyFrom.set(file("README.md").readText())
-//        dependencies.set(listOf(
-//            Dependency("cloth-config", "required"),
-//            Dependency("modmenu", "optional")
-//        ))
+        dependencies.set(listOf(
+            ModDependency("cloth-config", "required"),
+            ModDependency("modmenu", "optional")
+        ))
     }
 }
 

changelogs/1.0.1.md

@@ -0,0 +1,4 @@
+- fix fabric loader crash when using other mods with mixin extras
+- make sodium options a bit clearer to people who don't know what Cull Less Leaves is (modpacks)
+- estonian translation - [Madis0](https://github.com/isXander/CullLessLeaves/pull/6)
+- russian translation - [RozeFound](https://github.com/isXander/CullLessLeaves/pull/5)

src/main/java/dev/isxander/culllessleaves/CullLessLeaves.java

@@ -1,21 +1,28 @@
 package dev.isxander.culllessleaves;
 
+import com.llamalad7.mixinextras.MixinExtrasBootstrap;
 import dev.isxander.culllessleaves.compat.Compat;
 import dev.isxander.culllessleaves.config.CullLessLeavesConfig;
 import me.shedaniel.autoconfig.AutoConfig;
 import me.shedaniel.autoconfig.serializer.Toml4jConfigSerializer;
 import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint;
 import net.minecraft.block.LeavesBlock;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.world.BlockView;
 
-public class CullLessLeaves implements ClientModInitializer {
+public class CullLessLeaves implements ClientModInitializer, PreLaunchEntrypoint {
     @Override
     public void onInitializeClient() {
         AutoConfig.register(CullLessLeavesConfig.class, Toml4jConfigSerializer::new);
     }
 
+    @Override
+    public void onPreLaunch() {
+        MixinExtrasBootstrap.init();
+    }
+
     public static CullLessLeavesConfig getConfig() {
         return AutoConfig.getConfigHolder(CullLessLeavesConfig.class).getConfig();
     }

src/main/java/dev/isxander/culllessleaves/compat/SodiumCompat.java

@@ -8,13 +8,7 @@
 import net.minecraft.client.MinecraftClient;
 
 public class SodiumCompat {
-    public static boolean isFancyLeaves() {
-        return SodiumClientMod.options().quality.leavesQuality.isFancy(MinecraftClient.getInstance().options.graphicsMode);
-    }
-
-    public static class CullLeavesOptionStorage implements OptionStorage<CullLessLeavesConfig> {
-        public static final CullLeavesOptionStorage INSTANCE = new CullLeavesOptionStorage();
-
+    private static final OptionStorage<CullLessLeavesConfig> OPTION_STORAGE = new OptionStorage<CullLessLeavesConfig>() {
         @Override
         public CullLessLeavesConfig getData() {
             return CullLessLeaves.getConfig();
@@ -24,5 +18,13 @@ public CullLessLeavesConfig getData() {
         public void save() {
             AutoConfig.getConfigHolder(CullLessLeavesConfig.class).save();
         }
+    };
+
+    public static boolean isFancyLeaves() {
+        return SodiumClientMod.options().quality.leavesQuality.isFancy(MinecraftClient.getInstance().options.graphicsMode);
+    }
+
+    public static OptionStorage<CullLessLeavesConfig> getOptionStorage() {
+        return OPTION_STORAGE;
     }
 }

src/main/java/dev/isxander/culllessleaves/mixins/BlockMixin.java

@@ -2,7 +2,6 @@
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import dev.isxander.culllessleaves.CullLessLeaves;
-import dev.isxander.culllessleaves.compat.Compat;
 import net.minecraft.block.*;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;

src/main/java/dev/isxander/culllessleaves/mixins/sodiumcompat/BlockOcclusionCacheMixin.java

@@ -15,6 +15,10 @@
 @Pseudo
 @Mixin(BlockOcclusionCache.class)
 public class BlockOcclusionCacheMixin {
+    /**
+     * Sodium caches if the sides are visible which reimplements
+     * vanilla code that this mod uses.
+     */
     @ModifyExpressionValue(method = "shouldDrawSide", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;isSideInvisible(Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/Direction;)Z"))
     private boolean shouldCullSide(boolean isSideInvisible, BlockState state, BlockView view, BlockPos pos, Direction facing) {
         if (!(state.getBlock() instanceof LeavesBlock) || !CullLessLeaves.getConfig().enabled)

src/main/java/dev/isxander/culllessleaves/mixins/sodiumcompat/LeavesBlockMixin.java

@@ -12,6 +12,13 @@ public LeavesBlockMixin(Settings settings) {
         super(settings);
     }
 
+    /**
+     * sodium implements custom logic for
+     * culling leaves when set to fast
+     *
+     * this mixin simply reverts to vanilla behaviour
+     * @see me.jellysquid.mods.sodium.mixin.features.render_layer.leaves.MixinLeavesBlock
+     */
     @Override
     @SuppressWarnings("deprecation")
     public boolean isSideInvisible(BlockState state, BlockState stateFrom, Direction direction) {

src/main/java/dev/isxander/culllessleaves/mixins/sodiumcompat/SodiumGameOptionPagesMixin.java

@@ -1,15 +1,12 @@
 package dev.isxander.culllessleaves.mixins.sodiumcompat;
 
-import dev.isxander.culllessleaves.CullLessLeaves;
 import dev.isxander.culllessleaves.compat.SodiumCompat;
 import me.jellysquid.mods.sodium.client.gui.SodiumGameOptionPages;
 import me.jellysquid.mods.sodium.client.gui.options.*;
 import me.jellysquid.mods.sodium.client.gui.options.control.ControlValueFormatter;
 import me.jellysquid.mods.sodium.client.gui.options.control.SliderControl;
 import me.jellysquid.mods.sodium.client.gui.options.control.TickBoxControl;
-import me.jellysquid.mods.sodium.client.gui.options.storage.SodiumOptionsStorage;
 import net.minecraft.text.TranslatableText;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Pseudo;
 import org.spongepowered.asm.mixin.injection.At;
@@ -23,16 +20,16 @@ public class SodiumGameOptionPagesMixin {
     @ModifyVariable(method = "performance", at = @At(value = "INVOKE", target = "Lcom/google/common/collect/ImmutableList;copyOf(Ljava/util/Collection;)Lcom/google/common/collect/ImmutableList;"))
     private static List<OptionGroup> addLeavesCulling(List<OptionGroup> groups) {
         groups.add(OptionGroup.createBuilder()
-                .add(OptionImpl.createBuilder(boolean.class, SodiumCompat.CullLeavesOptionStorage.INSTANCE)
-                        .setName(new TranslatableText("text.autoconfig.cull-less-leaves.title"))
-                        .setTooltip(new TranslatableText("text.cull-less-leaves.description"))
+                .add(OptionImpl.createBuilder(boolean.class, SodiumCompat.getOptionStorage())
+                        .setName(new TranslatableText("text.cull-less-leaves.sodium.option.enabled"))
+                        .setTooltip(new TranslatableText("text.cull-less-leaves.sodium.option.enabled.description"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> opts.enabled = value, opts -> opts.enabled)
                         .setImpact(OptionImpact.MEDIUM)
                         .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD)
                         .build()
                 )
-                .add(OptionImpl.createBuilder(int.class, SodiumCompat.CullLeavesOptionStorage.INSTANCE)
+                .add(OptionImpl.createBuilder(int.class, SodiumCompat.getOptionStorage())
                         .setName(new TranslatableText("text.cull-less-leaves.sodium.option.depth"))
                         .setTooltip(new TranslatableText("text.autoconfig.cull-less-leaves.option.depth.@Tooltip"))
                         .setControl(o -> new SliderControl(o, 1, 4, 1, ControlValueFormatter.number()))

src/main/resources/assets/cull-less-leaves/lang/en_us.json

@@ -3,6 +3,7 @@
   "text.autoconfig.cull-less-leaves.option.enabled": "Enabled",
   "text.autoconfig.cull-less-leaves.option.depth": "Depth",
   "text.autoconfig.cull-less-leaves.option.depth.@Tooltip": "Amount of layers of leaves before the inside of the leaves is culled.\n1 = Fastest but least good-looking.\n2 = Recommended.\n4 = Slowest but most good-looking.",
-  "text.cull-less-leaves.description": "Enables Cull Less Leaves mod.",
+  "text.cull-less-leaves.sodium.option.enabled": "Cull Leaves",
+  "text.cull-less-leaves.sodium.option.enabled.description": "Enables Cull Less Leaves mod.",
   "text.cull-less-leaves.sodium.option.depth": "Cull Leaves Depth"
 }