CullLeaves 3.0.0 - Forge support & better Sodium compatibility

- Now utilizes the Architectury build system to provide support for Fabric, native Quilt and even Forge (No Architectury API needed!)
- Update to MidnightLib 1.0.0
- Better Sodium/Rubidium support:
   - Fix resourcepacks utilizing leaf culling flickering when using Sodium (Fixes #15)
   - Integrate Leaf Culling toggle into Sodium options screen

.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,84 +1,58 @@
 plugins {
-	id 'fabric-loom' version '0.5-SNAPSHOT'
-	id 'maven-publish'
+    id "architectury-plugin" version "3.4-SNAPSHOT"
+    id "dev.architectury.loom" version "1.0-SNAPSHOT" 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" }
-}
-
-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 ("io.github.prospector:modmenu:${project.mod_menu_version}"){
-        exclude module: "fabric-api"
+    maven {
+        url = "https://api.modrinth.com/maven"
     }
 }
 
-processResources {
-	inputs.property "version", project.version
+subprojects {
+    apply plugin: "dev.architectury.loom"
 
-	from(sourceSets.main.resources.srcDirs) {
-		include "fabric.mod.json"
-		expand "version": project.version
-	}
+    loom {
+        silentMojangMappingsLicense()
+    }
 
-	from(sourceSets.main.resources.srcDirs) {
-		exclude "fabric.mod.json"
-	}
+    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 "net.fabricmc:yarn:1.19.2+build.3:v2"
+    }
 }
 
-// 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"
-}
+allprojects {
+    apply plugin: "java"
+    apply plugin: "architectury-plugin"
+    apply plugin: "maven-publish"
 
-// 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
-}
+    archivesBaseName = rootProject.archives_base_name
+    version = rootProject.mod_version
+    group = rootProject.maven_group
 
-jar {
-	from "LICENSE"
-}
+    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.
+    }
 
-// 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
-			}
-		}
-	}
+    tasks.withType(JavaCompile) {
+        options.encoding = "UTF-8"
+        options.release = 17
+    }
 
-	// select the repositories you want to publish to
-	repositories {
-		// uncomment to publish to the local maven
-		// mavenLocal()
-	}
+    java {
+        withSourcesJar()
+    }
 }

common/build.gradle

@@ -0,0 +1,35 @@
+architectury {
+    injectInjectables = false
+    common(rootProject.enabled_platforms.split(","))
+}
+
+loom {
+}
+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"
+    modCompileOnlyApi "maven.modrinth:sodium:${rootProject.sodium_version}"
+
+    // Remove the next line if you don't want to depend on the API
+    //modApi "dev.architectury:architectury:${rootProject.architectury_version}"
+}
+
+publishing {
+    publications {
+        mavenCommon(MavenPublication) {
+            artifactId = rootProject.archives_base_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.
+    }
+}

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

@@ -1,7 +1,10 @@
-package eu.midnightdust.cullleaves.config;
-
-public class CullLeavesConfig extends MidnightConfig {
-
-    @Entry //  Enable/Disable the mod. Requires Chunk Reload (F3 + A).
-    public static boolean enabled = true;
-}
+package eu.midnightdust.cullleaves.config;
+
+import eu.midnightdust.lib.config.MidnightConfig;
+
+public class CullLeavesConfig extends MidnightConfig {
+    @Entry //  Enable/Disable the mod. Requires Chunk Reload (F3 + A).
+    public static boolean enabled = true;
+    @Entry //  Fixes resourcepacks utilizing leaf culling flickering when using Sodium
+    public static boolean sodiumBlockFaceCullingFix = true;
+}

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

@@ -1,28 +1,28 @@
-package eu.midnightdust.cullleaves.mixin;
-
-import eu.midnightdust.cullleaves.config.CullLeavesConfig;
-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(LeavesBlock.class)
-@Environment(EnvType.CLIENT)
-public class MixinLeavesBlock extends Block {
-
-    public MixinLeavesBlock(Settings settings) {
-        super(settings);
-    }
-
-    @Override
-    @SuppressWarnings("deprecation")
-    public boolean isSideInvisible(BlockState state, BlockState neighborState, Direction offset) {
-        if (CullLeavesConfig.enabled) {
-            return neighborState.getBlock() instanceof LeavesBlock;
-        }
-        else return false;
-    }
+package eu.midnightdust.cullleaves.mixin;
+
+import eu.midnightdust.cullleaves.config.CullLeavesConfig;
+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
+    @SuppressWarnings("deprecation")
+    public boolean isSideInvisible(BlockState state, BlockState neighborState, Direction offset) {
+        if (CullLeavesConfig.enabled) {
+            return neighborState.getBlock() instanceof LeavesBlock;
+        }
+        else return false;
+    }
 }

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

@@ -0,0 +1,46 @@
+package eu.midnightdust.cullleaves.mixin;
+
+import eu.midnightdust.cullleaves.config.CullLeavesConfig;
+import me.jellysquid.mods.sodium.client.gl.device.RenderDevice;
+import me.jellysquid.mods.sodium.client.gl.util.ElementRange;
+import me.jellysquid.mods.sodium.client.model.quad.properties.ModelQuadFacing;
+import me.jellysquid.mods.sodium.client.model.vertex.type.ChunkVertexType;
+import me.jellysquid.mods.sodium.client.render.chunk.*;
+import me.jellysquid.mods.sodium.client.render.chunk.passes.BlockRenderPass;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+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.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.List;
+
+@Mixin(value = RegionChunkRenderer.class, remap = false)
+public abstract class MixinRegionChunkRenderer extends ShaderChunkRenderer {
+    @Shadow @Final private boolean isBlockFaceCullingEnabled;
+    @Shadow protected abstract void addDrawCall(ElementRange part, long baseIndexPointer, int baseVertexIndex);
+    @Unique private boolean doFix = false;
+
+    public MixinRegionChunkRenderer(RenderDevice device, ChunkVertexType vertexType) {
+        super(device, vertexType);
+    }
+
+    @Inject(method = "buildDrawBatches", at = @At(value = "INVOKE", target = "Lme/jellysquid/mods/sodium/client/render/chunk/RenderSection;getBounds()Lme/jellysquid/mods/sodium/client/render/chunk/data/ChunkRenderBounds;", ordinal = 0))
+    public void cullleaves$shouldApplyTransparentBlockFaceCullingFix(List<RenderSection> sections, BlockRenderPass pass, ChunkCameraContext camera, CallbackInfoReturnable<Boolean> cir) {
+        doFix = pass.getAlphaCutoff() != 0 && CullLeavesConfig.enabled && CullLeavesConfig.sodiumBlockFaceCullingFix && this.isBlockFaceCullingEnabled;
+    }
+    @Redirect(method = "buildDrawBatches", at = @At(value = "INVOKE", target = "Lme/jellysquid/mods/sodium/client/render/chunk/ChunkGraphicsState;getModelPart(Lme/jellysquid/mods/sodium/client/model/quad/properties/ModelQuadFacing;)Lme/jellysquid/mods/sodium/client/gl/util/ElementRange;", ordinal = 0))
+    public ElementRange cullleaves$fixTransparentBlockFaceCulling(ChunkGraphicsState state, ModelQuadFacing facing) {
+        if (doFix) {
+            long indexOffset = state.getIndexSegment().getOffset();
+            int baseVertex = state.getVertexSegment().getOffset() / this.vertexFormat.getStride();
+            for (ModelQuadFacing direction : ModelQuadFacing.DIRECTIONS) {
+                this.addDrawCall(state.getModelPart(direction), indexOffset, baseVertex);
+            }
+        }
+        return state.getModelPart(ModelQuadFacing.UNASSIGNED);
+    }
+}

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

@@ -0,0 +1,45 @@
+package eu.midnightdust.cullleaves.mixin;
+
+import eu.midnightdust.cullleaves.config.CullLeavesConfig;
+import me.jellysquid.mods.sodium.client.gui.SodiumGameOptionPages;
+import me.jellysquid.mods.sodium.client.gui.options.OptionFlag;
+import me.jellysquid.mods.sodium.client.gui.options.OptionGroup;
+import me.jellysquid.mods.sodium.client.gui.options.OptionImpact;
+import me.jellysquid.mods.sodium.client.gui.options.OptionImpl;
+import me.jellysquid.mods.sodium.client.gui.options.control.TickBoxControl;
+import me.jellysquid.mods.sodium.client.gui.options.storage.SodiumOptionsStorage;
+import net.minecraft.text.Text;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
+
+import java.util.List;
+
+@Mixin(value = SodiumGameOptionPages.class, remap = false)
+public class MixinSodiumGameOptionPages {
+
+    @Shadow @Final private static SodiumOptionsStorage sodiumOpts;
+
+    @ModifyVariable(method = "performance", at = @At(value = "INVOKE", target = "Lcom/google/common/collect/ImmutableList;copyOf(Ljava/util/Collection;)Lcom/google/common/collect/ImmutableList;"))
+    private static List<OptionGroup> cullleaves$addCullLeavesOption(List<OptionGroup> groups) {
+        groups.add(OptionGroup.createBuilder()
+                .add(OptionImpl.createBuilder(boolean.class, sodiumOpts)
+                        .setName(Text.translatable("cullleaves.midnightconfig.enabled"))
+                        .setTooltip(Text.translatable("cullleaves.midnightconfig.enabled.tooltip.sodium"))
+                        .setControl(TickBoxControl::new)
+                        .setBinding((opts, value) -> {
+                            CullLeavesConfig.enabled = value;
+                            CullLeavesConfig.write("cullleaves");
+                        }, opts -> CullLeavesConfig.enabled)
+                        .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD)
+                        .setImpact(OptionImpact.MEDIUM)
+                        .build()
+                )
+                .build()
+        );
+
+        return groups;
+    }
+}

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

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

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

@@ -0,0 +1,8 @@
+{
+	"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.sodiumBlockFaceCullingFix.tooltip": "Fixes resourcepacks utilizing leaf culling flickering when using Sodium.\nYou probably want this to be enabled.",
+	"cullleaves.midnightconfig.sodiumBlockFaceCullingFix": "Fix Sodium Block Face Culling on Leaves"
+}

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,5 @@
+{
+	"cullleaves.midnightconfig.title":"Настройки Cull Leaves",
+	"cullleaves.midnightconfig.enabled.tooltip":"После изменения этого параметра необходимо перезагрузить чанки (F3 + A)",
+	"cullleaves.midnightconfig.enabled":"Включён Cull Leaves"
+}

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": [
+    "MixinLeavesBlock",
+    "MixinRegionChunkRenderer",
+    "MixinSodiumGameOptionPages"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}

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

@@ -1,10 +1,10 @@
-The MIT License
-Copyright © 2020 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,
-and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+The MIT License
+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,
+and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

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

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 9,
+    "description": "§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}"
+
+    compileClasspath(project(path: ":common", configuration: "namedElements")) { transitive false }
+}

fabric/build.gradle

@@ -0,0 +1,89 @@
+plugins {
+    id "com.github.johnrengelman.shadow" version "7.1.2"
+}
+
+architectury {
+    injectInjectables = false
+    platformSetupLoomIde()
+    fabric()
+}
+
+loom {
+}
+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 "maven.modrinth:midnightlib:${rootProject.midnightlib_version}-fabric"
+    include "maven.modrinth:midnightlib:${rootProject.midnightlib_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]
+    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 {
+        mavenFabric(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.
+    }
+}

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

@@ -1,18 +1,19 @@
-package eu.midnightdust.cullleaves;
+package eu.midnightdust.cullleaves.fabric;
 
 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.loader.api.FabricLoader;
 import net.minecraft.util.Identifier;
 
-public class CullLeavesClient implements ClientModInitializer {
-
+public class CullLeavesClientFabric implements ClientModInitializer {
+    @Override
     public void onInitializeClient() {
-        CullLeavesConfig.init("cullleaves", CullLeavesConfig.class);
-
+        MidnightConfig.init("cullleaves", CullLeavesConfig.class);
         FabricLoader.getInstance().getModContainer("cullleaves").ifPresent(modContainer -> {
-            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("cullleaves:smartleaves"), "resourcepacks/smartleaves", modContainer, true);
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("cullleaves:smartleaves"), modContainer, ResourcePackActivationType.NORMAL);
         });
     }
 }

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

@@ -21,10 +21,7 @@
   "environment": "client",
   "entrypoints": {
     "client": [
-      "eu.midnightdust.cullleaves.CullLeavesClient"
-    ],
-    "modmenu": [
-      "eu.midnightdust.cullleaves.config.ModMenuIntegration"
+      "eu.midnightdust.cullleaves.fabric.CullLeavesClientFabric"
     ]
   },
 
@@ -36,4 +33,4 @@
   "mixins": [
     "cullleaves.mixins.json"
   ]
-}
+}

forge/build.gradle

@@ -0,0 +1,90 @@
+plugins {
+    id "com.github.johnrengelman.shadow" version "7.1.2"
+}
+
+architectury {
+    injectInjectables = false
+    platformSetupLoomIde()
+    forge()
+}
+
+loom {
+    forge {
+        mixinConfig "cullleaves.mixins.json"
+    }
+}
+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
+    developmentForge.extendsFrom common
+    archivesBaseName = rootProject.archives_base_name + "-forge"
+}
+
+dependencies {
+    forge "net.minecraftforge:forge:${rootProject.forge_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}-forge"
+    include "maven.modrinth:midnightlib:${rootProject.midnightlib_version}-forge"
+
+    common(project(path: ":common", configuration: "namedElements")) { transitive false }
+    shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
+}
+
+processResources {
+    inputs.property "version", project.version
+
+    filesMatching("META-INF/mods.toml") {
+        expand "version": project.version
+    }
+}
+
+shadowJar {
+    exclude "fabric.mod.json"
+    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 {
+        mavenForge(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.
+    }
+}

forge/gradle.properties

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

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

@@ -0,0 +1,33 @@
+package eu.midnightdust.cullleaves.forge;
+
+import net.minecraft.resource.*;
+import net.minecraft.resource.metadata.PackResourceMetadata;
+import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.event.AddPackFindersEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.ModList;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.forgespi.locating.IModFile;
+import net.minecraftforge.resource.PathPackResources;
+
+import java.io.IOException;
+
+@Mod.EventBusSubscriber(modid = "cullleaves", bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
+public class CullLeavesClientEvents {
+    @SubscribeEvent
+    public static void addPackFinders(AddPackFindersEvent event) {
+        if (event.getPackType() == ResourceType.CLIENT_RESOURCES) {
+            registerResourcePack(event, new Identifier("cullleaves", "smartleaves"), false);
+        }
+    }
+    private static void registerResourcePack(AddPackFindersEvent event, Identifier id, boolean alwaysEnabled) {
+        event.addRepositorySource(((profileAdder, factory) -> {
+            IModFile file = ModList.get().getModFileById(id.getNamespace()).getFile();
+            try (PathPackResources pack = new PathPackResources(id.toString(), file.findResource("resourcepacks/"+id.getPath()))) {
+                profileAdder.accept(new ResourcePackProfile(id.toString(), alwaysEnabled, () -> pack, Text.of(id.getNamespace()+"/"+id.getPath()), pack.parseMetadata(PackResourceMetadata.READER).getDescription().copy().append(" §7(built-in)"), ResourcePackCompatibility.COMPATIBLE, ResourcePackProfile.InsertionPosition.TOP, false, ResourcePackSource.PACK_SOURCE_BUILTIN, false));
+            } catch (IOException | NullPointerException e) {e.printStackTrace();}
+        }));
+    }
+}

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

@@ -0,0 +1,21 @@
+package eu.midnightdust.cullleaves.forge;
+
+import eu.midnightdust.cullleaves.config.CullLeavesConfig;
+import eu.midnightdust.lib.config.MidnightConfig;
+import net.minecraftforge.client.ConfigScreenHandler;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fml.IExtensionPoint;
+import net.minecraftforge.fml.ModLoadingContext;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.network.NetworkConstants;
+
+@Mod("cullleaves")
+public class CullLeavesClientForge {
+    public CullLeavesClientForge() {
+        MidnightConfig.init("cullleaves", 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());
+    }
+}

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

@@ -0,0 +1,35 @@
+modLoader = "javafml"
+loaderVersion = "[43,)"
+#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"
+
+[[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 = "NONE"
+side = "CLIENT"

forge/src/main/resources/pack.mcmeta

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

gradle.properties

@@ -1,19 +1,20 @@
-# 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.5
-	yarn_mappings=1.16.5+build.5
-	loader_version=0.11.2
+minecraft_version=1.19.2
+enabled_platforms=quilt,fabric,forge
 
-# Mod Properties
-	mod_version = 2.1.0
-	maven_group = eu.midnightdust
-	archives_base_name = cullleaves
+archives_base_name=cullleaves
+mod_version=3.0.0
+maven_group=eu.midnightdust
 
-# 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.31.0+1.16
-	
-	mod_menu_version = 1.14.6+build.31
+architectury_version=6.2.43
+midnightlib_version=1.0.0
+sodium_version=mc1.19.2-0.4.4
+
+fabric_loader_version=0.14.9
+fabric_api_version=0.59.0+1.19.2
+
+forge_version=1.19.2-43.0.8
+
+quilt_loader_version=0.17.2-beta.3
+quilt_fabric_api_version=4.0.0-beta.7+0.59.0-1.19.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 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-7.5.1-bin.zip
 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/master/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
+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
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # 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,101 @@ 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*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        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

@@ -1,100 +1,91 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@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"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-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%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="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
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+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"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+: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 %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+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!
+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
+
+:omega

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,60 @@
+{
+  "schema_version": 1,
+  "quilt_loader": {
+    "group": "${group}",
+    "id": "cullleaves",
+    "version": "${version}",
+    "name": "Cull Leaves",
+    "description": "Adds culling to leaf blocks, providing a huge performance boost over vanilla.",
+    "authors": [
+      "Motschen",
+      "TeamMidnightDust"
+    ],
+    "contact": {
+      "homepage": "https://www.midnightdust.eu/",
+      "sources": "https://github.com/TeamMidnightDust/MidnightLib",
+      "issues": "https://github.com/TeamMidnightDust/MidnightLib/issues"
+    },
+    "license": "MIT",
+    "icon": "assets/cullleaves/icon.png",
+    "intermediate_mappings": "net.fabricmc:intermediary",
+    "environment": "client",
+    "entrypoints": {
+      "client_init": [
+        "eu.midnightdust.cullleaves.quilt.CullLeavesClientQuilt"
+      ]
+    },
+    "depends": [
+      {
+        "id": "quilt_loader",
+        "version": "*"
+      },
+      {
+        "id": "quilt_base",
+        "version": "*"
+      },
+      {
+        "id": "midnightlib",
+        "version": "*"
+      }
+    ],
+    "metadata": {
+      "name": "Cull Leaves (Quilt)",
+      "description": "Adds culling to leaf blocks, providing a huge performance boost over vanilla.",
+      "contributors": {
+        "Motschen": "Author",
+        "TeamMidnightDust": "Mascot"
+      },
+      "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.minecraftforge.net/" }
         gradlePluginPortal()
     }
 }
+
+include("common")
+include("fabric-like")
+include("fabric")
+include("quilt")
+include("forge")
+
+rootProject.name = "cullleaves"

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

@@ -1,288 +0,0 @@
-package eu.midnightdust.cullleaves.config;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.ScreenTexts;
-import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.gui.widget.TextFieldWidget;
-import net.minecraft.client.resource.language.I18n;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.text.*;
-import net.minecraft.util.Formatting;
-
-import java.lang.annotation.*;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.*;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.regex.Pattern;
-
-// MidnightConfig v0.1.0 //
-
-/* Based on https://github.com/Minenash/TinyConfig
-   Credits to Minenash - CC0-1.0
-   You can copy this class to get a standalone version of MidnightConfig */
-
-@SuppressWarnings("rawtypes")
-public class MidnightConfig {
-
-    private static final Pattern INTEGER_ONLY = Pattern.compile("(-?[0-9]*)");
-    private static final Pattern DECIMAL_ONLY = Pattern.compile("-?([\\d]+\\.?[\\d]*|[\\d]*\\.?[\\d]+|\\.)");
-
-    private static final List<EntryInfo> entries = new ArrayList<>();
-
-    protected static class EntryInfo {
-        Field field;
-        Object widget;
-        int width;
-        Method dynamicTooltip;
-        Map.Entry<TextFieldWidget,Text> error;
-        Object defaultValue;
-        Object value;
-        String tempValue;
-        boolean inLimits = true;
-    }
-
-    private static Class configClass;
-    private static String translationPrefix;
-    private static Path path;
-
-    private static final Gson gson = new GsonBuilder()
-            .excludeFieldsWithModifiers(Modifier.TRANSIENT)
-            .excludeFieldsWithModifiers(Modifier.PRIVATE)
-            .setPrettyPrinting()
-            .create();
-
-    public static void init(String modid, Class<?> config) {
-        translationPrefix = modid + ".midnightconfig.";
-        path = FabricLoader.getInstance().getConfigDir().resolve(modid + ".json");
-        configClass = config;
-
-        for (Field field : config.getFields()) {
-            Class<?> type = field.getType();
-            EntryInfo info = new EntryInfo();
-
-            Entry e;
-            try { e = field.getAnnotation(Entry.class); }
-            catch (Exception ignored) { continue; }
-
-            info.width = e.width();
-            info.field = field;
-
-            if (type == int.class)         textField(info, Integer::parseInt, INTEGER_ONLY, e.min(), e.max(), true);
-            else if (type == double.class) textField(info, Double::parseDouble, DECIMAL_ONLY, e.min(), e.max(),false);
-            else if (type == String.class) textField(info, String::length, null, Math.min(e.min(),0), Math.max(e.max(),1),true);
-            else if (type == boolean.class) {
-                Function<Object,Text> func = value -> new LiteralText((Boolean) value ? "True" : "False").formatted((Boolean) value ? Formatting.GREEN : Formatting.RED);
-                info.widget = new AbstractMap.SimpleEntry<ButtonWidget.PressAction, Function<Object, Text>>(button -> {
-                    info.value = !(Boolean) info.value;
-                    button.setMessage(func.apply(info.value));
-                }, func);
-            }
-            else if (type.isEnum()) {
-                List<?> values = Arrays.asList(field.getType().getEnumConstants());
-                Function<Object,Text> func = value -> new TranslatableText(translationPrefix + "enum." + type.getSimpleName() + "." + info.value.toString());
-                info.widget = new AbstractMap.SimpleEntry<ButtonWidget.PressAction, Function<Object,Text>>( button -> {
-                    int index = values.indexOf(info.value) + 1;
-                    info.value = values.get(index >= values.size()? 0 : index);
-                    button.setMessage(func.apply(info.value));
-                }, func);
-            }
-            else
-                continue;
-
-            entries.add(info);
-
-            try { info.defaultValue = field.get(null); }
-            catch (IllegalAccessException ignored) {}
-
-            try {
-                info.dynamicTooltip = config.getMethod(e.dynamicTooltip());
-                info.dynamicTooltip.setAccessible(true);
-            } catch (Exception ignored) {}
-
-        }
-
-        try { gson.fromJson(Files.newBufferedReader(path), config); }
-        catch (Exception e) { write(); }
-
-        for (EntryInfo info : entries) {
-            try {
-                info.value = info.field.get(null);
-                info.tempValue = info.value.toString();
-            }
-            catch (IllegalAccessException ignored) {}
-        }
-
-    }
-
-    private static void textField(EntryInfo info, Function<String,Number> f, Pattern pattern, double min, double max, boolean cast) {
-        boolean isNumber = pattern != null;
-        info.widget = (BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) (t, b) -> s -> {
-            s = s.trim();
-            if (!(s.isEmpty() || !isNumber || pattern.matcher(s).matches()))
-                return false;
-
-            Number value = 0;
-            boolean inLimits = false;
-            System.out.println(((isNumber ^ s.isEmpty())));
-            System.out.println(!s.equals("-") && !s.equals("."));
-            info.error = null;
-            if (!(isNumber && s.isEmpty()) && !s.equals("-") && !s.equals(".")) {
-                value = f.apply(s);
-                inLimits = value.doubleValue() >= min && value.doubleValue() <= max;
-                info.error = inLimits? null : new AbstractMap.SimpleEntry<>(t, new LiteralText(value.doubleValue() < min ?
-                        "§cMinimum " + (isNumber? "value" : "length") + (cast? " is " + (int)min : " is " + min) :
-                        "§cMaximum " + (isNumber? "value" : "length") + (cast? " is " + (int)max : " is " + max)));
-            }
-
-            info.tempValue = s;
-            t.setEditableColor(inLimits? 0xFFFFFFFF : 0xFFFF7777);
-            info.inLimits = inLimits;
-            b.active = entries.stream().allMatch(e -> e.inLimits);
-
-            if (inLimits)
-                info.value = isNumber? value : s;
-
-            return true;
-        };
-    }
-
-    public static void write() {
-        try {
-            if (!Files.exists(path)) Files.createFile(path);
-            Files.write(path, gson.toJson(configClass.newInstance()).getBytes());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    public Screen getScreen(Screen parent) {
-        return new TinyConfigScreen(parent);
-    }
-
-    private static class TinyConfigScreen extends Screen {
-        protected TinyConfigScreen(Screen parent) {
-            super(new TranslatableText(MidnightConfig.translationPrefix + "title"));
-            this.parent = parent;
-        }
-        private final Screen parent;
-
-        // Real Time config update //
-        @Override
-        public void tick() {
-            for (EntryInfo info : entries)
-                try { info.field.set(null, info.value); }
-                catch (IllegalAccessException ignore) {}
-        }
-
-        @Override
-        protected void init() {
-            super.init();
-            this.addButton(new ButtonWidget(this.width / 2 - 154, this.height - 28, 150, 20, ScreenTexts.CANCEL, button -> {
-                try { gson.fromJson(Files.newBufferedReader(path), configClass); }
-                catch (Exception e) { write(); }
-
-                for (EntryInfo info : entries) {
-                    try {
-                        info.value = info.field.get(null);
-                        info.tempValue = info.value.toString();
-                    }
-                    catch (IllegalAccessException ignored) {}
-                }
-                    Objects.requireNonNull(client).openScreen(parent);
-            }));
-
-            ButtonWidget done = this.addButton(new ButtonWidget(this.width / 2 + 4, this.height - 28, 150, 20, ScreenTexts.DONE, (button) -> {
-                for (EntryInfo info : entries)
-                    try { info.field.set(null, info.value); }
-                    catch (IllegalAccessException ignore) {}
-                write();
-                Objects.requireNonNull(client).openScreen(parent);
-            }));
-
-            int y = 45;
-            for (EntryInfo info : entries) {
-                addButton(new ButtonWidget(width - 155, y, 40,20, new LiteralText("Reset").formatted(Formatting.RED), (button -> {
-                    info.value = info.defaultValue;
-                    info.tempValue = info.value.toString();
-                    Objects.requireNonNull(client).openScreen(this);
-                })));
-
-                if (info.widget instanceof Map.Entry) {
-                    Map.Entry<ButtonWidget.PressAction,Function<Object,Text>> widget = (Map.Entry<ButtonWidget.PressAction, Function<Object, Text>>) info.widget;
-                    addButton(new ButtonWidget(width-110,y,info.width,20, widget.getValue().apply(info.value), widget.getKey()));
-                }
-                else {
-                    TextFieldWidget widget = addButton(new TextFieldWidget(textRenderer, width-110, y, info.width, 20, null));
-                    widget.setText(info.tempValue);
-
-                    Predicate<String> processor = ((BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) info.widget).apply(widget,done);
-                    widget.setTextPredicate(processor);
-
-                    children.add(widget);
-                }
-                y += 25;
-            }
-
-        }
-        int aniX = this.width / 2;
-        @Override
-        public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
-            this.renderBackground(matrices);
-
-            if (aniX < this.width / 2) {
-                aniX = aniX +40;
-            }
-
-            int stringWidth = (int) (title.getString().length() * 2.75f);
-            this.fillGradient(matrices, this.width / 2 - stringWidth, 10, this.width /2 + stringWidth, 29, -1072689136, -804253680);
-            this.fillGradient(matrices, this.width / 2 - aniX, 35, width/2 + aniX, this.height - 40, -1072689136, -804253680);
-
-            super.render(matrices, mouseX, mouseY, delta);
-            drawCenteredText(matrices, textRenderer, title, width/2, 15, 0xFFFFFF);
-
-            int y = 40;
-            for (EntryInfo info : entries) {
-                drawTextWithShadow(matrices, textRenderer, new TranslatableText(translationPrefix + info.field.getName()), 12, y + 10, 0xFFFFFF);
-
-                if (info.error != null && info.error.getKey().isMouseOver(mouseX,mouseY))
-                    renderTooltip(matrices, info.error.getValue(), mouseX, mouseY);
-                else if (mouseY >= y && mouseY < (y + 25)) {
-                    if (info.dynamicTooltip != null) {
-                        try {
-                            renderTooltip(matrices, (List<Text>) info.dynamicTooltip.invoke(null, entries), mouseX, mouseY);
-                            y += 25;
-                            continue;
-                        } catch (Exception e) { e.printStackTrace(); }
-                    }
-                    String key = translationPrefix + info.field.getName() + ".tooltip";
-                    if (I18n.hasTranslation(key)) {
-                        List<Text> list = new ArrayList<>();
-                        for (String str : I18n.translate(key).split("\n"))
-                            list.add(new LiteralText(str));
-                        renderTooltip(matrices, list, mouseX, mouseY);
-                    }
-                }
-                y += 25;
-            }
-        }
-    }
-
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.FIELD)
-    public @interface Entry {
-        String dynamicTooltip() default "";
-        int width() default 100;
-        double min() default Double.MIN_NORMAL;
-        double max() default Double.MAX_VALUE;
-    }
-}

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

@@ -1,15 +0,0 @@
-package eu.midnightdust.cullleaves.config;
-
-import io.github.prospector.modmenu.api.ConfigScreenFactory;
-import io.github.prospector.modmenu.api.ModMenuApi;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-
-@Environment(EnvType.CLIENT)
-public class ModMenuIntegration implements ModMenuApi {
-
-    @Override
-    public ConfigScreenFactory<?> getModConfigScreenFactory() {
-        return parent -> new CullLeavesConfig().getScreen(parent);
-    }
-}

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

@@ -1,5 +0,0 @@
-{
-	"cullleaves.midnightconfig.title":"Cull Leaves Config",
-	"cullleaves.midnightconfig.enabled.tooltip":"After changing this setting you have to reload all chunks (F3 + A)",
-	"cullleaves.midnightconfig.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"
-  }
-}