stonecutter: support 1.20.1

Also apply fixes to 1.21.4

build.gradle

@@ -1,76 +0,0 @@
-plugins {
-    id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
-    id "me.shedaniel.unified-publishing" version "0.1.+" apply false
-}
-
-architectury {
-    injectInjectables = false
-    minecraft = rootProject.minecraft_version
-}
-
-repositories {
-    maven {
-        url = "https://api.modrinth.com/maven"
-    }
-}
-
-subprojects {
-    apply plugin: "dev.architectury.loom"
-
-    loom {
-    }
-
-    dependencies {
-        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")
-        }
-    }
-}
-
-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 {
-        // 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()
-    }
-}

build.gradle.kts

@@ -0,0 +1,237 @@
+plugins {
+    id("dev.architectury.loom")
+    id("architectury-plugin")
+    id("me.modmuss50.mod-publish-plugin")
+    id("com.github.johnrengelman.shadow")
+    `maven-publish`
+}
+
+val minecraft = stonecutter.current.version
+val loader = loom.platform.get().name.lowercase()
+
+version = "${mod.version}+$minecraft"
+group = mod.group
+base {
+    archivesName.set("${mod.id}-$loader")
+}
+
+repositories {
+    maven("https://maven.neoforged.net/releases/")
+    maven("https://api.modrinth.com/maven")
+
+    // modmenu
+    maven("https://maven.terraformersmc.com/")
+    maven("https://maven.nucleoid.xyz/")
+
+    // MidnightLib
+    maven("https://maven.midnightdust.eu/snapshots/")
+}
+dependencies {
+    minecraft("com.mojang:minecraft:$minecraft")
+
+    // MidnightLib
+    modImplementation ("eu.midnightdust:midnightlib:${mod.dep("midnightlib_version")}+${minecraft}-${loader}")
+
+    if (loader == "fabric") {
+        modImplementation("net.fabricmc:fabric-loader:${mod.dep("fabric_loader")}")
+        modImplementation("net.fabricmc.fabric-api:fabric-api:${mod.dep("fabric_version")}")
+
+        modCompileOnly("maven.modrinth:sodium:${mod.dep("sodium_version")}-fabric")
+    }
+    if (loader == "forge") {
+        "forge"("net.minecraftforge:forge:${minecraft}-${mod.dep("forge_loader")}")
+
+        modCompileOnly("maven.modrinth:xenon-forge:0.3.31")
+    }
+    if (loader == "neoforge") {
+        "neoForge"("net.neoforged:neoforge:${mod.dep("neoforge_loader")}")
+        modCompileOnly("maven.modrinth:sodium:${mod.dep("sodium_version")}-neoforge")
+    }
+    mappings (loom.officialMojangMappings())
+}
+
+loom {
+    //accessWidenerPath = rootProject.file("src/main/resources/template.accesswidener")
+
+    decompilers {
+        get("vineflower").apply { // Adds names to lambdas - useful for mixins
+            options.put("mark-corresponding-synthetics", "1")
+        }
+    }
+    if (loader == "forge") {
+        forge.mixinConfigs("cullleaves.mixins.json", "cullleaves-neoforge.mixins.json")
+    }
+}
+
+publishMods {
+    val modrinthToken = System.getenv("MODRINTH_TOKEN")
+    val curseforgeToken = System.getenv("CURSEFORGE_TOKEN")
+    val githubToken = System.getenv("GITHUB_TOKEN").orEmpty()
+
+    file = project.tasks.remapJar.get().archiveFile
+    dryRun = modrinthToken == null || curseforgeToken == null
+
+    displayName = "${mod.name} ${loader.replaceFirstChar { it.uppercase() }} ${property("mod.mc_title")}-${mod.version}"
+    version = mod.version
+    changelog = rootProject.file("CHANGELOG.md").readText()
+    type = BETA
+
+    modLoaders.add(loader)
+
+    val targets = property("mod.mc_targets").toString().split(' ')
+    modrinth {
+        projectId = property("publish.modrinth").toString()
+        accessToken = modrinthToken
+        targets.forEach(minecraftVersions::add)
+        if (loader == "fabric") {
+            requires("fabric-api")
+            optional("modmenu")
+        }
+    }
+
+    curseforge {
+        projectId = property("publish.curseforge").toString()
+        accessToken = curseforgeToken.toString()
+        targets.forEach(minecraftVersions::add)
+        if (loader == "fabric") {
+            requires("fabric-api")
+            optional("modmenu")
+        }
+    }
+
+    github {
+        accessToken = githubToken
+        repository = "TeamMidnightDust/CullLeaves"
+        commitish = "multiversion" // This is the branch the release tag will be created from
+
+        tagName = "v" + properties["mod.version"]
+
+        // Allow the release to be initially created without any files.
+        allowEmptyFiles = true
+    }
+}
+//publishing {
+//    publications {
+//        create<MavenPublication>("mavenJava") {
+//            pom {
+//                groupId = "eu.midnightdust"
+//                artifactId = "midnightlib"
+//                version = project.version
+//
+//                from(components["java"])
+//            }
+//        }
+//    }
+//}
+publishing {
+    repositories {
+        maven {
+            name = "MidnightDust"
+            url = uri("https://maven.midnightdust.eu/snapshots")
+            credentials(PasswordCredentials::class)
+        }
+    }
+    publications {
+        create<MavenPublication>("mavenJava") {
+            pom {
+                groupId = "eu.midnightdust"
+                artifactId = project.mod.id
+                version = "${project.version}-${loader}"
+
+                from(components["java"])
+            }
+        }
+    }
+}
+
+
+java {
+    withSourcesJar()
+    val java = if (stonecutter.eval(minecraft, ">=1.20.5")) JavaVersion.VERSION_21 else JavaVersion.VERSION_17
+    targetCompatibility = java
+    sourceCompatibility = java
+}
+
+val shadowBundle: Configuration by configurations.creating {
+    isCanBeConsumed = false
+    isCanBeResolved = true
+}
+
+tasks.shadowJar {
+    configurations = listOf(shadowBundle)
+    archiveClassifier = "dev-shadow"
+}
+
+tasks.remapJar {
+    injectAccessWidener = true
+    input = tasks.shadowJar.get().archiveFile
+    archiveClassifier = null
+    dependsOn(tasks.shadowJar)
+}
+
+tasks.jar {
+    archiveClassifier = "dev"
+}
+
+val buildAndCollect = tasks.register<Copy>("buildAndCollect") {
+    group = "build"
+    from(tasks.remapJar.get().archiveFile, tasks.remapSourcesJar.get().archiveFile)
+    into(rootProject.layout.buildDirectory.file("libs/${mod.version}/$loader"))
+    dependsOn("build")
+}
+
+if (stonecutter.current.isActive) {
+    rootProject.tasks.register("buildActive") {
+        group = "project"
+        dependsOn(buildAndCollect)
+    }
+
+    rootProject.tasks.register("runActive") {
+        group = "project"
+        dependsOn(tasks.named("runClient"))
+    }
+}
+
+tasks.processResources {
+    properties(
+        listOf("fabric.mod.json"),
+        "id" to mod.id,
+        "name" to mod.name,
+        "version" to mod.version,
+        "minecraft" to mod.prop("mc_dep_fabric")
+    )
+    properties(
+        listOf("META-INF/mods.toml", "pack.mcmeta"),
+        "id" to mod.id,
+        "name" to mod.name,
+        "version" to mod.version,
+        "minecraft" to mod.prop("mc_dep_forgelike")
+    )
+    properties(
+        listOf("META-INF/neoforge.mods.toml", "pack.mcmeta"),
+        "id" to mod.id,
+        "name" to mod.name,
+        "version" to mod.version,
+        "minecraft" to mod.prop("mc_dep_forgelike")
+    )
+}
+
+tasks.build {
+    group = "versioned"
+    description = "Must run through 'chiseledBuild'"
+}
+
+
+stonecutter {
+    constants {
+        arrayOf("fabric", "neoforge", "forge").forEach { it -> put(it, loader == it) }
+    }
+    replacements.string {
+        direction = eval(current.version, ">=1.21")
+        replace("new ResourceLocation", "ResourceLocation.fromNamespaceAndPath")
+    }
+    replacements.string {
+        direction = eval(current.version, ">=1.21")
+        replace("me.jellysquid.mods.sodium", "net.caffeinemc.mods.sodium")
+    }
+}

buildSrc/build.gradle.kts

@@ -0,0 +1,8 @@
+plugins {
+    `kotlin-dsl`
+    kotlin("jvm") version "2.0.20"
+}
+
+repositories {
+    mavenCentral()
+}

buildSrc/src/main/kotlin/build-extensions.kt

@@ -0,0 +1,33 @@
+import org.gradle.api.Project
+import org.gradle.api.artifacts.dsl.RepositoryHandler
+import org.gradle.kotlin.dsl.expand
+import org.gradle.kotlin.dsl.maven
+import org.gradle.language.jvm.tasks.ProcessResources
+import java.util.*
+
+val Project.mod: ModData get() = ModData(this)
+fun Project.prop(key: String): String? = findProperty(key)?.toString()
+fun String.upperCaseFirst() = replaceFirstChar { if (it.isLowerCase()) it.uppercaseChar() else it }
+
+fun RepositoryHandler.strictMaven(url: String, alias: String, vararg groups: String) = exclusiveContent {
+    forRepository { maven(url) { name = alias } }
+    filter { groups.forEach(::includeGroup) }
+}
+
+fun ProcessResources.properties(files: Iterable<String>, vararg properties: Pair<String, Any>) {
+    for ((name, value) in properties) inputs.property(name, value)
+    filesMatching(files) {
+        expand(properties.toMap())
+    }
+}
+
+@JvmInline
+value class ModData(private val project: Project) {
+    val id: String get() = requireNotNull(project.prop("mod.id")) { "Missing 'mod.id'" }
+    val name: String get() = requireNotNull(project.prop("mod.name")) { "Missing 'mod.name'" }
+    val version: String get() = requireNotNull(project.prop("mod.version")) { "Missing 'mod.version'" }
+    val group: String get() = requireNotNull(project.prop("mod.group")) { "Missing 'mod.group'" }
+
+    fun prop(key: String) = requireNotNull(project.prop("mod.$key")) { "Missing 'mod.$key'" }
+    fun dep(key: String) = requireNotNull(project.prop("deps.$key")) { "Missing 'deps.$key'" }
+}

common/build.gradle

@@ -1,17 +0,0 @@
-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

@@ -1,78 +0,0 @@
-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/mixin/MixinBlockModelRenderer.java

@@ -1,25 +0,0 @@
-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.BakedModel;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.random.Random;
-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;
-
-@Mixin(BlockModelRenderer.class)
-public class MixinBlockModelRenderer {
-    @Inject(at = @At("HEAD"), method = "render(Lnet/minecraft/world/BlockRenderView;Lnet/minecraft/client/render/model/BakedModel;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumer;ZLnet/minecraft/util/math/random/Random;JI)V", cancellable = true)
-    private void cullleaves$cancelRendering(BlockRenderView world, BakedModel model, BlockState state, BlockPos pos, MatrixStack matrices, VertexConsumer vertexConsumer, boolean cull, Random random, long seed, 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

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

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

@@ -1,22 +0,0 @@
-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/assets/cullleaves/lang/de_de.json

@@ -1,9 +0,0 @@
-{
-	"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

@@ -1,9 +0,0 @@
-{
-	"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

@@ -1,9 +0,0 @@
-{
-	"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/ru_ru.json

@@ -1,10 +0,0 @@
-{
-	"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

@@ -1,8 +0,0 @@
-{
-	"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

@@ -1,8 +0,0 @@
-{
-	"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

@@ -1,9 +0,0 @@
-{
-	"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

@@ -1,8 +0,0 @@
-{
-	"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

@@ -1,9 +0,0 @@
-{
-	"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/resourcepacks/smartleaves/pack.mcmeta

@@ -1,10 +0,0 @@
-{
-  "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

@@ -1,16 +0,0 @@
-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

@@ -1,111 +0,0 @@
-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

@@ -1,33 +0,0 @@
-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

@@ -1,22 +0,0 @@
-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.BakedModel;
-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(BakedModel 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

@@ -1,55 +0,0 @@
-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;
-    }
-}

gradle.properties

@@ -1,24 +1,37 @@
-org.gradle.jvmargs=-Xmx4096M
+# Done to increase the memory available to gradle.
+org.gradle.jvmargs=-Xmx3G
+#org.gradle.parallel=true
+org.gradle.caching=false
+org.gradle.caching.debug=false
+org.gradle.parallel=false
+#org.gradle.configureondemand=true
 
-minecraft_version=1.21.1
-yarn_mappings=1.21.1+build.3
-enabled_platforms=fabric,neoforge
+# Mod properties
+mod.version=4.1.0
+mod.group=eu.midnightdust
+mod.id=cullleaves
+mod.name=CullLeaves
 
-archives_base_name=cullleaves
-mod_version=4.0.1
-maven_group=eu.midnightdust
-release_type=release
-curseforge_id=423254
-modrinth_id=GNxdLCoP
+# Used for the mod metadata
+mod.mc_dep_fabric=[VERSIONED]
+mod.mc_dep_forgelike=[VERSIONED]
+# Used for the release title. I.e. '1.20.x'
+mod.mc_title=[VERSIONED]
+# Space separated versions for publishing. I.e. '1.20, 1.20.1'
+mod.mc_targets=[VERSIONED]
 
-midnightlib_version=1.6.3
-sodium_version=mc1.21.1-0.6.5
+# Mod setup
+deps.fabric_loader=0.17.3
+deps.fabric_version=[VERSIONED]
 
-fabric_loader_version=0.16.9
-fabric_api_version=0.110.0+1.21.1
+deps.forge_loader=[VERSIONED]
+deps.neoforge_loader=[VERSIONED]
+deps.neoforge_patch=[VERSIONED]
 
-neoforge_version=21.1.82
-yarn_mappings_patch_neoforge_version = 1.21+build.4
+# Mod dependencies
+deps.midnightlib_version=1.9.0-alpha.1
+deps.sodium_version=mc1.21.8-0.7.0
 
-quilt_loader_version=0.18.9
-quilt_fabric_api_version=7.0.6+0.85.0-1.20.1
+# Publishing
+publish.modrinth=GNxdLCoP
+publish.curseforge=423254

gradle/wrapper/gradle-wrapper.properties

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

neoforge/build.gradle

@@ -1,118 +0,0 @@
-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

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

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

@@ -1,42 +0,0 @@
-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.RegisterClientReloadListenersEvent;
-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(RegisterClientReloadListenersEvent event) {
-        event.registerReloadListener(CullLeavesClient.ReloadListener.INSTANCE);
-    }
-}

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

@@ -1,12 +0,0 @@
-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

@@ -1,26 +0,0 @@
-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();
-    }
-}

quilt/build.gradle

@@ -1,97 +0,0 @@
-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

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

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

@@ -1,17 +0,0 @@
-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

@@ -1,53 +0,0 @@
-{
-  "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,16 +0,0 @@
-pluginManagement {
-    repositories {
-        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"

settings.gradle.kts

@@ -0,0 +1,33 @@
+pluginManagement {
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+        maven("https://maven.fabricmc.net/")
+        maven("https://maven.architectury.dev")
+        maven("https://maven.minecraftforge.net")
+        maven("https://maven.neoforged.net/releases/")
+        maven("https://maven.kikugie.dev/snapshots")
+    }
+}
+
+plugins {
+    id("dev.kikugie.stonecutter") version "0.7"
+}
+
+stonecutter {
+    centralScript = "build.gradle.kts"
+    kotlinController = true
+    shared {
+        fun mc(loader: String, vararg versions: String) {
+            for (version in versions) vers("$version-$loader", version)
+        }
+        //i would recommend to use neoforge for mc > 1.20.1, i haven't tested template for forge on versions higher than that
+        mc("fabric","1.20.1", "1.21.1", "1.21.5", "1.21.8", "1.21.10")
+        mc("forge","1.20.1")
+        //WARNING: neoforge uses mods.toml instead of neoforge.mods.toml for versions 1.20.4 (?) and earlier
+        mc("neoforge", "1.21.1", "1.21.5", "1.21.8", "1.21.10")
+    }
+    create(rootProject)
+}
+
+rootProject.name = "CullLeaves"

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

@@ -0,0 +1,203 @@
+package eu.midnightdust.cullleaves;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import eu.midnightdust.cullleaves.config.CullLeavesConfig;
+import eu.midnightdust.lib.config.MidnightConfig;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.packs.PackType;
+
+import net.minecraft.server.packs.resources.ResourceManager;
+import net.minecraft.server.packs.resources.ResourceManagerReloadListener;
+import net.minecraft.world.level.BlockAndTintGetter;
+import net.minecraft.world.level.block.LeavesBlock;
+import net.minecraft.world.level.block.MangroveRootsBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+
+//? fabric {
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
+import net.fabricmc.fabric.api.resource.ResourcePackActivationType;
+import net.fabricmc.loader.api.FabricLoader;
+//? if >= 1.21.9 {
+import net.fabricmc.fabric.api.resource.v1.ResourceLoader;
+//?} else {
+/*import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener;
+*///?}
+
+//?} neoforge {
+/*import net.minecraft.network.chat.Component;
+import net.minecraft.server.packs.repository.Pack;
+import net.minecraft.server.packs.repository.PackSource;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.common.EventBusSubscriber;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.neoforge.event.AddPackFindersEvent;
+    //? if >= 1.21.4 {
+    import net.neoforged.neoforge.client.event.AddClientReloadListenersEvent;
+    //?} else {
+    /^import net.neoforged.neoforge.client.event.RegisterClientReloadListenersEvent;
+    ^///?}
+*///?}
+
+//? forge {
+/*import net.minecraft.network.chat.Component;
+import net.minecraft.server.packs.repository.Pack;
+import net.minecraft.server.packs.repository.PackSource;
+
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.client.ConfigScreenHandler;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.AddPackFindersEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.IExtensionPoint;
+import net.minecraftforge.fml.ModList;
+import net.minecraftforge.fml.ModLoadingContext;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.forgespi.locating.IModFile;
+import net.minecraftforge.network.NetworkConstants;
+import net.minecraftforge.resource.PathPackResources;
+*///?}
+
+//? neoforge || forge
+/*@Mod(CullLeavesClient.MOD_ID)*/
+public class CullLeavesClient /*? fabric {*/ implements ModInitializer /*?}*/ {
+    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(BlockAndTintGetter world, BlockPos pos) {
+        if (CullLeavesClient.forceHideInnerLeaves) {
+            boolean shouldForceCull = true;
+            for (Direction dir : Direction.values()) {
+                BlockState otherState = world.getBlockState(pos.relative(dir));
+                if (!(otherState.getBlock() instanceof LeavesBlock) &&
+                        !otherState.isFaceSturdy(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 ResourceManagerReloadListener {
+        public static final ReloadListener INSTANCE = new ReloadListener();
+
+        private ReloadListener() {
+        }
+
+        @Override
+        public void onResourceManagerReload(ResourceManager manager) {
+            CullLeavesClient.forceLeafCulling = false;
+            CullLeavesClient.forceHideInnerLeaves = false;
+            manager.listResources("options", path -> path.toString().startsWith("cullleaves") && path.toString().endsWith("options.json")).forEach((id, resource) -> {
+                try {
+                    JsonObject json = JsonParser.parseReader(resource.openAsReader()).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);
+                }
+            });
+        }
+    }
+
+    //? fabric {
+    @Override
+    public void onInitialize() {
+        MidnightConfig.init(CullLeavesClient.MOD_ID, CullLeavesConfig.class);
+        FabricLoader.getInstance().getModContainer("cullleaves").ifPresent(modContainer -> {
+            ResourceManagerHelper.registerBuiltinResourcePack(ResourceLocation.fromNamespaceAndPath(CullLeavesClient.MOD_ID, "smartleaves"), modContainer, ResourcePackActivationType.NORMAL);
+        });
+        //? if >= 1.21.9 {
+        ResourceLoader.get(PackType.CLIENT_RESOURCES).registerReloader(ResourceLocation.fromNamespaceAndPath(CullLeavesClient.MOD_ID, "resourcepack_options"), CullLeavesClient.ReloadListener.INSTANCE);
+        //?} else {
+        /*ResourceManagerHelper.get(PackType.CLIENT_RESOURCES).registerReloadListener(new SimpleSynchronousResourceReloadListener() {
+            @Override
+            public ResourceLocation getFabricId() {
+                return ResourceLocation.fromNamespaceAndPath(CullLeavesClient.MOD_ID, "resourcepack_options");
+            }
+            @Override
+            public void onResourceManagerReload(ResourceManager manager) {
+                CullLeavesClient.ReloadListener.INSTANCE.onResourceManagerReload(manager);
+            }
+        });
+        *///?}
+    }
+    //?} else if neoforge {
+    /*public CullLeavesClient() {
+        MidnightConfig.init(CullLeavesClient.MOD_ID, CullLeavesConfig.class);
+    }
+
+    @EventBusSubscriber(modid = CullLeavesClient.MOD_ID, value = Dist.CLIENT/^? if <=1.21.5 {^//^, bus = EventBusSubscriber.Bus.MOD ^//^?}^/)
+    public static class CullLeavesClientEvents {
+        @SubscribeEvent
+        public static void addPackFinders(AddPackFindersEvent event) {
+            if (event.getPackType() == PackType.CLIENT_RESOURCES) {
+                event.addPackFinders(ResourceLocation.fromNamespaceAndPath(CullLeavesClient.MOD_ID, "resourcepacks/smartleaves"), PackType.CLIENT_RESOURCES, Component.literal("cullleaves/smartleaves"), PackSource.BUILT_IN, false, Pack.Position.TOP);
+            }
+        }
+        @SubscribeEvent
+        public static void onResourceReload(/^? if >= 1.21.4 {^/ AddClientReloadListenersEvent /^?} else {^//^RegisterClientReloadListenersEvent ^//^?}^/ event) {
+            event. /^? if >= 1.21.4 {^/ addListener(ResourceLocation.fromNamespaceAndPath(CullLeavesClient.MOD_ID, "resourcepack_options"), /^?} else {^/ /^registerReloadListener( ^//^?}^/ CullLeavesClient.ReloadListener.INSTANCE);
+        }
+    }
+    *///?} else if forge {
+    /*public CullLeavesClient() {
+        MidnightConfig.init(MOD_ID, CullLeavesConfig.class);
+        ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (remote, server) -> true));
+        ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () ->
+                new ConfigScreenHandler.ConfigScreenFactory((client, parent) -> MidnightConfig.getScreen(parent, "cullleaves")));
+        //MinecraftForge.EVENT_BUS.register(new CullLeavesClientEvents());
+    }
+
+    @Mod.EventBusSubscriber(modid = MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
+    public static class CullLeavesClientEvents {
+        @SubscribeEvent
+        public static void addPackFinders(AddPackFindersEvent event) {
+            if (event.getPackType() == PackType.CLIENT_RESOURCES) {
+                registerResourcePack(event, ResourceLocation.fromNamespaceAndPath(MOD_ID, "smartleaves"), false);
+            }
+        }
+        private static void registerResourcePack(AddPackFindersEvent event, ResourceLocation id, boolean alwaysEnabled) {
+            event.addRepositorySource((profileAdder -> {
+                IModFile file = ModList.get().getModFileById(id.getNamespace()).getFile();
+                try (PathPackResources pack = new PathPackResources(id.toString(), true, file.findResource("resourcepacks/"+id.getPath()))) {
+                    profileAdder.accept(Pack.readMetaAndCreate(id.toString(), Component.literal(id.getNamespace()+"/"+id.getPath()), alwaysEnabled, a -> pack, PackType.CLIENT_RESOURCES, Pack.Position.TOP, PackSource.BUILT_IN));
+                } catch (NullPointerException e) {e.printStackTrace();}
+            }));
+        }
+    }
+    *///?}
+}
+

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

@@ -1,7 +1,7 @@
 package eu.midnightdust.cullleaves.config;
 
 import eu.midnightdust.lib.config.MidnightConfig;
-import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.Minecraft;
 
 public class CullLeavesConfig extends MidnightConfig {
     @Entry //  Enable/Disable the mod. Requires Chunk Reload (F3 + A).
@@ -10,9 +10,9 @@ public class CullLeavesConfig extends MidnightConfig {
     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);
+    public void writeChanges() {
+        var client = Minecraft.getInstance();
+        if (client != null && client.level != null) client.levelRenderer.needsUpdate();
+        super.writeChanges();
     }
 }

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

@@ -0,0 +1,35 @@
+package eu.midnightdust.cullleaves.mixin;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import eu.midnightdust.cullleaves.CullLeavesClient;
+import net.minecraft.client.renderer.block.ModelBlockRenderer;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.BlockAndTintGetter;
+import net.minecraft.world.level.block.LeavesBlock;
+import net.minecraft.world.level.block.state.BlockState;
+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;
+
+//? if >= 1.21.4 {
+import net.minecraft.client.renderer.block.model.BlockModelPart;
+import java.util.List;
+//?} else {
+/*import net.minecraft.client.resources.model.BakedModel;
+import net.minecraft.util.RandomSource;
+*///?}
+
+@Mixin(ModelBlockRenderer.class)
+public class MixinBlockModelRenderer {
+    @Inject(at = @At("HEAD"), method = "tesselateBlock", cancellable = true)
+    //? if >= 1.21.4 {
+    private void cullleaves$cancelRendering(BlockAndTintGetter world, List<BlockModelPart> parts, BlockState state, BlockPos pos, PoseStack matrices, VertexConsumer vertexConsumer, boolean cull, int overlay, CallbackInfo ci) {
+    //?} else {
+    /*private void cullleaves$cancelRendering(BlockAndTintGetter world, BakedModel bakedModel, BlockState state, BlockPos pos, PoseStack matrices, VertexConsumer vertexConsumer, boolean cull, RandomSource randomSource, long l, int overlay, CallbackInfo ci) {
+    *///?}
+        if (state.getBlock() instanceof LeavesBlock &&
+                CullLeavesClient.shouldHideBlock(world, pos)) ci.cancel();
+    }
+}

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

@@ -0,0 +1,20 @@
+package eu.midnightdust.cullleaves.mixin;
+
+import eu.midnightdust.cullleaves.CullLeavesClient;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.LeavesBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(value = LeavesBlock.class, priority = 1900)
+public abstract class MixinLeavesBlock extends Block {
+    public MixinLeavesBlock(Properties properties) {
+        super(properties);
+    }
+
+    @Override
+    public boolean skipRendering(BlockState state, BlockState neighborState, Direction offset) {
+        return CullLeavesClient.isLeafSideInvisible(neighborState);
+    }
+}

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

@@ -0,0 +1,20 @@
+package eu.midnightdust.cullleaves.mixin;
+
+import eu.midnightdust.cullleaves.CullLeavesClient;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.MangroveRootsBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(value = MangroveRootsBlock.class, priority = 1900)
+public abstract class MixinMangroveRootsBlock extends Block {
+    public MixinMangroveRootsBlock(Properties properties) {
+        super(properties);
+    }
+
+    @Override
+    public boolean skipRendering(BlockState state, BlockState neighborState, Direction offset) {
+        return CullLeavesClient.isRootSideInvisible(neighborState);
+    }
+}

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

@@ -0,0 +1,50 @@
+package eu.midnightdust.cullleaves.mixin.sodium;
+
+import net.caffeinemc.mods.sodium.client.render.chunk.compile.pipeline.BlockRenderer;
+import eu.midnightdust.cullleaves.CullLeavesClient;
+import net.minecraft.world.level.block.LeavesBlock;
+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;
+//? if >= 1.21.4 {
+import net.minecraft.client.renderer.block.model.BlockStateModel;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.core.BlockPos;
+//?} else if >= 1.21 {
+/*import net.minecraft.core.BlockPos;
+import net.minecraft.client.resources.model.BakedModel;
+import net.minecraft.world.level.block.state.BlockState;
+*///?} else {
+/*import net.caffeinemc.mods.sodium.client.render.chunk.compile.ChunkBuildBuffers;
+import net.caffeinemc.mods.sodium.client.render.chunk.compile.pipeline.BlockRenderContext;
+*///?}
+
+//? if fabric && >= 1.21 {
+import net.caffeinemc.mods.sodium.client.render.frapi.render.AbstractBlockRenderContext;
+//?} else {
+/*import net.minecraft.client.Minecraft;
+import org.spongepowered.asm.mixin.Unique;
+*///?}
+
+@Mixin(BlockRenderer.class)
+public abstract class MixinBlockRenderer /*? if fabric && >= 1.21 {*/ extends AbstractBlockRenderContext /*?}*/ {
+    //? if neoforge || < 1.21 {
+    /*@Unique
+    private static final Minecraft cullleaves$client = Minecraft.getInstance();
+    *///?}
+
+    @Inject(at = @At("HEAD"), method = "renderModel", cancellable = true /*? if forge {*//*, remap = false *//*?}*/)
+    //? if >= 1.21.4 {
+    public void cullleaves$cancelRendering(BlockStateModel model, BlockState state, BlockPos pos, BlockPos origin, CallbackInfo ci) {
+    //?} else if >= 1.21 {
+    /*public void cullleaves$cancelRendering(BakedModel model, BlockState state, BlockPos pos, BlockPos origin, CallbackInfo ci) {
+    *///?} else {
+    /*public void cullleaves$cancelRendering(BlockRenderContext ctx, ChunkBuildBuffers buffers, CallbackInfo ci) {
+        var state = ctx.state();
+        var pos = ctx.pos();
+    *///?}
+        if (state.getBlock() instanceof LeavesBlock && CullLeavesClient.shouldHideBlock(/*? if fabric && >= 1.21 {*/ this.level /*?} else {*/ /*cullleaves$client.level *//*?}*/, pos))
+            ci.cancel();
+    }
+}

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

@@ -1,4 +1,4 @@
-package eu.midnightdust.cullleaves.neoforge.mixin.sodium;
+package eu.midnightdust.cullleaves.mixin.sodium;
 
 import eu.midnightdust.cullleaves.config.CullLeavesConfig;
 import net.caffeinemc.mods.sodium.client.gui.SodiumGameOptionPages;
@@ -8,7 +8,7 @@ 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 net.minecraft.network.chat.Component;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -26,8 +26,8 @@ public class MixinSodiumGameOptionPages {
     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"))
+                        .setName(Component.translatable("cullleaves.midnightconfig.enabled"))
+                        .setTooltip(Component.translatable("cullleaves.midnightconfig.enabled.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> {
                             CullLeavesConfig.enabled = value;
@@ -37,8 +37,8 @@ public class MixinSodiumGameOptionPages {
                         .setImpact(OptionImpact.MEDIUM)
                         .build()
                 ).add(OptionImpl.createBuilder(boolean.class, sodiumOpts)
-                        .setName(Text.translatable("cullleaves.midnightconfig.cullRoots"))
-                        .setTooltip(Text.translatable("cullleaves.midnightconfig.cullRoots.tooltip.sodium"))
+                        .setName(Component.translatable("cullleaves.midnightconfig.cullRoots"))
+                        .setTooltip(Component.translatable("cullleaves.midnightconfig.cullRoots.tooltip"))
                         .setControl(TickBoxControl::new)
                         .setBinding((opts, value) -> {
                             CullLeavesConfig.cullRoots = value;

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

@@ -37,5 +37,5 @@ side = "CLIENT"
 modId = "midnightlib"
 required = true
 versionRange = "[1.0.0,)"
-ordering = "AFTER"
-side = "CLIENT"
+ordering = "BEFORE"
+side = "CLIENT"

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

@@ -0,0 +1,7 @@
+{
+	"cullleaves.midnightconfig.title":"Cull Leaves Konfiguration",
+	"cullleaves.midnightconfig.enabled.tooltip":"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",
+	"cullleaves.midnightconfig.cullRoots":"Culling von Mangrovenwurzeln"
+}

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

@@ -0,0 +1,7 @@
+{
+	"cullleaves.midnightconfig.title":"Cull Leaves Config",
+	"cullleaves.midnightconfig.enabled.tooltip":"Enables culling for leaves, providing a nice performance boost",
+	"cullleaves.midnightconfig.enabled":"Enable Leaf Culling",
+	"cullleaves.midnightconfig.cullRoots.tooltip":"Enables culling for mangrove roots",
+	"cullleaves.midnightconfig.cullRoots":"Enable Mangrove Root Culling"
+}

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

@@ -0,0 +1,7 @@
+{
+	"cullleaves.midnightconfig.title": "Konfigurasi Cull Leaves",
+	"cullleaves.midnightconfig.enabled.tooltip": "Mendayakan penyorokan daun yang memberikan peningkatan prestasi yang bagus",
+	"cullleaves.midnightconfig.enabled": "Dayakan Penyorokan Daun",
+	"cullleaves.midnightconfig.cullRoots.tooltip": "Mendayakan penyorokan akar bakau.",
+	"cullleaves.midnightconfig.cullRoots": "Dayakan Penyorokan Akar Bakau"
+}

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

@@ -0,0 +1,8 @@
+{
+	"cullleaves.midnightconfig.title": "Настройки отбраковки листьев",
+	"cullleaves.midnightconfig.enabled.tooltip": "Включает отбраковку листьев, что значительно повышает производительность",
+	"cullleaves.midnightconfig.enabled": "Включить отбраковку листьев",
+	"cullleaves.midnightconfig.cullRoots.tooltip": "Включает отбраковку мангровых корней.",
+	"cullleaves.midnightconfig.cullRoots": "Включить отбраковку мангровых корней",
+	"cullleaves.resourcepack.translation": "§2Делает листья идентичными 'умным листьям' в OptiFine"
+}

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

@@ -0,0 +1,5 @@
+{
+	"cullleaves.midnightconfig.title":"Конфігурація Cull Leaves",
+	"cullleaves.midnightconfig.enabled.tooltip":"Вмикає вибраковування листя, забезпечуючи хороше підвищення продуктивності",
+	"cullleaves.midnightconfig.enabled":"Увімкнути вибраковування листя"
+}

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

@@ -0,0 +1,5 @@
+{
+	"cullleaves.midnightconfig.title":"Cấu hình Cull Leaves",
+	"cullleaves.midnightconfig.enabled.tooltip":"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á"
+}

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

@@ -0,0 +1,7 @@
+{
+	"cullleaves.midnightconfig.title":"Cull Leaves 选项",
+	"cullleaves.midnightconfig.enabled.tooltip":"剔除树叶，提升性能",
+	"cullleaves.midnightconfig.enabled":"启用树叶剔除",
+	"cullleaves.midnightconfig.cullRoots.tooltip":"启用红树根剔除",
+	"cullleaves.midnightconfig.cullRoots":"启用红树根剔除"
+}

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

@@ -0,0 +1,5 @@
+{
+	"cullleaves.midnightconfig.title":"Cull Leaves 設定",
+	"cullleaves.midnightconfig.enabled.tooltip":"啟用樹葉剔除，獲得良好的效能提升",
+	"cullleaves.midnightconfig.enabled":"啟用樹葉剔除"
+}

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

@@ -0,0 +1,7 @@
+{
+	"cullleaves.midnightconfig.title": "کونفيݢوراسي Cull Leaves",
+	"cullleaves.midnightconfig.enabled.tooltip": "منداياکن ڤڽوروقن داٴون يڠ ممبريکن ڤنيڠکتن ڤريستاسي يڠ باݢوس",
+	"cullleaves.midnightconfig.enabled": "داياکن ڤڽوروقن داٴون",
+	"cullleaves.midnightconfig.cullRoots.tooltip": "منداياکن ڤڽوروقن اکر باکاو.",
+	"cullleaves.midnightconfig.cullRoots": "داياکن ڤڽوروقن اکر باکاو"
+}

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

@@ -1,6 +1,6 @@
 {
   "required": true,
-  "package": "eu.midnightdust.cullleaves.fabric.mixin",
+  "package": "eu.midnightdust.cullleaves.mixin",
   "plugin": "eu.midnightdust.cullleaves.CullLeavesMixinPlugin",
   "compatibilityLevel": "JAVA_17",
   "minVersion": "0.8",

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

@@ -1,6 +1,6 @@
 {
   "required": true,
-  "package": "eu.midnightdust.cullleaves.neoforge.mixin",
+  "package": "eu.midnightdust.cullleaves.mixin",
   "compatibilityLevel": "JAVA_17",
   "minVersion": "0.8",
   "client": [

src/main/resources/fabric.mod.json

@@ -20,14 +20,14 @@
 
   "environment": "client",
   "entrypoints": {
-    "client": [
-      "eu.midnightdust.cullleaves.fabric.CullLeavesClientFabric"
+    "main": [
+      "eu.midnightdust.cullleaves.CullLeavesClient"
     ]
   },
 
   "depends": {
     "midnightlib": "*",
-    "minecraft": ">=1.21"
+    "minecraft": ">=1.20"
   },
   "breaks": {
     "sodium": "<0.6.0"

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

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

stonecutter.gradle.kts

@@ -0,0 +1,16 @@
+plugins {
+    id("dev.kikugie.stonecutter")
+    id("dev.architectury.loom") version "1.13-SNAPSHOT" apply false
+    id("architectury-plugin") version "3.4-SNAPSHOT" apply false
+    id("com.github.johnrengelman.shadow") version "8.1.1" apply false
+    id("me.modmuss50.mod-publish-plugin") version "0.8.4" apply false
+}
+stonecutter active "1.21.10-fabric" /* [SC] DO NOT EDIT */
+
+// See https://stonecutter.kikugie.dev/wiki/config/params
+stonecutter parameters {
+    swaps["mod_version"] = "\"" + property("mod.version") + "\";"
+    swaps["minecraft"] = "\"" + node.metadata.version + "\";"
+    constants["release"] = property("mod.id") != "template"
+    dependencies["fapi"] = node.project.property("deps.fabric_version") as String
+}

versions/1.20.1-fabric/gradle.properties

@@ -0,0 +1,13 @@
+mod.mc_dep_fabric==1.20.1
+mod.mc_dep_forgelike=[1.20, 1.20.1]
+mod.mc_title=1.20.1
+mod.mc_targets=1.20.1
+
+deps.forge_loader=47.3.0
+deps.neoforge_loader=[UNSUPPORTED]
+
+deps.fabric_version=0.92.3+1.20.1
+deps.modmenu_version=7.2.2
+deps.sodium_version=mc1.20.1-0.5.13
+
+loom.platform=fabric

versions/1.20.1-forge/gradle.properties

@@ -0,0 +1,13 @@
+mod.mc_dep_fabric==1.20.1
+mod.mc_dep_forgelike=[1.20, 1.20.1]
+mod.mc_title=1.20.1
+mod.mc_targets=1.20.1
+
+deps.forge_loader=47.3.0
+deps.neoforge_loader=[UNSUPPORTED]
+
+deps.fabric_version=0.92.3+1.20.1
+
+deps.modmenu_version=[UNSUPPORTED]
+
+loom.platform=forge

versions/1.20.1-forge/src/main/resources/META-INF/mods.toml

@@ -0,0 +1,35 @@
+modLoader = "javafml"
+loaderVersion = "[43,)"
+#issueTrackerURL = ""
+license = "MIT License"
+
+[[mods]]
+modId = "${id}"
+version = "${version}"
+displayName = "CullLeaves"
+authors = "Motschen, TeamMidnightDust"
+description = '''
+Adds culling to leaf blocks, providing a huge performance boost over vanilla.
+'''
+logoFile = "icon.png"
+
+[[dependencies.cullleaves]]
+modId = "forge"
+mandatory = true
+versionRange = "[43,)"
+ordering = "NONE"
+side = "CLIENT"
+
+[[dependencies.cullleaves]]
+modId = "minecraft"
+mandatory = true
+versionRange = "[1.19.2,)"
+ordering = "NONE"
+side = "CLIENT"
+
+[[dependencies.cullleaves]]
+modId = "midnightlib"
+mandatory = true
+versionRange = "[1.0.0,)"
+ordering = "BEFORE"
+side = "CLIENT"

versions/1.21.1-fabric/gradle.properties

@@ -0,0 +1,13 @@
+mod.mc_dep_fabric=>=1.21 <=1.21.1
+mod.mc_dep_forgelike=[1.21, 1.21.1]
+mod.mc_title=1.21.1
+mod.mc_targets=1.21 1.21.1
+
+deps.forge_loader=0
+deps.neoforge_loader=21.1.66
+
+deps.fabric_version=0.114.0+1.21.1
+
+deps.modmenu_version=11.0.3
+
+loom.platform=fabric

versions/1.21.1-neoforge/gradle.properties

@@ -0,0 +1,13 @@
+mod.mc_dep_fabric=>=1.21 <=1.21.1
+mod.mc_dep_forgelike=[1.21, 1.21.1]
+mod.mc_title=1.21.1
+mod.mc_targets=1.21 1.21.1
+
+deps.forge_loader=0
+deps.neoforge_loader=21.1.66
+
+deps.fabric_version=0.114.0+1.21.1
+
+deps.sodium_version=mc1.21.1-0.6.13
+
+loom.platform=neoforge

versions/1.21.10-fabric/gradle.properties

@@ -0,0 +1,12 @@
+mod.mc_dep_fabric=>=1.21.9
+mod.mc_dep_forgelike=[1.21.10,)
+mod.mc_title=1.21.10
+mod.mc_targets=1.21.9, 1.21.10
+
+deps.forge_loader=0
+deps.neoforge_loader=21.10.47-beta
+
+deps.fabric_version=0.138.0+1.21.10
+deps.modmenu_version=16.0.0-rc.1
+
+loom.platform=fabric

versions/1.21.10-neoforge/gradle.properties

@@ -0,0 +1,12 @@
+mod.mc_dep_fabric=>=1.21.9
+mod.mc_dep_forgelike=[1.21.10,)
+mod.mc_title=1.21.10
+mod.mc_targets=1.21.9, 1.21.10
+
+deps.forge_loader=0
+deps.neoforge_loader=21.10.47-beta
+
+deps.fabric_version=0.138.0+1.21.10
+deps.modmenu_version=16.0.0-rc.1
+
+loom.platform=neoforge

versions/1.21.5-fabric/gradle.properties

@@ -0,0 +1,12 @@
+mod.mc_dep_fabric==1.21.5
+mod.mc_dep_forgelike=[1.21.5]
+mod.mc_title=1.21.5
+mod.mc_targets=1.21.5
+
+deps.forge_loader=54.0.13
+deps.neoforge_loader=21.4.47-beta
+
+deps.fabric_version=0.121.0+1.21.5
+deps.modmenu_version=14.0.0-rc.1
+
+loom.platform=fabric

versions/1.21.5-neoforge/gradle.properties

@@ -0,0 +1,12 @@
+mod.mc_dep_fabric==1.21.5
+mod.mc_dep_forgelike=[1.21.5]
+mod.mc_title=1.21.5
+mod.mc_targets=1.21.5
+
+deps.forge_loader=0
+deps.neoforge_loader=21.5.54-beta
+
+deps.fabric_version=0.121.0+1.21.5
+deps.modmenu_version=[UNSUPPORTED]
+
+loom.platform=neoforge

versions/1.21.8-fabric/gradle.properties

@@ -0,0 +1,12 @@
+mod.mc_dep_fabric==1.21.8
+mod.mc_dep_forgelike=[1.21.8]
+mod.mc_title=1.21.8
+mod.mc_targets=1.21.8
+
+deps.forge_loader=0
+deps.neoforge_loader=21.8.50
+
+deps.fabric_version=0.136.0+1.21.8
+deps.modmenu_version=15.0.0
+
+loom.platform=fabric

versions/1.21.8-neoforge/gradle.properties

@@ -0,0 +1,12 @@
+mod.mc_dep_fabric==1.21.5
+mod.mc_dep_forgelike=[1.21.5]
+mod.mc_title=1.21.5
+mod.mc_targets=1.21.5
+
+deps.forge_loader=0
+deps.neoforge_loader=21.8.50
+
+deps.fabric_version=0.136.0+1.21.8
+deps.modmenu_version=[UNSUPPORTED]
+
+loom.platform=neoforge