bump version to 2.6.5

+lang file cleanup

.gitignore

@@ -0,0 +1,9 @@
+.idea/
+*.iml
+*.ipr
+*.iws
+run/
+.gradle/
+build/
+classes/
+temp/

build.gradle.kts

@@ -0,0 +1,70 @@
+import net.fabricmc.loom.task.RemapJarTask
+import org.ajoberstar.grgit.Grgit
+
+plugins {
+    id("fabric-loom").version("0.6-SNAPSHOT")
+    kotlin("jvm").version("1.4.31")
+    id("org.ajoberstar.grgit").version("3.1.1")
+}
+apply(plugin = "org.ajoberstar.grgit")
+
+val gitHash = (project.ext.get("grgit") as Grgit).head().abbreviatedId
+val semVer = "${project.version}+$gitHash"
+val jarName = "BetterFoliage-$semVer-Fabric-${properties["mcVersion"]}"
+
+repositories {
+    maven("https://maven.fabricmc.net/")
+    maven("https://minecraft.curseforge.com/api/maven")
+    maven("https://maven.modmuss50.me/")
+    maven("https://maven.shedaniel.me/")
+    maven("https://grondag-repo.appspot.com").credentials { username = "guest"; password = "" }
+    maven("https://jitpack.io")
+}
+
+dependencies {
+    "minecraft"("com.mojang:minecraft:${properties["mcVersion"]}")
+    "mappings"("net.fabricmc:yarn:${properties["yarnMappings"]}:v2")
+
+    // basic Fabric stuff
+    "modImplementation"("net.fabricmc:fabric-loader:${properties["loaderVersion"]}")
+    "modImplementation"("net.fabricmc.fabric-api:fabric-api:${properties["fabricVersion"]}")
+    "modImplementation"("net.fabricmc:fabric-language-kotlin:${properties["fabricKotlinVersion"]}")
+
+    // configuration handling
+    "modImplementation"("io.github.prospector:modmenu:${properties["modMenuVersion"]}")
+    listOf("modImplementation", "include").forEach { configuration ->
+        configuration("me.shedaniel.cloth:cloth-config-fabric:${properties["clothConfigVersion"]}")
+        configuration("me.zeroeightsix:fiber:${properties["fiberVersion"]}")
+    }
+
+    // Canvas Renderer
+//    "modImplementation"("grondag:canvas:0.7.+")
+
+    // Optifabric
+//    "modImplementation"("com.github.modmuss50:OptiFabric:1.0.0")
+    "implementation"("org.zeroturnaround:zt-zip:1.13")
+}
+
+sourceSets {
+    get("main").ext["refMap"] = "betterfoliage.refmap.json"
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+kotlin {
+    target.compilations.configureEach {
+        kotlinOptions.jvmTarget = "1.8"
+        kotlinOptions.freeCompilerArgs += listOf("-Xno-param-assertions", "-Xno-call-assertions")
+    }
+}
+
+tasks.getByName<ProcessResources>("processResources") {
+    filesMatching("fabric.mod.json") { expand(mutableMapOf("version" to semVer)) }
+}
+
+tasks.getByName<RemapJarTask>("remapJar") {
+    archiveName = "$jarName.jar"
+}

gradle.properties

@@ -0,0 +1,20 @@
+org.gradle.jvmargs=-Xmx2G
+org.gradle.daemon=false
+
+group = com.github.octarine-noise
+name = betterfoliage
+jarName = BetterFoliage-Forge
+
+version = 2.6.5
+
+mcVersion = 1.16.5
+yarnMappings=1.16.5+build.6
+loaderVersion=0.11.3
+fabricVersion=0.32.5+1.16
+
+kotlinVersion=1.3.60
+fabricKotlinVersion=1.5.0+kotlin.1.4.31
+
+clothConfigVersion=4.11.24
+modMenuVersion=1.16.9
+fiberVersion=0.8.0-2

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -0,0 +1,183 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# 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"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# 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
+    ;;
+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"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    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
+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 or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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=`expr $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" ;;
+    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, 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"
+
+exec "$JAVACMD" "$@"

gradlew.bat

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

settings.gradle.kts

@@ -0,0 +1,8 @@
+pluginManagement {
+    repositories {
+        jcenter()
+        maven("https://maven.fabricmc.net/")
+        gradlePluginPortal()
+    }
+}
+rootProject.name = "betterfoliage"

src/main/java/mods/betterfoliage/MixinConfigPlugin.java

@@ -0,0 +1,49 @@
+package mods.betterfoliage;
+
+import net.fabricmc.loader.api.FabricLoader;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.objectweb.asm.tree.ClassNode;
+import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
+import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
+
+import java.util.List;
+import java.util.Set;
+
+public class MixinConfigPlugin implements IMixinConfigPlugin {
+
+    Logger logger = LogManager.getLogger(this);
+
+    Boolean hasOptifine = null;
+
+    @Override
+    public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
+        if (hasOptifine == null) {
+            hasOptifine = FabricLoader.getInstance().isModLoaded("optifabric");
+            if (hasOptifine) logger.log(Level.INFO, "[BetterFoliage] Optifabric detected, applying Optifine mixins");
+            else logger.log(Level.INFO, "[BetterFoliage] Optifabric not detected, applying Vanilla mixins");
+        }
+        if (mixinClassName.endsWith("Vanilla") && hasOptifine) return false;
+        if (mixinClassName.endsWith("Optifine") && !hasOptifine) return false;
+        return true;
+    }
+
+    @Override
+    public void onLoad(String mixinPackage) { }
+
+    @Override
+    public String getRefMapperConfig() { return null; }
+
+    @Override
+    public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) { }
+
+    @Override
+    public List<String> getMixins() { return null; }
+
+    @Override
+    public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { }
+
+    @Override
+    public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { }
+}

src/main/java/mods/betterfoliage/mixin/MixinBlock.java

@@ -0,0 +1,44 @@
+package mods.betterfoliage.mixin;
+
+import mods.betterfoliage.Hooks;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.shape.VoxelShape;
+import net.minecraft.world.BlockView;
+import net.minecraft.world.World;
+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.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.Random;
+
+
+@Mixin(Block.class)
+public class MixinBlock {
+    private static final String shouldSideBeRendered = "Lnet/minecraft/block/Block;shouldDrawSide(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/Direction;)Z";
+    private static final String getVoxelShape = "Lnet/minecraft/block/BlockState;getCullingFace(Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/Direction;)Lnet/minecraft/util/shape/VoxelShape;";
+    private static final String randomDisplayTick = "randomDisplayTick(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Ljava/util/Random;)V";
+
+    /**
+     * Override the {@link VoxelShape} used for the neighbor block in {@link Block}.shouldSideBeRendered().
+     *
+     * This way log blocks can be made to not block rendering, without altering any {@link Block} or
+     * {@link BlockState} properties with potential gameplay ramifications.
+     */
+    @Redirect(method = shouldSideBeRendered, at = @At(value = "INVOKE", target = getVoxelShape, ordinal = 1))
+    private static VoxelShape getVoxelShapeOverride(BlockState state, BlockView reader, BlockPos pos, Direction dir) {
+        return Hooks.getVoxelShapeOverride(state, reader, pos, dir);
+    }
+
+    /**
+     * Inject a callback to call for every random display tick. Used for adding custom particle effects to blocks.
+     */
+    @Inject(method = randomDisplayTick, at = @At("HEAD"))
+    void onRandomDisplayTick(BlockState state, World world, BlockPos pos, Random rnd, CallbackInfo ci) {
+//        Hooks.onRandomDisplayTick(state.getBlock(), state, world, pos, rnd);
+    }
+}

src/main/java/mods/betterfoliage/mixin/MixinBlockModels.java

@@ -0,0 +1,17 @@
+package mods.betterfoliage.mixin;
+
+import mods.betterfoliage.BlockModelsReloadCallback;
+import net.minecraft.client.render.block.BlockModels;
+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(BlockModels.class)
+public class MixinBlockModels {
+
+    @Inject(method = "reload()V", at = @At("RETURN"))
+    void onReload(CallbackInfo ci) {
+        BlockModelsReloadCallback.EVENT.invoker().reloadBlockModels((BlockModels) (Object) this);
+    }
+}

src/main/java/mods/betterfoliage/mixin/MixinBlockState.java

@@ -0,0 +1,29 @@
+package mods.betterfoliage.mixin;
+
+import mods.betterfoliage.Hooks;
+import net.minecraft.block.AbstractBlock;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.BlockView;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+/**
+ * Mixin to override the result of {@link BlockState}.getAmbientOcclusionLightValue().
+ *
+ * Needed to avoid excessive darkening of Round Logs at the corners, now that they are not full blocks.
+ */
+@Mixin(AbstractBlock.AbstractBlockState.class)
+@SuppressWarnings({"deprecation"})
+public class MixinBlockState {
+    private static final String callFrom = "Lnet/minecraft/block/AbstractBlock$AbstractBlockState;getAmbientOcclusionLightLevel(Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;)F";
+    // why is the INVOKEVIRTUAL target class Block in the bytecode, not AbstractBlock?
+    private static final String callTo = "Lnet/minecraft/block/Block;getAmbientOcclusionLightLevel(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;)F";
+
+    @Redirect(method = callFrom, at = @At(value = "INVOKE", target = callTo))
+    float getAmbientOcclusionValue(Block block, BlockState state, BlockView reader, BlockPos pos) {
+        return Hooks.getAmbientOcclusionLightValueOverride(block.getAmbientOcclusionLightLevel(state, reader, pos), state);
+    }
+}

src/main/java/mods/betterfoliage/mixin/MixinClientChunkManager.java

@@ -0,0 +1,24 @@
+package mods.betterfoliage.mixin;
+
+import mods.betterfoliage.ClientChunkLoadCallback;
+import net.minecraft.client.world.ClientChunkManager;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.network.PacketByteBuf;
+import net.minecraft.world.biome.source.BiomeArray;
+import net.minecraft.world.chunk.WorldChunk;
+import org.jetbrains.annotations.Nullable;
+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.CallbackInfoReturnable;
+
+@Mixin(ClientChunkManager.class)
+public class MixinClientChunkManager {
+
+    private static final String onLoadChunkFromPacket = "Lnet/minecraft/client/world/ClientChunkManager;loadChunkFromPacket(IILnet/minecraft/world/biome/source/BiomeArray;Lnet/minecraft/network/PacketByteBuf;Lnet/minecraft/nbt/CompoundTag;IZ)Lnet/minecraft/world/chunk/WorldChunk;";
+
+    @Inject(method = onLoadChunkFromPacket, at = @At(value = "RETURN", ordinal = 2))
+    void onLoadChunkFromPacket(int x, int z, @Nullable BiomeArray biomes, PacketByteBuf buf, CompoundTag tag, int verticalStripBitmask, boolean complete, CallbackInfoReturnable<WorldChunk> ci) {
+        ClientChunkLoadCallback.EVENT.invoker().loadChunk(ci.getReturnValue());
+    }
+}

src/main/java/mods/betterfoliage/mixin/MixinClientChunkManagerChunkMap.java

@@ -0,0 +1,19 @@
+package mods.betterfoliage.mixin;
+
+import mods.betterfoliage.ClientChunkLoadCallback;
+import net.minecraft.world.chunk.WorldChunk;
+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.CallbackInfoReturnable;
+
+@Mixin(targets = {"net.minecraft.client.world.ClientChunkManager$ClientChunkMap"})
+public class MixinClientChunkManagerChunkMap {
+
+    private static final String onCompareAndSet = "Lnet/minecraft/client/world/ClientChunkManager$ClientChunkMap;compareAndSet(ILnet/minecraft/world/chunk/WorldChunk;Lnet/minecraft/world/chunk/WorldChunk;)Lnet/minecraft/world/chunk/WorldChunk;";
+
+    @Inject(method = onCompareAndSet, at = @At("HEAD"))
+    void onSetAndCompare(int i, WorldChunk oldChunk, WorldChunk newChunk, CallbackInfoReturnable<WorldChunk> ci) {
+        ClientChunkLoadCallback.EVENT.invoker().unloadChunk(oldChunk);
+    }
+}

src/main/java/mods/betterfoliage/mixin/MixinClientWorld.java

@@ -0,0 +1,53 @@
+package mods.betterfoliage.mixin;
+
+import mods.betterfoliage.ClientWorldLoadCallback;
+import mods.betterfoliage.Hooks;
+import net.minecraft.block.BlockState;
+import net.minecraft.client.network.ClientPlayNetworkHandler;
+import net.minecraft.client.render.WorldRenderer;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.registry.RegistryKey;
+import net.minecraft.world.World;
+import net.minecraft.world.dimension.DimensionType;
+import net.minecraft.world.level.LevelInfo;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.Random;
+import java.util.function.Supplier;
+
+@Mixin(ClientWorld.class)
+public class MixinClientWorld {
+
+    private static final String ctor = "Lnet/minecraft/client/world/ClientWorld;<init>(Lnet/minecraft/client/network/ClientPlayNetworkHandler;Lnet/minecraft/client/world/ClientWorld$Properties;Lnet/minecraft/util/registry/RegistryKey;Lnet/minecraft/world/dimension/DimensionType;ILjava/util/function/Supplier;Lnet/minecraft/client/render/WorldRenderer;ZJ)V";
+    private static final String scheduleBlockRerenderIfNeeded = "Lnet/minecraft/client/world/ClientWorld;scheduleBlockRerenderIfNeeded(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/block/BlockState;)V";
+    private static final String rendererNotify = "Lnet/minecraft/client/render/WorldRenderer;method_21596(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/block/BlockState;)V";
+    private static final String worldDisplayTick = "randomBlockDisplayTick(IIIILjava/util/Random;ZLnet/minecraft/util/math/BlockPos$Mutable;)V";
+    private static final String blockDisplayTick = "Lnet/minecraft/block/Block;randomDisplayTick(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Ljava/util/Random;)V";
+
+    /**
+     * Inject callback to get notified of client-side blockstate changes.
+     * Used to invalidate caches in the {@link mods.betterfoliage.chunk.ChunkOverlayManager}
+     */
+    @Inject(method = scheduleBlockRerenderIfNeeded, at = @At(value = "HEAD"))
+    void onClientBlockChanged(BlockPos pos, BlockState oldState, BlockState newState, CallbackInfo ci) {
+        Hooks.onClientBlockChanged((ClientWorld) (Object) this, pos, oldState, newState);
+    }
+
+    @Inject(method = ctor, at = @At("RETURN"))
+    void onClientWorldCreated(ClientPlayNetworkHandler networkHandler, ClientWorld.Properties properties, RegistryKey<World> registryRef, DimensionType dimensionType, int loadDistance, Supplier<Profiler> profiler, WorldRenderer worldRenderer, boolean debugWorld, long seed, CallbackInfo ci) {
+        ClientWorldLoadCallback.EVENT.invoker().loadWorld((ClientWorld) (Object) this);
+    }
+
+    /**
+     * Inject a callback to call for every random display tick. Used for adding custom particle effects to blocks.
+     */
+    @Inject(method = worldDisplayTick, at = @At(value = "INVOKE", target = blockDisplayTick))
+    void onRandomDisplayTick(int xCenter, int yCenter, int zCenter, int radius, Random random, boolean spawnBarrierParticles, BlockPos.Mutable mutable, CallbackInfo ci) {
+        Hooks.onRandomDisplayTick((ClientWorld) (Object) this, mutable);
+    }
+}

src/main/java/mods/betterfoliage/mixin/MixinModelLoader.java

@@ -0,0 +1,37 @@
+package mods.betterfoliage.mixin;
+
+import mods.betterfoliage.ModelLoadingCallback;
+import mods.betterfoliage.resource.discovery.BakeWrapperManager;
+import net.minecraft.client.render.model.BakedModel;
+import net.minecraft.client.render.model.ModelBakeSettings;
+import net.minecraft.client.render.model.ModelLoader;
+import net.minecraft.client.render.model.UnbakedModel;
+import net.minecraft.client.texture.Sprite;
+import net.minecraft.client.util.ModelIdentifier;
+import net.minecraft.client.util.SpriteIdentifier;
+import net.minecraft.resource.ResourceManager;
+import net.minecraft.util.Identifier;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.function.Function;
+
+@Mixin(ModelLoader.class)
+public class MixinModelLoader {
+
+    @Shadow @Final private ResourceManager resourceManager;
+
+    // use the same trick fabric-api does to get around the no-mixins-in-constructors policy
+    @Inject(at = @At("HEAD"), method = "addModel")
+    private void addModelHook(ModelIdentifier id, CallbackInfo info) {
+        if (id.getPath().equals("trident_in_hand")) {
+            // last step before stitching
+            ModelLoadingCallback.EVENT.invoker().beginLoadModels((ModelLoader) (Object) this, resourceManager);
+        }
+    }
+}

src/main/java/mods/betterfoliage/mixin/MixinModelLoaderOptifine.java

@@ -0,0 +1,34 @@
+package mods.betterfoliage.mixin;
+
+import mods.betterfoliage.resource.discovery.BakeWrapperManager;
+import net.minecraft.client.render.model.BakedModel;
+import net.minecraft.client.render.model.ModelBakeSettings;
+import net.minecraft.client.render.model.ModelLoader;
+import net.minecraft.client.render.model.UnbakedModel;
+import net.minecraft.client.texture.Sprite;
+import net.minecraft.client.util.SpriteIdentifier;
+import net.minecraft.util.Identifier;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import java.util.function.Function;
+
+@Mixin(ModelLoader.class)
+public class MixinModelLoaderOptifine {
+
+    private static final String loaderBake = "Lnet/minecraft/class_1088;getBakedModel(Lnet/minecraft/class_2960;Lnet/minecraft/class_3665;Ljava/util/function/Function;)Lnet/minecraft/class_1087;";
+    private static final String modelBake = "Lnet/minecraft/class_1100;method_4753(Lnet/minecraft/class_1088;Ljava/util/function/Function;Lnet/minecraft/class_3665;Lnet/minecraft/class_2960;)Lnet/minecraft/class_1087;";
+
+    @SuppressWarnings("UnresolvedMixinReference")
+    @Redirect(method = loaderBake, at = @At(value = "INVOKE", target = modelBake), remap = false)
+    BakedModel onBakeModel(
+            UnbakedModel unbaked,
+            ModelLoader loader,
+            Function<SpriteIdentifier, Sprite> textureGetter,
+            ModelBakeSettings rotationContainer,
+            Identifier modelId
+    ) {
+        return BakeWrapperManager.INSTANCE.onBake(unbaked, loader, textureGetter, rotationContainer, modelId);
+    }
+}

src/main/java/mods/betterfoliage/mixin/MixinModelLoaderVanilla.java

@@ -0,0 +1,34 @@
+package mods.betterfoliage.mixin;
+
+import mods.betterfoliage.resource.discovery.BakeWrapperManager;
+import net.minecraft.client.render.model.BakedModel;
+import net.minecraft.client.render.model.ModelBakeSettings;
+import net.minecraft.client.render.model.ModelLoader;
+import net.minecraft.client.render.model.UnbakedModel;
+import net.minecraft.client.texture.Sprite;
+import net.minecraft.client.util.SpriteIdentifier;
+import net.minecraft.util.Identifier;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import java.util.function.Function;
+
+@Mixin(ModelLoader.class)
+public class MixinModelLoaderVanilla {
+
+    private static final String loaderBake = "Lnet/minecraft/client/render/model/ModelLoader;bake(Lnet/minecraft/util/Identifier;Lnet/minecraft/client/render/model/ModelBakeSettings;)Lnet/minecraft/client/render/model/BakedModel;";
+    private static final String modelBake = "Lnet/minecraft/client/render/model/UnbakedModel;bake(Lnet/minecraft/client/render/model/ModelLoader;Ljava/util/function/Function;Lnet/minecraft/client/render/model/ModelBakeSettings;Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/render/model/BakedModel;";
+
+    @Redirect(method = loaderBake, at = @At(value = "INVOKE", target = modelBake))
+    BakedModel onBakeModel(
+            UnbakedModel unbaked,
+            ModelLoader loader,
+            Function<SpriteIdentifier, Sprite> textureGetter,
+            ModelBakeSettings rotationContainer,
+            Identifier modelId
+    ) {
+        return BakeWrapperManager.INSTANCE.onBake(unbaked, loader, textureGetter, rotationContainer, modelId);
+    }
+}
+

src/main/kotlin/mods/betterfoliage/BetterFoliage.kt

@@ -0,0 +1,94 @@
+package mods.betterfoliage
+
+import me.zeroeightsix.fiber.JanksonSettings
+import mods.betterfoliage.chunk.ChunkOverlayManager
+import mods.betterfoliage.config.BlockConfig
+import mods.betterfoliage.config.MainConfig
+import mods.betterfoliage.render.ShadersModIntegration
+import mods.betterfoliage.render.block.vanilla.*
+import mods.betterfoliage.render.particle.LeafParticleRegistry
+import mods.betterfoliage.render.particle.RisingSoulParticle
+import mods.betterfoliage.resource.discovery.BakeWrapperManager
+import mods.betterfoliage.resource.discovery.BlockTypeCache
+import mods.betterfoliage.resource.generated.GeneratedBlockTexturePack
+import net.fabricmc.api.ClientModInitializer
+import net.fabricmc.fabric.api.resource.ResourceManagerHelper
+import net.fabricmc.fabric.mixin.resource.loader.ResourcePackManagerAccessor
+import net.fabricmc.loader.api.FabricLoader
+import net.minecraft.block.BlockState
+import net.minecraft.client.MinecraftClient
+import net.minecraft.resource.ResourceType
+import net.minecraft.util.Identifier
+import org.apache.logging.log4j.Level
+import org.apache.logging.log4j.LogManager
+import org.apache.logging.log4j.simple.SimpleLogger
+import org.apache.logging.log4j.util.PropertiesUtil
+import java.io.File
+import java.io.PrintStream
+import java.util.*
+
+
+object BetterFoliage : ClientModInitializer {
+    const val MOD_ID = "betterfoliage"
+
+    val detailLogStream = PrintStream(File("logs/betterfoliage.log").apply {
+        parentFile.mkdirs()
+        if (!exists()) createNewFile()
+    })
+
+    fun logger(obj: Any) = LogManager.getLogger(obj)
+    fun detailLogger(obj: Any) = SimpleLogger(
+        obj::class.java.simpleName, Level.DEBUG, false, true, true, false, "yyyy-MM-dd HH:mm:ss", null, PropertiesUtil(Properties()), detailLogStream
+    )
+
+    val configFile get() = File(FabricLoader.getInstance().configDirectory, "BetterFoliage.json")
+
+    val config = MainConfig().apply {
+        if (configFile.exists()) JanksonSettings().deserialize(fiberNode, configFile.inputStream())
+        else JanksonSettings().serialize(fiberNode, configFile.outputStream(), false)
+    }
+
+    val blockConfig = BlockConfig()
+    val generatedPack = GeneratedBlockTexturePack(Identifier(MOD_ID, "generated"), "betterfoliage-generated", "Better Foliage", "Generated leaf textures")
+
+    /** List of recognized [BlockState]s */
+    var blockTypes = BlockTypeCache()
+
+    override fun onInitializeClient() {
+        // Register generated resource pack
+        ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(generatedPack.reloader)
+        (MinecraftClient.getInstance().resourcePackManager as ResourcePackManagerAccessor)
+            .providers.add(generatedPack.finder)
+
+        ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(blockConfig)
+
+        // Add standard block support
+        BakeWrapperManager.discoverers.add(StandardCactusDiscovery)
+        BakeWrapperManager.discoverers.add(StandardDirtDiscovery)
+        BakeWrapperManager.discoverers.add(StandardGrassDiscovery)
+        BakeWrapperManager.discoverers.add(StandardLeafDiscovery)
+        BakeWrapperManager.discoverers.add(StandardLilypadDiscovery)
+        BakeWrapperManager.discoverers.add(StandardMyceliumDiscovery)
+        BakeWrapperManager.discoverers.add(StandardNetherrackDiscovery)
+        BakeWrapperManager.discoverers.add(StandardRoundLogDiscovery)
+        BakeWrapperManager.discoverers.add(StandardSandDiscovery)
+
+        // Init overlay layers
+        ChunkOverlayManager.layers.add(RoundLogOverlayLayer)
+
+        // Init singletons
+        LeafParticleRegistry
+        StandardLeafModel.Companion
+        StandardGrassModel.Companion
+        StandardRoundLogModel.Companion
+        StandardCactusModel.Companion
+        StandardLilypadModel.Companion
+        DirtModel.Companion
+        StandardSandModel.Companion
+        StandardMyceliumModel.Companion
+        StandardNetherrackModel.Companion
+        RisingSoulParticle.Companion
+        ShadersModIntegration
+    }
+
+}

src/main/kotlin/mods/betterfoliage/CommonRefs.kt

@@ -0,0 +1,11 @@
+package mods.betterfoliage
+
+import it.unimi.dsi.fastutil.ints.IntList
+import mods.betterfoliage.util.YarnHelper
+import net.minecraft.client.texture.Sprite
+import net.minecraft.world.World
+
+val VertexFormat_offsets = YarnHelper.requiredField<IntList>("net.minecraft.class_293", "field_1597", "Lit/unimi/dsi/fastutil/ints/IntList;")
+val BakedQuad_sprite = YarnHelper.requiredField<Sprite>("net.minecraft.class_777", "field_4176", "Lnet/minecraft/class_1058;")
+val WorldChunk_world = YarnHelper.requiredField<World>("net.minecraft.class_2818", "field_12858", "Lnet/minecraft/class_1937;")
+val ChunkRendererRegion_world = YarnHelper.requiredField<World>("net.minecraft.class_853", "field_4490", "Lnet/minecraft/class_1937;")

src/main/kotlin/mods/betterfoliage/Events.kt

@@ -0,0 +1,72 @@
+package mods.betterfoliage
+
+import net.fabricmc.fabric.api.event.Event
+import net.fabricmc.fabric.api.event.EventFactory
+import net.minecraft.client.render.block.BlockModels
+import net.minecraft.client.render.model.ModelLoader
+import net.minecraft.client.world.ClientWorld
+import net.minecraft.resource.ResourceManager
+import net.minecraft.world.chunk.WorldChunk
+
+interface ClientChunkLoadCallback {
+    fun loadChunk(chunk: WorldChunk)
+    fun unloadChunk(chunk: WorldChunk)
+
+    companion object {
+        @JvmField val EVENT: Event<ClientChunkLoadCallback> = EventFactory.createArrayBacked(ClientChunkLoadCallback::class.java) { listeners ->
+            object : ClientChunkLoadCallback {
+                override fun loadChunk(chunk: WorldChunk) { listeners.forEach { it.loadChunk(chunk) } }
+                override fun unloadChunk(chunk: WorldChunk) { listeners.forEach { it.unloadChunk(chunk) } }
+            }
+        }
+    }
+}
+
+interface ClientWorldLoadCallback {
+    fun loadWorld(world: ClientWorld)
+
+    companion object {
+        @JvmField val EVENT : Event<ClientWorldLoadCallback> = EventFactory.createArrayBacked(ClientWorldLoadCallback::class.java) { listeners ->
+            object : ClientWorldLoadCallback {
+                override fun loadWorld(world: ClientWorld) { listeners.forEach { it.loadWorld(world) } }
+            }
+        }
+    }
+}
+
+/**
+ * Event fired after [BlockModels.reload] finishes.
+ */
+interface BlockModelsReloadCallback {
+    fun reloadBlockModels(blockModels: BlockModels)
+
+    companion object {
+        @JvmField val EVENT: Event<BlockModelsReloadCallback> = EventFactory.createArrayBacked(BlockModelsReloadCallback::class.java) { listeners ->
+            object : BlockModelsReloadCallback {
+                override fun reloadBlockModels(blockModels: BlockModels) {
+                    listeners.forEach { it.reloadBlockModels(blockModels) }
+                }
+            }
+        }
+    }
+}
+
+/**
+ * Event fired when the [ModelLoader] first starts loading models.
+ *
+ * This happens during the constructor, so BEWARE!
+ * Try to avoid any interaction until the block texture atlas starts stitching.
+ */
+interface ModelLoadingCallback {
+    fun beginLoadModels(loader: ModelLoader, manager: ResourceManager)
+
+    companion object {
+        @JvmField val EVENT: Event<ModelLoadingCallback> = EventFactory.createArrayBacked(ModelLoadingCallback::class.java) { listeners ->
+            object : ModelLoadingCallback {
+                override fun beginLoadModels(loader: ModelLoader, manager: ResourceManager) {
+                    listeners.forEach { it.beginLoadModels(loader, manager) }
+                }
+            }
+        }
+    }
+}

src/main/kotlin/mods/betterfoliage/Hooks.kt

@@ -0,0 +1,67 @@
+@file:JvmName("Hooks")
+package mods.betterfoliage
+
+import mods.betterfoliage.chunk.ChunkOverlayManager
+import mods.betterfoliage.render.block.vanilla.LeafParticleKey
+import mods.betterfoliage.render.block.vanilla.RoundLogKey
+import mods.betterfoliage.render.particle.FallingLeafParticle
+import mods.betterfoliage.render.particle.RisingSoulParticle
+import mods.betterfoliage.util.offset
+import mods.betterfoliage.util.plus
+import mods.betterfoliage.util.random
+import mods.betterfoliage.util.randomD
+import net.minecraft.block.BlockState
+import net.minecraft.block.Blocks
+import net.minecraft.client.MinecraftClient
+import net.minecraft.client.world.ClientWorld
+import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.Direction
+import net.minecraft.util.shape.VoxelShape
+import net.minecraft.util.shape.VoxelShapes
+import net.minecraft.world.BlockView
+
+fun getAmbientOcclusionLightValueOverride(original: Float, state: BlockState): Float {
+    if (BetterFoliage.config.enabled &&
+        BetterFoliage.config.roundLogs.enabled &&
+        BetterFoliage.blockTypes.hasTyped<RoundLogKey>(state)
+    ) return BetterFoliage.config.roundLogs.dimming.toFloat()
+    return original
+}
+
+fun getUseNeighborBrightnessOverride(original: Boolean, state: BlockState): Boolean {
+    return original || (BetterFoliage.config.enabled && BetterFoliage.config.roundLogs.enabled && BetterFoliage.blockConfig.logBlocks.matchesClass(state.block));
+}
+
+fun onClientBlockChanged(worldClient: ClientWorld, pos: BlockPos, oldState: BlockState, newState: BlockState) {
+    ChunkOverlayManager.onBlockChange(worldClient, pos)
+}
+
+fun onRandomDisplayTick(world: ClientWorld, pos: BlockPos) {
+    val state = world.getBlockState(pos)
+
+    if (BetterFoliage.config.enabled &&
+        BetterFoliage.config.risingSoul.enabled &&
+        state.block == Blocks.SOUL_SAND &&
+        world.isAir(pos + Direction.UP.offset) &&
+        Math.random() < BetterFoliage.config.risingSoul.chance) {
+            RisingSoulParticle(world, pos).addIfValid()
+    }
+
+    if (BetterFoliage.config.enabled &&
+        BetterFoliage.config.fallingLeaves.enabled &&
+        world.isAir(pos + Direction.DOWN.offset) &&
+        randomD() < BetterFoliage.config.fallingLeaves.chance) {
+            BetterFoliage.blockTypes.getTyped<LeafParticleKey>(state)?.let { key ->
+                val blockColor = MinecraftClient.getInstance().blockColors.getColor(state, world, pos, 0)
+                FallingLeafParticle(world, pos, key, blockColor, random).addIfValid()
+            }
+    }
+}
+
+fun getVoxelShapeOverride(state: BlockState, reader: BlockView, pos: BlockPos, dir: Direction): VoxelShape {
+    if (BetterFoliage.blockTypes.hasTyped<RoundLogKey>(state)) {
+        return VoxelShapes.empty()
+    }
+    // TODO ?
+    return state.getCullingFace(reader, pos, dir)
+}

src/main/kotlin/mods/betterfoliage/chunk/BlockContext.kt

@@ -0,0 +1,60 @@
+package mods.betterfoliage.chunk
+
+import mods.betterfoliage.ChunkRendererRegion_world
+import mods.betterfoliage.util.Int3
+import mods.betterfoliage.util.allDirections
+import mods.betterfoliage.util.offset
+import mods.betterfoliage.util.plus
+import net.minecraft.block.Block
+import net.minecraft.block.BlockState
+import net.minecraft.client.MinecraftClient
+import net.minecraft.client.render.chunk.ChunkRendererRegion
+import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.Direction
+import net.minecraft.world.BlockRenderView
+import net.minecraft.world.WorldView
+import net.minecraft.world.biome.Biome
+
+/**
+ * Represents the block being rendered. Has properties and methods to query the neighborhood of the block in
+ * block-relative coordinates.
+ */
+interface BlockCtx {
+    val world: BlockRenderView
+    val pos: BlockPos
+
+    fun offset(dir: Direction) = offset(dir.offset)
+    fun offset(offset: Int3): BlockCtx
+
+    val state: BlockState get() = world.getBlockState(pos)
+    fun state(dir: Direction) = world.getBlockState(pos + dir.offset)
+    fun state(offset: Int3) = world.getBlockState(pos + offset)
+
+    val biome: Biome? get() =
+        (world as? WorldView)?.getBiome(pos) ?:
+        (world as? ChunkRendererRegion)?.let { ChunkRendererRegion_world[it]?.getBiome(pos) }
+
+    val isNormalCube: Boolean get() = state.isOpaqueFullCube(world, pos)
+
+    fun shouldSideBeRendered(side: Direction) = Block.shouldDrawSide(state, world, pos, side)
+
+    fun isNeighborSolid(dir: Direction) = offset(dir).let { it.state.isSideSolidFullSquare(it.world, it.pos, dir.opposite) }
+
+    fun model(dir: Direction) = state(dir).let { MinecraftClient.getInstance().blockRenderManager.getModel(it)!! }
+    fun model(offset: Int3) = state(offset).let { MinecraftClient.getInstance().blockRenderManager.getModel(it)!! }
+}
+
+open class BasicBlockCtx(
+    override val world: BlockRenderView,
+    override val pos: BlockPos
+) : BlockCtx {
+    override val state = world.getBlockState(pos)
+    override fun offset(offset: Int3) = BasicBlockCtx(world, pos + offset)
+    fun cache() = CachedBlockCtx(world, pos)
+}
+
+open class CachedBlockCtx(world: BlockRenderView, pos: BlockPos) : BasicBlockCtx(world, pos) {
+    var neighbors = Array<BlockState>(6) { world.getBlockState(pos + allDirections[it].offset) }
+    override var biome: Biome? = super.biome
+    override fun state(dir: Direction) = neighbors[dir.ordinal]
+}

src/main/kotlin/mods/betterfoliage/chunk/OffsetBlockView.kt

@@ -0,0 +1,50 @@
+package mods.betterfoliage.chunk
+
+import net.minecraft.util.math.BlockPos
+import net.minecraft.world.BlockView
+import net.minecraft.world.LightType
+import net.minecraft.world.WorldView
+
+/**
+ * Delegating [IBlockAccess] that fakes a _modified_ location to return values from a _target_ location.
+ * All other locations are handled normally.
+ *
+ * @param[original] the [IBlockAccess] that is delegated to
+ */
+@Suppress("NOTHING_TO_INLINE", "NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS", "HasPlatformType")
+open class OffsetBlockView(open val original: BlockView, val modded: BlockPos, val target: BlockPos) : BlockView {
+    inline fun actualPos(pos: BlockPos) = if (pos != null && pos.x == modded.x && pos.y == modded.y && pos.z == modded.z) target else pos
+
+    override fun getBlockState(pos: BlockPos) = original.getBlockState(actualPos(pos))
+    override fun getBlockEntity(pos: BlockPos) = original.getBlockEntity(actualPos(pos))
+    override fun getFluidState(pos: BlockPos) = original.getFluidState(actualPos(pos))
+}
+
+@Suppress("NOTHING_TO_INLINE", "NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS", "HasPlatformType")
+class OffsetExtBlockView(val original: WorldView, val modded: BlockPos, val target: BlockPos) : WorldView by original {
+    inline fun actualPos(pos: BlockPos) = if (pos != null && pos.x == modded.x && pos.y == modded.y && pos.z == modded.z) target else pos
+
+    override fun getBlockState(pos: BlockPos) = original.getBlockState(actualPos(pos))
+    override fun getBlockEntity(pos: BlockPos) = original.getBlockEntity(actualPos(pos))
+    override fun getFluidState(pos: BlockPos) = original.getFluidState(actualPos(pos))
+
+    override fun getLightLevel(type: LightType, pos: BlockPos) = original.getLightLevel(type, actualPos(pos))
+    override fun getBaseLightLevel(pos: BlockPos, light: Int) = original.getBaseLightLevel(actualPos(pos), light)
+    override fun getBiome(pos: BlockPos) = original.getBiome(actualPos(pos))
+}
+
+/**
+ * Temporarily replaces the [IBlockReader] used by this [BlockContext] and the corresponding [ExtendedRenderBlocks]
+ * to use an [OffsetEnvBlockReader] while executing this lambda.
+ *
+ * @param[modded] the _modified_ location
+ * @param[target] the _target_ location
+ * @param[func] the lambda to execute
+ */
+//inline fun <reified T> BlockContext.withOffset(modded: Int3, target: Int3, func: () -> T): T {
+//    val original = reader!!
+//    reader = OffsetEnvBlockReader(original, pos + modded, pos + target)
+//    val result = func()
+//    reader = original
+//    return result
+//}

src/main/kotlin/mods/betterfoliage/chunk/Overlay.kt

@@ -0,0 +1,119 @@
+package mods.betterfoliage.chunk
+
+import mods.betterfoliage.*
+import mods.betterfoliage.util.YarnHelper
+import mods.betterfoliage.util.get
+import net.minecraft.client.render.chunk.ChunkRendererRegion
+import net.minecraft.client.world.ClientWorld
+import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.ChunkPos
+import net.minecraft.world.BlockRenderView
+import net.minecraft.world.World
+import net.minecraft.world.WorldView
+import net.minecraft.world.chunk.WorldChunk
+import net.minecraft.world.dimension.DimensionType
+import java.util.*
+import kotlin.collections.List
+import kotlin.collections.MutableMap
+import kotlin.collections.associateWith
+import kotlin.collections.forEach
+import kotlin.collections.mutableListOf
+import kotlin.collections.mutableMapOf
+import kotlin.collections.set
+
+val BlockRenderView.dimType: DimensionType get() = when {
+    this is WorldView -> dimension
+    this is ChunkRendererRegion -> this[ChunkRendererRegion_world]!!.dimension
+//    this.isInstance(ChunkCacheOF) -> this[ChunkCacheOF.chunkCache]!!.dimType
+    else -> throw IllegalArgumentException("DimensionType of world with class ${this::class.qualifiedName} cannot be determined!")
+}
+
+/**
+ * Represents some form of arbitrary non-persistent data that can be calculated and cached for each block position
+ */
+interface ChunkOverlayLayer<T> {
+    fun calculate(ctx: BlockCtx): T
+    fun onBlockUpdate(world: WorldView, pos: BlockPos)
+}
+
+/**
+ * Query, lazy calculation and lifecycle management of multiple layers of chunk overlay data.
+ */
+object ChunkOverlayManager : ClientChunkLoadCallback, ClientWorldLoadCallback {
+
+    init {
+        ClientWorldLoadCallback.EVENT.register(this)
+        ClientChunkLoadCallback.EVENT.register(this)
+    }
+
+    val chunkData = IdentityHashMap<DimensionType, MutableMap<ChunkPos, ChunkOverlayData>>()
+    val layers = mutableListOf<ChunkOverlayLayer<*>>()
+
+    /**
+     * Get the overlay data for a given layer and position
+     *
+     * @param layer Overlay layer to query
+     * @param reader World to use if calculation of overlay value is necessary
+     * @param pos Block position
+     */
+    fun <T> get(layer: ChunkOverlayLayer<T>, ctx: BlockCtx): T? {
+        val data = chunkData[ctx.world.dimType]?.get(ChunkPos(ctx.pos)) ?: return null
+        data.get(layer, ctx.pos).let { value ->
+            if (value !== ChunkOverlayData.UNCALCULATED) return value
+            val newValue = layer.calculate(ctx)
+            data.set(layer, ctx.pos, newValue)
+            return newValue
+        }
+    }
+
+    /**
+     * Clear the overlay data for a given layer and position
+     *
+     * @param layer Overlay layer to clear
+     * @param pos Block position
+     */
+    fun <T> clear(dimension: DimensionType, layer: ChunkOverlayLayer<T>, pos: BlockPos) {
+        chunkData[dimension]?.get(ChunkPos(pos))?.clear(layer, pos)
+    }
+
+    fun onBlockChange(world: ClientWorld, pos: BlockPos) {
+        if (chunkData[world.dimType]?.containsKey(ChunkPos(pos)) == true) {
+            layers.forEach { layer -> layer.onBlockUpdate(world, pos) }
+        }
+    }
+
+    override fun loadChunk(chunk: WorldChunk) {
+        chunk[WorldChunk_world]!!.dimType.let { dim ->
+            val data = chunkData[dim] ?: mutableMapOf<ChunkPos, ChunkOverlayData>().apply { chunkData[dim] = this }
+            data.let { chunks ->
+                // check for existence first because Optifine fires a TON of these
+                if (chunk.pos !in chunks.keys) chunks[chunk.pos] = ChunkOverlayData(layers)
+            }
+        }
+    }
+
+    override fun unloadChunk(chunk: WorldChunk) {
+        chunk[WorldChunk_world]!!.dimType.let { dim ->
+            chunkData[dim]?.remove(chunk.pos)
+        }
+    }
+
+    override fun loadWorld(world: ClientWorld) {
+        val dim = world.dimType
+//        chunkData.keys.forEach { if (it == dim) chunkData[dim] = mutableMapOf() else chunkData.remove(dim)}
+    }
+}
+
+class ChunkOverlayData(layers: List<ChunkOverlayLayer<*>>) {
+    val BlockPos.isValid: Boolean get() = y in validYRange
+    val rawData = layers.associateWith { emptyOverlay() }
+    fun <T> get(layer: ChunkOverlayLayer<T>, pos: BlockPos): T? = if (pos.isValid) rawData[layer]?.get(pos.x and 15)?.get(pos.z and 15)?.get(pos.y) as T? else null
+    fun <T> set(layer: ChunkOverlayLayer<T>, pos: BlockPos, data: T) = if (pos.isValid) rawData[layer]?.get(pos.x and 15)?.get(pos.z and 15)?.set(pos.y, data) else null
+    fun <T> clear(layer: ChunkOverlayLayer<T>, pos: BlockPos) = if (pos.isValid) rawData[layer]?.get(pos.x and 15)?.get(pos.z and 15)?.set(pos.y, UNCALCULATED) else null
+
+    companion object {
+        val UNCALCULATED = object {}
+        fun emptyOverlay() = Array(16) { Array(16) { Array<Any?>(256) { UNCALCULATED }}}
+        val validYRange = 0 until 256
+    }
+}

src/main/kotlin/mods/betterfoliage/config/BlockConfig.kt

@@ -0,0 +1,39 @@
+package mods.betterfoliage.config
+
+import mods.betterfoliage.BetterFoliage
+import mods.betterfoliage.resource.VeryEarlyReloadListener
+import mods.betterfoliage.resource.discovery.ConfigurableBlockMatcher
+import mods.betterfoliage.resource.discovery.ModelTextureListConfiguration
+import net.minecraft.resource.ResourceManager
+import net.minecraft.util.Identifier
+
+class BlockConfig : VeryEarlyReloadListener {
+    private val list = mutableListOf<Any>()
+
+    val leafBlocks = blocks("leaves_blocks_default.cfg")
+    val leafModels = models("leaves_models_default.cfg")
+    val grassBlocks = blocks("grass_blocks_default.cfg")
+    val grassModels = models("grass_models_default.cfg")
+//    val mycelium = blocks("mycelium_blocks_default.cfg")
+//    val dirt = blocks("dirt_default.cfg")
+//    val crops = blocks("crop_default.cfg")
+    val logBlocks = blocks("log_blocks_default.cfg")
+    val logModels = models("log_models_default.cfg")
+//    val sand = blocks("sand_default.cfg")
+//    val lilypad = blocks("lilypad_default.cfg")
+//    val cactus = blocks("cactus_default.cfg")
+//    val netherrack = blocks("netherrack_blocks_default.cfg")
+
+    private fun blocks(cfgName: String) = ConfigurableBlockMatcher(Identifier(BetterFoliage.MOD_ID, cfgName)).apply { list.add(this) }
+    private fun models(cfgName: String) = ModelTextureListConfiguration(Identifier(BetterFoliage.MOD_ID, cfgName)).apply { list.add(this) }
+
+
+    override fun getFabricId() = Identifier(BetterFoliage.MOD_ID, "block-config")
+
+    override fun onReloadStarted(manager: ResourceManager) {
+        list.forEach { when(it) {
+            is ConfigurableBlockMatcher -> it.readDefaults(manager)
+            is ModelTextureListConfiguration -> it.readDefaults(manager)
+        } }
+    }
+}

src/main/kotlin/mods/betterfoliage/config/Delegate.kt

@@ -0,0 +1,141 @@
+package mods.betterfoliage.config
+
+import me.shedaniel.clothconfig2.api.AbstractConfigListEntry
+import me.shedaniel.clothconfig2.api.ConfigEntryBuilder
+import me.shedaniel.clothconfig2.gui.entries.SubCategoryListEntry
+import me.zeroeightsix.fiber.builder.ConfigValueBuilder
+import me.zeroeightsix.fiber.tree.ConfigLeaf
+import me.zeroeightsix.fiber.tree.ConfigNode
+import me.zeroeightsix.fiber.tree.ConfigValue
+import net.minecraft.client.resource.language.I18n
+import net.minecraft.text.LiteralText
+import java.util.*
+import kotlin.properties.ReadOnlyProperty
+import kotlin.reflect.KProperty
+
+const val MAX_LINE_LEN = 30
+
+fun textify(string: String) = LiteralText(string)
+fun textify(strings: Array<String>) = strings.map(::LiteralText).toTypedArray()
+
+sealed class DelegatingConfigNode<N: ConfigLeaf>(val fiberNode: N) {
+    abstract fun createClothNode(names: List<String>): AbstractConfigListEntry<*>
+}
+
+abstract class DelegatingConfigValue<T>(fiberNode: ConfigValue<T>) : DelegatingConfigNode<ConfigValue<T>>(fiberNode), ReadOnlyProperty<DelegatingConfigGroup, T>
+
+open class DelegatingConfigGroup(fiberNode: ConfigNode) : DelegatingConfigNode<ConfigNode>(fiberNode) {
+    val children = mutableListOf<DelegatingConfigNode<*>>()
+    override fun createClothNode(names: List<String>): SubCategoryListEntry {
+        val builder = ConfigEntryBuilder.create()
+            .startSubCategory(textify(names.joinToString(".").translate()))
+            .setTooltip(*textify(names.joinToString(".").translateTooltip()))
+            .setExpanded(false)
+        children.forEach { builder.add(it.createClothNode(names + it.fiberNode.name!!)) }
+        return builder.build()
+    }
+    operator fun get(name: String) = children.find { it.fiberNode.name == name }
+}
+
+interface DelegatingConfigGroupFactory<T> {
+    operator fun provideDelegate(parent: DelegatingConfigGroup, property: KProperty<*>): ReadOnlyProperty<DelegatingConfigGroup, T>
+}
+
+fun <T: DelegatingConfigGroup> subNode(factory: (ConfigNode)->T) = object : DelegatingConfigGroupFactory<T> {
+    override operator fun provideDelegate(parent: DelegatingConfigGroup, property: KProperty<*>): ReadOnlyProperty<DelegatingConfigGroup, T> {
+        val childNode = ConfigNode(property.name, null)
+        val configGroup = factory(childNode)
+        parent.fiberNode.items.add(childNode)
+        parent.children.add(configGroup)
+        return object : ReadOnlyProperty<DelegatingConfigGroup, T> {
+            override fun getValue(thisRef: DelegatingConfigGroup, property: KProperty<*>) = configGroup
+        }
+    }
+}
+
+interface DelegatingConfigValueFactory<T> {
+    fun createFiberNode(parent: ConfigNode, name: String): ConfigValue<T>
+    fun createClothNode(node: ConfigValue<T>, names: List<String>): AbstractConfigListEntry<T>
+
+    operator fun provideDelegate(parent: DelegatingConfigGroup, property: KProperty<*>): ReadOnlyProperty<DelegatingConfigGroup, T> {
+        return object : DelegatingConfigValue<T>(createFiberNode(parent.fiberNode, property.name)) {
+            override fun createClothNode(names: List<String>) = createClothNode(fiberNode, names)
+            override fun getValue(thisRef: DelegatingConfigGroup, property: KProperty<*>) = fiberNode.value!!
+        }.apply { parent.children.add(this) }
+    }
+}
+
+fun String.translate() = I18n.translate(this)
+fun String.translateTooltip(lineLength: Int = MAX_LINE_LEN) = ("$this.tooltip").translate().let { tooltip ->
+    tooltip.splitToSequence(" ").fold(mutableListOf("")) { tooltips, word ->
+        if (tooltips.last().length + word.length < lineLength) {
+            tooltips[tooltips.lastIndex] += "$word "
+        } else {
+            tooltips.add("$word ")
+        }
+        tooltips
+    }.map { it.trim() }.toTypedArray()
+}
+
+fun boolean(
+    default: Boolean,
+    langKey: (List<String>)->String = { it.joinToString(".") },
+    valueOverride: (Boolean)->Boolean = { it }
+) = object : DelegatingConfigValueFactory<Boolean> {
+    override fun createFiberNode(parent: ConfigNode, name: String) = ConfigValueBuilder(Boolean::class.java)
+        .withName(name)
+        .withParent(parent)
+        .withDefaultValue(default)
+        .build()
+
+    override fun createClothNode(node: ConfigValue<Boolean>, names: List<String>) = ConfigEntryBuilder.create()
+        .startBooleanToggle(textify(langKey(names).translate()), node.value!!)
+        .setTooltip(langKey(names).let { if (I18n.hasTranslation("$it.tooltip")) Optional.of(textify(it.translateTooltip())) else Optional.empty() })
+        .setSaveConsumer { node.value = valueOverride(it) }
+        .build()
+}
+
+fun integer(
+    default: Int, min: Int, max: Int,
+    langKey: (List<String>)->String = { it.joinToString(".") },
+    valueOverride: (Int)->Int = { it }
+) = object : DelegatingConfigValueFactory<Int> {
+    override fun createFiberNode(parent: ConfigNode, name: String) = ConfigValueBuilder(Int::class.java)
+        .withName(name)
+        .withParent(parent)
+        .withDefaultValue(default)
+        .constraints().minNumerical(min).maxNumerical(max).finish()
+        .build()
+
+    override fun createClothNode(node: ConfigValue<Int>, names: List<String>) = ConfigEntryBuilder.create()
+        .startIntField(textify(langKey(names).translate()), node.value!!)
+        .setTooltip(langKey(names).let { if (I18n.hasTranslation("$it.tooltip")) Optional.of(textify(it.translateTooltip())) else Optional.empty() })
+        .setMin(min).setMax(max)
+        .setSaveConsumer { node.value = valueOverride(it) }
+        .build()
+}
+
+fun double(
+    default: Double, min: Double, max: Double,
+    langKey: (List<String>)->String = { it.joinToString(".") },
+    valueOverride: (Double)->Double = { it }
+) = object : DelegatingConfigValueFactory<Double> {
+    override fun createFiberNode(parent: ConfigNode, name: String) = ConfigValueBuilder(Double::class.java)
+        .withName(name)
+        .withParent(parent)
+        .withDefaultValue(default)
+        .constraints().minNumerical(min).maxNumerical(max).finish()
+        .build()
+
+    override fun createClothNode(node: ConfigValue<Double>, names: List<String>) = ConfigEntryBuilder.create()
+        .startDoubleField(textify(langKey(names).translate()), node.value!!)
+        .setTooltip(langKey(names).let { if (I18n.hasTranslation("$it.tooltip")) Optional.of(textify(it.translateTooltip())) else Optional.empty() })
+        .setMin(min).setMax(max)
+        .setSaveConsumer { node.value = valueOverride(it) }
+        .build()
+}
+
+val recurring = { names: List<String> -> "${names.first()}.${names.last()}" }
+fun fakeCategory(name: String) = { names: List<String> ->
+    (listOf(names.first(), name) + names.drop(1)).joinToString(".")
+}

src/main/kotlin/mods/betterfoliage/config/MainConfig.kt

@@ -0,0 +1,158 @@
+package mods.betterfoliage.config
+
+import me.zeroeightsix.fiber.tree.ConfigNode
+import java.util.*
+
+interface PopulationConfigData {
+    val enabled: Boolean
+    val population: Int
+    fun enabled(random: Random) = random.nextInt(64) < population && enabled
+}
+
+fun population(default: Int) = integer(default, min = 0, max = 64, langKey = recurring)
+
+class MainConfig : DelegatingConfigGroup(ConfigNode("root", null)) {
+
+    val enabled by boolean(true, langKey = fakeCategory("global"))
+    val nVidia by boolean(true, langKey = fakeCategory("global"))
+
+    val leaves by subNode { LeavesConfig(it) }
+    val shortGrass by subNode { ShortGrassConfig(it) }
+    val connectedGrass by subNode { ConnectedGrassConfig(it) }
+    val roundLogs by subNode { RoundLogConfig(it) }
+    val cactus by subNode { CactusConfig(it) }
+    val lilypad by subNode { LilypadConfig(it) }
+    val reed by subNode { ReedConfig(it) }
+    val algae by subNode { AlgaeConfig(it) }
+    val coral by subNode { CoralConfig(it) }
+    val netherrack by subNode { NetherrackConfig(it) }
+    val fallingLeaves by subNode { FallingLeavesConfig(it) }
+    val risingSoul by subNode { RisingSoulConfig(it) }
+}
+
+class LeavesConfig(node: ConfigNode) : DelegatingConfigGroup(node) {
+    val enabled by boolean(true, langKey = recurring)
+    val snowEnabled by boolean(true)
+    val dense by boolean(false)
+    val hideInternal by boolean(true)
+
+    val hOffset by double(0.2, min = 0.0, max = 0.4, langKey = recurring)
+    val vOffset by double(0.1, min = 0.0, max = 0.4, langKey = recurring)
+    val size by double(1.4, min = 0.75, max = 2.5, langKey = recurring)
+    val shaderWind by boolean(true, langKey = recurring)
+    val saturationThreshold by double(0.1, min = 0.0, max = 1.0, langKey = recurring)
+}
+
+class ShortGrassConfig(node: ConfigNode) : DelegatingConfigGroup(node), PopulationConfigData {
+    override val enabled by boolean(true, langKey = recurring)
+    val myceliumEnabled by boolean(true)
+    val snowEnabled by boolean(true)
+    val hOffset by double(0.2, min = 0.0, max = 0.4, langKey = recurring)
+    val heightMin by double(0.6, min = 0.1, max = 2.5, langKey = recurring)
+    val heightMax by double(0.6, min = 0.1, max = 2.5, langKey = recurring) { it.coerceAtLeast(heightMin) }
+    val size by double(1.0, min = 0.5, max = 1.5, langKey = recurring)
+    override val population by population(64)
+    val useGenerated by boolean(false)
+    val shaderWind by boolean(true, langKey = recurring)
+    val saturationThreshold by double(0.1, min = 0.0, max = 1.0, langKey = recurring)
+}
+
+class ConnectedGrassConfig(node: ConfigNode) : DelegatingConfigGroup(node) {
+    val enabled by boolean(true, langKey = recurring)
+    val snowEnabled by boolean(true)
+}
+
+class RoundLogConfig(node: ConfigNode) : DelegatingConfigGroup(node) {
+    val enabled by boolean(true, langKey = recurring)
+
+    val defaultY by boolean(false)
+    val connectSolids by boolean(false)
+    val lenientConnect by boolean(true)
+    val connectPerpendicular by boolean(true)
+    val connectGrass by boolean(true)
+
+    val radiusSmall by double(0.25, min = 0.0, max = 0.5)
+    val radiusLarge by double(0.44, min = 0.0, max = 0.5) { it.coerceAtLeast(radiusSmall) }
+    val dimming by double(0.7, min = 0.0, max = 1.0)
+    val zProtection by double(0.99, min = 0.9, max = 1.0)
+}
+
+class CactusConfig(node: ConfigNode) : DelegatingConfigGroup(node) {
+    val enabled by boolean(true, langKey = recurring)
+    val size by double(1.3, min = 1.0, max = 2.0, langKey = recurring)
+    val sizeVariation by double(0.1, min = 0.0, max = 0.5)
+    val hOffset by double(0.1, min = 0.0, max = 0.5, langKey = recurring)
+}
+
+class LilypadConfig(node: ConfigNode) : DelegatingConfigGroup(node), PopulationConfigData {
+    override val enabled by boolean(true, langKey = recurring)
+    val hOffset by double(0.1, min = 0.0, max = 0.25, langKey = recurring)
+    override val population by population(16)
+    val shaderWind by boolean(true, langKey = recurring)
+}
+
+class ReedConfig(node: ConfigNode) : DelegatingConfigGroup(node), PopulationConfigData {
+    override val enabled by boolean(true, langKey = recurring)
+    val hOffset by double(0.2, min = 0.0, max = 0.4, langKey = recurring)
+    val heightMin by double(1.7, min = 1.5, max = 3.0, langKey = recurring)
+    val heightMax by double(2.2, min = 1.5, max = 3.0, langKey = recurring) { it.coerceAtLeast(heightMin) }
+    override val population by population(32)
+    val minBiomeTemp by double(0.4, min = 0.0, max = 2.0)
+    val minBiomeRainfall by double(0.4, min = 0.0, max = 1.0)
+    val shaderWind by boolean(true, langKey = recurring)
+}
+
+class AlgaeConfig(node: ConfigNode) : DelegatingConfigGroup(node), PopulationConfigData {
+    override val enabled by boolean(true, langKey = recurring)
+    val hOffset by double(0.1, min = 0.0, max = 0.4, langKey = recurring)
+    val size by double(1.0, min = 0.5, max = 1.5, langKey = recurring)
+    val heightMin by double(0.5, min = 0.1, max = 1.0, langKey = recurring)
+    val heightMax by double(0.5, min = 0.1, max = 1.0, langKey = recurring) { it.coerceAtLeast(heightMin) }
+    override val population by population(48)
+    val shaderWind by boolean(true, langKey = recurring)
+}
+
+class CoralConfig(node: ConfigNode) : DelegatingConfigGroup(node), PopulationConfigData {
+    override val enabled by boolean(true, langKey = recurring)
+    val shallowWater by boolean(false)
+    val hOffset by double(0.2, min = 0.0, max = 0.4, langKey = recurring)
+    val vOffset by double(0.1, min = 0.0, max = 0.4, langKey = recurring)
+    val size by double(0.7, min = 0.5, max = 1.5, langKey = recurring)
+    val crustSize by double(1.4, min = 0.5, max = 1.5)
+    val chance by integer(32, min = 0, max = 64)
+    override val population by population(48)
+}
+
+class NetherrackConfig(node: ConfigNode) : DelegatingConfigGroup(node) {
+    val enabled by boolean(true, langKey = recurring)
+    val hOffset by double(0.2, min = 0.0, max = 0.4, langKey = recurring)
+    val size by double(1.0, min = 0.5, max = 1.5, langKey = recurring)
+    val heightMin by double(0.6, min = 0.5, max = 1.5, langKey = recurring)
+    val heightMax by double(0.8, min = 0.5, max = 1.5, langKey = recurring) { it.coerceAtLeast(heightMin) }
+}
+
+class FallingLeavesConfig(node: ConfigNode) : DelegatingConfigGroup(node) {
+    val enabled by boolean(true, langKey = recurring)
+    val opacityHack by boolean(false)
+    val speed by double(0.05, min = 0.01, max = 0.15)
+    val windStrength by double(0.5, min = 0.1, max = 2.0)
+    val stormStrength by double(0.8, min = 0.1, max = 2.0) { it.coerceAtLeast(windStrength) }
+    val size by double(0.75, min = 0.25, max = 1.5)
+    val chance by double(0.05, min = 0.001, max = 1.0)
+    val perturb by double(0.25, min = 0.01, max = 1.0)
+    val lifetime by double(7.5, min = 1.0, max = 15.0)
+}
+
+class RisingSoulConfig(node: ConfigNode) : DelegatingConfigGroup(node) {
+    val enabled by boolean(true, langKey = recurring)
+    val chance by double(0.02, min = 0.001, max = 1.0)
+    val perturb by double(0.05, min = 0.01, max = 0.25)
+    val headSize by double(1.0, min = 0.25, max = 1.5)
+    val trailSize by double(0.75, min = 0.25, max = 1.5)
+    val opacity by double(0.5, min = 0.05, max = 1.0)
+    val sizeDecay by double(0.97, min = 0.5, max = 1.0)
+    val opacityDecay by double(0.97, min = 0.5, max = 1.0)
+    val lifetime by double(4.0, min = 1.0, max = 15.0)
+    val trailLength by integer(48, min = 2, max = 128)
+    val trailDensity by integer(3, min = 1, max = 16)
+}

src/main/kotlin/mods/betterfoliage/config/MiscDefaults.kt

@@ -0,0 +1,13 @@
+package mods.betterfoliage.config
+
+import net.minecraft.block.Blocks
+import net.minecraft.block.Material
+import net.minecraft.world.biome.Biome
+
+val CACTUS_BLOCKS = listOf(Blocks.CACTUS)
+val DIRT_BLOCKS = listOf(Blocks.DIRT, Blocks.COARSE_DIRT, Blocks.PODZOL)
+val SAND_BLOCKS = listOf(Blocks.SAND, Blocks.RED_SAND)
+val NETHERRACK_BLOCKS = listOf(Blocks.NETHERRACK)
+
+val SALTWATER_BIOMES = listOf(Biome.Category.BEACH, Biome.Category.OCEAN)
+val SNOW_MATERIALS = listOf(Material.SNOW_BLOCK)

src/main/kotlin/mods/betterfoliage/integration/ModMenu.kt

@@ -0,0 +1,31 @@
+package mods.betterfoliage.integration
+
+import io.github.prospector.modmenu.api.ModMenuApi
+import me.shedaniel.clothconfig2.api.ConfigBuilder
+import me.zeroeightsix.fiber.JanksonSettings
+import mods.betterfoliage.BetterFoliage
+import mods.betterfoliage.resource.discovery.BakeWrapperManager
+import net.minecraft.client.MinecraftClient
+import net.minecraft.client.gui.screen.Screen
+import net.minecraft.client.resource.language.I18n
+import net.minecraft.text.LiteralText
+import java.util.function.Function
+
+object ModMenu : ModMenuApi {
+    override fun getModId() = BetterFoliage.MOD_ID
+
+    override fun getConfigScreenFactory() = Function { screen: Screen ->
+        val builder = ConfigBuilder.create()
+            .setParentScreen(screen)
+            .setTitle(LiteralText(I18n.translate("betterfoliage.title")))
+        BetterFoliage.config.createClothNode(listOf("betterfoliage")).value.forEach { rootOption ->
+            builder.getOrCreateCategory(LiteralText("main")).addEntry(rootOption)
+        }
+        builder.savingRunnable = Runnable {
+            JanksonSettings().serialize(BetterFoliage.config.fiberNode, BetterFoliage.configFile.outputStream(), false)
+            BakeWrapperManager.invalidate()
+            MinecraftClient.getInstance().worldRenderer.reload()
+        }
+        builder.build()
+    }
+}

src/main/kotlin/mods/betterfoliage/integration/RubberIntegration.kt

@@ -0,0 +1,139 @@
+package mods.betterfoliage.integration
+
+
+object IC2RubberIntegration {
+
+//    val BlockRubWood = ClassRefOld<Any>("ic2.core.block.BlockRubWood")
+
+    init {
+//        if (ModList.get().isLoaded("ic2") && allAvailable(BlockRubWood)) {
+//            BetterFoliage.log(Level.INFO, "IC2 rubber support initialized")
+//            LogRegistry.registries.add(IC2LogDiscovery)
+//            BetterFoliage.blockSprites.providers.add(IC2LogDiscovery)
+//        }
+    }
+}
+
+object TechRebornRubberIntegration {
+
+//    val BlockRubberLog = ClassRefOld<Any>("techreborn.blocks.BlockRubberLog")
+
+    init {
+//        if (ModList.get().isLoaded("techreborn") && allAvailable(BlockRubberLog)) {
+//            BetterFoliage.log(Level.INFO, "TechReborn rubber support initialized")
+//            LogRegistry.registries.add(TechRebornLogDiscovery)
+//            BetterFoliage.blockSprites.providers.add(TechRebornLogDiscovery)
+//        }
+    }
+}
+
+/*
+class RubberLogInfo(
+    axis: Axis?,
+    val spotDir: Direction,
+    topTexture: Sprite,
+    bottomTexture: Sprite,
+    val spotTexture: Sprite,
+    sideTextures: List<Sprite>
+) : SimpleColumnInfo(axis, topTexture, bottomTexture, sideTextures) {
+
+    override val side: QuadIconResolver = { ctx: CombinedContext, idx: Int, quad: Quad ->
+        val worldFace = (if ((idx and 1) == 0) SOUTH else EAST).rotate(ctx.modelRotation)
+        if (worldFace == spotDir) spotTexture else {
+            val sideIdx = if (this.sideTextures.size > 1) (ctx.semiRandom(1) + dirToIdx[worldFace.ordinal]) % this.sideTextures.size else 0
+            this.sideTextures[sideIdx]
+        }
+    }
+}
+
+object IC2LogDiscovery : ModelDiscovery<ColumnTextureInfo>() {
+    override val logger = BetterFoliage.logDetail
+
+    override fun processModel(ctx: ModelDiscoveryContext, atlas: AtlasFuture): CompletableFuture<ColumnTextureInfo>? {
+        // check for proper block class, existence of ModelBlock, and "state" blockstate property
+        if (!IC2RubberIntegration.BlockRubWood.isInstance(ctx.state.block)) return null
+        val blockLoc = ctx.models.firstOrNull() as Pair<JsonUnbakedModel, Identifier> ?: return null
+        val type = ctx.state.entries.entries.find { it.key.getName() == "state" }?.value?.toString() ?: return null
+
+        // logs with no rubber spot
+        if (blockLoc.derivesFrom(Identifier("block/cube_column"))) {
+            val axis = when(type) {
+                "plain_y" -> Axis.Y
+                "plain_x" -> Axis.X
+                "plain_z" -> Axis.Z
+                else -> null
+            }
+            val textureNames = listOf("end", "side").map { blockLoc.first.resolveTexture(it) }
+            if (textureNames.any { it == "missingno" }) return null
+            log("IC2LogSupport: block state ${ctx.state.toString()}")
+            log("IC2LogSupport:             axis=$axis, end=${textureNames[0]}, side=${textureNames[1]}")
+            val endSprite = atlas.sprite(textureNames[0])
+            val sideSprite = atlas.sprite(textureNames[1])
+            return atlas.mapAfter {
+                SimpleColumnInfo(axis, endSprite.get(), endSprite.get(), listOf(sideSprite.get()))
+            }
+        }
+
+        // logs with rubber spot
+        val spotDir = when(type) {
+            "dry_north", "wet_north" -> NORTH
+            "dry_south", "wet_south" -> SOUTH
+            "dry_west", "wet_west" -> WEST
+            "dry_east", "wet_east" -> EAST
+            else -> null
+        }
+        val textureNames = listOf("up", "down", "north", "south").map { blockLoc.first.resolveTexture(it) }
+        if (textureNames.any { it == "missingno" }) return null
+        log("IC2LogSupport: block state ${ctx.state.toString()}")
+        log("IC2LogSupport:             spotDir=$spotDir, up=${textureNames[0]}, down=${textureNames[1]}, side=${textureNames[2]}, spot=${textureNames[3]}")
+        val upSprite = atlas.sprite(textureNames[0])
+        val downSprite = atlas.sprite(textureNames[1])
+        val sideSprite = atlas.sprite(textureNames[2])
+        val spotSprite = atlas.sprite(textureNames[3])
+        return if (spotDir != null) atlas.mapAfter {
+            RubberLogInfo(Axis.Y, spotDir, upSprite.get(), downSprite.get(), spotSprite.get(), listOf(sideSprite.get()))
+        } else atlas.mapAfter {
+            SimpleColumnInfo(Axis.Y, upSprite.get(), downSprite.get(), listOf(sideSprite.get()))
+        }
+    }
+}
+
+object TechRebornLogDiscovery : ModelDiscovery<ColumnTextureInfo>() {
+    override val logger = BetterFoliage.logDetail
+
+    override fun processModel(ctx: ModelDiscoveryContext, atlas: AtlasFuture): CompletableFuture<ColumnTextureInfo>? {
+        // check for proper block class, existence of ModelBlock
+        if (!TechRebornRubberIntegration.BlockRubberLog.isInstance(ctx.state.block)) return null
+        val blockLoc = ctx.models.map { it as? Pair<JsonUnbakedModel, Identifier> }.firstOrNull() ?: return null
+
+        val hasSap = ctx.state.entries.entries.find { it.key.getName() == "hassap" }?.value as? Boolean ?: return null
+        val sapSide = ctx.state.entries.entries.find { it.key.getName() == "sapside" }?.value as? Direction ?: return null
+
+        log("$logName: block state ${ctx.state}")
+        if (hasSap) {
+            val textureNames = listOf("end", "side", "sapside").map { blockLoc.first.resolveTexture(it) }
+            log("$logName:             spotDir=$sapSide, end=${textureNames[0]}, side=${textureNames[2]}, spot=${textureNames[3]}")
+            if (textureNames.all { it != "missingno" }) {
+                val endSprite = atlas.sprite(textureNames[0])
+                val sideSprite = atlas.sprite(textureNames[1])
+                val sapSprite = atlas.sprite(textureNames[2])
+                return atlas.mapAfter {
+                    RubberLogInfo(Axis.Y, sapSide, endSprite.get(), endSprite.get(), sapSprite.get(), listOf(sideSprite.get()))
+                }
+            }
+        } else {
+            val textureNames = listOf("end", "side").map { blockLoc.first.resolveTexture(it) }
+            log("$logName:             end=${textureNames[0]}, side=${textureNames[1]}")
+            if (textureNames.all { it != "missingno" }) {
+                val endSprite = atlas.sprite(textureNames[0])
+                val sideSprite = atlas.sprite(textureNames[1])
+                return atlas.mapAfter {
+                    SimpleColumnInfo(Axis.Y, endSprite.get(), endSprite.get(), listOf(sideSprite.get()))
+                }
+            }
+        }
+        return null
+    }
+}
+
+ */

src/main/kotlin/mods/betterfoliage/model/Meshify.kt

@@ -0,0 +1,117 @@
+package mods.betterfoliage.model
+
+import mods.betterfoliage.BakedQuad_sprite
+import mods.betterfoliage.VertexFormat_offsets
+import mods.betterfoliage.util.Double3
+import mods.betterfoliage.util.allDirections
+import mods.betterfoliage.util.findFirst
+import mods.betterfoliage.util.get
+import net.fabricmc.fabric.api.renderer.v1.material.BlendMode
+import net.minecraft.block.BlockState
+import net.minecraft.client.render.VertexFormat
+import net.minecraft.client.render.VertexFormatElement
+import net.minecraft.client.render.VertexFormatElement.Format.FLOAT
+import net.minecraft.client.render.VertexFormatElement.Format.UBYTE
+import net.minecraft.client.render.VertexFormatElement.Type.*
+import net.minecraft.client.render.VertexFormatElement.Type.UV
+import net.minecraft.client.render.VertexFormats
+import net.minecraft.client.render.model.BakedModel
+import net.minecraft.client.render.model.BakedQuad
+import net.minecraft.client.render.model.BasicBakedModel
+import net.minecraft.util.math.Direction
+import java.util.*
+
+interface BakedModelConverter {
+    /**
+     * Convert baked model. Returns null if conversion unsuccessful (wrong input type).
+     * @param model Input model
+     * @param converter Converter to use for converting nested models.
+     */
+    fun convert(model: BakedModel): BakedModel?
+    companion object {
+        fun of(func: (BakedModel)->BakedModel?) = object : BakedModelConverter {
+            override fun convert(model: BakedModel) = func(model)
+        }
+        val identity = of { model -> model }
+    }
+}
+
+/**
+ * Convert [BakedModel] using the provided list of [BakedModelConverter]s (in order).
+ * If all converters fail, gives the original model back.
+ */
+fun List<BakedModelConverter>.convert(model: BakedModel) = object : BakedModelConverter {
+    val converters = this@convert + BakedModelConverter.identity
+    override fun convert(model: BakedModel) = converters.findFirst { it.convert(model) }
+}.let { converterStack ->
+    // we are guaranteed a result here because of the identity converter
+    converterStack.convert(model)!!
+}
+
+/**
+ * Convert [BasicBakedModel] into one using fabric-rendering-api [Mesh] instead of the vanilla pipeline.
+ * @param blendMode Use the given [BlockRenderLayer] for the [Mesh]
+ * instead of the one declared by the corresponding [Block]
+ */
+fun meshifyStandard(model: BasicBakedModel, state: BlockState? = null, blendMode: BlendMode? = null) =
+    WrappedMeshModel.converter(state, blendModeOverride = blendMode).convert(model)!!
+
+fun meshifySolid(model: BasicBakedModel) = meshifyStandard(model, null, BlendMode.SOLID)
+fun meshifyCutoutMipped(model: BasicBakedModel) = meshifyStandard(model, null, BlendMode.CUTOUT_MIPPED)
+
+/**
+ * Convert a vanilla [BakedModel] into intermediate [Quad]s
+ * Vertex normals not supported (yet)
+ * Vertex data elements not aligned to 32 bit boundaries not supported
+ */
+fun unbakeQuads(model: BakedModel, state: BlockState?, random: Random, unshade: Boolean): List<Quad> {
+    return (allDirections.toList() + null as Direction?).flatMap { face ->
+        model.getQuads(state, face, random).mapIndexed { qIdx, bakedQuad ->
+            var quad = Quad(Vertex(), Vertex(), Vertex(), Vertex(), face = face, colorIndex = bakedQuad.colorIndex, sprite = bakedQuad[BakedQuad_sprite])
+
+            val format = quadVertexFormat(bakedQuad)
+            val stride = format.vertexSizeInteger
+            format.getIntOffset(POSITION, FLOAT, 3)?.let { posOffset ->
+                quad = quad.transformVI { vertex, vIdx -> vertex.copy(xyz = Double3(
+                    x = java.lang.Float.intBitsToFloat(bakedQuad.vertexData[vIdx * stride + posOffset + 0]).toDouble(),
+                    y = java.lang.Float.intBitsToFloat(bakedQuad.vertexData[vIdx * stride + posOffset + 1]).toDouble(),
+                    z = java.lang.Float.intBitsToFloat(bakedQuad.vertexData[vIdx * stride + posOffset + 2]).toDouble()
+                )) }
+            }
+            format.getIntOffset(COLOR, UBYTE, 4)?.let { colorOffset ->
+                quad = quad.transformVI { vertex, vIdx -> vertex.copy(
+                    color = Color(bakedQuad.vertexData[vIdx * stride + colorOffset])
+                ) }
+            }
+            format.getIntOffset(UV, FLOAT, 2, 0)?.let { uvOffset ->
+                quad = quad.transformVI { vertex, vIdx -> vertex.copy(uv = UV(
+                    u = java.lang.Float.intBitsToFloat(bakedQuad.vertexData[vIdx * stride + uvOffset + 0]).toDouble(),
+                    v = java.lang.Float.intBitsToFloat(bakedQuad.vertexData[vIdx * stride + uvOffset + 1]).toDouble()
+                )) }
+            }
+
+            quad = quad.transformV { it.copy(uv = it.uv.unbake(quad.sprite!!)) }.move(Double3(-0.5, -0.5, -0.5))
+            if (unshade) quad = quad.transformV { it.copy(color = it.color * (1.0f / Color.bakeShade(quad.face))) }
+            quad
+        }
+    }
+}
+
+/** Get the byte offset of the [VertexFormatElement] matching the given criteria */
+fun VertexFormat.getByteOffset(type: VertexFormatElement.Type, format: VertexFormatElement.Format, count: Int, index: Int = 0): Int? {
+    elements.forEachIndexed { idx, element ->
+        if (element == VertexFormatElement(index, format, type, count))
+            return VertexFormat_offsets[this]!!.getInt(idx)
+    }
+    return null
+}
+
+/**
+ * Get the int (32 bit) offset of the [VertexFormatElement] matching the given criteria
+ * Returns null if the element is not properly aligned
+ */
+fun VertexFormat.getIntOffset(type: VertexFormatElement.Type, format: VertexFormatElement.Format, count: Int, index: Int = 0) =
+    getByteOffset(type, format, count, index)?.let { if (it % 4 == 0) it / 4 else null }
+
+/** Function to determine [VertexFormat] used by [BakedQuad] */
+var quadVertexFormat: (BakedQuad)->VertexFormat = { VertexFormats.POSITION_COLOR_TEXTURE_LIGHT_NORMAL }

src/main/kotlin/mods/betterfoliage/model/Quads.kt

@@ -0,0 +1,230 @@
+package mods.betterfoliage.model
+
+import mods.betterfoliage.util.Atlas
+import mods.betterfoliage.util.*
+import mods.betterfoliage.util.minmax
+import net.fabricmc.fabric.api.renderer.v1.RendererAccess
+import net.fabricmc.fabric.api.renderer.v1.material.BlendMode
+import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh
+import net.minecraft.client.texture.MissingSprite
+import net.minecraft.client.texture.Sprite
+import net.minecraft.util.math.Direction
+import net.minecraft.util.math.Direction.*
+import java.lang.Math.max
+import java.lang.Math.min
+import java.util.Random
+import kotlin.math.cos
+import kotlin.math.sin
+
+/**
+ * Vertex UV coordinates
+ *
+ * Zero-centered: sprite coordinates fall between (-0.5, 0.5)
+ */
+data class UV(val u: Double, val v: Double) {
+    companion object {
+        val topLeft = UV(-0.5, -0.5)
+        val topRight = UV(0.5, -0.5)
+        val bottomLeft = UV(-0.5, 0.5)
+        val bottomRight = UV(0.5, 0.5)
+    }
+
+    val rotate: UV get() = UV(v, -u)
+
+    fun rotate(n: Int) = when(n % 4) {
+        0 -> copy()
+        1 -> UV(v, -u)
+        2 -> UV(-u, -v)
+        else -> UV(-v, u)
+    }
+
+    fun clamp(minU: Double = -0.5, maxU: Double = 0.5, minV: Double = -0.5, maxV: Double = 0.5) =
+        UV(u.minmax(minU, maxU), v.minmax(minV, maxV))
+
+    fun mirror(mirrorU: Boolean, mirrorV: Boolean) = UV(if (mirrorU) -u else u, if (mirrorV) -v else v)
+
+    fun unbake(sprite: Sprite) = UV(
+        (u - sprite.minU.toDouble()) / (sprite.maxU - sprite.minU).toDouble() - 0.5,
+        (v - sprite.minV.toDouble()) / (sprite.maxV - sprite.minV).toDouble() - 0.5
+    )
+}
+
+data class Color(val alpha: Int, val red: Int, val green: Int, val blue: Int) {
+    constructor(combined: Int) : this(combined shr 24 and 255, combined shr 16 and 255, combined shr 8 and 255, combined and 255)
+    val asInt get() = (alpha shl 24) or (red shl 16) or (green shl 8) or blue
+    operator fun times(f: Float) = Color(
+        alpha,
+        (f * red.toFloat()).toInt().coerceIn(0 until 256),
+        (f * green.toFloat()).toInt().coerceIn(0 until 256),
+        (f * blue.toFloat()).toInt().coerceIn(0 until 256)
+    )
+    companion object {
+        val white get() = Color(255, 255, 255, 255)
+        /** Amount of vanilla diffuse lighting applied to face quads */
+        fun bakeShade(dir: Direction?) = when(dir) {
+            DOWN -> 0.5f
+            NORTH, SOUTH -> 0.8f
+            EAST, WEST -> 0.6f
+            else -> 1.0f
+        }
+    }
+}
+
+data class HSB(var hue: Float, var saturation: Float, var brightness: Float) {
+    companion object {
+        fun fromColor(color: Int): HSB {
+            val hsbVals = java.awt.Color.RGBtoHSB((color shr 16) and 255, (color shr 8) and 255, color and 255, null)
+            return HSB(hsbVals[0], hsbVals[1], hsbVals[2])
+        }
+    }
+    val asColor: Int get() = java.awt.Color.HSBtoRGB(hue, saturation, brightness)
+}
+
+/**
+ * Model vertex
+ *
+ * @param[xyz] x, y, z coordinates
+ * @param[uv] u, v coordinates
+ * @param[color] vertex color RGB components
+ * @param[alpha] vertex color alpha component
+ */
+data class Vertex(val xyz: Double3 = Double3(0.0, 0.0, 0.0),
+                  val uv: UV = UV(0.0, 0.0),
+                  val color: Color = Color.white,
+                  val alpha: Int = 255,
+                  val normal: Double3? = null
+)
+
+/**
+ * Intermediate (fabric-renderer-api independent) representation of model quad
+ * Immutable, double-precision
+ * Zero-centered (both XYZ and UV) coordinates for simpler rotation/mirroring
+ */
+data class Quad(
+    val v1: Vertex, val v2: Vertex, val v3: Vertex, val v4: Vertex,
+    val sprite: Sprite? = null,
+    val colorIndex: Int = -1,
+    val face: Direction? = null
+) {
+    val verts = arrayOf(v1, v2, v3, v4)
+
+    inline fun transformV(trans: (Vertex)-> Vertex): Quad = transformVI { vertex, idx -> trans(vertex) }
+    inline fun transformVI(trans: (Vertex, Int)-> Vertex): Quad = copy(
+        v1 = trans(v1, 0), v2 = trans(v2, 1), v3 = trans(v3, 2), v4 = trans(v4, 3)
+    )
+    val normal: Double3 get() = (v2.xyz - v1.xyz).cross(v4.xyz - v1.xyz).normalize
+
+    fun move(trans: Double3) = transformV { it.copy(xyz = it.xyz + trans) }
+    fun move(trans: Pair<Double, Direction>) = move(Double3(trans.second) * trans.first)
+    fun scale (scale: Double) = transformV { it.copy(xyz = it.xyz * scale) }
+    fun scale (scale: Double3) = transformV { it.copy(xyz = Double3(it.xyz.x * scale.x, it.xyz.y * scale.y, it.xyz.z * scale.z)) }
+    fun rotate(rot: Rotation) = transformV { it.copy(xyz = it.xyz.rotate(rot), normal = it.normal?.rotate(rot)) }.copy(face = face?.rotate(rot))
+    fun rotateZ(angle: Double) = transformV { it.copy(
+        xyz = Double3(it.xyz.x * cos(angle) + it.xyz.z * sin(angle), it.xyz.y, it.xyz.z * cos(angle) - it.xyz.x * sin(angle)),
+        normal = it.normal?.let { normal-> Double3(normal.x * cos(angle) + normal.z * sin(angle), normal.y, normal.z * cos(angle) - normal.x * sin(angle)) }
+    ) }
+
+    fun scaleUV (scale: Double) = transformV { it.copy(uv = UV(it.uv.u * scale, it.uv.v * scale)) }
+    fun rotateUV(n: Int) = transformV { it.copy(uv = it.uv.rotate(n)) }
+    fun clampUV(minU: Double = -0.5, maxU: Double = 0.5, minV: Double = -0.5, maxV: Double = 0.5) =
+        transformV { it.copy(uv = it.uv.clamp(minU, maxU, minV, maxV)) }
+    fun mirrorUV(mirrorU: Boolean, mirrorV: Boolean) = transformV { it.copy(uv = it.uv.mirror(mirrorU, mirrorV)) }
+    fun scrambleUV(random: Random, canFlipU: Boolean, canFlipV: Boolean, canRotate: Boolean) = this
+        .mirrorUV(canFlipU && random.nextBoolean(), canFlipV && random.nextBoolean())
+        .let { if (canRotate) it.rotateUV(random.nextInt(4)) else it }
+
+    fun sprite(sprite: Sprite) = copy(sprite = sprite)
+    fun color(color: Color) = transformV { it.copy(color = color) }
+    fun color(color: Int) = transformV { it.copy(color = Color(color)) }
+    fun colorIndex(colorIndex: Int) = copy(colorIndex = colorIndex)
+    fun colorAndIndex(color: Int?) = color(color ?: Color.white.asInt).colorIndex(if (color == null) 0 else -1)
+
+    val flipped: Quad get() = Quad(v4, v3, v2, v1, sprite, colorIndex)
+    fun cycleVertices(n: Int) = when(n % 4) {
+        1 -> Quad(v2, v3, v4, v1)
+        2 -> Quad(v3, v4, v1, v2)
+        3 -> Quad(v4, v1, v2, v3)
+        else -> this.copy()
+    }
+
+    companion object {
+        fun mix(first: Quad, second: Quad, vertexFactory: (Vertex, Vertex)-> Vertex) = Quad(
+            v1 = vertexFactory(first.v1, second.v1),
+            v2 = vertexFactory(first.v2, second.v2),
+            v3 = vertexFactory(first.v3, second.v3),
+            v4 = vertexFactory(first.v4, second.v4)
+        )
+    }
+}
+
+fun List<Quad>.transform(trans: Quad.()-> Quad) = map { it.trans() }
+fun Array<List<Quad>>.transform(trans: Quad.(Int)-> Quad) = mapIndexed { idx, qList -> qList.map { it.trans(idx) } }.toTypedArray()
+
+fun List<Quad>.withOpposites() = flatMap { listOf(it, it.flipped) }
+fun Array<List<Quad>>.withOpposites() = map { it.withOpposites() }.toTypedArray()
+
+/**
+ * Pour quad data into a fabric-renderer-api Mesh
+ */
+fun List<Quad>.build(blendMode: BlendMode, noDiffuse: Boolean = false, flatLighting: Boolean = false): Mesh {
+    val renderer = RendererAccess.INSTANCE.renderer!!
+    val material = renderer.materialFinder().blendMode(0, blendMode).disableAo(0, flatLighting).disableDiffuse(0, noDiffuse).find()
+    val builder = renderer.meshBuilder()
+    builder.emitter.apply {
+        forEach { quad ->
+            val sprite = quad.sprite ?: Atlas.BLOCKS[MissingSprite.getMissingSpriteId()]!!
+            quad.verts.forEachIndexed { idx, vertex ->
+                pos(idx, (vertex.xyz + Double3(0.5, 0.5, 0.5)).asVec3f)
+                sprite(idx, 0,
+                    (sprite.maxU - sprite.minU) * (vertex.uv.u.toFloat() + 0.5f) + sprite.minU,
+                    (sprite.maxV - sprite.minV) * (vertex.uv.v.toFloat() + 0.5f) + sprite.minV
+                )
+                spriteColor(idx, 0, vertex.color.asInt)
+            }
+            cullFace(quad.face)
+            colorIndex(quad.colorIndex)
+            material(material)
+            emit()
+        }
+    }
+    return builder.build()
+}
+
+fun Array<List<Quad>>.build(blendMode: BlendMode, noDiffuse: Boolean = false, flatLighting: Boolean = false) = map { it.build(blendMode, noDiffuse, flatLighting) }.toTypedArray()
+
+/**
+ * The model should be positioned so that (0,0,0) is the block center.
+ * The block extends to (-0.5, 0.5) in all directions (inclusive).
+ */
+fun verticalRectangle(x1: Double, z1: Double, x2: Double, z2: Double, yBottom: Double, yTop: Double) = Quad(
+    Vertex(Double3(x1, yBottom, z1), UV.bottomLeft),
+    Vertex(Double3(x2, yBottom, z2), UV.bottomRight),
+    Vertex(Double3(x2, yTop, z2), UV.topRight),
+    Vertex(Double3(x1, yTop, z1), UV.topLeft)
+)
+
+fun horizontalRectangle(x1: Double, z1: Double, x2: Double, z2: Double, y: Double): Quad {
+    val xMin = min(x1, x2); val xMax = max(x1, x2)
+    val zMin = min(z1, z2); val zMax = max(z1, z2)
+    return Quad(
+        Vertex(Double3(xMin, y, zMin), UV.topLeft),
+        Vertex(Double3(xMin, y, zMax), UV.bottomLeft),
+        Vertex(Double3(xMax, y, zMax), UV.bottomRight),
+        Vertex(Double3(xMax, y, zMin), UV.topRight)
+    )
+}
+
+fun faceQuad(face: Direction): Quad {
+    val base = face.vec * 0.5
+    val top = boxFaces[face].top * 0.5
+    val left = boxFaces[face].left * 0.5
+    return Quad(
+        Vertex(base + top + left, UV.topLeft),
+        Vertex(base - top + left, UV.bottomLeft),
+        Vertex(base - top - left, UV.bottomRight),
+        Vertex(base + top - left, UV.topRight),
+        face = face
+    )
+}
+
+fun xzDisk(modelIdx: Int) = (PI2 * modelIdx / 64.0).let { Double3(cos(it), 0.0, sin(it)) }

src/main/kotlin/mods/betterfoliage/model/SpriteSets.kt

@@ -0,0 +1,75 @@
+package mods.betterfoliage.model
+
+import mods.betterfoliage.util.Atlas
+import mods.betterfoliage.util.get
+import net.fabricmc.fabric.api.event.client.ClientSpriteRegistryCallback
+import net.minecraft.client.MinecraftClient
+import net.minecraft.client.texture.MissingSprite
+import net.minecraft.client.texture.Sprite
+import net.minecraft.client.texture.SpriteAtlasTexture
+import net.minecraft.util.Identifier
+import kotlin.properties.ReadOnlyProperty
+import kotlin.reflect.KProperty
+
+interface SpriteSet {
+    val num: Int
+    operator fun get(idx: Int): Sprite
+}
+
+class FixedSpriteSet(val sprites: List<Sprite>) : SpriteSet {
+    override val num = sprites.size
+    override fun get(idx: Int) = sprites[idx % num]
+
+    constructor(atlas: Atlas, ids: List<Identifier>) : this(
+        ids.mapNotNull { atlas[it] }.let { sprites ->
+            if (sprites.isNotEmpty()) sprites else listOf(atlas[MissingSprite.getMissingSpriteId()]!!)
+        }
+    )
+}
+
+class SpriteDelegate(val atlas: Atlas, val idFunc: ()->Identifier) : ReadOnlyProperty<Any, Sprite>, ClientSpriteRegistryCallback {
+    private var id: Identifier? = null
+    private var value: Sprite? = null
+
+    init { ClientSpriteRegistryCallback.event(atlas.resourceId).register(this) }
+
+    override fun registerSprites(atlasTexture: SpriteAtlasTexture, registry: ClientSpriteRegistryCallback.Registry) {
+        id = idFunc(); value = null
+        registry.register(id)
+    }
+
+    override fun getValue(thisRef: Any, property: KProperty<*>): Sprite {
+        value?.let { return it }
+        synchronized(this) {
+            value?.let { return it }
+            atlas[id!!]!!.let { value = it; return it }
+        }
+    }
+}
+
+
+class SpriteSetDelegate(
+    val atlas: Atlas,
+    val idRegister: (Identifier)->Identifier = { it },
+    val idFunc: (Int)->Identifier
+) : ReadOnlyProperty<Any, SpriteSet>, ClientSpriteRegistryCallback {
+    private var idList: List<Identifier> = emptyList()
+    private var spriteSet: SpriteSet? = null
+    init { ClientSpriteRegistryCallback.event(atlas.resourceId).register(this) }
+
+    override fun registerSprites(atlasTexture: SpriteAtlasTexture, registry: ClientSpriteRegistryCallback.Registry) {
+        spriteSet = null
+        val manager = MinecraftClient.getInstance().resourceManager
+        idList = (0 until 16).map(idFunc).filter { manager.containsResource(atlas.file(it)) }.map(idRegister)
+        idList.forEach { registry.register(it) }
+    }
+
+    override fun getValue(thisRef: Any, property: KProperty<*>): SpriteSet {
+        spriteSet?.let { return it }
+        synchronized(this) {
+            spriteSet?.let { return it }
+            spriteSet = FixedSpriteSet(atlas, idList)
+            return spriteSet!!
+        }
+    }
+}

src/main/kotlin/mods/betterfoliage/model/TuftMeshes.kt

@@ -0,0 +1,80 @@
+package mods.betterfoliage.model
+
+import mods.betterfoliage.util.*
+import net.fabricmc.fabric.api.renderer.v1.material.BlendMode
+import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh
+import net.minecraft.client.texture.Sprite
+import net.minecraft.util.Identifier
+import net.minecraft.util.math.Direction.UP
+
+data class TuftShapeKey(
+    val size: Double,
+    val height: Double,
+    val offset: Double3,
+    val flipU1: Boolean,
+    val flipU2: Boolean
+)
+
+fun tuftShapeSet(size: Double, heightMin: Double, heightMax: Double, hOffset: Double): Array<TuftShapeKey> {
+    return Array(64) { idx ->
+        TuftShapeKey(
+            size,
+            randomD(heightMin, heightMax),
+            xzDisk(idx) * randomD(hOffset / 2.0, hOffset),
+            randomB(),
+            randomB()
+        )
+    }
+}
+
+fun tuftQuadSingle(size: Double, height: Double, flipU: Boolean) =
+    verticalRectangle(x1 = -0.5 * size, z1 = 0.5 * size, x2 = 0.5 * size, z2 = -0.5 * size, yBottom = 0.5, yTop = 0.5 + height)
+        .mirrorUV(flipU, false)
+
+fun tuftModelSet(shapes: Array<TuftShapeKey>, tintIndex: Int, spriteGetter: (Int)->Sprite) = shapes.mapIndexed { idx, shape ->
+    listOf(
+        tuftQuadSingle(shape.size, shape.height, shape.flipU1),
+        tuftQuadSingle(shape.size, shape.height, shape.flipU2).rotate(rot(UP))
+    ).map { it.move(shape.offset) }
+        .map { it.colorIndex(tintIndex) }
+        .map { it.sprite(spriteGetter(idx)) }
+}.toTypedArray()
+
+fun fullCubeTextured(spriteId: Identifier, tintIndex: Int, scrambleUV: Boolean = true): Mesh {
+    val sprite = Atlas.BLOCKS[spriteId]!!
+    return allDirections.map { faceQuad(it) }
+        .map { if (!scrambleUV) it else it.rotateUV(randomI(max = 4)) }
+        .map { it.sprite(sprite) }
+        .map { it.colorIndex(tintIndex) }
+        .build(BlendMode.SOLID, noDiffuse = true)
+}
+
+fun crossModelsRaw(num: Int, size: Double, hOffset: Double, vOffset: Double): Array<List<Quad>> {
+    return Array(num) { idx ->
+        listOf(
+            verticalRectangle(x1 = -0.5, z1 = 0.5, x2 = 0.5, z2 = -0.5, yBottom = -0.5 * 1.41, yTop = 0.5 * 1.41),
+            verticalRectangle(x1 = -0.5, z1 = 0.5, x2 = 0.5, z2 = -0.5, yBottom = -0.5 * 1.41, yTop = 0.5 * 1.41)
+                .rotate(rot(UP))
+        ).map { it.scale(size) }
+        .map { it.move(xzDisk(idx) * hOffset) }
+        .map { it.move(UP.vec * randomD(-1.0, 1.0) * vOffset) }
+    }
+}
+
+fun crossModelSingle(base: List<Quad>, sprite: Sprite, tintIndex: Int,scrambleUV: Boolean) =
+    base.map { if (scrambleUV) it.scrambleUV(random, canFlipU = true, canFlipV = true, canRotate = true) else it }
+        .map { it.colorIndex(tintIndex) }
+        .mapIndexed { idx, quad -> quad.sprite(sprite) }
+        .withOpposites()
+        .build(BlendMode.CUTOUT_MIPPED)
+
+fun crossModelsTextured(
+    leafBase: Array<List<Quad>>,
+    tintIndex: Int,
+    scrambleUV: Boolean,
+    spriteGetter: (Int) -> Identifier
+) = leafBase.mapIndexed { idx, leaf ->
+    crossModelSingle(leaf, Atlas.BLOCKS[spriteGetter(idx)], tintIndex, scrambleUV)
+}.toTypedArray()
+
+    fun Array<List<Quad>>.buildTufts() = withOpposites().build(BlendMode.CUTOUT_MIPPED)

src/main/kotlin/mods/betterfoliage/model/VanillaWrappers.kt

@@ -0,0 +1,87 @@
+package mods.betterfoliage.model
+
+import mods.betterfoliage.resource.discovery.ModelBakingContext
+import mods.betterfoliage.resource.discovery.ModelBakingKey
+import mods.betterfoliage.util.HasLogger
+import net.fabricmc.fabric.api.renderer.v1.material.BlendMode
+import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh
+import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel
+import net.fabricmc.fabric.api.renderer.v1.render.RenderContext
+import net.minecraft.block.BlockState
+import net.minecraft.client.render.RenderLayers
+import net.minecraft.client.render.model.BakedModel
+import net.minecraft.client.render.model.BasicBakedModel
+import net.minecraft.item.ItemStack
+import net.minecraft.util.collection.WeightedPicker
+import net.minecraft.util.math.BlockPos
+import net.minecraft.world.BlockRenderView
+import java.util.*
+import java.util.function.Supplier
+
+abstract class ModelWrapKey : ModelBakingKey, HasLogger() {
+    override fun bake(ctx: ModelBakingContext): BakedModel? {
+        val baseModel = super.bake(ctx)
+        if (baseModel is BasicBakedModel)
+            return bake(ctx, baseModel)
+        else
+            return baseModel
+    }
+
+    abstract fun bake(ctx: ModelBakingContext, wrapped: BasicBakedModel): BakedModel
+}
+
+abstract class WrappedBakedModel(val wrapped: BakedModel) : BakedModel by wrapped, FabricBakedModel {
+    override fun isVanillaAdapter() = false
+
+    override fun emitItemQuads(stack: ItemStack, randomSupplier: Supplier<Random>, context: RenderContext) {
+        (wrapped as FabricBakedModel).emitItemQuads(stack, randomSupplier, context)
+    }
+
+    override fun emitBlockQuads(blockView: BlockRenderView, state: BlockState, pos: BlockPos, randomSupplier: Supplier<Random>, context: RenderContext) {
+        (wrapped as FabricBakedModel).emitBlockQuads(blockView, state, pos, randomSupplier, context)
+    }
+}
+
+class WrappedMeshModel(wrapped: BasicBakedModel, val mesh: Mesh) : WrappedBakedModel(wrapped) {
+    override fun emitBlockQuads(blockView: BlockRenderView, state: BlockState, pos: BlockPos, randomSupplier: Supplier<Random>, context: RenderContext) {
+        context.meshConsumer().accept(mesh)
+    }
+
+    companion object {
+        /**
+         * Converter for [BasicBakedModel] instances.
+         * @param state [BlockState] to use when querying [BakedModel]
+         * @param unshade undo vanilla diffuse lighting when unbaking the [BakedModel]
+         * @param noDiffuse disable diffuse lighting when baking the [Mesh]
+         * @param blendModeOverride [BlockRenderLayer] to use instead of the one declared by the corresponding [Block]
+         */
+        fun converter(state: BlockState?, unshade: Boolean = false, noDiffuse: Boolean = true, blendModeOverride: BlendMode? = null) = BakedModelConverter.of { model ->
+            if (model is BasicBakedModel) {
+                val mesh = unbakeQuads(model, state, Random(42L), unshade).build(
+                    blendMode = blendModeOverride ?: BlendMode.fromRenderLayer(RenderLayers.getBlockLayer(state)),
+                    noDiffuse = noDiffuse,
+                    flatLighting = !model.useAmbientOcclusion()
+                )
+                WrappedMeshModel(model, mesh)
+            } else null
+        }
+    }
+}
+
+class WeightedModelWrapper(
+    val models: List<WeightedModel>, baseModel: BakedModel
+): WrappedBakedModel(baseModel), FabricBakedModel {
+
+    class WeightedModel(val model: BakedModel, val weight: Int) : WeightedPicker.Entry(weight)
+    fun getModel(random: Random) = WeightedPicker.getRandom(random, models).model
+
+    override fun emitBlockQuads(blockView: BlockRenderView, state: BlockState, pos: BlockPos, randomSupplier: Supplier<Random>, context: RenderContext) {
+        (getModel(randomSupplier.get()) as FabricBakedModel).emitBlockQuads(blockView, state, pos, randomSupplier, context)
+    }
+}
+
+fun getUnderlyingModel(model: BakedModel, random: Random): BakedModel = when(model) {
+    is WeightedModelWrapper -> getUnderlyingModel(model.getModel(random), random)
+    is WrappedBakedModel -> model.wrapped
+    else -> model
+}

src/main/kotlin/mods/betterfoliage/render/ShadersModIntegration.kt

@@ -0,0 +1,54 @@
+package mods.betterfoliage.render
+
+import mods.betterfoliage.BetterFoliage
+import mods.betterfoliage.render.lighting.getBufferBuilder
+import mods.betterfoliage.util.HasLogger
+import mods.betterfoliage.util.getAllMethods
+import net.fabricmc.fabric.api.renderer.v1.render.RenderContext
+import net.minecraft.block.BlockState
+import net.minecraft.block.Blocks
+import net.minecraft.client.render.BufferBuilder
+import net.minecraft.client.render.RenderLayer
+
+/**
+ * Integration for ShadersMod.
+ */
+object ShadersModIntegration : HasLogger() {
+
+    val BufferBuilder_SVertexBuilder = BufferBuilder::class.java.fields.find { it.name == "sVertexBuilder" }
+    val SVertexBuilder_pushState = getAllMethods("net.optifine.shaders.SVertexBuilder", "pushEntity").find { it.parameterCount == 1 }
+    val SVertexBuilder_popState = getAllMethods("net.optifine.shaders.SVertexBuilder", "popEntity").find { it.parameterCount == 0 }
+    val BlockAliases_getAliasBlockId = getAllMethods("net.optifine.shaders.BlockAliases", "getAliasBlockId").firstOrNull()
+
+    @JvmStatic val isAvailable =
+        listOf(BufferBuilder_SVertexBuilder).all { it != null } &&
+        listOf(SVertexBuilder_pushState, SVertexBuilder_popState, BlockAliases_getAliasBlockId).all { it != null }
+
+    val defaultLeaves = Blocks.OAK_LEAVES.defaultState
+    val defaultGrass = Blocks.TALL_GRASS.defaultState
+
+    init {
+        logger.info("[BetterFoliage] ShadersMod integration is ${if (isAvailable) "enabled" else "disabled" }")
+    }
+
+    /** Quads rendered inside this block will use the given block entity data in shader programs. */
+    inline fun renderAs(ctx: RenderContext, state: BlockState, layer: RenderLayer, enabled: Boolean = true, func: ()->Unit) {
+        if (isAvailable && enabled) {
+            val sVertexBuilder = BufferBuilder_SVertexBuilder!!.get(ctx.getBufferBuilder(layer))
+            val aliasBlockId = BlockAliases_getAliasBlockId!!.invoke(null, state)
+            SVertexBuilder_pushState!!.invoke(sVertexBuilder, aliasBlockId)
+            func()
+            SVertexBuilder_popState!!.invoke(sVertexBuilder)
+        } else {
+            func()
+        }
+    }
+
+    /** Quads rendered inside this block will behave as tallgrass blocks in shader programs. */
+    inline fun grass(ctx: RenderContext, enabled: Boolean = true, func: ()->Unit) =
+        renderAs(ctx, defaultGrass, RenderLayer.getCutoutMipped(), enabled, func)
+
+    /** Quads rendered inside this block will behave as leaf blocks in shader programs. */
+    inline fun leaves(ctx: RenderContext, enabled: Boolean = true, func: ()->Unit) =
+        renderAs(ctx, defaultLeaves, RenderLayer.getCutoutMipped(), enabled, func)
+}

src/main/kotlin/mods/betterfoliage/render/block/vanilla/Cactus.kt

@@ -0,0 +1,103 @@
+package mods.betterfoliage.render.block.vanilla
+
+import mods.betterfoliage.BetterFoliage
+import mods.betterfoliage.config.CACTUS_BLOCKS
+import mods.betterfoliage.model.Color
+import mods.betterfoliage.model.ModelWrapKey
+import mods.betterfoliage.model.SpriteDelegate
+import mods.betterfoliage.model.SpriteSetDelegate
+import mods.betterfoliage.model.WrappedBakedModel
+import mods.betterfoliage.model.buildTufts
+import mods.betterfoliage.model.crossModelsRaw
+import mods.betterfoliage.model.crossModelsTextured
+import mods.betterfoliage.model.meshifyCutoutMipped
+import mods.betterfoliage.model.meshifyStandard
+import mods.betterfoliage.model.transform
+import mods.betterfoliage.model.tuftModelSet
+import mods.betterfoliage.model.tuftShapeSet
+import mods.betterfoliage.render.lighting.grassTuftLighting
+import mods.betterfoliage.render.lighting.roundLeafLighting
+import mods.betterfoliage.render.lighting.withLighting
+import mods.betterfoliage.resource.discovery.AbstractModelDiscovery
+import mods.betterfoliage.resource.discovery.BakeWrapperManager
+import mods.betterfoliage.resource.discovery.ModelBakingContext
+import mods.betterfoliage.resource.discovery.ModelDiscoveryContext
+import mods.betterfoliage.util.Atlas
+import mods.betterfoliage.util.LazyInvalidatable
+import mods.betterfoliage.util.Rotation
+import mods.betterfoliage.util.get
+import mods.betterfoliage.util.horizontalDirections
+import mods.betterfoliage.util.randomD
+import mods.betterfoliage.util.randomI
+import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel
+import net.fabricmc.fabric.api.renderer.v1.render.RenderContext
+import net.minecraft.block.BlockState
+import net.minecraft.block.Blocks
+import net.minecraft.client.render.model.BakedModel
+import net.minecraft.client.render.model.BasicBakedModel
+import net.minecraft.client.render.model.json.JsonUnbakedModel
+import net.minecraft.util.Identifier
+import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.Direction.DOWN
+import net.minecraft.world.BlockRenderView
+import java.util.Random
+import java.util.function.Supplier
+
+
+object StandardCactusDiscovery : AbstractModelDiscovery() {
+    override fun processModel(ctx: ModelDiscoveryContext) {
+        val model = ctx.getUnbaked()
+        if (model is JsonUnbakedModel && ctx.blockState.block in CACTUS_BLOCKS) {
+            BetterFoliage.blockTypes.dirt.add(ctx.blockState)
+            ctx.addReplacement(StandardCactusKey)
+            ctx.sprites.add(StandardCactusModel.cactusCrossSprite)
+        }
+        super.processModel(ctx)
+    }
+}
+
+object StandardCactusKey : ModelWrapKey() {
+    override fun bake(ctx: ModelBakingContext, wrapped: BasicBakedModel) = StandardCactusModel(meshifyCutoutMipped(wrapped))
+}
+
+class StandardCactusModel(wrapped: BakedModel) : WrappedBakedModel(wrapped), FabricBakedModel {
+
+    val armLighting = horizontalDirections.map { grassTuftLighting(it) }
+    val crossLighting = roundLeafLighting()
+
+    override fun emitBlockQuads(blockView: BlockRenderView, state: BlockState, pos: BlockPos, randomSupplier: Supplier<Random>, context: RenderContext) {
+        (wrapped as FabricBakedModel).emitBlockQuads(blockView, state, pos, randomSupplier, context)
+        if (!BetterFoliage.config.enabled || !BetterFoliage.config.cactus.enabled) return
+
+        val random = randomSupplier.get()
+        val armSide = random.nextInt() and 3
+
+        context.withLighting(armLighting[armSide]) {
+            it.accept(cactusArmModels[armSide][random])
+        }
+        context.withLighting(crossLighting) {
+            it.accept(cactusCrossModels[random])
+        }
+    }
+
+    companion object {
+        val cactusCrossSprite = Identifier(BetterFoliage.MOD_ID, "blocks/better_cactus")
+        val cactusArmSprites by SpriteSetDelegate(Atlas.BLOCKS) { idx ->
+            Identifier(BetterFoliage.MOD_ID, "blocks/better_cactus_arm_$idx")
+        }
+        val cactusArmModels by LazyInvalidatable(BakeWrapperManager) {
+            val shapes = BetterFoliage.config.cactus.let { tuftShapeSet(0.8, 0.8, 0.8, 0.2) }
+            val models = tuftModelSet(shapes, Color.white.asInt) { cactusArmSprites[randomI()] }
+            horizontalDirections.map { side ->
+                models.transform { move(0.0625 to DOWN).rotate(Rotation.fromUp[side.ordinal]) }.buildTufts()
+            }.toTypedArray()
+        }
+        val cactusCrossModels by LazyInvalidatable(BakeWrapperManager) {
+            val models = BetterFoliage.config.cactus.let { config ->
+                crossModelsRaw(64, config.size, 0.0, 0.0)
+                    .transform { rotateZ(randomD(-config.sizeVariation, config.sizeVariation)) }
+            }
+            crossModelsTextured(models, Color.white.asInt, true) { cactusCrossSprite }
+        }
+    }
+}

src/main/kotlin/mods/betterfoliage/render/block/vanilla/Dirt.kt

@@ -0,0 +1,142 @@
+package mods.betterfoliage.render.block.vanilla
+
+import mods.betterfoliage.BetterFoliage
+import mods.betterfoliage.chunk.BasicBlockCtx
+import mods.betterfoliage.config.DIRT_BLOCKS
+import mods.betterfoliage.model.Color
+import mods.betterfoliage.model.ModelWrapKey
+import mods.betterfoliage.model.SpriteSetDelegate
+import mods.betterfoliage.model.WrappedBakedModel
+import mods.betterfoliage.model.build
+import mods.betterfoliage.model.meshifyStandard
+import mods.betterfoliage.model.tuftModelSet
+import mods.betterfoliage.model.tuftShapeSet
+import mods.betterfoliage.model.withOpposites
+import mods.betterfoliage.config.SALTWATER_BIOMES
+import mods.betterfoliage.model.getUnderlyingModel
+import mods.betterfoliage.model.meshifySolid
+import mods.betterfoliage.render.ShadersModIntegration
+import mods.betterfoliage.render.lighting.grassTuftLighting
+import mods.betterfoliage.render.lighting.reedLighting
+import mods.betterfoliage.render.lighting.renderMasquerade
+import mods.betterfoliage.render.lighting.withLighting
+import mods.betterfoliage.resource.discovery.AbstractModelDiscovery
+import mods.betterfoliage.resource.discovery.BakeWrapperManager
+import mods.betterfoliage.resource.discovery.ModelBakingContext
+import mods.betterfoliage.resource.discovery.ModelDiscoveryContext
+import mods.betterfoliage.resource.generated.CenteredSprite
+import mods.betterfoliage.util.Atlas
+import mods.betterfoliage.util.Int3
+import mods.betterfoliage.util.LazyInvalidatable
+import mods.betterfoliage.util.get
+import mods.betterfoliage.util.randomI
+import net.fabricmc.fabric.api.renderer.v1.material.BlendMode
+import net.fabricmc.fabric.api.renderer.v1.render.RenderContext
+import net.minecraft.block.BlockState
+import net.minecraft.block.Blocks
+import net.minecraft.block.Material
+import net.minecraft.client.render.RenderLayer
+import net.minecraft.client.render.model.BakedModel
+import net.minecraft.client.render.model.BasicBakedModel
+import net.minecraft.client.render.model.json.JsonUnbakedModel
+import net.minecraft.util.Identifier
+import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.Direction.UP
+import net.minecraft.world.BlockRenderView
+import java.util.Random
+import java.util.function.Supplier
+
+object StandardDirtDiscovery : AbstractModelDiscovery() {
+    fun canRenderInLayer(layer: RenderLayer) = when {
+        !BetterFoliage.config.enabled -> layer == RenderLayer.getSolid()
+        (!BetterFoliage.config.connectedGrass.enabled &&
+                !BetterFoliage.config.algae.enabled &&
+                !BetterFoliage.config.reed.enabled
+                ) -> layer == RenderLayer.getSolid()
+        else -> layer == RenderLayer.getCutoutMipped()
+    }
+
+    override fun processModel(ctx: ModelDiscoveryContext) {
+        if (ctx.getUnbaked() is JsonUnbakedModel && ctx.blockState.block in DIRT_BLOCKS) {
+            BetterFoliage.blockTypes.dirt.add(ctx.blockState)
+            ctx.addReplacement(StandardDirtKey)
+//            RenderTypeLookup.setRenderLayer(ctx.blockState.block, ::canRenderInLayer)
+        }
+        super.processModel(ctx)
+    }
+}
+
+object StandardDirtKey : ModelWrapKey() {
+    override fun bake(ctx: ModelBakingContext, wrapped: BasicBakedModel) = DirtModel(meshifySolid(wrapped))
+}
+
+class DirtModel(wrapped: BakedModel) : WrappedBakedModel(wrapped) {
+
+    val algaeLighting = grassTuftLighting(UP)
+    val reedLighting = reedLighting()
+
+    override fun emitBlockQuads(
+        blockView: BlockRenderView,
+        state: BlockState,
+        pos: BlockPos,
+        randomSupplier: Supplier<Random>,
+        context: RenderContext
+    ) {
+        if (!BetterFoliage.config.enabled) return super.emitBlockQuads(blockView, state, pos, randomSupplier, context)
+
+        val ctx = BasicBlockCtx(blockView, pos)
+        val stateUp = ctx.offset(UP).state
+        val isGrassUp = stateUp in BetterFoliage.blockTypes.grass
+
+        val isWater = stateUp.material == Material.WATER
+        val isDeepWater = isWater && ctx.offset(Int3(2 to UP)).state.material == Material.WATER
+        val isShallowWater = isWater && ctx.offset(Int3(2 to UP)).state.isAir
+        val isSaltWater = isWater && ctx.biome?.category in SALTWATER_BIOMES
+
+        val random = randomSupplier.get()
+        if (BetterFoliage.config.connectedGrass.enabled && isGrassUp) {
+            val grassBaseModel = getUnderlyingModel(ctx.model(UP), random)
+            context.renderMasquerade(grassBaseModel, blockView, stateUp, pos, randomSupplier, context)
+        } else {
+            super.emitBlockQuads(blockView, state, pos, randomSupplier, context)
+        }
+
+        if (BetterFoliage.config.algae.enabled(random) && isDeepWater) {
+            ShadersModIntegration.grass(context, BetterFoliage.config.algae.shaderWind) {
+                context.withLighting(algaeLighting) {
+                    it.accept(algaeModels[random])
+                }
+            }
+        } else if (BetterFoliage.config.reed.enabled(random) && isShallowWater && !isSaltWater) {
+            ShadersModIntegration.grass(context, BetterFoliage.config.reed.shaderWind) {
+                context.withLighting(reedLighting) {
+                    it.accept(reedModels[random])
+                }
+            }
+        }
+    }
+
+    companion object {
+        val algaeSprites by SpriteSetDelegate(Atlas.BLOCKS) { idx ->
+            Identifier(BetterFoliage.MOD_ID, "blocks/better_algae_$idx")
+        }
+        val reedSprites by SpriteSetDelegate(Atlas.BLOCKS,
+            idFunc = { idx -> Identifier(BetterFoliage.MOD_ID, "blocks/better_reed_$idx") },
+            idRegister = { id -> CenteredSprite(id, aspectHeight = 2).register(BetterFoliage.generatedPack) }
+        )
+        val algaeModels by LazyInvalidatable(BakeWrapperManager) {
+            val shapes =
+                BetterFoliage.config.algae.let { tuftShapeSet(it.size, it.heightMin, it.heightMax, it.hOffset) }
+            tuftModelSet(shapes, Color.white.asInt) { algaeSprites[randomI()] }
+                .withOpposites()
+                .build(BlendMode.CUTOUT_MIPPED, flatLighting = false)
+
+        }
+        val reedModels by LazyInvalidatable(BakeWrapperManager) {
+            val shapes = BetterFoliage.config.reed.let { tuftShapeSet(2.0, it.heightMin, it.heightMax, it.hOffset) }
+            tuftModelSet(shapes, Color.white.asInt) { reedSprites[randomI()] }
+                .withOpposites()
+                .build(BlendMode.CUTOUT_MIPPED, flatLighting = false)
+        }
+    }
+}

src/main/kotlin/mods/betterfoliage/render/block/vanilla/Grass.kt

@@ -0,0 +1,115 @@
+package mods.betterfoliage.render.block.vanilla
+
+import mods.betterfoliage.BetterFoliage
+import mods.betterfoliage.chunk.BasicBlockCtx
+import mods.betterfoliage.config.BlockConfig
+import mods.betterfoliage.config.SNOW_MATERIALS
+import mods.betterfoliage.render.ShadersModIntegration
+import mods.betterfoliage.render.lighting.grassTuftLighting
+import mods.betterfoliage.render.lighting.withLighting
+import mods.betterfoliage.resource.discovery.*
+import mods.betterfoliage.model.*
+import mods.betterfoliage.util.*
+import net.fabricmc.fabric.api.renderer.v1.material.BlendMode
+import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel
+import net.fabricmc.fabric.api.renderer.v1.render.RenderContext
+import net.minecraft.block.BlockState
+import net.minecraft.client.render.model.BakedModel
+import net.minecraft.client.render.model.BasicBakedModel
+import net.minecraft.util.Identifier
+import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.Direction.*
+import net.minecraft.world.BlockRenderView
+import java.util.*
+import java.util.function.Consumer
+import java.util.function.Supplier
+
+object StandardGrassDiscovery : ConfigurableModelDiscovery() {
+    override val matchClasses: ConfigurableBlockMatcher get() = BetterFoliage.blockConfig.grassBlocks
+    override val modelTextures: List<ModelTextureList> get() = BetterFoliage.blockConfig.grassModels.modelList
+
+    override fun processModel(ctx: ModelDiscoveryContext, textureMatch: List<Identifier>) {
+        ctx.addReplacement(StandardGrassKey(textureMatch[0], null))
+        BetterFoliage.blockTypes.grass.add(ctx.blockState)
+    }
+}
+
+data class StandardGrassKey(
+    val grassLocation: Identifier,
+    val overrideColor: Color?
+) : ModelWrapKey() {
+    val tintIndex: Int get() = if (overrideColor == null) 0 else -1
+
+    override fun bake(ctx: ModelBakingContext, wrapped: BasicBakedModel): BakedModel {
+        val grassSpriteColor = Atlas.BLOCKS[grassLocation].averageColor.let { hsb ->
+            logColorOverride(detailLogger, BetterFoliage.config.shortGrass.saturationThreshold, hsb)
+            hsb.colorOverride(BetterFoliage.config.shortGrass.saturationThreshold)
+        }
+        return StandardGrassModel(meshifyCutoutMipped(wrapped), this.copy(overrideColor = grassSpriteColor))
+    }
+}
+
+class StandardGrassModel(wrapped: BakedModel, val key: StandardGrassKey) : WrappedBakedModel(wrapped) {
+
+    val tuftNormal by grassTuftMeshesNormal.delegate(key)
+    val tuftSnowed by grassTuftMeshesSnowed.delegate(key)
+    val fullBlock by grassFullBlockMeshes.delegate(key)
+
+    val tuftLighting = grassTuftLighting(UP)
+
+    override fun emitBlockQuads(blockView: BlockRenderView, state: BlockState, pos: BlockPos, randomSupplier: Supplier<Random>, context: RenderContext) {
+        if (!BetterFoliage.config.enabled) return super.emitBlockQuads(blockView, state, pos, randomSupplier, context)
+
+        val ctx = BasicBlockCtx(blockView, pos)
+        val stateBelow = ctx.state(DOWN)
+        val stateAbove = ctx.state(UP)
+
+        val isSnowed = stateAbove.material in SNOW_MATERIALS
+        val connected = BetterFoliage.config.connectedGrass.enabled &&
+            (!isSnowed || BetterFoliage.config.connectedGrass.snowEnabled) &&
+            (stateBelow in BetterFoliage.blockTypes.dirt || stateBelow in BetterFoliage.blockTypes.grass)
+
+        val random = randomSupplier.get()
+        if (connected) {
+            context.meshConsumer().accept(if (isSnowed) snowFullBlockMeshes[random] else fullBlock[random])
+        } else {
+            super.emitBlockQuads(blockView, state, pos, randomSupplier, context)
+        }
+
+        if (BetterFoliage.config.shortGrass.enabled(random) && !ctx.isNeighborSolid(UP)) {
+            ShadersModIntegration.grass(context, BetterFoliage.config.shortGrass.shaderWind) {
+                context.withLighting(tuftLighting) {
+                    it.accept(if (isSnowed) tuftSnowed[random] else tuftNormal[random])
+                }
+            }
+        }
+    }
+
+    companion object {
+        val grassTuftSpritesNormal by SpriteSetDelegate(Atlas.BLOCKS) { idx ->
+            Identifier(BetterFoliage.MOD_ID, "blocks/better_grass_long_$idx")
+        }
+        val grassTuftSpritesSnowed by SpriteSetDelegate(Atlas.BLOCKS) { idx ->
+            Identifier(BetterFoliage.MOD_ID, "blocks/better_grass_long_$idx")
+        }
+        val grassTuftShapes = LazyMap(BakeWrapperManager) { key: StandardGrassKey ->
+            BetterFoliage.config.shortGrass.let { tuftShapeSet(it.size, it.heightMin, it.heightMax, it.hOffset) }
+        }
+        val grassTuftMeshesNormal = LazyMap(BakeWrapperManager) { key: StandardGrassKey ->
+            tuftModelSet(grassTuftShapes[key], key.tintIndex) { idx -> grassTuftSpritesNormal[randomI()] }
+                .withOpposites()
+                .build(BlendMode.CUTOUT_MIPPED, flatLighting = false)
+        }
+        val grassTuftMeshesSnowed = LazyMap(BakeWrapperManager) { key: StandardGrassKey ->
+            tuftModelSet(grassTuftShapes[key], Color.white.asInt) { idx -> grassTuftSpritesSnowed[randomI()] }
+                .withOpposites()
+                .build(BlendMode.CUTOUT_MIPPED, flatLighting = false)
+        }
+        val grassFullBlockMeshes = LazyMap(BakeWrapperManager) { key: StandardGrassKey ->
+            Array(64) { fullCubeTextured(key.grassLocation, key.tintIndex) }
+        }
+        val snowFullBlockMeshes by LazyInvalidatable(BakeWrapperManager) {
+            Array(64) { fullCubeTextured(Identifier("block/snow"), -1) }
+        }
+    }
+}

src/main/kotlin/mods/betterfoliage/render/block/vanilla/Leaf.kt

@@ -0,0 +1,122 @@
+package mods.betterfoliage.render.block.vanilla
+
+import mods.betterfoliage.BetterFoliage
+import mods.betterfoliage.chunk.BasicBlockCtx
+import mods.betterfoliage.config.SNOW_MATERIALS
+import mods.betterfoliage.model.Color
+import mods.betterfoliage.model.ModelWrapKey
+import mods.betterfoliage.model.SpriteSetDelegate
+import mods.betterfoliage.model.WrappedBakedModel
+import mods.betterfoliage.model.crossModelsRaw
+import mods.betterfoliage.model.crossModelsTextured
+import mods.betterfoliage.model.meshifyCutoutMipped
+import mods.betterfoliage.render.ShadersModIntegration
+import mods.betterfoliage.render.lighting.roundLeafLighting
+import mods.betterfoliage.render.lighting.withLighting
+import mods.betterfoliage.render.particle.LeafParticleRegistry
+import mods.betterfoliage.resource.discovery.BakeWrapperManager
+import mods.betterfoliage.resource.discovery.ConfigurableBlockMatcher
+import mods.betterfoliage.resource.discovery.ConfigurableModelDiscovery
+import mods.betterfoliage.resource.discovery.ModelBakingContext
+import mods.betterfoliage.resource.discovery.ModelDiscoveryContext
+import mods.betterfoliage.resource.discovery.ModelTextureList
+import mods.betterfoliage.resource.generated.GeneratedLeafSprite
+import mods.betterfoliage.util.Atlas
+import mods.betterfoliage.util.LazyMap
+import mods.betterfoliage.util.averageColor
+import mods.betterfoliage.util.colorOverride
+import mods.betterfoliage.util.get
+import mods.betterfoliage.util.logColorOverride
+import net.fabricmc.fabric.api.renderer.v1.render.RenderContext
+import net.minecraft.block.BlockState
+import net.minecraft.client.render.model.BakedModel
+import net.minecraft.client.render.model.BasicBakedModel
+import net.minecraft.util.Identifier
+import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.Direction.UP
+import net.minecraft.world.BlockRenderView
+import org.apache.logging.log4j.Level
+import java.util.Random
+import java.util.function.Supplier
+
+interface LeafBlockModel {
+    val key: LeafParticleKey
+}
+
+interface LeafParticleKey {
+    val leafType: String
+    val overrideColor: Color?
+}
+
+object StandardLeafDiscovery : ConfigurableModelDiscovery() {
+    override val matchClasses: ConfigurableBlockMatcher get() = BetterFoliage.blockConfig.leafBlocks
+    override val modelTextures: List<ModelTextureList> get() = BetterFoliage.blockConfig.leafModels.modelList
+
+    override fun processModel(ctx: ModelDiscoveryContext, textureMatch: List<Identifier>) {
+        val leafType = LeafParticleRegistry.typeMappings.getType(textureMatch[0]) ?: "default"
+        val generated = GeneratedLeafSprite(textureMatch[0], leafType)
+            .register(BetterFoliage.generatedPack)
+            .apply { ctx.sprites.add(this) }
+
+        detailLogger.log(Level.INFO, "     particle $leafType")
+        ctx.addReplacement(StandardLeafKey(generated, leafType, null))
+    }
+}
+
+data class StandardLeafKey(
+    val roundLeafTexture: Identifier,
+    override val leafType: String,
+    override val overrideColor: Color?
+) : ModelWrapKey(), LeafParticleKey {
+    val tintIndex: Int get() = if (overrideColor == null) 0 else -1
+
+    override fun bake(ctx: ModelBakingContext, wrapped: BasicBakedModel): BakedModel {
+        val leafSpriteColor = Atlas.BLOCKS[roundLeafTexture].averageColor.let { hsb ->
+            logColorOverride(detailLogger, BetterFoliage.config.leaves.saturationThreshold, hsb)
+            hsb.colorOverride(BetterFoliage.config.leaves.saturationThreshold)
+        }
+        return StandardLeafModel(meshifyCutoutMipped(wrapped), this.copy(overrideColor = leafSpriteColor))
+    }
+}
+
+class StandardLeafModel(
+    wrapped: BakedModel,
+    override val key: StandardLeafKey
+) : WrappedBakedModel(wrapped), LeafBlockModel {
+
+    val leafNormal by leafModelsNormal.delegate(key)
+    val leafSnowed by leafModelsSnowed.delegate(key)
+    val leafLighting = roundLeafLighting()
+
+    override fun emitBlockQuads(blockView: BlockRenderView, state: BlockState, pos: BlockPos, randomSupplier: Supplier<Random>, context: RenderContext) {
+        ShadersModIntegration.leaves(context, BetterFoliage.config.leaves.shaderWind) {
+            super.emitBlockQuads(blockView, state, pos, randomSupplier, context)
+            if (!BetterFoliage.config.enabled || !BetterFoliage.config.leaves.enabled) return
+
+            val ctx = BasicBlockCtx(blockView, pos)
+            val stateAbove = ctx.state(UP)
+            val isSnowed = stateAbove.material in SNOW_MATERIALS
+
+            val random = randomSupplier.get()
+            context.withLighting(leafLighting) {
+                it.accept(leafNormal[random])
+                if (isSnowed) it.accept(leafSnowed[random])
+            }
+        }
+    }
+
+    companion object {
+        val leafSpritesSnowed by SpriteSetDelegate(Atlas.BLOCKS) { idx ->
+            Identifier(BetterFoliage.MOD_ID, "blocks/better_leaves_snowed_$idx")
+        }
+        val leafModelsBase = LazyMap(BakeWrapperManager) { key: StandardLeafKey ->
+            BetterFoliage.config.leaves.let { crossModelsRaw(64, it.size, it.hOffset, it.vOffset) }
+        }
+        val leafModelsNormal = LazyMap(BakeWrapperManager) { key: StandardLeafKey ->
+            crossModelsTextured(leafModelsBase[key], key.tintIndex, true) { key.roundLeafTexture }
+        }
+        val leafModelsSnowed = LazyMap(BakeWrapperManager) { key: StandardLeafKey ->
+            crossModelsTextured(leafModelsBase[key], Color.white.asInt, false) { leafSpritesSnowed[it].id }
+        }
+    }
+}

src/main/kotlin/mods/betterfoliage/render/block/vanilla/Lilypad.kt

@@ -0,0 +1,84 @@
+package mods.betterfoliage.render.block.vanilla
+
+import mods.betterfoliage.BetterFoliage
+import mods.betterfoliage.model.Color
+import mods.betterfoliage.model.ModelWrapKey
+import mods.betterfoliage.model.SpriteSetDelegate
+import mods.betterfoliage.model.WrappedBakedModel
+import mods.betterfoliage.model.buildTufts
+import mods.betterfoliage.model.meshifyCutoutMipped
+import mods.betterfoliage.model.meshifyStandard
+import mods.betterfoliage.model.transform
+import mods.betterfoliage.model.tuftModelSet
+import mods.betterfoliage.model.tuftShapeSet
+import mods.betterfoliage.render.ShadersModIntegration
+import mods.betterfoliage.resource.discovery.AbstractModelDiscovery
+import mods.betterfoliage.resource.discovery.BakeWrapperManager
+import mods.betterfoliage.resource.discovery.ModelBakingContext
+import mods.betterfoliage.resource.discovery.ModelDiscoveryContext
+import mods.betterfoliage.util.Atlas
+import mods.betterfoliage.util.LazyInvalidatable
+import mods.betterfoliage.util.get
+import net.fabricmc.fabric.api.renderer.v1.render.RenderContext
+import net.minecraft.block.BlockState
+import net.minecraft.block.Blocks
+import net.minecraft.client.render.model.BakedModel
+import net.minecraft.client.render.model.BasicBakedModel
+import net.minecraft.client.render.model.json.JsonUnbakedModel
+import net.minecraft.util.Identifier
+import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.Direction.DOWN
+import net.minecraft.world.BlockRenderView
+import java.util.Random
+import java.util.function.Supplier
+
+object StandardLilypadDiscovery : AbstractModelDiscovery() {
+    val LILYPAD_BLOCKS = listOf(Blocks.LILY_PAD)
+
+    override fun processModel(ctx: ModelDiscoveryContext) {
+        if (ctx.getUnbaked() is JsonUnbakedModel && ctx.blockState.block in LILYPAD_BLOCKS) {
+            ctx.addReplacement(StandardLilypadKey)
+        }
+        super.processModel(ctx)
+    }
+}
+
+object StandardLilypadKey : ModelWrapKey() {
+    override fun bake(ctx: ModelBakingContext, wrapped: BasicBakedModel) = StandardLilypadModel(meshifyCutoutMipped(wrapped))
+}
+
+class StandardLilypadModel(wrapped: BakedModel) : WrappedBakedModel(wrapped) {
+    override fun emitBlockQuads(blockView: BlockRenderView, state: BlockState, pos: BlockPos, randomSupplier: Supplier<Random>, context: RenderContext) {
+        super.emitBlockQuads(blockView, state, pos, randomSupplier, context)
+        if (!BetterFoliage.config.enabled || !BetterFoliage.config.lilypad.enabled) return
+
+        val random = randomSupplier.get()
+        ShadersModIntegration.grass(context, BetterFoliage.config.lilypad.shaderWind) {
+            context.meshConsumer().accept(lilypadRootModels[random])
+        }
+        if (random.nextInt(64) < BetterFoliage.config.lilypad.population) {
+            context.meshConsumer().accept(lilypadFlowerModels[random])
+        }
+    }
+
+    companion object {
+        val lilypadRootSprites by SpriteSetDelegate(Atlas.BLOCKS) { idx ->
+            Identifier(BetterFoliage.MOD_ID, "blocks/better_lilypad_roots_$idx")
+        }
+        val lilypadFlowerSprites by SpriteSetDelegate(Atlas.BLOCKS) { idx ->
+            Identifier(BetterFoliage.MOD_ID, "blocks/better_lilypad_flower_$idx")
+        }
+        val lilypadRootModels by LazyInvalidatable(BakeWrapperManager) {
+            val shapes = tuftShapeSet(1.0, 1.0, 1.0, BetterFoliage.config.lilypad.hOffset)
+            tuftModelSet(shapes, Color.white.asInt) { lilypadRootSprites[it] }
+                .transform { move(2.0 to DOWN) }
+                .buildTufts()
+        }
+        val lilypadFlowerModels by LazyInvalidatable(BakeWrapperManager) {
+            val shapes = tuftShapeSet(0.5, 0.5, 0.5, BetterFoliage.config.lilypad.hOffset)
+            tuftModelSet(shapes, Color.white.asInt) { lilypadFlowerSprites[it] }
+                .transform { move(1.0 to DOWN) }
+                .buildTufts()
+        }
+    }
+}

src/main/kotlin/mods/betterfoliage/render/block/vanilla/Mycelium.kt

@@ -0,0 +1,84 @@
+package mods.betterfoliage.render.block.vanilla
+
+import mods.betterfoliage.BetterFoliage
+import mods.betterfoliage.model.Color
+import mods.betterfoliage.model.ModelWrapKey
+import mods.betterfoliage.model.SpriteSetDelegate
+import mods.betterfoliage.model.WrappedBakedModel
+import mods.betterfoliage.model.buildTufts
+import mods.betterfoliage.model.meshifyCutoutMipped
+import mods.betterfoliage.model.meshifyStandard
+import mods.betterfoliage.model.tuftModelSet
+import mods.betterfoliage.model.tuftShapeSet
+import mods.betterfoliage.render.ShadersModIntegration
+import mods.betterfoliage.render.lighting.grassTuftLighting
+import mods.betterfoliage.render.lighting.withLighting
+import mods.betterfoliage.resource.discovery.AbstractModelDiscovery
+import mods.betterfoliage.resource.discovery.BakeWrapperManager
+import mods.betterfoliage.resource.discovery.ModelBakingContext
+import mods.betterfoliage.resource.discovery.ModelDiscoveryContext
+import mods.betterfoliage.util.Atlas
+import mods.betterfoliage.util.LazyInvalidatable
+import mods.betterfoliage.util.get
+import mods.betterfoliage.util.offset
+import mods.betterfoliage.util.plus
+import mods.betterfoliage.util.randomI
+import net.fabricmc.fabric.api.renderer.v1.render.RenderContext
+import net.minecraft.block.BlockState
+import net.minecraft.block.Blocks
+import net.minecraft.client.render.model.BakedModel
+import net.minecraft.client.render.model.BasicBakedModel
+import net.minecraft.client.render.model.json.JsonUnbakedModel
+import net.minecraft.util.Identifier
+import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.Direction.UP
+import net.minecraft.world.BlockRenderView
+import java.util.Random
+import java.util.function.Supplier
+
+object StandardMyceliumDiscovery : AbstractModelDiscovery() {
+    val MYCELIUM_BLOCKS = listOf(Blocks.MYCELIUM)
+
+    override fun processModel(ctx: ModelDiscoveryContext) {
+        if (ctx.getUnbaked() is JsonUnbakedModel && ctx.blockState.block in MYCELIUM_BLOCKS) {
+            ctx.addReplacement(StandardMyceliumKey)
+//            RenderTypeLookup.setRenderLayer(ctx.blockState.block, RenderType.getCutout())
+        }
+        super.processModel(ctx)
+    }
+}
+
+object StandardMyceliumKey : ModelWrapKey() {
+    override fun bake(ctx: ModelBakingContext, wrapped: BasicBakedModel) = StandardMyceliumModel(meshifyCutoutMipped(wrapped))
+}
+
+class StandardMyceliumModel(wrapped: BakedModel) : WrappedBakedModel(wrapped) {
+
+    val tuftLighting = grassTuftLighting(UP)
+
+    override fun emitBlockQuads(blockView: BlockRenderView, state: BlockState, pos: BlockPos, randomSupplier: Supplier<Random>, context: RenderContext) {
+        super.emitBlockQuads(blockView, state, pos, randomSupplier, context)
+
+        val random = randomSupplier.get()
+        if (BetterFoliage.config.enabled &&
+            BetterFoliage.config.shortGrass.let { it.myceliumEnabled && random.nextInt(64) < it.population } &&
+            blockView.getBlockState(pos + UP.offset).isAir
+        ) {
+            ShadersModIntegration.grass(context, BetterFoliage.config.shortGrass.shaderWind) {
+                context.withLighting(tuftLighting) {
+                    it.accept(myceliumTuftModels[random])
+                }
+            }
+        }
+    }
+
+    companion object {
+        val myceliumTuftSprites by SpriteSetDelegate(Atlas.BLOCKS) { idx ->
+            Identifier(BetterFoliage.MOD_ID, "blocks/better_mycel_$idx")
+        }
+        val myceliumTuftModels by LazyInvalidatable(BakeWrapperManager) {
+            val shapes = BetterFoliage.config.shortGrass.let { tuftShapeSet(it.size, it.heightMin, it.heightMax, it.hOffset) }
+            tuftModelSet(shapes, Color.white.asInt) { idx -> myceliumTuftSprites[randomI()] }.buildTufts()
+        }
+    }
+}

src/main/kotlin/mods/betterfoliage/render/block/vanilla/Netherrack.kt

@@ -0,0 +1,94 @@
+package mods.betterfoliage.render.block.vanilla
+
+import mods.betterfoliage.BetterFoliage
+import mods.betterfoliage.config.NETHERRACK_BLOCKS
+import mods.betterfoliage.model.Color
+import mods.betterfoliage.model.ModelWrapKey
+import mods.betterfoliage.model.SpriteSetDelegate
+import mods.betterfoliage.model.WrappedBakedModel
+import mods.betterfoliage.model.build
+import mods.betterfoliage.model.meshifyCutoutMipped
+import mods.betterfoliage.model.meshifyStandard
+import mods.betterfoliage.model.transform
+import mods.betterfoliage.model.tuftModelSet
+import mods.betterfoliage.model.tuftShapeSet
+import mods.betterfoliage.model.withOpposites
+import mods.betterfoliage.render.lighting.grassTuftLighting
+import mods.betterfoliage.render.lighting.withLighting
+import mods.betterfoliage.resource.discovery.AbstractModelDiscovery
+import mods.betterfoliage.resource.discovery.BakeWrapperManager
+import mods.betterfoliage.resource.discovery.ModelBakingContext
+import mods.betterfoliage.resource.discovery.ModelDiscoveryContext
+import mods.betterfoliage.util.Atlas
+import mods.betterfoliage.util.LazyInvalidatable
+import mods.betterfoliage.util.Rotation
+import mods.betterfoliage.util.get
+import mods.betterfoliage.util.offset
+import mods.betterfoliage.util.plus
+import mods.betterfoliage.util.randomI
+import net.fabricmc.fabric.api.renderer.v1.material.BlendMode
+import net.fabricmc.fabric.api.renderer.v1.render.RenderContext
+import net.minecraft.block.BlockState
+import net.minecraft.client.render.RenderLayer
+import net.minecraft.client.render.model.BakedModel
+import net.minecraft.client.render.model.BasicBakedModel
+import net.minecraft.client.render.model.json.JsonUnbakedModel
+import net.minecraft.util.Identifier
+import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.Direction.DOWN
+import net.minecraft.world.BlockRenderView
+import java.util.Random
+import java.util.function.Supplier
+
+object StandardNetherrackDiscovery : AbstractModelDiscovery() {
+
+    fun canRenderInLayer(layer: RenderLayer) = when {
+        !BetterFoliage.config.enabled -> layer == RenderLayer.getSolid()
+        !BetterFoliage.config.netherrack.enabled -> layer == RenderLayer.getSolid()
+        else -> layer == RenderLayer.getCutoutMipped()
+    }
+
+    override fun processModel(ctx: ModelDiscoveryContext) {
+        if (ctx.getUnbaked() is JsonUnbakedModel && ctx.blockState.block in NETHERRACK_BLOCKS) {
+            BetterFoliage.blockTypes.dirt.add(ctx.blockState)
+            ctx.addReplacement(StandardNetherrackKey)
+//            RenderTypeLookup.setRenderLayer(ctx.blockState.block, ::canRenderInLayer)
+        }
+        super.processModel(ctx)
+    }
+}
+
+object StandardNetherrackKey : ModelWrapKey() {
+    override fun bake(ctx: ModelBakingContext, wrapped: BasicBakedModel) = StandardNetherrackModel(meshifyCutoutMipped(wrapped))
+}
+
+class StandardNetherrackModel(wrapped: BakedModel) : WrappedBakedModel(wrapped) {
+
+    val tuftLighting = grassTuftLighting(DOWN)
+
+    override fun emitBlockQuads(blockView: BlockRenderView, state: BlockState, pos: BlockPos, randomSupplier: Supplier<Random>, context: RenderContext) {
+        super.emitBlockQuads(blockView, state, pos, randomSupplier, context)
+        if (BetterFoliage.config.enabled &&
+            BetterFoliage.config.netherrack.enabled &&
+            blockView.getBlockState(pos + DOWN.offset).isAir
+        ) {
+            val random = randomSupplier.get()
+            context.withLighting(tuftLighting) {
+                it.accept(netherrackTuftModels[random])
+            }
+        }
+    }
+
+    companion object {
+        val netherrackTuftSprites by SpriteSetDelegate(Atlas.BLOCKS) { idx ->
+            Identifier(BetterFoliage.MOD_ID, "blocks/better_netherrack_$idx")
+        }
+        val netherrackTuftModels by LazyInvalidatable(BakeWrapperManager) {
+            val shapes = BetterFoliage.config.netherrack.let { tuftShapeSet(it.size, it.heightMin, it.heightMax, it.hOffset) }
+            tuftModelSet(shapes, Color.white.asInt) { netherrackTuftSprites[randomI()] }
+                .transform { rotate(Rotation.fromUp[DOWN.ordinal]).rotateUV(2) }
+                .withOpposites()
+                .build(BlendMode.CUTOUT_MIPPED, flatLighting = false)
+        }
+    }
+}

src/main/kotlin/mods/betterfoliage/render/block/vanilla/RoundLog.kt

@@ -0,0 +1,92 @@
+package mods.betterfoliage.render.block.vanilla
+
+import mods.betterfoliage.BetterFoliage
+import mods.betterfoliage.model.ModelWrapKey
+import mods.betterfoliage.model.meshifySolid
+import mods.betterfoliage.render.column.ColumnBlockKey
+import mods.betterfoliage.render.column.ColumnMeshSet
+import mods.betterfoliage.render.column.ColumnModelBase
+import mods.betterfoliage.render.column.ColumnRenderLayer
+import mods.betterfoliage.resource.discovery.BakeWrapperManager
+import mods.betterfoliage.resource.discovery.ConfigurableBlockMatcher
+import mods.betterfoliage.resource.discovery.ConfigurableModelDiscovery
+import mods.betterfoliage.resource.discovery.ModelBakingContext
+import mods.betterfoliage.resource.discovery.ModelBakingKey
+import mods.betterfoliage.resource.discovery.ModelDiscoveryContext
+import mods.betterfoliage.resource.discovery.ModelTextureList
+import mods.betterfoliage.util.Atlas
+import mods.betterfoliage.util.LazyMap
+import mods.betterfoliage.util.tryDefault
+import net.minecraft.block.BlockState
+import net.minecraft.block.PillarBlock
+import net.minecraft.client.render.model.BakedModel
+import net.minecraft.client.render.model.BasicBakedModel
+import net.minecraft.util.Identifier
+import net.minecraft.util.math.Direction.Axis
+import org.apache.logging.log4j.Level
+
+interface RoundLogKey : ColumnBlockKey, ModelBakingKey {
+    val barkSprite: Identifier
+    val endSprite: Identifier
+}
+
+object RoundLogOverlayLayer : ColumnRenderLayer() {
+    override fun getColumnKey(state: BlockState) = BetterFoliage.blockTypes.getTyped<ColumnBlockKey>(state)
+    override val connectSolids: Boolean get() = BetterFoliage.config.roundLogs.connectSolids
+    override val lenientConnect: Boolean get() = BetterFoliage.config.roundLogs.lenientConnect
+    override val defaultToY: Boolean get() = BetterFoliage.config.roundLogs.defaultY
+}
+
+object StandardRoundLogDiscovery : ConfigurableModelDiscovery() {
+    override val matchClasses: ConfigurableBlockMatcher get() = BetterFoliage.blockConfig.logBlocks
+    override val modelTextures: List<ModelTextureList> get() = BetterFoliage.blockConfig.logModels.modelList
+
+    override fun processModel(ctx: ModelDiscoveryContext, textureMatch: List<Identifier>) {
+        val axis = getAxis(ctx.blockState)
+        detailLogger.log(Level.INFO, "       axis $axis")
+        ctx.addReplacement(StandardRoundLogKey(axis, textureMatch[0], textureMatch[1]))
+    }
+
+    fun getAxis(state: BlockState): Axis? {
+        val axis = tryDefault(null) { state.get(PillarBlock.AXIS).toString() } ?:
+        state.entries.entries.find { it.key.getName().toLowerCase() == "axis" }?.value?.toString()
+        return when (axis) {
+            "x" -> Axis.X
+            "y" -> Axis.Y
+            "z" -> Axis.Z
+            else -> null
+        }
+    }
+}
+
+data class StandardRoundLogKey(
+    override val axis: Axis?,
+    override val barkSprite: Identifier,
+    override val endSprite: Identifier
+) : RoundLogKey, ModelWrapKey() {
+    override fun bake(ctx: ModelBakingContext, wrapped: BasicBakedModel) = StandardRoundLogModel(meshifySolid(wrapped), this)
+}
+
+class StandardRoundLogModel(wrapped: BakedModel, val key: StandardRoundLogKey) : ColumnModelBase(wrapped) {
+    override val enabled: Boolean get() = BetterFoliage.config.enabled && BetterFoliage.config.roundLogs.enabled
+    override val overlayLayer: ColumnRenderLayer get() = RoundLogOverlayLayer
+    override val connectPerpendicular: Boolean get() = BetterFoliage.config.roundLogs.connectPerpendicular
+
+    val modelSet by modelSets.delegate(key)
+    override fun getMeshSet(axis: Axis, quadrant: Int) = modelSet
+
+    companion object {
+        val modelSets = LazyMap(BakeWrapperManager) { key: StandardRoundLogKey ->
+            val barkSprite = Atlas.BLOCKS[key.barkSprite]!!
+            val endSprite = Atlas.BLOCKS[key.endSprite]!!
+            BetterFoliage.config.roundLogs.let { config ->
+                ColumnMeshSet(
+                    config.radiusSmall, config.radiusLarge, config.zProtection,
+                    key.axis ?: Axis.Y,
+                    barkSprite, barkSprite,
+                    endSprite, endSprite
+                )
+            }
+        }
+    }
+}

src/main/kotlin/mods/betterfoliage/render/block/vanilla/Sand.kt

@@ -0,0 +1,122 @@
+package mods.betterfoliage.render.block.vanilla
+
+import mods.betterfoliage.BetterFoliage
+import mods.betterfoliage.chunk.CachedBlockCtx
+import mods.betterfoliage.config.SALTWATER_BIOMES
+import mods.betterfoliage.config.SAND_BLOCKS
+import mods.betterfoliage.model.Color
+import mods.betterfoliage.model.ModelWrapKey
+import mods.betterfoliage.model.SpriteSetDelegate
+import mods.betterfoliage.model.WrappedBakedModel
+import mods.betterfoliage.model.build
+import mods.betterfoliage.model.horizontalRectangle
+import mods.betterfoliage.model.meshifySolid
+import mods.betterfoliage.model.meshifyStandard
+import mods.betterfoliage.model.transform
+import mods.betterfoliage.model.tuftModelSet
+import mods.betterfoliage.model.tuftShapeSet
+import mods.betterfoliage.model.withOpposites
+import mods.betterfoliage.render.lighting.grassTuftLighting
+import mods.betterfoliage.render.lighting.withLighting
+import mods.betterfoliage.resource.discovery.AbstractModelDiscovery
+import mods.betterfoliage.resource.discovery.BakeWrapperManager
+import mods.betterfoliage.resource.discovery.ModelBakingContext
+import mods.betterfoliage.resource.discovery.ModelDiscoveryContext
+import mods.betterfoliage.util.Atlas
+import mods.betterfoliage.util.LazyInvalidatable
+import mods.betterfoliage.util.Rotation
+import mods.betterfoliage.util.allDirections
+import mods.betterfoliage.util.get
+import mods.betterfoliage.util.randomB
+import mods.betterfoliage.util.randomD
+import mods.betterfoliage.util.randomI
+import net.fabricmc.fabric.api.renderer.v1.material.BlendMode
+import net.fabricmc.fabric.api.renderer.v1.render.RenderContext
+import net.minecraft.block.BlockState
+import net.minecraft.block.Blocks
+import net.minecraft.block.Material
+import net.minecraft.client.render.model.BakedModel
+import net.minecraft.client.render.model.BasicBakedModel
+import net.minecraft.client.render.model.json.JsonUnbakedModel
+import net.minecraft.util.Identifier
+import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.Direction.UP
+import net.minecraft.world.BlockRenderView
+import java.util.Random
+import java.util.function.Supplier
+
+object StandardSandDiscovery : AbstractModelDiscovery() {
+
+
+    override fun processModel(ctx: ModelDiscoveryContext) {
+        if (ctx.getUnbaked() is JsonUnbakedModel && ctx.blockState.block in SAND_BLOCKS) {
+            BetterFoliage.blockTypes.dirt.add(ctx.blockState)
+            ctx.addReplacement(StandardSandKey)
+//            RenderTypeLookup.setRenderLayer(ctx.blockState.block, RenderType.getCutoutMipped())
+        }
+        super.processModel(ctx)
+    }
+}
+
+object StandardSandKey : ModelWrapKey() {
+    override fun bake(ctx: ModelBakingContext, wrapped: BasicBakedModel) = StandardSandModel(meshifySolid(wrapped))
+}
+
+class StandardSandModel(wrapped: BakedModel) : WrappedBakedModel(wrapped) {
+
+    val coralLighting = allDirections.map { grassTuftLighting(it) }.toTypedArray()
+
+    override fun emitBlockQuads(blockView: BlockRenderView, state: BlockState, pos: BlockPos, randomSupplier: Supplier<Random>, context: RenderContext) {
+        super.emitBlockQuads(blockView, state, pos, randomSupplier, context)
+
+        val ctx = CachedBlockCtx(blockView, pos)
+
+        val random = randomSupplier.get()
+        if (!BetterFoliage.config.enabled || !BetterFoliage.config.coral.enabled(random)) return
+        if (ctx.biome?.category !in SALTWATER_BIOMES) return
+
+        allDirections.filter { random.nextInt(64) < BetterFoliage.config.coral.chance }.forEach { face ->
+            val isWater = ctx.state(face).material == Material.WATER
+            val isDeepWater = isWater && ctx.offset(face).state(UP).material == Material.WATER
+            if (isDeepWater) context.withLighting(coralLighting[face]) {
+                it.accept(coralCrustModels[face][random])
+                it.accept(coralTuftModels[face][random])
+            }
+        }
+    }
+
+    companion object {
+//        val sandModel by LazyInvalidatable(BetterFoliage.modelReplacer) {
+//            Array(64) { fullCubeTextured(Identifier("block/sand"), Color.white.asInt) }
+//        }
+
+        val coralTuftSprites by SpriteSetDelegate(Atlas.BLOCKS) { idx ->
+            Identifier(BetterFoliage.MOD_ID, "blocks/better_coral_$idx")
+        }
+        val coralCrustSprites by SpriteSetDelegate(Atlas.BLOCKS) { idx ->
+            Identifier(BetterFoliage.MOD_ID, "blocks/better_crust_$idx")
+        }
+        val coralTuftModels by LazyInvalidatable(BakeWrapperManager) {
+            val shapes = BetterFoliage.config.coral.let { tuftShapeSet(it.size, 1.0, 1.0, it.hOffset) }
+            allDirections.map { face ->
+                tuftModelSet(shapes, Color.white.asInt) { coralTuftSprites[randomI()] }
+                    .transform { rotate(Rotation.fromUp[face]) }
+                    .withOpposites()
+                    .build(BlendMode.CUTOUT_MIPPED)
+            }.toTypedArray()
+        }
+        val coralCrustModels by LazyInvalidatable(BakeWrapperManager) {
+            allDirections.map { face ->
+                Array(64) { idx ->
+                    listOf(horizontalRectangle(x1 = -0.5, x2 = 0.5, z1 = -0.5, z2 = 0.5, y = 0.0)
+                        .scale(BetterFoliage.config.coral.crustSize)
+                        .move(0.5 + randomD(0.01, BetterFoliage.config.coral.vOffset) to UP)
+                        .rotate(Rotation.fromUp[face])
+                        .mirrorUV(randomB(), randomB()).rotateUV(randomI(max = 4))
+                        .sprite(coralCrustSprites[idx]).colorAndIndex(null)
+                    ).build(BlendMode.CUTOUT_MIPPED)
+                }
+            }.toTypedArray()
+        }
+    }
+}

src/main/kotlin/mods/betterfoliage/render/column/ColumnMeshSet.kt

@@ -0,0 +1,170 @@
+package mods.betterfoliage.render.column
+
+import mods.betterfoliage.BetterFoliage
+import mods.betterfoliage.render.column.ColumnLayerData.SpecialRender.QuadrantType
+import mods.betterfoliage.render.column.ColumnLayerData.SpecialRender.QuadrantType.INVISIBLE
+import mods.betterfoliage.render.column.ColumnLayerData.SpecialRender.QuadrantType.LARGE_RADIUS
+import mods.betterfoliage.render.column.ColumnLayerData.SpecialRender.QuadrantType.SMALL_RADIUS
+import mods.betterfoliage.render.column.ColumnLayerData.SpecialRender.QuadrantType.SQUARE
+import mods.betterfoliage.model.Color
+import mods.betterfoliage.model.Quad
+import mods.betterfoliage.model.UV
+import mods.betterfoliage.model.Vertex
+import mods.betterfoliage.model.build
+import mods.betterfoliage.model.horizontalRectangle
+import mods.betterfoliage.model.verticalRectangle
+import mods.betterfoliage.util.Double3
+import mods.betterfoliage.util.Rotation
+import net.fabricmc.fabric.api.renderer.v1.material.BlendMode.SOLID
+import net.minecraft.client.texture.Sprite
+import net.minecraft.util.math.Direction.Axis
+import net.minecraft.util.math.Direction.EAST
+import net.minecraft.util.math.Direction.SOUTH
+import net.minecraft.util.math.Direction.UP
+
+/**
+ * Collection of dynamically generated meshes used to render rounded columns.
+ */
+class ColumnMeshSet(
+    radiusSmall: Double,
+    radiusLarge: Double,
+    zProtection: Double,
+    val axis: Axis,
+    val spriteLeft: Sprite,
+    val spriteRight: Sprite,
+    val spriteTop: Sprite,
+    val spriteBottom: Sprite
+) {
+    protected fun sideRounded(radius: Double, yBottom: Double, yTop: Double): List<Quad> {
+        val halfRadius = radius * 0.5
+        return listOf(
+            // left side of the diagonal
+            verticalRectangle(0.0, 0.5, 0.5 - radius, 0.5, yBottom, yTop).clampUV(minU = 0.0, maxU = 0.5 - radius),
+            verticalRectangle(0.5 - radius, 0.5, 0.5 - halfRadius, 0.5 - halfRadius, yBottom, yTop).clampUV(minU = 0.5 - radius),
+            // right side of the diagonal
+            verticalRectangle(0.5 - halfRadius, 0.5 - halfRadius, 0.5, 0.5 - radius, yBottom, yTop).clampUV(maxU = radius - 0.5),
+            verticalRectangle(0.5, 0.5 - radius, 0.5, 0.0, yBottom, yTop).clampUV(minU = radius - 0.5, maxU = 0.0)
+        )
+    }
+
+    protected fun sideRoundedTransition(radiusBottom: Double, radiusTop: Double, yBottom: Double, yTop: Double): List<Quad> {
+        val ySplit = 0.5 * (yBottom + yTop)
+        val modelTop = sideRounded(radiusTop, yBottom, yTop)
+        val modelBottom = sideRounded(radiusBottom, yBottom, yTop)
+        return (modelBottom zip modelTop).map { (quadBottom, quadTop) ->
+            Quad.mix(quadBottom, quadTop) { vBottom, vTop -> if (vBottom.xyz.y < ySplit) vBottom.copy() else vTop.copy() }
+        }
+    }
+
+    protected fun sideSquare(yBottom: Double, yTop: Double) = listOf(
+        verticalRectangle(0.0, 0.5, 0.5, 0.5, yBottom, yTop).clampUV(minU = 0.0),
+        verticalRectangle(0.5, 0.5, 0.5, 0.0, yBottom, yTop).clampUV(maxU = 0.0)
+    )
+
+    protected fun lidRounded(radius: Double, y: Double, isBottom: Boolean) = Array(4) { quadrant ->
+        val rotation = baseRotation(axis) + quadrantRotations[quadrant]
+        val v1 = Vertex(Double3(0.0, y, 0.0), UV(0.0, 0.0))
+        val v2 = Vertex(Double3(0.0, y, 0.5), UV(0.0, 0.5))
+        val v3 = Vertex(Double3(0.5 - radius, y, 0.5), UV(0.5 - radius, 0.5))
+        val v4 = Vertex(Double3(0.5 - radius * 0.5, y, 0.5 - radius * 0.5), UV(0.5, 0.5))
+        val v5 = Vertex(Double3(0.5, y, 0.5 - radius), UV(0.5, 0.5 - radius))
+        val v6 = Vertex(Double3(0.5, y, 0.0), UV(0.5, 0.0))
+        listOf(Quad(v1, v2, v3, v4), Quad(v1, v4, v5, v6))
+            .map { it.cycleVertices(if (isBottom xor BetterFoliage.config.nVidia) 0 else 1) }
+            .map { it.rotate(rotation).rotateUV(quadrant) }
+            .map { it.sprite(if (isBottom) spriteBottom else spriteTop).colorAndIndex(Color.white.asInt) }
+            .map { if (isBottom) it.flipped else it }
+    }
+
+    protected fun lidSquare(y: Double, isBottom: Boolean) = Array(4) { quadrant ->
+        val rotation = baseRotation(axis) + quadrantRotations[quadrant]
+        listOf(
+            horizontalRectangle(x1 = 0.0, x2 = 0.5, z1 = 0.0, z2 = 0.5, y = y).clampUV(minU = 0.0, minV = 0.0)
+                .rotate(rotation).rotateUV(quadrant)
+                .sprite(if (isBottom) spriteBottom else spriteTop).colorAndIndex(Color.white.asInt)
+                .let { if (isBottom) it.flipped else it }
+        )
+    }
+
+    protected val zProtectionScale = zProtection.let { Double3(it, 1.0, it) }
+
+    protected fun List<Quad>.extendTop(size: Double) = map { q -> q.clampUV(minV = 0.5 - size).transformV { v ->
+        if (v.xyz.y > 0.501) v.copy(xyz = v.xyz * zProtectionScale) else v }
+    }
+    protected fun List<Quad>.extendBottom(size: Double) = map { q -> q.clampUV(maxV = -0.5 + size).transformV { v ->
+        if (v.xyz.y < -0.501) v.copy(xyz = v.xyz * zProtectionScale) else v }
+    }
+    protected fun List<Quad>.buildSides(quadsPerSprite: Int) = Array(4) { quadrant ->
+        val rotation = baseRotation(axis) + quadrantRotations[quadrant]
+        this.map { it.rotate(rotation).colorAndIndex(Color.white.asInt) }
+            .mapIndexed { idx, q -> if (idx % (2 * quadsPerSprite) >= quadsPerSprite) q.sprite(spriteRight) else q.sprite(spriteLeft) }
+            .build(SOLID, flatLighting = false)
+    }
+
+    companion object {
+        fun baseRotation(axis: Axis) = when(axis) {
+            Axis.X -> Rotation.fromUp[EAST.ordinal]
+            Axis.Y -> Rotation.fromUp[UP.ordinal]
+            Axis.Z -> Rotation.fromUp[SOUTH.ordinal]
+        }
+        val quadrantRotations = Array(4) { Rotation.rot90[UP.ordinal] * it }
+    }
+
+    //
+    // Mesh definitions
+    // 4-element arrays hold prebuild meshes for each of the rotations around the axis
+    //
+    val sideSquare = sideSquare(-0.5, 0.5).buildSides(quadsPerSprite = 1)
+    val sideRoundSmall = sideRounded(radiusSmall, -0.5, 0.5).buildSides(quadsPerSprite = 2)
+    val sideRoundLarge = sideRounded(radiusLarge, -0.5, 0.5).buildSides(quadsPerSprite = 2)
+
+    val sideExtendTopSquare = sideSquare(0.5, 0.5 + radiusLarge).extendTop(radiusLarge).buildSides(quadsPerSprite = 1)
+    val sideExtendTopRoundSmall = sideRounded(radiusSmall, 0.5, 0.5 + radiusLarge).extendTop(radiusLarge).buildSides(quadsPerSprite = 2)
+    val sideExtendTopRoundLarge = sideRounded(radiusLarge, 0.5, 0.5 + radiusLarge).extendTop(radiusLarge).buildSides(quadsPerSprite = 2)
+
+    val sideExtendBottomSquare = sideSquare(-0.5 - radiusLarge, -0.5).extendBottom(radiusLarge).buildSides(quadsPerSprite = 1)
+    val sideExtendBottomRoundSmall = sideRounded(radiusSmall, -0.5 - radiusLarge, -0.5).extendBottom(radiusLarge).buildSides(quadsPerSprite = 2)
+    val sideExtendBottomRoundLarge = sideRounded(radiusLarge, -0.5 - radiusLarge, -0.5).extendBottom(radiusLarge).buildSides(quadsPerSprite = 2)
+
+    val lidTopSquare = lidSquare(0.5, false).build(SOLID, flatLighting = false)
+    val lidTopRoundSmall = lidRounded(radiusSmall, 0.5, false).build(SOLID, flatLighting = false)
+    val lidTopRoundLarge = lidRounded(radiusLarge, 0.5, false).build(SOLID, flatLighting = false)
+
+    val lidBottomSquare = lidSquare(-0.5, true).build(SOLID, flatLighting = false)
+    val lidBottomRoundSmall = lidRounded(radiusSmall, -0.5, true).build(SOLID, flatLighting = false)
+    val lidBottomRoundLarge = lidRounded(radiusLarge, -0.5, true).build(SOLID, flatLighting = false)
+
+    val transitionTop = sideRoundedTransition(radiusLarge, radiusSmall, -0.5, 0.5).buildSides(quadsPerSprite = 2)
+    val transitionBottom = sideRoundedTransition(radiusSmall, radiusLarge, -0.5, 0.5).buildSides(quadsPerSprite = 2)
+
+    //
+    // Helper fuctions for lids (block ends)
+    //
+    fun flatTop(quadrantTypes: Array<QuadrantType>, quadrant: Int) = when(quadrantTypes[quadrant]) {
+        SMALL_RADIUS -> lidTopRoundSmall[quadrant]
+        LARGE_RADIUS -> lidTopRoundLarge[quadrant]
+        SQUARE -> lidTopSquare[quadrant]
+        INVISIBLE -> lidTopSquare[quadrant]
+    }
+
+    fun flatBottom(quadrantTypes: Array<QuadrantType>, quadrant: Int) = when(quadrantTypes[quadrant]) {
+        SMALL_RADIUS -> lidBottomRoundSmall[quadrant]
+        LARGE_RADIUS -> lidBottomRoundLarge[quadrant]
+        SQUARE -> lidBottomSquare[quadrant]
+        INVISIBLE -> lidBottomSquare[quadrant]
+    }
+
+    fun extendTop(quadrantTypes: Array<QuadrantType>, quadrant: Int) = when(quadrantTypes[quadrant]) {
+        SMALL_RADIUS -> sideExtendTopRoundSmall[quadrant]
+        LARGE_RADIUS -> sideExtendTopRoundLarge[quadrant]
+        SQUARE -> sideExtendTopSquare[quadrant]
+        INVISIBLE -> sideExtendTopSquare[quadrant]
+    }
+
+    fun extendBottom(quadrantTypes: Array<QuadrantType>, quadrant: Int) = when(quadrantTypes[quadrant]) {
+        SMALL_RADIUS -> sideExtendBottomRoundSmall[quadrant]
+        LARGE_RADIUS -> sideExtendBottomRoundLarge[quadrant]
+        SQUARE -> sideExtendBottomSquare[quadrant]
+        INVISIBLE -> sideExtendBottomSquare[quadrant]
+    }
+}

src/main/kotlin/mods/betterfoliage/render/column/ColumnModel.kt

@@ -0,0 +1,109 @@
+package mods.betterfoliage.render.column
+
+import mods.betterfoliage.chunk.CachedBlockCtx
+import mods.betterfoliage.chunk.ChunkOverlayManager
+import mods.betterfoliage.render.column.ColumnLayerData.NormalRender
+import mods.betterfoliage.render.column.ColumnLayerData.SpecialRender.BlockType.*
+import mods.betterfoliage.render.column.ColumnLayerData.SpecialRender.QuadrantType.*
+import mods.betterfoliage.model.WrappedBakedModel
+import net.fabricmc.fabric.api.renderer.v1.render.RenderContext
+import net.minecraft.block.BlockState
+import net.minecraft.client.render.model.BakedModel
+import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.Direction.Axis
+import net.minecraft.world.BlockRenderView
+import java.util.*
+import java.util.function.Supplier
+
+abstract class ColumnModelBase(wrapped: BakedModel) : WrappedBakedModel(wrapped) {
+    abstract val enabled: Boolean
+    abstract val overlayLayer: ColumnRenderLayer
+    abstract val connectPerpendicular: Boolean
+    abstract fun getMeshSet(axis: Axis, quadrant: Int): ColumnMeshSet
+
+    override fun emitBlockQuads(blockView: BlockRenderView, state: BlockState, pos: BlockPos, randomSupplier: Supplier<Random>, context: RenderContext) {
+        if (!enabled) return super.emitBlockQuads(blockView, state, pos, randomSupplier, context)
+        val ctx = CachedBlockCtx(blockView, pos)
+        val roundLog = ChunkOverlayManager.get(overlayLayer, ctx)
+
+        when(roundLog) {
+            ColumnLayerData.SkipRender -> return
+            NormalRender -> return super.emitBlockQuads(blockView, state, pos, randomSupplier, context)
+            ColumnLayerData.ResolveError, null -> {
+                return super.emitBlockQuads(blockView, state, pos, randomSupplier, context)
+            }
+        }
+
+        // if log axis is not defined and "Default to vertical" config option is not set, render normally
+        if ((roundLog as ColumnLayerData.SpecialRender).column.axis == null && !overlayLayer.defaultToY) {
+            return super.emitBlockQuads(blockView, state, pos, randomSupplier, context)
+        }
+
+        val axis = roundLog.column.axis ?: Axis.Y
+        val baseRotation = ColumnMeshSet.baseRotation(axis)
+        ColumnMeshSet.quadrantRotations.forEachIndexed { idx, quadrantRotation ->
+            // set rotation for the current quadrant
+            val rotation = baseRotation + quadrantRotation
+            val meshSet = getMeshSet(axis, idx)
+
+            // disallow sharp discontinuities in the chamfer radius, or tapering-in where inappropriate
+            if (roundLog.quadrants[idx] == LARGE_RADIUS &&
+                roundLog.upType == PARALLEL && roundLog.quadrantsTop[idx] != LARGE_RADIUS &&
+                roundLog.downType == PARALLEL && roundLog.quadrantsBottom[idx] != LARGE_RADIUS) {
+                roundLog.quadrants[idx] = SMALL_RADIUS
+            }
+
+            // select meshes for current quadrant based on connectivity rules
+            val sideMesh = when (roundLog.quadrants[idx]) {
+                SMALL_RADIUS -> meshSet.sideRoundSmall[idx]
+                LARGE_RADIUS -> if (roundLog.upType == PARALLEL && roundLog.quadrantsTop[idx] == SMALL_RADIUS) meshSet.transitionTop[idx]
+                    else if (roundLog.downType == PARALLEL && roundLog.quadrantsBottom[idx] == SMALL_RADIUS) meshSet.transitionBottom[idx]
+                    else meshSet.sideRoundLarge[idx]
+                SQUARE -> meshSet.sideSquare[idx]
+                else -> null
+            }
+
+            val upMesh = when(roundLog.upType) {
+                NONSOLID -> meshSet.flatTop(roundLog.quadrants, idx)
+                PERPENDICULAR -> {
+                    if (!connectPerpendicular) {
+                        meshSet.flatTop(roundLog.quadrants, idx)
+                    } else {
+                        meshSet.extendTop(roundLog.quadrants, idx)
+                    }
+                }
+                PARALLEL -> {
+                    if (roundLog.quadrants[idx] discontinuousWith roundLog.quadrantsTop[idx] &&
+                        roundLog.quadrants[idx].let { it == SQUARE || it == INVISIBLE } )
+                        meshSet.flatTop(roundLog.quadrants, idx)
+                    else null
+                }
+                else -> null
+            }
+
+            val downMesh = when(roundLog.downType) {
+                NONSOLID -> meshSet.flatBottom(roundLog.quadrants, idx)
+                PERPENDICULAR -> {
+                    if (!connectPerpendicular) {
+                        meshSet.flatBottom(roundLog.quadrants, idx)
+                    } else {
+                        meshSet.extendBottom(roundLog.quadrants, idx)
+                    }
+                }
+                PARALLEL -> {
+                    if (roundLog.quadrants[idx] discontinuousWith roundLog.quadrantsBottom[idx] &&
+                        roundLog.quadrants[idx].let { it == SQUARE || it == INVISIBLE } )
+                        meshSet.flatBottom(roundLog.quadrants, idx)
+                    else null
+                }
+                else -> null
+            }
+
+            // render
+            sideMesh?.let { context.meshConsumer().accept(it) }
+            upMesh?.let { context.meshConsumer().accept(it) }
+            downMesh?.let { context.meshConsumer().accept(it) }
+
+        }
+    }
+}

src/main/kotlin/mods/betterfoliage/render/column/ColumnOverlayLayer.kt

@@ -0,0 +1,199 @@
+package mods.betterfoliage.render.column
+
+import mods.betterfoliage.BetterFoliage
+import mods.betterfoliage.chunk.BlockCtx
+import mods.betterfoliage.chunk.ChunkOverlayLayer
+import mods.betterfoliage.chunk.ChunkOverlayManager
+import mods.betterfoliage.chunk.dimType
+import mods.betterfoliage.render.block.vanilla.RoundLogKey
+import mods.betterfoliage.render.column.ColumnLayerData.SpecialRender.BlockType.NONSOLID
+import mods.betterfoliage.render.column.ColumnLayerData.SpecialRender.BlockType.PARALLEL
+import mods.betterfoliage.render.column.ColumnLayerData.SpecialRender.BlockType.PERPENDICULAR
+import mods.betterfoliage.render.column.ColumnLayerData.SpecialRender.BlockType.SOLID
+import mods.betterfoliage.render.column.ColumnLayerData.SpecialRender.QuadrantType
+import mods.betterfoliage.render.column.ColumnLayerData.SpecialRender.QuadrantType.INVISIBLE
+import mods.betterfoliage.render.column.ColumnLayerData.SpecialRender.QuadrantType.LARGE_RADIUS
+import mods.betterfoliage.render.column.ColumnLayerData.SpecialRender.QuadrantType.SMALL_RADIUS
+import mods.betterfoliage.render.column.ColumnLayerData.SpecialRender.QuadrantType.SQUARE
+import mods.betterfoliage.util.Int3
+import mods.betterfoliage.util.Rotation
+import mods.betterfoliage.util.allDirections
+import mods.betterfoliage.util.face
+import mods.betterfoliage.util.get
+import mods.betterfoliage.util.plus
+import net.minecraft.block.BlockState
+import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.Direction.Axis
+import net.minecraft.util.math.Direction.AxisDirection
+import net.minecraft.world.WorldView
+
+/** Index of SOUTH-EAST quadrant. */
+const val SE = 0
+/** Index of NORTH-EAST quadrant. */
+const val NE = 1
+/** Index of NORTH-WEST quadrant. */
+const val NW = 2
+/** Index of SOUTH-WEST quadrant. */
+const val SW = 3
+
+interface ColumnBlockKey {
+    val axis: Axis?
+}
+
+/**
+ * Sealed class hierarchy for all possible render outcomes
+ */
+sealed class ColumnLayerData {
+    /**
+     * Data structure to cache texture and world neighborhood data relevant to column rendering
+     */
+    @Suppress("ArrayInDataClass") // not used in comparisons anywhere
+    data class SpecialRender(
+        val column: ColumnBlockKey,
+        val upType: BlockType,
+        val downType: BlockType,
+        val quadrants: Array<QuadrantType>,
+        val quadrantsTop: Array<QuadrantType>,
+        val quadrantsBottom: Array<QuadrantType>
+    ) : ColumnLayerData() {
+        enum class BlockType { SOLID, NONSOLID, PARALLEL, PERPENDICULAR }
+        enum class QuadrantType {
+            SMALL_RADIUS, LARGE_RADIUS, SQUARE, INVISIBLE;
+            infix fun continuousWith(other: QuadrantType) =
+                this == other || ((this == SQUARE || this == INVISIBLE) && (other == SQUARE || other == INVISIBLE))
+            infix fun discontinuousWith(other: QuadrantType) = !continuousWith(other)
+        }
+    }
+
+    /** Column block should not be rendered at all */
+    object SkipRender : ColumnLayerData()
+
+    /** Column block must be rendered normally */
+    object NormalRender : ColumnLayerData()
+
+    /** Error while resolving render data, column block must be rendered normally */
+    object ResolveError : ColumnLayerData()
+}
+
+abstract class ColumnRenderLayer : ChunkOverlayLayer<ColumnLayerData> {
+
+    abstract val connectSolids: Boolean
+    abstract val lenientConnect: Boolean
+    abstract val defaultToY: Boolean
+
+    abstract fun getColumnKey(state: BlockState): ColumnBlockKey?
+
+    val allNeighborOffsets = (-1..1).flatMap { offsetX -> (-1..1).flatMap { offsetY -> (-1..1).map { offsetZ -> Int3(offsetX, offsetY, offsetZ) }}}
+
+    override fun onBlockUpdate(world: WorldView, pos: BlockPos) {
+        allNeighborOffsets.forEach { offset -> ChunkOverlayManager.clear(world.dimType, this, pos + offset) }
+    }
+
+    override fun calculate(ctx: BlockCtx): ColumnLayerData {
+        if (allDirections.all { dir ->
+                ctx.offset(dir).let { it.isNormalCube && !BetterFoliage.blockTypes.hasTyped<RoundLogKey>(it.state) }
+        }) return ColumnLayerData.SkipRender
+        val columnTextures = getColumnKey(ctx.state) ?: return ColumnLayerData.ResolveError
+
+        // if log axis is not defined and "Default to vertical" config option is not set, render normally
+        val logAxis = columnTextures.axis ?: if (defaultToY) Axis.Y else return ColumnLayerData.NormalRender
+
+        // check log neighborhood
+        val baseRotation = Rotation.fromUp[(logAxis to AxisDirection.POSITIVE).face.ordinal]
+
+        val upType = ctx.blockType(baseRotation, logAxis, Int3(0, 1, 0))
+        val downType = ctx.blockType(baseRotation, logAxis, Int3(0, -1, 0))
+
+        val quadrants = Array(4) { SMALL_RADIUS }.checkNeighbors(ctx, baseRotation, logAxis, 0)
+        val quadrantsTop = Array(4) { SMALL_RADIUS }
+        if (upType == PARALLEL) quadrantsTop.checkNeighbors(ctx, baseRotation, logAxis, 1)
+        val quadrantsBottom = Array(4) { SMALL_RADIUS }
+        if (downType == PARALLEL) quadrantsBottom.checkNeighbors(ctx, baseRotation, logAxis, -1)
+        return ColumnLayerData.SpecialRender(columnTextures, upType, downType, quadrants, quadrantsTop, quadrantsBottom)
+    }
+
+    /** Sets the type of the given quadrant only if the new value is "stronger" (larger ordinal). */
+    inline fun Array<QuadrantType>.upgrade(idx: Int, value: QuadrantType) {
+        if (this[idx].ordinal < value.ordinal) this[idx] = value
+    }
+
+    /** Fill the array of [QuadrantType]s based on the blocks to the sides of this one. */
+    fun Array<QuadrantType>.checkNeighbors(ctx: BlockCtx, rotation: Rotation, logAxis: Axis, yOff: Int): Array<QuadrantType> {
+        val blkS = ctx.blockType(rotation, logAxis, Int3(0, yOff, 1))
+        val blkE = ctx.blockType(rotation, logAxis, Int3(1, yOff, 0))
+        val blkN = ctx.blockType(rotation, logAxis, Int3(0, yOff, -1))
+        val blkW = ctx.blockType(rotation, logAxis, Int3(-1, yOff, 0))
+
+        // a solid block on one side will make the 2 neighboring quadrants SQUARE
+        // if there are solid blocks to both sides of a quadrant, it is INVISIBLE
+        if (connectSolids) {
+            if (blkS == SOLID) {
+                upgrade(SW, SQUARE); upgrade(SE, SQUARE)
+            }
+            if (blkE == SOLID) {
+                upgrade(SE, SQUARE); upgrade(NE, SQUARE)
+            }
+            if (blkN == SOLID) {
+                upgrade(NE, SQUARE); upgrade(NW, SQUARE)
+            }
+            if (blkW == SOLID) {
+                upgrade(NW, SQUARE); upgrade(SW, SQUARE)
+            }
+            if (blkS == SOLID && blkE == SOLID) upgrade(SE, INVISIBLE)
+            if (blkN == SOLID && blkE == SOLID) upgrade(NE, INVISIBLE)
+            if (blkN == SOLID && blkW == SOLID) upgrade(NW, INVISIBLE)
+            if (blkS == SOLID && blkW == SOLID) upgrade(SW, INVISIBLE)
+        }
+        val blkSE = ctx.blockType(rotation, logAxis, Int3(1, yOff, 1))
+        val blkNE = ctx.blockType(rotation, logAxis, Int3(1, yOff, -1))
+        val blkNW = ctx.blockType(rotation, logAxis, Int3(-1, yOff, -1))
+        val blkSW = ctx.blockType(rotation, logAxis, Int3(-1, yOff, 1))
+
+        if (lenientConnect) {
+            // if the block forms the tip of an L-shape, connect to its neighbor with SQUARE quadrants
+            if (blkE == PARALLEL && (blkSE == PARALLEL || blkNE == PARALLEL)) {
+                upgrade(SE, SQUARE); upgrade(NE, SQUARE)
+            }
+            if (blkN == PARALLEL && (blkNE == PARALLEL || blkNW == PARALLEL)) {
+                upgrade(NE, SQUARE); upgrade(NW, SQUARE)
+            }
+            if (blkW == PARALLEL && (blkNW == PARALLEL || blkSW == PARALLEL)) {
+                upgrade(NW, SQUARE); upgrade(SW, SQUARE)
+            }
+            if (blkS == PARALLEL && (blkSE == PARALLEL || blkSW == PARALLEL)) {
+                upgrade(SW, SQUARE); upgrade(SE, SQUARE)
+            }
+        }
+
+        // if the block forms the middle of an L-shape, or is part of a 2x2 configuration,
+        // connect to its neighbors with SQUARE quadrants, INVISIBLE on the inner corner, and LARGE_RADIUS on the outer corner
+        if (blkN == PARALLEL && blkW == PARALLEL && (lenientConnect || blkNW == PARALLEL)) {
+            upgrade(SE, LARGE_RADIUS); upgrade(NE, SQUARE); upgrade(SW, SQUARE); upgrade(NW, INVISIBLE)
+        }
+        if (blkS == PARALLEL && blkW == PARALLEL && (lenientConnect || blkSW == PARALLEL)) {
+            upgrade(NE, LARGE_RADIUS); upgrade(SE, SQUARE); upgrade(NW, SQUARE); upgrade(SW, INVISIBLE)
+        }
+        if (blkS == PARALLEL && blkE == PARALLEL && (lenientConnect || blkSE == PARALLEL)) {
+            upgrade(NW, LARGE_RADIUS); upgrade(NE, SQUARE); upgrade(SW, SQUARE); upgrade(SE, INVISIBLE)
+        }
+        if (blkN == PARALLEL && blkE == PARALLEL && (lenientConnect || blkNE == PARALLEL)) {
+            upgrade(SW, LARGE_RADIUS); upgrade(SE, SQUARE); upgrade(NW, SQUARE); upgrade(NE, INVISIBLE)
+        }
+        return this
+    }
+
+    /**
+     * Get the type of the block at the given offset in a rotated reference frame.
+     */
+    fun BlockCtx.blockType(rotation: Rotation, axis: Axis, offset: Int3): ColumnLayerData.SpecialRender.BlockType {
+        val offsetRot = offset.rotate(rotation)
+        val key = getColumnKey(state(offsetRot))
+        return if (key == null) {
+            if (offset(offsetRot).isNormalCube) SOLID else NONSOLID
+        } else {
+            (key.axis ?: if (BetterFoliage.config.roundLogs.defaultY) Axis.Y else null)?.let {
+                if (it == axis) PARALLEL else PERPENDICULAR
+            } ?: SOLID
+        }
+    }
+}

src/main/kotlin/mods/betterfoliage/render/lighting/CustomLighting.kt

@@ -0,0 +1,140 @@
+package mods.betterfoliage.render.lighting
+
+import mods.betterfoliage.util.*
+import net.fabricmc.fabric.api.renderer.v1.mesh.QuadView
+import net.minecraft.util.math.Direction
+import net.minecraft.util.math.Direction.*
+import kotlin.math.abs
+
+val EPSILON = 0.05
+
+interface CustomLighting {
+    fun applyLighting(lighting: CustomLightingMeshConsumer, quad: QuadView, flat: Boolean, emissive: Boolean)
+}
+
+interface CustomLightingMeshConsumer {
+    /** Clear cached block brightness and AO values */
+    fun clearLighting()
+    /** Fill AO/light cache for given face */
+    fun fillAoData(lightFace: Direction)
+    /** Set AO/light values for quad vertex */
+    fun setLighting(vIdx: Int, ao: Float, light: Int)
+    /** Get neighbor block brightness */
+    fun brNeighbor(dir: Direction): Int
+    /** Block brightness value */
+    val brSelf: Int
+    /** Cached AO values for all box face corners */
+    val aoFull: FloatArray
+    /** Cached light values for all box face corners */
+    val lightFull: IntArray
+}
+
+/** Custom lighting used for protruding tuft quads (short grass, algae, cactus arms, etc.) */
+fun grassTuftLighting(lightFace: Direction) = object : CustomLighting {
+    override fun applyLighting(lighting: CustomLightingMeshConsumer, quad : QuadView, flat: Boolean, emissive: Boolean) {
+        if (flat) lighting.flatForceNeighbor(quad, lightFace) else lighting.smoothWithFaceOverride(quad, lightFace)
+    }
+}
+
+/** Custom lighting used for round leaves */
+fun roundLeafLighting() = object : CustomLighting {
+    override fun applyLighting(lighting: CustomLightingMeshConsumer, quad: QuadView, flat: Boolean, emissive: Boolean) {
+        if (flat) lighting.flatMax(quad) else lighting.smooth45PreferUp(quad)
+    }
+}
+
+/** Custom lighting used for reeds */
+fun reedLighting() = object : CustomLighting {
+    override fun applyLighting(lighting: CustomLightingMeshConsumer, quad: QuadView, flat: Boolean, emissive: Boolean) {
+        lighting.flatForceNeighbor(quad, UP)
+    }
+}
+
+/** Flat lighting, use neighbor brightness in the given direction */
+fun CustomLightingMeshConsumer.flatForceNeighbor(quad: QuadView, lightFace: Direction) {
+    for (vIdx in 0 until 4) {
+        setLighting(vIdx, 1.0f, brNeighbor(lightFace))
+    }
+}
+
+/** Smooth lighting, use *only* AO/light values on the given face (closest corner) */
+fun CustomLightingMeshConsumer.smoothWithFaceOverride(quad: QuadView, lightFace: Direction) {
+    fillAoData(lightFace)
+    forEachVertex(quad) { vIdx, x, y, z ->
+        val cornerUndir = getCornerUndir(x, y, z)
+        cornerDirFromUndir[lightFace.ordinal][cornerUndir]?.let { aoCorner ->
+            setLighting(vIdx, aoFull[aoCorner], lightFull[aoCorner])
+        }
+    }
+}
+
+/**
+ * Smooth lighting scheme for 45-degree quads bisecting the box along 2 opposing face diagonals.
+ *
+ * Determine 2 *primary faces* based on the normal direction.
+ * Take AO/light values *only* from the 2 primary faces *or* the UP direction,
+ * based on which box corner is closest. Prefer taking values from the top face.
+ */
+fun CustomLightingMeshConsumer.smooth45PreferUp(quad: QuadView) {
+    getAngles45(quad)?.let { normalFaces ->
+        fillAoData(normalFaces.first)
+        fillAoData(normalFaces.second)
+        if (normalFaces.first != UP && normalFaces.second != UP) fillAoData(UP)
+        forEachVertex(quad) { vIdx, x, y, z ->
+            val isUp = y > 0.5f
+            val cornerUndir = getCornerUndir(x, y, z)
+            val preferredFace = if (isUp) UP else normalFaces.minBy { faceDistance(it, x, y, z) }
+            val aoCorner = cornerDirFromUndir[preferredFace.ordinal][cornerUndir]!!
+            setLighting(vIdx, aoFull[aoCorner], lightFull[aoCorner])
+        }
+    }
+}
+
+/** Flat lighting, use maximum neighbor brightness at the nearest box corner */
+fun CustomLightingMeshConsumer.flatMax(quad: QuadView) {
+    forEachVertex(quad) { vIdx, x, y, z ->
+        val maxBrightness = cornersUndir[getCornerUndir(x, y, z)].maxValueBy { brNeighbor(it) }
+        setLighting(vIdx, 1.0f, maxBrightness)
+    }
+}
+
+/**
+ * If the quad normal approximately bisects 2 axes at a 45 degree angle,
+ * and is approximately perpendicular to the third, returns the 2 directions
+ * the quad normal points towards.
+ * Returns null otherwise.
+ */
+fun getAngles45(quad: QuadView): Pair<Direction, Direction>? {
+    val normal = quad.faceNormal()
+    // one of the components must be close to zero
+    val zeroAxis = when {
+        abs(normal.x) < EPSILON -> Axis.X
+        abs(normal.y) < EPSILON -> Axis.Y
+        abs(normal.z) < EPSILON -> Axis.Z
+        else -> return null
+    }
+    // the other two must be of similar magnitude
+    val diff = when(zeroAxis) {
+        Axis.X -> abs(abs(normal.y) - abs(normal.z))
+        Axis.Y -> abs(abs(normal.x) - abs(normal.z))
+        Axis.Z -> abs(abs(normal.x) - abs(normal.y))
+    }
+    if (diff > EPSILON) return null
+    return when(zeroAxis) {
+        Axis.X -> Pair(if (normal.y > 0.0f) UP else DOWN, if (normal.z > 0.0f) SOUTH else NORTH)
+        Axis.Y -> Pair(if (normal.x > 0.0f) EAST else WEST, if (normal.z > 0.0f) SOUTH else NORTH)
+        Axis.Z -> Pair(if (normal.x > 0.0f) EAST else WEST, if (normal.y > 0.0f) UP else DOWN)
+    }
+}
+
+fun faceDistance(face: Direction, x: Float, y: Float, z: Float) = when(face) {
+    WEST -> x; EAST -> 1.0f - x
+    DOWN -> y; UP -> 1.0f - y
+    NORTH -> z; SOUTH -> 1.0f - z
+}
+
+inline fun forEachVertex(quad: QuadView, func: (vIdx: Int, x: Float, y: Float, z: Float)->Unit) {
+    for (vIdx in 0..3) {
+        func(vIdx, quad.x(vIdx), quad.y(vIdx), quad.z(vIdx))
+    }
+}

src/main/kotlin/mods/betterfoliage/render/lighting/Indigo.kt

@@ -0,0 +1,78 @@
+package mods.betterfoliage.render.lighting
+
+import mods.betterfoliage.util.YarnHelper
+import mods.betterfoliage.util.get
+import mods.betterfoliage.util.reflectField
+import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh
+import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel
+import net.fabricmc.fabric.api.renderer.v1.render.RenderContext
+import net.fabricmc.fabric.impl.client.indigo.renderer.aocalc.AoCalculator
+import net.fabricmc.fabric.impl.client.indigo.renderer.render.*
+import net.minecraft.block.BlockState
+import net.minecraft.client.render.RenderLayer
+import net.minecraft.client.render.VertexConsumer
+import net.minecraft.client.render.model.BakedModel
+import net.minecraft.util.math.BlockPos
+import net.minecraft.world.BlockRenderView
+import java.util.*
+import java.util.function.Consumer
+import java.util.function.Supplier
+
+val AbstractQuadRenderer_blockInfo2 = YarnHelper.requiredField<TerrainBlockRenderInfo>(
+    "net.fabricmc.fabric.impl.client.indigo.renderer.render.AbstractQuadRenderer",
+    "blockInfo", "Lnet/fabricmc/fabric/impl/client/indigo/renderer/render/TerrainBlockRenderInfo;"
+)
+val AbstractQuadRenderer_bufferFunc2 = YarnHelper.requiredField<java.util.function.Function<RenderLayer, VertexConsumer>>(
+    "net.fabricmc.fabric.impl.client.indigo.renderer.render.AbstractQuadRenderer",
+    "bufferFunc", "Ljava/util/function/Function;"
+)
+val AbstractQuadRenderer_aoCalc = YarnHelper.requiredField<AoCalculator>(
+    "net.fabricmc.fabric.impl.client.indigo.renderer.render.AbstractQuadRenderer",
+    "aoCalc", "Lnet/fabricmc/fabric/impl/client/indigo/renderer/aocalc/AoCalculator;"
+)
+val AbstractQuadRenderer_transform = YarnHelper.requiredField<RenderContext.QuadTransform>(
+    "net.fabricmc.fabric.impl.client.indigo.renderer.render.AbstractQuadRenderer",
+    "transform", "Lnet/fabricmc/fabric/api/renderer/v1/render/RenderContext\$QuadTransform;"
+)
+
+val MODIFIED_CONSUMER_POOL = ThreadLocal<ModifiedTerrainMeshConsumer>()
+
+fun AbstractMeshConsumer.modified() = MODIFIED_CONSUMER_POOL.get() ?: let {
+    ModifiedTerrainMeshConsumer(this)
+}.apply { MODIFIED_CONSUMER_POOL.set(this) }
+
+/**
+ * Render the given model at the given position.
+ * Mutates the state of the [RenderContext]!!
+ */
+fun RenderContext.renderMasquerade(model: BakedModel, blockView: BlockRenderView, state: BlockState, pos: BlockPos, randomSupplier: Supplier<Random>, context: RenderContext) = when(this) {
+    is TerrainRenderContext -> {
+        val blockInfo = meshConsumer()[AbstractQuadRenderer_blockInfo2]!!
+        blockInfo.prepareForBlock(state, pos, model.useAmbientOcclusion())
+        (model as FabricBakedModel).emitBlockQuads(blockView, state, pos, randomSupplier, context)
+    }
+    else -> {
+        (model as FabricBakedModel).emitBlockQuads(blockView, state, pos, randomSupplier, context)
+    }
+}
+
+/** Execute the provided block with a mesh consumer using the given custom lighting. */
+fun RenderContext.withLighting(lighter: CustomLighting, func: (Consumer<Mesh>)->Unit) = when(this) {
+    is TerrainRenderContext -> {
+        val consumer = (meshConsumer() as AbstractMeshConsumer).modified()
+        consumer.clearLighting()
+        consumer.lighter = lighter
+        func(consumer)
+        consumer.lighter = null
+    }
+    else -> func(meshConsumer())
+}
+
+/** Get the [BufferBuilder] responsible for a given [BlockRenderLayer] */
+fun RenderContext.getBufferBuilder(layer: RenderLayer) = when(this) {
+    is TerrainRenderContext -> {
+        val bufferFunc = meshConsumer()[AbstractQuadRenderer_bufferFunc2]!!
+        bufferFunc.apply(layer)
+    }
+    else -> null
+}

src/main/kotlin/mods/betterfoliage/render/particle/AbstractParticle.kt

@@ -0,0 +1,102 @@
+package mods.betterfoliage.render.particle
+
+import mods.betterfoliage.util.Double3
+import net.minecraft.client.MinecraftClient
+import net.minecraft.client.particle.SpriteBillboardParticle
+import net.minecraft.client.render.Camera
+import net.minecraft.client.render.VertexConsumer
+import net.minecraft.client.texture.Sprite
+import net.minecraft.client.util.math.Vector3f
+import net.minecraft.client.world.ClientWorld
+import net.minecraft.util.math.MathHelper
+import net.minecraft.world.World
+
+abstract class AbstractParticle(world: ClientWorld, x: Double, y: Double, z: Double) : SpriteBillboardParticle(world, x, y, z) {
+
+    companion object {
+//        @JvmStatic val sin = Array(64) { idx -> Math.sin(PI2 / 64.0 * idx) }
+//        @JvmStatic val cos = Array(64) { idx -> Math.cos(PI2 / 64.0 * idx) }
+    }
+
+    val billboardRot = Pair(Double3.zero, Double3.zero)
+    val currentPos = Double3.zero
+    val prevPos = Double3.zero
+    val velocity = Double3.zero
+
+    override fun tick() {
+        super.tick()
+        currentPos.setTo(x, y, z)
+        prevPos.setTo(prevPosX, prevPosY, prevPosZ)
+        velocity.setTo(velocityX, velocityY, velocityZ)
+        update()
+        x = currentPos.x; y = currentPos.y; z = currentPos.z;
+        velocityX = velocity.x; velocityY = velocity.y; velocityZ = velocity.z;
+    }
+
+    /** Update particle on world tick. */
+    abstract fun update()
+
+    /** True if the particle is renderable. */
+    abstract val isValid: Boolean
+
+    /** Add the particle to the effect renderer if it is valid. */
+    fun addIfValid() { if (isValid) MinecraftClient.getInstance().particleManager.addParticle(this) }
+
+    override fun buildGeometry(vertexConsumer: VertexConsumer, camera: Camera, tickDelta: Float) {
+        renderParticleQuad(vertexConsumer, camera, tickDelta)
+    }
+
+    /**
+     * Render a particle quad.
+     *
+     * @param[tessellator] the [Tessellator] instance to use
+     * @param[tickDelta] partial tick time
+     * @param[currentPos] render position
+     * @param[prevPos] previous tick position for interpolation
+     * @param[size] particle size
+     * @param[currentAngle] viewpoint-dependent particle rotation (64 steps)
+     * @param[sprite] particle texture
+     * @param[isMirrored] mirror particle texture along V-axis
+     * @param[alpha] aplha blending
+     */
+    fun renderParticleQuad(vertexConsumer: VertexConsumer,
+                           camera: Camera,
+                           tickDelta: Float,
+                           currentPos: Double3 = this.currentPos,
+                           prevPos: Double3 = this.prevPos,
+                           size: Double = scale.toDouble(),
+                           currentAngle: Float = this.angle,
+                           prevAngle: Float = this.prevAngle,
+                           sprite: Sprite = this.sprite,
+                           alpha: Float = this.colorAlpha) {
+
+        val center = Double3.lerp(tickDelta.toDouble(), prevPos, currentPos)
+        val angle = MathHelper.lerp(tickDelta, prevAngle, currentAngle)
+        val rotation = camera.rotation.copy().apply { hamiltonProduct(Vector3f.POSITIVE_Z.getRadialQuaternion(angle)) }
+        val lightmapCoord = getColorMultiplier(tickDelta)
+
+        val coords = arrayOf(
+            Double3(-1.0, -1.0, 0.0),
+            Double3(-1.0, 1.0, 0.0),
+            Double3(1.0, 1.0, 0.0),
+            Double3(1.0, -1.0, 0.0)
+        ).map { it.rotate(rotation).mul(size).add(center).sub(camera.pos.x, camera.pos.y, camera.pos.z) }
+
+        fun renderVertex(vertex: Double3, u: Float, v: Float) = vertexConsumer
+            .vertex(vertex.x, vertex.y, vertex.z).texture(u, v)
+            .color(colorRed, colorGreen, colorBlue, alpha).light(lightmapCoord)
+            .next()
+
+        renderVertex(coords[0], sprite.maxU, sprite.maxV)
+        renderVertex(coords[1], sprite.maxU, sprite.minV)
+        renderVertex(coords[2], sprite.minU, sprite.minV)
+        renderVertex(coords[3], sprite.minU, sprite.maxV)
+    }
+
+    fun setColor(color: Int) {
+        colorBlue = (color and 255) / 256.0f
+        colorGreen = ((color shr 8) and 255) / 256.0f
+        colorRed = ((color shr 16) and 255) / 256.0f
+    }
+}
+

src/main/kotlin/mods/betterfoliage/render/particle/FallingLeaves.kt

@@ -0,0 +1,118 @@
+package mods.betterfoliage.render.particle
+
+import mods.betterfoliage.BetterFoliage
+import mods.betterfoliage.ClientWorldLoadCallback
+import mods.betterfoliage.render.block.vanilla.LeafParticleKey
+import mods.betterfoliage.util.Double3
+import mods.betterfoliage.util.PI2
+import mods.betterfoliage.util.minmax
+import mods.betterfoliage.util.randomB
+import mods.betterfoliage.util.randomD
+import mods.betterfoliage.util.randomF
+import mods.betterfoliage.util.randomI
+import net.fabricmc.fabric.api.event.world.WorldTickCallback
+import net.minecraft.client.particle.ParticleTextureSheet
+import net.minecraft.client.world.ClientWorld
+import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.MathHelper
+import net.minecraft.world.World
+import java.util.Random
+import kotlin.math.abs
+import kotlin.math.cos
+import kotlin.math.sin
+
+class FallingLeafParticle(
+    world: ClientWorld, pos: BlockPos, leaf: LeafParticleKey, blockColor: Int, random: Random
+) : AbstractParticle(
+    world, pos.x.toDouble() + 0.5, pos.y.toDouble(), pos.z.toDouble() + 0.5
+) {
+
+    companion object {
+        @JvmStatic val biomeBrightnessMultiplier = 0.5f
+    }
+
+    var rotationSpeed = random.randomF(min = PI2 / 80.0, max = PI2 / 50.0)
+    val isMirrored = randomB()
+    var wasCollided = false
+
+    init {
+        angle = random.randomF(max = PI2)
+        prevAngle = angle - rotationSpeed
+
+        maxAge = MathHelper.floor(randomD(0.6, 1.0) * BetterFoliage.config.fallingLeaves.lifetime * 20.0)
+        velocityY = -BetterFoliage.config.fallingLeaves.speed
+
+        scale = BetterFoliage.config.fallingLeaves.size.toFloat() * 0.1f
+
+        val state = world.getBlockState(pos)
+
+        setColor(leaf.overrideColor?.asInt ?: blockColor)
+        sprite = LeafParticleRegistry[leaf.leafType][randomI(max = 1024)]
+    }
+
+    override val isValid: Boolean get() = (sprite != null)
+
+    override fun update() {
+        if (randomF() > 0.95f) rotationSpeed = -rotationSpeed
+        if (age > maxAge - 20) colorAlpha = 0.05f * (maxAge - age)
+
+        if (onGround || wasCollided) {
+            velocity.setTo(0.0, 0.0, 0.0)
+            prevAngle = angle
+            if (!wasCollided) {
+                age = age.coerceAtLeast(maxAge - 20)
+                wasCollided = true
+            }
+        } else {
+            val cosRotation = cos(angle).toDouble(); val sinRotation = sin(angle).toDouble()
+            velocity.setTo(cosRotation, 0.0, sinRotation).mul(BetterFoliage.config.fallingLeaves.perturb)
+                    .add(LeafWindTracker.current).add(0.0, -1.0, 0.0).mul(BetterFoliage.config.fallingLeaves.speed)
+            prevAngle = angle
+            angle += rotationSpeed
+        }
+    }
+
+    fun setParticleColor(overrideColor: Int?, blockColor: Int) {
+        val color =  overrideColor ?: blockColor
+        setColor(color)
+    }
+
+    override fun getType() =
+        if (BetterFoliage.config.fallingLeaves.opacityHack) ParticleTextureSheet.PARTICLE_SHEET_OPAQUE
+        else ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT
+}
+
+object LeafWindTracker : WorldTickCallback, ClientWorldLoadCallback {
+    val random = Random()
+    val target = Double3.zero
+    val current = Double3.zero
+    var nextChange: Long = 0
+
+    fun changeWindTarget(world: World) {
+        nextChange = world.time + 120 + random.nextInt(80)
+        val direction = PI2 * random.nextDouble()
+        val speed = abs(random.nextGaussian()) * BetterFoliage.config.fallingLeaves.windStrength +
+            (if (!world.isRaining) 0.0 else abs(random.nextGaussian()) * BetterFoliage.config.fallingLeaves.stormStrength)
+        target.setTo(cos(direction) * speed, 0.0, sin(direction) * speed)
+    }
+
+    override fun tick(world: World) {
+        if (world.isClient) {
+            // change target wind speed
+            if (world.time >= nextChange) changeWindTarget(world)
+
+            // change current wind speed
+            val changeRate = if (world.isRaining) 0.015 else 0.005
+            current.add(
+                (target.x - current.x).minmax(-changeRate, changeRate),
+                0.0,
+                (target.z - current.z).minmax(-changeRate, changeRate)
+            )
+        }
+    }
+
+    override fun loadWorld(world: ClientWorld) {
+        changeWindTarget(world)
+    }
+}
+

src/main/kotlin/mods/betterfoliage/render/particle/LeafParticleRegistry.kt

@@ -0,0 +1,104 @@
+package mods.betterfoliage.render.particle
+
+import mods.betterfoliage.BetterFoliage
+import mods.betterfoliage.model.FixedSpriteSet
+import mods.betterfoliage.model.SpriteSet
+import mods.betterfoliage.resource.VeryEarlyReloadListener
+import mods.betterfoliage.util.Atlas
+import mods.betterfoliage.util.HasLogger
+import mods.betterfoliage.util.get
+import mods.betterfoliage.util.getLines
+import mods.betterfoliage.util.resourceManager
+import mods.betterfoliage.util.stripStart
+import net.fabricmc.fabric.api.event.client.ClientSpriteRegistryCallback
+import net.minecraft.client.texture.MissingSprite
+import net.minecraft.client.texture.SpriteAtlasTexture
+import net.minecraft.resource.ResourceManager
+import net.minecraft.util.Identifier
+import org.apache.logging.log4j.Level
+import kotlin.collections.MutableList
+import kotlin.collections.distinct
+import kotlin.collections.filter
+import kotlin.collections.firstOrNull
+import kotlin.collections.forEach
+import kotlin.collections.isNotEmpty
+import kotlin.collections.joinToString
+import kotlin.collections.listOf
+import kotlin.collections.map
+import kotlin.collections.mutableListOf
+import kotlin.collections.mutableMapOf
+import kotlin.collections.plus
+import kotlin.collections.set
+
+object LeafParticleRegistry : HasLogger(), ClientSpriteRegistryCallback, VeryEarlyReloadListener {
+    val typeMappings = TextureMatcher()
+    val allTypes get() = (typeMappings.mappings.map { it.type } + "default").distinct()
+
+    val spriteSets = mutableMapOf<String, SpriteSet>()
+
+    override fun getFabricId() = Identifier(BetterFoliage.MOD_ID, "leaf-particles")
+
+    override fun onReloadStarted(resourceManager: ResourceManager) {
+        typeMappings.loadMappings(Identifier(BetterFoliage.MOD_ID, "leaf_texture_mappings.cfg"))
+        detailLogger.log(Level.INFO, "Loaded leaf particle mappings, types = [${allTypes.joinToString(", ")}]")
+    }
+
+    override fun registerSprites(atlasTexture: SpriteAtlasTexture, registry: ClientSpriteRegistryCallback.Registry) {
+        spriteSets.clear()
+        allTypes.forEach { leafType ->
+            val validIds = (0 until 16).map { idx -> Identifier(BetterFoliage.MOD_ID, "particle/falling_leaf_${leafType}_$idx") }
+                .filter { resourceManager.containsResource(Atlas.PARTICLES.file(it)) }
+            validIds.forEach { registry.register(it) }
+        }
+    }
+
+    operator fun get(leafType: String): SpriteSet {
+        spriteSets[leafType]?.let { return it }
+
+        val sprites = (0 until 16)
+            .map { idx -> Identifier(BetterFoliage.MOD_ID, "particle/falling_leaf_${leafType}_$idx") }
+            .map { Atlas.PARTICLES[it] }
+            .filter { it !is MissingSprite }
+
+        detailLogger.log(Level.INFO, "Leaf particle type [$leafType], ${sprites.size} sprites in atlas")
+        if (sprites.isNotEmpty()) return FixedSpriteSet(sprites).apply { spriteSets[leafType] = this }
+
+        return if (leafType == "default")
+            FixedSpriteSet(listOf(Atlas.PARTICLES[MissingSprite.getMissingSpriteId()])).apply { spriteSets[leafType] = this }
+        else
+            get("default").apply { spriteSets[leafType] = this }
+    }
+
+    init {
+        ClientSpriteRegistryCallback.event(SpriteAtlasTexture.PARTICLE_ATLAS_TEXTURE).register(this)
+    }
+}
+
+class TextureMatcher {
+
+    data class Mapping(val domain: String?, val path: String, val type: String) {
+        fun matches(iconLocation: Identifier): Boolean {
+            return (domain == null || domain == iconLocation.namespace) &&
+                iconLocation.path.stripStart("blocks/").contains(path, ignoreCase = true)
+        }
+    }
+
+    val mappings: MutableList<Mapping> = mutableListOf()
+
+    fun getType(resource: Identifier) = mappings.filter { it.matches(resource) }.map { it.type }.firstOrNull()
+    fun getType(iconName: String) = Identifier(iconName).let { getType(it) }
+
+    fun loadMappings(mappingLocation: Identifier) {
+        mappings.clear()
+        resourceManager[mappingLocation]?.getLines()?.let { lines ->
+            lines.filter { !it.startsWith("//") }.filter { it.isNotEmpty() }.forEach { line ->
+                val line2 = line.trim().split('=')
+                if (line2.size == 2) {
+                    val mapping = line2[0].trim().split(':')
+                    if (mapping.size == 1) mappings.add(Mapping(null, mapping[0].trim(), line2[1].trim()))
+                    else if (mapping.size == 2) mappings.add(Mapping(mapping[0].trim(), mapping[1].trim(), line2[1].trim()))
+                }
+            }
+        }
+    }
+}

src/main/kotlin/mods/betterfoliage/render/particle/RisingSouls.kt

@@ -0,0 +1,88 @@
+package mods.betterfoliage.render.particle
+
+import mods.betterfoliage.BetterFoliage
+import mods.betterfoliage.model.SpriteDelegate
+import mods.betterfoliage.model.SpriteSetDelegate
+import mods.betterfoliage.util.Atlas
+import mods.betterfoliage.util.Double3
+import mods.betterfoliage.util.PI2
+import mods.betterfoliage.util.forEachPairIndexed
+import mods.betterfoliage.util.randomD
+import mods.betterfoliage.util.randomI
+import net.minecraft.client.particle.ParticleTextureSheet
+import net.minecraft.client.render.Camera
+import net.minecraft.client.render.VertexConsumer
+import net.minecraft.client.world.ClientWorld
+import net.minecraft.util.Identifier
+import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.MathHelper
+import java.util.Deque
+import java.util.LinkedList
+import kotlin.math.cos
+import kotlin.math.sin
+
+class RisingSoulParticle(
+    world: ClientWorld, pos: BlockPos
+) : AbstractParticle(
+    world, pos.x.toDouble() + 0.5, pos.y.toDouble() + 1.0, pos.z.toDouble() + 0.5
+) {
+
+    val particleTrail: Deque<Double3> = LinkedList()
+    val initialPhase = randomD(max = PI2)
+
+    init {
+        velocityY = 0.1
+        gravityStrength = 0.0f
+        sprite = headIcons[randomI(max = 1024)]
+        maxAge = MathHelper.floor((0.6 + 0.4 * randomD()) * BetterFoliage.config.risingSoul.lifetime * 20.0)
+    }
+
+    override val isValid: Boolean get() = true
+
+    override fun update() {
+        val phase = initialPhase + (age.toDouble() * PI2 / 64.0)
+        val cosPhase = cos(phase);
+        val sinPhase = sin(phase)
+        velocity.setTo(BetterFoliage.config.risingSoul.perturb.let { Double3(cosPhase * it, 0.1, sinPhase * it) })
+
+        particleTrail.addFirst(currentPos.copy())
+        while (particleTrail.size > BetterFoliage.config.risingSoul.trailLength) particleTrail.removeLast()
+
+        if (!BetterFoliage.config.enabled) markDead()
+    }
+
+    override fun buildGeometry(vertexConsumer: VertexConsumer, camera: Camera, tickDelta: Float) {
+        var alpha = BetterFoliage.config.risingSoul.opacity.toFloat()
+        if (age > maxAge - 40) alpha *= (maxAge - age) / 40.0f
+
+        renderParticleQuad(
+            vertexConsumer, camera, tickDelta,
+            size = BetterFoliage.config.risingSoul.headSize * 0.25,
+            alpha = alpha
+        )
+
+        var scale = BetterFoliage.config.risingSoul.trailSize * 0.25
+        particleTrail.forEachPairIndexed { idx, current, previous ->
+            scale *= BetterFoliage.config.risingSoul.sizeDecay
+            alpha *= BetterFoliage.config.risingSoul.opacityDecay.toFloat()
+            if (idx % BetterFoliage.config.risingSoul.trailDensity == 0)
+                renderParticleQuad(
+                    vertexConsumer, camera, tickDelta,
+                    currentPos = current,
+                    prevPos = previous,
+                    size = scale,
+                    alpha = alpha,
+                    sprite = trackIcon
+                )
+        }
+    }
+
+    override fun getType() = ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT
+
+    companion object {
+        val headIcons by SpriteSetDelegate(Atlas.PARTICLES) { idx ->
+            Identifier(BetterFoliage.MOD_ID, "particle/rising_soul_$idx")
+        }
+        val trackIcon by SpriteDelegate(Atlas.PARTICLES) { Identifier(BetterFoliage.MOD_ID, "particle/soul_track") }
+    }
+}

src/main/kotlin/mods/betterfoliage/resource/VeryEarlyReloadListener.kt

@@ -0,0 +1,28 @@
+package mods.betterfoliage.resource
+
+import net.fabricmc.fabric.api.resource.IdentifiableResourceReloadListener
+import net.minecraft.resource.ResourceManager
+import net.minecraft.resource.ResourceReloadListener
+import net.minecraft.util.profiler.Profiler
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.Executor
+
+/**
+ * Catch resource reload extremely early, before any of the reloaders
+ * have started working.
+ */
+interface VeryEarlyReloadListener : ResourceReloadListener, IdentifiableResourceReloadListener {
+    override fun reload(
+        synchronizer: ResourceReloadListener.Synchronizer,
+        resourceManager: ResourceManager,
+        preparationsProfiler: Profiler,
+        reloadProfiler: Profiler,
+        backgroundExecutor: Executor,
+        gameExecutor: Executor
+    ): CompletableFuture<Void> {
+        onReloadStarted(resourceManager)
+        return synchronizer.whenPrepared(null)
+    }
+
+    fun onReloadStarted(resourceManager: ResourceManager) {}
+}

src/main/kotlin/mods/betterfoliage/resource/discovery/BakingLifecycle.kt

@@ -0,0 +1,124 @@
+package mods.betterfoliage.resource.discovery
+
+import mods.betterfoliage.BetterFoliage
+import mods.betterfoliage.BlockModelsReloadCallback
+import mods.betterfoliage.ModelLoadingCallback
+import mods.betterfoliage.util.HasLogger
+import mods.betterfoliage.util.Invalidator
+import net.fabricmc.fabric.api.event.client.ClientSpriteRegistryCallback
+import net.minecraft.block.BlockState
+import net.minecraft.client.render.block.BlockModels
+import net.minecraft.client.render.model.BakedModel
+import net.minecraft.client.render.model.ModelBakeSettings
+import net.minecraft.client.render.model.ModelLoader
+import net.minecraft.client.render.model.UnbakedModel
+import net.minecraft.client.texture.Sprite
+import net.minecraft.client.texture.SpriteAtlasTexture
+import net.minecraft.client.util.SpriteIdentifier
+import net.minecraft.resource.ResourceManager
+import net.minecraft.util.Identifier
+import org.apache.logging.log4j.Level.INFO
+import org.apache.logging.log4j.Level.WARN
+import org.apache.logging.log4j.Logger
+import java.lang.ref.WeakReference
+import java.util.function.Function
+
+data class ModelDiscoveryContext(
+    val bakery: ModelLoader,
+    val blockState: BlockState,
+    val modelLocation: Identifier,
+    val sprites: MutableSet<Identifier>,
+    val replacements: MutableMap<Identifier, ModelBakingKey>,
+    val logger: Logger
+) {
+    fun getUnbaked(location: Identifier = modelLocation) = bakery.getOrLoadModel(location)
+    fun addReplacement(key: ModelBakingKey, addToStateKeys: Boolean = true) {
+        replacements[modelLocation] = key
+        if (addToStateKeys) BetterFoliage.blockTypes.stateKeys[blockState] = key
+        logger.log(INFO, "Adding model replacement $modelLocation -> $key")
+    }
+}
+
+interface ModelDiscovery {
+    fun onModelsLoaded(
+        bakery: ModelLoader,
+        sprites: MutableSet<Identifier>,
+        replacements: MutableMap<Identifier, ModelBakingKey>
+    )
+}
+
+data class ModelBakingContext(
+    val bakery: ModelLoader,
+    val spriteGetter: Function<SpriteIdentifier, Sprite>,
+    val location: Identifier,
+    val transform: ModelBakeSettings,
+    val logger: Logger
+) {
+    fun getUnbaked() = bakery.getOrLoadModel(location)
+    fun getBaked() = bakery.bake(location, transform)
+}
+
+interface ModelBakingKey {
+    fun bake(ctx: ModelBakingContext): BakedModel? =
+        ctx.getUnbaked().bake(ctx.bakery, ctx.spriteGetter, ctx.transform, ctx.location)
+}
+
+object BakeWrapperManager : HasLogger(), Invalidator, ModelLoadingCallback, ClientSpriteRegistryCallback, BlockModelsReloadCallback {
+    init {
+        ModelLoadingCallback.EVENT.register(this)
+        ClientSpriteRegistryCallback.event(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE).register(this)
+    }
+    val discoverers = mutableListOf<ModelDiscovery>()
+    override val callbacks = mutableListOf<WeakReference<()->Unit>>()
+
+    private val replacements = mutableMapOf<Identifier, ModelBakingKey>()
+    private val sprites = mutableSetOf<Identifier>()
+
+    override fun beginLoadModels(loader: ModelLoader, manager: ResourceManager) {
+        val startTime = System.currentTimeMillis()
+        replacements.clear()
+        sprites.clear()
+        invalidate()
+        BetterFoliage.blockTypes = BlockTypeCache()
+
+        logger.log(INFO, "starting model discovery (${discoverers.size} listeners)")
+        discoverers.forEach { listener ->
+            val replacementsLocal = mutableMapOf<Identifier, ModelBakingKey>()
+            listener.onModelsLoaded(loader, sprites, replacements)
+        }
+
+        val elapsed = System.currentTimeMillis() - startTime
+        logger.log(INFO, "finished model discovery in $elapsed ms, ${replacements.size} top-level replacements")
+    }
+
+    override fun registerSprites(atlas: SpriteAtlasTexture, registry: ClientSpriteRegistryCallback.Registry) {
+        logger.log(INFO, "Adding ${sprites.size} sprites to block atlas")
+        sprites.forEach { registry.register(it) }
+        sprites.clear()
+    }
+
+    override fun reloadBlockModels(blockModels: BlockModels) {
+        replacements.clear()
+    }
+
+    fun onBake(
+        unbaked: UnbakedModel,
+        bakery: ModelLoader,
+        spriteGetter: Function<SpriteIdentifier, Sprite>,
+        transform: ModelBakeSettings,
+        location: Identifier
+    ): BakedModel? {
+        val ctx = ModelBakingContext(bakery, spriteGetter, location, transform, detailLogger)
+        // bake replacement if available
+        replacements[location]?.let { replacement ->
+            detailLogger.log(INFO, "Baking replacement for [${unbaked::class.java.simpleName}] $location -> $replacement")
+            try {
+                return replacement.bake(ctx)
+            } catch (e: Exception) {
+                detailLogger.log(WARN, "Error while baking $replacement", e)
+                logger.log(WARN, "Error while baking $replacement", e)
+            }
+        }
+        return unbaked.bake(bakery, spriteGetter, transform, location)
+    }
+}

src/main/kotlin/mods/betterfoliage/resource/discovery/BlockTypeCache.kt

@@ -0,0 +1,14 @@
+package mods.betterfoliage.resource.discovery
+
+import net.minecraft.block.BlockState
+
+class BlockTypeCache {
+    val leaf = mutableSetOf<BlockState>()
+    val grass = mutableSetOf<BlockState>()
+    val dirt = mutableSetOf<BlockState>()
+
+    val stateKeys = mutableMapOf<BlockState, ModelBakingKey>()
+
+    inline fun <reified T> getTyped(state: BlockState) = stateKeys[state] as? T
+    inline fun <reified T> hasTyped(state: BlockState) = stateKeys[state] is T
+}

src/main/kotlin/mods/betterfoliage/resource/discovery/Matchers.kt

@@ -0,0 +1,88 @@
+package mods.betterfoliage.resource.discovery
+
+import mods.betterfoliage.util.HasLogger
+import mods.betterfoliage.util.getLines
+import mods.betterfoliage.util.INTERMEDIARY
+import mods.betterfoliage.util.getJavaClass
+import net.fabricmc.loader.api.FabricLoader
+import net.minecraft.block.Block
+import net.minecraft.resource.ResourceManager
+import net.minecraft.util.Identifier
+import org.apache.logging.log4j.Level
+import org.apache.logging.log4j.Level.INFO
+import org.apache.logging.log4j.Logger
+
+interface IBlockMatcher {
+    fun matchesClass(block: Block): Boolean
+    fun matchingClass(block: Block): Class<*>?
+}
+
+class SimpleBlockMatcher(vararg val classes: Class<*>) : IBlockMatcher {
+    override fun matchesClass(block: Block) = matchingClass(block) != null
+
+    override fun matchingClass(block: Block): Class<*>? {
+        val blockClass = block.javaClass
+        classes.forEach { if (it.isAssignableFrom(blockClass)) return it }
+        return null
+    }
+}
+
+class ConfigurableBlockMatcher(val location: Identifier) : HasLogger(), IBlockMatcher {
+
+    val blackList = mutableListOf<Class<*>>()
+    val whiteList = mutableListOf<Class<*>>()
+
+    override fun matchesClass(block: Block): Boolean {
+        val blockClass = block.javaClass
+        blackList.forEach { if (it.isAssignableFrom(blockClass)) return false }
+        whiteList.forEach { if (it.isAssignableFrom(blockClass)) return true }
+        return false
+    }
+
+    override fun matchingClass(block: Block): Class<*>? {
+        val blockClass = block.javaClass
+        blackList.forEach { if (it.isAssignableFrom(blockClass)) return null }
+        whiteList.forEach { if (it.isAssignableFrom(blockClass)) return it }
+        return null
+    }
+
+    fun readDefaults(manager: ResourceManager) {
+        blackList.clear()
+        whiteList.clear()
+        manager.getAllResources(location).forEach { resource ->
+            detailLogger.log(INFO, "Reading class list $location from pack ${resource.resourcePackName}")
+            resource.getLines().map{ it.trim() }.filter { !it.startsWith("//") && it.isNotEmpty() }.forEach { line ->
+                val name = if (line.startsWith("-")) line.substring(1) else line
+                val mappedName = FabricLoader.getInstance().mappingResolver.mapClassName(INTERMEDIARY, name)
+                if (name != mappedName) logger.debug("    found yarn mapping for class: $name -> $mappedName")
+                val klass = getJavaClass(mappedName)
+
+                val list = if (line.startsWith("-")) "blacklist" to blackList else "whitelist" to whiteList
+
+                if (klass != null) {
+                    logger.debug("    ${list.first} class $name found")
+                    list.second.add(klass)
+                } else {
+                    logger.debug("    ${list.first} class $name not found")
+                }
+            }
+        }
+    }
+}
+
+data class ModelTextureList(val modelLocation: Identifier, val textureNames: List<String>) {
+    constructor(vararg args: String) : this(Identifier(args[0]), listOf(*args).drop(1))
+}
+
+class ModelTextureListConfiguration(val location: Identifier) : HasLogger() {
+    val modelList = mutableListOf<ModelTextureList>()
+    fun readDefaults(manager: ResourceManager) {
+        manager.getAllResources(location).forEach { resource ->
+            detailLogger.log(INFO, "Reading model configuration $location from pack ${resource.resourcePackName}")
+            resource.getLines().map{ it.trim() }.filter { !it.startsWith("//") && it.isNotEmpty() }.forEach { line ->
+                val elements = line.split(",")
+                modelList.add(ModelTextureList(Identifier(elements.first()), elements.drop(1)))
+            }
+        }
+    }
+}

src/main/kotlin/mods/betterfoliage/resource/discovery/ModelDiscovery.kt

@@ -0,0 +1,99 @@
+package mods.betterfoliage.resource.discovery
+
+import com.google.common.base.Joiner
+import mods.betterfoliage.util.HasLogger
+import mods.betterfoliage.util.YarnHelper
+import mods.betterfoliage.util.get
+import net.minecraft.block.Block
+import net.minecraft.client.render.block.BlockModels
+import net.minecraft.client.render.model.ModelLoader
+import net.minecraft.client.render.model.json.JsonUnbakedModel
+import net.minecraft.client.render.model.json.WeightedUnbakedModel
+import net.minecraft.client.texture.MissingSprite
+import net.minecraft.util.Identifier
+import net.minecraft.util.registry.Registry
+import org.apache.logging.log4j.Level
+
+abstract class AbstractModelDiscovery : HasLogger(), ModelDiscovery {
+    override fun onModelsLoaded(
+        bakery: ModelLoader,
+        sprites: MutableSet<Identifier>,
+        replacements: MutableMap<Identifier, ModelBakingKey>
+    ) {
+        (Registry.BLOCK as Iterable<Block>)
+            .flatMap { block -> block.stateManager.states }
+            .forEach { state ->
+                val location = BlockModels.getModelId(state)
+                val ctx = ModelDiscoveryContext(bakery, state, location, sprites, replacements, detailLogger)
+                try {
+                    processModel(ctx)
+                } catch (e: Exception) {
+                    logger.log(Level.WARN, "Discovery error in $location", e)
+                }
+            }
+    }
+
+    open fun processModel(ctx: ModelDiscoveryContext) {
+        val model = ctx.getUnbaked()
+
+        // built-in support for container models
+        if (model is WeightedUnbakedModel) {
+            // per-location replacements need to be scoped to the variant list, as replacement models
+            // may need information from the BlockState which is not available at baking time
+            val scopedReplacements = mutableMapOf<Identifier, ModelBakingKey>()
+            model.variants.forEach { variant ->
+                processModel(ctx.copy(modelLocation = variant.location, replacements = scopedReplacements))
+            }
+            if (scopedReplacements.isNotEmpty()) {
+                ctx.addReplacement(WeightedUnbakedKey(scopedReplacements), addToStateKeys = false)
+            }
+        }
+    }
+}
+
+abstract class ConfigurableModelDiscovery : AbstractModelDiscovery() {
+    abstract val matchClasses: IBlockMatcher
+    abstract val modelTextures: List<ModelTextureList>
+
+    abstract fun processModel(
+        ctx: ModelDiscoveryContext,
+        textureMatch: List<Identifier>
+    )
+
+    override fun processModel(ctx: ModelDiscoveryContext) {
+        val model = ctx.getUnbaked()
+        if (model is JsonUnbakedModel) {
+            val matchClass = matchClasses.matchingClass(ctx.blockState.block) ?: return
+
+            detailLogger.log(Level.INFO, "block state ${ctx.blockState}")
+            detailLogger.log(Level.INFO, "      model ${ctx.modelLocation}")
+            detailLogger.log(Level.INFO, "      class ${ctx.blockState.block.javaClass.name} matches ${matchClass.name}")
+
+            modelTextures
+                .filter { matcher -> ctx.bakery.modelDerivesFrom(model, ctx.modelLocation, matcher.modelLocation) }
+                .forEach { match ->
+                    detailLogger.log(Level.INFO, "      model $model matches ${match.modelLocation}")
+
+                    val materials = match.textureNames.map { it to model.resolveSprite(it) }
+                    val texMapString = Joiner.on(", ").join(materials.map { "${it.first}=${it.second.textureId}" })
+                    detailLogger.log(Level.INFO, "    sprites [$texMapString]")
+
+                    if (materials.all { it.second.textureId != MissingSprite.getMissingSpriteId() }) {
+                        // found a valid model (all required textures exist)
+                        processModel(ctx, materials.map { it.second.textureId })
+                    }
+                }
+        }
+        return super.processModel(ctx)
+    }
+}
+
+// net.minecraft.client.render.model.json.JsonUnbakedModel.parentId
+val JsonUnbakedModel_parentId = YarnHelper.requiredField<Identifier>("net.minecraft.class_793", "field_4247", "Lnet/minecraft/class_2960;")
+
+fun ModelLoader.modelDerivesFrom(model: JsonUnbakedModel, location: Identifier, target: Identifier): Boolean =
+    if (location == target) true
+    else model[JsonUnbakedModel_parentId]
+        ?.let { getOrLoadModel(it) as? JsonUnbakedModel }
+        ?.let { parent -> modelDerivesFrom(parent, model[JsonUnbakedModel_parentId]!!, target) }
+        ?: false

src/main/kotlin/mods/betterfoliage/resource/discovery/VanillaWrappers.kt

@@ -0,0 +1,61 @@
+package mods.betterfoliage.resource.discovery
+
+import mods.betterfoliage.model.WeightedModelWrapper
+import mods.betterfoliage.model.WrappedBakedModel
+import mods.betterfoliage.model.WrappedMeshModel
+import mods.betterfoliage.util.HasLogger
+import net.fabricmc.fabric.api.renderer.v1.material.BlendMode
+import net.minecraft.client.render.model.BakedModel
+import net.minecraft.client.render.model.BasicBakedModel
+import net.minecraft.client.render.model.json.WeightedUnbakedModel
+import net.minecraft.util.Identifier
+import org.apache.logging.log4j.Level.INFO
+import org.apache.logging.log4j.Level.WARN
+
+class WeightedUnbakedKey(
+    val replacements: Map<Identifier, ModelBakingKey>
+) : ModelBakingKey {
+
+    override fun bake(ctx: ModelBakingContext): BakedModel? {
+        val unbaked = ctx.getUnbaked()
+        if (unbaked !is WeightedUnbakedModel) return super.bake(ctx)
+
+        // bake all variants, replace as needed
+        val bakedModels = unbaked.variants.mapNotNull {
+            val variantCtx = ctx.copy(location = it.location, transform = it)
+            val replacement = replacements[it.location]
+            val baked = replacement?.let { replacement ->
+                ctx.logger.log(INFO, "Baking replacement for variant [${variantCtx.getUnbaked()::class.java.simpleName}] ${variantCtx.location} -> $replacement")
+                replacement.bake(variantCtx)
+            } ?: variantCtx.getBaked()
+            when(baked) {
+                is WrappedBakedModel -> it to baked
+                // just in case we replaced some variants in the list, but not others
+                // this should not realistically happen, this is just a best-effort fallback
+                is BasicBakedModel -> it to WrappedMeshModel.converter(
+                    state = null, unshade = false, noDiffuse = true, blendModeOverride = BlendMode.CUTOUT_MIPPED
+                ).convert(baked)!!
+                else -> null
+            }
+        }
+
+        // something fishy going on, possibly unknown model type
+        // let it through unchanged
+        if (bakedModels.isEmpty()) return super.bake(ctx)
+
+        if (bakedModels.size < unbaked.variants.size) {
+            detailLogger.log(
+                WARN,
+                "Dropped ${unbaked.variants.size - bakedModels.size} variants from model ${ctx.location}"
+            )
+        }
+        val weightedSpecials = bakedModels.map { (variant, model) ->
+            WeightedModelWrapper.WeightedModel(model, variant.weight)
+        }
+        return WeightedModelWrapper(weightedSpecials, weightedSpecials[0].model)
+    }
+
+    override fun toString() = "[WeightedUnbakedKey, ${replacements.size} replacements]"
+
+    companion object : HasLogger()
+}

src/main/kotlin/mods/betterfoliage/resource/generated/CenteredSprite.kt

@@ -0,0 +1,39 @@
+package mods.betterfoliage.resource.generated
+
+import mods.betterfoliage.util.Atlas
+import mods.betterfoliage.util.bytes
+import mods.betterfoliage.util.loadSprite
+import net.minecraft.resource.ResourceManager
+import net.minecraft.util.Identifier
+import java.awt.image.BufferedImage
+import java.lang.Math.max
+
+data class CenteredSprite(val sprite: Identifier, val atlas: Atlas = Atlas.BLOCKS, val aspectHeight: Int = 1, val aspectWidth: Int = 1) {
+
+    fun register(pack: GeneratedBlockTexturePack) = pack.register(this, this::draw)
+
+    fun draw(resourceManager: ResourceManager): ByteArray {
+        val baseTexture = resourceManager.loadSprite(atlas.file(sprite))
+
+        val frameWidth = baseTexture.width
+        val frameHeight = baseTexture.width * aspectHeight / aspectWidth
+        val frames = baseTexture.height / frameHeight
+        val size = max(frameWidth, frameHeight)
+
+        val result = BufferedImage(size, size * frames, BufferedImage.TYPE_4BYTE_ABGR)
+        val graphics = result.createGraphics()
+
+        // iterate all frames
+        for (frame in 0 until frames) {
+            val baseFrame = baseTexture.getSubimage(0, size * frame, frameWidth, frameHeight)
+            val resultFrame = BufferedImage(size, size, BufferedImage.TYPE_4BYTE_ABGR)
+
+            resultFrame.createGraphics().apply {
+                drawImage(baseFrame, (size - frameWidth) / 2, (size - frameHeight) / 2, null)
+            }
+            graphics.drawImage(resultFrame, 0, size * frame, null)
+        }
+
+        return result.bytes
+    }
+}

src/main/kotlin/mods/betterfoliage/resource/generated/GeneratedBlockTexturePack.kt

@@ -0,0 +1,95 @@
+package mods.betterfoliage.resource.generated
+
+import mods.betterfoliage.util.Atlas
+import mods.betterfoliage.util.HasLogger
+import net.fabricmc.fabric.api.resource.IdentifiableResourceReloadListener
+import net.minecraft.resource.*
+import net.minecraft.resource.ResourceType.CLIENT_RESOURCES
+import net.minecraft.resource.metadata.ResourceMetadataReader
+import net.minecraft.text.LiteralText
+import net.minecraft.util.Identifier
+import net.minecraft.util.profiler.Profiler
+import org.apache.logging.log4j.Level.INFO
+import java.io.IOException
+import java.util.*
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.ExecutionException
+import java.util.concurrent.Executor
+import java.util.function.Consumer
+import java.util.function.Predicate
+
+/**
+ * [ResourcePack] containing generated block textures
+ *
+ * @param[reloadId] Fabric ID of the pack
+ * @param[nameSpace] Resource namespace of pack
+ * @param[packName] Friendly name of pack
+ * @param[packDesc] Description of pack
+ * @param[logger] Logger to log to when generating resources
+ */
+class GeneratedBlockTexturePack(
+    val reloadId: Identifier, val nameSpace: String, val packName: String, val packDesc: String
+) : HasLogger(), ResourcePack {
+
+    override fun getName() = reloadId.toString()
+    override fun getNamespaces(type: ResourceType) = setOf(nameSpace)
+    override fun <T : Any?> parseMetadata(deserializer: ResourceMetadataReader<T>) = null
+    override fun openRoot(id: String) = null
+    override fun findResources(type: ResourceType, path: String, prefix: String, maxDepth: Int, filter: Predicate<String>) = emptyList<Identifier>()
+
+    override fun close() {}
+
+    protected var manager: ResourceManager? = null
+    val identifiers: MutableMap<Any, Identifier> = Collections.synchronizedMap(mutableMapOf<Any, Identifier>())
+    val resources: MutableMap<Identifier, ByteArray> = Collections.synchronizedMap(mutableMapOf<Identifier, ByteArray>())
+
+    fun register(key: Any, func: (ResourceManager)->ByteArray): Identifier {
+        if (manager == null) throw IllegalStateException("Cannot register resources unless resource manager is being reloaded")
+        identifiers[key]?.let { return it }
+
+        val id = Identifier(nameSpace, UUID.randomUUID().toString())
+        val resource = func(manager!!)
+
+        identifiers[key] = id
+        resources[Atlas.BLOCKS.file(id)] = resource
+        detailLogger.log(INFO, "generated resource $key -> $id")
+        return id
+    }
+
+    override fun open(type: ResourceType, id: Identifier) =
+        if (type != CLIENT_RESOURCES) null else
+            try { resources[id]!!.inputStream() }
+            catch (e: ExecutionException) { (e.cause as? IOException)?.let { throw it } }   // rethrow wrapped IOException if present
+
+    override fun contains(type: ResourceType, id: Identifier) =
+        type == CLIENT_RESOURCES && resources.containsKey(id)
+
+    /**
+     * Provider for this resource pack. Adds pack as always-on and hidden.
+     */
+    val finder = object : ResourcePackProvider {
+        val packInfo = ResourcePackProfile(
+            packName, true, { this@GeneratedBlockTexturePack },
+            LiteralText(packName),
+            LiteralText(packDesc),
+            ResourcePackCompatibility.COMPATIBLE, ResourcePackProfile.InsertionPosition.TOP, true, ResourcePackSource.field_25347
+        )
+
+        override fun register(consumer: Consumer<ResourcePackProfile>, factory: ResourcePackProfile.Factory) {
+            consumer.accept(packInfo)
+        }
+    }
+
+    val reloader = object : IdentifiableResourceReloadListener {
+        override fun getFabricId() = reloadId
+
+        override fun reload(synchronizer: ResourceReloadListener.Synchronizer, manager: ResourceManager, prepareProfiler: Profiler, applyProfiler: Profiler, prepareExecutor: Executor, applyExecutor: Executor): CompletableFuture<Void> {
+            this@GeneratedBlockTexturePack.manager = manager
+            return synchronizer.whenPrepared(null).thenRun {
+                this@GeneratedBlockTexturePack.manager = null
+                identifiers.clear()
+                resources.clear()
+            }
+        }
+    }
+}

src/main/kotlin/mods/betterfoliage/resource/generated/GeneratedGrassSprite.kt

@@ -0,0 +1,50 @@
+package mods.betterfoliage.resource.generated
+
+import mods.betterfoliage.util.*
+import net.minecraft.resource.ResourceManager
+import net.minecraft.util.Identifier
+import java.awt.image.BufferedImage
+
+/**
+ * Generate Short Grass textures from [Blocks.tallgrass] block textures.
+ * The bottom 3/8 of the base texture is chopped off.
+ *
+ * @param[domain] Resource domain of generator
+ */
+data class GeneratedGrassSprite(val sprite: Identifier, val isSnowed: Boolean, val atlas: Atlas = Atlas.BLOCKS) {
+    constructor(sprite: String, isSnowed: Boolean) : this(Identifier(sprite), isSnowed)
+
+    fun register(pack: GeneratedBlockTexturePack) = pack.register(this, this::draw)
+
+    fun draw(resourceManager: ResourceManager): ByteArray {
+        val baseTexture = resourceManager.loadSprite(atlas.file(sprite))
+
+        val result = BufferedImage(baseTexture.width, baseTexture.height, BufferedImage.TYPE_4BYTE_ABGR)
+        val graphics = result.createGraphics()
+
+        val size = baseTexture.width
+        val frames = baseTexture.height / size
+
+        // iterate all frames
+        for (frame in 0 until frames) {
+            val baseFrame = baseTexture.getSubimage(0, size * frame, size, size)
+            val grassFrame = BufferedImage(size, size, BufferedImage.TYPE_4BYTE_ABGR)
+
+            // draw bottom half of texture
+            grassFrame.createGraphics().apply {
+                drawImage(baseFrame, 0, 3 * size / 8, null)
+            }
+
+            // add to animated png
+            graphics.drawImage(grassFrame, 0, size * frame, null)
+        }
+
+        // blend with white if snowed
+        if (isSnowed) {
+            for (x in 0..result.width - 1) for (y in 0..result.height - 1) {
+                result[x, y] = blendRGB(result[x, y], 16777215, 2, 3)
+            }
+        }
+        return result.bytes
+    }
+}

src/main/kotlin/mods/betterfoliage/resource/generated/GeneratedLeafSprite.kt

@@ -0,0 +1,86 @@
+package mods.betterfoliage.resource.generated
+
+import mods.betterfoliage.BetterFoliage
+import mods.betterfoliage.util.*
+import net.minecraft.resource.Resource
+import net.minecraft.resource.ResourceManager
+import net.minecraft.util.Identifier
+import java.awt.image.BufferedImage
+
+/**
+ * Generate round leaf textures from leaf block textures.
+ * The base texture is tiled 2x2, then parts of it are made transparent by applying a mask to the alpha channel.
+ *
+ * Different leaf types may have their own alpha mask.
+ *
+ * @param[domain] Resource domain of generator
+ */
+data class GeneratedLeafSprite(val sprite: Identifier, val leafType: String, val atlas: Atlas = Atlas.BLOCKS) {
+
+    fun register(pack: GeneratedBlockTexturePack) = pack.register(this, this::draw)
+
+    fun draw(resourceManager: ResourceManager): ByteArray {
+        val baseTexture = resourceManager.loadSprite(atlas.file(sprite))
+
+        val size = baseTexture.width
+        val frames = baseTexture.height / size
+
+        val maskTexture = (getLeafMask(leafType, size * 2) ?: getLeafMask("default", size * 2))?.loadImage()
+        fun scale(i: Int) = i * maskTexture!!.width / (size * 2)
+
+        val result = BufferedImage(size * 2, size * 2 * frames, BufferedImage.TYPE_4BYTE_ABGR)
+        val graphics = result.createGraphics()
+
+        // iterate all frames
+        for (frame in 0 until frames) {
+            val baseFrame = baseTexture.getSubimage(0, size * frame, size, size)
+            val leafFrame = BufferedImage(size * 2, size * 2, BufferedImage.TYPE_4BYTE_ABGR)
+
+            // tile leaf texture 2x2
+            leafFrame.createGraphics().apply {
+                drawImage(baseFrame, 0, 0, null)
+                drawImage(baseFrame, 0, size, null)
+                drawImage(baseFrame, size, 0, null)
+                drawImage(baseFrame, size, size, null)
+            }
+
+            // overlay alpha mask
+            if (maskTexture != null) {
+                for (x in 0 until size * 2) for (y in 0 until size * 2) {
+                    val basePixel = leafFrame[x, y].toLong() and 0xFFFFFFFFL
+                    val maskPixel = maskTexture[scale(x), scale(y)].toLong() and 0xFF000000L or 0xFFFFFFL
+                    leafFrame[x, y] = (basePixel and maskPixel).toInt()
+                }
+            }
+
+            // add to animated png
+            graphics.drawImage(leafFrame, 0, size * frame * 2, null)
+        }
+
+        return result.bytes
+    }
+
+    /**
+     * Get the alpha mask to use
+     *
+     * @param[type] Alpha mask type.
+     * @param[maxSize] Preferred mask size.
+     */
+    fun getLeafMask(type: String, maxSize: Int) = getMultisizeTexture(maxSize) { size ->
+        Atlas.BLOCKS.file(Identifier(BetterFoliage.MOD_ID, "blocks/leafmask_${size}_${type}"))
+    }
+
+    /**
+     * Get a texture resource when multiple sizes may exist.
+     *
+     * @param[maxSize] Maximum size to consider. This value is progressively halved when searching for smaller versions.
+     * @param[maskPath] Location of the texture of the given size
+     *
+     */
+    fun getMultisizeTexture(maxSize: Int, maskPath: (Int)->Identifier): Resource? {
+        var size = maxSize
+        val sizes = mutableListOf<Int>()
+        while(size > 2) { sizes.add(size); size /= 2 }
+        return sizes.findFirst { resourceManager[maskPath(it)] }
+    }
+}

src/main/kotlin/mods/betterfoliage/util/Caching.kt

@@ -0,0 +1,60 @@
+package mods.betterfoliage.util
+
+import java.lang.ref.WeakReference
+import kotlin.properties.ReadOnlyProperty
+import kotlin.reflect.KProperty
+
+interface Invalidator {
+    fun invalidate() {
+        val iterator = callbacks.iterator()
+        while(iterator.hasNext()) iterator.next().let { callback ->
+            callback.get()?.invoke() ?: iterator.remove()
+        }
+    }
+    val callbacks: MutableList<WeakReference<()->Unit>>
+    fun onInvalidate(callback: ()->Unit) {
+        callbacks.add(WeakReference(callback))
+    }
+}
+
+class LazyInvalidatable<V>(invalidator: Invalidator, val valueFactory: ()->V): ReadOnlyProperty<Any, V> {
+    init { invalidator.onInvalidate { value = null } }
+
+    var value: V? = null
+
+    override fun getValue(thisRef: Any, property: KProperty<*>): V {
+        value?.let { return it }
+        return synchronized(this) {
+            value?.let { return it }
+            valueFactory().apply { value = this }
+        }
+    }
+}
+
+class LazyMap<K, V>(val invalidator: Invalidator, val valueFactory: (K)->V) {
+    init { invalidator.onInvalidate { values.clear() } }
+
+    val values = mutableMapOf<K, V>()
+
+    operator fun get(key: K): V {
+        values[key]?.let { return it }
+        return synchronized(values) {
+            values[key]?.let { return it }
+            valueFactory(key).apply { values[key] = this }
+        }
+    }
+    operator fun set(key: K, value: V) { values[key] = value }
+
+    fun delegate(key: K) = Delegate(key)
+
+    inner class Delegate(val key: K) : ReadOnlyProperty<Any, V> {
+        init { invalidator.onInvalidate { cached = null } }
+
+        private var cached: V? = null
+
+        override fun getValue(thisRef: Any, property: KProperty<*>): V {
+            cached?.let { return it }
+            get(key).let { cached = it; return it }
+        }
+    }
+}

src/main/kotlin/mods/betterfoliage/util/Collections.kt

@@ -0,0 +1,63 @@
+package mods.betterfoliage.util
+
+import java.util.*
+
+/**
+ * Starting with the second element of this [Iterable] until the last, call the supplied lambda with
+ * the parameters (index, element, previous element).
+ */
+inline fun <reified T> Iterable<T>.forEachPairIndexed(func: (Int, T, T)->Unit) {
+    var previous: T? = null
+    forEachIndexed { idx, current ->
+        if (previous != null) func(idx, current, previous!!)
+        previous = current
+    }
+}
+
+inline fun <T, C: Comparable<C>> Pair<T, T>.minBy(func: (T)->C) =
+    if (func(first) < func(second)) first else second
+
+inline fun <T, C: Comparable<C>> Pair<T, T>.maxBy(func: (T)->C) =
+    if (func(first) > func(second)) first else second
+
+inline fun <T, C: Comparable<C>> Triple<T, T, T>.maxValueBy(func: (T)->C): C {
+    var result = func(first)
+    func(second).let { if (it > result) result = it }
+    func(third).let { if (it > result) result = it }
+    return result
+}
+
+@Suppress("UNCHECKED_CAST")
+inline fun <K, V> Map<K, V?>.filterValuesNotNull() = filterValues { it != null } as Map<K, V>
+
+inline fun <reified T, R> Iterable<T>.findFirst(func: (T)->R?): R? {
+    forEach { func(it)?.let { return it } }
+    return null
+}
+
+inline fun <A1, reified A2, B> List<Pair<A1, B>>.filterIsInstanceFirst(cls: Class<A2>) = filter { it.first is A2 } as List<Pair<A2, B>>
+
+/** Cross product of this [Iterable] with the parameter. */
+fun <A, B> Iterable<A>.cross(other: Iterable<B>) = flatMap { a -> other.map { b -> a to b } }
+
+inline fun <C, R, T> Iterable<T>.mapAs(transform: (C) -> R) = map { transform(it as C) }
+
+inline fun <T1, T2> forEachNested(list1: Iterable<T1>, list2: Iterable<T2>, func: (T1, T2)-> Unit) =
+    list1.forEach { e1 ->
+        list2.forEach { e2 ->
+            func(e1, e2)
+        }
+    }
+
+/** Mutating version of _map_. Replace each element of the list with the result of the given transformation. */
+inline fun <reified T> MutableList<T>.replace(transform: (T) -> T) = forEachIndexed { idx, value -> this[idx] = transform(value) }
+
+/** Exchange the two elements of the list with the given indices */
+inline fun <T> MutableList<T>.exchange(idx1: Int, idx2: Int) {
+    val e = this[idx1]
+    this[idx1] = this[idx2]
+    this[idx2] = e
+}
+
+/** Return a random element from the array using the provided random generator */
+inline operator fun <T> Array<T>.get(random: Random) = get(random.nextInt(Int.MAX_VALUE) % size)

src/main/kotlin/mods/betterfoliage/util/Futures.kt

@@ -0,0 +1,15 @@
+package mods.betterfoliage.util
+
+import net.minecraft.client.MinecraftClient
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.CompletionStage
+import java.util.function.Consumer
+import java.util.function.Function
+
+fun completedVoid() = CompletableFuture.completedFuture<Void>(null)!!
+
+fun <T, U> CompletionStage<T>.map(func: (T)->U) = thenApply(Function(func)).toCompletableFuture()!!
+fun <T, U> CompletionStage<T>.mapAsync(func: (T)->U) = thenApplyAsync(Function(func), MinecraftClient.getInstance()).toCompletableFuture()!!
+
+fun <T> CompletionStage<T>.sink(func: (T)->Unit) = thenAccept(Consumer(func)).toCompletableFuture()!!
+fun <T> CompletionStage<T>.sinkAsync(func: (T)->Unit) = thenAcceptAsync(Consumer(func), MinecraftClient.getInstance()).toCompletableFuture()!!

src/main/kotlin/mods/betterfoliage/util/Geometry.kt

@@ -0,0 +1,244 @@
+package mods.betterfoliage.util
+
+import net.minecraft.client.util.math.Vector3f
+import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.Direction
+import net.minecraft.util.math.Direction.Axis.*
+import net.minecraft.util.math.Direction.AxisDirection
+import net.minecraft.util.math.Direction.AxisDirection.*
+import net.minecraft.util.math.Direction.*
+import net.minecraft.util.math.Quaternion
+
+// ================================
+// Axes and directions
+// ================================
+val axes = listOf(X, Y, Z)
+val axisDirs = listOf(POSITIVE, NEGATIVE)
+val allDirections = Direction.values()
+val horizontalDirections = listOf(NORTH, SOUTH, EAST, WEST)
+val allDirOffsets = allDirections.map { Int3(it) }
+val Pair<Direction.Axis, AxisDirection>.face: Direction get() = when(this) {
+    X to POSITIVE -> EAST; X to NEGATIVE -> WEST
+    Y to POSITIVE -> UP; Y to NEGATIVE -> DOWN
+    Z to POSITIVE -> SOUTH; else -> NORTH
+}
+val Direction.perpendiculars: List<Direction> get() =
+    axes.filter { it != this.axis }.cross(axisDirs).map { it.face }
+val Direction.offset: Int3 get() = allDirOffsets[ordinal]
+
+/** Old ForgeDirection rotation matrix yanked from 1.7.10 */
+val ROTATION_MATRIX: Array<IntArray> get() = arrayOf(
+    intArrayOf(0, 1, 4, 5, 3, 2, 6),
+    intArrayOf(0, 1, 5, 4, 2, 3, 6),
+    intArrayOf(5, 4, 2, 3, 0, 1, 6),
+    intArrayOf(4, 5, 2, 3, 1, 0, 6),
+    intArrayOf(2, 3, 1, 0, 4, 5, 6),
+    intArrayOf(3, 2, 0, 1, 4, 5, 6)
+)
+
+// ================================
+// Vectors
+// ================================
+operator fun Direction.times(scale: Double) =
+    Double3(vector.x.toDouble() * scale, vector.y.toDouble() * scale, vector.z.toDouble() * scale)
+val Direction.vec: Double3 get() = Double3(vector.x.toDouble(), vector.y.toDouble(), vector.z.toDouble())
+
+operator fun BlockPos.plus(other: Int3) = BlockPos(x + other.x, y + other.y, z + other.z)
+
+/** 3D vector of [Double]s. Offers both mutable operations, and immutable operations in operator notation. */
+data class Double3(var x: Double, var y: Double, var z: Double) {
+    constructor(x: Float, y: Float, z: Float) : this(x.toDouble(), y.toDouble(), z.toDouble())
+    constructor(dir: Direction) : this(dir.vector.x.toDouble(), dir.vector.y.toDouble(), dir.vector.z.toDouble())
+    companion object {
+        val zero: Double3 get() = Double3(0.0, 0.0, 0.0)
+        fun weight(v1: Double3, weight1: Double, v2: Double3, weight2: Double) =
+            Double3(v1.x * weight1 + v2.x * weight2, v1.y * weight1 + v2.y * weight2, v1.z * weight1 + v2.z * weight2)
+        fun lerp(delta: Double, first: Double3, second: Double3) = first + (second - first) * delta
+    }
+
+    // immutable operations
+    operator fun plus(other: Double3) = Double3(x + other.x, y + other.y, z + other.z)
+    operator fun unaryMinus() = Double3(-x, -y, -z)
+    operator fun minus(other: Double3) = Double3(x - other.x, y - other.y, z - other.z)
+    operator fun times(scale: Double) = Double3(x * scale, y * scale, z * scale)
+    operator fun times(other: Double3) = Double3(x * other.x, y * other.y, z * other.z)
+
+    /** Rotate this vector, and return coordinates in the unrotated frame */
+    fun rotate(rot: Rotation) = Double3(
+        rot.rotatedComponent(EAST, x, y, z),
+        rot.rotatedComponent(UP, x, y, z),
+        rot.rotatedComponent(SOUTH, x, y, z)
+    )
+
+    /** Rotate vector by the given [Quaternion] */
+    fun rotate(quat: Quaternion) =
+        quat.copy()
+            .apply { hamiltonProduct(Quaternion(this@Double3.x.toFloat(), this@Double3.y.toFloat(), this@Double3.z.toFloat(), 0.0F)) }
+            .apply { hamiltonProduct(quat.copy().apply(Quaternion::conjugate)) }
+            .let { Double3(it.x, it.y, it.z) }
+
+    // mutable operations
+    fun setTo(other: Double3): Double3 { x = other.x; y = other.y; z = other.z; return this }
+    fun setTo(x: Double, y: Double, z: Double): Double3 { this.x = x; this.y = y; this.z = z; return this }
+    fun setTo(x: Float, y: Float, z: Float) = setTo(x.toDouble(), y.toDouble(), z.toDouble())
+    fun add(other: Double3): Double3 { x += other.x; y += other.y; z += other.z; return this }
+    fun add(x: Double, y: Double, z: Double): Double3 { this.x += x; this.y += y; this.z += z; return this }
+    fun sub(other: Double3): Double3 { x -= other.x; y -= other.y; z -= other.z; return this }
+    fun sub(x: Double, y: Double, z: Double): Double3 { this.x -= x; this.y -= y; this.z -= z; return this }
+    fun invert(): Double3 { x = -x; y = -y; z = -z; return this }
+    fun mul(scale: Double): Double3 { x *= scale; y *= scale; z *= scale; return this }
+    fun mul(other: Double3): Double3 { x *= other.x; y *= other.y; z *= other.z; return this }
+    fun rotateMut(rot: Rotation): Double3 {
+        val rotX = rot.rotatedComponent(EAST, x, y, z)
+        val rotY = rot.rotatedComponent(UP, x, y, z)
+        val rotZ = rot.rotatedComponent(SOUTH, x, y, z)
+        return setTo(rotX, rotY, rotZ)
+    }
+
+    // misc operations
+    infix fun dot(other: Double3) = x * other.x + y * other.y + z * other.z
+    infix fun cross(o: Double3) = Double3(y * o.z - z * o.y, z * o.x - x * o.z, x * o.y - y * o.x)
+    val length: Double get() = Math.sqrt(x * x + y * y + z * z)
+    val normalize: Double3 get() = (1.0 / length).let { Double3(x * it, y * it, z * it) }
+    val nearestCardinal: Direction get() = nearestAngle(this, allDirections.asIterable()) { it.vec }.first
+    val asVec3f: Vector3f get() = Vector3f(x.toFloat(), y.toFloat(), z.toFloat())
+}
+
+/** 3D vector of [Int]s. Offers both mutable operations, and immutable operations in operator notation. */
+data class Int3(var x: Int, var y: Int, var z: Int) {
+    constructor(dir: Direction) : this(dir.vector.x, dir.vector.y, dir.vector.z)
+    constructor(offset: Pair<Int, Direction>) : this(
+        offset.first * offset.second.vector.x,
+        offset.first * offset.second.vector.y,
+        offset.first * offset.second.vector.z
+    )
+    companion object {
+        val zero = Int3(0, 0, 0)
+    }
+
+    // immutable operations
+    operator fun plus(other: Int3) = Int3(x + other.x, y + other.y, z + other.z)
+    operator fun plus(other: Pair<Int, Direction>) = Int3(
+        x + other.first * other.second.vector.x,
+        y + other.first * other.second.vector.y,
+        z + other.first * other.second.vector.z
+    )
+    operator fun unaryMinus() = Int3(-x, -y, -z)
+    operator fun minus(other: Int3) = Int3(x - other.x, y - other.y, z - other.z)
+    operator fun times(scale: Int) = Int3(x * scale, y * scale, z * scale)
+    operator fun times(other: Int3) = Int3(x * other.x, y * other.y, z * other.z)
+
+    /** Rotate this vector, and return coordinates in the unrotated frame */
+    fun rotate(rot: Rotation) = Int3(
+        rot.rotatedComponent(EAST, x, y, z),
+        rot.rotatedComponent(UP, x, y, z),
+        rot.rotatedComponent(SOUTH, x, y, z)
+    )
+
+    // mutable operations
+    fun setTo(other: Int3): Int3 { x = other.x; y = other.y; z = other.z; return this }
+    fun setTo(x: Int, y: Int, z: Int): Int3 { this.x = x; this.y = y; this.z = z; return this }
+    fun add(other: Int3): Int3 { x += other.x; y += other.y; z += other.z; return this }
+    fun sub(other: Int3): Int3 { x -= other.x; y -= other.y; z -= other.z; return this }
+    fun invert(): Int3 { x = -x; y = -y; z = -z; return this }
+    fun mul(scale: Int): Int3 { x *= scale; y *= scale; z *= scale; return this }
+    fun mul(other: Int3): Int3 { x *= other.x; y *= other.y; z *= other.z; return this }
+    fun rotateMut(rot: Rotation): Int3 {
+        val rotX = rot.rotatedComponent(EAST, x, y, z)
+        val rotY = rot.rotatedComponent(UP, x, y, z)
+        val rotZ = rot.rotatedComponent(SOUTH, x, y, z)
+        return setTo(rotX, rotY, rotZ)
+    }
+}
+
+// ================================
+// Rotation
+// ================================
+val Direction.rotations: Array<Direction> get() =
+    Array(6) { idx -> Direction.values()[ROTATION_MATRIX[ordinal][idx]] }
+fun Direction.rotate(rot: Rotation) = rot.forward[ordinal]
+fun rot(axis: Direction) = Rotation.rot90[axis.ordinal]
+
+/**
+ * Class representing an arbitrary rotation (or combination of rotations) around cardinal axes by 90 degrees.
+ * In effect, a permutation of [ForgeDirection]s.
+ */
+@Suppress("NOTHING_TO_INLINE")
+class Rotation(val forward: Array<Direction>, val reverse: Array<Direction>) {
+    operator fun plus(other: Rotation) = Rotation(
+        Array(6) { idx -> forward[other.forward[idx].ordinal] },
+        Array(6) { idx -> other.reverse[reverse[idx].ordinal] }
+    )
+    operator fun unaryMinus() = Rotation(reverse, forward)
+    operator fun times(num: Int) = when(num % 4) { 1 -> this; 2 -> this + this; 3 -> -this; else -> identity
+    }
+
+    inline fun rotatedComponent(dir: Direction, x: Int, y: Int, z: Int) =
+        when(reverse[dir.ordinal]) { EAST -> x; WEST -> -x; UP -> y; DOWN -> -y; SOUTH -> z; NORTH -> -z; else -> 0 }
+    inline fun rotatedComponent(dir: Direction, x: Double, y: Double, z: Double) =
+        when(reverse[dir.ordinal]) { EAST -> x; WEST -> -x; UP -> y; DOWN -> -y; SOUTH -> z; NORTH -> -z; else -> 0.0 }
+
+    companion object {
+        // Forge rotation matrix is left-hand
+        val rot90 = Array(6) { idx -> Rotation(allDirections[idx].opposite.rotations, allDirections[idx].rotations) }
+        val identity = Rotation(allDirections, allDirections)
+        val fromUp = arrayOf(
+            rot90[EAST.ordinal] * 2,
+            identity,
+            rot90[WEST.ordinal],
+            rot90[EAST.ordinal],
+            rot90[SOUTH.ordinal],
+            rot90[NORTH.ordinal]
+        )
+    }
+}
+
+// ================================
+// Miscellaneous
+// ================================
+
+inline operator fun <reified T> Array<T>.get(face: Direction): T = get(face.ordinal)
+
+data class BoxFace(val top: Direction, val left: Direction) {
+    val bottom get() = top.opposite
+    val right get() = left.opposite
+    val allCorners = listOf(top to left, top to left.opposite, top.opposite to left, top.opposite to left.opposite)
+
+    val tl get() = top to left
+    val tr get() = top to right
+    val bl get() = bottom to left
+    val br get() = bottom to right
+}
+val boxFaces = allDirections.map { when(it) {
+    DOWN -> BoxFace(SOUTH, WEST)
+    UP -> BoxFace(SOUTH, EAST)
+    NORTH -> BoxFace(WEST, UP)
+    SOUTH -> BoxFace(UP, WEST)
+    WEST -> BoxFace(SOUTH, UP)
+    EAST -> BoxFace(SOUTH, DOWN)
+}}.toTypedArray()
+
+/** List of all 12 box edges, represented as a [Pair] of [ForgeDirection]s */
+val boxEdges = allDirections.flatMap { face1 -> allDirections.filter { it.axis > face1.axis }.map { face1 to it } }
+
+/**
+ * Get the closest object to the specified point from a list of objects.
+ *
+ * @param[vertex] the reference point
+ * @param[objs] list of geomertric objects
+ * @param[objPos] lambda to calculate the position of an object
+ * @return [Pair] of (object, distance)
+ */
+fun <T> nearestPosition(vertex: Double3, objs: Iterable<T>, objPos: (T)-> Double3): Pair<T, Double>  =
+        objs.map { it to (objPos(it) - vertex).length }.minBy { it.second }!!
+
+/**
+ * Get the object closest in orientation to the specified vector from a list of objects.
+ *
+ * @param[vector] the reference vector (direction)
+ * @param[objs] list of geomertric objects
+ * @param[objAngle] lambda to calculate the orientation of an object
+ * @return [Pair] of (object, normalized dot product)
+ */
+fun <T> nearestAngle(vector: Double3, objs: Iterable<T>, objAngle: (T)-> Double3): Pair<T, Double> =
+        objs.map { it to objAngle(it).dot(vector) }.maxBy { it.second }!!

src/main/kotlin/mods/betterfoliage/util/Misc.kt

@@ -0,0 +1,74 @@
+@file:Suppress("NOTHING_TO_INLINE")
+package mods.betterfoliage.util
+
+import mods.betterfoliage.BetterFoliage
+import net.minecraft.text.LiteralText
+import net.minecraft.text.Style
+import net.minecraft.util.Formatting
+import net.minecraft.util.Identifier
+import net.minecraft.util.math.BlockPos
+import net.minecraft.world.World
+import java.lang.Math.*
+import kotlin.reflect.KProperty
+
+const val PI2 = 2.0 * PI
+
+/** Strip the given prefix off the start of the string, if present */
+inline fun String.stripStart(str: String, ignoreCase: Boolean = true) = if (startsWith(str, ignoreCase)) substring(str.length) else this
+inline fun String.stripEnd(str: String, ignoreCase: Boolean = true) = if (endsWith(str, ignoreCase)) substring(0, length - str.length) else this
+
+/** Strip the given prefix off the start of the resource path, if present */
+inline fun Identifier.stripStart(str: String) = Identifier(namespace, path.stripStart(str))
+inline fun Identifier.stripEnd(str: String) = Identifier(namespace, path.stripEnd(str))
+
+/**
+ * Property-level delegate backed by a [ThreadLocal].
+ *
+ * @param[init] Lambda to get initial value
+ */
+class ThreadLocalDelegate<T>(init: () -> T) {
+    var tlVal = ThreadLocal.withInitial(init)
+    operator fun getValue(thisRef: Any?, property: KProperty<*>): T = tlVal.get()
+    operator fun setValue(thisRef: Any?, property: KProperty<*>, value: T) { tlVal.set(value) }
+}
+
+/** Call the supplied lambda and return its result, or the given default value if an exception is thrown. */
+fun <T> tryDefault(default: T, work: ()->T) = try { work() } catch (e: Throwable) { default }
+
+/**
+ * Return this [Double] value if it lies between the two limits. If outside, return the
+ * minimum/maximum value correspondingly.
+ */
+fun Double.minmax(minVal: Double, maxVal: Double) = min(max(this, minVal), maxVal)
+
+/**
+ * Return this [Int] value if it lies between the two limits. If outside, return the
+ * minimum/maximum value correspondingly.
+ */
+fun Int.minmax(minVal: Int, maxVal: Int) = min(max(this, minVal), maxVal)
+
+fun nextPowerOf2(x: Int): Int {
+    return 1 shl (if (x == 0) 0 else 32 - Integer.numberOfLeadingZeros(x - 1))
+}
+
+/**
+ * Check if the Chunk containing the given [BlockPos] is loaded.
+ * Works for both [World] and [ChunkCache] (vanilla and OptiFine) instances.
+ */
+//fun IWorldReader.isBlockLoaded(pos: BlockPos) = when {
+//    this is World -> isBlockLoaded(pos, false)
+//    this is RenderChunkCache -> isworld.isBlockLoaded(pos, false)
+//    Refs.OptifineChunkCache.isInstance(this) -> (Refs.CCOFChunkCache.get(this) as ChunkCache).world.isBlockLoaded(pos, false)
+//    else -> false
+//}
+
+@Suppress("LeakingThis")
+abstract class HasLogger {
+    val logger = BetterFoliage.logger(this)
+    val detailLogger = BetterFoliage.detailLogger(this)
+}
+
+fun textComponent(msg: String, color: Formatting = Formatting.GRAY): LiteralText {
+    val style = Style.EMPTY.withColor(color)
+    return LiteralText(msg).apply { this.style = style }
+}

src/main/kotlin/mods/betterfoliage/util/Random.kt

@@ -0,0 +1,23 @@
+package mods.betterfoliage.util
+
+import net.minecraft.util.math.BlockPos
+import java.util.Random
+
+val random = Random(System.nanoTime())
+
+fun randomB() = random.nextBoolean()
+fun randomI(min: Int = 0, max: Int = Int.MAX_VALUE) = min + random.nextInt(max - min)
+fun randomF(min: Float = 0.0f, max: Float = 1.0f) = random.randomF(min, max)
+fun randomD(min: Double = 0.0, max: Double = 1.0) = random.randomD(min, max)
+
+fun Random.randomF(min: Float = 0.0f, max: Float = 1.0f) = nextFloat() * (max - min) + min
+fun Random.randomF(min: Double = 0.0, max: Double = 1.0) = randomF(min.toFloat(), max.toFloat())
+fun Random.randomD(min: Double = 0.0, max: Double = 1.0) = nextDouble() * (max - min) + min
+
+fun semiRandom(x: Int, y: Int, z: Int, seed: Int): Int {
+    var value = (x * x + y * y + z * z + x * y + y * z + z * x + (seed * seed))
+    value = (3 * x * value + 5 * y * value + 7 * z * value + (11 * seed))
+    return value shr 4
+}
+
+//fun BlockPos.semiRandom(seed: Int) = semiRandom(x, y, z, seed)

src/main/kotlin/mods/betterfoliage/util/Reflection.kt

@@ -0,0 +1,114 @@
+package mods.betterfoliage.util
+
+import java.lang.reflect.Field
+import java.lang.reflect.Method
+import net.fabricmc.loader.api.FabricLoader
+import net.fabricmc.mappings.EntryTriple
+import org.apache.logging.log4j.Level
+import org.apache.logging.log4j.LogManager
+import java.lang.Exception
+
+/** Get a Java class with the given name. */
+fun getJavaClass(name: String) = tryDefault(null) { Class.forName(name) }
+
+/** Get the field with the given name and type using reflection. */
+fun <T> Any.reflectField(name: String) = getFieldRecursive(this::class.java, name).let {
+    it.isAccessible = true
+    it.get(this) as T
+}
+
+/** Get the field on the class with the given name.
+ * Does not handle overloads, suitable only for unique field names (like Yarn intermediate names)
+ * */
+fun getFieldRecursive(cls: Class<*>, name: String): Field = try {
+    cls.getDeclaredField(name)
+} catch (e: NoSuchFieldException) {
+    cls.superclass?.let { getFieldRecursive(it, name) } ?: throw IllegalArgumentException(e)
+}
+
+/** Get the method on the class with the given name.
+ * Does not handle overloads, suitable only for unique field names (like Yarn intermediate names)
+ * */
+fun getMethodRecursive(cls: Class<*>, name: String): Method = try {
+    cls.declaredMethods.find { it.name == name } ?: throw NoSuchMethodException()
+} catch (e: NoSuchMethodException) {
+    cls.superclass?.let { getMethodRecursive(it, name) } ?: throw IllegalArgumentException(e)
+}
+
+fun getAllMethods(className: String, methodName: String): List<Method> =
+    tryDefault(null) { Class.forName(className) }?.declaredMethods?.filter { it.name == methodName }
+        ?: emptyList()
+
+interface FieldRef<T> {
+    val field: Field?
+
+    /** Get this field using reflection. */
+    operator fun get(receiver: Any?) = field?.get(receiver) as T?
+
+    /** Get this static field using reflection. */
+    fun getStatic() = get(null)
+
+    /** Get this field using reflection. */
+    fun set(receiver: Any?, obj: Any?) { field?.set(receiver, obj) }
+}
+
+interface MethodRef<T> {
+    val method: Method?
+
+    /** Invoke this method using reflection. */
+    operator fun invoke(receiver: Any, vararg args: Any?) = method?.invoke(receiver, *args) as T
+
+    /** Invoke this static method using reflection. */
+    fun invokeStatic(vararg args: Any) = method?.invoke(null, *args)
+}
+
+const val INTERMEDIARY = "intermediary"
+
+object YarnHelper {
+    val logger = LogManager.getLogger()
+    val resolver = FabricLoader.getInstance().mappingResolver
+
+    fun <T> requiredField(className: String, fieldName: String, descriptor: String) = Field<T>(false, className, fieldName, descriptor)
+    fun <T> requiredMethod(className: String, methodName: String, descriptor: String) = Method<T>(false, className, methodName, descriptor)
+
+    class Field<T>(val optional: Boolean, val className: String, val fieldName: String, descriptor: String) : FieldRef<T> {
+        override val field = FabricLoader.getInstance().mappingResolver.let { resolver ->
+            try {
+                val classMapped = resolver.mapClassName(INTERMEDIARY, className)
+                val fieldMapped = resolver.mapFieldName(INTERMEDIARY, className, fieldName, descriptor)
+                Class.forName(classMapped).let { cls -> getFieldRecursive(cls, fieldMapped).apply { isAccessible = true } }
+            } catch (e: Exception) {
+                logger.log(
+                    if (optional) Level.DEBUG else Level.ERROR,
+                    "Could not resolve field $className.$fieldName ( $descriptor ): ${e.message}"
+                )
+                if (optional) null else throw e
+            }
+        }
+    }
+
+    class Method<T>(val optional: Boolean, val className: String, val methodName: String, descriptor: String) : MethodRef<T> {
+        override val method = FabricLoader.getInstance().mappingResolver.let { resolver ->
+            try {
+                val classMapped = resolver.mapClassName(INTERMEDIARY, className)
+                val methodMapped = resolver.mapMethodName(INTERMEDIARY, className, methodName, descriptor)
+                Class.forName(classMapped).let { cls -> getMethodRecursive(cls, methodMapped).apply { isAccessible = true } }
+            } catch (e: Exception) {
+                logger.log(
+                    if (optional) Level.DEBUG else Level.ERROR,
+                    "Could not resolve field $className.$methodName ( $descriptor ): ${e.message}"
+                )
+                if (optional) null else throw e
+            }
+        }
+    }
+}
+
+interface ReflectionCallable<T> {
+    operator fun invoke(vararg args: Any): T
+}
+inline operator fun <reified T> Any.get(field: FieldRef<T>) = field.get(this)
+inline operator fun <reified T> Any.set(field: FieldRef<T>, value: T) = field.set(this, value)
+inline operator fun <T> Any.get(methodRef: MethodRef<T>) = object : ReflectionCallable<T> {
+    override fun invoke(vararg args: Any) = methodRef.invoke(this@get, *args)
+}

src/main/kotlin/mods/betterfoliage/util/Resources.kt

@@ -0,0 +1,30 @@
+package mods.betterfoliage.util
+
+import net.minecraft.client.MinecraftClient
+import net.minecraft.resource.ReloadableResourceManager
+import net.minecraft.resource.Resource
+import net.minecraft.resource.ResourceManager
+import net.minecraft.util.Identifier
+
+/** Concise getter for the Minecraft resource manager. */
+val resourceManager: ReloadableResourceManager get() =
+    MinecraftClient.getInstance().resourceManager as ReloadableResourceManager
+
+/** Append a string to the [ResourceLocation]'s path. */
+operator fun Identifier.plus(str: String) = Identifier(namespace, path + str)
+
+/** Index operator to get a resource. */
+operator fun ResourceManager.get(domain: String, path: String): Resource? = get(Identifier(domain, path))
+/** Index operator to get a resource. */
+operator fun ResourceManager.get(location: Identifier): Resource? = tryDefault(null) { getResource(location) }
+
+/** Get the lines of a text resource. */
+fun Resource.getLines(): List<String> {
+    val result = arrayListOf<String>()
+    inputStream.bufferedReader().useLines { it.forEach { result.add(it) } }
+    return result
+}
+
+
+
+

src/main/kotlin/mods/betterfoliage/util/Sprites.kt

@@ -0,0 +1,102 @@
+package mods.betterfoliage.util
+
+import mods.betterfoliage.model.Color
+import mods.betterfoliage.model.HSB
+import net.minecraft.client.MinecraftClient
+import net.minecraft.client.texture.NativeImage
+import net.minecraft.client.texture.Sprite
+import net.minecraft.client.texture.SpriteAtlasTexture
+import net.minecraft.resource.Resource
+import net.minecraft.resource.ResourceManager
+import net.minecraft.util.Identifier
+import org.apache.logging.log4j.Level
+import org.apache.logging.log4j.Logger
+import java.awt.image.BufferedImage
+import java.io.ByteArrayOutputStream
+import java.io.IOException
+import javax.imageio.ImageIO
+import kotlin.math.atan2
+
+enum class Atlas(val resourceId: Identifier) {
+    BLOCKS(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE),
+    PARTICLES(SpriteAtlasTexture.PARTICLE_ATLAS_TEXTURE);
+
+    /** Get the fully-qualified resource name for sprites belonging to this atlas */
+    fun file(resource: Identifier) = Identifier(resource.namespace, "textures/${resource.path}.png")
+
+    /** Reference to the atlas itself */
+    private val atlas: SpriteAtlasTexture get() = MinecraftClient.getInstance().textureManager.getTexture(resourceId) as SpriteAtlasTexture
+
+    /** Get a sprite from this atlas */
+    operator fun get(location: Identifier) = atlas.getSprite(location)
+}
+
+operator fun SpriteAtlasTexture.get(res: Identifier): Sprite? = getSprite(res)
+operator fun SpriteAtlasTexture.get(name: String): Sprite? = getSprite(Identifier(name))
+
+fun ResourceManager.loadSprite(id: Identifier) = this.get(id)?.loadImage() ?: throw IOException("Cannot load resource $id")
+
+fun Resource.loadImage(): BufferedImage? = ImageIO.read(this.inputStream)
+
+/** Index operator to get the RGB value of a pixel. */
+operator fun BufferedImage.get(x: Int, y: Int) = this.getRGB(x, y)
+/** Index operator to set the RGB value of a pixel. */
+operator fun BufferedImage.set(x: Int, y: Int, value: Int) = this.setRGB(x, y, value)
+
+val BufferedImage.bytes: ByteArray get() =
+    ByteArrayOutputStream().let { ImageIO.write(this, "PNG", it); it.toByteArray() }
+
+/**
+ * Calculate the average color of an image.
+ *
+ * Only non-transparent pixels are considered. Averages are taken in the HSB color space (note: Hue is a circular average),
+ * and the result transformed back to the RGB color space.
+ */
+val Sprite_images = YarnHelper.requiredField<Array<NativeImage>>("net.minecraft.class_1058", "field_5262", "[Lnet/minecraft/class_1011;")
+
+val Sprite.averageColor: HSB get() {
+    var numOpaque = 0
+    var sumHueX = 0.0
+    var sumHueY = 0.0
+    var sumSaturation = 0.0f
+    var sumBrightness = 0.0f
+    for (x in 0 until width)
+        for (y in 0 until height) {
+            val pixel = this[Sprite_images]!![0].getPixelColor(x, y)
+            val alpha = (pixel shr 24) and 255
+            val hsb = HSB.fromColor(pixel)
+            if (alpha == 255) {
+                numOpaque++
+                sumHueX += Math.cos((hsb.hue.toDouble() - 0.5) * PI2)
+                sumHueY += Math.sin((hsb.hue.toDouble() - 0.5) * PI2)
+                sumSaturation += hsb.saturation
+                sumBrightness += hsb.brightness
+            }
+        }
+
+    // circular average - transform sum vector to polar angle
+    val avgHue = (atan2(sumHueY, sumHueX) / PI2 + 0.5).toFloat()
+    return HSB(avgHue, sumSaturation / numOpaque.toFloat(), sumBrightness / numOpaque.toFloat())
+}
+
+/** Weighted blend of 2 packed RGB colors */
+fun blendRGB(rgb1: Int, rgb2: Int, weight1: Int, weight2: Int): Int {
+    val r = (((rgb1 shr 16) and 255) * weight1 + ((rgb2 shr 16) and 255) * weight2) / (weight1 + weight2)
+    val g = (((rgb1 shr 8) and 255) * weight1 + ((rgb2 shr 8) and 255) * weight2) / (weight1 + weight2)
+    val b = ((rgb1 and 255) * weight1 + (rgb2 and 255) * weight2) / (weight1 + weight2)
+    val a = (rgb1 shr 24) and 255
+    val result = ((a shl 24) or (r shl 16) or (g shl 8) or b)
+    return result
+}
+
+fun logColorOverride(logger: Logger, threshold: Double, hsb: HSB) {
+    return if (hsb.saturation >= threshold) {
+        logger.log(Level.INFO, "         brightness ${hsb.brightness}")
+        logger.log(Level.INFO, "         saturation ${hsb.saturation} >= ${threshold}, will use texture color")
+    } else {
+        logger.log(Level.INFO, "         saturation ${hsb.saturation} < ${threshold}, will use block color")
+    }
+}
+
+fun HSB.colorOverride(threshold: Double) =
+    if (saturation < threshold) null else copy(brightness = (brightness * 2.0f).coerceAtMost(0.9f)).asColor.let { Color(it) }

src/main/kotlin/mods/betterfoliage/util/Winding.kt

@@ -0,0 +1,102 @@
+package mods.betterfoliage.util
+
+import net.minecraft.util.math.Direction
+import net.minecraft.util.math.Direction.*
+
+fun Pair<Direction, Direction>.ccwWinding() = arrayOf(first to second, first.opposite to second, first.opposite to second.opposite, first to second.opposite)
+
+typealias BoxCorner = Triple<Direction, Direction, Direction>
+fun BoxCorner.equalsUnordered(other: BoxCorner) = contains(other.first) && contains(other.second) && contains(other.third)
+
+fun BoxCorner.contains(dir: Direction) = first == dir || second == dir || third == dir
+
+fun Array<BoxCorner>.findIdx(corner: BoxCorner): Int? {
+    forEachIndexed { idx, test -> if (test.contains(corner.first) && test.contains(corner.second) && test.contains(corner.third)) return idx }
+    return null
+}
+fun Array<BoxCorner>.findIdx(predicate: (BoxCorner)->Boolean): Int? {
+    forEachIndexed { idx, test -> if (predicate(test)) return idx }
+    return null
+}
+
+/**
+ *  Decribes the winding order for vanilla AO data.
+ *   1st index: light face ordinal
+ *   2nd index: index in AO data array
+ *   value: pair of [Direction]s that along with light face fully describe the corner
+ *          the AO data belongs to
+ */
+val aoWinding = allDirections.map { when(it) {
+    DOWN -> (SOUTH to WEST).ccwWinding()
+    UP -> (SOUTH to EAST).ccwWinding()
+    NORTH -> (WEST to UP).ccwWinding()
+    SOUTH -> (UP to WEST).ccwWinding()
+    WEST -> (SOUTH to UP).ccwWinding()
+    EAST -> (SOUTH to DOWN).ccwWinding()
+} }.toTypedArray()
+
+/**
+ * Indexing for undirected box corners (component order does not matter).
+ * Array contains [Direction] triplets fully defining the corner.
+ */
+val cornersUndir = Array(8) { idx -> Triple(
+    if (idx and 1 != 0) EAST else WEST,
+    if (idx and 2 != 0) UP else DOWN,
+    if (idx and 4 != 0) SOUTH else NORTH
+) }
+
+/**
+ * Reverse lookup for [cornersUndir]. Index 3 times with the corner's cardinal directions.
+ *  A null value indicates an invalid corner (multiple indexing along the same axis)
+ */
+val cornersUndirIdx = Array(6) { idx1 -> Array(6) { idx2 -> Array(6) { idx3 ->
+    cornersUndir.findIdx(BoxCorner(byId(idx1), byId(idx2), byId(idx3)))
+} } }
+
+/**
+ * Get corner index for vertex coordinates
+ */
+fun getCornerUndir(x: Float, y: Float, z: Float): Int {
+    var result = 0
+    if (x > 0.5f) result += 1
+    if (y > 0.5f) result += 2
+    if (z > 0.5f) result += 4
+    return result
+}
+
+/**
+ * Indexing scheme for directed box corners.
+ * The first direction - the face - matters, the other two are unordered.
+ * 1:1 correspondence with possible AO values.
+ * Array contains triplets defining the corner fully.
+ */
+val cornersDir = Array(24) { idx ->
+    val faceIdx = idx / 4
+    val windingIdx = idx % 4
+    val winding = aoWinding[faceIdx][windingIdx]
+    BoxCorner(byId(faceIdx), winding.first, winding.second)
+}
+
+/**
+ * Reverse lookup for [cornersDir].
+ *   1st index: primary face
+ *   2nd index: undirected corner index.
+ *   value: directed corner index
+ *   A null value indicates an invalid corner (primary face not shared by corner).
+ */
+val cornerDirFromUndir = Array(6) { faceIdx -> Array(8) { undirIdx ->
+    val face = byId(faceIdx); val corner = cornersUndir[undirIdx]
+    if (!corner.contains(face)) null else cornersDir.findIdx { it.first == face && it.equalsUnordered(corner) }
+} }
+
+/**
+ * Reverse lookup for [cornersDir].
+ *   1st index: primary face
+ *   2nd index: AO value index on the face.
+ *   value: directed corner index
+ */
+val cornerDirFromAo = Array(6) { faceIdx -> IntArray(4) { aoIdx ->
+    val face = byId(faceIdx); val corner = aoWinding[face.ordinal][aoIdx].let { Triple(face, it.first, it.second) }
+    cornersDir.findIdx { it.first == face && it.equalsUnordered(corner) }!!
+} }
+

src/main/kotlin/net/fabricmc/fabric/impl/client/indigo/renderer/render/ModifiedTerrainMeshConsumer.kt

@@ -0,0 +1,114 @@
+package net.fabricmc.fabric.impl.client.indigo.renderer.render
+
+import mods.betterfoliage.render.lighting.AbstractQuadRenderer_aoCalc
+import mods.betterfoliage.render.lighting.AbstractQuadRenderer_blockInfo2
+import mods.betterfoliage.render.lighting.AbstractQuadRenderer_bufferFunc2
+import mods.betterfoliage.render.lighting.AbstractQuadRenderer_transform
+import mods.betterfoliage.render.lighting.CustomLighting
+import mods.betterfoliage.render.lighting.CustomLightingMeshConsumer
+import mods.betterfoliage.util.YarnHelper
+import mods.betterfoliage.util.cornerDirFromAo
+import mods.betterfoliage.util.get
+import mods.betterfoliage.util.offset
+import mods.betterfoliage.util.plus
+import net.fabricmc.fabric.impl.client.indigo.renderer.mesh.MutableQuadViewImpl
+import net.minecraft.client.render.RenderLayer
+import net.minecraft.client.render.WorldRenderer
+import net.minecraft.util.math.Direction
+
+val AoCalculator_computeFace = YarnHelper.requiredMethod<Any>(
+    "net.fabricmc.fabric.impl.client.indigo.renderer.aocalc.AoCalculator", "computeFace",
+    "(Lnet/minecraft/util/math/Direction;ZZ)Lnet/fabricmc/fabric/impl/client/indigo/renderer/aocalc/AoFaceData;"
+)
+val AoFaceData_toArray = YarnHelper.requiredMethod<Unit>(
+    "net.fabricmc.fabric.impl.client.indigo.renderer.aocalc.AoFaceData", "toArray",
+    "([F[I[I)V"
+)
+
+open class ModifiedTerrainMeshConsumer(
+    val original: AbstractMeshConsumer
+) : AbstractMeshConsumer(
+    original[AbstractQuadRenderer_blockInfo2],
+    original[AbstractQuadRenderer_bufferFunc2],
+    original[AbstractQuadRenderer_aoCalc],
+    original[AbstractQuadRenderer_transform]
+), CustomLightingMeshConsumer {
+    override fun matrix() = original.matrix()
+    override fun normalMatrix() = original.normalMatrix()
+    override fun overlay() = original.overlay()
+
+    /** Custom lighting to use */
+    var lighter: CustomLighting? = null
+
+    /** Cache validity for AO/light values */
+    protected val aoValid = Array(6) { false }
+    override val aoFull = FloatArray(24)
+    override val lightFull = IntArray(24)
+
+    /** Cached block brightness values for all neighbors */
+    val brNeighbor = IntArray(6)
+
+    /** Cache validity for block brightness values (neighbors + self) */
+    val brValid = Array(7) { false }
+
+    override var brSelf: Int = -1
+        get() {
+            if (brValid[6]) return field else {
+                field = WorldRenderer.getLightmapCoordinates(blockInfo.blockView, blockInfo.blockPos)
+                brValid[6] = true
+                return field
+            }
+        }
+        protected set
+
+    override fun brNeighbor(dir: Direction): Int {
+        if (brValid[dir.ordinal]) return brNeighbor[dir.ordinal]
+        WorldRenderer.getLightmapCoordinates(blockInfo.blockView, blockInfo.blockPos + dir.offset)
+            .let { brNeighbor[dir.ordinal] = it; brValid[dir.ordinal] = true; return it }
+    }
+
+    override fun clearLighting() {
+        for (idx in 0 until 6) {
+            aoValid[idx] = false
+            brValid[idx] = false
+        }
+        brValid[6] = false
+    }
+
+    override fun fillAoData(lightFace: Direction) {
+        if (!aoValid[lightFace.ordinal]) {
+            AoFaceData_toArray.invoke(
+                AoCalculator_computeFace.invoke(aoCalc, lightFace, true, false),
+                aoFull,
+                lightFull,
+                cornerDirFromAo[lightFace.ordinal]
+            )
+            aoValid[lightFace.ordinal] = true
+        }
+    }
+
+    override fun setLighting(vIdx: Int, ao: Float, light: Int) {
+        aoCalc.ao[vIdx] = ao
+        aoCalc.light[vIdx] = light
+    }
+
+    override fun tesselateFlat(q: MutableQuadViewImpl, renderLayer: RenderLayer, blockColorIndex: Int) {
+        lighter?.applyLighting(this, q, flat = true, emissive = false)
+        super.tesselateSmooth(q, renderLayer, blockColorIndex)
+    }
+
+    override fun tesselateFlatEmissive(q: MutableQuadViewImpl, renderLayer: RenderLayer, blockColorIndex: Int) {
+        lighter?.applyLighting(this, q, flat = true, emissive = true)
+        super.tesselateSmoothEmissive(q, renderLayer, blockColorIndex)
+    }
+
+    override fun tesselateSmooth(q: MutableQuadViewImpl, renderLayer: RenderLayer, blockColorIndex: Int) {
+        lighter?.applyLighting(this, q, flat = false, emissive = false)
+        super.tesselateSmooth(q, renderLayer, blockColorIndex)
+    }
+
+    override fun tesselateSmoothEmissive(q: MutableQuadViewImpl, renderLayer: RenderLayer, blockColorIndex: Int) {
+        lighter?.applyLighting(this, q, flat = false, emissive = true)
+        super.tesselateSmoothEmissive(q, renderLayer, blockColorIndex)
+    }
+}

src/main/resources/META-INF/MANIFEST.MF

@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Specification-Title: BetterFoliage
+Implementation-Title: BetterFoliage
+Specification-Vendor: octarine-noise
+Implementation-Vendor: octarine-noise
+MixinConnector: mods.betterfoliage.MixinConnector

src/main/resources/assets/betterfoliage/cactus_default.cfg

@@ -0,0 +1,3 @@
+// Vanilla
+//net.minecraft.block.CactusBlock
+net.minecraft.class_2266

src/main/resources/assets/betterfoliage/crop_default.cfg

@@ -0,0 +1,16 @@
+// Vanilla
+//net.minecraft.block.FernBlock
+net.minecraft.class_2526
+//net.minecraft.block.CropBlock
+net.minecraft.class_2302
+
+//-net.minecraft.block.TallPlantBlock
+-net.minecraft.class_2320
+
+// Biomes O'Plenty
+biomesoplenty.common.block.BlockBOPFlower
+biomesoplenty.common.block.BlockBOPTurnip
+biomesoplenty.common.block.BlockBOPPlant
+
+// Tinkers' Construct
+tconstruct.blocks.slime.SlimeTallGrass

src/main/resources/assets/betterfoliage/dirt_default.cfg

@@ -0,0 +1,2 @@
+// Vanilla
+net.minecraft.block.DirtBlock

src/main/resources/assets/betterfoliage/grass_blocks_default.cfg

@@ -0,0 +1,3 @@
+// Vanilla
+//net.minecraft.block.GrassBlock
+net.minecraft.class_2372

src/main/resources/assets/betterfoliage/grass_models_default.cfg

@@ -0,0 +1,3 @@
+// Vanilla
+block/grass_block,top
+block/cube_bottom_top,top

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

@@ -0,0 +1,175 @@
+{
+    "key.betterfoliage.gui": "Open Settings",
+
+    "betterfoliage.title": "Better Foliage configuration",
+
+    "betterfoliage.global.enabled": "Enable Mod",
+    "betterfoliage.global.enabled.tooltip": "If set to false, BetterFoliage will not render anything",
+    "betterfoliage.global.nVidia": "nVidia GPU",
+    "betterfoliage.global.nVidia.tooltip": "Specify whether you have an nVidia GPU",
+
+    "betterfoliage.enabled": "Enable",
+    "betterfoliage.enabled.tooltip": "Is this feature enabled?",
+    "betterfoliage.hOffset": "Horizontal offset",
+    "betterfoliage.hOffset.tooltip": "The distance this element is shifted horizontally, in blocks",
+    "betterfoliage.vOffset": "Vertical offset",
+    "betterfoliage.vOffset.tooltip": "The distance this element is shifted vertically, in blocks",
+    "betterfoliage.size": "Size",
+    "betterfoliage.size.tooltip": "Size of this element",
+    "betterfoliage.heightMin": "Minimum height",
+    "betterfoliage.heightMin.tooltip": "Minimum height of element",
+    "betterfoliage.heightMax": "Maximum height",
+    "betterfoliage.heightMax.tooltip": "Maximum height of element",
+    "betterfoliage.population": "Population",
+    "betterfoliage.population.tooltip": "Chance (N in 64) that an eligible block will have this feature",
+    "betterfoliage.shaderWind": "Shader wind effects",
+    "betterfoliage.shaderWind.tooltip": "Apply wind effects from ShaderMod shaders to this element?",
+    "betterfoliage.distance": "Distance limit",
+    "betterfoliage.distance.tooltip": "Maximum distance from player at which to render this feature",
+    "betterfoliage.saturationThreshold": "Saturation threshold",
+    "betterfoliage.saturationThreshold.tooltip": "Color saturation cutoff between \"colorless\" blocks (using biome color) and \"colorful\" blocks (using their own specific color)",
+
+    "betterfoliage.rendererror": "§a[BetterFoliage]§f Error rendering block %s at position %s",
+
+    "betterfoliage.shaders": "Shader configuration",
+    "betterfoliage.shaders.tooltip": "Configure integration with shaders",
+    "betterfoliage.shaders.leavesId": "Leaves ID",
+    "betterfoliage.shaders.leavesId.tooltip": "Block ID reported to shader programs for all kinds of leaves. If your shader uses a §6block.properties§e file, you'll probably need to change this to match the shader's mappings.",
+    "betterfoliage.shaders.grassId": "Grass ID",
+    "betterfoliage.shaders.grassId.tooltip": "Block ID reported to shader programs for all grasses and crops. If your shader uses a §6block.properties§e file, you'll probably need to change this to match the shader's mappings.",
+
+    "betterfoliage.leaves": "Extra Leaves",
+    "betterfoliage.leaves.tooltip": "Extra round leaves on leaf blocks",
+    "betterfoliage.leaves.dense": "Dense mode",
+    "betterfoliage.leaves.dense.tooltip": "Dense mode has more round leaves",
+    "betterfoliage.leaves.snowEnabled": "Enable snow",
+    "betterfoliage.leaves.snowEnabled.tooltip": "Enable snow on extra leaves?",
+    "betterfoliage.leaves.hideInternal": "Hide internal leaves",
+    "betterfoliage.leaves.hideInternal.tooltip": "Skip rendering extra leaves if leaf block is completely surrounded by other leaves or solid blocks",
+
+    "betterfoliage.shortGrass": "Short Grass & Mycelium",
+    "betterfoliage.shortGrass.tooltip": "Tufts of grass/mycelium on top of appropriate blocks",
+    "betterfoliage.shortGrass.useGenerated": "Use generated texture for grass",
+    "betterfoliage.shortGrass.useGenerated.tooltip": "Generated texture is made by slicing the tallgrass texture from the active resource pack in half",
+    "betterfoliage.shortGrass.myceliumEnabled": "Enable Mycelium",
+    "betterfoliage.shortGrass.myceliumEnabled.tooltip": "Is this feature enabled for mycelium blocks?",
+    "betterfoliage.shortGrass.grassEnabled": "Enable Grass",
+    "betterfoliage.shortGrass.grassEnabled.tooltip": "Is this feature enabled for grass blocks?",
+    "betterfoliage.shortGrass.snowEnabled": "Enable under snow",
+    "betterfoliage.shortGrass.snowEnabled.tooltip": "Enable on snowed grass blocks?",
+
+    "betterfoliage.connectedGrass.snowEnabled": "Enable under snow",
+    "betterfoliage.connectedGrass.snowEnabled.tooltip": "Enable on snowed grass blocks?",
+
+    "betterfoliage.hangingGrass": "Hanging Grass",
+    "betterfoliage.hangingGrass.tooltip": "Grass tufts hanging down from the top edges of grass blocks",
+    "betterfoliage.hangingGrass.separation": "Separation",
+    "betterfoliage.hangingGrass.separation.tooltip": "How much the hanging grass stands out from the block",
+
+    "betterfoliage.cactus": "Better Cactus",
+    "betterfoliage.cactus.tooltip": "Enhance cactus with extra bits and smooth shading",
+    "betterfoliage.cactus.sizeVariation": "Size variation",
+    "betterfoliage.cactus.sizeVariation.tooltip": "Amount of random variation on cactus size",
+
+    "betterfoliage.lilypad": "Better Lilypad",
+    "betterfoliage.lilypad.tooltip": "Enhance lilypad with roots and occasional flowers",
+    "betterfoliage.lilypad.flowerChance": "Flower chance",
+    "betterfoliage.lilypad.flowerChance.tooltip": "Chance (N in 64) of a lilypad having a flower on it",
+
+    "betterfoliage.reed": "Reeds",
+    "betterfoliage.reed.tooltip": "Reeds on dirt blocks in shallow water",
+    "betterfoliage.reed.biomes": "Biome List",
+    "betterfoliage.reed.biomes.tooltip": "Configure which biomes reeds are allowed to appear in",
+    "betterfoliage.reed.biomes.tooltip.element": "Should reeds appear in the %s biome?",
+
+    "betterfoliage.algae": "Algae",
+    "betterfoliage.algae.tooltip": "Algae on dirt blocks in deep water",
+    "betterfoliage.algae.biomes": "Biome List",
+    "betterfoliage.algae.biomes.tooltip": "Configure which biomes algae is allowed to appear in",
+    "betterfoliage.algae.biomes.tooltip.element": "Should algae appear in the %s biome?",
+
+    "betterfoliage.coral": "Coral",
+    "betterfoliage.coral.tooltip": "Coral on sand blocks in deep water",
+    "betterfoliage.coral.size": "Coral size",
+    "betterfoliage.coral.size.tooltip": "Size of coral bits sticking out",
+    "betterfoliage.coral.crustSize": "Crust size",
+    "betterfoliage.coral.crustSize.tooltip": "Size of the flat coral part",
+    "betterfoliage.coral.chance": "Coral chance",
+    "betterfoliage.coral.chance.tooltip": "Chance (N in 64) of a specific face of the block to show coral",
+    "betterfoliage.coral.biomes": "Biome List",
+    "betterfoliage.coral.biomes.tooltip": "Configure which biomes coral is allowed to appear in",
+    "betterfoliage.coral.biomes.tooltip.element": "Should coral appear in the %s biome?",
+    "betterfoliage.coral.shallowWater": "Shallow water coral",
+    "betterfoliage.coral.shallowWater.tooltip": "Should coral appear in 1 block deep water?",
+
+    "betterfoliage.netherrack": "Netherrack Vines",
+    "betterfoliage.netherrack.tooltip": "Hanging Vines under netherrack",
+
+    "betterfoliage.fallingLeaves": "Falling leaves",
+    "betterfoliage.fallingLeaves.tooltip": "Falling leaf particle FX emitted from the bottom of leaf blocks",
+    "betterfoliage.fallingLeaves.speed": "Particle speed",
+    "betterfoliage.fallingLeaves.speed.tooltip": "Overall particle speed",
+    "betterfoliage.fallingLeaves.windStrength": "Wind strength",
+    "betterfoliage.fallingLeaves.windStrength.tooltip": "Magnitude of wind effects in good weather (spread of normal distribution centered on 0)",
+    "betterfoliage.fallingLeaves.stormStrength": "Storm strength",
+    "betterfoliage.fallingLeaves.stormStrength.tooltip": "Additional magnitude of wind effects in rainy weather (spread of normal distribution centered on 0)",
+    "betterfoliage.fallingLeaves.size": "Particle size",
+    "betterfoliage.fallingLeaves.chance": "Particle chance",
+    "betterfoliage.fallingLeaves.chance.tooltip": "Chance of each random render tick hitting a leaf block to spawn a particle",
+    "betterfoliage.fallingLeaves.perturb": "Perturbation",
+    "betterfoliage.fallingLeaves.perturb.tooltip": "Magnitude of perturbation effect. Adds a corkscrew-like motion to the particle synchronized to its rotation",
+    "betterfoliage.fallingLeaves.lifetime": "Maximum lifetime",
+    "betterfoliage.fallingLeaves.lifetime.tooltip": "Maximum lifetime of particle in seconds. Minimum lifetime is 60%% of this value",
+    "betterfoliage.fallingLeaves.opacityHack": "Opaque particles",
+    "betterfoliage.fallingLeaves.opacityHack.tooltip": "Stop transparent blocks obscuring particles even when particle is in front. WARNING: may cause glitches.",
+
+    "betterfoliage.risingSoul": "Rising souls",
+    "betterfoliage.risingSoul.tooltip": "Rising soul particle FX emitted from the top of soulsand blocks",
+    "betterfoliage.risingSoul.chance": "Particle chance",
+    "betterfoliage.risingSoul.chance.tooltip": "Chance of each random render tick hitting a soulsand block to spawn a particle",
+    "betterfoliage.risingSoul.speed": "Particle speed",
+    "betterfoliage.risingSoul.speed.tooltip": "Vertical speed of soul particles",
+    "betterfoliage.risingSoul.perturb": "Perturbation",
+    "betterfoliage.risingSoul.perturb.tooltip": "Magnitude of perturbation effect. Adds a corkscrew-like motion to the particle",
+    "betterfoliage.risingSoul.headSize": "Soul size",
+    "betterfoliage.risingSoul.headSize.tooltip": "Size of the soul particle",
+    "betterfoliage.risingSoul.trailSize": "Trail size",
+    "betterfoliage.risingSoul.trailSize.tooltip": "Initial size of the particle trail",
+    "betterfoliage.risingSoul.opacity": "Opacity",
+    "betterfoliage.risingSoul.opacity.tooltip": "Opacity of the particle effect",
+    "betterfoliage.risingSoul.sizeDecay": "Size decay",
+    "betterfoliage.risingSoul.sizeDecay.tooltip": "Trail particle size relative to its size in the previous tick",
+    "betterfoliage.risingSoul.opacityDecay": "Opacity decay",
+    "betterfoliage.risingSoul.opacityDecay.tooltip": "Trail particle opacity relative to its opacity in the previous tick",
+    "betterfoliage.risingSoul.lifetime": "Maximum lifetime",
+    "betterfoliage.risingSoul.lifetime.tooltip": "Maximum lifetime of particle effect in seconds. Minimum lifetime is 60%% of this value",
+    "betterfoliage.risingSoul.trailLength": "Trail length",
+    "betterfoliage.risingSoul.trailLength.tooltip": "Number of previous positions the particle remembers in ticks",
+    "betterfoliage.risingSoul.trailDensity": "Trail density",
+    "betterfoliage.risingSoul.trailDensity.tooltip": "Render every Nth previous position in the particle trail",
+
+    "betterfoliage.connectedGrass": "Connected grass textures",
+    "betterfoliage.connectedGrass.enabled": "Enable",
+    "betterfoliage.connectedGrass.enabled.tooltip": "If there is a grass block on top of a dirt block: draw grass top texture on all grass block sides,",
+
+    "betterfoliage.roundLogs": "Round Logs",
+    "betterfoliage.roundLogs.tooltip": "Connect round blocks to solid full blocks?",
+    "betterfoliage.roundLogs.connectSolids": "Connect to solid",
+    "betterfoliage.roundLogs.connectSolids.tooltip": "Connect round blocks to solid full blocks?",
+    "betterfoliage.roundLogs.connectPerpendicular": "Connect to perpendicular logs",
+    "betterfoliage.roundLogs.connectPerpendicular.tooltip": "Connect round logs to perpendicular logs along its axis?",
+    "betterfoliage.roundLogs.lenientConnect": "Lenient rounding",
+    "betterfoliage.roundLogs.lenientConnect.tooltip": "Connect parallel round logs in an L-shape too, not just 2x2",
+    "betterfoliage.roundLogs.connectGrass": "Connect Grass",
+    "betterfoliage.roundLogs.connectGrass.tooltip": "Render grass block under trees instead of dirt if there is grass nearby",
+    "betterfoliage.roundLogs.radiusSmall": "Chamfer radius",
+    "betterfoliage.roundLogs.radiusSmall.tooltip": "How much to chop off from the log corner",
+    "betterfoliage.roundLogs.radiusLarge": "Connected chamfer radius",
+    "betterfoliage.roundLogs.radiusLarge.tooltip": "How much to chop off from the outer corner of connected logs",
+    "betterfoliage.roundLogs.dimming": "Dimming",
+    "betterfoliage.roundLogs.dimming.tooltip": "Amount to darken obscured log faces",
+    "betterfoliage.roundLogs.zProtection": "Z-Protection",
+    "betterfoliage.roundLogs.zProtection.tooltip": "Amount to scale parallel log connection bits to stop Z-fighting (flickering). Try to set it as high as possible without having glitches.",
+    "betterfoliage.roundLogs.defaultY": "Default to vertical",
+    "betterfoliage.roundLogs.defaultY.tooltip": "If true, log blocks where the orientation cannot be determined will be rendered as vertical. Otherwise, they will be rendered as cube blocks."
+}

src/main/resources/assets/betterfoliage/lang/ko_kr.json

@@ -0,0 +1,155 @@
+{
+    "key.betterfoliage.gui": "설정",
+
+    "betterfoliage.global.enabled": "모드 활성화",
+    "betterfoliage.global.enabled.tooltip": "비활성화 할 경우, 환경강화모드 렌더링이 보이지 않습니다.",
+
+    "betterfoliage.enabled": "활성화",
+    "betterfoliage.enabled.tooltip": "이 기능이 활성화 되어 있습니까?",
+    "betterfoliage.hOffset": "수평(가로) 상쇄시키다",
+    "betterfoliage.hOffset.tooltip": "이 성분이 블럭 수평으로 이동된다.",
+    "betterfoliage.vOffset": "수직(세로) 상쇄시키다",
+    "betterfoliage.vOffset.tooltip": "이 성분이 블럭 수직으로 이동된다.",
+    "betterfoliage.size": "사이즈(크기)",
+    "betterfoliage.size.tooltip": "사이즈(크기)의 최소",
+    "betterfoliage.heightMin": "최소한 높이",
+    "betterfoliage.heightMin.tooltip": "높이 최소한의 최소",
+    "betterfoliage.heightMax": "최대한 높이",
+    "betterfoliage.heightMax.tooltip": "높이 최대한의 최소",
+    "betterfoliage.population": "주민",
+    "betterfoliage.population.tooltip": "자격을 갖춘 블럭의 기능 확률(N 분의 64)",
+    "betterfoliage.shaderWind": "쉐이더 바람 효과",
+    "betterfoliage.shaderWind.tooltip": "바람효과를 쉐이더에 적용시키겠습니까?",
+    "betterfoliage.distance": "거리 제한",
+    "betterfoliage.distance.tooltip": "이 기능을 렌더링하는 플레이어의 최대거리",
+    "betterfoliage.saturationThreshold": "채도 임계값",
+    "betterfoliage.saturationThreshold.tooltip": "(특정 색상을 사용하여)\"무채색\"블록과 (바이옴 색을 사용하여)\"화려한\"블록 사이의 채도 차단",
+
+    "betterfoliage.leaves": "잎 추가",
+    "betterfoliage.leaves.tooltip": "둥글게 나뭇잎을 추가시켜줍니다.",
+    "betterfoliage.leaves.dense": "조밀한 모드",
+    "betterfoliage.leaves.dense.tooltip": "조밀한 모드는 둥근 나뭇잎을 더 추가시켜줍니다.",
+
+    "betterfoliage.shortGrass": "이쁜 잔디 & 균사체",
+    "betterfoliage.shortGrass.tooltip": "블록 상단에 잔디 / 균사체",
+    "betterfoliage.shortGrass.useGenerated": "잔디텍스쳐를 활성화 합니다.",
+    "betterfoliage.shortGrass.useGenerated.tooltip": "소스팩의 일부분에 활성화 되어있는 큰잔디 텍스쳐를 생성시킵니다.",
+    "betterfoliage.shortGrass.myceliumEnabled": "균사체 활성화",
+    "betterfoliage.shortGrass.myceliumEnabled.tooltip": "균사체 블록에 있는 기능을 활성화 시키겠습니까?",
+    "betterfoliage.shortGrass.grassEnabled": "잔디 활성화",
+    "betterfoliage.shortGrass.grassEnabled.tooltip": "잔디 블록에 있는 기능을 활성화 시키겠습니까?",
+    "betterfoliage.shortGrass.snowEnabled": "눈 활성화",
+    "betterfoliage.shortGrass.snowEnabled.tooltip": "잔디 블록위에 있는 눈을 활성화 시키겠습니까?",
+
+    "betterfoliage.hangingGrass": "매달려있는 잔디",
+    "betterfoliage.hangingGrass.tooltip": "잔디 블록 상단 가장자리에서 아래로 매달려 있는 잔디 다발",
+    "betterfoliage.hangingGrass.separation": "분리",
+    "betterfoliage.hangingGrass.separation.tooltip": "잔디블럭에 매달려있는 잔디의 양 ",
+
+    "betterfoliage.cactus": "선인장",
+    "betterfoliage.cactus.tooltip": "선인장의 비트 수와 부드러운 그림자를 추가",
+    "betterfoliage.cactus.sizeVariation": "사이즈 변화",
+    "betterfoliage.cactus.sizeVariation.tooltip": "선인장의 사이즈 크기를 무작위 변화 시킵니다.",
+
+    "betterfoliage.lilypad": "연꽃잎",
+    "betterfoliage.lilypad.tooltip": "연꽃의 뿌리와 약간의 꽃 추가",
+    "betterfoliage.lilypad.flowerChance": "꽃 확률",
+    "betterfoliage.lilypad.flowerChance.tooltip": "연꽃 위에 있는 꽃 확률(N 분의 64)",
+
+    "betterfoliage.reed": "갈대",
+    "betterfoliage.reed.tooltip": "물 속에서 흙블럭 위에 있는 갈대",
+    "betterfoliage.reed.biomes": "바이옴 리스트",
+    "betterfoliage.reed.biomes.tooltip": "갈대를 바이옴에 따라 표시",
+    "betterfoliage.reed.biomes.tooltip.element": "갈대를 %s 바이옴에 따라 나타내시겠습니까? ",
+
+    "betterfoliage.algae": "해조류",
+    "betterfoliage.algae.tooltip": "깊은 물 속 흙 블럭 위에 있는 해조류",
+    "betterfoliage.algae.biomes": "바이옴 리스트",
+    "betterfoliage.algae.biomes.tooltip": "해조류를 바이옴에 따라 표시",
+    "betterfoliage.algae.biomes.tooltip.element": "해조류를 %s 바이옴에 따라 나타내시겠습니까? ",
+
+    "betterfoliage.coral": "산호",
+    "betterfoliage.coral.tooltip": "깊은 물 속 모래 블럭 위에있는 산호",
+    "betterfoliage.coral.size": "산호 사이즈(크기)",
+    "betterfoliage.coral.size.tooltip": "산호 이미지만큼 적용",
+    "betterfoliage.coral.crustSize": "껍질 크기",
+    "betterfoliage.coral.crustSize.tooltip": "산호 부분의 크기 ",
+    "betterfoliage.coral.chance": "산호 확률",
+    "betterfoliage.coral.chance.tooltip": "산호를 특정블록에 표시하는 확률(N 분의 64)",
+    "betterfoliage.coral.biomes": "바이옴 리스트",
+    "betterfoliage.coral.biomes.tooltip": "산호를 바이옴에 따라 표시",
+    "betterfoliage.coral.biomes.tooltip.element": "산호를 %s 바이옴에 따라 나타내시겠습니까?",
+    "betterfoliage.coral.shallowWater": "얕은 물 산호",
+    "betterfoliage.coral.shallowWater.tooltip": "산호를 깊은 물에 표시하시겠습니까?",
+
+    "betterfoliage.netherrack": "네더랙 덩굴",
+    "betterfoliage.netherrack.tooltip": "네더랙에 매달려있는 덩굴",
+
+    "betterfoliage.fallingLeaves": "떨어지는 나뭇잎",
+    "betterfoliage.fallingLeaves.tooltip": "잎 블록에서 바닥으로 떨어지는 잎 파티클",
+    "betterfoliage.fallingLeaves.speed": "파티클 속도",
+    "betterfoliage.fallingLeaves.speed.tooltip": "전체 파티클 속도",
+    "betterfoliage.fallingLeaves.windStrength": "바람 세기",
+    "betterfoliage.fallingLeaves.windStrength.tooltip": "날씨 바람 추가효과 (0을 중심으로 정규분포의 확산)",
+    "betterfoliage.fallingLeaves.stormStrength": "폭풍 세기",
+    "betterfoliage.fallingLeaves.stormStrength.tooltip": "비 날씨에 바람 추가효과 (0을 중심으로 정규분포의 확산)",
+    "betterfoliage.fallingLeaves.size": "파티클 크기",
+    "betterfoliage.fallingLeaves.chance": "파티클 확률",
+    "betterfoliage.fallingLeaves.chance.tooltip": "잎 파티클 랜덤 확률 설정",
+    "betterfoliage.fallingLeaves.perturb": "움직임",
+    "betterfoliage.fallingLeaves.perturb.tooltip": "움직임 효과의 크기. 코르크 같은 움직임을 추가합니다.",
+    "betterfoliage.fallingLeaves.lifetime": "파티클 지속시간",
+    "betterfoliage.fallingLeaves.lifetime.tooltip": "최대 파티클 지속시간을 설정합니다. 최소 지속시간은 60%입니다.",
+    "betterfoliage.fallingLeaves.opacityHack": "불투명 파티클",
+    "betterfoliage.fallingLeaves.opacityHack.tooltip": "파티클이 앞에 있어도 파티클을 가리는 투명블럭을 없앱니다. 경고: 오류주의",
+
+    "betterfoliage.risingSoul": "소울 상승",
+    "betterfoliage.risingSoul.tooltip": "소울 블럭에서 올라오는 파티클",
+    "betterfoliage.risingSoul.chance": "파티클 수정",
+    "betterfoliage.risingSoul.chance.tooltip": "소울 파티클 랜덤 확률 설정",
+    "betterfoliage.risingSoul.speed": "파티클 속도",
+    "betterfoliage.risingSoul.speed.tooltip": "파티클 속도",
+    "betterfoliage.risingSoul.perturb": "움직임",
+    "betterfoliage.risingSoul.perturb.tooltip": "움직임 효과의 크기. 코르크 같은 움직임을 추가합니다.",
+    "betterfoliage.risingSoul.headSize": "소울 크기",
+    "betterfoliage.risingSoul.headSize.tooltip": "소울 파티클의 크기",
+    "betterfoliage.risingSoul.trailSize": "자취 사이즈",
+    "betterfoliage.risingSoul.trailSize.tooltip": "자취의 크기",
+    "betterfoliage.risingSoul.opacity": "불투명",
+    "betterfoliage.risingSoul.opacity.tooltip": "파티클의 불투명",
+    "betterfoliage.risingSoul.sizeDecay": "크기 감소",
+    "betterfoliage.risingSoul.sizeDecay.tooltip": "상대적인 자취 파티클 크기",
+    "betterfoliage.risingSoul.opacityDecay": "불투명 감소",
+    "betterfoliage.risingSoul.opacityDecay.tooltip": "상대적인 입자의 파티클 불투명도",
+    "betterfoliage.risingSoul.lifetime": "최대 지속시간",
+    "betterfoliage.risingSoul.lifetime.tooltip": "최대 파티클 지속시간을 설정합니다. 최소 지속시간은 60%입니다.",
+    "betterfoliage.risingSoul.trailLength": "자취의 세기",
+    "betterfoliage.risingSoul.trailLength.tooltip": "이전 파티클 틱으로 자취를 생성합니다.",
+    "betterfoliage.risingSoul.trailDensity": "자취의 밀도",
+    "betterfoliage.risingSoul.trailDensity.tooltip": "파티클 자취를 모두 렌더링 합니다.",
+
+    "betterfoliage.connectedGrass": "잔디 연결 텍스쳐",
+    "betterfoliage.connectedGrass.enabled": "활성화",
+    "betterfoliage.connectedGrass.enabled.tooltip": "잔디블록이 흙블록 위에 있을 경우 잔디블록 윗텍스쳐를 옆텍스쳐에 전부 씌웁니다.",
+
+    "betterfoliage.roundLogs": "둥근 나무",
+    "betterfoliage.roundLogs.tooltip": "둥근부분을 블럭과 연결.",
+    "betterfoliage.roundLogs.connectSolids": "블럭과 연결",
+    "betterfoliage.roundLogs.connectSolids.tooltip": "둥근부분을 블럭과 연결.",
+    "betterfoliage.roundLogs.connectPerpendicular": "나무 세로부분과 연결",
+    "betterfoliage.roundLogs.connectPerpendicular.tooltip": "나무 세로부분을 나무부분끼리 연결",
+    "betterfoliage.roundLogs.lenientConnect": "부드럽게 둥글게 연결",
+    "betterfoliage.roundLogs.lenientConnect.tooltip": "2x2사이즈처럼 나무 평형된 부분끼리 서로 연결합니다.",
+    "betterfoliage.roundLogs.connectGrass": "잔디 연결 텍스쳐",
+    "betterfoliage.roundLogs.connectGrass.tooltip": "잔디가 근처에 있을 경우 나무 아래 잔디 블록을 렌더링",
+    "betterfoliage.roundLogs.radiusSmall": "모서리 깎는 반지름",
+    "betterfoliage.roundLogs.radiusSmall.tooltip": "나무 모서리 깎는 정도",
+    "betterfoliage.roundLogs.radiusLarge": "모서리 깎는 부분 연결",
+    "betterfoliage.roundLogs.radiusLarge.tooltip": "나무 모서리 부분을 연결",
+    "betterfoliage.roundLogs.dimming": "조광",
+    "betterfoliage.roundLogs.dimming.tooltip": "나무 표면부분을 어둡게하는 양",
+    "betterfoliage.roundLogs.zProtection": "Z-Protection",
+    "betterfoliage.roundLogs.zProtection.tooltip": "Amount to scale parallel log connection bits to stop Z-fighting (flickering). Try to set it as high as possible without having glitches.",
+    "betterfoliage.roundLogs.defaultY": "수직선에대한 기본값",
+    "betterfoliage.roundLogs.defaultY.tooltip": "true 일경우, 나무 블럭이 수직선에대한 렌더링을 할수가 없습니다. 그렇지 아니하면, 네모난 블럭으로 렌더링 될것임니다."
+}

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

@@ -0,0 +1,154 @@
+{
+    "key.betterfoliage.gui": "Открыть настройки",
+
+    "betterfoliage.global.enabled": "Включить мод",
+    "betterfoliage.global.enabled.tooltip": "Если установлено на false, BetterFoliage не будет ничего рендерить",
+
+    "betterfoliage.enabled": "Включить",
+    "betterfoliage.enabled.tooltip": "Включена ли эта функция?",
+    "betterfoliage.hOffset": "Горизонтальное смещение",
+    "betterfoliage.hOffset.tooltip": "Дистанция горизонтального смещения этого элемента в блоках",
+    "betterfoliage.vOffset": "Вертикальное смещение",
+    "betterfoliage.vOffset.tooltip": "Дистанция вертикального смещения этого элемента в блоках",
+    "betterfoliage.size": "Размер",
+    "betterfoliage.size.tooltip": "Размер этого элемента",
+    "betterfoliage.heightMin": "Минимальная высота",
+    "betterfoliage.heightMin.tooltip": "Минимальная высота элемента",
+    "betterfoliage.heightMax": "Максимальная высота",
+    "betterfoliage.heightMax.tooltip": "Максимальная высота этого элемента",
+    "betterfoliage.population": "Популяция",
+    "betterfoliage.population.tooltip": "Шанс (N к 64), что блок будет иметь эту функцию",
+    "betterfoliage.shaderWind": "Шейдерные эффекты ветра",
+    "betterfoliage.shaderWind.tooltip": "Применить эффекты ветра с ShaderMod для этого элемента?",
+    "betterfoliage.distance": "Лимит дистанции",
+    "betterfoliage.distance.tooltip": "Максимальное расстояние от игрока для рендеринга этой функции",
+    "betterfoliage.saturationThreshold": "Порог насыщения",
+    "betterfoliage.saturationThreshold.tooltip": "Насыщенность цвета разделяется на: \"обесцвеченные\" блоки (используя цвет биома) и \"цветные\" блоки (используя их собственный цвет)",
+
+    "betterfoliage.leaves": "Улучшенная листва",
+    "betterfoliage.leaves.tooltip": "Дополнительное округление листьев на блоках листвы.",
+    "betterfoliage.leaves.dense": "Плотный режим",
+    "betterfoliage.leaves.dense.tooltip": "Плотный режим имеет более округлые листья.",
+
+    "betterfoliage.shortGrass": "Низкая трава и мицелий",
+    "betterfoliage.shortGrass.tooltip": "Пучки травы / мицелия на поверхности соответствующих блоков.",
+    "betterfoliage.shortGrass.useGenerated": "Использовать сгенерированные текстуры для травы.",
+    "betterfoliage.shortGrass.useGenerated.tooltip": "Сгенерированная текстура создается путём разрезания текстуры высокой травы с активного ресурс-пака пополам.",
+    "betterfoliage.shortGrass.myceliumEnabled": "Включить мицелий",
+    "betterfoliage.shortGrass.myceliumEnabled.tooltip": "Включить эту особенность для блоков мицелия?",
+    "betterfoliage.shortGrass.grassEnabled": "Включить траву",
+    "betterfoliage.shortGrass.grassEnabled.tooltip": "Включить эту особенность для блоков травы?",
+    "betterfoliage.shortGrass.snowEnabled": "Включить траву под снегом",
+    "betterfoliage.shortGrass.snowEnabled.tooltip": "Включить эту особенность для заснеженных блоков травы?",
+
+    "betterfoliage.hangingGrass": "Висячая трава",
+    "betterfoliage.hangingGrass.tooltip": "Пучки травы свисают вниз с верхних краев блока травы.",
+    "betterfoliage.hangingGrass.separation": "Разделение",
+    "betterfoliage.hangingGrass.separation.tooltip": "Как долго подвесная трава выделяется из блока?",
+
+    "betterfoliage.cactus": "Улучшенные кактусы",
+    "betterfoliage.cactus.tooltip": "Улучшить кактус с дополнительными частицами и плавными тенями.",
+    "betterfoliage.cactus.sizeVariation": "Вариации размера",
+    "betterfoliage.cactus.sizeVariation.tooltip": "Количество случайных изменений в размере кактусов.",
+
+    "betterfoliage.lilypad": "Улучшенные кувшинки",
+    "betterfoliage.lilypad.tooltip": "Добавить кувшинкам корни и цветы.",
+    "betterfoliage.lilypad.flowerChance": "Шанс появления цветов",
+    "betterfoliage.lilypad.flowerChance.tooltip": "Шанс (N к 64) появления цветка на кувшинке.",
+
+    "betterfoliage.reed": "Камыши",
+    "betterfoliage.reed.tooltip": "Мелководные камыши на блоках земли.",
+    "betterfoliage.reed.biomes": "Список биомов",
+    "betterfoliage.reed.biomes.tooltip": "Настройка биомов, в которых камышам разрешено появляться.",
+    "betterfoliage.reed.biomes.tooltip.element": "Должны ли камыши встречаться в %s биоме?",
+
+    "betterfoliage.algae": "Морские водоросли",
+    "betterfoliage.algae.tooltip": "Глубоководные водоросли на блоках земли.",
+    "betterfoliage.algae.biomes": "Список биомов",
+    "betterfoliage.algae.biomes.tooltip": "Настройка биомов, в которых водорослям разрешено появляться.",
+    "betterfoliage.algae.biomes.tooltip.element": "Должны ли водоросли встречаться в %s биоме?",
+
+    "betterfoliage.coral": "Кораллы",
+    "betterfoliage.coral.tooltip": "Кораллы на песчаных блоках в глубокой воде.",
+    "betterfoliage.coral.size": "Размер кораллов",
+    "betterfoliage.coral.size.tooltip": "Размер торчащих частичек кораллов.",
+    "betterfoliage.coral.crustSize": "Размер коры",
+    "betterfoliage.coral.crustSize.tooltip": "Размер плоской части кораллов.",
+    "betterfoliage.coral.chance": "Шанс кораллов",
+    "betterfoliage.coral.chance.tooltip": "Шанс (N in 64) появления кораллов на определенном блоке.",
+    "betterfoliage.coral.biomes": "Список биомов",
+    "betterfoliage.coral.biomes.tooltip": "Настройка биомов, в которых разрешено появляться кораллам.",
+    "betterfoliage.coral.biomes.tooltip.element": "Должны ли кораллы появляться в %s биоме?",
+    "betterfoliage.coral.shallowWater": "Мелководные кораллы",
+    "betterfoliage.coral.shallowWater.tooltip": "Должны ли появляться кораллы в воде, глубиной в 1 блок?",
+
+    "betterfoliage.netherrack": "Адская лоза",
+    "betterfoliage.netherrack.tooltip": "Висячая лоза под адским камнем",
+
+    "betterfoliage.fallingLeaves": "Падающие листья",
+    "betterfoliage.fallingLeaves.tooltip": "Падение FX частиц листвы исходящие из низа блоков листвы",
+    "betterfoliage.fallingLeaves.speed": "Скорость частиц",
+    "betterfoliage.fallingLeaves.speed.tooltip": "Общая скорость частиц",
+    "betterfoliage.fallingLeaves.windStrength": "Сила ветра",
+    "betterfoliage.fallingLeaves.windStrength.tooltip": "Величина воздействия ветра в хорошую погоду (распространение нормального распределения сосредоточено на 0)",
+    "betterfoliage.fallingLeaves.stormStrength": "Сила шторма",
+    "betterfoliage.fallingLeaves.stormStrength.tooltip": "Дополнительная величина воздействия ветра в ненастную погоду (распространение нормального распределения сосредоточено на 0)",
+    "betterfoliage.fallingLeaves.size": "Размер частиц",
+    "betterfoliage.fallingLeaves.chance": "Шанс частиц",
+    "betterfoliage.fallingLeaves.chance.tooltip": "Вероятность каждого случайного рендеринга в такт (1/20 секунды) опадения частицы блока листвы.",
+    "betterfoliage.fallingLeaves.perturb": "Возмущение",
+    "betterfoliage.fallingLeaves.perturb.tooltip": "Величина эффекта возмущений. Добавляет штопорообразное движение к частице синхронизированной с его вращением.",
+    "betterfoliage.fallingLeaves.lifetime": "Максимальное время жизни",
+    "betterfoliage.fallingLeaves.lifetime.tooltip": "Максимальное время жизни частиц. Минимальное время жизни - 60%% от этого значения.",
+    "betterfoliage.fallingLeaves.opacityHack": "Непрозрачные частицы",
+    "betterfoliage.fallingLeaves.opacityHack.tooltip": "Запретить прозрачным блокам затемнять частицы даже тогда, когда частицы впереди. ВНИМАНИЕ: может спровоцировать баги.",
+
+    "betterfoliage.risingSoul": "Адские духи",
+    "betterfoliage.risingSoul.tooltip": "Количество душ-частиц FX, испускаемых из верхней части блоков песка душ.",
+    "betterfoliage.risingSoul.chance": "Шанс частиц",
+    "betterfoliage.risingSoul.chance.tooltip": "Частота генерации частиц на песке душ.",
+    "betterfoliage.risingSoul.speed": "Скорость частиц",
+    "betterfoliage.risingSoul.speed.tooltip": "Вертикальная скорость движения частиц духов.",
+    "betterfoliage.risingSoul.perturb": "Возмущение",
+    "betterfoliage.risingSoul.perturb.tooltip": "Магнитуда эффекта возмущений. Добавляет штопороподобное движение частиц.",
+    "betterfoliage.risingSoul.headSize": "Размер духа",
+    "betterfoliage.risingSoul.headSize.tooltip": "Размер частицы духа",
+    "betterfoliage.risingSoul.trailSize": "Размер следов",
+    "betterfoliage.risingSoul.trailSize.tooltip": "Начальный размер следа частиц",
+    "betterfoliage.risingSoul.opacity": "Прозрачность",
+    "betterfoliage.risingSoul.opacity.tooltip": "Непрозрачность эффекта частиц",
+    "betterfoliage.risingSoul.sizeDecay": "Размер распада",
+    "betterfoliage.risingSoul.sizeDecay.tooltip": "Следующий размер частицы соответствует их же размеру в предыдущем такте (1/20 секунды).",
+    "betterfoliage.risingSoul.opacityDecay": "Непрозрачность распада",
+    "betterfoliage.risingSoul.opacityDecay.tooltip": "Следующий уровень прозрачности частицы соответствует их же уровню прозрачности в предыдущем такте (1/20 секунды).",
+    "betterfoliage.risingSoul.lifetime": "Максимальное время жизни",
+    "betterfoliage.risingSoul.lifetime.tooltip": "Максимальное время жизни эффекта частиц. Минимальное время жизни равно 60%% от этого числа.",
+    "betterfoliage.risingSoul.trailLength": "Длина следов",
+    "betterfoliage.risingSoul.trailLength.tooltip": "Количество предыдущих позиций, которые запомнила частица в тактах (1/20 секунды).",
+    "betterfoliage.risingSoul.trailDensity": "Плотность следов",
+    "betterfoliage.risingSoul.trailDensity.tooltip": "Рендер каждой предыдущий N’ой позиции в следах частиц.",
+
+
+    "betterfoliage.connectedGrass": "Соединенные текстуры травы",
+    "betterfoliage.connectedGrass.enabled": "Включить",
+    "betterfoliage.connectedGrass.enabled.tooltip": "Если блок травы находится над блоком земли: прорисовать верхнюю текстуру травы на всех сторонах блока травы.",
+
+    "betterfoliage.roundLogs": "Цилиндрические брёвна",
+    "betterfoliage.roundLogs.tooltip": "Соединить круглые блоки в сплошные, полные блоки?",
+    "betterfoliage.roundLogs.connectSolids": "Соединение в крупные брёвна",
+    "betterfoliage.roundLogs.connectSolids.tooltip": "Соединить круглые блоки в сплошные, полные блоки?",
+    "betterfoliage.roundLogs.connectPerpendicular": "Соединение в перпендикулярные брёвна",
+    "betterfoliage.roundLogs.connectPerpendicular.tooltip": "Соединить круглые брёвна к перпендикулярным брёвнам относительно их оси?",
+    "betterfoliage.roundLogs.lenientConnect": "Мягкое округление",
+    "betterfoliage.roundLogs.lenientConnect.tooltip": "Соединение в параллельные круглые брёвна L-формы, не только 2х2.",
+    "betterfoliage.roundLogs.connectGrass": "Соединенная трава",
+    "betterfoliage.roundLogs.connectGrass.tooltip": "Заменяет землю под деревьями на траву, если она есть поблизости.",
+    "betterfoliage.roundLogs.radiusSmall": "Радиус фаски",
+    "betterfoliage.roundLogs.radiusSmall.tooltip": "Радиус обрезки углов от бревна.",
+    "betterfoliage.roundLogs.radiusLarge": "Радиус соединенной фаски",
+    "betterfoliage.roundLogs.radiusLarge.tooltip": "Радиус среза внешнего угла соединённых брёвен.",
+    "betterfoliage.roundLogs.dimming": "Затемнение",
+    "betterfoliage.roundLogs.dimming.tooltip": "Затемнить неясные длинные грани.",
+    "betterfoliage.roundLogs.zProtection": "Z-Защита",
+    "betterfoliage.roundLogs.zProtection.tooltip": "Для масштабирования параллельных битов соединения бревен, чтобы остановить Z-бой (мерцание). Попробуйте установить его как можно выше, для устранения мерцания."
+}

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

@@ -0,0 +1,175 @@
+{
+  "key.betterfoliage.gui": "打开BF设置",
+
+  "betterfoliage.global.enabled": "模组使用",
+  "betterfoliage.global.enabled.tooltip": "如果关闭,BetterFoliage不会呈现任何东西",
+  "betterfoliage.global.nVidia": "nVidia GPU",
+  "betterfoliage.global.nVidia.tooltip": "明确你是否有一个nVidia GPU",
+
+  "betterfoliage.enabled": "启用",
+  "betterfoliage.enabled.tooltip": "要启用这个功能吗?",
+  "betterfoliage.hOffset": "水平偏移",
+  "betterfoliage.hOffset.tooltip": "在方块中这个元素是横向距离移动的",
+  "betterfoliage.vOffset": "垂直偏移",
+  "betterfoliage.vOffset.tooltip": "在方块中这个元素是横向距离移动的",
+  "betterfoliage.size": "尺寸",
+  "betterfoliage.size.tooltip": "该元素的尺寸",
+  "betterfoliage.heightMin": "最小高度",
+  "betterfoliage.heightMin.tooltip": "最小元素的高度",
+  "betterfoliage.heightMax": "最大高度",
+  "betterfoliage.heightMax.tooltip": "最大元素的高度",
+  "betterfoliage.population": "物体密度",
+  "betterfoliage.population.tooltip": "生成的概率为64分之1",
+  "betterfoliage.shaderWind": "光影水反中的 风的影响",
+  "betterfoliage.shaderWind.tooltip": "能适用于光影水反中的\"风的影响\" 这一元素?",
+  "betterfoliage.distance": "距离限制",
+  "betterfoliage.distance.tooltip": "离游戏者的最大距离,在这个范围内呈现这个特征",
+  "betterfoliage.saturationThreshold": "饱和度阈值",
+  "betterfoliage.saturationThreshold.tooltip": "色彩饱和度将介于\"无色\"方块(使用生物群系的颜色)和\"有色\"方块(使用材质特定颜色)之间",
+
+  "betterfoliage.rendererror": "§a[BF更好的叶子]§f 错误:渲染方块 %s 此位置 %s",
+
+  "betterfoliage.shaders": "着色器配置",
+  "betterfoliage.shaders.tooltip": "Configure integration with shaders",
+  "betterfoliage.shaders.leavesId": "叶子 ID",
+  "betterfoliage.shaders.leavesId.tooltip": "方块 ID 将作为所有叶片都使用的相同ID提供给光影水反 如果你的光影水反文件使用了一个 §6block.properties§e 文件, 你可能需要修改这个以匹配光影水反的映射",
+  "betterfoliage.shaders.grassId": "草 ID",
+  "betterfoliage.shaders.grassId.tooltip": "方块 ID 将作为所有的草和作物都使用的相同ID提供给光影水反 如果你的光影水反文件使用了一个 §6block.properties§e 文件, 你可能需要修改这个以匹配光影水反的映射",
+
+  "betterfoliage.leaves": "额外的叶片",
+  "betterfoliage.leaves.tooltip": "叶方块上额外的密叶",
+  "betterfoliage.leaves.dense": "浓密模式",
+  "betterfoliage.leaves.dense.tooltip": "浓密的叶子会有更多额外的叶片",
+  "betterfoliage.leaves.snowEnabled": "启用雪覆盖叶片",
+  "betterfoliage.leaves.snowEnabled.tooltip": "是否启用被雪覆盖的额外叶片?",
+  "betterfoliage.leaves.hideInternal": "隐藏内部的叶片",
+  "betterfoliage.leaves.hideInternal.tooltip": "如果该叶方块完全被其他叶方块或者固体方块包围,将不渲染额外的叶片",
+
+  "betterfoliage.shortGrass": "短草和菌丝",
+  "betterfoliage.shortGrass.tooltip": "一簇小草或者一丛菌丝长在合适的方块的顶部",
+  "betterfoliage.shortGrass.useGenerated": "为草使用mod创建的材质",
+  "betterfoliage.shortGrass.useGenerated.tooltip": "mod创建的材质指的是将已选用的资源包中高草的材质切一半来用",
+  "betterfoliage.shortGrass.myceliumEnabled": "使用在菌丝上",
+  "betterfoliage.shortGrass.myceliumEnabled.tooltip": "将这个特性利用到菌丝中吗?",
+  "betterfoliage.shortGrass.grassEnabled": "使用在草方块上",
+  "betterfoliage.shortGrass.grassEnabled.tooltip": "将这个特性利用到草方块中吗?",
+  "betterfoliage.shortGrass.snowEnabled": "使用在雪地里",
+  "betterfoliage.shortGrass.snowEnabled.tooltip": "使用到被雪覆盖的草方块中去?",
+
+  "betterfoliage.connectedGrass": "草的纹理的连接",
+  "betterfoliage.connectedGrass.tooltip": "使得草方块侧面拥有像顶面的材质",
+  "betterfoliage.connectedGrass.enabled": "启用",
+  "betterfoliage.connectedGrass.enabled.tooltip": "如果泥土上有草方块:所有的草方块的侧面换成草方块顶部的材质,",
+  "betterfoliage.connectedGrass.snowEnabled": "使用在被雪覆盖的草方块上",
+  "betterfoliage.connectedGrass.snowEnabled.tooltip": "是否应用于被雪覆盖的草方块上?",
+
+  "betterfoliage.hangingGrass": "悬挂的草",
+  "betterfoliage.hangingGrass.tooltip": "草会在边缘的草方块上垂下来",
+  "betterfoliage.hangingGrass.separation": "垂下来的距离",
+  "betterfoliage.hangingGrass.separation.tooltip": "有多长的挂草会从草方块上垂下来",
+
+  "betterfoliage.cactus": "更好的仙人掌",
+  "betterfoliage.cactus.tooltip": "用额外的仙人掌刺和圆润的形状来提高仙人掌的真实性",
+  "betterfoliage.cactus.sizeVariation": "尺寸变化",
+  "betterfoliage.cactus.sizeVariation.tooltip": "仙人掌的尺寸随机变化的范围",
+
+  "betterfoliage.lilypad": "更好的莲叶与荷花",
+  "betterfoliage.lilypad.tooltip": "用莲叶的根和随机的莲花以提高莲叶的真实性",
+  "betterfoliage.lilypad.flowerChance": "花的生成概率",
+  "betterfoliage.lilypad.flowerChance.tooltip": "(64个莲叶中 N 个)莲叶具有花了",
+
+  "betterfoliage.reed": "芦苇",
+  "betterfoliage.reed.tooltip": "芦苇会生成在浅水中的泥土块上",
+  "betterfoliage.reed.biomes": "生物群系的列表",
+  "betterfoliage.reed.biomes.tooltip": "配置允许出现芦苇的生物群系",
+  "betterfoliage.reed.biomes.tooltip.element": "芦苇应该出现在%s生物群落?",
+
+  "betterfoliage.algae": "藻类",
+  "betterfoliage.algae.tooltip": "藻类会生成在深水中的泥土块上",
+  "betterfoliage.algae.biomes": "生物群系的列表",
+  "betterfoliage.algae.biomes.tooltip": "配置允许出现藻类的生物群系",
+  "betterfoliage.algae.biomes.tooltip.element": "藻类应该出现在%s生物群落?",
+
+  "betterfoliage.coral": "珊瑚",
+  "betterfoliage.coral.tooltip": "珊瑚会生成在深水中的沙块上",
+  "betterfoliage.coral.size": "珊瑚的大小",
+  "betterfoliage.coral.size.tooltip": "珊瑚伸出的部分的大小",
+  "betterfoliage.coral.crustSize": "外壳尺寸",
+  "betterfoliage.coral.crustSize.tooltip": "珊瑚的平的部分的尺寸",
+  "betterfoliage.coral.chance": "珊瑚的生成概率",
+  "betterfoliage.coral.chance.tooltip": "64个特殊表面的方块中有N个有机会出现珊瑚",
+  "betterfoliage.coral.biomes": "生物群落的列表",
+  "betterfoliage.coral.biomes.tooltip": "配置允许出现珊瑚的生物群系",
+  "betterfoliage.coral.biomes.tooltip.element": "珊瑚应该出现在%s生物群落?",
+  "betterfoliage.coral.shallowWater": "浅海珊瑚",
+  "betterfoliage.coral.shallowWater.tooltip": "珊瑚应该生成在深水1格?",
+
+  "betterfoliage.netherrack": "下界岩下面的藤蔓",
+  "betterfoliage.netherrack.tooltip": "下界岩下面将挂上藤蔓",
+
+  "betterfoliage.fallingLeaves": "落叶",
+  "betterfoliage.fallingLeaves.tooltip": "落叶粒子效果 FX 会从叶方块底部下落",
+  "betterfoliage.fallingLeaves.speed": "粒子速度",
+  "betterfoliage.fallingLeaves.speed.tooltip": "总体的粒子速度",
+  "betterfoliage.fallingLeaves.windStrength": "柔风的强度",
+  "betterfoliage.fallingLeaves.windStrength.tooltip": "在晴天中体现的风的效果(默认以0为中心散播)",
+  "betterfoliage.fallingLeaves.stormStrength": "风暴的强度",
+  "betterfoliage.fallingLeaves.stormStrength.tooltip": "附加在阴天里体现的风的效果(默认以0为中心散播)",
+  "betterfoliage.fallingLeaves.size": "粒子大小",
+  "betterfoliage.fallingLeaves.chance": "粒子生成机率",
+  "betterfoliage.fallingLeaves.chance.tooltip": "随机渲染刻激发叶方块生成粒子的概率",
+  "betterfoliage.fallingLeaves.perturb": "扰动",
+  "betterfoliage.fallingLeaves.perturb.tooltip": "扰动的大小.增加了一个与之旋转同步的螺旋状动量",
+  "betterfoliage.fallingLeaves.lifetime": "最长存在时间",
+  "betterfoliage.fallingLeaves.lifetime.tooltip": "粒子的最长存在时间,仅在几秒内,最短时间为这个值60%%",
+  "betterfoliage.fallingLeaves.opacityHack": "粒子不透明",
+  "betterfoliage.fallingLeaves.opacityHack.tooltip": "阻止透明方块隐藏粒子,即使粒子已经在前面了.警告:可能会导致错误",
+
+  "betterfoliage.risingSoul": "灵魂沙上飘起的魂灵",
+  "betterfoliage.risingSoul.tooltip": "灵魂沙的顶部飘出灵魂粒子 FX",
+  "betterfoliage.risingSoul.chance": "粒子的生成机率",
+  "betterfoliage.risingSoul.chance.tooltip": "随机渲染刻激发灵魂沙生成一个粒子的概率",
+  "betterfoliage.risingSoul.speed": "粒子速度",
+  "betterfoliage.risingSoul.speed.tooltip": "灵颗粒的垂直速度",
+  "betterfoliage.risingSoul.perturb": "扰动",
+  "betterfoliage.risingSoul.perturb.tooltip": "动的大小.增加了一个与之旋转同步的螺旋状动量",
+  "betterfoliage.risingSoul.headSize": "魂灵的大小",
+  "betterfoliage.risingSoul.headSize.tooltip": "灵魂粒子的大小",
+  "betterfoliage.risingSoul.trailSize": "魂灵轨迹的大小",
+  "betterfoliage.risingSoul.trailSize.tooltip": "灵魂粒子的轨迹的初始大小",
+  "betterfoliage.risingSoul.opacity": "不透明度",
+  "betterfoliage.risingSoul.opacity.tooltip": "粒子效果的不透明度",
+  "betterfoliage.risingSoul.sizeDecay": "大小的衰减",
+  "betterfoliage.risingSoul.sizeDecay.tooltip": "灵魂轨迹粒子大小与前一刻他的大小相关",
+  "betterfoliage.risingSoul.opacityDecay": "不透明度的衰减",
+  "betterfoliage.risingSoul.opacityDecay.tooltip": "灵魂轨迹粒子不透明度与前一刻他的不透明度相关",
+  "betterfoliage.risingSoul.lifetime": "最长存在时间",
+  "betterfoliage.risingSoul.lifetime.tooltip": "粒子的最长存在时间,仅在几秒内,最短时间为这个值60%%",
+  "betterfoliage.risingSoul.trailLength": "魂灵轨迹长度",
+  "betterfoliage.risingSoul.trailLength.tooltip": "在游戏刻内粒子记录的轨迹位置的数量",
+  "betterfoliage.risingSoul.trailDensity": "魂灵轨迹密集程度",
+  "betterfoliage.risingSoul.trailDensity.tooltip": "整条轨迹中渲染每第N个轨迹位置",
+
+  "betterfoliage.roundLogs": "圆木",
+  "betterfoliage.roundLogs.tooltip": "使木方块拥有八角形的横截面",
+  "betterfoliage.roundLogs.plantsOnly": "仅仅应用于植物性材料",
+  "betterfoliage.roundLogs.plantsOnly.tooltip": "是否仅仅应用于木质材料和干草堆，而不是所有圆柱方块?",
+  "betterfoliage.roundLogs.connectSolids": "连接到固体方块上",
+  "betterfoliage.roundLogs.connectSolids.tooltip": "要使圆木连接到完整的固体方块上吗?",
+  "betterfoliage.roundLogs.connectPerpendicular": "连接到垂直的圆木上",
+  "betterfoliage.roundLogs.connectPerpendicular.tooltip": "要使圆木根据它的角度连接到垂直圆木上吗?",
+  "betterfoliage.roundLogs.lenientConnect": "巨大的圆木",
+  "betterfoliage.roundLogs.lenientConnect.tooltip": "在L形中也连接成巨大的圆木, 不只是2x2形",
+  "betterfoliage.roundLogs.connectGrass": "连接到草方块上",
+  "betterfoliage.roundLogs.connectGrass.tooltip": "如果树木下的泥土附近有草方块,那么它也会被渲染成草方块",
+  "betterfoliage.roundLogs.radiusSmall": "圆木斜面的半径",
+  "betterfoliage.roundLogs.radiusSmall.tooltip": "从圆木的外角砍掉多大的部分",
+  "betterfoliage.roundLogs.radiusLarge": "连接圆木的斜面半径",
+  "betterfoliage.roundLogs.radiusLarge.tooltip": "从连接着的巨大圆木的外角砍掉多大的部分",
+  "betterfoliage.roundLogs.dimming": "调光变暗",
+  "betterfoliage.roundLogs.dimming.tooltip": "将圆木阴暗面变黑的程度",
+  "betterfoliage.roundLogs.zProtection": "Z-Protection [Z保护]",
+  "betterfoliage.roundLogs.zProtection.tooltip": "用多少倍放大平行圆木连接处的面 去停止 Z-fighting (闪烁）[斑驳,两个多边形共面所出现的效果].在没有发生故障的情况下,试着将这个值设置得尽可能的高[这是Z-fighting出现的原因:多个多面体的面重叠在一起,会一直闪烁]",
+  "betterfoliage.roundLogs.defaultY": "默认垂直",
+  "betterfoliage.roundLogs.defaultY.tooltip": "如果开启, 方向不确定的圆木将会渲染成垂直的.否则, 它们仅仅渲染为cube型方块."
+}

src/main/resources/assets/betterfoliage/leaf_texture_mappings.cfg

@@ -0,0 +1,9 @@
+// Vanilla
+spruce=spruce
+jungle=jungle
+
+// Biomes O' Plenty
+fir=spruce
+
+// Forestry
+forestry:conifers=spruce

src/main/resources/assets/betterfoliage/leaves_blocks_default.cfg

@@ -0,0 +1,3 @@
+// Vanilla
+//net.minecraft.block.LeavesBlock
+net.minecraft.class_2397

src/main/resources/assets/betterfoliage/leaves_models_default.cfg

@@ -0,0 +1,4 @@
+minecraft:block/leaves,all
+minecraft:block/cube_all,all
+
+biomesoplenty:block/leaves_overlay,under

src/main/resources/assets/betterfoliage/lilypad_default.cfg

@@ -0,0 +1,6 @@
+// Vanilla
+//net.minecraft.block.LilyPadBlock
+net.minecraft.class_2553
+
+// Biomes O'Plenty
+biomesoplenty.common.block.BlockBOPLilypad

src/main/resources/assets/betterfoliage/log_blocks_default.cfg

@@ -0,0 +1,3 @@
+// Vanilla
+//net.minecraft.block.PillarBlock
+net.minecraft.class_2465

src/main/resources/assets/betterfoliage/log_models_default.cfg

@@ -0,0 +1,4 @@
+// Vanilla
+block/cube_column,side,end
+block/cube_column_horizontal,side,end
+block/cube_all,all,all

src/main/resources/assets/betterfoliage/mycelium_blocks_default.cfg

@@ -0,0 +1,3 @@
+// Vanilla
+//net.minecraft.block.MyceliumBlock
+net.minecraft.class_2418

src/main/resources/assets/betterfoliage/sand_default.cfg

@@ -0,0 +1,3 @@
+// Vanilla
+//net.minecraft.block.SandBlock
+net.minecraft.class_2468