fix leaves and neoforge config screen

Author: 1foxy2

common/src/main/java/ca/fxco/moreculling/mixin/blocks/LeavesBlock_typesMixin.java

@@ -16,6 +16,9 @@
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+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;
 
@@ -33,13 +36,16 @@ public LeavesBlock_typesMixin(Properties settings) {
         super(settings);
     }
 
-    @Override
-    public boolean skipRendering(BlockState state, BlockState stateFrom, Direction direction) {
+    @Inject(
+            method = "skipRendering",
+            at = @At(value = "HEAD"),
+            cancellable = true
+    )
+    public void skipRendering(BlockState state, BlockState stateFrom, Direction direction, CallbackInfoReturnable<Boolean> cir) {
         if (MoreCulling.CONFIG.leavesCullingMode == FAST || CullingUtils.areLeavesOpaque() ||
                 (MoreCulling.CONFIG.leavesCullingMode == VERTICAL && direction.getAxis() == Direction.Axis.Y)) {
-            return stateFrom.getBlock() instanceof LeavesCulling || super.skipRendering(state, stateFrom, direction);
+            cir.setReturnValue(stateFrom.getBlock() instanceof LeavesCulling || super.skipRendering(state, stateFrom, direction));
         }
-        return super.skipRendering(state, stateFrom, direction);
     }
 
     @Override

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

@@ -89,7 +89,7 @@ private static boolean shouldDrawFace(BlockGetter world, BlockState thisState, B
     }
 
     public static boolean areLeavesOpaque() {
-        return Minecraft.getInstance().options.cutoutLeaves().get();
+        return !Minecraft.getInstance().options.cutoutLeaves().get();
     }
 
     public static Optional<Boolean> shouldDrawFaceCheck(BlockGetter view, BlockState sideState,

gradle.properties

@@ -25,7 +25,7 @@ neoforge_loader_version_range=[21.11.0-beta,)
 fabric_loader_version=0.18.1
 
 # Mod Properties
-mod_version=1.6.0-beta.1
+mod_version=1.6.0-beta.2
 maven_group=ca.fxco.moreculling
 archives_base_name=moreculling
 license=GPL-3.0-only

neoforge/build.gradle

@@ -35,8 +35,8 @@ neoForge {
 }
 
 dependencies {
-    implementation "net.caffeinemc:sodium-neoforge:${project.sodium_version}"
-    implementation "net.caffeinemc:sodium-neoforge-mod:${project.sodium_version}"
+    runtimeOnly "maven.modrinth:sodium:mc1.21.11-0.8.0-neoforge-neoforge"
+    compileOnly "net.caffeinemc:sodium-neoforge-mod:${project.sodium_version}"
     runtimeOnly "me.shedaniel.cloth:cloth-config-neoforge:${project.cloth_config_version}"
 
     //implementation "maven.modrinth:client-tweaks:${project.clienttweaks_version}+neoforge-${project.minecraft_version}"

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -16,7 +16,7 @@ authors="${mod_author}" #optional
 description='''${description}'''
 
 [modproperties.${mod_id}]
-"sodium:config_api_user" = "ca.fxco.moreculling.config.sodium.SodiumConfigBuilder"
+"sodium:config_api_user" = "ca.fxco.moreculling.config.sodium.MoreCullingSodiumConfigBuilder"
 
 [modproperties.modmenu]
 badges=["client"]