port: Spring to Life (1.21.5)

Also apply fixes to 1.21.4

.gitignore

@@ -1,25 +1,20 @@
-# gradle
-
-.gradle/
-out/
-classes/
 build/
-
-# idea
-
-.idea/
-*.iml
 *.ipr
+run/
 *.iws
-
-# vscode
-
-.settings/
-.vscode/
+out/
+*.iml
+.gradle/
+output/
 bin/
+libs/
+.architectury-transformer/
+
 .classpath
 .project
-
-# fabric
-
-run/
+.idea/
+classes/
+.metadata
+.vscode
+.settings
+*.launch

build.gradle

@@ -1,92 +1,76 @@
 plugins {
-	id 'fabric-loom' version '0.5-SNAPSHOT'
-	id 'maven-publish'
+    id "architectury-plugin" version "3.4-SNAPSHOT"
+    id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false
+    id "me.shedaniel.unified-publishing" version "0.1.+" apply false
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
-
-archivesBaseName = project.archives_base_name
-version = project.mod_version
-group = project.maven_group
-
-minecraft {
+architectury {
+    injectInjectables = false
+    minecraft = rootProject.minecraft_version
 }
 
 repositories {
-	maven { url "https://jitpack.io" }
+    maven {
+        url = "https://api.modrinth.com/maven"
+    }
+}
+
+subprojects {
+    apply plugin: "dev.architectury.loom"
+
+    loom {
     }
 
     dependencies {
-	//to change the versions see the gradle.properties file
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-	modCompile "net.fabricmc:fabric-loader:${project.loader_version}"
-
-	modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-	
-	modImplementation ("me.sargunvohra.mcmods:autoconfig1u:${project.auto_config_version}"){
-        exclude module: "fabric-api"
-    }
-	modImplementation ("me.shedaniel.cloth:config-2:${project.cloth_config_version}"){
-        exclude module: "fabric-api"
-    }
-	modImplementation ("io.github.prospector:modmenu:${project.mod_menu_version}"){
-        exclude module: "fabric-api"
-    }
-	include "me.sargunvohra.mcmods:autoconfig1u:${project.auto_config_version}"
-	include "me.shedaniel.cloth:config-2:${project.cloth_config_version}"
-}
-
-processResources {
-	inputs.property "version", project.version
-
-	from(sourceSets.main.resources.srcDirs) {
-		include "fabric.mod.json"
-		expand "version": project.version
-	}
-
-	from(sourceSets.main.resources.srcDirs) {
-		exclude "fabric.mod.json"
-	}
-}
-
-// ensure that the encoding is set to UTF-8, no matter what the system default is
-// this fixes some edge cases with special characters not displaying correctly
-// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-tasks.withType(JavaCompile) {
-	options.encoding = "UTF-8"
-}
-
-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// if it is present.
-// If you remove this task, sources will not be generated.
-task sourcesJar(type: Jar, dependsOn: classes) {
-	classifier = "sources"
-	from sourceSets.main.allSource
-}
-
-jar {
-	from "LICENSE"
-}
-
-// configure the maven publication
-publishing {
-	publications {
-		mavenJava(MavenPublication) {
-			// add all the jars that should be included when publishing to maven
-			artifact(remapJar) {
-				builtBy remapJar
-			}
-			artifact(sourcesJar) {
-				builtBy remapSourcesJar
+        minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
+        // The following line declares the mojmap mappings, you may use other mappings as well
+        //mappings loom.officialMojangMappings()
+        // The following line declares the yarn mappings you may select this one as well.
+        mappings loom.layered {
+            it.mappings("net.fabricmc:yarn:$rootProject.yarn_mappings:v2")
+            it.mappings("dev.architectury:yarn-mappings-patch-neoforge:$rootProject.yarn_mappings_patch_neoforge_version")
         }
     }
 }
 
-	// select the repositories you want to publish to
+allprojects {
+    apply plugin: "java"
+    apply plugin: "architectury-plugin"
+    apply plugin: "maven-publish"
+
+    archivesBaseName = rootProject.archives_base_name
+    version = rootProject.mod_version
+    group = rootProject.maven_group
+
     repositories {
-		// uncomment to publish to the local maven
-		// mavenLocal()
+        // Add repositories to retrieve artifacts from in here.
+        // You should only use this when depending on other mods because
+        // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
+        // See https://docs.gradle.org/current/userguide/declaring_repositories.html
+        // for more information about repositories.
+    }
+
+    tasks.withType(JavaCompile).configureEach {
+        options.encoding = "UTF-8"
+        options.release = 21
+    }
+    ext {
+        releaseChangelog = {
+            def changes = new StringBuilder()
+            changes << "## CullLeaves v$project.version for $project.minecraft_version\n[View the changelog](https://www.github.com/TeamMidnightDust/CullLeaves/commits/)"
+            def proc = "git log --max-count=200 --pretty=format:%s".execute()
+            proc.in.eachLine { line ->
+                def processedLine = line.toString()
+                if (!processedLine.contains("New translations") && !processedLine.contains("Merge") && !processedLine.contains("branch")) {
+                    changes << "\n- ${processedLine.capitalize()}"
+                }
+            }
+            proc.waitFor()
+            return changes.toString()
+        }
+    }
+
+    java {
+        withSourcesJar()
     }
 }

common/build.gradle

@@ -0,0 +1,17 @@
+architectury {
+    injectInjectables = false
+    common(rootProject.enabled_platforms.split(","))
+}
+
+repositories {
+    maven { url "https://api.modrinth.com/maven" }
+}
+
+dependencies {
+    // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
+    // Do NOT use other classes from fabric loader
+    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
+    modCompileOnlyApi "maven.modrinth:midnightlib:${rootProject.midnightlib_version}-fabric"
+    // Remove the next line if you don't want to depend on the API
+    //modApi "dev.architectury:architectury:${rootProject.architectury_version}"
+}

common/src/main/java/eu/midnightdust/cullleaves/CullLeavesClient.java

@@ -0,0 +1,78 @@
+package eu.midnightdust.cullleaves;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import eu.midnightdust.cullleaves.config.CullLeavesConfig;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.LeavesBlock;
+import net.minecraft.block.MangroveRootsBlock;
+import net.minecraft.resource.ResourceManager;
+import net.minecraft.resource.SynchronousResourceReloader;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.world.BlockView;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+
+public class CullLeavesClient {
+    public static final String MOD_ID = "cullleaves";
+    public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
+
+    public static boolean forceLeafCulling = false;
+    public static boolean forceHideInnerLeaves = false;
+
+    public static boolean shouldHideBlock(BlockView world, BlockPos pos) {
+        if (CullLeavesClient.forceHideInnerLeaves) {
+            boolean shouldForceCull = true;
+            for (Direction dir : Direction.values()) {
+                BlockState otherState = world.getBlockState(pos.offset(dir));
+                if (!(otherState.getBlock() instanceof LeavesBlock) &&
+                        !otherState.isSideSolidFullSquare(world, pos, dir.getOpposite())) {
+                    shouldForceCull = false;
+                    break;
+                }
+            }
+            return shouldForceCull;
+        }
+        return false;
+    }
+    public static boolean isLeafSideInvisible(BlockState neighborState) {
+        if (CullLeavesConfig.enabled || CullLeavesClient.forceLeafCulling) {
+            return neighborState.getBlock() instanceof LeavesBlock;
+        }
+        else return false;
+    }
+    public static boolean isRootSideInvisible(BlockState neighborState) {
+        if (CullLeavesConfig.cullRoots) {
+            return neighborState.getBlock() instanceof MangroveRootsBlock;
+        }
+        else return false;
+    }
+
+    public static class ReloadListener implements SynchronousResourceReloader {
+        public static final ReloadListener INSTANCE = new ReloadListener();
+
+        private ReloadListener() {}
+
+        @Override
+        public void reload(ResourceManager manager) {
+            CullLeavesClient.forceLeafCulling = false;
+            CullLeavesClient.forceHideInnerLeaves = false;
+            manager.findResources("options", path -> path.toString().startsWith("cullleaves") && path.toString().endsWith("options.json")).forEach((id, resource) -> {
+                try {
+                    JsonObject json = JsonParser.parseReader(resource.getReader()).getAsJsonObject();
+                    if (json.has("forceLeafCulling")) {
+                        CullLeavesClient.forceLeafCulling = json.get("forceLeafCulling").getAsBoolean();
+                        LOGGER.info("Forcing leaf culling as requested by resourcepack");
+                    }
+                    if (json.has("forceHideInnerLeaves")) {
+                        CullLeavesClient.forceHideInnerLeaves = json.get("forceHideInnerLeaves").getAsBoolean();
+                        LOGGER.info("Not rendering inner leaves as requested by resourcepack");
+                    }
+                } catch (IOException e) { throw new RuntimeException(e); }
+            });
+        }
+    }
+}

common/src/main/java/eu/midnightdust/cullleaves/CullLeavesMixinPlugin.java

@@ -0,0 +1,32 @@
+package eu.midnightdust.cullleaves;
+
+import eu.midnightdust.lib.util.PlatformFunctions;
+import org.objectweb.asm.tree.ClassNode;
+import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
+import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
+
+import java.util.List;
+import java.util.Set;
+
+public class CullLeavesMixinPlugin implements IMixinConfigPlugin {
+    private String mixinPackage;
+
+    @Override
+    public void onLoad(String mixinPackage) {
+        this.mixinPackage = mixinPackage + ".";
+    }
+
+    @Override
+    public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
+        final String mixinName = mixinClassName.substring(this.mixinPackage.length());
+
+        if (mixinName.indexOf('.') < 0) return true;
+        return PlatformFunctions.isModLoaded(mixinName.substring(0, mixinName.indexOf('.')));
+    }
+
+    @Override public List<String> getMixins() { return null; }
+    @Override public String getRefMapperConfig() { return null; }
+    @Override public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {}
+    @Override public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {}
+    @Override public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {}
+}

common/src/main/java/eu/midnightdust/cullleaves/config/CullLeavesConfig.java

@@ -0,0 +1,18 @@
+package eu.midnightdust.cullleaves.config;
+
+import eu.midnightdust.lib.config.MidnightConfig;
+import net.minecraft.client.MinecraftClient;
+
+public class CullLeavesConfig extends MidnightConfig {
+    @Entry //  Enable/Disable the mod. Requires Chunk Reload (F3 + A).
+    public static boolean enabled = true;
+    @Entry //  Enable/Disable culling on Mangrove Roots.
+    public static boolean cullRoots = true;
+
+    @Override
+    public void writeChanges(String modid) {
+        var client = MinecraftClient.getInstance();
+        if (client.world != null) client.worldRenderer.reload();
+        super.writeChanges(modid);
+    }
+}

common/src/main/java/eu/midnightdust/cullleaves/mixin/MixinBlockModelRenderer.java

@@ -0,0 +1,26 @@
+package eu.midnightdust.cullleaves.mixin;
+
+import eu.midnightdust.cullleaves.CullLeavesClient;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.LeavesBlock;
+import net.minecraft.client.render.VertexConsumer;
+import net.minecraft.client.render.block.BlockModelRenderer;
+import net.minecraft.client.render.model.BlockModelPart;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.BlockRenderView;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.List;
+
+@Mixin(BlockModelRenderer.class)
+public class MixinBlockModelRenderer {
+    @Inject(at = @At("HEAD"), method = "render(Lnet/minecraft/world/BlockRenderView;Ljava/util/List;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumer;ZI)V", cancellable = true)
+    private void cullleaves$cancelRendering(BlockRenderView world, List<BlockModelPart> parts, BlockState state, BlockPos pos, MatrixStack matrices, VertexConsumer vertexConsumer, boolean cull, int overlay, CallbackInfo ci) {
+        if (state.getBlock() instanceof LeavesBlock &&
+                CullLeavesClient.shouldHideBlock(world, pos)) ci.cancel();
+    }
+}

common/src/main/java/eu/midnightdust/cullleaves/mixin/MixinLeavesBlock.java

@@ -9,20 +9,16 @@ import net.minecraft.block.LeavesBlock;
 import net.minecraft.util.math.Direction;
 import org.spongepowered.asm.mixin.Mixin;
 
-@Mixin(LeavesBlock.class)
+@Mixin(value = LeavesBlock.class, priority = 1900)
 @Environment(EnvType.CLIENT)
-public class MixinLeavesBlock extends Block {
+public abstract class MixinLeavesBlock extends Block {
 
     public MixinLeavesBlock(Settings settings) {
         super(settings);
     }
 
     @Override
-    @SuppressWarnings("deprecation")
     public boolean isSideInvisible(BlockState state, BlockState neighborState, Direction offset) {
-        if (CullLeavesClient.CL_CONFIG.enabled) {
-            return neighborState.getBlock() instanceof LeavesBlock;
-        }
-        else return false;
+        return CullLeavesClient.isLeafSideInvisible(neighborState);
     }
 }

common/src/main/java/eu/midnightdust/cullleaves/mixin/MixinMangroveRootsBlock.java

@@ -0,0 +1,22 @@
+package eu.midnightdust.cullleaves.mixin;
+
+import eu.midnightdust.cullleaves.CullLeavesClient;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.block.*;
+import net.minecraft.util.math.Direction;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(value = MangroveRootsBlock.class, priority = 1900)
+@Environment(EnvType.CLIENT)
+public abstract class MixinMangroveRootsBlock extends Block {
+
+    public MixinMangroveRootsBlock(Settings settings) {
+        super(settings);
+    }
+
+    @Override
+    public boolean isSideInvisible(BlockState state, BlockState neighborState, Direction offset) {
+        return CullLeavesClient.isRootSideInvisible(neighborState);
+    }
+}

common/src/main/resources/architectury.common.json

@@ -0,0 +1,2 @@
+{
+}

common/src/main/resources/assets/cullleaves/lang/de_de.json

@@ -0,0 +1,9 @@
+{
+	"cullleaves.midnightconfig.title":"Cull Leaves Konfiguration",
+	"cullleaves.midnightconfig.enabled.tooltip":"Aktiviert Culling bei Blättern, was zu besserer Performance führt.\n§cNach dem Ändern dieser Option müssen alle Chunks neugeladen werden (F3 + A)",
+	"cullleaves.midnightconfig.enabled.tooltip.sodium":"Aktiviert Culling bei Blättern, was zu besserer Performance führt.",
+	"cullleaves.midnightconfig.enabled":"Aktiviere Culling von Blättern",
+	"cullleaves.midnightconfig.cullRoots.tooltip":"Aktiviert Culling von Mangrovenwurzeln.\n§cNach dem Ändern dieser Option müssen alle Chunks neugeladen werden (F3 + A)",
+	"cullleaves.midnightconfig.cullRoots.tooltip.sodium":"Aktiviert Culling von Mangrovenwurzeln.",
+	"cullleaves.midnightconfig.cullRoots":"Culling von Mangrovenwurzeln"
+}

common/src/main/resources/assets/cullleaves/lang/en_us.json

@@ -0,0 +1,9 @@
+{
+	"cullleaves.midnightconfig.title":"Cull Leaves Config",
+	"cullleaves.midnightconfig.enabled.tooltip":"Enables culling for leaves, providing a nice performance boost.\n§cAfter changing this setting you have to reload all chunks (F3 + A)",
+	"cullleaves.midnightconfig.enabled.tooltip.sodium":"Enables culling for leaves, providing a nice performance boost",
+	"cullleaves.midnightconfig.enabled":"Enable Leaf Culling",
+	"cullleaves.midnightconfig.cullRoots.tooltip":"Enables culling for mangrove roots.\n§cAfter changing this setting you have to reload all chunks (F3 + A)",
+	"cullleaves.midnightconfig.cullRoots.tooltip.sodium":"Enables culling for mangrove roots.",
+	"cullleaves.midnightconfig.cullRoots":"Enable Mangrove Root Culling"
+}

common/src/main/resources/assets/cullleaves/lang/ms_my.json

@@ -0,0 +1,9 @@
+{
+	"cullleaves.midnightconfig.title": "Konfigurasi Cull Leaves",
+	"cullleaves.midnightconfig.enabled.tooltip": "Mendayakan penyorokan daun yang memberikan peningkatan prestasi yang bagus\n§cSelepas menukar tetapan ini, anda perlu memuat semula semua cebisan (F3 + A)",
+	"cullleaves.midnightconfig.enabled.tooltip.sodium": "Mendayakan penyorokan daun yang memberikan peningkatan prestasi yang bagus",
+	"cullleaves.midnightconfig.enabled": "Dayakan Penyorokan Daun",
+	"cullleaves.midnightconfig.cullRoots.tooltip": "Mendayakan penyorokan akar bakau.\n§cSelepas menukar tetapan ini, anda perlu memuat semula semua cebisan (F3 + A)",
+	"cullleaves.midnightconfig.cullRoots.tooltip.sodium": "Mendayakan penyorokan akar bakau.",
+	"cullleaves.midnightconfig.cullRoots": "Dayakan Penyorokan Akar Bakau"
+}

common/src/main/resources/assets/cullleaves/lang/pt_br.json

@@ -0,0 +1,5 @@
+{
+	"cullleaves.midnightconfig.title":"Definições do Cull Leaves",
+	"cullleaves.midnightconfig.enabled.tooltip":"Recarregue os chunks (F3 + A) ao alterar essa opção",
+	"cullleaves.midnightconfig.enabled":"Ativado Cull Leaves"
+}

common/src/main/resources/assets/cullleaves/lang/ru_ru.json

@@ -0,0 +1,10 @@
+{
+	"cullleaves.midnightconfig.title": "Настройки отбраковки листьев",
+	"cullleaves.midnightconfig.enabled.tooltip": "Включает отбраковку листьев, что значительно повышает производительность.\n§cПосле изменения этого параметра вам необходимо перезагрузить все чанки (F3 + A)",
+	"cullleaves.midnightconfig.enabled.tooltip.sodium": "Включает отбраковку листьев, что значительно повышает производительность",
+	"cullleaves.midnightconfig.enabled": "Включить отбраковку листьев",
+	"cullleaves.midnightconfig.cullRoots.tooltip": "Включает отбраковку мангровых корней.\n§cПосле изменения этого параметра вам необходимо перезагрузить все чанки (F3 + A)",
+	"cullleaves.midnightconfig.cullRoots.tooltip.sodium": "Включает отбраковку мангровых корней.",
+	"cullleaves.midnightconfig.cullRoots": "Включить отбраковку мангровых корней",
+	"cullleaves.resourcepack.name": "§2Делает листья идентичными 'умным листьям' в OptiFine"
+}

common/src/main/resources/assets/cullleaves/lang/uk_ua.json

@@ -0,0 +1,8 @@
+{
+	"cullleaves.midnightconfig.title":"Конфігурація Cull Leaves",
+	"cullleaves.midnightconfig.enabled.tooltip":"Вмикає вибраковування листя, забезпечуючи хороше підвищення продуктивності.\n§cПісля зміни цього параметра ви повинні перезавантажити всі чанки (F3 + A)",
+	"cullleaves.midnightconfig.enabled.tooltip.sodium":"Вмикає вибраковування листя, забезпечуючи хороше підвищення продуктивності",
+	"cullleaves.midnightconfig.enabled":"Увімкнути вибраковування листя",
+	"cullleaves.midnightconfig.sodiumBlockFaceCullingFix.tooltip": "Виправляє пакети ресурсів, які використовують мерехтіння вибраковування листя при використанні Sodium.\nЙмовірно, ви хочете, щоб це було ввімкнено.",
+	"cullleaves.midnightconfig.sodiumBlockFaceCullingFix": "Виправити для мода Sodium вибраковування сторін блоку для листя"
+}

common/src/main/resources/assets/cullleaves/lang/vi_vn.json

@@ -0,0 +1,8 @@
+{
+	"cullleaves.midnightconfig.title":"Cấu hình Cull Leaves",
+	"cullleaves.midnightconfig.enabled.tooltip":"Cho phép loại bỏ các lá, giúp tăng hiệu suất tốt.\n§cSau khi thay đổi cài đặt này, bạn phải tải lại tất cả các chunk (F3 + A)",
+	"cullleaves.midnightconfig.enabled.tooltip.sodium":"Cho phép loại bỏ lá, giúp tăng hiệu suất tốt",
+	"cullleaves.midnightconfig.enabled":"Kích hoạt loại bỏ lá",
+	"cullleaves.midnightconfig.sodiumBlockFaceCullingFix.tooltip": "Sửa các gói tài nguyên sử dụng loại bỏ lá nhấp nháy khi sử dụng Sodium.\nBạn có thể muốn kích hoạt tính năng này.",
+	"cullleaves.midnightconfig.sodiumBlockFaceCullingFix": "Khắc phục hiện tượng loại bỏ mặt khối của Sodium trên lá"
+}

common/src/main/resources/assets/cullleaves/lang/zh_cn.json

@@ -0,0 +1,9 @@
+{
+	"cullleaves.midnightconfig.title":"Cull Leaves 选项",
+	"cullleaves.midnightconfig.enabled.tooltip":"剔除树叶，提升性能\n§c更改此选项后须要重新加载全部区块（F3 + A）",
+	"cullleaves.midnightconfig.enabled.tooltip.sodium":"剔除树叶，提升性能",
+	"cullleaves.midnightconfig.enabled":"启用树叶剔除",
+	"cullleaves.midnightconfig.cullRoots.tooltip":"启用红树根剔除\n§c更改此选项后须要重新加载全部区块（F3 + A）",
+	"cullleaves.midnightconfig.cullRoots.tooltip.sodium":"启用红树根剔除",
+	"cullleaves.midnightconfig.cullRoots":"启用红树根剔除"
+}

common/src/main/resources/assets/cullleaves/lang/zh_tw.json

@@ -0,0 +1,8 @@
+{
+	"cullleaves.midnightconfig.title":"Cull Leaves 設定",
+	"cullleaves.midnightconfig.enabled.tooltip":"在樹葉上啟用剃除，獲得良好的效能提升。\n§c更改此設定後，您需要重新載入所有區塊（F3 + A）",
+	"cullleaves.midnightconfig.enabled.tooltip.sodium":"啟用樹葉剔除，獲得良好的效能提升",
+	"cullleaves.midnightconfig.enabled":"啟用樹葉剔除",
+	"cullleaves.midnightconfig.sodiumBlockFaceCullingFix.tooltip": "修復使用 Sodium 的資源包在使用葉子剔除時閃爍的問題。\n您可能想要將此功能啟用。",
+	"cullleaves.midnightconfig.sodiumBlockFaceCullingFix": "修復 Sodium 在葉子上的啟用方塊表面剔除"
+}

common/src/main/resources/assets/cullleaves/lang/zlm_arab.json

@@ -0,0 +1,9 @@
+{
+	"cullleaves.midnightconfig.title": "کونفيݢوراسي Cull Leaves",
+	"cullleaves.midnightconfig.enabled.tooltip": "منداياکن ڤڽوروقن داٴون يڠ ممبريکن ڤنيڠکتن ڤريستاسي يڠ باݢوس\n§cسلڤس منوکر تتڤن اين⹁ اندا ڤرلو مموات سمولا سموا چبيسن (F3 + A)",
+	"cullleaves.midnightconfig.enabled.tooltip.sodium": "منداياکن ڤڽوروقن داٴون يڠ ممبريکن ڤنيڠکتن ڤريستاسي يڠ باݢوس",
+	"cullleaves.midnightconfig.enabled": "داياکن ڤڽوروقن داٴون",
+	"cullleaves.midnightconfig.cullRoots.tooltip": "منداياکن ڤڽوروقن اکر باکاو.\n§cسلڤس منوکر تتڤن اين⹁ اندا ڤرلو مموات سمولا سموا چبيسن (F3 + A)",
+	"cullleaves.midnightconfig.cullRoots.tooltip.sodium": "منداياکن ڤڽوروقن اکر باکاو.",
+	"cullleaves.midnightconfig.cullRoots": "داياکن ڤڽوروقن اکر باکاو"
+}

common/src/main/resources/cullleaves.mixins.json

@@ -0,0 +1,14 @@
+{
+  "required": true,
+  "package": "eu.midnightdust.cullleaves.mixin",
+  "compatibilityLevel": "JAVA_17",
+  "minVersion": "0.8",
+  "client": [
+    "MixinBlockModelRenderer",
+    "MixinLeavesBlock",
+    "MixinMangroveRootsBlock"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}

common/src/main/resources/resourcepacks/smartleaves/assets/cullleaves/options/options.json

@@ -0,0 +1,3 @@
+{
+    "forceLeafCulling": true
+}

common/src/main/resources/resourcepacks/smartleaves/assets/minecraft/models/block/azalea_leaves.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/leaves_notint",
+  "textures": {
+    "all": "minecraft:block/azalea_leaves"
+  }
+}

common/src/main/resources/resourcepacks/smartleaves/assets/minecraft/models/block/flowering_azalea_leaves.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/leaves_notint",
+  "textures": {
+    "all": "minecraft:block/flowering_azalea_leaves"
+  }
+}

common/src/main/resources/resourcepacks/smartleaves/assets/minecraft/models/block/leaves.json

@@ -20,32 +20,32 @@
 		},
 		{
 			"name": "bottom",
-			"from": [0, 0, 0],
-			"to": [16, 0, 16],
+			"from": [0, 0.01, 0],
+			"to": [16, 0.01, 16],
 			"faces": {
 				"up": {"uv": [0, 0, 16, 16], "texture": "#all", "cullface": "down", "tintindex": 0}
 			}
 		},
 		{
 			"name": "west",
-			"from": [0, 0, 0],
-			"to": [0, 16, 16],
+			"from": [0.01, 0, 0],
+			"to": [0.01, 16, 16],
 			"faces": {
 				"east": {"uv": [0, 0, 16, 16], "texture": "#all", "cullface": "west", "tintindex": 0}
 			}
 		},
 		{
 			"name": "north",
-			"from": [0, 0, 0],
-			"to": [16, 16, 0],
+			"from": [0, 0, 0.01],
+			"to": [16, 16, 0.01],
 			"faces": {
 				"south": {"uv": [0, 0, 16, 16], "texture": "#all", "cullface": "north", "tintindex": 0}
 			}
 		},
 		{
 			"name": "east",
-			"from": [16, 0, 0],
-			"to": [16, 16, 16],
+			"from": [15.99, 0, 0],
+			"to": [15.99, 16, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]},
 			"faces": {
 				"west": {"uv": [0, 0, 16, 16], "texture": "#all", "cullface": "east", "tintindex": 0}
@@ -53,8 +53,8 @@
 		},
 		{
 			"name": "south",
-			"from": [0, 0, 16],
-			"to": [16, 16, 16],
+			"from": [0, 0, 15.99],
+			"to": [16, 16, 15.99],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 23]},
 			"faces": {
 				"north": {"uv": [0, 0, 16, 16], "texture": "#all", "cullface": "south", "tintindex": 0}
@@ -62,8 +62,8 @@
 		},
 		{
 			"name": "up",
-			"from": [0, 16, 0],
-			"to": [16, 16, 16],
+			"from": [0, 15.99, 0],
+			"to": [16, 15.99, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]},
 			"faces": {
 				"down": {"uv": [0, 0, 16, 16], "texture": "#all", "cullface": "up", "tintindex": 0}

common/src/main/resources/resourcepacks/smartleaves/assets/minecraft/models/block/leaves_notint.json

@@ -0,0 +1,73 @@
+{
+	"credit": "made by Motschen",
+	"parent": "block/block",
+	"textures": {
+		"particle": "#all"
+	},
+	"elements": [
+		{
+			"name": "main",
+			"from": [0, 0, 0],
+			"to": [16, 16, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 16, 16], "texture": "#all", "cullface": "north"},
+				"east": {"uv": [0, 0, 16, 16], "texture": "#all", "cullface": "east"},
+				"south": {"uv": [0, 0, 16, 16], "texture": "#all", "cullface": "south"},
+				"west": {"uv": [0, 0, 16, 16], "texture": "#all", "cullface": "west"},
+				"up": {"uv": [0, 0, 16, 16], "texture": "#all", "cullface": "up"},
+				"down": {"uv": [0, 0, 16, 16], "texture": "#all", "cullface": "down"}
+			}
+		},
+		{
+			"name": "bottom",
+			"from": [0, 0.01, 0],
+			"to": [16, 0.01, 16],
+			"faces": {
+				"up": {"uv": [0, 0, 16, 16], "texture": "#all", "cullface": "down"}
+			}
+		},
+		{
+			"name": "west",
+			"from": [0.01, 0, 0],
+			"to": [0.01, 16, 16],
+			"faces": {
+				"east": {"uv": [0, 0, 16, 16], "texture": "#all", "cullface": "west"}
+			}
+		},
+		{
+			"name": "north",
+			"from": [0, 0, 0.01],
+			"to": [16, 16, 0.01],
+			"faces": {
+				"south": {"uv": [0, 0, 16, 16], "texture": "#all", "cullface": "north"}
+			}
+		},
+		{
+			"name": "east",
+			"from": [15.99, 0, 0],
+			"to": [15.99, 16, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [23, 8, 8]},
+			"faces": {
+				"west": {"uv": [0, 0, 16, 16], "texture": "#all", "cullface": "east"}
+			}
+		},
+		{
+			"name": "south",
+			"from": [0, 0, 15.99],
+			"to": [16, 16, 15.99],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 23]},
+			"faces": {
+				"north": {"uv": [0, 0, 16, 16], "texture": "#all", "cullface": "south"}
+			}
+		},
+		{
+			"name": "up",
+			"from": [0, 15.99, 0],
+			"to": [16, 15.99, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]},
+			"faces": {
+				"down": {"uv": [0, 0, 16, 16], "texture": "#all", "cullface": "up"}
+			}
+		}
+	]
+}

common/src/main/resources/resourcepacks/smartleaves/license.txt

@@ -1,5 +1,5 @@
 The MIT License
-Copyright © 2020 Motschen
+Copyright © 2022 Motschen
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
 to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,

common/src/main/resources/resourcepacks/smartleaves/pack.mcmeta

@@ -0,0 +1,10 @@
+{
+  "pack": {
+    "pack_format": 15,
+    "supported_formats": [15, 99],
+    "description": {
+      "translate": "cullleaves.resourcepack.name",
+      "fallback": "§2Makes leaves look identical to OptiFine's smart leaves"
+    }
+  }
+}

fabric-like/build.gradle

@@ -0,0 +1,16 @@
+architectury {
+    injectInjectables = false
+    common(rootProject.enabled_platforms.split(","))
+}
+
+loom {
+}
+
+dependencies {
+    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
+    modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
+    // Remove the next line if you don't want to depend on the API
+    //modApi "dev.architectury:architectury-fabric:${rootProject.architectury_version}"
+
+    compileOnly(project(path: ":common", configuration: "namedElements")) { transitive false }
+}

fabric/build.gradle

@@ -0,0 +1,111 @@
+plugins {
+    id "com.github.johnrengelman.shadow" version "7.1.2"
+    id "me.shedaniel.unified-publishing"
+}
+
+architectury {
+    injectInjectables = false
+    platformSetupLoomIde()
+    fabric()
+}
+
+repositories {
+    maven { url "https://api.modrinth.com/maven" }
+}
+
+configurations {
+    common
+    shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
+    compileClasspath.extendsFrom common
+    runtimeClasspath.extendsFrom common
+    developmentFabric.extendsFrom common
+    archivesBaseName = rootProject.archives_base_name + "-fabric"
+}
+
+dependencies {
+    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
+    modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
+    // Remove the next line if you don't want to depend on the API
+    //modApi "dev.architectury:architectury-fabric:${rootProject.architectury_version}"
+    modImplementation include ("maven.modrinth:midnightlib:${rootProject.midnightlib_version}-fabric")
+    modImplementation "maven.modrinth:sodium:${rootProject.sodium_version}-fabric"
+
+    common(project(path: ":common", configuration: "namedElements")) { transitive false }
+    shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
+    common(project(path: ":fabric-like", configuration: "namedElements")) { transitive false }
+    shadowCommon(project(path: ":fabric-like", configuration: "transformProductionFabric")) { transitive false }
+}
+
+processResources {
+    inputs.property "version", project.version
+
+    filesMatching("fabric.mod.json") {
+        expand "version": project.version
+    }
+}
+
+
+shadowJar {
+    exclude "architectury.common.json"
+
+    configurations = [project.configurations.shadowCommon]
+    archiveClassifier = "dev-shadow"
+}
+
+remapJar {
+    injectAccessWidener = true
+    input.set shadowJar.archiveFile
+    dependsOn shadowJar
+}
+
+sourcesJar {
+    def commonSources = project(":common").sourcesJar
+    dependsOn commonSources
+    from commonSources.archiveFile.map { zipTree(it) }
+}
+
+components.java {
+    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
+        skip()
+    }
+}
+
+unifiedPublishing {
+    project {
+        displayName = "CullLeaves v$project.version - Fabric $project.minecraft_version"
+        releaseType = "$project.release_type"
+        changelog = releaseChangelog()
+        gameVersions = []
+        gameLoaders = ["fabric","quilt"]
+        mainPublication remapJar
+        relations {
+            depends {
+                curseforge = "fabric-api"
+                modrinth = "fabric-api"
+            }
+            includes {
+                curseforge = "midnightlib"
+                modrinth = "midnightlib"
+            }
+        }
+
+        var CURSEFORGE_TOKEN = project.findProperty("CURSEFORGE_TOKEN") ?: System.getenv("CURSEFORGE_TOKEN")
+        if (CURSEFORGE_TOKEN != null) {
+            curseforge {
+                token = CURSEFORGE_TOKEN
+                id = rootProject.curseforge_id
+                gameVersions.addAll "Java 17", project.minecraft_version
+            }
+        }
+
+        var MODRINTH_TOKEN = project.findProperty("MODRINTH_TOKEN") ?: System.getenv("MODRINTH_TOKEN")
+        if (MODRINTH_TOKEN != null) {
+            modrinth {
+                token = MODRINTH_TOKEN
+                id = rootProject.modrinth_id
+                version = "$project.version-$project.name"
+                gameVersions.addAll project.minecraft_version
+            }
+        }
+    }
+}

fabric/src/main/java/eu/midnightdust/cullleaves/fabric/CullLeavesClientFabric.java

@@ -0,0 +1,33 @@
+package eu.midnightdust.cullleaves.fabric;
+
+import eu.midnightdust.cullleaves.CullLeavesClient;
+import eu.midnightdust.cullleaves.config.CullLeavesConfig;
+import eu.midnightdust.lib.config.MidnightConfig;
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
+import net.fabricmc.fabric.api.resource.ResourcePackActivationType;
+import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.resource.ResourceManager;
+import net.minecraft.resource.ResourceType;
+import net.minecraft.util.Identifier;
+
+public class CullLeavesClientFabric implements ClientModInitializer {
+    @Override
+    public void onInitializeClient() {
+        MidnightConfig.init(CullLeavesClient.MOD_ID, CullLeavesConfig.class);
+        FabricLoader.getInstance().getModContainer("cullleaves").ifPresent(modContainer -> {
+            ResourceManagerHelper.registerBuiltinResourcePack(Identifier.of(CullLeavesClient.MOD_ID,"smartleaves"), modContainer, ResourcePackActivationType.NORMAL);
+        });
+        ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(new SimpleSynchronousResourceReloadListener() {
+            @Override
+            public Identifier getFabricId() {
+                return Identifier.of(CullLeavesClient.MOD_ID, "resourcepack_options");
+            }
+            @Override
+            public void reload(ResourceManager manager) {
+                CullLeavesClient.ReloadListener.INSTANCE.reload(manager);
+            }
+        });
+    }
+}

fabric/src/main/java/eu/midnightdust/cullleaves/fabric/mixin/sodium/MixinBlockRenderer.java

@@ -0,0 +1,22 @@
+package eu.midnightdust.cullleaves.fabric.mixin.sodium;
+
+import eu.midnightdust.cullleaves.CullLeavesClient;
+import net.caffeinemc.mods.sodium.client.render.chunk.compile.pipeline.BlockRenderer;
+import net.caffeinemc.mods.sodium.client.render.frapi.render.AbstractBlockRenderContext;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.LeavesBlock;
+import net.minecraft.client.render.model.BlockStateModel;
+import net.minecraft.util.math.BlockPos;
+import org.spongepowered.asm.mixin.Mixin;
+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 extends AbstractBlockRenderContext {
+    @Inject(at = @At("HEAD"), method = "renderModel", cancellable = true)
+    public void cullleaves$cancelRendering(BlockStateModel model, BlockState state, BlockPos pos, BlockPos origin, CallbackInfo ci) {
+        if (state.getBlock() instanceof LeavesBlock && CullLeavesClient.shouldHideBlock(this.level, pos))
+            ci.cancel();
+    }
+}

fabric/src/main/java/eu/midnightdust/cullleaves/fabric/mixin/sodium/MixinSodiumGameOptionPages.java

@@ -0,0 +1,55 @@
+package eu.midnightdust.cullleaves.fabric.mixin.sodium;
+
+import eu.midnightdust.cullleaves.config.CullLeavesConfig;
+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 = net.caffeinemc.mods.sodium.client.gui.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;
+    }
+}

fabric/src/main/resources/cullleaves-fabric.mixins.json

@@ -0,0 +1,14 @@
+{
+  "required": true,
+  "package": "eu.midnightdust.cullleaves.fabric.mixin",
+  "plugin": "eu.midnightdust.cullleaves.CullLeavesMixinPlugin",
+  "compatibilityLevel": "JAVA_17",
+  "minVersion": "0.8",
+  "client": [
+    "sodium.MixinBlockRenderer",
+    "sodium.MixinSodiumGameOptionPages"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}

fabric/src/main/resources/fabric.mod.json

@@ -21,19 +21,20 @@
   "environment": "client",
   "entrypoints": {
     "client": [
-      "eu.midnightdust.cullleaves.CullLeavesClient"
-    ],
-    "modmenu": [
-      "eu.midnightdust.cullleaves.config.ModMenuIntegration"
+      "eu.midnightdust.cullleaves.fabric.CullLeavesClientFabric"
     ]
   },
 
   "depends": {
-    "fabric-resource-loader-v0": "*",
-    "minecraft": ">=1.16"
+    "midnightlib": "*",
+    "minecraft": ">=1.21"
+  },
+  "breaks": {
+    "sodium": "<0.6.0"
   },
 
   "mixins": [
-    "cullleaves.mixins.json"
+    "cullleaves.mixins.json",
+    "cullleaves-fabric.mixins.json"
   ]
 }

gradle.properties

@@ -1,21 +1,24 @@
-# Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
+org.gradle.jvmargs=-Xmx4096M
 
-# Fabric Properties
-	# check these on https://fabricmc.net/use
-	minecraft_version=1.16.4
-	yarn_mappings=1.16.4+build.7
-	loader_version=0.10.8
+minecraft_version=1.21.5
+yarn_mappings=1.21.5+build.1
+enabled_platforms=fabric,neoforge
 
-# Mod Properties
-	mod_version = 2.0.0
-	maven_group = eu.midnightdust
 archives_base_name=cullleaves
+mod_version=4.0.4
+maven_group=eu.midnightdust
+release_type=release
+curseforge_id=423254
+modrinth_id=GNxdLCoP
 
-# Dependencies
-	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.26.1+1.16
+midnightlib_version=1.7.1+1.21.4
+sodium_version=mc1.21.5-0.6.13
 
-	auto_config_version = 3.3.1
-	cloth_config_version = 4.8.3
-	mod_menu_version = 1.14.6+build.31
+fabric_loader_version=0.16.13
+fabric_api_version=0.121.0+1.21.5
+
+neoforge_version=21.5.52-beta
+yarn_mappings_patch_neoforge_version = 1.21+build.4
+
+quilt_loader_version=0.18.9
+quilt_fabric_api_version=7.0.6+0.85.0-1.20.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,78 +17,113 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -97,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -105,84 +140,105 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
 fi
 
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -26,9 +26,13 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +55,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,38 +65,26 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

neoforge/build.gradle

@@ -0,0 +1,118 @@
+plugins {
+    id "com.github.johnrengelman.shadow" version "7.1.2"
+    id "me.shedaniel.unified-publishing"
+}
+
+architectury {
+    injectInjectables = false
+    platformSetupLoomIde()
+    neoForge()
+}
+
+loom {}
+repositories {
+    maven { url "https://api.modrinth.com/maven" }
+    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 {
+    common
+    shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
+    compileClasspath.extendsFrom common
+    runtimeClasspath.extendsFrom common
+    developmentForge.extendsFrom common
+    archivesBaseName = rootProject.archives_base_name + "-neoforge"
+}
+
+dependencies {
+    neoForge "net.neoforged:neoforge:${rootProject.neoforge_version}"
+    // 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 }
+    shadowCommon(project(path: ":common", configuration: "transformProductionNeoForge")) { transitive = false }
+}
+
+processResources {
+    inputs.property "version", project.version
+
+    filesMatching("META-INF/neoforge.mods.toml") {
+        expand "version": project.version
+    }
+}
+
+shadowJar {
+    exclude "fabric.mod.json"
+    exclude "architectury.common.json"
+
+    configurations = [project.configurations.shadowCommon]
+    archiveClassifier = "dev-shadow"
+}
+
+remapJar {
+    input.set shadowJar.archiveFile
+    dependsOn shadowJar
+}
+
+sourcesJar {
+    def commonSources = project(":common").sourcesJar
+    dependsOn commonSources
+    from commonSources.archiveFile.map { zipTree(it) }
+}
+
+components.java {
+    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
+        skip()
+    }
+}
+
+unifiedPublishing {
+    project {
+        displayName = "CullLeaves v$project.version - NeoForge $project.minecraft_version"
+        releaseType = "$project.release_type"
+        changelog = releaseChangelog()
+        gameVersions = []
+        gameLoaders = ["neoforge"]
+
+        mainPublication remapJar
+
+        relations {
+            depends {
+                curseforge = "midnightlib"
+                modrinth = "midnightlib"
+            }
+            includes {}
+        }
+
+        var CURSEFORGE_TOKEN = project.findProperty("CURSEFORGE_TOKEN") ?: System.getenv("CURSEFORGE_TOKEN")
+        if (CURSEFORGE_TOKEN != null) {
+            curseforge {
+                token = CURSEFORGE_TOKEN
+                id = rootProject.curseforge_id
+                gameVersions.addAll "Java 17", project.minecraft_version
+                releaseType = "alpha"
+            }
+        }
+
+        var MODRINTH_TOKEN = project.findProperty("MODRINTH_TOKEN") ?: System.getenv("MODRINTH_TOKEN")
+        if (MODRINTH_TOKEN != null) {
+            modrinth {
+                token = MODRINTH_TOKEN
+                id = rootProject.modrinth_id
+                version = "$project.version-$project.name"
+                gameVersions.addAll project.minecraft_version
+            }
+        }
+    }
+}

neoforge/gradle.properties

@@ -0,0 +1 @@
+loom.platform=neoforge

neoforge/src/main/java/eu/midnightdust/cullleaves/neoforge/CullLeavesClientEvents.java

@@ -0,0 +1,42 @@
+package eu.midnightdust.cullleaves.neoforge;
+
+import eu.midnightdust.cullleaves.CullLeavesClient;
+import net.minecraft.resource.*;
+import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
+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.AddClientReloadListenersEvent;
+import net.neoforged.neoforge.event.AddPackFindersEvent;
+import net.neoforged.neoforgespi.locating.IModFile;
+
+import java.util.Optional;
+
+@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(CullLeavesClient.MOD_ID, "smartleaves"), false);
+        }
+    }
+    private static void registerResourcePack(AddPackFindersEvent event, Identifier id, boolean alwaysEnabled) {
+        event.addRepositorySource(((profileAdder) -> {
+            IModFile file = ModList.get().getModFileById(id.getNamespace()).getFile();
+            try {
+                ResourcePackProfile.PackFactory pack = new DirectoryResourcePack.DirectoryBackedFactory(file.findResource("resourcepacks/" + id.getPath()));
+                ResourcePackInfo info = new ResourcePackInfo(id.toString(), Text.of(id.getNamespace()+"/"+id.getPath()), ResourcePackSource.BUILTIN, Optional.empty());
+                ResourcePackProfile packProfile = ResourcePackProfile.create(info, pack, ResourceType.CLIENT_RESOURCES, new ResourcePackPosition(alwaysEnabled, ResourcePackProfile.InsertionPosition.TOP, false));
+                if (packProfile != null) {
+                    profileAdder.accept(packProfile);
+                }
+            } catch (NullPointerException e) {e.fillInStackTrace();}
+        }));
+    }
+    @SubscribeEvent
+    public static void onResourceReload(AddClientReloadListenersEvent event) {
+        event.addListener(Identifier.of(CullLeavesClient.MOD_ID, "resourcepack_options"), CullLeavesClient.ReloadListener.INSTANCE);
+    }
+}

neoforge/src/main/java/eu/midnightdust/cullleaves/neoforge/CullLeavesClientForge.java

@@ -0,0 +1,12 @@
+package eu.midnightdust.cullleaves.neoforge;
+
+import eu.midnightdust.cullleaves.config.CullLeavesConfig;
+import eu.midnightdust.lib.config.MidnightConfig;
+import net.neoforged.fml.common.Mod;
+
+@Mod("cullleaves")
+public class CullLeavesClientForge {
+    public CullLeavesClientForge() {
+        MidnightConfig.init("cullleaves", CullLeavesConfig.class);
+    }
+}

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.BlockStateModel;
+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(BlockStateModel model, BlockState state, BlockPos pos, BlockPos origin, CallbackInfo ci) {
+        if (CullLeavesClient.forceHideInnerLeaves && state.getBlock() instanceof LeavesBlock && CullLeavesClient.shouldHideBlock(cullleaves$client.world, pos))
+            ci.cancel();
+    }
+}

neoforge/src/main/java/eu/midnightdust/cullleaves/neoforge/mixin/sodium/MixinSodiumGameOptionPages.java

@@ -0,0 +1,57 @@
+package eu.midnightdust.cullleaves.neoforge.mixin.sodium;
+
+import eu.midnightdust.cullleaves.CullLeavesClient;
+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(CullLeavesClient.MOD_ID);
+                        }, 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(CullLeavesClient.MOD_ID);
+                        }, opts -> CullLeavesConfig.cullRoots)
+                        .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD)
+                        .setImpact(OptionImpact.MEDIUM)
+                        .build()
+                )
+                .build()
+        );
+
+        return groups;
+    }
+}

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

@@ -0,0 +1,41 @@
+modLoader = "javafml"
+loaderVersion = "[1,)"
+#issueTrackerURL = ""
+license = "MIT License"
+
+[[mods]]
+modId = "cullleaves"
+version = "${version}"
+displayName = "CullLeaves"
+authors = "Motschen, TeamMidnightDust"
+description = '''
+Adds culling to leaf blocks, providing a huge performance boost over vanilla.
+'''
+logoFile = "icon.png"
+
+[[mixins]]
+config = "cullleaves.mixins.json"
+
+[[mixins]]
+config = "cullleaves-neoforge.mixins.json"
+
+[[dependencies.cullleaves]]
+modId = "neoforge"
+required = true
+versionRange = "[20.3,)"
+ordering = "NONE"
+side = "CLIENT"
+
+[[dependencies.cullleaves]]
+modId = "minecraft"
+required = true
+versionRange = "[1.21,)"
+ordering = "NONE"
+side = "CLIENT"
+
+[[dependencies.cullleaves]]
+modId = "midnightlib"
+required = true
+versionRange = "[1.0.0,)"
+ordering = "AFTER"
+side = "CLIENT"

neoforge/src/main/resources/cullleaves-neoforge.mixins.json

@@ -0,0 +1,13 @@
+{
+  "required": true,
+  "package": "eu.midnightdust.cullleaves.neoforge.mixin",
+  "compatibilityLevel": "JAVA_17",
+  "minVersion": "0.8",
+  "client": [
+    "sodium.MixinBlockRenderer",
+    "sodium.MixinSodiumGameOptionPages"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}

neoforge/src/main/resources/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "description": "CullLeaves",
+    "pack_format": 9
+  }
+}

quilt/build.gradle

@@ -0,0 +1,97 @@
+plugins {
+    id "com.github.johnrengelman.shadow" version "7.1.2"
+}
+
+repositories {
+    maven { url "https://maven.quiltmc.org/repository/release/" }
+    maven { url "https://api.modrinth.com/maven" }
+}
+
+architectury {
+    injectInjectables = false
+    platformSetupLoomIde()
+    loader("quilt")
+}
+
+loom {
+}
+
+configurations {
+    common
+    shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
+    compileClasspath.extendsFrom common
+    runtimeClasspath.extendsFrom common
+    developmentQuilt.extendsFrom common
+    archivesBaseName = rootProject.archives_base_name + "-quilt"
+}
+
+dependencies {
+    modImplementation "org.quiltmc:quilt-loader:${rootProject.quilt_loader_version}"
+    modApi "org.quiltmc.quilted-fabric-api:quilted-fabric-api:${rootProject.quilt_fabric_api_version}"
+    // Remove the next few lines if you don't want to depend on the API
+    //modApi("dev.architectury:architectury-fabric:${rootProject.architectury_version}") {
+    //    // We must not pull Fabric Loader from Architectury Fabric
+    //    exclude group: "net.fabricmc"
+    //    exclude group: "net.fabricmc.fabric-api"
+    //}
+    modImplementation "maven.modrinth:midnightlib:${rootProject.midnightlib_version}-quilt"
+    include "maven.modrinth:midnightlib:${rootProject.midnightlib_version}-quilt"
+
+    common(project(path: ":common", configuration: "namedElements")) { transitive false }
+    shadowCommon(project(path: ":common", configuration: "transformProductionQuilt")) { transitive false }
+    common(project(path: ":fabric-like", configuration: "namedElements")) { transitive false }
+    shadowCommon(project(path: ":fabric-like", configuration: "transformProductionQuilt")) { transitive false }
+}
+
+processResources {
+    inputs.property "group", rootProject.maven_group
+    inputs.property "version", project.version
+
+    filesMatching("quilt.mod.json") {
+        expand "group": rootProject.maven_group,
+                "version": project.version
+    }
+}
+
+shadowJar {
+    exclude "architectury.common.json"
+
+    configurations = [project.configurations.shadowCommon]
+    classifier "dev-shadow"
+}
+
+remapJar {
+    input.set shadowJar.archiveFile
+    dependsOn shadowJar
+    classifier null
+}
+
+jar {
+    classifier "dev"
+}
+
+sourcesJar {
+    def commonSources = project(":common").sourcesJar
+    dependsOn commonSources
+    from commonSources.archiveFile.map { zipTree(it) }
+}
+
+components.java {
+    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
+        skip()
+    }
+}
+
+publishing {
+    publications {
+        mavenQuilt(MavenPublication) {
+            artifactId = rootProject.archives_base_name + "-" + project.name
+            from components.java
+        }
+    }
+
+    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+    repositories {
+        // Add repositories to publish to here.
+    }
+}

quilt/gradle.properties

@@ -0,0 +1 @@
+loom.platform=quilt

quilt/src/main/java/eu/midnightdust/cullleaves/quilt/CullLeavesClientQuilt.java

@@ -0,0 +1,17 @@
+package eu.midnightdust.cullleaves.quilt;
+
+import eu.midnightdust.cullleaves.config.CullLeavesConfig;
+import eu.midnightdust.lib.config.MidnightConfig;
+import net.minecraft.util.Identifier;
+import org.quiltmc.loader.api.ModContainer;
+import org.quiltmc.qsl.base.api.entrypoint.client.ClientModInitializer;
+import org.quiltmc.qsl.resource.loader.api.ResourceLoader;
+import org.quiltmc.qsl.resource.loader.api.ResourcePackActivationType;
+
+public class CullLeavesClientQuilt implements ClientModInitializer {
+    @Override
+    public void onInitializeClient(ModContainer mod) {
+        MidnightConfig.init("cullleaves", CullLeavesConfig.class);
+        ResourceLoader.registerBuiltinResourcePack(new Identifier("cullleaves:smartleaves"), mod, ResourcePackActivationType.NORMAL);
+    }
+}

quilt/src/main/resources/quilt.mod.json

@@ -0,0 +1,53 @@
+{
+  "schema_version": 1,
+  "quilt_loader": {
+    "group": "${group}",
+    "id": "cullleaves",
+    "version": "${version}",
+    "intermediate_mappings": "net.fabricmc:intermediary",
+    "entrypoints": {
+      "client_init": [
+        "eu.midnightdust.cullleaves.quilt.CullLeavesClientQuilt"
+      ]
+    },
+    "depends": [
+      {
+        "id": "quilt_loader",
+        "version": "*"
+      },
+      {
+        "id": "quilt_base",
+        "version": "*"
+      },
+      {
+        "id": "midnightlib",
+        "version": "*"
+      }
+    ],
+    "breaks": [
+      {
+        "id": "sodium",
+        "versions": "<0.4.9"
+      }
+    ],
+    "metadata": {
+      "name": "Cull Leaves (Quilt)",
+      "description": "Adds culling to leaf blocks, providing a huge performance boost over vanilla.",
+      "contributors": {
+        "Motschen": "Author",
+        "TeamMidnightDust": "Mascot"
+      },
+      "environment": "client",
+      "contact": {
+        "email": "mail@midnightdust.eu",
+        "homepage": "https://modrinth.com/mod/cullleaves",
+        "issues":  "https://github.com/TeamMidnightDust/CullLeaves/issues",
+        "sources": "https://github.com/TeamMidnightDust/CullLeaves"
+      },
+      "icon": "assets/cullleaves/icon.png"
+    }
+  },
+  "mixin": [
+    "cullleaves.mixins.json"
+  ]
+}

settings.gradle

@@ -1,10 +1,16 @@
 pluginManagement {
     repositories {
-        jcenter()
-        maven {
-            name = 'Fabric'
-            url = 'https://maven.fabricmc.net/'
-        }
+        maven { url "https://maven.fabricmc.net/" }
+        maven { url "https://maven.architectury.dev/" }
+        maven { url "https://maven.neoforged.net/releases" }
         gradlePluginPortal()
     }
 }
+
+include("common")
+include("fabric-like")
+include("fabric")
+//include("quilt")
+include("neoforge")
+
+rootProject.name = "cullleaves"

src/main/java/eu/midnightdust/cullleaves/CullLeavesClient.java

@@ -1,22 +0,0 @@
-package eu.midnightdust.cullleaves;
-
-import eu.midnightdust.cullleaves.config.CullLeavesConfig;
-import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
-import me.sargunvohra.mcmods.autoconfig1u.serializer.JanksonConfigSerializer;
-import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
-import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.util.Identifier;
-
-public class CullLeavesClient implements ClientModInitializer {
-    public static CullLeavesConfig CL_CONFIG;
-
-    public void onInitializeClient() {
-        AutoConfig.register(CullLeavesConfig.class, JanksonConfigSerializer::new);
-        CL_CONFIG = AutoConfig.getConfigHolder(CullLeavesConfig.class).getConfig();
-
-        FabricLoader.getInstance().getModContainer("cullleaves").ifPresent(modContainer -> {
-            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("cullleaves:smartleaves"), "resourcepacks/smartleaves", modContainer, true);
-        });
-    }
-}

src/main/java/eu/midnightdust/cullleaves/config/CullLeavesConfig.java

@@ -1,14 +0,0 @@
-package eu.midnightdust.cullleaves.config;
-
-import me.sargunvohra.mcmods.autoconfig1u.ConfigData;
-import me.sargunvohra.mcmods.autoconfig1u.annotation.Config;
-import me.sargunvohra.mcmods.autoconfig1u.annotation.ConfigEntry;
-import me.sargunvohra.mcmods.autoconfig1u.shadowed.blue.endless.jankson.Comment;
-import net.minecraft.client.render.entity.PlayerModelPart;
-
-@Config(name = "cullleaves")
-public class CullLeavesConfig implements ConfigData {
-
-    @ConfigEntry.Gui.PrefixText //  Enable/Disable the mod. Requires Chunk Reload (F3 + A).
-    public boolean enabled = true;
-}

src/main/java/eu/midnightdust/cullleaves/config/ModMenuIntegration.java

@@ -1,16 +0,0 @@
-package eu.midnightdust.cullleaves.config;
-
-import io.github.prospector.modmenu.api.ConfigScreenFactory;
-import io.github.prospector.modmenu.api.ModMenuApi;
-import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-
-@Environment(EnvType.CLIENT)
-public class ModMenuIntegration implements ModMenuApi {
-
-    @Override
-    public ConfigScreenFactory<?> getModConfigScreenFactory() {
-        return parent -> AutoConfig.getConfigScreen(CullLeavesConfig.class, parent).get();
-    }
-}

src/main/resources/assets/cullleaves/lang/en_us.json

@@ -1,5 +0,0 @@
-{
-	"text.autoconfig.cullleaves.title":"Cull Leaves Config",
-	"text.autoconfig.cullleaves.option.enabled.@PrefixText":"After changing this setting you have to reload all chunks (F3 + A)",
-	"text.autoconfig.cullleaves.option.enabled":"Enabled"
-}

src/main/resources/cullleaves.mixins.json

@@ -1,11 +0,0 @@
-{
-  "required": true,
-  "package": "eu.midnightdust.cullleaves.mixin",
-  "compatibilityLevel": "JAVA_8",
-  "client": [
-    "MixinLeavesBlock"
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  }
-}

src/main/resources/resourcepacks/smartleaves/pack.mcmeta

@@ -1,6 +0,0 @@
-{
-  "pack": {
-    "pack_format": 6,
-    "description": "§2Makes the leaves look identical to the optifine smart leaves effect"
-  }
-}