Many QoL improvements & Resourcepack features

- Support Sodium 0.6+ - Allow resourcepacks to force culling and hide fully-encircled leaf blocks - Force leaf culling when the smart leaves pack is enabled - Reload world when the config changes - Only apply Sodium mixins when Sodium is actually installed (Removes log spam)
2025-12-16 06:15:08 +01:00 · 2024-12-24 14:01:05 +01:00
parent 1ad05aa6bf
commit b8d2e6b4ab
22 changed files with 343 additions and 46 deletions
--- a/neoforge/build.gradle
+++ b/neoforge/build.gradle
@@ -12,7 +12,15 @@ architectury {
 loom {}
 repositories {
    maven { url "https://api.modrinth.com/maven" }
-    maven {url "https://maven.neoforged.net/releases"}
+    maven { url "https://maven.neoforged.net/releases" }
+    maven { url "https://maven.pkg.github.com/ims212/ForgifiedFabricAPI"
+        credentials {
+            username = "IMS212"
+            // Read only token
+            password = "ghp_" + "DEuGv0Z56vnSOYKLCXdsS9svK4nb9K39C1Hn"
+        }
+    }
+    maven{ url "https://maven.su5ed.dev/releases" }
 }

 configurations {
@@ -29,6 +37,7 @@ dependencies {
    // Remove the next line if you don't want to depend on the API
    //modApi "dev.architectury:architectury-forge:${rootProject.architectury_version}"
    modImplementation "maven.modrinth:midnightlib:${rootProject.midnightlib_version}-neoforge"
+    modImplementation "maven.modrinth:sodium:${rootProject.sodium_version}-neoforge"
    //include "maven.modrinth:midnightlib:${rootProject.midnightlib_version}-forge"

    common(project(path: ":common", configuration: "namedElements")) { transitive false }
--- a/neoforge/src/main/java/eu/midnightdust/cullleaves/neoforge/CullLeavesClientEvents.java
+++ b/neoforge/src/main/java/eu/midnightdust/cullleaves/neoforge/CullLeavesClientEvents.java
@@ -1,5 +1,6 @@
 package eu.midnightdust.cullleaves.neoforge;

+import eu.midnightdust.cullleaves.CullLeavesClient;
 import net.minecraft.resource.*;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
@@ -7,17 +8,18 @@ import net.neoforged.api.distmarker.Dist;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.ModList;
 import net.neoforged.fml.common.EventBusSubscriber;
+import net.neoforged.neoforge.client.event.RegisterClientReloadListenersEvent;
 import net.neoforged.neoforge.event.AddPackFindersEvent;
 import net.neoforged.neoforgespi.locating.IModFile;

 import java.util.Optional;

-@EventBusSubscriber(modid = "cullleaves", bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
+@EventBusSubscriber(modid = CullLeavesClient.MOD_ID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
 public class CullLeavesClientEvents {
    @SubscribeEvent
    public static void addPackFinders(AddPackFindersEvent event) {
        if (event.getPackType() == ResourceType.CLIENT_RESOURCES) {
-            registerResourcePack(event, Identifier.of("cullleaves", "smartleaves"), false);
+            registerResourcePack(event, Identifier.of(CullLeavesClient.MOD_ID, "smartleaves"), false);
        }
    }
    private static void registerResourcePack(AddPackFindersEvent event, Identifier id, boolean alwaysEnabled) {
@@ -33,4 +35,8 @@ public class CullLeavesClientEvents {
            } catch (NullPointerException e) {e.fillInStackTrace();}
        }));
    }
+    @SubscribeEvent
+    public static void onResourceReload(RegisterClientReloadListenersEvent event) {
+        event.registerReloadListener(CullLeavesClient.ReloadListener.INSTANCE);
+    }
 }
--- a/neoforge/src/main/java/eu/midnightdust/cullleaves/neoforge/mixin/sodium/MixinBlockRenderer.java
+++ b/neoforge/src/main/java/eu/midnightdust/cullleaves/neoforge/mixin/sodium/MixinBlockRenderer.java
@@ -0,0 +1,26 @@
+package eu.midnightdust.cullleaves.neoforge.mixin.sodium;
+
+import eu.midnightdust.cullleaves.CullLeavesClient;
+import net.caffeinemc.mods.sodium.client.render.chunk.compile.pipeline.BlockRenderer;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.LeavesBlock;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.model.BakedModel;
+import net.minecraft.util.math.BlockPos;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(BlockRenderer.class)
+public abstract class MixinBlockRenderer {
+    // Unfortunately, we cannot use the level view from AbstractBlockRenderContext on NeoForge because of method conflicts
+    @Unique private static final MinecraftClient cullleaves$client = MinecraftClient.getInstance();
+
+    @Inject(at = @At("HEAD"), method = "renderModel", cancellable = true)
+    public void cullleaves$cancelRendering(BakedModel model, BlockState state, BlockPos pos, BlockPos origin, CallbackInfo ci) {
+        if (CullLeavesClient.forceHideInnerLeaves && state.getBlock() instanceof LeavesBlock && CullLeavesClient.shouldHideBlock(cullleaves$client.world, pos))
+            ci.cancel();
+    }
+}
--- a/neoforge/src/main/java/eu/midnightdust/cullleaves/neoforge/mixin/sodium/MixinSodiumGameOptionPages.java
+++ b/neoforge/src/main/java/eu/midnightdust/cullleaves/neoforge/mixin/sodium/MixinSodiumGameOptionPages.java
@@ -0,0 +1,56 @@
+package eu.midnightdust.cullleaves.neoforge.mixin.sodium;
+
+import eu.midnightdust.cullleaves.config.CullLeavesConfig;
+import net.caffeinemc.mods.sodium.client.gui.SodiumGameOptionPages;
+import net.caffeinemc.mods.sodium.client.gui.options.OptionFlag;
+import net.caffeinemc.mods.sodium.client.gui.options.OptionGroup;
+import net.caffeinemc.mods.sodium.client.gui.options.OptionImpact;
+import net.caffeinemc.mods.sodium.client.gui.options.OptionImpl;
+import net.caffeinemc.mods.sodium.client.gui.options.control.TickBoxControl;
+import net.caffeinemc.mods.sodium.client.gui.options.storage.SodiumOptionsStorage;
+import net.minecraft.text.Text;
+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.ModifyVariable;
+
+import java.util.List;
+
+@Mixin(value = SodiumGameOptionPages.class, remap = false)
+public class MixinSodiumGameOptionPages {
+
+    @Shadow @Final private static SodiumOptionsStorage sodiumOpts;
+
+    @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> cullleaves$addCullLeavesOption(List<OptionGroup> groups) {
+        groups.add(OptionGroup.createBuilder()
+                .add(OptionImpl.createBuilder(boolean.class, sodiumOpts)
+                        .setName(Text.translatable("cullleaves.midnightconfig.enabled"))
+                        .setTooltip(Text.translatable("cullleaves.midnightconfig.enabled.tooltip.sodium"))
+                        .setControl(TickBoxControl::new)
+                        .setBinding((opts, value) -> {
+                            CullLeavesConfig.enabled = value;
+                            CullLeavesConfig.write("cullleaves");
+                        }, opts -> CullLeavesConfig.enabled)
+                        .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD)
+                        .setImpact(OptionImpact.MEDIUM)
+                        .build()
+                ).add(OptionImpl.createBuilder(boolean.class, sodiumOpts)
+                        .setName(Text.translatable("cullleaves.midnightconfig.cullRoots"))
+                        .setTooltip(Text.translatable("cullleaves.midnightconfig.cullRoots.tooltip.sodium"))
+                        .setControl(TickBoxControl::new)
+                        .setBinding((opts, value) -> {
+                            CullLeavesConfig.cullRoots = value;
+                            CullLeavesConfig.write("cullleaves");
+                        }, opts -> CullLeavesConfig.cullRoots)
+                        .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD)
+                        .setImpact(OptionImpact.MEDIUM)
+                        .build()
+                )
+                .build()
+        );
+
+        return groups;
+    }
+}
--- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml
+++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -16,6 +16,9 @@ logoFile = "icon.png"
 [[mixins]]
 config = "cullleaves.mixins.json"

+[[mixins]]
+config = "cullleaves-neoforge.mixins.json"
+
 [[dependencies.cullleaves]]
 modId = "neoforge"
 required = true
@@ -26,7 +29,7 @@ side = "CLIENT"
 [[dependencies.cullleaves]]
 modId = "minecraft"
 required = true
-versionRange = "[1.20,)"
+versionRange = "[1.21,)"
 ordering = "NONE"
 side = "CLIENT"

--- a/neoforge/src/main/resources/cullleaves-neoforge.mixins.json
+++ b/neoforge/src/main/resources/cullleaves-neoforge.mixins.json
@@ -0,0 +1,14 @@
+{
+  "required": true,
+  "package": "eu.midnightdust.cullleaves.neoforge.mixin",
+  "plugin": "eu.midnightdust.cullleaves.CullLeavesMixinPlugin",
+  "compatibilityLevel": "JAVA_17",
+  "minVersion": "0.8",
+  "client": [
+    "sodium.MixinBlockRenderer",
+    "sodium.MixinSodiumGameOptionPages"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}