Port to 1.16.5

Kottle -> KotlinForForge

.classpath

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

.gitignore

@@ -1,5 +1,10 @@
+.idea/
+*.iml
+*.ipr
+*.iws
+run/
 .gradle/
-.settings/
-bin/
 build/
-libs/
+classes/
+temp/
+logs

.project

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>BetterFoliage</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

README.md

@@ -1,11 +1,4 @@
 BetterFoliage
 =============
+
 Minecraft mod that alters the appearance of leaves & grass
-
-More info: http://www.minecraftforum.net/topic/2776217-better-foliage/
-
-Download
-========
-[BetterFoliage 0.9.4-beta] (http://goo.gl/pNBE23) (MC 1.7.2)
-
-[BetterFoliage 0.9.4-beta] (http://goo.gl/ywT6Xg) (MC 1.7.10)

build.gradle

@@ -1,45 +0,0 @@
-buildscript {
-	repositories {
-		mavenCentral()
-		maven {
-			name = "forge"
-			url = "http://files.minecraftforge.net/maven"
-		}
-		maven {
-			name = "sonatype"
-			url = "https://oss.sonatype.org/content/repositories/snapshots/"
-		}
-	}
-	dependencies {
-		classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
-	}
-}
-apply plugin: 'forge'
-
-minecraft {
-	version = '1.7.2-10.12.2.1147'
-}
-
-jar.baseName = 'BetterFoliage-1.7.2'
-group = 'com.github.octarine-noise'
-version='0.9.5b'
-
-processResources {
-	inputs.property "version", project.version
-	inputs.property "mcversion", project.minecraft.version
-	
-	from(sourceSets.main.resources.srcDirs) {
-		include 'mcmod.info'
-		expand 'version':project.version, 'mcversion':project.minecraft.version
-	}
-
-	from(sourceSets.main.resources.srcDirs) {
-		exclude 'mcmod.info'
-	}
-}
-
-jar {
-	manifest {
-		attributes("FMLCorePlugin": "mods.betterfoliage.loader.BetterFoliageLoader", "FMLCorePluginContainsFMLMod": "mods.betterfoliage.BetterFoliage")
-	}
-}

build.gradle.kts

@@ -0,0 +1,69 @@
+plugins {
+    kotlin("jvm").version("1.4.20")
+    id("net.minecraftforge.gradle").version("4.1.12")
+    id("org.spongepowered.mixin").version("0.7-SNAPSHOT")
+}
+//apply(plugin = "org.spongepowered.mixin")
+
+repositories {
+    maven("https://files.minecraftforge.net/maven")
+    maven("https://repo.spongepowered.org/maven")
+    maven("https://minecraft.curseforge.com/api/maven")
+    maven("https://maven.shedaniel.me/")
+    maven("https://www.cursemaven.com")
+    maven("https://thedarkcolour.github.io/KotlinForForge/")
+}
+
+dependencies {
+    "minecraft"("net.minecraftforge:forge:${properties["mcVersion"]}-${properties["forgeVersion"]}")
+
+//    "api"(fg.deobf("curse.maven:clothconfig-348521:2938583"))
+
+//    "implementation"(fg.deobf("curse.maven:biomesoplenty-220318:2988999"))
+    "implementation"("thedarkcolour:kotlinforforge:1.7.0")
+
+    "implementation"("org.spongepowered:mixin:0.8-SNAPSHOT")
+}
+
+configurations["annotationProcessor"].extendsFrom(configurations["implementation"])
+sourceSets {
+    get("main").ext["refMap"] = "betterfoliage.refmap.json"
+}
+
+minecraft {
+    mappings(properties["mappingsChannel"] as String, properties["mappingsVersion"] as String)
+    accessTransformer(file("src/main/resources/META-INF/accesstransformer.cfg"))
+
+    runs.create("client") {
+        workingDirectory(file("run"))
+        properties["forge.logging.markers"] = "CORE"
+        properties["forge.logging.console.level"] = "debug"
+        mods.create("betterfoliage") {
+            source(sourceSets["main"])
+        }
+    }
+}
+
+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<Jar>("jar") {
+    archiveName = "BetterFoliage-${project.version}-Forge-${properties["mcVersion"]}.jar"
+    manifest {
+        from(file("src/main/resources/META-INF/MANIFEST.MF"))
+        attributes["Implementation-Version"] = project.version
+    }
+    exclude("net")
+    filesMatching("META-INF/mods.toml") { expand(project.properties) }
+    filesMatching("mcmod.info") { expand(project.properties) }
+}

gradle.properties

@@ -0,0 +1,14 @@
+org.gradle.jvmargs=-Xmx2G
+org.gradle.daemon=false
+
+group = com.github.octarine-noise
+jarName = BetterFoliage-Forge
+
+version = 2.6.1
+
+mcVersion = 1.16.5
+forgeVersion = 36.1.17
+mappingsChannel = official
+mappingsVersion = 1.16.5
+
+#kottleVersion = 1.4.0

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -0,0 +1,185 @@
+#!/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,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="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,13 @@
+pluginManagement {
+    repositories {
+        maven("https://files.minecraftforge.net/maven")
+        maven("https://repo.spongepowered.org/maven")
+        gradlePluginPortal()
+    }
+    resolutionStrategy {
+        eachPlugin {
+            if (requested.id.let { it.namespace == "net.minecraftforge" && it.name == "gradle"} ) useModule("net.minecraftforge.gradle:ForgeGradle:${requested.version}")
+            if (requested.id.let { it.namespace == "org.spongepowered" && it.name == "mixin"} ) useModule("org.spongepowered:mixingradle:${requested.version}")
+        }
+    }
+}

src/main/java/mods/betterfoliage/BetterFoliage.java

@@ -1,48 +0,0 @@
-package mods.betterfoliage;
-
-import java.io.File;
-import java.util.Map;
-
-import mods.betterfoliage.client.BetterFoliageClient;
-import mods.betterfoliage.common.config.BetterFoliageConfig;
-
-import org.apache.logging.log4j.Logger;
-
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.network.NetworkCheckHandler;
-import cpw.mods.fml.relauncher.Side;
-
-@Mod(name=BetterFoliage.MOD_NAME, modid=BetterFoliage.MOD_ID, acceptedMinecraftVersions=BetterFoliage.MC_VERSIONS, guiFactory=BetterFoliage.GUI_FACTORY)
-public class BetterFoliage {
-
-	public static final String MOD_ID = "BetterFoliage";
-	public static final String MOD_NAME = "Better Foliage";
-	public static final String MC_VERSIONS = "[1.7.2]";
-	public static final String GUI_FACTORY = "mods.betterfoliage.client.gui.ConfigGuiFactory";
-	
-	@Mod.Instance
-	public static BetterFoliage instance;
-	
-	public static BetterFoliageConfig config = new BetterFoliageConfig();
-	
-	public static Logger log;
-	
-	public static File configDir;
-	
-	@Mod.EventHandler
-	public void preInit(FMLPreInitializationEvent event)  {
-		log = event.getModLog();
-		if (event.getSide() == Side.CLIENT) {
-			configDir = new File(event.getModConfigurationDirectory(), MOD_ID);
-			configDir.mkdir();
-			config.load(new File(configDir, "betterfoliage.cfg"));
-			BetterFoliageClient.preInit();
-		}
-	}
-	
-	@NetworkCheckHandler
-	public boolean checkVersion(Map<String, String> mods, Side side) {
-		return true;
-	}
-}

src/main/java/mods/betterfoliage/MixinConnector.java

@@ -0,0 +1,18 @@
+package mods.betterfoliage;
+
+import org.spongepowered.asm.mixin.Mixins;
+import org.spongepowered.asm.mixin.connect.IMixinConnector;
+
+public class MixinConnector implements IMixinConnector {
+    @Override
+    public void connect() {
+        Mixins.addConfiguration("betterfoliage.common.mixins.json");
+
+        try {
+            Class.forName("optifine.OptiFineTransformationService");
+            Mixins.addConfiguration("betterfoliage.optifine.mixins.json");
+        } catch (ClassNotFoundException e) {
+            Mixins.addConfiguration("betterfoliage.vanilla.mixins.json");
+        }
+    }
+}

src/main/java/mods/betterfoliage/client/BetterFoliageClient.java

@@ -1,128 +0,0 @@
-package mods.betterfoliage.client;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Map;
-
-import mods.betterfoliage.BetterFoliage;
-import mods.betterfoliage.client.render.IRenderBlockDecorator;
-import mods.betterfoliage.client.render.impl.RenderBlockBetterAlgae;
-import mods.betterfoliage.client.render.impl.RenderBlockBetterCactus;
-import mods.betterfoliage.client.render.impl.RenderBlockBetterGrass;
-import mods.betterfoliage.client.render.impl.RenderBlockBetterLeaves;
-import mods.betterfoliage.client.render.impl.RenderBlockBetterLilypad;
-import mods.betterfoliage.client.render.impl.RenderBlockBetterReed;
-import mods.betterfoliage.client.resource.BlockTextureGenerator;
-import mods.betterfoliage.client.resource.HalfTextureResource;
-import mods.betterfoliage.client.resource.ILeafTextureRecognizer;
-import mods.betterfoliage.client.resource.LeafTextureGenerator;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockCarrot;
-import net.minecraft.block.BlockCrops;
-import net.minecraft.block.BlockDoublePlant;
-import net.minecraft.block.BlockLeavesBase;
-import net.minecraft.block.BlockPotato;
-import net.minecraft.block.BlockReed;
-import net.minecraft.block.BlockTallGrass;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.resources.IResource;
-import net.minecraft.init.Blocks;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.IBlockAccess;
-import net.minecraftforge.common.MinecraftForge;
-
-import com.google.common.collect.Maps;
-
-import cpw.mods.fml.client.registry.RenderingRegistry;
-import cpw.mods.fml.common.FMLCommonHandler;
-
-public class BetterFoliageClient implements ILeafTextureRecognizer {
-
-	public static Map<Integer, IRenderBlockDecorator> decorators = Maps.newHashMap();
-	public static LeafTextureGenerator leafGenerator;
-	
-	public static BlockMatcher leaves;
-	public static BlockMatcher crops;
-	
-	public static void preInit() {
-		FMLCommonHandler.instance().bus().register(new KeyHandler());
-		
-		BetterFoliage.log.info("Registering renderers");
-		registerRenderer(new RenderBlockBetterLeaves());
-		registerRenderer(new RenderBlockBetterGrass());
-		registerRenderer(new RenderBlockBetterCactus());
-		registerRenderer(new RenderBlockBetterLilypad());
-		registerRenderer(new RenderBlockBetterReed());
-		registerRenderer(new RenderBlockBetterAlgae());
-		
-		leaves = new BlockMatcher(BlockLeavesBase.class.getName(),
-								  "forestry.arboriculture.gadgets.BlockLeaves",
-								  "thaumcraft.common.blocks.BlockMagicalLeaves");
-		leaves.load(new File(BetterFoliage.configDir, "classesLeaves.cfg"));
-		
-		crops = new BlockMatcher(BlockCrops.class.getName(),
-								 "-" + BlockCarrot.class.getName(),
-								 "-" + BlockPotato.class.getName(),
-								 BlockTallGrass.class.getName(),
-								 BlockDoublePlant.class.getName(),
-								 BlockReed.class.getName(),
-								 "biomesoplenty.common.blocks.BlockBOPFlower",
-								 "biomesoplenty.common.blocks.BlockBOPFlower2",
-								 "tconstruct.blocks.slime.SlimeTallGrass");
-		crops.load(new File(BetterFoliage.configDir, "classesCrops.cfg"));
-		
-		BetterFoliage.log.info("Registering leaf texture generator");
-		leafGenerator = new LeafTextureGenerator();
-		MinecraftForge.EVENT_BUS.register(leafGenerator);
-		leafGenerator.recognizers.add(new BetterFoliageClient());
-		
-		MinecraftForge.EVENT_BUS.register(new BlockTextureGenerator("bf_reed_bottom", new ResourceLocation("betterfoliage", "textures/blocks/missing_leaf.png")) {
-			@Override
-			public IResource getResource(ResourceLocation var1) throws IOException {
-				return new HalfTextureResource(unwrapResource(var1), true, getMissingResource());
-			}
-		});
-		MinecraftForge.EVENT_BUS.register(new BlockTextureGenerator("bf_reed_top", new ResourceLocation("betterfoliage", "textures/blocks/missing_leaf.png")) {
-			@Override
-			public IResource getResource(ResourceLocation var1) throws IOException {
-				return new HalfTextureResource(unwrapResource(var1), false, getMissingResource());
-			}
-		});
-
-		MinecraftForge.EVENT_BUS.register(new BetterFoliageClient());
-	}
-
-	public boolean isLeafTexture(TextureAtlasSprite icon) {
-		String resourceLocation = icon.getIconName();
-		if (resourceLocation.startsWith("forestry:leaves/")) return true;
-		return false;
-	}
-	
-	public static int getRenderTypeOverride(IBlockAccess blockAccess, int x, int y, int z, Block block, int original) {
-		// universal sign for DON'T RENDER ME!
-		if (original == -1) return original;
-		
-		for (Map.Entry<Integer, IRenderBlockDecorator> entry : decorators.entrySet())
-			if (entry.getValue().isBlockAccepted(blockAccess, x, y, z, block, original))
-				return entry.getKey();
-		
-		return original;
-	}
-	
-	public static int getGLSLBlockIdOverride(int original, Block block) {
-		if (leaves.matchesID(original & 0xFFFF))
-			return Block.blockRegistry.getIDForObject(Blocks.leaves) & 0xFFFF | block.getRenderType() << 16;
-		if (crops.matchesID(original & 0xFFFF))
-			return Block.blockRegistry.getIDForObject(Blocks.tallgrass) & 0xFFFF | block.getRenderType() << 16;
-		return original;
-	}
-	
-	public static void registerRenderer(IRenderBlockDecorator decorator) {
-		int renderId = RenderingRegistry.getNextAvailableRenderId();
-		decorators.put(renderId, decorator);
-		RenderingRegistry.registerBlockHandler(renderId, decorator);
-		MinecraftForge.EVENT_BUS.register(decorator);
-		decorator.init();
-	}
-
-}

src/main/java/mods/betterfoliage/client/BlockMatcher.java

@@ -1,116 +0,0 @@
-package mods.betterfoliage.client;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Set;
-
-import mods.betterfoliage.BetterFoliage;
-import net.minecraft.block.Block;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.world.WorldEvent;
-
-import com.google.common.collect.Sets;
-
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-
-public class BlockMatcher {
-
-	public Set<String> whiteList = Sets.newHashSet();
-	public Set<String> blackList = Sets.newHashSet();
-	public Set<Integer> blockIDs = Sets.newHashSet();
-	
-	public BlockMatcher(String... defaults) {
-		for (String clazz : defaults) addClass(clazz);
-		MinecraftForge.EVENT_BUS.register(this);
-	}
-	
-	public void addClass(String className) {
-		if (className.startsWith("-"))
-			blackList.add(className.substring(1));
-		else
-			whiteList.add(className);
-	}
-	
-	public boolean matchesClass(Block block) {
-		for (String className : blackList) {
-			try {
-				Class<?> clazz = Class.forName(className);
-				if (clazz.isAssignableFrom(block.getClass())) return false;
-			} catch(ClassNotFoundException e) {}
-		}
-		for (String className : whiteList) {
-			try {
-				Class<?> clazz = Class.forName(className);
-				if (clazz.isAssignableFrom(block.getClass())) return true;
-			} catch(ClassNotFoundException e) {}
-		}
-		return false;
-	}
-	
-	public boolean matchesID(int blockId) {
-		return blockIDs.contains(blockId);
-	}
-	
-	public boolean matchesID(Block block) {
-		return blockIDs.contains(Block.blockRegistry.getIDForObject(block));
-	}
-	
-	public void load(File file) {
-		BufferedReader reader = null;
-		try {
-			reader = new BufferedReader(new FileReader(file));
-			whiteList.clear();
-			blackList.clear();
-			String line = reader.readLine();
-			while(line != null) {
-				addClass(line.trim());
-				line = reader.readLine();
-			}
-			reader.close();
-		} catch (FileNotFoundException e) {
-			saveDefaults(file);
-		} catch (IOException e) {
-			BetterFoliage.log.warn(String.format("Error reading configuration: %s", file.getName()));
-		}
-	}
-	
-	public void saveDefaults(File file) {
-		FileWriter writer = null;
-		try {
-			writer = new FileWriter(file);
-			for (String className : whiteList) {
-				writer.write(className);
-				writer.write("\n");
-			}
-			for (String className : blackList) {
-				writer.write("-");
-				writer.write(className);
-				writer.write("\n");
-			}
-			writer.close();
-		} catch (FileNotFoundException e) {
-			saveDefaults(file);
-		} catch (IOException e) {
-			BetterFoliage.log.warn(String.format("Error writing default configuration: %s", file.getName()));
-		}
-	}
-	
-	/** Caches block IDs on world load for fast lookup
-	 * @param event
-	 */
-	@SuppressWarnings("unchecked")
-	@SubscribeEvent
-	public void handleWorldLoad(WorldEvent.Load event) {
-		blockIDs.clear();
-		Iterator<Block> iter = Block.blockRegistry.iterator();
-		while (iter.hasNext()) {
-			Block block = iter.next();
-			if (matchesClass(block)) blockIDs.add(Block.blockRegistry.getIDForObject(block));
-		}
-	}
-}

src/main/java/mods/betterfoliage/client/KeyHandler.java

@@ -1,27 +0,0 @@
-package mods.betterfoliage.client;
-
-import cpw.mods.fml.client.FMLClientHandler;
-import cpw.mods.fml.client.registry.ClientRegistry;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.InputEvent;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import mods.betterfoliage.BetterFoliage;
-import mods.betterfoliage.client.gui.ConfigGuiMain;
-import net.minecraft.client.settings.KeyBinding;
-
-@SideOnly(Side.CLIENT)
-public class KeyHandler {
-	
-	public static KeyBinding guiBinding;
-	
-	public KeyHandler() {
-		guiBinding = new KeyBinding("key.betterfoliage.gui", 66, BetterFoliage.MOD_NAME);
-		ClientRegistry.registerKeyBinding(guiBinding);
-	}
-	
-	@SubscribeEvent
-	public void handleKeyPress(InputEvent.KeyInputEvent event) {
-		if (guiBinding.isPressed()) FMLClientHandler.instance().showGuiScreen(new ConfigGuiMain(null));
-	}
-}

src/main/java/mods/betterfoliage/client/gui/ConfigGuiAlgae.java

@@ -1,36 +0,0 @@
-package mods.betterfoliage.client.gui;
-
-import mods.betterfoliage.BetterFoliage;
-import mods.betterfoliage.client.gui.widget.OptionDoubleWidget;
-import mods.betterfoliage.client.gui.widget.OptionIntegerWidget;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.resources.I18n;
-import cpw.mods.fml.client.FMLClientHandler;
-
-public class ConfigGuiAlgae extends ConfigGuiScreenBase {
-
-	public ConfigGuiAlgae(GuiScreen parent) {
-		super(parent);
-		int id = 10;
-		widgets.add(new OptionDoubleWidget(BetterFoliage.config.algaeHOffset, -100, -70, 200, 50, id++, id++, "message.betterfoliage.hOffset", "%.3f"));
-		widgets.add(new OptionDoubleWidget(BetterFoliage.config.algaeSize, -100, -40, 200, 50, id++, id++, "message.betterfoliage.size", "%.2f"));
-		widgets.add(new OptionDoubleWidget(BetterFoliage.config.algaeHeightMin, -100, -10, 200, 50, id++, id++, "message.betterfoliage.minHeight", "%.2f"));
-		widgets.add(new OptionDoubleWidget(BetterFoliage.config.algaeHeightMax, -100, 20, 200, 50, id++, id++, "message.betterfoliage.maxHeight", "%.2f"));
-		widgets.add(new OptionIntegerWidget(BetterFoliage.config.algaeChance, -100, 50, 200, 50, id++, id++, "message.betterfoliage.algaeChance"));
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public void addButtons(int x, int y) {
-		buttonList.add(new GuiButton(0, x - 50, y + 100, 100, 20, I18n.format("message.betterfoliage.back")));
-	}
-
-	@Override
-	protected void onButtonPress(int id) {
-		if (id == 0) FMLClientHandler.instance().showGuiScreen(parent);
-		
-		if (BetterFoliage.config.algaeHeightMin.value > BetterFoliage.config.algaeHeightMax.value) BetterFoliage.config.algaeHeightMin.value = BetterFoliage.config.algaeHeightMax.value;
-	}
-	
-}

src/main/java/mods/betterfoliage/client/gui/ConfigGuiFactory.java

@@ -1,32 +0,0 @@
-package mods.betterfoliage.client.gui;
-
-import java.util.Set;
-
-import com.google.common.collect.ImmutableSet;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiScreen;
-import cpw.mods.fml.client.IModGuiFactory;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class ConfigGuiFactory implements IModGuiFactory {
-
-	public void initialize(Minecraft minecraftInstance) {
-		
-	}
-
-	public Class<? extends GuiScreen> mainConfigGuiClass() {
-		return ConfigGuiMain.class;
-	}
-
-	public Set<RuntimeOptionCategoryElement> runtimeGuiCategories() {
-		return ImmutableSet.<RuntimeOptionCategoryElement>of();
-	}
-
-	public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement element) {
-		return null;
-	}
-
-}

src/main/java/mods/betterfoliage/client/gui/ConfigGuiGrass.java

@@ -1,34 +0,0 @@
-package mods.betterfoliage.client.gui;
-
-import mods.betterfoliage.BetterFoliage;
-import mods.betterfoliage.client.gui.widget.OptionDoubleWidget;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.resources.I18n;
-import cpw.mods.fml.client.FMLClientHandler;
-
-public class ConfigGuiGrass extends ConfigGuiScreenBase {
-
-	public ConfigGuiGrass(GuiScreen parent) {
-		super(parent);
-		int id = 10;
-		widgets.add(new OptionDoubleWidget(BetterFoliage.config.grassSize, -100, -70, 200, 50, id++, id++, "message.betterfoliage.size", "%.2f"));
-		widgets.add(new OptionDoubleWidget(BetterFoliage.config.grassHOffset, -100, -40, 200, 50, id++, id++, "message.betterfoliage.hOffset", "%.3f"));
-		widgets.add(new OptionDoubleWidget(BetterFoliage.config.grassHeightMin, -100, -10, 200, 50, id++, id++, "message.betterfoliage.minHeight", "%.2f"));
-		widgets.add(new OptionDoubleWidget(BetterFoliage.config.grassHeightMax, -100, 20, 200, 50, id++, id++, "message.betterfoliage.maxHeight", "%.2f"));
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public void addButtons(int x, int y) {
-		buttonList.add(new GuiButton(0, x - 50, y + 50, 100, 20, I18n.format("message.betterfoliage.back")));
-	}
-
-	@Override
-	protected void onButtonPress(int id) {
-		if (id == 0) FMLClientHandler.instance().showGuiScreen(parent);
-		
-		if (BetterFoliage.config.grassHeightMin.value > BetterFoliage.config.grassHeightMax.value) BetterFoliage.config.grassHeightMin.value = BetterFoliage.config.grassHeightMax.value;
-	}
-	
-}

src/main/java/mods/betterfoliage/client/gui/ConfigGuiLeaves.java

@@ -1,39 +0,0 @@
-package mods.betterfoliage.client.gui;
-
-import mods.betterfoliage.BetterFoliage;
-import mods.betterfoliage.client.gui.widget.OptionDoubleWidget;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.resources.I18n;
-import cpw.mods.fml.client.FMLClientHandler;
-
-public class ConfigGuiLeaves extends ConfigGuiScreenBase {
-
-	public enum Button {CLOSE, LEAVES_OFFSET_MODE}
-	
-	public ConfigGuiLeaves(GuiScreen parent) {
-		super(parent);
-		int id = 10;
-		widgets.add(new OptionDoubleWidget(BetterFoliage.config.leavesSize, -100, -70, 200, 50, id++, id++, "message.betterfoliage.size", "%.2f"));
-		widgets.add(new OptionDoubleWidget(BetterFoliage.config.leavesHOffset, -100, -10, 200, 50, id++, id++, "message.betterfoliage.hOffset", "%.3f"));
-		widgets.add(new OptionDoubleWidget(BetterFoliage.config.leavesVOffset, -100, 20, 200, 50, id++, id++, "message.betterfoliage.vOffset", "%.3f"));
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public void addButtons(int x, int y) {
-		buttonList.add(new GuiButton(Button.CLOSE.ordinal(), x - 50, y + 50, 100, 20, I18n.format("message.betterfoliage.back")));
-		buttonList.add(new GuiButton(Button.LEAVES_OFFSET_MODE.ordinal(), x - 100, y - 40, 200, 20, ""));
-	}
-
-	protected void updateButtons() {
-		setButtonOptionBoolean(Button.LEAVES_OFFSET_MODE.ordinal(), "message.betterfoliage.leavesMode", BetterFoliage.config.leavesSkew ? "message.betterfoliage.leavesSkew" : "message.betterfoliage.leavesTranslate");
-	}
-
-	@Override
-	protected void onButtonPress(int id) {
-		if (id == Button.CLOSE.ordinal()) FMLClientHandler.instance().showGuiScreen(parent);
-		if (id == Button.LEAVES_OFFSET_MODE.ordinal()) BetterFoliage.config.leavesSkew = !BetterFoliage.config.leavesSkew;
-	}
-	
-}

src/main/java/mods/betterfoliage/client/gui/ConfigGuiLilypad.java

@@ -1,31 +0,0 @@
-package mods.betterfoliage.client.gui;
-
-import mods.betterfoliage.BetterFoliage;
-import mods.betterfoliage.client.gui.widget.OptionDoubleWidget;
-import mods.betterfoliage.client.gui.widget.OptionIntegerWidget;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.resources.I18n;
-import cpw.mods.fml.client.FMLClientHandler;
-
-public class ConfigGuiLilypad extends ConfigGuiScreenBase {
-
-	public ConfigGuiLilypad(GuiScreen parent) {
-		super(parent);
-		int id = 10;
-		widgets.add(new OptionDoubleWidget(BetterFoliage.config.lilypadHOffset, -100, -40, 200, 50, id++, id++, "message.betterfoliage.hOffset", "%.3f"));
-		widgets.add(new OptionIntegerWidget(BetterFoliage.config.lilypadChance, -100, -10, 200, 50, id++, id++, "message.betterfoliage.flowerChance"));
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public void addButtons(int x, int y) {
-		buttonList.add(new GuiButton(0, x - 50, y + 50, 100, 20, I18n.format("message.betterfoliage.back")));
-	}
-
-	@Override
-	protected void onButtonPress(int id) {
-		if (id == 0) FMLClientHandler.instance().showGuiScreen(parent);
-	}
-	
-}

src/main/java/mods/betterfoliage/client/gui/ConfigGuiMain.java

@@ -1,83 +0,0 @@
-package mods.betterfoliage.client.gui;
-
-import mods.betterfoliage.BetterFoliage;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.resources.I18n;
-import cpw.mods.fml.client.FMLClientHandler;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class ConfigGuiMain extends ConfigGuiScreenBase {
-
-	public enum Button {CLOSE, 
-						TOGGLE_LEAVES, CONFIG_LEAVES,
-						TOGGLE_GRASS, CONFIG_GRASS,
-						TOGGLE_CACTUS, CONFIG_CACTUS,
-						TOGGLE_LILYPAD, CONFIG_LILYPAD,
-						TOGGLE_REED, CONFIG_REED,
-						TOGGLE_ALGAE, CONFIG_ALGAE}
-	
-	public ConfigGuiMain(GuiScreen parent) {
-		super(parent);
-
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	protected void addButtons(int x, int y) {
-		buttonList.add(new GuiButton(Button.CLOSE.ordinal(), x - 50, y + 80, 100, 20, I18n.format("message.betterfoliage.close")));
-		
-		buttonList.add(new GuiButton(Button.TOGGLE_LEAVES.ordinal(), x - 100, y - 100, 150, 20, ""));
-		buttonList.add(new GuiButton(Button.CONFIG_LEAVES.ordinal(), x + 60, y - 100, 40, 20, I18n.format("message.betterfoliage.config")));
-		
-		buttonList.add(new GuiButton(Button.TOGGLE_GRASS.ordinal(), x - 100, y - 70, 150, 20, ""));
-		buttonList.add(new GuiButton(Button.CONFIG_GRASS.ordinal(), x + 60, y - 70, 40, 20, I18n.format("message.betterfoliage.config")));
-		
-		buttonList.add(new GuiButton(Button.TOGGLE_CACTUS.ordinal(), x - 100, y - 40, 150, 20, ""));
-		buttonList.add(new GuiButton(Button.CONFIG_CACTUS.ordinal(), x + 60, y - 40, 40, 20, I18n.format("message.betterfoliage.config")));
-		
-		buttonList.add(new GuiButton(Button.TOGGLE_LILYPAD.ordinal(), x - 100, y - 10, 150, 20, ""));
-		buttonList.add(new GuiButton(Button.CONFIG_LILYPAD.ordinal(), x + 60, y - 10, 40, 20, I18n.format("message.betterfoliage.config")));
-		
-		buttonList.add(new GuiButton(Button.TOGGLE_REED.ordinal(), x - 100, y + 20, 150, 20, ""));
-		buttonList.add(new GuiButton(Button.CONFIG_REED.ordinal(), x + 60, y + 20, 40, 20, I18n.format("message.betterfoliage.config")));
-		
-		buttonList.add(new GuiButton(Button.TOGGLE_ALGAE.ordinal(), x - 100, y + 50, 150, 20, ""));
-		buttonList.add(new GuiButton(Button.CONFIG_ALGAE.ordinal(), x + 60, y + 50, 40, 20, I18n.format("message.betterfoliage.config")));
-	}
-
-	protected void updateButtons() {
-		setButtonOptionBoolean(Button.TOGGLE_LEAVES.ordinal(), "message.betterfoliage.betterLeaves", BetterFoliage.config.leavesEnabled);
-		setButtonOptionBoolean(Button.TOGGLE_GRASS.ordinal(), "message.betterfoliage.betterGrass", BetterFoliage.config.grassEnabled);
-		setButtonOptionBoolean(Button.TOGGLE_CACTUS.ordinal(), "message.betterfoliage.betterCactus", BetterFoliage.config.cactusEnabled);
-		setButtonOptionBoolean(Button.TOGGLE_LILYPAD.ordinal(), "message.betterfoliage.betterLilypad", BetterFoliage.config.lilypadEnabled);
-		setButtonOptionBoolean(Button.TOGGLE_REED.ordinal(), "message.betterfoliage.betterReed", BetterFoliage.config.reedEnabled);
-		setButtonOptionBoolean(Button.TOGGLE_ALGAE.ordinal(), "message.betterfoliage.betterAlgae", BetterFoliage.config.algaeEnabled);
-		((GuiButton) buttonList.get(Button.CONFIG_CACTUS.ordinal())).enabled = false;
-	}
-	
-	@Override
-	protected void onButtonPress(int id) {
-		if (id == Button.CLOSE.ordinal()) {
-			BetterFoliage.config.save();
-			Minecraft.getMinecraft().renderGlobal.loadRenderers();
-			FMLClientHandler.instance().showGuiScreen(parent);
-		}
-		if (id == Button.TOGGLE_LEAVES.ordinal()) BetterFoliage.config.leavesEnabled = !BetterFoliage.config.leavesEnabled;
-		if (id == Button.TOGGLE_GRASS.ordinal()) BetterFoliage.config.grassEnabled = !BetterFoliage.config.grassEnabled;
-		if (id == Button.TOGGLE_CACTUS.ordinal()) BetterFoliage.config.cactusEnabled = !BetterFoliage.config.cactusEnabled;
-		if (id == Button.TOGGLE_LILYPAD.ordinal()) BetterFoliage.config.lilypadEnabled = !BetterFoliage.config.lilypadEnabled;
-		if (id == Button.TOGGLE_REED.ordinal()) BetterFoliage.config.reedEnabled = !BetterFoliage.config.reedEnabled;
-		if (id == Button.TOGGLE_ALGAE.ordinal()) BetterFoliage.config.algaeEnabled = !BetterFoliage.config.algaeEnabled;
-		
-		if (id== Button.CONFIG_LEAVES.ordinal()) FMLClientHandler.instance().showGuiScreen(new ConfigGuiLeaves(this));
-		if (id== Button.CONFIG_GRASS.ordinal()) FMLClientHandler.instance().showGuiScreen(new ConfigGuiGrass(this));
-		if (id== Button.CONFIG_LILYPAD.ordinal()) FMLClientHandler.instance().showGuiScreen(new ConfigGuiLilypad(this));
-		if (id== Button.CONFIG_REED.ordinal()) FMLClientHandler.instance().showGuiScreen(new ConfigGuiReed(this));
-		if (id== Button.CONFIG_ALGAE.ordinal()) FMLClientHandler.instance().showGuiScreen(new ConfigGuiAlgae(this));
-	}
-
-}

src/main/java/mods/betterfoliage/client/gui/ConfigGuiReed.java

@@ -1,35 +0,0 @@
-package mods.betterfoliage.client.gui;
-
-import mods.betterfoliage.BetterFoliage;
-import mods.betterfoliage.client.gui.widget.OptionDoubleWidget;
-import mods.betterfoliage.client.gui.widget.OptionIntegerWidget;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.resources.I18n;
-import cpw.mods.fml.client.FMLClientHandler;
-
-public class ConfigGuiReed extends ConfigGuiScreenBase {
-
-	public ConfigGuiReed(GuiScreen parent) {
-		super(parent);
-		int id = 10;
-		widgets.add(new OptionDoubleWidget(BetterFoliage.config.reedHOffset, -100, -70, 200, 50, id++, id++, "message.betterfoliage.hOffset", "%.3f"));
-		widgets.add(new OptionDoubleWidget(BetterFoliage.config.reedHeightMin, -100, -40, 200, 50, id++, id++, "message.betterfoliage.minHeight", "%.2f"));
-		widgets.add(new OptionDoubleWidget(BetterFoliage.config.reedHeightMax, -100, -10, 200, 50, id++, id++, "message.betterfoliage.maxHeight", "%.2f"));
-		widgets.add(new OptionIntegerWidget(BetterFoliage.config.reedChance, -100, 20, 200, 50, id++, id++, "message.betterfoliage.reedChance"));
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public void addButtons(int x, int y) {
-		buttonList.add(new GuiButton(0, x - 50, y + 50, 100, 20, I18n.format("message.betterfoliage.back")));
-	}
-
-	@Override
-	protected void onButtonPress(int id) {
-		if (id == 0) FMLClientHandler.instance().showGuiScreen(parent);
-		
-		if (BetterFoliage.config.reedHeightMin.value > BetterFoliage.config.reedHeightMax.value) BetterFoliage.config.reedHeightMin.value = BetterFoliage.config.reedHeightMax.value;
-	}
-	
-}

src/main/java/mods/betterfoliage/client/gui/ConfigGuiScreenBase.java

@@ -1,75 +0,0 @@
-package mods.betterfoliage.client.gui;
-
-import java.util.List;
-
-import mods.betterfoliage.client.gui.widget.IOptionWidget;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.util.EnumChatFormatting;
-
-import com.google.common.collect.Lists;
-
-public class ConfigGuiScreenBase extends GuiScreen {
-
-	protected GuiScreen parent;
-	protected List<IOptionWidget> widgets = Lists.newLinkedList();
-	
-	public ConfigGuiScreenBase(GuiScreen parent) {
-		this.parent = parent;
-	}
-	
-	@Override
-	public void drawScreen(int par1, int par2, float par3) {
-		this.drawDefaultBackground();
-		int x = width / 2;
-		int y = height / 2;
-		for (IOptionWidget widget : widgets) widget.drawStrings(this, fontRendererObj, x, y, 14737632, 16777120);
-		super.drawScreen(par1, par2, par3);
-	}
-	
-	@SuppressWarnings("unchecked")
-	@Override
-	public void initGui() {
-		int x = width / 2;
-		int y = height / 2;
-		for (IOptionWidget widget : widgets) widget.addButtons(buttonList, x, y);
-		addButtons(x, y);
-		updateButtons();
-	}
-	
-	protected void addButtons(int x, int y) {}
-	
-	protected void updateButtons() {}
-	
-	protected void onButtonPress(int id) {}
-	
-	@Override
-	protected void actionPerformed(GuiButton button) {
-		super.actionPerformed(button);
-		for (IOptionWidget widget : widgets) widget.onAction(button.id);
-		onButtonPress(button.id);
-		updateButtons();
-	}
-	
-	@SuppressWarnings("unchecked")
-	protected void setButtonOptionBoolean(int id, String msgKey, boolean option) {
-		for (GuiButton button : (List<GuiButton>) buttonList) {
-			if (button.id == id) {
-				String optionText = option ? (EnumChatFormatting.GREEN + I18n.format("message.betterfoliage.optionOn")) : (EnumChatFormatting.RED + I18n.format("message.betterfoliage.optionOff"));
-				button.displayString = I18n.format(msgKey, optionText);
-				break;
-			}
-		}
-	}
-	
-	@SuppressWarnings("unchecked")
-	protected void setButtonOptionBoolean(int id, String msgKey, String optionKey) {
-		for (GuiButton button : (List<GuiButton>) buttonList) {
-			if (button.id == id) {
-				button.displayString = I18n.format(msgKey, I18n.format(optionKey));
-				break;
-			}
-		}
-	}
-}

src/main/java/mods/betterfoliage/client/gui/widget/IOptionWidget.java

@@ -1,15 +0,0 @@
-package mods.betterfoliage.client.gui.widget;
-
-import java.util.List;
-
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
-
-public interface IOptionWidget {
-
-	public void addButtons(List<GuiButton> buttonList, int xOffset, int yOffset);
-	public void drawStrings(GuiScreen screen, FontRenderer fontRenderer, int xOffset, int yOffset, int labelColor, int numColor);
-	public void onAction(int buttonId);
-
-}

src/main/java/mods/betterfoliage/client/gui/widget/OptionDoubleWidget.java

@@ -1,53 +0,0 @@
-package mods.betterfoliage.client.gui.widget;
-
-import java.util.List;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-import mods.betterfoliage.common.config.OptionDouble;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.resources.I18n;
-
-@SideOnly(Side.CLIENT)
-public class OptionDoubleWidget implements IOptionWidget {
-
-	public OptionDouble option;
-	public int x;
-	public int y;
-	public int width;
-	public int numWidth;
-	public int idDecrement;
-	public int idIncrement;
-	public String keyLabel;
-	public String formatString;
-	
-	public OptionDoubleWidget(OptionDouble option, int x, int y, int width, int numWidth, int idDecrement, int idIncrement, String keyLabel, String formatString) {
-		this.option = option;
-		this.x = x;
-		this.y = y;
-		this.width = width;
-		this.numWidth = numWidth;
-		this.idDecrement = idDecrement;
-		this.idIncrement = idIncrement;
-		this.keyLabel = keyLabel;
-		this.formatString = formatString;
-	}
-	
-	public void addButtons(List<GuiButton> buttonList, int xOffset, int yOffset) {
-		buttonList.add(new GuiButton(idDecrement, xOffset + x + width - numWidth - 40, yOffset + y, 20, 20, "-"));
-		buttonList.add(new GuiButton(idIncrement, xOffset + x + width - 20, yOffset + y, 20, 20, "+"));
-	}
-	
-	public void drawStrings(GuiScreen screen, FontRenderer fontRenderer, int xOffset, int yOffset, int labelColor, int numColor) {
-		screen.drawString(fontRenderer, I18n.format(keyLabel), xOffset + x, yOffset + y + 5, labelColor);
-		screen.drawCenteredString(fontRenderer, String.format(formatString, option.value), xOffset + x + width - 20 - numWidth / 2, yOffset + y + 5, numColor);
-	}
-
-	public void onAction(int buttonId) {
-		if (buttonId == idDecrement) option.decrement();
-		if (buttonId == idIncrement) option.increment();
-	}
-}

src/main/java/mods/betterfoliage/client/gui/widget/OptionIntegerWidget.java

@@ -1,50 +0,0 @@
-package mods.betterfoliage.client.gui.widget;
-
-import java.util.List;
-
-import mods.betterfoliage.common.config.OptionInteger;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.resources.I18n;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class OptionIntegerWidget implements IOptionWidget {
-
-	public OptionInteger option;
-	public int x;
-	public int y;
-	public int width;
-	public int numWidth;
-	public int idDecrement;
-	public int idIncrement;
-	public String keyLabel;
-	
-	public OptionIntegerWidget(OptionInteger option, int x, int y, int width, int numWidth, int idDecrement, int idIncrement, String keyLabel) {
-		this.option = option;
-		this.x = x;
-		this.y = y;
-		this.width = width;
-		this.numWidth = numWidth;
-		this.idDecrement = idDecrement;
-		this.idIncrement = idIncrement;
-		this.keyLabel = keyLabel;
-	}
-	
-	public void addButtons(List<GuiButton> buttonList, int xOffset, int yOffset) {
-		buttonList.add(new GuiButton(idDecrement, xOffset + x + width - numWidth - 40, yOffset + y, 20, 20, "-"));
-		buttonList.add(new GuiButton(idIncrement, xOffset + x + width - 20, yOffset + y, 20, 20, "+"));
-	}
-	
-	public void drawStrings(GuiScreen screen, FontRenderer fontRenderer, int xOffset, int yOffset, int labelColor, int numColor) {
-		screen.drawString(fontRenderer, I18n.format(keyLabel), xOffset + x, yOffset + y + 5, labelColor);
-		screen.drawCenteredString(fontRenderer, Integer.toString(option.value), xOffset + x + width - 20 - numWidth / 2, yOffset + y + 5, numColor);
-	}
-	
-	public void onAction(int buttonId) {
-		if (buttonId == idDecrement) option.decrement();
-		if (buttonId == idIncrement) option.increment();
-	}
-}

src/main/java/mods/betterfoliage/client/render/FakeRenderBlockAOBase.java

@@ -1,62 +0,0 @@
-package mods.betterfoliage.client.render;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.block.Block;
-import net.minecraft.util.IIcon;
-
-/** Same as {@link RenderBlockAOBase}, but does not actually render anything.
- * @author octarine-noise
- */
-@SideOnly(Side.CLIENT)
-public class FakeRenderBlockAOBase extends RenderBlockAOBase {
-
-	@Override
-	public void renderFaceZNeg(Block block, double x, double y, double z, IIcon icon) {
-		saveShadingTopLeft(aoZNXYPP);
-		saveShadingTopRight(aoZNXYNP);
-		saveShadingBottomLeft(aoZNXYPN);
-		saveShadingBottomRight(aoZNXYNN);
-	}
-
-	@Override
-	public void renderFaceZPos(Block block, double x, double y, double z, IIcon icon) {
-		saveShadingTopLeft(aoZPXYNP);
-		saveShadingTopRight(aoZPXYPP);
-		saveShadingBottomLeft(aoZPXYNN);
-		saveShadingBottomRight(aoZPXYPN);
-	}
-
-	@Override
-	public void renderFaceXNeg(Block block, double x, double y, double z, IIcon icon) {
-		saveShadingTopLeft(aoXNYZPN);
-		saveShadingTopRight(aoXNYZPP);
-		saveShadingBottomLeft(aoXNYZNN);
-		saveShadingBottomRight(aoXNYZNP);
-	}
-
-	@Override
-	public void renderFaceXPos(Block block, double x, double y, double z, IIcon icon) {
-		saveShadingTopLeft(aoXPYZPP);
-		saveShadingTopRight(aoXPYZPN);
-		saveShadingBottomLeft(aoXPYZNP);
-		saveShadingBottomRight(aoXPYZNN);
-	}
-
-	@Override
-	public void renderFaceYNeg(Block block, double x, double y, double z, IIcon icon) {
-		saveShadingTopLeft(aoYNXZNP);
-		saveShadingTopRight(aoYNXZPP);
-		saveShadingBottomLeft(aoYNXZNN);
-		saveShadingBottomRight(aoYNXZPN);
-	}
-
-	@Override
-	public void renderFaceYPos(Block block, double x, double y, double z, IIcon icon) {
-		saveShadingTopLeft(aoYPXZPP);
-		saveShadingTopRight(aoYPXZNP);
-		saveShadingBottomLeft(aoYPXZPN);
-		saveShadingBottomRight(aoYPXZNN);
-	}
-	
-}

src/main/java/mods/betterfoliage/client/render/IRenderBlockDecorator.java

@@ -1,15 +0,0 @@
-package mods.betterfoliage.client.render;
-
-import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.block.Block;
-import net.minecraft.world.IBlockAccess;
-
-@SideOnly(Side.CLIENT)
-public interface IRenderBlockDecorator extends ISimpleBlockRenderingHandler {
-
-	public void init();
-	public boolean isBlockAccepted(IBlockAccess blockAccess, int x, int y, int z, Block block, int original);
-	
-}

src/main/java/mods/betterfoliage/client/render/IconSet.java

@@ -1,52 +0,0 @@
-package mods.betterfoliage.client.render;
-
-import mods.betterfoliage.common.util.Utils;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.ResourceLocation;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-/** Loads an indexed set of textures
- * @author octarine-noise
- */
-@SideOnly(Side.CLIENT)
-public class IconSet {
-
-	/** Icon array */
-	public IIcon[] icons = new IIcon[16];
-	
-	/** Number of successfully loaded icons*/
-	public int numLoaded = 0;
-	
-	/** Resource domain of icons */
-	String domain;
-	
-	/** Format string of icon paths */
-	String path;
-	
-	public IconSet(String domain, String path) {
-		this.domain = domain;
-		this.path = path;
-	}
-	
-	public void registerIcons(IIconRegister register) {
-		numLoaded = 0;
-		for (int idx = 0; idx < 16; idx++) {
-			icons[idx] = null;
-			// if the path contains a domain, use that to check if the resource exists
-			String resolvedDomain = path.contains(":") ? new ResourceLocation(path).getResourceDomain() : domain;
-			String resolvedPath = String.format("textures/blocks/" + (path.contains(":") ? new ResourceLocation(path).getResourcePath() : path) + ".png", idx);
-			if (Utils.resourceExists(new ResourceLocation(resolvedDomain, resolvedPath)))
-				icons[numLoaded++] = register.registerIcon(domain + ":" + String.format(path, idx));
-		}
-	}
-	
-	public IIcon get(int variation) {
-		return numLoaded == 0 ? null : icons[variation % numLoaded];
-	}
-	
-	public boolean hasIcons() {
-		return numLoaded > 0;
-	}
-}

src/main/java/mods/betterfoliage/client/render/RenderBlockAOBase.java

@@ -1,437 +0,0 @@
-package mods.betterfoliage.client.render;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import mods.betterfoliage.common.util.Double3;
-import net.minecraft.block.Block;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.init.Blocks;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.MathHelper;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import org.lwjgl.opengl.GL11;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-/** Block renderer base class. Stores calculated ambient occlusion light and color values when rendering
- *  block sides for later use.
- * @author octarine-noise
- */
-@SideOnly(Side.CLIENT)
-public class RenderBlockAOBase extends RenderBlocks {
-
-	/** AO light and color values
-	 * @author octarine-noise
-	 */
-	@SideOnly(Side.CLIENT)
-	public static class ShadingValues {
-		public int passCounter = 0;
-		public int brightness;
-		public float red;
-		public float green;
-		public float blue;
-	}
-	
-	protected double[] uValues = new double[] {0.0, 16.0, 16.0, 0.0};
-	protected double[] vValues = new double[] {0.0, 0.0, 16.0, 16.0};
-	
-	protected ForgeDirection[] faceDir1 = new ForgeDirection[] {ForgeDirection.WEST, ForgeDirection.WEST, ForgeDirection.WEST, ForgeDirection.EAST, ForgeDirection.SOUTH, ForgeDirection.NORTH};
-	protected ForgeDirection[] faceDir2 = new ForgeDirection[] {ForgeDirection.NORTH, ForgeDirection.SOUTH, ForgeDirection.UP, ForgeDirection.UP, ForgeDirection.UP, ForgeDirection.UP};
-	
-	/** Random vector pool. Unit rotation vectors in the XZ plane, Y coord goes between [-1.0, 1.0].
-	 * Filled at init time */
-	public Double3[] pRot = new Double3[64];
-	
-	/** Pool of random double values. Filled at init time. */
-	public double[] pRand = new double[64];
-	
-	public ShadingValues aoXPYZPP = new ShadingValues();
-	public ShadingValues aoXPYZPN = new ShadingValues();
-	public ShadingValues aoXPYZNP = new ShadingValues();
-	public ShadingValues aoXPYZNN = new ShadingValues();
-	public ShadingValues aoXNYZPP = new ShadingValues();
-	public ShadingValues aoXNYZPN = new ShadingValues();
-	public ShadingValues aoXNYZNP = new ShadingValues();
-	public ShadingValues aoXNYZNN = new ShadingValues();
-	public ShadingValues aoYPXZPP = new ShadingValues();
-	public ShadingValues aoYPXZPN = new ShadingValues();
-	public ShadingValues aoYPXZNP = new ShadingValues();
-	public ShadingValues aoYPXZNN = new ShadingValues();
-	public ShadingValues aoYNXZPP = new ShadingValues();
-	public ShadingValues aoYNXZPN = new ShadingValues();
-	public ShadingValues aoYNXZNP = new ShadingValues();
-	public ShadingValues aoYNXZNN = new ShadingValues();
-	public ShadingValues aoZPXYPP = new ShadingValues();
-	public ShadingValues aoZPXYPN = new ShadingValues();
-	public ShadingValues aoZPXYNP = new ShadingValues();
-	public ShadingValues aoZPXYNN = new ShadingValues();
-	public ShadingValues aoZNXYPP = new ShadingValues();
-	public ShadingValues aoZNXYPN = new ShadingValues();
-	public ShadingValues aoZNXYNP = new ShadingValues();
-	public ShadingValues aoZNXYNN = new ShadingValues();
-
-	// temporary shading values for a single face
-	public ShadingValues faceAOPP, faceAOPN, faceAONN, faceAONP;
-	
-	/** Initialize random values */
-	public void init() {
-		List<Double3> perturbs = new ArrayList<Double3>(64);
-		for (int idx = 0; idx < 64; idx++) {
-			double angle = (double) idx * Math.PI * 2.0 / 64.0;
-			perturbs.add(new Double3(Math.cos(angle), Math.random() * 2.0 - 1.0, Math.sin(angle)));
-			pRand[idx] = Math.random();
-		}
-		Collections.shuffle(perturbs);
-		Iterator<Double3> iter = perturbs.iterator();
-		for (int idx = 0; idx < 64; idx++) pRot[idx] = iter.next();
-	}
-			
-	/** Get a semi-random value depending on block position.
-	 * @param x block X coord
-	 * @param y block Y coord
-	 * @param z block Z coord
-	 * @param seed additional seed
-	 * @return semirandom value
-	 */
-	protected int getSemiRandomFromPos(double x, double y, double z, int seed) {
-		long lx = MathHelper.floor_double(x);
-		long ly = MathHelper.floor_double(y);
-		long lz = MathHelper.floor_double(z);
-		long value = (lx * lx + ly * ly + lz * lz + lx * ly + ly * lz + lz * lx + seed * seed) & 63;
-		value = (3 * lx * value + 5 * ly * value + 7 * lz * value + 11 * seed) & 63;
-		return (int) value;
-	}
-	
-	public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) {
-		renderStandardBlockAsItem(renderer, block, metadata, 1.0f);
-	}
-	
-	public boolean shouldRender3DInInventory(int modelId) {
-		return true;
-	}
-	
-	public int getRenderId() {
-		return 0;
-	}
-	
-	protected void renderStandardBlockAsItem(RenderBlocks renderer, Block p_147800_1_, int p_147800_2_, float p_147800_3_) {
-		Tessellator tessellator = Tessellator.instance;
-		boolean flag = p_147800_1_ == Blocks.grass;
-		
-        float f2;
-        float f3;
-        int k;
-        
-		p_147800_1_.setBlockBoundsForItemRender();
-		renderer.setRenderBoundsFromBlock(p_147800_1_);
-        GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F);
-        GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
-        tessellator.startDrawingQuads();
-        tessellator.setNormal(0.0F, -1.0F, 0.0F);
-        renderer.renderFaceYNeg(p_147800_1_, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(p_147800_1_, 0, p_147800_2_));
-        tessellator.draw();
-
-        if (flag && renderer.useInventoryTint)
-        {
-            k = p_147800_1_.getRenderColor(p_147800_2_);
-            f2 = (float)(k >> 16 & 255) / 255.0F;
-            f3 = (float)(k >> 8 & 255) / 255.0F;
-            float f4 = (float)(k & 255) / 255.0F;
-            GL11.glColor4f(f2 * p_147800_3_, f3 * p_147800_3_, f4 * p_147800_3_, 1.0F);
-        }
-
-        tessellator.startDrawingQuads();
-        tessellator.setNormal(0.0F, 1.0F, 0.0F);
-        renderer.renderFaceYPos(p_147800_1_, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(p_147800_1_, 1, p_147800_2_));
-        tessellator.draw();
-
-        if (flag && renderer.useInventoryTint)
-        {
-            GL11.glColor4f(p_147800_3_, p_147800_3_, p_147800_3_, 1.0F);
-        }
-
-        tessellator.startDrawingQuads();
-        tessellator.setNormal(0.0F, 0.0F, -1.0F);
-        renderer.renderFaceZNeg(p_147800_1_, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(p_147800_1_, 2, p_147800_2_));
-        tessellator.draw();
-        tessellator.startDrawingQuads();
-        tessellator.setNormal(0.0F, 0.0F, 1.0F);
-        renderer.renderFaceZPos(p_147800_1_, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(p_147800_1_, 3, p_147800_2_));
-        tessellator.draw();
-        tessellator.startDrawingQuads();
-        tessellator.setNormal(-1.0F, 0.0F, 0.0F);
-        renderer.renderFaceXNeg(p_147800_1_, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(p_147800_1_, 4, p_147800_2_));
-        tessellator.draw();
-        tessellator.startDrawingQuads();
-        tessellator.setNormal(1.0F, 0.0F, 0.0F);
-        renderer.renderFaceXPos(p_147800_1_, 0.0D, 0.0D, 0.0D, renderer.getBlockIconFromSideAndMetadata(p_147800_1_, 5, p_147800_2_));
-        tessellator.draw();
-        GL11.glTranslatef(0.5F, 0.5F, 0.5F);
-	}
-	
-	protected void setShadingForFace(ForgeDirection dir) {
-		if (dir == ForgeDirection.DOWN) {
-			// dir1 WEST, dir2 NORTH
-			faceAOPP = aoYNXZPP; faceAOPN = aoYNXZPN; faceAONN = aoYNXZNN; faceAONP = aoYNXZNP;
-		} else if (dir == ForgeDirection.UP) {
-			// dir1 WEST, dir2 SOUTH
-			faceAOPP = aoYPXZPP; faceAOPN = aoYPXZPN; faceAONN = aoYPXZNN; faceAONP = aoYPXZNP;
-		} else if (dir == ForgeDirection.NORTH) {
-			// dir1 WEST, dir2 UP
-			faceAOPP = aoZNXYNP; faceAOPN = aoZNXYNN; faceAONN = aoZNXYPN; faceAONP = aoZNXYPP;
-		} else if (dir == ForgeDirection.SOUTH) {
-			// dir1 EAST, dir2 UP
-			faceAOPP = aoZPXYPP; faceAOPN = aoZPXYPN; faceAONN = aoZPXYNN; faceAONP = aoZPXYNP;
-		} else if (dir == ForgeDirection.WEST) {
-			// dir1 SOUTH, dir2 UP
-			faceAOPP = aoXNYZPP; faceAOPN = aoXNYZNP; faceAONN = aoXNYZNN; faceAONP = aoXNYZPN;
-		} else if (dir == ForgeDirection.EAST) {
-			// dir1 NORTH, dir2 UP
-			faceAOPP = aoXPYZPN; faceAOPN = aoXPYZNN; faceAONN = aoXPYZNP; faceAONP = aoXPYZPP;
-		}
-	}
-	
-	public void renderCrossedSideQuads(Double3 drawBase, ForgeDirection dir, double scale, double halfHeight, Double3 rendomVec, double offset, IIcon renderIcon, int uvRot, boolean noShading) {
-		Double3 facePP, faceNP, faceNormal, drawCenter;
-		
-		if (dir == ForgeDirection.UP) {
-			// special case for block top, we'll be rendering a LOT of those
-			facePP = new Double3(-scale, 0.0, scale);
-			faceNP = new Double3(scale, 0.0, scale);
-			faceNormal = new Double3(0.0, halfHeight, 0.0);
-			drawCenter = drawBase.add(faceNormal);
-			if (rendomVec != null) {
-				drawCenter = drawBase.add(faceNormal).add(rendomVec.scaleAxes(-offset, 0.0, offset));
-			}
-		} else {
-			facePP = new Double3(faceDir1[dir.ordinal()]).add(new Double3(faceDir2[dir.ordinal()])).scale(scale);
-			faceNP = new Double3(faceDir1[dir.ordinal()]).inverse().add(new Double3(faceDir2[dir.ordinal()])).scale(scale);
-			faceNormal = new Double3(dir).scale(halfHeight);
-			drawCenter = drawBase.add(faceNormal);
-			if (rendomVec != null) {
-				drawCenter = drawCenter.add(new Double3(faceDir1[dir.ordinal()]).scale(rendomVec.x).scale(offset))
-									   .add(new Double3(faceDir2[dir.ordinal()]).scale(rendomVec.z).scale(offset));
-			}
-		}
-		
-		if (Minecraft.isAmbientOcclusionEnabled() && !noShading) {
-			setShadingForFace(dir);
-			renderQuadWithShading(renderIcon, drawCenter, facePP, faceNormal, uvRot,			faceAOPP, faceAONN, faceAONN, faceAOPP);
-			renderQuadWithShading(renderIcon, drawCenter, facePP.inverse(), faceNormal, uvRot,	faceAONN, faceAOPP, faceAOPP, faceAONN);
-			renderQuadWithShading(renderIcon, drawCenter, faceNP, faceNormal, uvRot, 			faceAONP, faceAOPN, faceAOPN, faceAONP);
-			renderQuadWithShading(renderIcon, drawCenter, faceNP.inverse(), faceNormal, uvRot,	faceAOPN, faceAONP, faceAONP, faceAOPN);
-		} else {
-			renderQuad(renderIcon, drawCenter, facePP, faceNormal, uvRot);
-			renderQuad(renderIcon, drawCenter, facePP.inverse(), faceNormal, uvRot);
-			renderQuad(renderIcon, drawCenter, faceNP, faceNormal, uvRot);
-			renderQuad(renderIcon, drawCenter, faceNP.inverse(), faceNormal, uvRot);
-		}
-	}
-	
-	protected void renderCrossedBlockQuadsTranslate(Double3 blockCenter, double halfSize, Double3 offsetVec, IIcon crossLeafIcon, int uvRot, boolean isAirTop, boolean isAirBottom) {
-		Double3 drawCenter = blockCenter;
-		if (offsetVec != null) drawCenter = drawCenter.add(offsetVec);
-		Double3 horz1 = new Double3(halfSize, 0.0, halfSize);
-		Double3 horz2 = new Double3(halfSize, 0.0, -halfSize);
-		Double3 vert1 = new Double3(0.0, halfSize * 1.41, 0.0);
-		
-		renderCrossedBlockQuadsInternal(drawCenter, horz1, horz2, vert1, crossLeafIcon, uvRot, isAirTop, isAirBottom);
-	}
-	
-	protected void renderCrossedBlockQuadsSkew(Double3 blockCenter, double halfSize, Double3 offsetVec1, Double3 offsetVec2, IIcon crossLeafIcon, int uvRot, boolean isAirTop, boolean isAirBottom) {
-		Double3 horz1 = new Double3(halfSize, 0.0, halfSize).add(offsetVec1);
-		Double3 horz2 = new Double3(halfSize, 0.0, -halfSize).add(offsetVec2);
-		Double3 vert1 = new Double3(0.0, halfSize * 1.41, 0.0);
-		
-		renderCrossedBlockQuadsInternal(blockCenter, horz1, horz2, vert1, crossLeafIcon, uvRot, isAirTop, isAirBottom);
-	}
-	
-	private void renderCrossedBlockQuadsInternal(Double3 drawCenter, Double3 horz1, Double3 horz2, Double3 vert1, IIcon crossLeafIcon, int uvRot, boolean isAirTop, boolean isAirBottom) {
-		if (Minecraft.isAmbientOcclusionEnabled()) {
-			renderQuadWithShading(crossLeafIcon, drawCenter, horz1, vert1, uvRot,
-					isAirTop ? aoYPXZPP : aoZPXYPP, isAirTop ? aoYPXZNN : aoXNYZPN, isAirBottom ? aoYNXZNN : aoXNYZNN, isAirBottom ? aoYNXZPP : aoZPXYPN);
-			renderQuadWithShading(crossLeafIcon, drawCenter, horz1.inverse(), vert1, uvRot,
-					isAirTop ? aoYPXZNN : aoZNXYNP, isAirTop ? aoYPXZPP : aoXPYZPP, isAirBottom ? aoYNXZPP : aoXPYZNP, isAirBottom ? aoYNXZNN : aoZNXYNN);
-			renderQuadWithShading(crossLeafIcon, drawCenter, horz2, vert1, uvRot,
-					isAirTop ? aoYPXZPN : aoXPYZPN, isAirTop ? aoYPXZNP : aoZPXYNP, isAirBottom ? aoYNXZNP : aoZPXYNN, isAirBottom ? aoYNXZPN : aoXPYZNN);
-			renderQuadWithShading(crossLeafIcon, drawCenter, horz2.inverse(), vert1, uvRot,
-					isAirTop ? aoYPXZNP : aoXNYZPP, isAirTop ? aoYPXZPN : aoZNXYPP, isAirBottom ? aoYNXZPN : aoZNXYPN, isAirBottom ? aoYNXZNP : aoXNYZNP);
-		} else {
-			renderQuad(crossLeafIcon, drawCenter, horz1, vert1, uvRot);
-			renderQuad(crossLeafIcon, drawCenter, horz1.inverse(), vert1, uvRot);
-			renderQuad(crossLeafIcon, drawCenter, horz2, vert1, uvRot);
-			renderQuad(crossLeafIcon, drawCenter, horz2.inverse(), vert1, uvRot);
-		}
-	}
-	
-	@Override
-	public void renderFaceZNeg(Block block, double x, double y, double z, IIcon icon) {
-		super.renderFaceZNeg(block, x, y, z, icon);
-		saveShadingTopLeft(aoZNXYPP);
-		saveShadingTopRight(aoZNXYNP);
-		saveShadingBottomLeft(aoZNXYPN);
-		saveShadingBottomRight(aoZNXYNN);
-	}
-
-	@Override
-	public void renderFaceZPos(Block block, double x, double y, double z, IIcon icon) {
-		super.renderFaceZPos(block, x, y, z, icon);
-		saveShadingTopLeft(aoZPXYNP);
-		saveShadingTopRight(aoZPXYPP);
-		saveShadingBottomLeft(aoZPXYNN);
-		saveShadingBottomRight(aoZPXYPN);
-	}
-
-	@Override
-	public void renderFaceXNeg(Block block, double x, double y, double z, IIcon icon) {
-		super.renderFaceXNeg(block, x, y, z, icon);
-		saveShadingTopLeft(aoXNYZPN);
-		saveShadingTopRight(aoXNYZPP);
-		saveShadingBottomLeft(aoXNYZNN);
-		saveShadingBottomRight(aoXNYZNP);
-	}
-
-	@Override
-	public void renderFaceXPos(Block block, double x, double y, double z, IIcon icon) {
-		super.renderFaceXPos(block, x, y, z, icon);
-		saveShadingTopLeft(aoXPYZPP);
-		saveShadingTopRight(aoXPYZPN);
-		saveShadingBottomLeft(aoXPYZNP);
-		saveShadingBottomRight(aoXPYZNN);
-	}
-
-	@Override
-	public void renderFaceYNeg(Block block, double x, double y, double z, IIcon icon) {
-		super.renderFaceYNeg(block, x, y, z, icon);
-		saveShadingTopLeft(aoYNXZNP);
-		saveShadingTopRight(aoYNXZPP);
-		saveShadingBottomLeft(aoYNXZNN);
-		saveShadingBottomRight(aoYNXZPN);
-	}
-
-	@Override
-	public void renderFaceYPos(Block block, double x, double y, double z, IIcon icon) {
-		super.renderFaceYPos(block, x, y, z, icon);
-		saveShadingTopLeft(aoYPXZPP);
-		saveShadingTopRight(aoYPXZNP);
-		saveShadingBottomLeft(aoYPXZPN);
-		saveShadingBottomRight(aoYPXZNN);
-	}
-	
-	protected void saveShadingTopLeft(ShadingValues values) {
-		if (--values.passCounter != 0) return;
-		values.brightness = brightnessTopLeft;
-		values.red = colorRedTopLeft;
-		values.green = colorGreenTopLeft;
-		values.blue = colorBlueTopLeft;
-	}
-	
-	protected void saveShadingTopRight(ShadingValues values) {
-		if (--values.passCounter != 0) return;
-		values.brightness = brightnessTopRight;
-		values.red = colorRedTopRight;
-		values.green = colorGreenTopRight;
-		values.blue = colorBlueTopRight;
-	}
-	
-	protected void saveShadingBottomLeft(ShadingValues values) {
-		if (--values.passCounter != 0) return;
-		values.brightness = brightnessBottomLeft;
-		values.red = colorRedBottomLeft;
-		values.green = colorGreenBottomLeft;
-		values.blue = colorBlueBottomLeft;
-	}
-	
-	protected void saveShadingBottomRight(ShadingValues values) {
-		if (--values.passCounter != 0) return;
-		values.brightness = brightnessBottomRight;
-		values.red = colorRedBottomRight;
-		values.green = colorGreenBottomRight;
-		values.blue = colorBlueBottomRight;
-	}
-	
-	/** Set pass counter on all shading value objects.
-	 *  Used to collect AO values from a specific draw pass
-	 *  if the underlying renderer draws overlays 
-	 * @param value pass counter
-	 */
-	protected void setPassCounters(int value) {
-		aoXPYZPP.passCounter = value;
-		aoXPYZPN.passCounter = value;
-		aoXPYZNP.passCounter = value;
-		aoXPYZNN.passCounter = value;
-		aoXNYZPP.passCounter = value;
-		aoXNYZPN.passCounter = value;
-		aoXNYZNP.passCounter = value;
-		aoXNYZNN.passCounter = value;
-		aoYPXZPP.passCounter = value;
-		aoYPXZPN.passCounter = value;
-		aoYPXZNP.passCounter = value;
-		aoYPXZNN.passCounter = value;
-		aoYNXZPP.passCounter = value;
-		aoYNXZPN.passCounter = value;
-		aoYNXZNP.passCounter = value;
-		aoYNXZNN.passCounter = value;
-		aoZPXYPP.passCounter = value;
-		aoZPXYPN.passCounter = value;
-		aoZPXYNP.passCounter = value;
-		aoZPXYNN.passCounter = value;
-		aoZNXYPP.passCounter = value;
-		aoZNXYPN.passCounter = value;
-		aoZNXYNP.passCounter = value;
-		aoZNXYNN.passCounter = value;
-	}
-	
-	/** Render textured quad
-	 * @param icon texture to use
-	 * @param center center of quad
-	 * @param vec1 vector to the half-point of one of the sides
-	 * @param vec2 vector to half-point of side next to vec1
-	 * @param uvRot number of increments to rotate UV coordinates by
-	 */
-	protected void renderQuad(IIcon icon, Double3 center, Double3 vec1, Double3 vec2, int uvRot) {
-		Tessellator tessellator = Tessellator.instance;
-		tessellator.addVertexWithUV(center.x + vec1.x + vec2.x, center.y + vec1.y + vec2.y, center.z + vec1.z + vec2.z, icon.getInterpolatedU(uValues[uvRot & 3]), icon.getInterpolatedV(vValues[uvRot & 3]));
-		tessellator.addVertexWithUV(center.x - vec1.x + vec2.x, center.y - vec1.y + vec2.y, center.z - vec1.z + vec2.z, icon.getInterpolatedU(uValues[(uvRot + 1) & 3]), icon.getInterpolatedV(vValues[(uvRot + 1) & 3]));
-		tessellator.addVertexWithUV(center.x - vec1.x - vec2.x, center.y - vec1.y - vec2.y, center.z - vec1.z - vec2.z, icon.getInterpolatedU(uValues[(uvRot + 2) & 3]), icon.getInterpolatedV(vValues[(uvRot + 2) & 3]));
-		tessellator.addVertexWithUV(center.x + vec1.x - vec2.x, center.y + vec1.y - vec2.y, center.z + vec1.z - vec2.z, icon.getInterpolatedU(uValues[(uvRot + 3) & 3]), icon.getInterpolatedV(vValues[(uvRot + 3) & 3]));
-	}
-	
-	/** Render textured quad using AO information
-	 * @param icon texture to use
-	 * @param center center of quad
-	 * @param vec1 vector to the half-point of one of the sides
-	 * @param vec2 vector to half-point of side next to vec1
-	 * @param uvRot number of increments to rotate UV coordinates by
-	 * @param aoPP AO values for vertex at (+vec1, +vec2)
-	 * @param aoNP AO values for vertex at (-vec1, +vec2)
-	 * @param aoNN AO values for vertex at (-vec1, -vec2)
-	 * @param aoPN AO values for vertex at (+vec1, -vec2) 
-	 */
-	protected void renderQuadWithShading(IIcon icon, Double3 center, Double3 vec1, Double3 vec2, int uvRot, ShadingValues aoPP, ShadingValues aoNP, ShadingValues aoNN, ShadingValues aoPN) {
-		Tessellator tessellator = Tessellator.instance;
-		tessellator.setBrightness(aoPP.brightness);
-		tessellator.setColorOpaque_F(aoPP.red, aoPP.green, aoPP.blue);
-		tessellator.addVertexWithUV(center.x + vec1.x + vec2.x, center.y + vec1.y + vec2.y, center.z + vec1.z + vec2.z, icon.getInterpolatedU(uValues[uvRot & 3]), icon.getInterpolatedV(vValues[uvRot & 3]));
-		tessellator.setBrightness(aoNP.brightness);
-		tessellator.setColorOpaque_F(aoNP.red, aoNP.green, aoNP.blue);
-		tessellator.addVertexWithUV(center.x - vec1.x + vec2.x, center.y - vec1.y + vec2.y, center.z - vec1.z + vec2.z, icon.getInterpolatedU(uValues[(uvRot + 1) & 3]), icon.getInterpolatedV(vValues[(uvRot + 1) & 3]));
-		tessellator.setBrightness(aoNN.brightness);
-		tessellator.setColorOpaque_F(aoNN.red, aoNN.green, aoNN.blue);
-		tessellator.addVertexWithUV(center.x - vec1.x - vec2.x, center.y - vec1.y - vec2.y, center.z - vec1.z - vec2.z, icon.getInterpolatedU(uValues[(uvRot + 2) & 3]), icon.getInterpolatedV(vValues[(uvRot + 2) & 3]));
-		tessellator.setBrightness(aoPN.brightness);
-		tessellator.setColorOpaque_F(aoPN.red, aoPN.green, aoPN.blue);
-		tessellator.addVertexWithUV(center.x + vec1.x - vec2.x, center.y + vec1.y - vec2.y, center.z + vec1.z - vec2.z, icon.getInterpolatedU(uValues[(uvRot + 3) & 3]), icon.getInterpolatedV(vValues[(uvRot + 3) & 3]));
-	}
-	
-	protected int getBrightness(Block block, int x, int y, int z) {
-		return block.getMixedBrightnessForBlock(blockAccess, x, y, z);
-	}
-}

src/main/java/mods/betterfoliage/client/render/impl/RenderBlockBetterAlgae.java

@@ -1,78 +0,0 @@
-package mods.betterfoliage.client.render.impl;
-
-import java.util.Random;
-
-import mods.betterfoliage.BetterFoliage;
-import mods.betterfoliage.client.render.IRenderBlockDecorator;
-import mods.betterfoliage.client.render.IconSet;
-import mods.betterfoliage.client.render.RenderBlockAOBase;
-import mods.betterfoliage.common.util.Double3;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockDirt;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.MathHelper;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.gen.NoiseGeneratorSimplex;
-import net.minecraftforge.client.event.TextureStitchEvent;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.event.world.WorldEvent;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class RenderBlockBetterAlgae extends RenderBlockAOBase implements IRenderBlockDecorator {
-
-	public IconSet algaeIcons = new IconSet("bettergrassandleaves", "better_algae_%d");
-	public NoiseGeneratorSimplex noise;
-	
-	public boolean isBlockAccepted(IBlockAccess blockAccess, int x, int y, int z, Block block, int original) {
-		if (!BetterFoliage.config.algaeEnabled) return false;
-		if (y >= 254 || !(block instanceof BlockDirt)) return false;
-		if (blockAccess.getBlock(x, y + 1, z).getMaterial() != Material.water) return false;
-		if (blockAccess.getBlock(x, y + 2, z).getMaterial() != Material.water) return false;
-		if (blockAccess.getBiomeGenForCoords(x, z).temperature < 0.4f) return false;
-		int terrainVariation = MathHelper.floor_double((noise.func_151605_a(x, z) + 1.0) * 32.0);
-		return terrainVariation < BetterFoliage.config.algaeChance.value;
-	}
-	
-	public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) {
-		// store world for later use
-		blockAccess = world;
-		
-		// render grass block
-		setPassCounters(1);
-		setRenderBoundsFromBlock(block);
-		renderStandardBlock(block, x, y, z);
-		
-		int variation = getSemiRandomFromPos(x, y, z, 0);
-		int heightVariation = getSemiRandomFromPos(x, y, z, 1);
-		
-		IIcon renderIcon = algaeIcons.get(variation);
-		if (renderIcon == null) return true;
-		
-		double scale = BetterFoliage.config.algaeSize.value * 0.5;
-		double halfHeight = 0.5 * (BetterFoliage.config.algaeHeightMin.value + pRand[heightVariation] * (BetterFoliage.config.algaeHeightMax.value - BetterFoliage.config.algaeHeightMin.value));
-		Tessellator.instance.setBrightness(getBrightness(block, x, y + 1, z));
-		renderCrossedSideQuads(new Double3(x + 0.5, y + 1.0 - 0.125 * halfHeight, z + 0.5), ForgeDirection.UP, scale, halfHeight, pRot[variation], BetterFoliage.config.algaeHOffset.value, renderIcon, 0, false);
-		
-		return true;
-	}
-	
-	@SubscribeEvent
-	public void handleTextureReload(TextureStitchEvent.Pre event) {
-		if (event.map.getTextureType() != 0) return;
-		
-		algaeIcons.registerIcons(event.map);
-		BetterFoliage.log.info(String.format("Found %d algae textures", algaeIcons.numLoaded));
-	}
-	
-	@SubscribeEvent
-	public void handleWorldLoad(WorldEvent.Load event) {
-		noise = new NoiseGeneratorSimplex(new Random(event.world.getWorldInfo().getSeed() + 1));
-	}
-	
-}

src/main/java/mods/betterfoliage/client/render/impl/RenderBlockBetterCactus.java

@@ -1,87 +0,0 @@
-package mods.betterfoliage.client.render.impl;
-
-import mods.betterfoliage.BetterFoliage;
-import mods.betterfoliage.client.render.FakeRenderBlockAOBase;
-import mods.betterfoliage.client.render.IRenderBlockDecorator;
-import mods.betterfoliage.client.render.IconSet;
-import mods.betterfoliage.common.util.Double3;
-import net.minecraft.block.Block;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.init.Blocks;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-import net.minecraftforge.client.event.TextureStitchEvent;
-import net.minecraftforge.common.util.ForgeDirection;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class RenderBlockBetterCactus extends FakeRenderBlockAOBase implements IRenderBlockDecorator {
-
-	public IIcon cactusRoundIcon;
-	public IconSet cactusSideIcons = new IconSet("bettergrassandleaves", "better_cactus_arm_%d");
-	
-	public static ForgeDirection[] cactusDirections = new ForgeDirection[] { ForgeDirection.NORTH, ForgeDirection.SOUTH, ForgeDirection.EAST, ForgeDirection.WEST};
-	public static double cactusRadius = 0.4375;
-	
-	public boolean isBlockAccepted(IBlockAccess blockAccess, int x, int y, int z, Block block, int original) {
-		return BetterFoliage.config.cactusEnabled && block == Blocks.cactus;
-	}
-	
-	public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) {
-		// store world for later use
-		blockAccess = world;
-		
-		// render cactus center
-		setPassCounters(1);
-		setRenderBoundsFromBlock(block);
-		
-		Double3 blockCenter = new Double3(x + 0.5, y + 0.5, z + 0.5);
-		renderStandardBlock(block, x, y, z);
-		Tessellator.instance.setBrightness(getBrightness(block,x, y, z));
-		renderCactusCore(block.getBlockTextureFromSide(ForgeDirection.UP.ordinal()),
-						 block.getBlockTextureFromSide(ForgeDirection.NORTH.ordinal()),
-						 blockCenter, 0);
-		
-		// render side growth
-		ForgeDirection drawDirection = cactusDirections[getSemiRandomFromPos(x, y, z, 0) % 4];
-		int iconVariation = getSemiRandomFromPos(x, y, z, 1);
-		Double3 drawBase = blockCenter.add(new Double3(drawDirection).scale(cactusRadius));
-		
-		Tessellator.instance.setBrightness(getBrightness(block, x, y, z));
-		if (cactusSideIcons.hasIcons()) renderCrossedSideQuads(drawBase, drawDirection, 0.5, 0.5, pRot[iconVariation], 0.2, cactusSideIcons.get(iconVariation), 0, false);
-		renderCrossedBlockQuadsSkew(blockCenter, 0.65,
-									pRot[iconVariation].scaleAxes(0.1, 0.0, 0.1),
-									pRot[(iconVariation + 1) & 63].scaleAxes(0.1, 0.0, 0.1),
-									cactusRoundIcon, iconVariation, false, false);
-		return true;
-	}
-
-	protected void renderCactusCore(IIcon topIcon, IIcon sideIcon, Double3 blockCenter, int sideUvRot) {
-		if (Minecraft.isAmbientOcclusionEnabled()) {
-			renderQuadWithShading(sideIcon, blockCenter.add(cactusRadius, 0.0, 0.0), new Double3(0.0, 0.0, -0.5), new Double3(0.0, 0.5, 0.0), sideUvRot, aoXPYZPN, aoXPYZPP, aoXPYZNP, aoXPYZNN);
-			renderQuadWithShading(sideIcon, blockCenter.add(-cactusRadius, 0.0, 0.0), new Double3(0.0, 0.0, 0.5), new Double3(0.0, 0.5, 0.0), sideUvRot, aoXNYZPP, aoXNYZPN, aoXNYZNN, aoXNYZNP);
-			renderQuadWithShading(sideIcon, blockCenter.add(0.0, 0.0, cactusRadius), new Double3(0.5, 0.0, 0.0), new Double3(0.0, 0.5, 0.0), sideUvRot, aoZPXYPP, aoZPXYNP, aoZPXYNN, aoZPXYPN);
-			renderQuadWithShading(sideIcon, blockCenter.add(0.0, 0.0, -cactusRadius), new Double3(-0.5, 0.0, 0.0), new Double3(0.0, 0.5, 0.0), sideUvRot, aoZNXYNP, aoZNXYPP, aoZNXYPN, aoZNXYNN);
-			renderQuadWithShading(topIcon, blockCenter.add(0.0, 0.5, 0.0), new Double3(-0.5, 0.0, 0.0), new Double3(0.0, 0.0, 0.5), 0, aoYPXZNP, aoYPXZPP, aoYPXZPN, aoYPXZNN);
-		} else {
-			renderQuad(sideIcon, blockCenter.add(cactusRadius, 0.0, 0.0), new Double3(0.0, 0.0, -0.5), new Double3(0.0, 0.5, 0.0), sideUvRot);
-			renderQuad(sideIcon, blockCenter.add(-cactusRadius, 0.0, 0.0), new Double3(0.0, 0.0, 0.5), new Double3(0.0, 0.5, 0.0), sideUvRot);
-			renderQuad(sideIcon, blockCenter.add(0.0, 0.0, cactusRadius), new Double3(0.5, 0.0, 0.0), new Double3(0.0, 0.5, 0.0), sideUvRot);
-			renderQuad(sideIcon, blockCenter.add(0.0, 0.0, -cactusRadius), new Double3(-0.5, 0.0, 0.0), new Double3(0.0, 0.5, 0.0), sideUvRot);
-			renderQuad(topIcon, blockCenter.add(0.0, 0.5, 0.0), new Double3(-0.5, 0.0, 0.0), new Double3(0.0, 0.0, 0.5), 0);
-		}
-	}
-	
-	@SubscribeEvent
-	public void handleTextureReload(TextureStitchEvent.Pre event) {
-		if (event.map.getTextureType() != 0) return;
-		
-		cactusRoundIcon = event.map.registerIcon("bettergrassandleaves:better_cactus");
-		cactusSideIcons.registerIcons(event.map);
-		BetterFoliage.log.info(String.format("Found %d cactus arm textures", cactusSideIcons.numLoaded));
-	}
-}

src/main/java/mods/betterfoliage/client/render/impl/RenderBlockBetterGrass.java

@@ -1,68 +0,0 @@
-package mods.betterfoliage.client.render.impl;
-
-import mods.betterfoliage.BetterFoliage;
-import mods.betterfoliage.client.render.IRenderBlockDecorator;
-import mods.betterfoliage.client.render.IconSet;
-import mods.betterfoliage.client.render.RenderBlockAOBase;
-import mods.betterfoliage.common.util.Double3;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockGrass;
-import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.init.Blocks;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-import net.minecraftforge.client.event.TextureStitchEvent;
-import net.minecraftforge.common.util.ForgeDirection;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class RenderBlockBetterGrass extends RenderBlockAOBase implements IRenderBlockDecorator {
-
-	public IconSet grassIcons = new IconSet("bettergrassandleaves", "better_grass_long_%d");
-	public IconSet myceliumIcons = new IconSet("bettergrassandleaves", "better_mycel_%d");
-	
-	
-	public boolean isBlockAccepted(IBlockAccess blockAccess, int x, int y, int z, Block block, int original) {
-		if (!BetterFoliage.config.grassEnabled) return false;
-		if (!((block instanceof BlockGrass || block == Blocks.mycelium))) return false;
-		if (y == 255 || !blockAccess.isAirBlock(x, y + 1, z)) return false;
-		return true;
-	}
-	
-	public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) {
-		// store world for later use
-		blockAccess = world;
-		
-		// render grass block
-		setPassCounters(1);
-		setRenderBoundsFromBlock(block);
-		renderStandardBlock(block, x, y, z);
-		
-		int variation = getSemiRandomFromPos(x, y, z, 0);
-		int heightVariation = getSemiRandomFromPos(x, y, z, 1);
-		
-		IIcon renderIcon = (block == Blocks.mycelium) ? myceliumIcons.get(variation) : grassIcons.get(variation);
-		if (renderIcon == null) return true;
-		
-		double scale = BetterFoliage.config.grassSize.value * 0.5;
-		double halfHeight = 0.5 * (BetterFoliage.config.grassHeightMin.value + pRand[heightVariation] * (BetterFoliage.config.grassHeightMax.value - BetterFoliage.config.grassHeightMin.value));
-		Tessellator.instance.setBrightness(getBrightness(block, x, y + 1, z));
-		renderCrossedSideQuads(new Double3(x + 0.5, y + 1.0 - 0.125 * halfHeight, z + 0.5), ForgeDirection.UP, scale, halfHeight, pRot[variation], BetterFoliage.config.grassHOffset.value, renderIcon, 0, false);
-		
-		return true;
-	}
-
-	@SubscribeEvent
-	public void handleTextureReload(TextureStitchEvent.Pre event) {
-		if (event.map.getTextureType() != 0) return;
-		
-		grassIcons.registerIcons(event.map);
-		myceliumIcons.registerIcons(event.map);
-		BetterFoliage.log.info(String.format("Found %d short grass textures", grassIcons.numLoaded));
-		BetterFoliage.log.info(String.format("Found %d mycelium textures", myceliumIcons.numLoaded));
-	}
-
-}

src/main/java/mods/betterfoliage/client/render/impl/RenderBlockBetterLeaves.java

@@ -1,90 +0,0 @@
-package mods.betterfoliage.client.render.impl;
-
-import mods.betterfoliage.BetterFoliage;
-import mods.betterfoliage.client.BetterFoliageClient;
-import mods.betterfoliage.client.render.IRenderBlockDecorator;
-import mods.betterfoliage.client.render.RenderBlockAOBase;
-import mods.betterfoliage.common.util.Double3;
-import mods.betterfoliage.common.util.Utils;
-import net.minecraft.block.Block;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-import net.minecraftforge.common.util.ForgeDirection;
-import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class RenderBlockBetterLeaves extends RenderBlockAOBase implements IRenderBlockDecorator {
-	
-	public boolean isBlockAccepted(IBlockAccess blockAccess, int x, int y, int z, Block block, int original) {
-		if (!BetterFoliage.config.leavesEnabled) return false;
-		if (original > 0 && original < 42) return false;
-		return BetterFoliageClient.leaves.matchesID(block) && !isBlockSurrounded(blockAccess, x, y, z);
-	}
-	
-	public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) {
-		// store world for later use
-		blockAccess = world;
-		
-		// render leaves center
-		setPassCounters(1);
-		setRenderBoundsFromBlock(block);
-		if (block.getRenderType() == 0) {
-			renderStandardBlock(block, x, y, z);
-		} else {
-			ISimpleBlockRenderingHandler handler = Utils.getRenderingHandler(block.getRenderType());
-			handler.renderWorldBlock(world, x, y, z, block, block.getRenderType(), this);
-		}
-
-		// find generated texture to render with, assume the
-		// "true" texture of the block is the one on the north size
-		TextureAtlasSprite blockLeafIcon = (TextureAtlasSprite) block.getIcon(world, x, y, z, ForgeDirection.NORTH.ordinal());
-		if (blockLeafIcon == null) {
-			BetterFoliage.log.warn(String.format("null leaf texture, x:%d, y:%d, z:%d, meta:%d, block:%s", x, y, z, blockAccess.getBlockMetadata(x, y, z), block.getClass().getName()));
-			return true;
-		}
-		IIcon crossLeafIcon = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(BetterFoliageClient.leafGenerator.domainName + ":" + blockLeafIcon.getIconName());
-		if (crossLeafIcon == null) {
-			return true;
-		}
-		
-		int offsetVariation = getSemiRandomFromPos(x, y, z, 0);
-		int uvVariation = getSemiRandomFromPos(x, y, z, 1);
-		double halfSize = 0.5 * BetterFoliage.config.leavesSize.value;
-		boolean isAirTop = y == 255 || blockAccess.isAirBlock(x, y + 1, z);
-		boolean isAirBottom = y == 0 || blockAccess.isAirBlock(x, y - 1, z);
-		
-		Tessellator.instance.setBrightness(isAirTop ? getBrightness(block, x, y + 1, z) : (isAirBottom ? getBrightness(block, x, y - 1, z) : getBrightness(block, x, y, z)));
-		Tessellator.instance.setColorOpaque_I(block.colorMultiplier(blockAccess, x, y, z));
-		
-		if (BetterFoliage.config.leavesSkew) {
-			renderCrossedBlockQuadsSkew(new Double3(x + 0.5, y + 0.5, z + 0.5), halfSize, 
-										pRot[offsetVariation].scaleAxes(BetterFoliage.config.leavesHOffset.value, BetterFoliage.config.leavesVOffset.value, BetterFoliage.config.leavesHOffset.value),
-										pRot[(offsetVariation + 1) & 63].scaleAxes(BetterFoliage.config.leavesHOffset.value, BetterFoliage.config.leavesVOffset.value, BetterFoliage.config.leavesHOffset.value),
-										crossLeafIcon, uvVariation, isAirTop, isAirBottom);
-		} else {
-			renderCrossedBlockQuadsTranslate(new Double3(x + 0.5, y + 0.5, z + 0.5), halfSize, 
-											 pRot[offsetVariation].scaleAxes(BetterFoliage.config.leavesHOffset.value, BetterFoliage.config.leavesVOffset.value, BetterFoliage.config.leavesHOffset.value),
-											 crossLeafIcon, uvVariation, isAirTop, isAirBottom);
-		}
-
-
-		return true;
-	}
-
-	protected boolean isBlockSurrounded(IBlockAccess blockAccess, int x, int y, int z) {
-		if (blockAccess.isAirBlock(x + 1, y, z)) return false;
-		if (blockAccess.isAirBlock(x - 1, y, z)) return false;
-		if (blockAccess.isAirBlock(x, y, z + 1)) return false;
-		if (blockAccess.isAirBlock(x, y, z - 1)) return false;
-		if (y == 255 || blockAccess.isAirBlock(x, y + 1, z)) return false;
-		if (y == 0 || blockAccess.isAirBlock(x, y - 1, z)) return false;
-		return true;
-	}
-	
-}

src/main/java/mods/betterfoliage/client/render/impl/RenderBlockBetterLilypad.java

@@ -1,67 +0,0 @@
-package mods.betterfoliage.client.render.impl;
-
-import mods.betterfoliage.BetterFoliage;
-import mods.betterfoliage.client.render.FakeRenderBlockAOBase;
-import mods.betterfoliage.client.render.IRenderBlockDecorator;
-import mods.betterfoliage.client.render.IconSet;
-import mods.betterfoliage.common.util.Double3;
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.init.Blocks;
-import net.minecraft.world.IBlockAccess;
-import net.minecraftforge.client.event.TextureStitchEvent;
-import net.minecraftforge.common.util.ForgeDirection;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class RenderBlockBetterLilypad extends FakeRenderBlockAOBase implements IRenderBlockDecorator {
-
-	public IconSet lilypadFlowers = new IconSet("bettergrassandleaves", "better_lilypad_flower_%d");
-	public IconSet lilypadRoots = new IconSet("bettergrassandleaves", "better_lilypad_roots_%d");
-	
-	public boolean isBlockAccepted(IBlockAccess blockAccess, int x, int y, int z, Block block, int original) {
-		return BetterFoliage.config.lilypadEnabled && block == Blocks.waterlily;
-	}
-	
-	public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) {
-		// store world for later use
-		blockAccess = world;
-		
-		// render grass block
-		renderBlockLilyPad(block, x, y, z);
-		
-		int chanceVariation = getSemiRandomFromPos(x, y, z, 0);
-		int iconVariation = getSemiRandomFromPos(x, y, z, 1);
-		int offsetVariation = getSemiRandomFromPos(x, y, z, 2);
-		
-		Tessellator.instance.setBrightness(getBrightness(block, x, y, z));
-		Tessellator.instance.setColorOpaque(255, 255, 255);
-		if (lilypadRoots.hasIcons()) renderCrossedSideQuads(new Double3(x + 0.5, y + 0.015, z + 0.5), ForgeDirection.DOWN,
-														   	0.2, 0.3,
-														   	null, 0.0,
-														   	lilypadRoots.get(iconVariation), 2,
-														   	true);
-		if (chanceVariation < BetterFoliage.config.lilypadChance.value && lilypadFlowers.hasIcons())
-			renderCrossedSideQuads(new Double3(x + 0.5, y + 0.02, z + 0.5), ForgeDirection.UP,
-					 			   0.2, 0.3, 
-					 			   pRot[offsetVariation], BetterFoliage.config.lilypadHOffset.value, 
-					 			   lilypadFlowers.get(iconVariation), 0,
-					 			   true);
-		
-		return true;
-	}
-	
-	@SubscribeEvent
-	public void handleTextureReload(TextureStitchEvent.Pre event) {
-		if (event.map.getTextureType() != 0) return;
-		
-		lilypadFlowers.registerIcons(event.map);
-		lilypadRoots.registerIcons(event.map);
-		BetterFoliage.log.info(String.format("Found %d lilypad flower textures", lilypadFlowers.numLoaded));
-		BetterFoliage.log.info(String.format("Found %d lilypad root textures", lilypadRoots.numLoaded));
-	}
-	
-}

src/main/java/mods/betterfoliage/client/render/impl/RenderBlockBetterReed.java

@@ -1,82 +0,0 @@
-package mods.betterfoliage.client.render.impl;
-
-import java.util.Random;
-
-import mods.betterfoliage.BetterFoliage;
-import mods.betterfoliage.client.render.IRenderBlockDecorator;
-import mods.betterfoliage.client.render.IconSet;
-import mods.betterfoliage.client.render.RenderBlockAOBase;
-import mods.betterfoliage.common.util.Double3;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockDirt;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.MathHelper;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.gen.NoiseGeneratorSimplex;
-import net.minecraftforge.client.event.TextureStitchEvent;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.event.world.WorldEvent;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class RenderBlockBetterReed extends RenderBlockAOBase implements IRenderBlockDecorator {
-
-	public IconSet reedBottomIcons = new IconSet("bf_reed_bottom", "bettergrassandleaves:better_reed_%d");
-	public IconSet reedTopIcons = new IconSet("bf_reed_top", "bettergrassandleaves:better_reed_%d");
-	public NoiseGeneratorSimplex noise;
-	
-	public boolean isBlockAccepted(IBlockAccess blockAccess, int x, int y, int z, Block block, int original) {
-		if (!BetterFoliage.config.reedEnabled) return false;
-		if (y >= 254 || !(block instanceof BlockDirt)) return false;
-		if (blockAccess.getBlock(x, y + 1, z).getMaterial() != Material.water) return false;
-		if (!blockAccess.isAirBlock(x, y + 2, z)) return false;
-		if (blockAccess.getBiomeGenForCoords(x, z).temperature < 0.4f || blockAccess.getBiomeGenForCoords(x, z).rainfall < 0.4f) return false;
-		int terrainVariation = MathHelper.floor_double((noise.func_151605_a(x, z) + 1.0) * 32.0);
-		return terrainVariation < BetterFoliage.config.reedChance.value;
-	}
-	
-	public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) {
-		// store world for later use
-		blockAccess = world;
-		
-		// render grass block
-		setPassCounters(1);
-		setRenderBoundsFromBlock(block);
-		renderStandardBlock(block, x, y, z);
-		
-		int iconVariation = getSemiRandomFromPos(x, y, z, 0);
-		int heightVariation = getSemiRandomFromPos(x, y, z, 1);
-		
-		IIcon bottomIcon = reedBottomIcons.get(iconVariation);
-		IIcon topIcon = reedTopIcons.get(iconVariation);
-		if (bottomIcon == null || topIcon == null) return true;
-		
-		double quarterHeight = 0.25 * (BetterFoliage.config.reedHeightMin.value + pRand[heightVariation] * (BetterFoliage.config.reedHeightMax.value - BetterFoliage.config.reedHeightMin.value));
-		Tessellator.instance.setBrightness(getBrightness(block, x, y + 2, z));
-		Tessellator.instance.setColorOpaque(255, 255, 255);
-		renderCrossedSideQuads(new Double3(x + 0.5, y + 1.0, z + 0.5), ForgeDirection.UP, 0.5, quarterHeight, pRot[iconVariation], BetterFoliage.config.reedHOffset.value, bottomIcon, 0, true);
-		renderCrossedSideQuads(new Double3(x + 0.5, y + 1.0 + 2.0 * quarterHeight, z + 0.5), ForgeDirection.UP, 0.5, quarterHeight, pRot[iconVariation], BetterFoliage.config.reedHOffset.value, topIcon, 0, true);
-		
-		return true;
-	}
-	
-	@SubscribeEvent
-	public void handleTextureReload(TextureStitchEvent.Pre event) {
-		if (event.map.getTextureType() != 0) return;
-		
-		reedBottomIcons.registerIcons(event.map);
-		reedTopIcons.registerIcons(event.map);
-		BetterFoliage.log.info(String.format("Found %d reed textures", reedBottomIcons.numLoaded));
-	}
-	
-	@SubscribeEvent
-	public void handleWorldLoad(WorldEvent.Load event) {
-		noise = new NoiseGeneratorSimplex(new Random(event.world.getWorldInfo().getSeed()));
-	}
-	
-}

src/main/java/mods/betterfoliage/client/resource/BlockTextureGenerator.java

@@ -1,91 +0,0 @@
-package mods.betterfoliage.client.resource;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import mods.betterfoliage.BetterFoliage;
-import mods.betterfoliage.common.util.Utils;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.client.resources.IResource;
-import net.minecraft.client.resources.IResourceManager;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.client.event.TextureStitchEvent;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public abstract class BlockTextureGenerator implements IResourceManager {
-
-	/** Resource domain name of generated textures */
-	public String domainName;
-	
-	/** Resource location for fallback texture (if the generation process fails) */
-	public ResourceLocation missingResource;
-	
-	/** Texture atlas for block textures used in the current run */
-	public TextureMap blockTextures;
-	
-	/** Number of textures generated in the current run */
-	int counter = 0;
-	
-	public BlockTextureGenerator(String domainName, ResourceLocation missingResource) {
-		this.domainName = domainName;
-		this.missingResource = missingResource;
-	}
-	
-	public void onStitchStart(TextureStitchEvent.Pre event) {}
-	
-	public void onStitchEnd(TextureStitchEvent.Post event) {}
-	
-	@SubscribeEvent
-	public void handleTextureReload(TextureStitchEvent.Pre event) {
-		if (event.map.getTextureType() != 0) return;
-		
-		blockTextures = event.map;
-		counter = 0;
-		Map<String, IResourceManager> domainManagers = Utils.getDomainResourceManagers();
-		if (domainManagers == null) {
-			BetterFoliage.log.warn("Failed to inject texture generator");
-			return;
-		}
-		domainManagers.put(domainName, this);
-		
-		onStitchStart(event);
-	}
-	
-	@SubscribeEvent
-	public void endTextureReload(TextureStitchEvent.Post event) {
-		blockTextures = null;
-		if (event.map.getTextureType() != 0) return;
-		
-		// don't leave a mess
-		Map<String, IResourceManager> domainManagers = Utils.getDomainResourceManagers();
-		if (domainManagers != null) domainManagers.remove(domainName);
-		
-		onStitchEnd(event);
-	}
-	
-	public Set<String> getResourceDomains() {
-		return ImmutableSet.<String>of(domainName);
-	}
-	
-	public List<IResource> getAllResources(ResourceLocation resource) throws IOException {
-		return ImmutableList.<IResource>of(getResource(resource));
-	}
-	
-	public IResource getMissingResource() throws IOException {
-		return Minecraft.getMinecraft().getResourceManager().getResource(missingResource);
-	}
-	
-	public ResourceLocation unwrapResource(ResourceLocation wrapped) {
-		return new ResourceLocation(wrapped.getResourcePath().substring(16));
-	}
-}

src/main/java/mods/betterfoliage/client/resource/HalfTextureResource.java

@@ -1,74 +0,0 @@
-package mods.betterfoliage.client.resource;
-
-import java.awt.Graphics2D;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-
-import javax.imageio.ImageIO;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-import mods.betterfoliage.BetterFoliage;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.IResource;
-import net.minecraft.client.resources.IResourceManager;
-import net.minecraft.client.resources.data.IMetadataSection;
-import net.minecraft.util.ResourceLocation;
-
-/** {@link IResource} of PNG containing one half (top or bottom) of a given texture resource
- * @author octarine-noise
- */
-@SideOnly(Side.CLIENT)
-public class HalfTextureResource implements IResource {
-
-	/** Raw PNG data*/
-	public byte[] data = null;
-	
-	/** Resource to return if generation fails */
-	public IResource fallbackResource;
-	
-	public HalfTextureResource(ResourceLocation resource, boolean bottom, IResource fallbackResource) {
-		this.fallbackResource = fallbackResource;
-		
-		IResourceManager resourceManager = Minecraft.getMinecraft().getResourceManager();
-		try {
-			// load full texture
-			ResourceLocation origResource = new ResourceLocation(resource.getResourceDomain(), "textures/blocks/" + resource.getResourcePath());
-			BufferedImage origImage = ImageIO.read(resourceManager.getResource(origResource).getInputStream());
-
-			// draw half texture
-			BufferedImage result = new BufferedImage(origImage.getWidth(), origImage.getHeight() / 2, BufferedImage.TYPE_4BYTE_ABGR);
-			Graphics2D graphics = result.createGraphics();
-			graphics.drawImage(origImage, 0, bottom ? -origImage.getHeight() / 2 : 0, null);
-
-			// create PNG image
-			ByteArrayOutputStream baos = new ByteArrayOutputStream();
-			ImageIO.write(result, "PNG", baos);
-			data = baos.toByteArray();
-		} catch (Exception e) {
-			// stop log spam with GLSL installed
-			if (e instanceof FileNotFoundException) return;
-			BetterFoliage.log.info(String.format("Could not load texture: %s, exception: %s", resource.toString(), e.getClass().getSimpleName()));
-		}
-	}
-	
-	@Override
-	public InputStream getInputStream() {
-		return data != null ? new ByteArrayInputStream(data) : fallbackResource.getInputStream();
-	}
-
-	@Override
-	public boolean hasMetadata() {
-		return false;
-	}
-
-	@Override
-	public IMetadataSection getMetadata(String var1) {
-		return null;
-	}
-
-}

src/main/java/mods/betterfoliage/client/resource/ILeafTextureRecognizer.java

@@ -1,11 +0,0 @@
-package mods.betterfoliage.client.resource;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-
-@SideOnly(Side.CLIENT)
-public interface ILeafTextureRecognizer {
-
-	public boolean isLeafTexture(TextureAtlasSprite icon);
-}

src/main/java/mods/betterfoliage/client/resource/LeafTextureGenerator.java

@@ -1,118 +0,0 @@
-package mods.betterfoliage.client.resource;
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import mods.betterfoliage.BetterFoliage;
-import mods.betterfoliage.client.BetterFoliageClient;
-import mods.betterfoliage.common.util.DeobfNames;
-import mods.betterfoliage.common.util.Utils;
-import net.minecraft.block.Block;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.resources.IResource;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.client.event.TextureStitchEvent.Post;
-import net.minecraftforge.client.event.TextureStitchEvent.Pre;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-/** Generates rounded crossleaf textures for all registered normal leaf textures at stitch time.
- * @author octarine-noise
- */
-@SideOnly(Side.CLIENT)
-public class LeafTextureGenerator extends BlockTextureGenerator implements IIconRegister {
-
-	public String nonGeneratedDomain = "betterfoliage";
-	
-	public int nonGeneratedCounter = 0;
-	
-	public LeafTextureGenerator() {
-		super("bf_leaves_autogen", new ResourceLocation("betterfoliage", "textures/blocks/missing_leaf.png"));
-	}
-
-	/** List of helpers which can identify leaf textures loaded by alternate means */
-	public List<ILeafTextureRecognizer> recognizers = Lists.newLinkedList();
-
-	public IResource getResource(ResourceLocation resourceLocation) throws IOException {
-		ResourceLocation original = unwrapResource(resourceLocation);
-		
-		// check for provided texture
-		ResourceLocation handDrawnLocation = new ResourceLocation(nonGeneratedDomain, String.format("textures/blocks/%s/%s", original.getResourceDomain(), original.getResourcePath())); 
-		if (Utils.resourceExists(handDrawnLocation)) {
-			nonGeneratedCounter++;
-			return Minecraft.getMinecraft().getResourceManager().getResource(handDrawnLocation);
-		}
-		
-		// generate our own
-		LeafTextureResource result = new LeafTextureResource(original, getMissingResource());
-		if (result.data != null) counter++;
-		return result;
-	}
-
-	/** Leaf blocks register their textures here. An extra texture will be registered in the atlas
-	 *  for each, with the resource domain of this generator.
-	 *  @return the originally registered {@link IIcon} already in the atlas
-	 */
-	public IIcon registerIcon(String resourceLocation) {
-		IIcon original = blockTextures.getTextureExtry(resourceLocation);
-		blockTextures.registerIcon(new ResourceLocation(domainName, resourceLocation).toString());
-		BetterFoliage.log.debug(String.format("Found leaf texture: %s", resourceLocation));
-		return original;
-	}
-
-	/** Iterates through all leaf blocks in the registry and makes them register
-	 *  their textures to "sniff out" all leaf textures.
-	 * @param event
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void onStitchStart(Pre event) {
-		nonGeneratedCounter = 0;
-		BetterFoliage.log.info("Reloading leaf textures");
-		
-		// register simple block textures
-		Iterator<Block> iter = Block.blockRegistry.iterator();
-		while(iter.hasNext()) {
-			Block block = iter.next();
-			if (BetterFoliageClient.leaves.matchesClass(block)) {
-				BetterFoliage.log.debug(String.format("Inspecting leaf block: %s", block.getClass().getName()));
-				block.registerBlockIcons(this);
-			}
-		}
-		
-		// enumerate all registered textures, find leaf textures among them
-		Map<String, TextureAtlasSprite> mapAtlas = null;
-		mapAtlas = Utils.getField(blockTextures, DeobfNames.TM_MRS_SRG, Map.class);
-		if (mapAtlas == null) mapAtlas = Utils.getField(blockTextures, DeobfNames.TM_MRS_MCP, Map.class);
-		if (mapAtlas == null) {
-			BetterFoliage.log.warn("Failed to reflect texture atlas, textures may be missing");
-		} else {
-			Set<String> foundLeafTextures = Sets.newHashSet();
-			for (TextureAtlasSprite icon : mapAtlas.values())
-				for (ILeafTextureRecognizer recognizer : recognizers)
-					if (recognizer.isLeafTexture(icon))
-						foundLeafTextures.add(icon.getIconName());
-			for (String resourceLocation : foundLeafTextures) {
-				BetterFoliage.log.debug(String.format("Found non-block-registered leaf texture: %s", resourceLocation));
-				blockTextures.registerIcon(new ResourceLocation(domainName, resourceLocation).toString());
-			}
-		}
-	}
-
-	@Override
-	public void onStitchEnd(Post event) {
-		BetterFoliage.log.info(String.format("Found %d pre-drawn leaf textures", nonGeneratedCounter));
-		BetterFoliage.log.info(String.format("Generated %d leaf textures", counter));
-	}
-
-}

src/main/java/mods/betterfoliage/client/resource/LeafTextureResource.java

@@ -1,116 +0,0 @@
-package mods.betterfoliage.client.resource;
-
-import java.awt.Graphics2D;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.imageio.ImageIO;
-
-import mods.betterfoliage.BetterFoliage;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.IResource;
-import net.minecraft.client.resources.IResourceManager;
-import net.minecraft.client.resources.data.IMetadataSection;
-import net.minecraft.util.ResourceLocation;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-/** {@link IResource} containing an autogenerated round crossleaf texture
- * @author octarine-noise
- */
-@SideOnly(Side.CLIENT)
-public class LeafTextureResource implements IResource {
-
-	/** Raw PNG data*/
-	protected byte[] data = null;
-	
-	/** Name of the default alpha mask to use */
-	public static String defaultMask = "rough";
-	
-	/** Resource to return if generation fails */
-	public IResource fallbackResource;
-	
-	public LeafTextureResource(ResourceLocation resLeaf, IResource fallbackResource) {
-		this.fallbackResource = fallbackResource;
-		
-		IResourceManager resourceManager = Minecraft.getMinecraft().getResourceManager();
-		try {
-			// load normal leaf texture
-			ResourceLocation origResource = new ResourceLocation(resLeaf.getResourceDomain(), "textures/blocks/" + resLeaf.getResourcePath());
-			BufferedImage origImage = ImageIO.read(resourceManager.getResource(origResource).getInputStream());
-			if (origImage.getWidth() != origImage.getHeight()) return;
-			int size = origImage.getWidth();
-
-			// load alpha mask of appropriate size
-			BufferedImage maskImage = loadLeafMaskImage(defaultMask, size * 2);
-			int scale = size * 2 / maskImage.getWidth();
-			
-			// tile leaf texture 2x2
-			BufferedImage overlayIcon = new BufferedImage(size * 2, size * 2, BufferedImage.TYPE_4BYTE_ABGR);
-			Graphics2D graphics = overlayIcon.createGraphics();
-			graphics.drawImage(origImage, 0, 0, null);
-			graphics.drawImage(origImage, 0, size, null);
-			graphics.drawImage(origImage, size, 0, null);
-			graphics.drawImage(origImage, size, size, null);
-			
-			// overlay mask alpha on texture
-			for (int x = 0; x < overlayIcon.getWidth(); x++) {
-				for (int y = 0; y < overlayIcon.getHeight(); y++) {
-					long origPixel = overlayIcon.getRGB(x, y) & 0xFFFFFFFFl;
-					long maskPixel = maskImage.getRGB(x / scale, y / scale) & 0xFF000000l | 0x00FFFFFF;
-					overlayIcon.setRGB(x, y, (int) (origPixel & maskPixel));
-				}
-			}
-
-			// create PNG image
-			ByteArrayOutputStream baos = new ByteArrayOutputStream();
-			ImageIO.write(overlayIcon, "PNG", baos);
-			data = baos.toByteArray();
-		} catch (Exception e) {
-			// stop log spam with GLSL installed
-			if (e instanceof FileNotFoundException) return;
-			BetterFoliage.log.info(String.format("Could not create leaf texture: %s, exception: %s", resLeaf.toString(), e.getClass().getSimpleName()));
-		}
-	}
-	
-	/** Loads the alpha mask of the given type and size. If a mask of the exact size can not be found,
-	 *  will try to load progressively smaller masks down to 16x16
-	 * @param type mask type
-	 * @param size texture size
-	 * @return alpha mask
-	 */
-	protected BufferedImage loadLeafMaskImage(String type, int size) {
-		IResourceManager resourceManager = Minecraft.getMinecraft().getResourceManager();
-		IResource maskResource = null;
-		
-		while (maskResource == null && size >= 16) {
-			try {
-				maskResource = resourceManager.getResource(new ResourceLocation(String.format("betterfoliage:textures/blocks/leafmask_%d_%s.png", size, type)));
-			} catch (Exception e) {}
-			size /= 2;
-		}
-		
-		try {
-			return maskResource == null ? null : ImageIO.read(maskResource.getInputStream());
-		} catch (IOException e) {
-			return null;
-		}
-	}
-	
-	public InputStream getInputStream() {
-		return data != null ? new ByteArrayInputStream(data) : fallbackResource.getInputStream();
-	}
-
-	public boolean hasMetadata() {
-		return false;
-	}
-
-	public IMetadataSection getMetadata(String var1) {
-		return null;
-	}
-
-}

src/main/java/mods/betterfoliage/common/config/BetterFoliageConfig.java

@@ -1,82 +0,0 @@
-package mods.betterfoliage.common.config;
-
-public class BetterFoliageConfig extends ConfigBase {
-	
-	@CfgElement(category="leaves", key="enabled") 
-	public boolean leavesEnabled = true;
-	
-	@CfgElement(category="leaves", key="skewMode")
-	public boolean leavesSkew = false;
-	
-	@CfgElement(category="grass", key="enabled")
-	public boolean grassEnabled = true;
-	
-	@CfgElement(category="cactus", key="enabled")
-	public boolean cactusEnabled = true;
-	
-	@CfgElement(category="lilypad", key="enabled")
-	public boolean lilypadEnabled = true;
-	
-	@CfgElement(category="reed", key="enabled")
-	public boolean reedEnabled = true;
-	
-	@CfgElement(category="algae", key="enabled")
-	public boolean algaeEnabled = true;
-	
-	@CfgElement(category="leaves", key="horizontalOffset")
-	public OptionDouble leavesHOffset = new OptionDouble(0.0, 0.4, 0.025, 0.2);
-	
-	@CfgElement(category="leaves", key="verticalOffset")
-	public OptionDouble leavesVOffset = new OptionDouble(0.0, 0.4, 0.025, 0.1);
-	
-	@CfgElement(category="leaves", key="size")
-	public OptionDouble leavesSize = new OptionDouble(0.75, 1.8, 0.05, 1.4);
-			
-	@CfgElement(category="grass", key="horizontalOffset")
-	public OptionDouble grassHOffset = new OptionDouble(0.0, 0.4, 0.025, 0.2);
-	
-	@CfgElement(category="grass", key="heightMin")
-	@Limit(max="grassHeightMax")
-	public OptionDouble grassHeightMin = new OptionDouble(0.1, 1.5, 0.05, 0.5);
-	
-	@CfgElement(category="grass", key="heightMax") 
-	public OptionDouble grassHeightMax = new OptionDouble(0.1, 1.5, 0.05, 1.0);
-	
-	@CfgElement(category="grass", key="size")
-	public OptionDouble grassSize = new OptionDouble(0.5, 1.5, 0.05, 1.0);
-	
-	@CfgElement(category="lilypad", key="horizontalOffset")
-	public OptionDouble lilypadHOffset = new OptionDouble(0.0, 0.25, 0.025, 0.1);
-	
-	@CfgElement(category="lilypad", key="chance")
-	public OptionInteger lilypadChance = new OptionInteger(0, 64, 1, 16);
-	
-	@CfgElement(category="reed", key="horizontalOffset")
-	public OptionDouble reedHOffset = new OptionDouble(0.0, 0.25, 0.025, 0.1);
-	
-	@CfgElement(category="reed", key="heightMin")
-	@Limit(max="reedHeightMax")
-	public OptionDouble reedHeightMin = new OptionDouble(1.5, 3.5, 0.1, 2.0);
-	
-	@CfgElement(category="reed", key="heightMax")
-	public OptionDouble reedHeightMax = new OptionDouble(1.5, 3.5, 0.1, 2.5);
-	
-	@CfgElement(category="reed", key="chance")
-	public OptionInteger reedChance = new OptionInteger(0, 64, 1, 32);
-	
-	@CfgElement(category="algae", key="horizontalOffset")
-	public OptionDouble algaeHOffset = new OptionDouble(0.0, 0.25, 0.025, 0.1);
-	
-	@CfgElement(category="algae", key="size")
-	public OptionDouble algaeSize = new OptionDouble(0.5, 1.5, 0.05, 1.0);
-	
-	@CfgElement(category="algae", key="heightMin")
-	@Limit(max="algaeHeightMax")
-	public OptionDouble algaeHeightMin = new OptionDouble(0.1, 1.5, 0.05, 0.5);
-	
-	@CfgElement(category="algae", key="heightMax")
-	public OptionDouble algaeHeightMax = new OptionDouble(0.1, 1.5, 0.05, 1.0);
-	
-	@CfgElement(category="algae", key="chance")
-	public OptionInteger algaeChance = new OptionInteger(0, 64, 1, 48);
-}

src/main/java/mods/betterfoliage/common/config/ConfigBase.java

@@ -1,128 +0,0 @@
-package mods.betterfoliage.common.config;
-
-import java.io.File;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.reflect.Field;
-
-import net.minecraftforge.common.config.Configuration;
-import net.minecraftforge.common.config.Property;
-
-public class ConfigBase {
-
-	@Target(ElementType.FIELD)
-	@Retention(RetentionPolicy.RUNTIME)
-	public static @interface CfgElement {
-		String category();
-		String key();
-		String comment() default "";
-	}
-	
-	@Target(ElementType.FIELD)
-	@Retention(RetentionPolicy.RUNTIME)
-	public static @interface Limit {
-		String min() default "";
-		String max() default "";
-	}
-	
-	protected Configuration config;
-	
-	public void load(File configFile) {
-		config = new Configuration(configFile);
-		config.load();
-		
-		for (Field field : getClass().getDeclaredFields()) {
-			CfgElement annot = field.getAnnotation(CfgElement.class);
-			if (annot == null) continue;
-			
-			field.setAccessible(true);
-			if (field.getType().equals(boolean.class) || field.getType().equals(Boolean.class)) {
-				try {
-					Property prop = config.get(annot.category(), annot.key(), field.getBoolean(this));
-					field.setBoolean(this, prop.getBoolean(field.getBoolean(this)));
-				} catch (Exception e) {
-				}
-			} else if (field.getType().equals(OptionInteger.class)) {
-				try {
-					OptionInteger option = (OptionInteger) field.get(this);
-					Property prop =  config.get(annot.category(), annot.key(), option.value);
-					option.value = prop.getInt(option.value);
-				} catch (Exception e) {
-				}
-			} else if (field.getType().equals(OptionDouble.class)) {
-				try {
-					OptionDouble option = (OptionDouble) field.get(this);
-					Property prop =  config.get(annot.category(), annot.key(), option.value);
-					option.value = prop.getDouble(option.value);
-				} catch (Exception e) {
-				}
-			}
-		}
-		
-		validateLimits();
-		if (config.hasChanged()) config.save();
-	}
-	
-	protected void validateLimits() {
-		for (Field fieldThis : getClass().getDeclaredFields()) {
-			Limit annot = fieldThis.getAnnotation(Limit.class);
-			if (annot == null) continue;
-			
-			try {
-				Field fieldMin = annot.min().isEmpty() ? null : getClass().getDeclaredField(annot.min());
-				Field fieldMax = annot.max().isEmpty() ? null : getClass().getDeclaredField(annot.max());
-				fieldThis.setAccessible(true);
-				fieldMin.setAccessible(true);
-				fieldMax.setAccessible(true);
-				
-				if (fieldThis.getType().equals(OptionInteger.class)) {
-					OptionInteger optionThis = (OptionInteger) fieldThis.get(this);
-					OptionInteger optionMin = fieldMin == null ? null : (OptionInteger) fieldMin.get(this);
-					OptionInteger optionMax = fieldMax == null ? null : (OptionInteger) fieldMax.get(this);
-					if (optionMin != null) optionThis.value = Math.max(optionThis.value, optionMin.value);
-					if (optionMax != null) optionThis.value = Math.min(optionThis.value, optionMax.value);
-				} else if (fieldThis.getType().equals(OptionDouble.class)) {
-					OptionDouble optionThis = (OptionDouble) fieldThis.get(this);
-					OptionDouble optionMin = fieldMin == null ? null : (OptionDouble) fieldMin.get(this);
-					OptionDouble optionMax = fieldMax == null ? null : (OptionDouble) fieldMax.get(this);
-					if (optionMin != null) optionThis.value = Math.max(optionThis.value, optionMin.value);
-					if (optionMax != null) optionThis.value = Math.min(optionThis.value, optionMax.value);
-				}
-			} catch (Exception e) {}
-		}
-	}
-	
-	public void save() {
-		for (Field field : getClass().getDeclaredFields()) {
-			CfgElement annot = field.getAnnotation(CfgElement.class);
-			if (annot == null) continue;
-			
-			field.setAccessible(true);
-			if (field.getType().equals(boolean.class) || field.getType().equals(Boolean.class)) {
-				try {
-					Property prop = config.get(annot.category(), annot.key(), field.getBoolean(this));
-					prop.set(field.getBoolean(this));
-				} catch (Exception e) {
-				}
-			} else if (field.getType().equals(OptionInteger.class)) {
-				try {
-					OptionInteger option = (OptionInteger) field.get(this);
-					Property prop =  config.get(annot.category(), annot.key(), option.value);
-					prop.set(option.value);
-				} catch (Exception e) {
-				}
-			} else if (field.getType().equals(OptionDouble.class)) {
-				try {
-					OptionDouble option = (OptionDouble) field.get(this);
-					Property prop =  config.get(annot.category(), annot.key(), option.value);
-					prop.set(option.value);
-				} catch (Exception e) {
-				}
-			}
-		}
-		
-		config.save();
-	}
-}

src/main/java/mods/betterfoliage/common/config/OptionDouble.java

@@ -1,26 +0,0 @@
-package mods.betterfoliage.common.config;
-
-public class OptionDouble {
-
-	public double min;
-	public double max;
-	public double step;
-	public double value;
-	
-	public OptionDouble(double min, double max, double step, double value) {
-		this.min = min;
-		this.max = max;
-		this.step = step;
-		this.value = value;
-	}
-	
-	public void increment() {
-		value += step;
-		if (value > max) value = max;
-	}
-	
-	public void decrement() {
-		value -= step;
-		if (value < min) value = min;
-	}
-}

src/main/java/mods/betterfoliage/common/config/OptionInteger.java

@@ -1,26 +0,0 @@
-package mods.betterfoliage.common.config;
-
-public class OptionInteger {
-
-	public int min;
-	public int max;
-	public int step;
-	public int value;
-	
-	public OptionInteger(int min, int max, int step, int value) {
-		this.min = min;
-		this.max = max;
-		this.step = step;
-		this.value = value;
-	}
-	
-	public void increment() {
-		value += step;
-		if (value > max) value = max;
-	}
-	
-	public void decrement() {
-		value -= step;
-		if (value < min) value = min;
-	}
-}

src/main/java/mods/betterfoliage/common/util/DeobfNames.java

@@ -1,71 +0,0 @@
-package mods.betterfoliage.common.util;
-
-public class DeobfNames {
-
-	private DeobfNames() {}
-	
-	/** MCP name of RenderBlocks */
-	public static final String RB_NAME_MCP = "net/minecraft/client/renderer/RenderBlocks";
-	
-	/** Obfuscated name of RenderBlocks */
-	public static final String RB_NAME_OBF = "ble";
-	
-	/** MCP name of RenderBlocks.blockAccess */
-	public static final String RB_BA_NAME_MCP = "blockAccess";
-	
-	/** Obfuscated name of RenderBlocks.blockAccess */
-	public static final String RB_BA_NAME_OBF = "a";
-	
-	/** MCP signature of RenderBlocks.blockAccess */
-	public static final String RB_BA_SIG_MCP = "Lnet/minecraft/world/IBlockAccess;";
-	
-	/** Obfuscated signature of RenderBlocks.blockAccess */
-	public static final String RB_BA_SIG_OBF = "Lafx;";
-	
-	/** MCP name of RenderBlocks.renderBlockByRenderType() */
-	public static final String RB_RBBRT_NAME_MCP = "renderBlockByRenderType";
-	
-	/** Obfuscated name of RenderBlocks.renderBlockByRenderType() */
-	public static final String RB_RBBRT_NAME_OBF = "b";
-	
-	/** MCP signature of RenderBlocks.renderBlockByRenderType() */
-	public static final String RB_RBBRT_SIG_MCP = "(Lnet/minecraft/block/Block;III)Z";
-	
-	/** Obfuscated signature of RenderBlocks.renderBlockByRenderType() */
-	public static final String RB_RBBRT_SIG_OBF = "(Lahu;III)Z";
-	
-	/** MCP signature of BetterFoliageClient.getRenderTypeOverride() */
-	public static final String BFC_GRTO_SIG_MCP = "(Lnet/minecraft/world/IBlockAccess;IIILnet/minecraft/block/Block;I)I";
-	
-	/** Obfuscated signature of BetterFoliageClient.getRenderTypeOverride() */
-	public static final String BFC_GRTO_SIG_OBF = "(Lafx;IIILahu;I)I";
-	
-	/** MCP name of SimpleReloadableResourceManager.domainResourceManagers */
-	public static final String SRRM_DRM_MCP = "domainResourceManagers";
-
-	/** SRG name of SimpleReloadableResourceManager.domainResourceManagers */
-	public static final String SRRM_DRM_SRGNAME = "field_110548_a";
-
-	/** MCP name of TextureMap.mapRegisteredSprites */
-	public static final String TM_MRS_MCP = "mapRegisteredSprites";
-	
-	/** Obfuscated name of TextureMap.mapRegisteredSprites */
-	public static final String TM_MRS_OBF = "bpr";
-	
-	/** SRG name of TextureMap.mapRegisteredSprites */
-	public static final String TM_MRS_SRG = "field_110574_e";
-	
-	/** MCP signature of Shaders.pushEntity() */
-	public static final String SHADERS_PE_SIG_MCP = "(Lnet/minecraft/client/renderer/RenderBlocks;Lnet/minecraft/block/Block;III)V";
-	
-	/** Obfuscated signature of Shaders.pushEntity() */
-	public static final String SHADERS_PE_SIG_OBF = "(Lble;Lahu;III)V";
-	
-	/** MCP signature of BetterFoliageClient.getGLSLBlockIdOverride() */
-	public static final String BFC_GLSLID_SIG_MCP = "(ILnet/minecraft/block/Block;)I"; 
-	
-	/** Obfuscated signature of BetterFoliageClient.getGLSLBlockIdOverride() */
-	public static final String BFC_GLSLID_SIG_OBF = "(ILahu;)I";
-	
-
-}

src/main/java/mods/betterfoliage/common/util/Double3.java

@@ -1,42 +0,0 @@
-package mods.betterfoliage.common.util;
-
-import net.minecraftforge.common.util.ForgeDirection;
-
-public class Double3 {
-
-	public final double x;
-	public final double y;
-	public final double z;
-	
-	public Double3(double x, double y, double z) {
-		this.x = x;
-		this.y = y;
-		this.z = z;
-	}
-	
-	public Double3(ForgeDirection dir) {
-		this.x = dir.offsetX;
-		this.y = dir.offsetY;
-		this.z = dir.offsetZ;
-	}
-	
-	public Double3 add(Double3 other) {
-		return new Double3(x + other.x, y + other.y, z + other.z);
-	}
-	
-	public Double3 add(double x, double y, double z) {
-		return new Double3(this.x + x, this.y + y, this.z + z);
-	}
-	
-	public Double3 scaleAxes(double sx, double sy, double sz) {
-		return new Double3(x * sx, y * sy, z * sz);
-	}
-	
-	public Double3 scale(double s) {
-		return new Double3(x * s, y * s, z * s);
-	}
-	
-	public Double3 inverse() {
-		return new Double3(-x, -y, -z);
-	}
-}

src/main/java/mods/betterfoliage/common/util/Utils.java

@@ -1,70 +0,0 @@
-package mods.betterfoliage.common.util;
-
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.Map;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.IResource;
-import net.minecraft.client.resources.IResourceManager;
-import net.minecraft.util.ResourceLocation;
-import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
-import cpw.mods.fml.client.registry.RenderingRegistry;
-
-public class Utils {
-
-	private Utils() {}
-	
-	@SuppressWarnings("unchecked")
-	public static Map<String, IResourceManager> getDomainResourceManagers() {
-		IResourceManager manager = Minecraft.getMinecraft().getResourceManager();
-		Map<String, IResourceManager> result = getField(manager, DeobfNames.SRRM_DRM_MCP, Map.class);
-		if (result == null) result = getField(manager, DeobfNames.SRRM_DRM_SRGNAME, Map.class);
-		return result;
-	}
-	
-	@SuppressWarnings("unchecked")
-	public static <T> T getField(Object target, String fieldName, Class<T> resultClass) {
-		try {
-			Field field = target.getClass().getDeclaredField(fieldName);
-			field.setAccessible(true);
-			return (T) field.get(target);
-		} catch (Exception e) {
-			return null;
-		}
-	}
-	
-	@SuppressWarnings("unchecked")
-	public static <T> T getStaticField(Class<?> clazz, String fieldName, Class<T> resultClass) {
-		try {
-			Field field = clazz.getDeclaredField(fieldName);
-			field.setAccessible(true);
-			return (T) field.get(null);
-		} catch (Exception e) {
-			return null;
-		}
-	}
-	
-	@SuppressWarnings("unchecked")
-	public static ISimpleBlockRenderingHandler getRenderingHandler(int renderType) {
-		try {
-			Field field = RenderingRegistry.class.getDeclaredField("INSTANCE");
-			field.setAccessible(true);
-			RenderingRegistry inst = (RenderingRegistry) field.get(null);
-			field = RenderingRegistry.class.getDeclaredField("blockRenderers");
-			field.setAccessible(true);
-			return ((Map<Integer, ISimpleBlockRenderingHandler>) field.get(inst)).get(renderType);
-		} catch (Exception e) {
-			return null;
-		}
-	}
-	
-	public static boolean resourceExists(ResourceLocation resourceLocation) {
-		try {
-			IResource resource = Minecraft.getMinecraft().getResourceManager().getResource(resourceLocation);
-			if (resource != null) return true;
-		} catch (IOException e) {
-		}
-		return false;
-	}
-}

src/main/java/mods/betterfoliage/loader/BetterFoliageLoader.java

@@ -1,30 +0,0 @@
-package mods.betterfoliage.loader;
-
-import java.util.Map;
-
-import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
-
-@IFMLLoadingPlugin.MCVersion("1.7.2")
-@IFMLLoadingPlugin.TransformerExclusions({"mods.betterfoliage.loader"})
-public class BetterFoliageLoader implements IFMLLoadingPlugin {
-
-	public String[] getASMTransformerClass() {
-		return new String[] {"mods.betterfoliage.loader.BetterFoliageTransformer"};
-	}
-
-	public String getModContainerClass() {
-		return null;
-	}
-
-	public String getSetupClass() {
-		return null;
-	}
-
-	public void injectData(Map<String, Object> data) {
-	}
-
-	public String getAccessTransformerClass() {
-		return null;
-	}
-
-}

src/main/java/mods/betterfoliage/loader/BetterFoliageTransformer.java

@@ -1,48 +0,0 @@
-package mods.betterfoliage.loader;
-
-import mods.betterfoliage.common.util.DeobfNames;
-
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.AbstractInsnNode;
-import org.objectweb.asm.tree.FieldInsnNode;
-import org.objectweb.asm.tree.MethodInsnNode;
-import org.objectweb.asm.tree.MethodNode;
-import org.objectweb.asm.tree.VarInsnNode;
-
-public class BetterFoliageTransformer extends EZTransformerBase {
-
-	@MethodTransform(className="net.minecraft.client.renderer.RenderBlocks",
-					 obf=@MethodMatch(name=DeobfNames.RB_RBBRT_NAME_OBF, signature=DeobfNames.RB_RBBRT_SIG_OBF),
-					 deobf=@MethodMatch(name=DeobfNames.RB_RBBRT_NAME_MCP, signature=DeobfNames.RB_RBBRT_SIG_MCP),
-					 log="Applying RenderBlocks.renderBlockByRenderType() render type ovverride")
-	public void handleRenderBlockOverride(MethodNode method, boolean obf) {
-		AbstractInsnNode invokeGetRenderType = findNext(method.instructions.getFirst(), matchInvokeAny());
-		AbstractInsnNode storeRenderType = findNext(invokeGetRenderType, matchOpcode(Opcodes.ISTORE));
-		insertAfter(method.instructions, storeRenderType,
-			new VarInsnNode(Opcodes.ALOAD, 0),
-			obf ? new FieldInsnNode(Opcodes.GETFIELD, DeobfNames.RB_NAME_OBF, DeobfNames.RB_BA_NAME_OBF, DeobfNames.RB_BA_SIG_OBF) :
-				  new FieldInsnNode(Opcodes.GETFIELD, DeobfNames.RB_NAME_MCP, DeobfNames.RB_BA_NAME_MCP, DeobfNames.RB_BA_SIG_MCP),
-			new VarInsnNode(Opcodes.ILOAD, 2),
-			new VarInsnNode(Opcodes.ILOAD, 3),
-			new VarInsnNode(Opcodes.ILOAD, 4),
-			new VarInsnNode(Opcodes.ALOAD, 1),
-			new VarInsnNode(Opcodes.ILOAD, 5),
-			obf ? new MethodInsnNode(Opcodes.INVOKESTATIC, "mods/betterfoliage/client/BetterFoliageClient", "getRenderTypeOverride", DeobfNames.BFC_GRTO_SIG_OBF) :
-				  new MethodInsnNode(Opcodes.INVOKESTATIC, "mods/betterfoliage/client/BetterFoliageClient", "getRenderTypeOverride", DeobfNames.BFC_GRTO_SIG_MCP),
-			new VarInsnNode(Opcodes.ISTORE, 5)
-		);
-	}
-	
-	@MethodTransform(className="shadersmodcore.client.Shaders",
-			 obf=@MethodMatch(name="pushEntity", signature=DeobfNames.SHADERS_PE_SIG_OBF),
-			 deobf=@MethodMatch(name="pushEntity", signature=DeobfNames.SHADERS_PE_SIG_MCP),
-			 log="Applying Shaders.pushEntity() block id ovverride")
-	public void handleGLSLBlockIDOverride(MethodNode method, boolean obf) {
-		AbstractInsnNode arrayStore = findNext(method.instructions.getFirst(), matchOpcode(Opcodes.IASTORE));
-		insertAfter(method.instructions, arrayStore.getPrevious(),
-			new VarInsnNode(Opcodes.ALOAD, 1),
-			obf ? new MethodInsnNode(Opcodes.INVOKESTATIC, "mods/betterfoliage/client/BetterFoliageClient", "getGLSLBlockIdOverride", DeobfNames.BFC_GLSLID_SIG_OBF) :
-				  new MethodInsnNode(Opcodes.INVOKESTATIC, "mods/betterfoliage/client/BetterFoliageClient", "getGLSLBlockIdOverride", DeobfNames.BFC_GLSLID_SIG_MCP)
-		);
-	}
-}

src/main/java/mods/betterfoliage/loader/EZTransformerBase.java

@@ -1,131 +0,0 @@
-package mods.betterfoliage.loader;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.reflect.Method;
-
-import net.minecraft.launchwrapper.IClassTransformer;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.tree.AbstractInsnNode;
-import org.objectweb.asm.tree.ClassNode;
-import org.objectweb.asm.tree.InsnList;
-import org.objectweb.asm.tree.MethodInsnNode;
-import org.objectweb.asm.tree.MethodNode;
-
-public class EZTransformerBase implements IClassTransformer {
-
-	public static interface IInstructionMatch {
-		public boolean matches(AbstractInsnNode node);
-	}
-	
-	@Retention(RetentionPolicy.RUNTIME)
-	public static @interface MethodMatch {
-		public String name();
-		public String signature();
-	}
-	
-	@Target(ElementType.METHOD)
-	@Retention(RetentionPolicy.RUNTIME)
-	public static @interface MethodTransform {
-		public String className();
-		public MethodMatch deobf();
-		public MethodMatch obf();
-		public String log();
-	}
-	
-	protected Logger logger = LogManager.getLogger(getClass().getSimpleName());
-	
-	public byte[] transform(String name, String transformedName, byte[] basicClass) {
-		// ???
-		if (basicClass == null) return null;
-		
-		// read class
-		ClassNode classNode = new ClassNode();
-        ClassReader classReader = new ClassReader(basicClass);
-        classReader.accept(classNode, 0);
-        boolean hasTransformed = false;
-        
-		for (Method classMethod : getClass().getMethods()) {
-			// check for annotated method with correct signature
-			MethodTransform annot = classMethod.getAnnotation(MethodTransform.class);
-			if (annot == null) continue;
-			if (classMethod.getParameterTypes().length != 2) continue;
-			if (!classMethod.getParameterTypes()[0].equals(MethodNode.class)) continue;
-			if (!classMethod.getParameterTypes()[1].equals(boolean.class)) continue;
-			
-			// try to find specified method in class
-			if (!transformedName.equals(annot.className())) continue;
-			for (MethodNode methodNode : classNode.methods) {
-				Boolean obf = null;
-				if (methodNode.name.equals(annot.obf().name()) && methodNode.desc.equals(annot.obf().signature())) {
-					obf = true;
-				} else if (methodNode.name.equals(annot.deobf().name()) && methodNode.desc.equals(annot.deobf().signature())) {
-					obf = false;
-				}
-				
-				if (obf != null) {
-					// transform
-					hasTransformed = true;
-					try {
-						classMethod.invoke(this, new Object[] {methodNode, obf});
-						logger.info(String.format("%s: SUCCESS", annot.log()));
-					} catch (Exception e) {
-						logger.info(String.format("%s: FAILURE", annot.log()));
-					}
-					break;
-				}
-			}
-		}
-		
-		// return result
-		ClassWriter writer = new ClassWriter(0);
-		if (hasTransformed) classNode.accept(writer);
-		return !hasTransformed ? basicClass : writer.toByteArray();
-	}
-
-	protected AbstractInsnNode findNext(AbstractInsnNode start, IInstructionMatch match) {
-		AbstractInsnNode current = start;
-		while(current != null) {
-			if (match.matches(current)) break;
-			current = current.getNext();
-		}
-		return current;
-	}
-	
-	protected AbstractInsnNode findPrevious(AbstractInsnNode start, IInstructionMatch match) {
-		AbstractInsnNode current = start;
-		while(current != null) {
-			if (match.matches(current)) break;
-			current = current.getPrevious();
-		}
-		return current;
-	}
-	
-	protected static IInstructionMatch matchInvokeAny() {
-		return new IInstructionMatch() {
-			public boolean matches(AbstractInsnNode node) {
-				return node instanceof MethodInsnNode;
-			}
-		};
-	}
-	
-	protected static IInstructionMatch matchOpcode(final int opcode) {
-		return new IInstructionMatch() {
-			public boolean matches(AbstractInsnNode node) {
-				return node.getOpcode() == opcode;
-			}
-		};
-	}
-	
-	protected static void insertAfter(InsnList insnList, AbstractInsnNode node, AbstractInsnNode... added) {
-		InsnList listAdd = new InsnList();
-		for (AbstractInsnNode inst : added) listAdd.add(inst);
-		insnList.insert(node, listAdd);
-	}
-}

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

@@ -0,0 +1,33 @@
+package mods.betterfoliage.mixin;
+
+import mods.betterfoliage.Hooks;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.shapes.VoxelShape;
+import net.minecraft.world.IBlockReader;
+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.CallbackInfoReturnable;
+
+/**
+ * Mixin overriding 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.
+ */
+@Mixin(Block.class)
+public class MixinBlock {
+    private static final String shouldSideBeRendered = "Lnet/minecraft/block/Block;shouldRenderFace(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/IBlockReader;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/Direction;)Z";
+    private static final String getVoxelShape = "Lnet/minecraft/block/BlockState;func_215702_a(Lnet/minecraft/world/IBlockReader;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/Direction;)Lnet/minecraft/util/math/shapes/VoxelShape;";
+    private static final String getFaceOcclusionShape = "Lnet/minecraft/block/BlockState;getFaceOcclusionShape(Lnet/minecraft/world/IBlockReader;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/Direction;)Lnet/minecraft/util/math/shapes/VoxelShape;";
+    private static final String isOpaqueCube = "Lnet/minecraft/block/Block;isOpaqueCube(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/IBlockReader;Lnet/minecraft/util/math/BlockPos;)Z";
+
+    @Redirect(method = shouldSideBeRendered, at = @At(value = "INVOKE", target = getFaceOcclusionShape, ordinal = 1))
+    private static VoxelShape getVoxelShapeOverride(BlockState state, IBlockReader reader, BlockPos pos, Direction dir) {
+        return Hooks.getVoxelShapeOverride(state, reader, pos, dir);
+    }
+}

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

@@ -0,0 +1,41 @@
+package mods.betterfoliage.mixin;
+
+import com.mojang.blaze3d.matrix.MatrixStack;
+import com.mojang.blaze3d.vertex.IVertexBuilder;
+import mods.betterfoliage.model.SpecialRenderModel;
+import mods.betterfoliage.render.pipeline.RenderCtxVanilla;
+import net.minecraft.block.BlockState;
+import net.minecraft.client.renderer.BlockModelRenderer;
+import net.minecraft.client.renderer.model.IBakedModel;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IBlockDisplayReader;
+import net.minecraftforge.client.model.data.IModelData;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import java.util.Random;
+
+@Mixin(BlockModelRenderer.class)
+public class MixinBlockModelRenderer {
+
+    private static final String renderModel = "Lnet/minecraft/client/renderer/BlockModelRenderer;renderModel(Lnet/minecraft/world/IBlockDisplayReader;Lnet/minecraft/client/renderer/model/IBakedModel;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lcom/mojang/blaze3d/matrix/MatrixStack;Lcom/mojang/blaze3d/vertex/IVertexBuilder;ZLjava/util/Random;JILnet/minecraftforge/client/model/data/IModelData;)Z";
+    private static final String renderModelFlat = "Lnet/minecraft/client/renderer/BlockModelRenderer;renderModelFlat(Lnet/minecraft/world/IBlockDisplayReader;Lnet/minecraft/client/renderer/model/IBakedModel;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lcom/mojang/blaze3d/matrix/MatrixStack;Lcom/mojang/blaze3d/vertex/IVertexBuilder;ZLjava/util/Random;JILnet/minecraftforge/client/model/data/IModelData;)Z";
+    private static final String renderModelSmooth = "Lnet/minecraft/client/renderer/BlockModelRenderer;renderModelSmooth(Lnet/minecraft/world/IBlockDisplayReader;Lnet/minecraft/client/renderer/model/IBakedModel;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lcom/mojang/blaze3d/matrix/MatrixStack;Lcom/mojang/blaze3d/vertex/IVertexBuilder;ZLjava/util/Random;JILnet/minecraftforge/client/model/data/IModelData;)Z";
+
+    @Redirect(method = renderModel, at = @At(value = "INVOKE", target = renderModelSmooth), remap = false)
+    public boolean onRenderModelSmooth(BlockModelRenderer renderer, IBlockDisplayReader world, IBakedModel model, BlockState state, BlockPos pos, MatrixStack matrixStack, IVertexBuilder buffer, boolean checkSides, Random random, long rand, int combinedOverlay, IModelData modelData) {
+        if (model instanceof SpecialRenderModel)
+            return RenderCtxVanilla.render(renderer, world, (SpecialRenderModel) model, state, pos, matrixStack, buffer, checkSides, random, rand, combinedOverlay, modelData, true);
+        else
+            return renderer.renderModelSmooth(world, model, state, pos, matrixStack, buffer, checkSides, random, rand, combinedOverlay, modelData);
+    }
+
+    @Redirect(method = renderModel, at = @At(value = "INVOKE", target = renderModelFlat), remap = false)
+    public boolean onRenderModelFlat(BlockModelRenderer renderer, IBlockDisplayReader world, IBakedModel model, BlockState state, BlockPos pos, MatrixStack matrixStack, IVertexBuilder buffer, boolean checkSides, Random random, long rand, int combinedOverlay, IModelData modelData) {
+        if (model instanceof SpecialRenderModel)
+            return RenderCtxVanilla.render(renderer, world, (SpecialRenderModel) model, state, pos, matrixStack, buffer, checkSides, random, rand, combinedOverlay, modelData, false);
+        else
+            return renderer.renderModelSmooth(world, model, state, pos, matrixStack, buffer, checkSides, random, rand, combinedOverlay, modelData);
+    }
+}

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

@@ -0,0 +1,31 @@
+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.IBlockReader;
+import org.spongepowered.asm.mixin.Debug;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Coerce;
+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;getShadeBrightness(Lnet/minecraft/world/IBlockReader;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;getShadeBrightness(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/IBlockReader;Lnet/minecraft/util/math/BlockPos;)F";
+
+    @Redirect(method = callFrom, at = @At(value = "INVOKE", target = callTo))
+    float getAmbientOcclusionValue(Block block, BlockState state, IBlockReader reader, BlockPos pos) {
+        return Hooks.getAmbientOcclusionLightValueOverride(block.getShadeBrightness(state, reader, pos), state);
+    }
+}

src/main/java/mods/betterfoliage/mixin/MixinClientWorld.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.client.renderer.WorldRenderer;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IBlockReader;
+import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import java.util.Random;
+
+@Mixin(ClientWorld.class)
+public class MixinClientWorld {
+
+    private static final String worldAnimateTick = "Lnet/minecraft/client/world/ClientWorld;doAnimateTick(IIIILjava/util/Random;ZLnet/minecraft/util/math/BlockPos$Mutable;)V";
+    private static final String blockAnimateTick = "Lnet/minecraft/block/Block;animateTick(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Ljava/util/Random;)V";
+
+    private static final String worldNotify = "Lnet/minecraft/client/world/ClientWorld;sendBlockUpdated(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/block/BlockState;I)V";
+    private static final String rendererNotify = "Lnet/minecraft/client/renderer/WorldRenderer;blockChanged(Lnet/minecraft/world/IBlockReader;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/block/BlockState;I)V";
+
+    /**
+     * Inject a callback to call for every random display tick. Used for adding custom particle effects to blocks.
+     */
+    @Redirect(method = worldAnimateTick, at = @At(value = "INVOKE", target = blockAnimateTick))
+    void onAnimateTick(Block block, BlockState state, World world, BlockPos pos, Random random) {
+        Hooks.onRandomDisplayTick(block, state, (ClientWorld) world, pos, random);
+        block.animateTick(state, world, pos, random);
+    }
+
+    /**
+     * Inject callback to get notified of client-side blockstate changes.
+     * Used to invalidate caches in the {@link mods.betterfoliage.chunk.ChunkOverlayManager}
+     */
+    @Redirect(method = worldNotify, at = @At(value = "INVOKE", target = rendererNotify))
+    void onClientBlockChanged(WorldRenderer renderer, IBlockReader world, BlockPos pos, BlockState oldState, BlockState newState, int flags) {
+        Hooks.onClientBlockChanged((ClientWorld) world, pos, oldState, newState, flags);
+        renderer.blockChanged(world, pos, oldState, newState, flags);
+    }
+}

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

@@ -0,0 +1,44 @@
+package mods.betterfoliage.mixin;
+
+import com.mojang.blaze3d.matrix.MatrixStack;
+import mods.betterfoliage.model.SpecialRenderModel;
+import mods.betterfoliage.render.pipeline.RenderCtxForge;
+import net.minecraft.block.BlockState;
+import net.minecraft.client.renderer.model.IBakedModel;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IBlockDisplayReader;
+import net.minecraftforge.client.model.data.IModelData;
+import net.minecraftforge.client.model.pipeline.ForgeBlockModelRenderer;
+import net.minecraftforge.client.model.pipeline.VertexLighterFlat;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import java.util.Random;
+
+@Mixin(ForgeBlockModelRenderer.class)
+public class MixinForgeBlockModelRenderer {
+
+    private static final String renderModelFlat = "Lnet/minecraftforge/client/model/pipeline/ForgeBlockModelRenderer;renderModelFlat(Lnet/minecraft/world/IBlockDisplayReader;Lnet/minecraft/client/renderer/model/IBakedModel;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lcom/mojang/blaze3d/matrix/MatrixStack;Lcom/mojang/blaze3d/vertex/IVertexBuilder;ZLjava/util/Random;JILnet/minecraftforge/client/model/data/IModelData;)Z";
+    private static final String renderModelSmooth = "Lnet/minecraftforge/client/model/pipeline/ForgeBlockModelRenderer;renderModelSmooth(Lnet/minecraft/world/IBlockDisplayReader;Lnet/minecraft/client/renderer/model/IBakedModel;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lcom/mojang/blaze3d/matrix/MatrixStack;Lcom/mojang/blaze3d/vertex/IVertexBuilder;ZLjava/util/Random;JILnet/minecraftforge/client/model/data/IModelData;)Z";
+    private static final String render = "Lnet/minecraftforge/client/model/pipeline/ForgeBlockModelRenderer;render(Lnet/minecraftforge/client/model/pipeline/VertexLighterFlat;Lnet/minecraft/world/IBlockDisplayReader;Lnet/minecraft/client/renderer/model/IBakedModel;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lcom/mojang/blaze3d/matrix/MatrixStack;ZLjava/util/Random;JLnet/minecraftforge/client/model/data/IModelData;)Z";
+
+    @Redirect(method = {renderModelFlat, renderModelSmooth}, at = @At(value = "INVOKE", target = render), remap = false)
+    public boolean render(
+            VertexLighterFlat lighter,
+            IBlockDisplayReader world,
+            IBakedModel model,
+            BlockState state,
+            BlockPos pos,
+            MatrixStack matrixStack,
+            boolean checkSides,
+            Random rand,
+            long seed,
+            IModelData modelData
+    ) {
+        if (model instanceof SpecialRenderModel)
+            return RenderCtxForge.render(lighter, world, (SpecialRenderModel) model, state, pos, matrixStack, checkSides, rand, seed, modelData);
+        else
+            return ForgeBlockModelRenderer.render(lighter, world, model, state, pos, matrixStack, checkSides, rand, seed, modelData);
+    }
+}

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

@@ -0,0 +1,65 @@
+package mods.betterfoliage.mixin;
+
+import mods.betterfoliage.render.lighting.ForgeVertexLighter;
+import mods.betterfoliage.render.lighting.ForgeVertexLighterAccess;
+import net.minecraftforge.client.model.pipeline.VertexLighterFlat;
+import org.jetbrains.annotations.NotNull;
+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;
+
+@Mixin(VertexLighterFlat.class)
+abstract public class MixinForgeCustomVertexLighting implements ForgeVertexLighter, ForgeVertexLighterAccess {
+
+    private static final String processQuad = "Lnet/minecraftforge/client/model/pipeline/VertexLighterFlat;processQuad()V";
+    private static final String updateLightmap = "Lnet/minecraftforge/client/model/pipeline/VertexLighterFlat;updateLightmap([F[FFFF)V";
+    private static final String updateColor = "Lnet/minecraftforge/client/model/pipeline/VertexLighterFlat;updateColor([F[FFFFFI)V";
+    private static final String resetBlockInfo = "Lnet/minecraftforge/client/model/pipeline/VertexLighterFlat;resetBlockInfo()V";
+
+    @NotNull
+    public ForgeVertexLighter vertexLighter = this;
+
+    @NotNull
+    public ForgeVertexLighter getVertexLighter() {
+        return vertexLighter;
+    }
+
+    public void setVertexLighter(@NotNull ForgeVertexLighter vertexLighter) {
+        this.vertexLighter = vertexLighter;
+    }
+
+
+    @Shadow
+    protected abstract void updateLightmap(float[] normal, float[] lightmap, float x, float y, float z);
+    @Shadow
+    protected abstract void updateColor(float[] normal, float[] color, float x, float y, float z, float tint, int multiplier);
+
+    @Override
+    public void updateVertexLightmap(@NotNull float[] normal, @NotNull float[] lightmap, float x, float y, float z) {
+        updateLightmap(normal, lightmap, x, y, z);
+    }
+
+    @Override
+    public void updateVertexColor(@NotNull float[] normal, @NotNull float[] color, float x, float y, float z, float tint, int multiplier) {
+        updateColor(normal, color, x, y, z, tint, multiplier);
+    }
+
+
+    @Redirect(method = processQuad, at = @At(value = "INVOKE", target = updateColor), remap = false)
+    void onUpdateColor(VertexLighterFlat self, float[] normal, float[] color, float x, float y, float z, float tint, int multiplier) {
+        vertexLighter.updateVertexColor(normal, color, x, y, z, tint, multiplier);
+    }
+
+    @Redirect(method = processQuad, at = @At(value = "INVOKE", target = updateLightmap), remap = false)
+    void onUpdateLightmap(VertexLighterFlat self, float[] normal, float[] lightmap, float x, float y, float z) {
+        vertexLighter.updateVertexLightmap(normal, lightmap, x, y, z);
+    }
+
+    @Inject(method = resetBlockInfo, at = @At("RETURN"), remap = false)
+    void onReset(CallbackInfo ci) {
+        vertexLighter = this;
+    }
+}

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

@@ -0,0 +1,43 @@
+package mods.betterfoliage.mixin;
+
+import mods.betterfoliage.BetterFoliageMod;
+import mods.betterfoliage.resource.discovery.BakeWrapperManager;
+import mods.betterfoliage.resource.discovery.ModelDefinitionsLoadedEvent;
+import net.minecraft.client.renderer.model.*;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.profiler.IProfiler;
+import net.minecraft.util.ResourceLocation;
+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.function.Function;
+
+@Mixin(ModelBakery.class)
+abstract public class MixinModelBakery {
+
+    private static final String processLoading = "Lnet/minecraft/client/renderer/model/ModelBakery;processLoading(Lnet/minecraft/profiler/IProfiler;I)V";
+    private static final String stitch = "Lnet/minecraft/client/renderer/texture/AtlasTexture;stitch(Lnet/minecraft/resources/IResourceManager;Ljava/util/stream/Stream;Lnet/minecraft/profiler/IProfiler;I)Lnet/minecraft/client/renderer/texture/AtlasTexture$SheetData;";
+    private static final String profilerSection = "Lnet/minecraft/profiler/IProfiler;popPush(Ljava/lang/String;)V";
+    private static final String getBakedModel = "Lnet/minecraft/client/renderer/model/ModelBakery;getBakedModel(Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/model/IModelTransform;Ljava/util/function/Function;)Lnet/minecraft/client/renderer/model/IBakedModel;";
+    private static final String bakeModel = "Lnet/minecraft/client/renderer/model/IUnbakedModel;bake(Lnet/minecraft/client/renderer/model/ModelBakery;Ljava/util/function/Function;Lnet/minecraft/client/renderer/model/IModelTransform;Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/model/IBakedModel;";
+
+    @Inject(method = processLoading, at = @At(value = "INVOKE", target = profilerSection, ordinal = 4))
+    void onBeforeTextures(IProfiler profiler, int maxMipmapLevel, CallbackInfo ci) {
+        profiler.popPush("betterfoliage");
+        BetterFoliageMod.INSTANCE.getBus().post(new ModelDefinitionsLoadedEvent(ModelBakery.class.cast(this)));
+    }
+
+    @Redirect(method = getBakedModel, at = @At(value = "INVOKE", target = bakeModel))
+    IBakedModel onBakeModel(
+            IUnbakedModel unbaked,
+            ModelBakery bakery,
+            Function<RenderMaterial, TextureAtlasSprite> spriteGetter,
+            IModelTransform transform,
+            ResourceLocation locationIn
+    ) {
+        return BakeWrapperManager.INSTANCE.onBake(unbaked, bakery, spriteGetter, transform, locationIn);
+    }
+}

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

@@ -0,0 +1,38 @@
+package mods.betterfoliage.mixin;
+
+import mods.betterfoliage.Hooks;
+import net.minecraft.block.BlockState;
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.shapes.VoxelShape;
+import net.minecraft.world.IBlockReader;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Coerce;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Pseudo
+@Mixin(targets = "net.optifine.util.BlockUtils")
+public class MixinOptifineBlockUtils {
+    private static final String shouldSideBeRendered = "shouldSideBeRendered(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/IBlockReader;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/Direction;Lnet/optifine/render/RenderEnv;)Z";
+
+    private static final String shouldSideBeRenderedCached = "shouldSideBeRenderedCached(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/IBlockReader;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/Direction;Lnet/optifine/render/RenderEnv;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;)Z";
+    private static final String getFaceOcclusionShape = "Lnet/minecraft/block/BlockState;getFaceOcclusionShape(Lnet/minecraft/world/IBlockReader;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/Direction;)Lnet/minecraft/util/math/shapes/VoxelShape;";
+
+    @SuppressWarnings("UnresolvedMixinReference")
+    @Redirect(method = shouldSideBeRenderedCached, at = @At(value = "INVOKE", target = getFaceOcclusionShape, ordinal = 1))
+    private static VoxelShape getVoxelShapeOverride(BlockState state, IBlockReader reader, BlockPos pos, Direction dir) {
+        return Hooks.getVoxelShapeOverride(state, reader, pos, dir);
+    }
+
+    @SuppressWarnings("UnresolvedMixinReference")
+    @Inject(method = shouldSideBeRendered, at = @At(value = "HEAD"), cancellable = true)
+    private static void shouldForceSideRender(BlockState state, IBlockReader reader, BlockPos pos, Direction face, @Coerce Object renderEnv, CallbackInfoReturnable<Boolean> cir) {
+        if (Hooks.shouldForceSideRenderOF(state, reader, pos, face)) {
+            cir.setReturnValue(true);
+        }
+    }
+}

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

@@ -0,0 +1,101 @@
+package mods.betterfoliage
+
+import mods.betterfoliage.chunk.ChunkOverlayManager
+import mods.betterfoliage.config.BlockConfig
+import mods.betterfoliage.integration.OptifineCustomColors
+import mods.betterfoliage.integration.ShadersModIntegration
+import mods.betterfoliage.render.block.vanilla.RoundLogOverlayLayer
+import mods.betterfoliage.render.block.vanilla.StandardCactusDiscovery
+import mods.betterfoliage.render.block.vanilla.StandardCactusModel
+import mods.betterfoliage.render.block.vanilla.StandardDirtDiscovery
+import mods.betterfoliage.render.block.vanilla.StandardDirtModel
+import mods.betterfoliage.render.block.vanilla.StandardGrassDiscovery
+import mods.betterfoliage.render.block.vanilla.StandardGrassModel
+import mods.betterfoliage.render.block.vanilla.StandardLeafDiscovery
+import mods.betterfoliage.render.block.vanilla.StandardLeafModel
+import mods.betterfoliage.render.block.vanilla.StandardLilypadDiscovery
+import mods.betterfoliage.render.block.vanilla.StandardLilypadModel
+import mods.betterfoliage.render.block.vanilla.StandardRoundLogDiscovery
+import mods.betterfoliage.render.block.vanilla.StandardMyceliumDiscovery
+import mods.betterfoliage.render.block.vanilla.StandardMyceliumModel
+import mods.betterfoliage.render.block.vanilla.StandardNetherrackDiscovery
+import mods.betterfoliage.render.block.vanilla.StandardNetherrackModel
+import mods.betterfoliage.render.block.vanilla.StandardRoundLogModel
+import mods.betterfoliage.render.block.vanilla.StandardSandDiscovery
+import mods.betterfoliage.render.block.vanilla.StandardSandModel
+import mods.betterfoliage.render.lighting.AoSideHelper
+import mods.betterfoliage.render.particle.LeafWindTracker
+import mods.betterfoliage.resource.discovery.BakeWrapperManager
+import mods.betterfoliage.resource.discovery.BlockTypeCache
+import mods.betterfoliage.resource.discovery.ModelDefinitionsLoadedEvent
+import mods.betterfoliage.resource.generated.GeneratedTexturePack
+import mods.betterfoliage.render.particle.LeafParticleRegistry
+import mods.betterfoliage.render.particle.RisingSoulParticle
+import mods.betterfoliage.util.resourceManager
+import net.minecraft.block.BlockState
+import net.minecraft.client.Minecraft
+import net.minecraft.resources.IReloadableResourceManager
+import net.minecraftforge.eventbus.api.SubscribeEvent
+
+/**
+ * Object responsible for initializing (and holding a reference to) all the infrastructure of the mod
+ * except for the call hooks.
+ */
+object BetterFoliage {
+    /** Resource pack holding generated assets */
+    val generatedPack = GeneratedTexturePack("bf_gen", "Better Foliage generated assets")
+
+    /** List of recognized [BlockState]s */
+    var blockTypes = BlockTypeCache()
+
+    fun init() {
+        // discoverers
+        BetterFoliageMod.bus.register(BakeWrapperManager)
+        BetterFoliageMod.bus.register(LeafParticleRegistry)
+        resourceManager.registerReloadListener(LeafParticleRegistry)
+
+        ChunkOverlayManager.layers.add(RoundLogOverlayLayer)
+
+        listOf(
+            StandardLeafDiscovery,
+            StandardGrassDiscovery,
+            StandardDirtDiscovery,
+            StandardMyceliumDiscovery,
+            StandardSandDiscovery,
+            StandardLilypadDiscovery,
+            StandardCactusDiscovery,
+            StandardNetherrackDiscovery,
+            StandardRoundLogDiscovery
+        ).forEach {
+            BakeWrapperManager.discoverers.add(it)
+        }
+
+        // init singletons
+        val singletons = listOf(
+            AoSideHelper,
+            BlockConfig,
+            ChunkOverlayManager,
+            LeafWindTracker
+        )
+
+        val modelSingletons = listOf(
+            StandardLeafModel.Companion,
+            StandardGrassModel.Companion,
+            StandardDirtModel.Companion,
+            StandardMyceliumModel.Companion,
+            StandardSandModel.Companion,
+            StandardLilypadModel.Companion,
+            StandardCactusModel.Companion,
+            StandardNetherrackModel.Companion,
+            StandardRoundLogModel.Companion,
+            RisingSoulParticle.Companion
+        )
+
+        // init mod integrations
+        val integrations = listOf(
+            ShadersModIntegration,
+            OptifineCustomColors
+        )
+    }
+}
+

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

@@ -0,0 +1,40 @@
+package mods.betterfoliage
+
+import mods.betterfoliage.config.BlockConfig
+import mods.betterfoliage.config.Config
+import net.minecraft.client.Minecraft
+import net.minecraftforge.fml.ModLoadingContext
+import net.minecraftforge.fml.common.Mod
+import net.minecraftforge.fml.config.ModConfig
+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 thedarkcolour.kotlinforforge.forge.MOD_BUS
+import java.io.File
+import java.io.PrintStream
+import java.util.Properties
+
+@Mod(BetterFoliageMod.MOD_ID)
+object BetterFoliageMod {
+    const val MOD_ID = "betterfoliage"
+
+    val bus = MOD_BUS
+
+    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
+    )
+
+    init {
+        ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, Config.build())
+        Minecraft.getInstance().resourcePackRepository.addPackFinder(BetterFoliage.generatedPack.finder)
+        bus.register(BlockConfig)
+        BetterFoliage.init()
+    }
+}

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

@@ -0,0 +1,90 @@
+package mods.octarinecore
+
+import mods.betterfoliage.util.ClassRef
+import mods.betterfoliage.util.ClassRef.Companion.float
+import mods.betterfoliage.util.ClassRef.Companion.void
+import mods.betterfoliage.util.FieldRef
+import mods.betterfoliage.util.MethodRef
+import net.minecraft.block.Block
+import net.minecraft.block.BlockState
+import net.minecraft.client.renderer.BlockModelRenderer
+import net.minecraft.client.renderer.BlockRendererDispatcher
+import net.minecraft.client.renderer.BufferBuilder
+import net.minecraft.client.renderer.chunk.ChunkRenderCache
+import net.minecraft.client.renderer.model.BakedQuad
+import net.minecraft.client.renderer.model.IUnbakedModel
+import net.minecraft.client.renderer.model.ModelBakery
+import net.minecraft.client.renderer.texture.TextureAtlasSprite
+import net.minecraft.util.ResourceLocation
+import net.minecraft.util.math.BlockPos
+import net.minecraft.world.IBlockDisplayReader
+import net.minecraft.world.IBlockReader
+import net.minecraftforge.client.model.pipeline.BlockInfo
+import net.minecraftforge.client.model.pipeline.VertexLighterFlat
+import java.util.Random
+
+// Java
+val String = ClassRef<String>("java.lang.String")
+val List = ClassRef<List<*>>("java.util.List")
+val Random = ClassRef<Random>("java.util.Random")
+fun <K, V> mapRef() = ClassRef<Map<K, V>>("java.util.Map")
+fun <K, V> mapRefMutable() = ClassRef<MutableMap<K, V>>("java.util.Map")
+
+// Minecraft
+val IBlockReader = ClassRef<IBlockReader>("net.minecraft.world.IBlockReader")
+val ILightReader = ClassRef<IBlockDisplayReader>("net.minecraft.world.IBlockDisplayReader")
+val BlockState = ClassRef<BlockState>("net.minecraft.block.BlockState")
+val BlockPos = ClassRef<BlockPos>("net.minecraft.util.math.BlockPos")
+val Block = ClassRef<Block>("net.minecraft.block.Block")
+
+val TextureAtlasSprite = ClassRef<TextureAtlasSprite>("net.minecraft.client.renderer.texture.TextureAtlasSprite")
+val BufferBuilder = ClassRef<BufferBuilder>("net.minecraft.client.renderer.BufferBuilder")
+val BufferBuilder_setSprite = MethodRef(BufferBuilder, "setSprite", void, TextureAtlasSprite)
+val BufferBuilder_sVertexBuilder = FieldRef(BufferBuilder, "sVertexBuilder", SVertexBuilder)
+val BlockRendererDispatcher = ClassRef<BlockRendererDispatcher>("net.minecraft.client.renderer.BlockRendererDispatcher")
+val ChunkRenderCache = ClassRef<ChunkRenderCache>("net.minecraft.client.renderer.chunk.ChunkRenderCache")
+val ResourceLocation = ClassRef<ResourceLocation>("net.minecraft.util.ResourceLocation")
+val BakedQuad = ClassRef<BakedQuad>("net.minecraft.client.renderer.model.BakedQuad")
+val BlockModelRenderer = ClassRef<BlockModelRenderer>("net.minecraft.client.renderer.BlockModelRenderer")
+
+val VertexLighterFlat = ClassRef<VertexLighterFlat>("net.minecraftforge.client.model.pipeline.VertexLighterFlat")
+val BlockInfo = ClassRef<BlockInfo>("net.minecraftforge.client.model.pipeline.BlockInfo")
+val VertexLighterFlat_blockInfo = FieldRef(VertexLighterFlat, "blockInfo", BlockInfo)
+val BlockInfo_shx = FieldRef(BlockInfo, "shx", float)
+val BlockInfo_shy = FieldRef(BlockInfo, "shy", float)
+val BlockInfo_shz = FieldRef(BlockInfo, "shz", float)
+
+object ModelBakery : ClassRef<ModelBakery>("net.minecraft.client.renderer.model.ModelBakery") {
+    val unbakedModels = FieldRef(this, "unbakedModels", mapRefMutable<ResourceLocation, IUnbakedModel>())
+    val topUnbakedModels = FieldRef(this, "topUnbakedModels", mapRefMutable<ResourceLocation, IUnbakedModel>())
+}
+
+// Optifine
+val OptifineClassTransformer = ClassRef<Any>("optifine.OptiFineClassTransformer")
+val BlockPosM = ClassRef<Any>("net.optifine.BlockPosM")
+object ChunkCacheOF : ClassRef<Any>("net.optifine.override.ChunkCacheOF") {
+    val chunkCache = FieldRef(this, "chunkCache", ChunkRenderCache)
+}
+
+object RenderEnv : ClassRef<Any>("net.optifine.render.RenderEnv") {
+    val reset = MethodRef(this, "reset", void, BlockState, BlockPos)
+}
+
+// Optifine custom colors
+val IColorizer = ClassRef<Any>("net.optifine.CustomColors\$IColorizer")
+object CustomColors : ClassRef<Any>("net.optifine.CustomColors") {
+    val getColorMultiplier = MethodRef(this, "getColorMultiplier", int, BakedQuad, BlockState, ILightReader, BlockPos, RenderEnv)
+}
+
+// Optifine shaders
+object SVertexBuilder : ClassRef<Any>("net.optifine.shaders.SVertexBuilder") {
+    val pushState = MethodRef(this, "pushEntity", void, long)
+    val popState = MethodRef(this, "popEntity", void)
+}
+
+object BlockAliases : ClassRef<Any>("net.optifine.shaders.BlockAliases") {
+    val getAliasBlockId = MethodRef(this, "getAliasBlockId", int, BlockState)
+}
+
+
+

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

@@ -0,0 +1,8 @@
+package mods.betterfoliage
+
+import net.minecraft.client.renderer.model.ModelBakery
+import net.minecraft.client.renderer.texture.AtlasTexture
+import net.minecraft.resources.IResourceManager
+import net.minecraft.util.ResourceLocation
+import net.minecraftforge.eventbus.api.Event
+

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

@@ -0,0 +1,76 @@
+@file:JvmName("Hooks")
+package mods.betterfoliage
+
+import mods.betterfoliage.chunk.ChunkOverlayManager
+import mods.betterfoliage.config.Config
+import mods.betterfoliage.model.SpecialRenderModel
+import mods.betterfoliage.model.WeightedModelWrapper
+import mods.betterfoliage.render.block.vanilla.RoundLogKey
+import mods.betterfoliage.render.particle.FallingLeafParticle
+import mods.betterfoliage.render.particle.LeafBlockModel
+import mods.betterfoliage.render.particle.RisingSoulParticle
+import net.minecraft.block.Block
+import net.minecraft.block.BlockState
+import net.minecraft.block.Blocks
+import net.minecraft.client.Minecraft
+import net.minecraft.client.world.ClientWorld
+import net.minecraft.util.Direction
+import net.minecraft.util.Direction.DOWN
+import net.minecraft.util.Direction.UP
+import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.shapes.VoxelShape
+import net.minecraft.util.math.shapes.VoxelShapes
+import net.minecraft.world.IBlockDisplayReader
+import net.minecraft.world.IBlockReader
+import net.minecraft.world.World
+import java.util.Random
+
+fun getAmbientOcclusionLightValueOverride(original: Float, state: BlockState): Float {
+    if (Config.enabled && Config.roundLogs.enabled && BetterFoliage.blockTypes.hasTyped<RoundLogKey>(state))
+        return Config.roundLogs.dimming.toFloat()
+    return original
+}
+
+fun onClientBlockChanged(worldClient: ClientWorld, pos: BlockPos, oldState: BlockState, newState: BlockState, flags: Int) {
+    ChunkOverlayManager.onBlockChange(worldClient, pos)
+}
+
+fun onRandomDisplayTick(block: Block, state: BlockState, world: ClientWorld, pos: BlockPos, random: Random) {
+    if (Config.enabled &&
+        Config.risingSoul.enabled &&
+        state.block == Blocks.SOUL_SAND &&
+        world.getBlockState(pos.relative(UP)).isAir &&
+        Math.random() < Config.risingSoul.chance) {
+            RisingSoulParticle(world, pos).addIfValid()
+    }
+
+    if (Config.enabled &&
+        Config.fallingLeaves.enabled &&
+        random.nextDouble() < Config.fallingLeaves.chance &&
+        world.getBlockState(pos.relative(DOWN)).isAir
+    ) {
+        (getActualRenderModel(world, pos, state, random) as? LeafBlockModel)?.let { leafModel ->
+            val blockColor = Minecraft.getInstance().blockColors.getColor(state, world, pos, 0)
+            FallingLeafParticle(world, pos, leafModel.key, blockColor, random).addIfValid()
+        }
+    }
+}
+
+fun getVoxelShapeOverride(state: BlockState, reader: IBlockReader, pos: BlockPos, dir: Direction): VoxelShape {
+    if (Config.enabled && Config.roundLogs.enabled && BetterFoliage.blockTypes.hasTyped<RoundLogKey>(state))
+        return VoxelShapes.empty()
+    return state.getFaceOcclusionShape(reader, pos, dir)
+}
+
+fun shouldForceSideRenderOF(state: BlockState, world: IBlockReader, pos: BlockPos, face: Direction) =
+    world.getBlockState(pos.relative(face)).let { neighbor -> BetterFoliage.blockTypes.hasTyped<RoundLogKey>(neighbor) }
+
+fun getActualRenderModel(world: IBlockDisplayReader, pos: BlockPos, state: BlockState, random: Random): SpecialRenderModel? {
+    val model = Minecraft.getInstance().blockRenderer.blockModelShaper.getBlockModel(state) as? SpecialRenderModel
+        ?: return null
+    if (model is WeightedModelWrapper) {
+        random.setSeed(state.getSeed(pos))
+        return model.getModel(random).model
+    }
+    return model
+}

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

@@ -0,0 +1,60 @@
+package mods.betterfoliage.chunk
+
+import mods.betterfoliage.util.Int3
+import mods.betterfoliage.util.offset
+import mods.betterfoliage.util.plus
+import mods.betterfoliage.util.semiRandom
+import net.minecraft.block.Block
+import net.minecraft.block.BlockState
+import net.minecraft.client.renderer.chunk.ChunkRenderCache
+import net.minecraft.util.Direction
+import net.minecraft.util.math.BlockPos
+import net.minecraft.world.IBlockDisplayReader
+import net.minecraft.world.IWorldReader
+import net.minecraft.world.biome.Biome
+import net.minecraft.world.level.ColorResolver
+
+/**
+ * Represents the block being rendered. Has properties and methods to query the neighborhood of the block in
+ * block-relative coordinates.
+ */
+interface BlockCtx {
+    val world: IBlockDisplayReader
+    val pos: BlockPos
+
+    fun offset(dir: Direction) = offset(dir.offset)
+    fun offset(offset: Int3): BlockCtx
+
+    val state: BlockState get() = world.getBlockState(pos)
+    fun state(offset: Int3) = world.getBlockState(pos + offset)
+    fun state(dir: Direction) = state(dir.offset)
+
+    fun isAir(offset: Int3) = (pos + offset).let { world.getBlockState(it).isAir(world, it) }
+    fun isAir(dir: Direction) = isAir(dir.offset)
+
+    val biome: Biome? get() =
+        (world as? IWorldReader)?.getBiome(pos) ?:
+        (world as? ChunkRenderCache)?.level?.getBiome(pos)
+
+    val isFullBlock: Boolean get() = state.isCollisionShapeFullBlock(world, pos)
+
+    fun isNeighborSturdy(dir: Direction) = offset(dir).let { it.state.isFaceSturdy(it.world, it.pos, dir.opposite) }
+
+    fun shouldSideBeRendered(side: Direction) = Block.shouldRenderFace(state, world, pos, side)
+
+    /** Get a semi-random value based on the block coordinate and the given seed. */
+    fun semiRandom(seed: Int) = pos.semiRandom(seed)
+
+    /** Get an array of semi-random values based on the block coordinate. */
+    fun semiRandomArray(num: Int): Array<Int> = Array(num) { semiRandom(it) }
+
+    fun color(resolver: ColorResolver) = world.getBlockTint(pos, resolver)
+}
+
+class BasicBlockCtx(
+    override val world: IBlockDisplayReader,
+    override val pos: BlockPos
+) : BlockCtx {
+    override val state: BlockState = world.getBlockState(pos)
+    override fun offset(offset: Int3) = BasicBlockCtx(world, pos + offset)
+}

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

@@ -0,0 +1,118 @@
+package mods.betterfoliage.chunk
+
+import mods.betterfoliage.util.get
+import mods.betterfoliage.util.isInstance
+import mods.octarinecore.ChunkCacheOF
+import net.minecraft.client.renderer.chunk.ChunkRenderCache
+import net.minecraft.client.world.ClientWorld
+import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.ChunkPos
+import net.minecraft.world.DimensionType
+import net.minecraft.world.IBlockDisplayReader
+import net.minecraft.world.IWorldReader
+import net.minecraftforge.common.MinecraftForge
+import net.minecraftforge.event.world.ChunkEvent
+import net.minecraftforge.event.world.WorldEvent
+import net.minecraftforge.eventbus.api.SubscribeEvent
+import java.util.*
+import kotlin.collections.set
+
+val IBlockDisplayReader.dimType: DimensionType get() = when {
+    this is IWorldReader -> dimensionType()
+    this is ChunkRenderCache -> level.dimensionType()
+    this.isInstance(ChunkCacheOF) -> this[ChunkCacheOF.chunkCache].level.dimensionType()
+    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: IBlockDisplayReader, pos: BlockPos)
+}
+
+/**
+ * Query, lazy calculation and lifecycle management of multiple layers of chunk overlay data.
+ */
+object ChunkOverlayManager {
+
+    var tempCounter = 0
+
+    init {
+        MinecraftForge.EVENT_BUS.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) }
+        }
+    }
+
+    @SubscribeEvent
+    fun handleLoadWorld(event: WorldEvent.Load) = (event.world as? ClientWorld)?.let { world ->
+        chunkData[world.dimType] = mutableMapOf()
+    }
+
+    @SubscribeEvent
+    fun handleUnloadWorld(event: WorldEvent.Unload) = (event.world as? ClientWorld)?.let { world ->
+        chunkData.remove(world.dimType)
+    }
+
+    @SubscribeEvent
+    fun handleLoadChunk(event: ChunkEvent.Load) = (event.world as? ClientWorld)?.let { world ->
+        chunkData[world.dimType]?.let { chunks ->
+            // check for existence first because Optifine fires a TON of these
+            if (event.chunk.pos !in chunks.keys) chunks[event.chunk.pos] = ChunkOverlayData(layers)
+        }
+    }
+
+    @SubscribeEvent
+    fun handleUnloadChunk(event: ChunkEvent.Unload) = (event.world as? ClientWorld)?.let { world ->
+        chunkData[world.dimType]?.remove(event.chunk.pos)
+    }
+}
+
+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/Config.kt

@@ -0,0 +1,180 @@
+package mods.betterfoliage.config
+
+import mods.betterfoliage.BetterFoliageMod
+import mods.betterfoliage.resource.discovery.ConfigurableBlockMatcher
+import mods.betterfoliage.resource.discovery.ModelTextureListConfiguration
+import net.minecraft.util.ResourceLocation
+import net.minecraftforge.eventbus.api.SubscribeEvent
+import net.minecraftforge.fml.config.ModConfig
+import java.util.Random
+
+private fun featureEnable() = boolean(true).lang("enabled")
+
+abstract class PopulationConfigCategory() : ConfigCategory() {
+    abstract val enabled: Boolean
+    abstract val population: Int
+
+    fun enabled(random: Random) = random.nextInt(64) < population && enabled
+}
+
+// Config singleton
+object Config : DelegatingConfig(BetterFoliageMod.MOD_ID, BetterFoliageMod.MOD_ID) {
+
+    val enabled by boolean(true)
+    val nVidia by boolean(false)
+
+    object leaves : ConfigCategory() {
+        val enabled by featureEnable()
+        val snowEnabled by boolean(true)
+        val hOffset by double(max=0.4, default=0.2).lang("hOffset")
+        val vOffset by double(max=0.4, default=0.1).lang("vOffset")
+        val size by double(min=0.75, max=2.5, default=1.4).lang("size")
+        val dense by boolean(false)
+        val hideInternal by boolean(true)
+        val saturationThreshold by double(default=0.1)
+    }
+
+    object shortGrass : PopulationConfigCategory(){
+        override val enabled by featureEnable()
+        val myceliumEnabled by boolean(true)
+        val snowEnabled by boolean(true)
+        val hOffset by double(max=0.4, default=0.2).lang("hOffset")
+        val heightMin by double(min=0.1, max=2.5, default=0.6).lang("heightMin")
+        val heightMax by double(min=0.1, max=2.5, default=0.8).lang("heightMax")
+        val size by double(min=0.5, max=1.5, default=1.0).lang("size")
+        override val population by int(max=64, default=64).lang("population")
+        val useGenerated by boolean(false)
+        val shaderWind by boolean(true).lang("shaderWind")
+        val saturationThreshold by double(default=0.1)
+    }
+
+    object connectedGrass : ConfigCategory(){
+        val enabled by featureEnable()
+        val snowEnabled by boolean(false)
+    }
+
+    object roundLogs : ConfigCategory(){
+        val enabled by featureEnable()
+        val plantsOnly by boolean(true)
+        val radiusSmall by double(max=0.5, default=0.25)
+        val radiusLarge by double(max=0.5, default=0.44)
+        val dimming by double(default = 0.7)
+        val connectSolids by boolean(false)
+        val lenientConnect by boolean(true)
+        val connectPerpendicular by boolean(true)
+        val connectGrass by boolean(true)
+        val defaultY by boolean(false)
+        val zProtection by double(min = 0.9, default = 0.99)
+    }
+
+    object cactus : ConfigCategory(){
+        val enabled by featureEnable()
+        val size by double(min=1.0, max=2.0, default=1.3).lang("size")
+        val sizeVariation by double(max=0.5, default=0.1)
+        val hOffset by double(max=0.5, default=0.1).lang("hOffset")
+    }
+
+    object lilypad : PopulationConfigCategory(){
+        override val enabled by featureEnable()
+        val hOffset by double(max=0.25, default=0.1).lang("hOffset")
+        override val population by int(max=64, default=16, min=0)
+        val shaderWind by boolean(true).lang("shaderWind")
+    }
+
+    object reed : PopulationConfigCategory(){
+        override val enabled by featureEnable()
+        val hOffset by double(max=0.4, default=0.2).lang("hOffset")
+        val heightMin by double(min=1.5, max=3.5, default=1.7).lang("heightMin")
+        val heightMax by double(min=1.5, max=3.5, default=2.2).lang("heightMax")
+        override val population by int(max=64, default=32).lang("population")
+        val minBiomeTemp by double(default=0.4)
+        val minBiomeRainfall by double(default=0.4)
+//        val biomes by biomeList { it.filterTemp(0.4f, null) && it.filterRain(0.4f, null) }
+        val shaderWind by boolean(true).lang("shaderWind")
+    }
+
+    object algae : PopulationConfigCategory(){
+        override val enabled by featureEnable()
+        val hOffset by double(max=0.25, default=0.1).lang("hOffset")
+        val size by double(min=0.5, max=1.5, default=1.0).lang("size")
+        val heightMin by double(min=0.1, max=1.5, default=0.5).lang("heightMin")
+        val heightMax by double(min=0.1, max=1.5, default=1.0).lang("heightMax")
+        override val population by int(max=64, default=48).lang("population")
+//        val biomes by biomeList { it.filterClass("river", "ocean") }
+        val shaderWind by boolean(true).lang("shaderWind")
+    }
+
+    object coral : PopulationConfigCategory(){
+        override val enabled by featureEnable()
+        val shallowWater by boolean(false)
+        val hOffset by double(max=0.4, default=0.2).lang("hOffset")
+        val vOffset by double(max=0.4, default=0.1).lang("vOffset")
+        val size by double(min=0.5, max=1.5, default=0.7).lang("size")
+        val crustSize by double(min=0.5, max=1.5, default=1.4)
+        val chance by int(max=64, default=32)
+        override val population by int(max=64, default=48).lang("population")
+//        val biomes by biomeList { it.filterClass("river", "ocean", "beach") }
+    }
+
+    object netherrack : ConfigCategory(){
+        val enabled by featureEnable()
+        val hOffset by double(max=0.4, default=0.2).lang("hOffset")
+        val heightMin by double(min=0.1, max=1.5, default=0.2).lang("heightMin")
+        val heightMax by double(min=0.1, max=1.5, default=0.5).lang("heightMax")
+        val size by double(min=0.5, max=1.5, default=1.0).lang("size")
+    }
+
+    object fallingLeaves : ConfigCategory(){
+        val enabled by featureEnable()
+        val speed by double(min=0.01, max=0.15, default=0.05)
+        val windStrength by double(min=0.1, max=2.0, default=0.5)
+        val stormStrength by double(min=0.1, max=2.0, default=0.8)
+        val size by double(min=0.25, max=1.5, default=0.75).lang("size")
+        val chance by double(min=0.001, max=1.0, default=0.02)
+        val perturb by double(min=0.01, max=1.0, default=0.25)
+        val lifetime by double(min=1.0, max=15.0, default=5.0)
+        val opacityHack by boolean(true)
+    }
+
+    object risingSoul : ConfigCategory(){
+        val enabled by featureEnable()
+        val chance by double(min=0.001, max=1.0, default=0.02)
+        val perturb by double(min=0.01, max=0.25, default=0.05)
+        val headSize by double(min=0.25, max=1.5, default=1.0)
+        val trailSize by double(min=0.25, max=1.5, default=0.75)
+        val opacity by double(min=0.05, max=1.0, default=0.5)
+        val sizeDecay by double(min=0.5, max=1.0, default=0.97)
+        val opacityDecay by double(min=0.5, max=1.0, default=0.97)
+        val lifetime by double(min=1.0, max=15.0, default=4.0)
+        val trailLength by int(min=2, max=128, default=48)
+        val trailDensity by int(min=1, max=16, default=3)
+    }
+
+}
+
+object BlockConfig {
+    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 lilypad = blocks("lilypad_default.cfg")
+
+    init { BetterFoliageMod.bus.register(this) }
+    private fun blocks(cfgName: String) = ConfigurableBlockMatcher(ResourceLocation(BetterFoliageMod.MOD_ID, cfgName)).apply { list.add(this) }
+    private fun models(cfgName: String) = ModelTextureListConfiguration(ResourceLocation(BetterFoliageMod.MOD_ID, cfgName)).apply { list.add(this) }
+
+    @SubscribeEvent
+    fun onConfig(event: ModConfig.ModConfigEvent) {
+        list.forEach { when(it) {
+            is ConfigurableBlockMatcher -> it.readDefaults()
+            is ModelTextureListConfiguration -> it.readDefaults()
+        } }
+    }
+}

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

@@ -0,0 +1,89 @@
+@file:JvmName("DelegatingConfigKt")
+
+package mods.betterfoliage.config
+
+import mods.betterfoliage.util.reflectDelegates
+import mods.betterfoliage.util.reflectNestedObjects
+import net.minecraftforge.common.ForgeConfigSpec
+import kotlin.properties.ReadOnlyProperty
+import kotlin.reflect.KProperty
+
+open class DelegatingConfig(val modId: String, val langPrefix: String) {
+    fun build() = ForgeConfigSpec.Builder().apply { ConfigBuildContext(langPrefix, emptyList(), this).addCategory(this@DelegatingConfig) }.build()
+}
+
+class ConfigBuildContext(val langPrefix: String, val path: List<String>, val builder: ForgeConfigSpec.Builder) {
+
+    fun addCategory(configObj: Any) {
+        configObj.reflectNestedObjects.forEach { (name, category) ->
+            builder.push(name)
+            descend(name).addCategory(category)
+            builder.pop()
+        }
+        configObj.reflectDelegates(ConfigDelegate::class.java).forEach { (name, delegate) ->
+            descend(name).apply { delegate.addToBuilder(this) }
+        }
+    }
+
+    fun descend(pathName: String) = ConfigBuildContext(langPrefix, path + pathName, builder)
+}
+
+open class ConfigCategory(val comment: String? = null) {
+}
+
+abstract class ConfigDelegate<T> : ReadOnlyProperty<Any, T> {
+    lateinit var configValue: ForgeConfigSpec.ConfigValue<T>
+    var cachedValue: T? = null
+
+    override fun getValue(thisRef: Any, property: KProperty<*>): T {
+        if (cachedValue == null) cachedValue = configValue.get()
+        return cachedValue!!
+    }
+
+    abstract fun getConfigValue(name: String, builder: ForgeConfigSpec.Builder): ForgeConfigSpec.ConfigValue<T>
+    fun addToBuilder(ctx: ConfigBuildContext) {
+        val langKey = ctx.langPrefix + "." + (langPrefixOverride ?: ctx.path.joinToString("."))
+        ctx.builder.translation(langKey)
+        configValue = getConfigValue(ctx.path.last(), ctx.builder)
+    }
+
+    var langPrefixOverride: String? = null
+    fun lang(prefix: String) = apply { langPrefixOverride = prefix }
+
+}
+
+class DelegatingBooleanValue(val defaultValue: Boolean) : ConfigDelegate<Boolean>() {
+    override fun getConfigValue(name: String, builder: ForgeConfigSpec.Builder) = builder.define(name, defaultValue)
+}
+
+class DelegatingIntValue(
+    val minValue: Int = 0,
+    val maxValue: Int = 1,
+    val defaultValue: Int = 0
+) : ConfigDelegate<Int>() {
+    override fun getConfigValue(name: String, builder: ForgeConfigSpec.Builder) = builder.defineInRange(name, defaultValue, minValue, maxValue)
+}
+
+class DelegatingLongValue(
+    val minValue: Long = 0,
+    val maxValue: Long = 1,
+    val defaultValue: Long = 0
+) : ConfigDelegate<Long>() {
+    override fun getConfigValue(name: String, builder: ForgeConfigSpec.Builder) = builder.defineInRange(name, defaultValue, minValue, maxValue)
+}
+
+class DelegatingDoubleValue(
+    val minValue: Double = 0.0,
+    val maxValue: Double = 1.0,
+    val defaultValue: Double = 0.0
+) : ConfigDelegate<Double>() {
+    override fun getConfigValue(name: String, builder: ForgeConfigSpec.Builder) = builder.defineInRange(name, defaultValue, minValue, maxValue)
+}
+
+// ============================
+// Delegate factory methods
+// ============================
+fun double(min: Double = 0.0, max: Double = 1.0, default: Double) = DelegatingDoubleValue(min, max, default)
+fun int(min: Int = 0, max: Int, default: Int) = DelegatingIntValue(min, max, default)
+fun long(min: Long = 0, max: Long, default: Long) = DelegatingLongValue(min, max, default)
+fun boolean(default: Boolean) = DelegatingBooleanValue(default)

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

@@ -0,0 +1,20 @@
+package mods.betterfoliage.config
+
+import net.minecraft.block.BlockState
+import net.minecraft.block.Blocks
+import net.minecraft.block.material.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 LILYPAD_BLOCKS = listOf(Blocks.LILY_PAD)
+val MYCELIUM_BLOCKS = listOf(Blocks.MYCELIUM)
+
+val SALTWATER_BIOMES = listOf(Biome.Category.BEACH, Biome.Category.OCEAN)
+
+val SNOW_MATERIALS = listOf(Material.TOP_SNOW, Material.SNOW)
+val BlockState.isSnow: Boolean get() = material in SNOW_MATERIALS
+
+val ACCEPTED_ROUND_LOG_MATERIALS = listOf(Material.WOOD, Material.GRASS)

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

@@ -0,0 +1,54 @@
+package mods.betterfoliage.integration
+
+import mods.betterfoliage.chunk.BlockCtx
+import mods.betterfoliage.util.ThreadLocalDelegate
+import mods.betterfoliage.util.allAvailable
+import mods.betterfoliage.util.reflectField
+import mods.octarinecore.BlockPos
+import mods.octarinecore.BlockState
+import mods.octarinecore.CustomColors
+import mods.octarinecore.RenderEnv
+import net.minecraft.block.BlockState
+import net.minecraft.client.Minecraft
+import net.minecraft.client.renderer.model.BakedQuad
+import net.minecraft.util.Direction.UP
+import net.minecraft.util.math.BlockPos
+import net.minecraft.world.level.ColorResolver
+import org.apache.logging.log4j.Level.INFO
+import org.apache.logging.log4j.LogManager
+
+/**
+ * Integration for OptiFine custom block colors.
+ */
+@Suppress("UNCHECKED_CAST")
+object OptifineCustomColors {
+    val logger = LogManager.getLogger(this)
+
+    val isColorAvailable = allAvailable(CustomColors, CustomColors.getColorMultiplier)
+
+    init {
+        logger.log(INFO, "Optifine custom color support is ${if (isColorAvailable) "enabled" else "disabled" }")
+    }
+
+    val renderEnv by ThreadLocalDelegate { OptifineRenderEnv() }
+    val fakeQuad = BakedQuad(IntArray(0), 1, UP, null, true)
+
+    fun getBlockColor(ctx: BlockCtx, resolver: ColorResolver): Int {
+        val ofColor = if (isColorAvailable && Minecraft.getInstance().options.reflectField<Boolean>("ofCustomColors") == true) {
+            renderEnv.reset(ctx.state, ctx.pos)
+            CustomColors.getColorMultiplier.invokeStatic(fakeQuad, ctx.state, ctx.world, ctx.pos, renderEnv.wrapped) as? Int
+        } else null
+        return if (ofColor == null || ofColor == -1) ctx.color(resolver) else ofColor
+    }
+}
+
+class OptifineRenderEnv {
+    val wrapped: Any = RenderEnv.element!!.getDeclaredConstructor(BlockState.element, BlockPos.element).let {
+        it.isAccessible = true
+        it.newInstance(null, null)
+    }
+
+    fun reset(state: BlockState, pos: BlockPos) {
+        RenderEnv.reset.invoke(wrapped, state, pos)
+    }
+}

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

@@ -0,0 +1,66 @@
+package mods.betterfoliage.integration
+
+import mods.betterfoliage.render.pipeline.RenderCtxBase
+import mods.betterfoliage.render.pipeline.RenderCtxVanilla
+import mods.betterfoliage.util.HasLogger
+import mods.betterfoliage.util.allAvailable
+import mods.betterfoliage.util.get
+import mods.octarinecore.*
+import net.minecraft.block.BlockRenderType
+import net.minecraft.block.BlockRenderType.MODEL
+import net.minecraft.block.BlockState
+import net.minecraft.block.Blocks
+import net.minecraft.client.renderer.BufferBuilder
+import net.minecraft.util.math.BlockPos
+import net.minecraft.world.IBlockDisplayReader
+import org.apache.logging.log4j.Level.INFO
+
+/**
+ * Integration for ShadersMod.
+ */
+object ShadersModIntegration : HasLogger() {
+    @JvmStatic val isAvailable = allAvailable(SVertexBuilder, SVertexBuilder.pushState, SVertexBuilder.popState, BlockAliases.getAliasBlockId)
+
+    val defaultLeaves = Blocks.OAK_LEAVES.defaultBlockState()
+    val defaultGrass = Blocks.GRASS.defaultBlockState()
+
+    /**
+     * Called from transformed ShadersMod code.
+     * @see mods.betterfoliage.loader.BetterFoliageTransformer
+     */
+    @JvmStatic fun getBlockStateOverride(state: BlockState, world: IBlockDisplayReader, pos: BlockPos): BlockState {
+//        if (LeafRegistry[state, world, pos] != null) return defaultLeaves
+//        if (BlockConfig.crops.matchesClass(state.block)) return defaultGrass
+        return state
+    }
+
+    init {
+        logger.log(INFO, "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(buffer: BufferBuilder, state: BlockState, renderType: BlockRenderType, enabled: Boolean = true, func: ()->Unit) {
+        if (isAvailable && enabled) {
+            val aliasBlockId = BlockAliases.getAliasBlockId.invokeStatic(state)
+            val sVertexBuilder = buffer[BufferBuilder_sVertexBuilder]
+            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: RenderCtxBase, enabled: Boolean = true, func: ()->Unit) =
+        ((ctx as? RenderCtxVanilla)?.buffer as? BufferBuilder)?.let { bufferBuilder ->
+            renderAs(bufferBuilder, defaultGrass, MODEL, enabled, func)
+        }
+
+
+    /** Quads rendered inside this block will behave as leaf blocks in shader programs. */
+    inline fun leaves(ctx: RenderCtxBase, enabled: Boolean = true, func: ()->Unit) =
+        ((ctx as? RenderCtxVanilla)?.buffer as? BufferBuilder)?.let { bufferBuilder ->
+            renderAs(bufferBuilder, defaultLeaves, MODEL, enabled, func)
+        }
+}

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

@@ -0,0 +1,118 @@
+package mods.betterfoliage.model
+
+import mods.betterfoliage.render.pipeline.RenderCtxBase
+import mods.betterfoliage.resource.discovery.ModelBakingContext
+import mods.betterfoliage.resource.discovery.ModelBakingKey
+import mods.betterfoliage.util.Double3
+import mods.betterfoliage.util.HasLogger
+import mods.betterfoliage.util.directionsAndNull
+import mods.betterfoliage.util.mapArray
+import net.minecraft.client.renderer.model.BakedQuad
+import net.minecraft.client.renderer.model.IBakedModel
+import net.minecraft.client.renderer.model.SimpleBakedModel
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats
+import net.minecraft.client.renderer.vertex.VertexFormatElement
+import net.minecraftforge.client.model.pipeline.BakedQuadBuilder
+import java.util.Random
+
+/**
+ * Hybrid baked quad implementation, carrying both baked and unbaked information.
+ * Used to do advanced vertex lighting without unbaking vertex data at lighting time.
+ */
+data class HalfBakedQuad(
+    val raw: Quad,
+    val baked: BakedQuad
+)
+
+open class HalfBakedSimpleModelWrapper(baseModel: SimpleBakedModel): IBakedModel by baseModel, SpecialRenderModel {
+    val baseQuads = baseModel.unbakeQuads()
+
+    override fun render(ctx: RenderCtxBase, noDecorations: Boolean) {
+        ctx.renderQuads(baseQuads)
+    }
+}
+
+open class HalfBakedSpecialWrapper(val baseModel: SpecialRenderModel): IBakedModel by baseModel, SpecialRenderModel {
+    override fun render(ctx: RenderCtxBase, noDecorations: Boolean) {
+        baseModel.render(ctx, noDecorations)
+    }
+}
+
+abstract class HalfBakedWrapperKey : ModelBakingKey, HasLogger() {
+    override fun bake(ctx: ModelBakingContext): IBakedModel? {
+        val baseModel = super.bake(ctx)
+        val halfBaked = when(baseModel) {
+            is SimpleBakedModel -> HalfBakedSimpleModelWrapper(baseModel)
+            else -> null
+        }
+        return if (halfBaked == null) baseModel else bake(ctx, halfBaked)
+    }
+
+    abstract fun bake(ctx: ModelBakingContext, wrapped: SpecialRenderModel): SpecialRenderModel
+}
+
+fun List<Quad>.bake(applyDiffuseLighting: Boolean) = map { quad ->
+    if (quad.sprite == null) throw IllegalStateException("Quad must have a texture assigned before baking")
+    val builder = BakedQuadBuilder(quad.sprite)
+    builder.setApplyDiffuseLighting(applyDiffuseLighting)
+    builder.setQuadOrientation(quad.face())
+    builder.setQuadTint(quad.colorIndex)
+    quad.verts.forEach { vertex ->
+        DefaultVertexFormats.BLOCK.elements.forEachIndexed { idx, element ->
+            when {
+                element.usage == VertexFormatElement.Usage.POSITION -> builder.put(idx,
+                    (vertex.xyz.x + 0.5).toFloat(),
+                    (vertex.xyz.y + 0.5).toFloat(),
+                    (vertex.xyz.z + 0.5).toFloat(),
+                    1.0f
+                )
+                // don't fill lightmap UV coords
+                element.usage == VertexFormatElement.Usage.UV && element.type == VertexFormatElement.Type.FLOAT -> builder.put(idx,
+                    quad.sprite.u0 + (quad.sprite.u1 - quad.sprite.u0) * (vertex.uv.u + 0.5).toFloat(),
+                    quad.sprite.v0 + (quad.sprite.v1 - quad.sprite.v0) * (vertex.uv.v + 0.5).toFloat(),
+                    0.0f, 1.0f
+                )
+                element.usage == VertexFormatElement.Usage.COLOR -> builder.put(idx,
+                    (vertex.color.red and 255).toFloat() / 255.0f,
+                    (vertex.color.green and 255).toFloat() / 255.0f,
+                    (vertex.color.blue and 255).toFloat() / 255.0f,
+                    (vertex.color.alpha and 255).toFloat() / 255.0f
+                )
+                element.usage == VertexFormatElement.Usage.NORMAL -> builder.put(idx,
+                    (vertex.normal ?: quad.normal).x.toFloat(),
+                    (vertex.normal ?: quad.normal).y.toFloat(),
+                    (vertex.normal ?: quad.normal).z.toFloat(),
+                    0.0f
+                )
+                else -> builder.put(idx)
+            }
+        }
+    }
+    HalfBakedQuad(quad, builder.build())
+}
+
+fun Array<List<Quad>>.bake(applyDiffuseLighting: Boolean) = mapArray { it.bake(applyDiffuseLighting) }
+
+fun BakedQuad.unbake(): HalfBakedQuad {
+    val size = DefaultVertexFormats.BLOCK.integerSize
+    val verts = Array(4) { vIdx ->
+        val x = java.lang.Float.intBitsToFloat(vertices[vIdx * size + 0])
+        val y = java.lang.Float.intBitsToFloat(vertices[vIdx * size + 1])
+        val z = java.lang.Float.intBitsToFloat(vertices[vIdx * size + 2])
+        val color = vertices[vIdx * size + 3]
+        val u = java.lang.Float.intBitsToFloat(vertices[vIdx * size + 4])
+        val v = java.lang.Float.intBitsToFloat(vertices[vIdx * size + 5])
+        Vertex(Double3(x, y, z), UV(u.toDouble(), v.toDouble()), Color(color))
+    }
+    val unbaked = Quad(
+        verts[0], verts[1], verts[2], verts[3],
+        colorIndex = if (isTinted) tintIndex else -1,
+        face = direction
+    )
+    return HalfBakedQuad(unbaked, this)
+}
+
+fun SimpleBakedModel.unbakeQuads() = directionsAndNull.flatMap { face ->
+    getQuads(null, face, Random()).map { it.unbake() }
+}
+

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

@@ -0,0 +1,207 @@
+package mods.betterfoliage.model
+
+import mods.betterfoliage.util.Double3
+import mods.betterfoliage.util.Rotation
+import mods.betterfoliage.util.boxFaces
+import mods.betterfoliage.util.get
+import mods.betterfoliage.util.minmax
+import mods.betterfoliage.util.nearestAngle
+import mods.betterfoliage.util.rotate
+import mods.betterfoliage.util.times
+import mods.betterfoliage.util.vec
+import net.minecraft.client.renderer.texture.NativeImage
+import net.minecraft.client.renderer.texture.TextureAtlasSprite
+import net.minecraft.util.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: coordinates fall between (-0.5, 0.5) (inclusive)
+ */
+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)
+}
+
+/**
+ * Model vertex
+ *
+ * @param[xyz] x, y, z coordinates
+ * @param[uv] u, v coordinates
+ * @param[aoShader] [ModelLighter] instance to use with AO rendering
+ * @param[flatShader] [ModelLighter] instance to use with non-AO rendering
+ */
+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 normal: Double3? = null
+)
+
+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)
+    }
+}
+
+data class HSB(var hue: Float, var saturation: Float, var brightness: Float) {
+    companion object {
+        /** Red is assumed to be LSB, see [NativeImage.PixelFormat.RGBA] */
+        fun fromColorRGBA(color: Int): HSB {
+            val hsbVals = java.awt.Color.RGBtoHSB(color and 255, (color shr 8) and 255, (color shr 16) and 255, null)
+            return HSB(hsbVals[0], hsbVals[1], hsbVals[2])
+        }
+    }
+    val asColor: Int get() = java.awt.Color.HSBtoRGB(hue, saturation, brightness)
+}
+
+/**
+ * Intermediate 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: TextureAtlasSprite? = 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: TextureAtlasSprite) = 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: Color?) = color(color ?: Color.white).colorIndex(if (color == null) 0 else -1)
+
+    fun face() = face ?: nearestAngle(normal, Direction.values().toList()) { it.vec }.first
+
+    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 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)
+            )
+        }
+    }
+}

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

@@ -0,0 +1,26 @@
+package mods.betterfoliage.model
+
+import mods.betterfoliage.render.pipeline.RenderCtxBase
+import net.minecraft.client.renderer.model.IBakedModel
+import net.minecraft.util.WeightedRandom
+import java.util.Random
+
+/**
+ * Model that makes use of advanced rendering features.
+ */
+interface SpecialRenderModel : IBakedModel {
+    fun render(ctx: RenderCtxBase, noDecorations: Boolean = false)
+}
+
+class WeightedModelWrapper(
+    val models: List<WeightedModel>, baseModel: SpecialRenderModel
+): IBakedModel by baseModel, SpecialRenderModel {
+    class WeightedModel(val model: SpecialRenderModel, weight: Int) : WeightedRandom.Item(weight)
+    val totalWeight = models.sumBy { it.weight }
+
+    fun getModel(random: Random) = WeightedRandom.getWeightedItem(models, random.nextInt(totalWeight))
+
+    override fun render(ctx: RenderCtxBase, noDecorations: Boolean) {
+        getModel(ctx.random).model.render(ctx, noDecorations)
+    }
+}

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

@@ -0,0 +1,83 @@
+package mods.betterfoliage.model
+
+import mods.betterfoliage.BetterFoliageMod
+import mods.betterfoliage.util.Atlas
+import mods.betterfoliage.util.resourceManager
+import net.minecraft.client.renderer.texture.MissingTextureSprite
+import net.minecraft.client.renderer.texture.TextureAtlasSprite
+import net.minecraft.util.ResourceLocation
+import net.minecraftforge.client.event.TextureStitchEvent
+import net.minecraftforge.eventbus.api.SubscribeEvent
+import kotlin.properties.ReadOnlyProperty
+import kotlin.reflect.KProperty
+
+interface SpriteSet {
+    val num: Int
+    operator fun get(idx: Int): TextureAtlasSprite
+}
+
+class FixedSpriteSet(val sprites: List<TextureAtlasSprite>) : SpriteSet {
+    override val num = sprites.size
+    override fun get(idx: Int) = sprites[idx % num]
+}
+
+class SpriteDelegate(val atlas: Atlas, val idFunc: () -> ResourceLocation) : ReadOnlyProperty<Any, TextureAtlasSprite> {
+    private lateinit var id: ResourceLocation
+    private var value: TextureAtlasSprite? = null
+
+    init {
+        BetterFoliageMod.bus.register(this)
+    }
+
+    @SubscribeEvent
+    fun handlePreStitch(event: TextureStitchEvent.Pre) {
+        id = idFunc(); value = null
+        event.addSprite(id)
+    }
+
+    override fun getValue(thisRef: Any, property: KProperty<*>): TextureAtlasSprite {
+        value?.let { return it }
+        synchronized(this) {
+            value?.let { return it }
+            atlas[id].let { value = it; return it }
+        }
+    }
+
+}
+
+class SpriteSetDelegate(
+    val atlas: Atlas,
+    val idRegister: (ResourceLocation) -> ResourceLocation = { it },
+    val idFunc: (Int) -> ResourceLocation
+) : ReadOnlyProperty<Any, SpriteSet> {
+    private var idList: List<ResourceLocation> = emptyList()
+    private var spriteSet: SpriteSet? = null
+
+    init {
+        BetterFoliageMod.bus.register(this)
+    }
+
+    @SubscribeEvent
+    fun handlePreStitch(event: TextureStitchEvent.Pre) {
+        if (event.map.location() != Atlas.BLOCKS.resourceId) return
+        spriteSet = null
+        idList = (0 until 16)
+            .map(idFunc)
+            .filter { resourceManager.hasResource(atlas.file(it)) }
+            .map(idRegister)
+        idList.forEach { event.addSprite(it) }
+    }
+
+    override fun getValue(thisRef: Any, property: KProperty<*>): SpriteSet {
+        spriteSet?.let { return it }
+        synchronized(this) {
+            spriteSet?.let { return it }
+            spriteSet = FixedSpriteSet(
+                idList
+                    .ifEmpty { listOf(MissingTextureSprite.getLocation()) }
+                    .map { atlas[it] }
+            )
+            return spriteSet!!
+        }
+    }
+}

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

@@ -0,0 +1,108 @@
+package mods.betterfoliage.model
+
+import mods.betterfoliage.util.Atlas
+import mods.betterfoliage.util.Double3
+import mods.betterfoliage.util.PI2
+import mods.betterfoliage.util.allDirections
+import mods.betterfoliage.util.random
+import mods.betterfoliage.util.randomB
+import mods.betterfoliage.util.randomD
+import mods.betterfoliage.util.randomI
+import mods.betterfoliage.util.rot
+import mods.betterfoliage.util.vec
+import net.minecraft.client.renderer.texture.TextureAtlasSprite
+import net.minecraft.util.Direction.UP
+import net.minecraft.util.ResourceLocation
+import kotlin.math.cos
+import kotlin.math.sin
+
+fun xzDisk(modelIdx: Int) = (PI2 * modelIdx.toDouble() / 64.0).let { Double3(cos(it), 0.0, sin(it)) }
+
+
+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) =
+    Quad.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) -> TextureAtlasSprite) =
+    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)) }
+    }
+
+fun fullCubeTextured(
+    spriteLocation: ResourceLocation,
+    tintIndex: Int,
+    scrambleUV: Boolean = true
+): List<HalfBakedQuad> {
+    val sprite = Atlas.BLOCKS[spriteLocation]
+    return allDirections.map { Quad.faceQuad(it) }
+        .map { if (!scrambleUV) it else it.rotateUV(randomI(max = 4)) }
+        .map { it.sprite(sprite) }
+        .map { it.colorIndex(tintIndex) }
+        .bake(true)
+}
+
+fun crossModelsRaw(num: Int, size: Double, hOffset: Double, vOffset: Double): List<List<Quad>> {
+    return (0 until num).map { idx ->
+        listOf(
+            Quad.verticalRectangle(x1 = -0.5, z1 = 0.5, x2 = 0.5, z2 = -0.5, yBottom = -0.5 * 1.41, yTop = 0.5 * 1.41),
+            Quad.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: TextureAtlasSprite, 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()
+        .bake(false)
+
+fun crossModelsTextured(
+    leafBase: Iterable<List<Quad>>,
+    tintIndex: Int,
+    scrambleUV: Boolean,
+    spriteGetter: (Int) -> ResourceLocation
+) = leafBase.mapIndexed { idx, leaf ->
+    crossModelSingle(leaf, Atlas.BLOCKS[spriteGetter(idx)], tintIndex, scrambleUV)
+}.toTypedArray()
+
+fun Iterable<Quad>.withOpposites() = flatMap { listOf(it, it.flipped) }
+fun Iterable<List<Quad>>.buildTufts(applyDiffuseLighting: Boolean = false) =
+    map { it.withOpposites().bake(applyDiffuseLighting) }.toTypedArray()
+
+fun Iterable<List<Quad>>.transform(trans: Quad.(Int)-> Quad) = mapIndexed { idx, qList -> qList.map { it.trans(idx) } }

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

@@ -0,0 +1,90 @@
+package mods.betterfoliage.render.block.vanilla
+
+import mods.betterfoliage.BetterFoliageMod
+import mods.betterfoliage.BetterFoliage
+import mods.betterfoliage.config.CACTUS_BLOCKS
+import mods.betterfoliage.config.Config
+import mods.betterfoliage.model.HalfBakedSpecialWrapper
+import mods.betterfoliage.model.HalfBakedWrapperKey
+import mods.betterfoliage.model.SpecialRenderModel
+import mods.betterfoliage.model.SpriteSetDelegate
+import mods.betterfoliage.model.buildTufts
+import mods.betterfoliage.model.crossModelsRaw
+import mods.betterfoliage.model.crossModelsTextured
+import mods.betterfoliage.model.transform
+import mods.betterfoliage.model.tuftModelSet
+import mods.betterfoliage.model.tuftShapeSet
+import mods.betterfoliage.render.lighting.LightingPreferredFace
+import mods.betterfoliage.render.lighting.RoundLeafLighting
+import mods.betterfoliage.render.pipeline.RenderCtxBase
+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.minecraft.block.Blocks
+import net.minecraft.client.renderer.model.BlockModel
+import net.minecraft.util.Direction.DOWN
+import net.minecraft.util.ResourceLocation
+
+object StandardCactusDiscovery : AbstractModelDiscovery() {
+    override fun processModel(ctx: ModelDiscoveryContext) {
+        val model = ctx.getUnbaked()
+        if (model is BlockModel && 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 : HalfBakedWrapperKey() {
+    override fun bake(ctx: ModelBakingContext, wrapped: SpecialRenderModel) = StandardCactusModel(wrapped)
+}
+
+class StandardCactusModel(
+    wrapped: SpecialRenderModel
+) : HalfBakedSpecialWrapper(wrapped) {
+
+    val armLighting = horizontalDirections.map { LightingPreferredFace(it) }.toTypedArray()
+
+    override fun render(ctx: RenderCtxBase, noDecorations: Boolean) {
+        ctx.checkSides = false
+        super.render(ctx, noDecorations)
+        if (!Config.enabled || !Config.cactus.enabled) return
+
+        val armSide = ctx.random.nextInt() and 3
+        ctx.vertexLighter = armLighting[armSide]
+        ctx.renderQuads(cactusArmModels[armSide][ctx.random])
+        ctx.vertexLighter = RoundLeafLighting
+        ctx.renderQuads(cactusCrossModels[ctx.random])
+    }
+
+    companion object {
+        val cactusCrossSprite = ResourceLocation(BetterFoliageMod.MOD_ID, "blocks/better_cactus")
+        val cactusArmSprites by SpriteSetDelegate(Atlas.BLOCKS) { idx ->
+            ResourceLocation(BetterFoliageMod.MOD_ID, "blocks/better_cactus_arm_$idx")
+        }
+        val cactusArmModels by LazyInvalidatable(BakeWrapperManager) {
+            val shapes = Config.cactus.let { tuftShapeSet(0.8, 0.8, 0.8, 0.2) }
+            val models = tuftModelSet(shapes, -1) { 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 = Config.cactus.let { config ->
+                crossModelsRaw(64, config.size, 0.0, 0.0)
+                    .transform { rotateZ(randomD(-config.sizeVariation, config.sizeVariation)) }
+            }
+            crossModelsTextured(models, -1, true) { cactusCrossSprite }
+        }
+    }
+}

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

@@ -0,0 +1,120 @@
+package mods.betterfoliage.render.block.vanilla
+
+import mods.betterfoliage.BetterFoliage
+import mods.betterfoliage.BetterFoliageMod
+import mods.betterfoliage.config.Config
+import mods.betterfoliage.config.DIRT_BLOCKS
+import mods.betterfoliage.config.SALTWATER_BIOMES
+import mods.betterfoliage.config.isSnow
+import mods.betterfoliage.integration.ShadersModIntegration
+import mods.betterfoliage.model.HalfBakedSpecialWrapper
+import mods.betterfoliage.model.HalfBakedWrapperKey
+import mods.betterfoliage.model.SpecialRenderModel
+import mods.betterfoliage.model.SpriteSetDelegate
+import mods.betterfoliage.model.buildTufts
+import mods.betterfoliage.model.tuftModelSet
+import mods.betterfoliage.model.tuftShapeSet
+import mods.betterfoliage.render.lighting.LightingPreferredFace
+import mods.betterfoliage.render.pipeline.RenderCtxBase
+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.offset
+import mods.betterfoliage.util.randomI
+import net.minecraft.block.material.Material
+import net.minecraft.client.renderer.RenderType
+import net.minecraft.client.renderer.RenderTypeLookup
+import net.minecraft.client.renderer.model.BlockModel
+import net.minecraft.util.Direction.UP
+import net.minecraft.util.ResourceLocation
+
+object StandardDirtDiscovery : AbstractModelDiscovery() {
+    fun canRenderInLayer(layer: RenderType) = when {
+        !Config.enabled -> layer == RenderType.solid()
+        !Config.connectedGrass.enabled && !Config.algae.enabled && !Config.reed.enabled -> layer == RenderType.solid()
+        else -> layer == RenderType.cutoutMipped()
+    }
+
+    override fun processModel(ctx: ModelDiscoveryContext) {
+        if (ctx.getUnbaked() is BlockModel && 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 : HalfBakedWrapperKey() {
+    override fun bake(ctx: ModelBakingContext, wrapped: SpecialRenderModel) = StandardDirtModel(wrapped)
+}
+
+class StandardDirtModel(
+    wrapped: SpecialRenderModel
+) : HalfBakedSpecialWrapper(wrapped) {
+    val vanillaTuftLighting = LightingPreferredFace(UP)
+
+    override fun render(ctx: RenderCtxBase, noDecorations: Boolean) {
+        if (!Config.enabled || noDecorations) return super.render(ctx, noDecorations)
+
+        val stateUp = ctx.state(UP)
+        val state2Up = ctx.state(Int3(0, 2, 0))
+        val isConnectedGrass = Config.connectedGrass.enabled &&
+                stateUp in BetterFoliage.blockTypes.grass &&
+                (Config.connectedGrass.snowEnabled || !state2Up.isSnow)
+
+        if (isConnectedGrass) {
+            (ctx.blockModelShapes.getBlockModel(stateUp) as? SpecialRenderModel)?.let { grassModel ->
+                ctx.renderMasquerade(UP.offset) {
+                    grassModel.render(ctx, true)
+                }
+                return
+            }
+            return super.render(ctx, false)
+        }
+
+        super.render(ctx, false)
+
+        val isWater = stateUp.material == Material.WATER
+        val isDeepWater = isWater && state2Up.material == Material.WATER
+        val isShallowWater = isWater && state2Up.isAir
+        val isSaltWater = isWater && ctx.biome?.biomeCategory in SALTWATER_BIOMES
+
+        if (Config.algae.enabled(ctx.random) && isDeepWater) {
+            ctx.vertexLighter = vanillaTuftLighting
+            ShadersModIntegration.grass(ctx, Config.algae.shaderWind) {
+                ctx.renderQuads(algaeModels[ctx.random])
+            }
+        } else if (Config.reed.enabled(ctx.random) && isShallowWater && !isSaltWater) {
+            ctx.vertexLighter = vanillaTuftLighting
+            ShadersModIntegration.grass(ctx, Config.reed.shaderWind) {
+                ctx.renderQuads(reedModels[ctx.random])
+            }
+        }
+    }
+
+    companion object {
+        val algaeSprites by SpriteSetDelegate(Atlas.BLOCKS) { idx ->
+            ResourceLocation(BetterFoliageMod.MOD_ID, "blocks/better_algae_$idx")
+        }
+        val reedSprites by SpriteSetDelegate(
+            Atlas.BLOCKS,
+            idFunc = { idx -> ResourceLocation(BetterFoliageMod.MOD_ID, "blocks/better_reed_$idx") },
+            idRegister = { id -> CenteredSprite(id, aspectHeight = 2).register(BetterFoliage.generatedPack) }
+        )
+        val algaeModels by LazyInvalidatable(BakeWrapperManager) {
+            val shapes = Config.algae.let { tuftShapeSet(it.size, it.heightMin, it.heightMax, it.hOffset) }
+            tuftModelSet(shapes, -1) { algaeSprites[randomI()] }.buildTufts()
+        }
+        val reedModels by LazyInvalidatable(BakeWrapperManager) {
+            val shapes = Config.reed.let { tuftShapeSet(2.0, it.heightMin, it.heightMax, it.hOffset) }
+            tuftModelSet(shapes, -1) { reedSprites[randomI()] }.buildTufts()
+        }
+    }
+}

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

@@ -0,0 +1,118 @@
+package mods.betterfoliage.render.block.vanilla
+
+import mods.betterfoliage.BetterFoliage
+import mods.betterfoliage.BetterFoliageMod
+import mods.betterfoliage.config.BlockConfig
+import mods.betterfoliage.config.Config
+import mods.betterfoliage.config.isSnow
+import mods.betterfoliage.integration.ShadersModIntegration
+import mods.betterfoliage.model.Color
+import mods.betterfoliage.model.HalfBakedSpecialWrapper
+import mods.betterfoliage.model.HalfBakedWrapperKey
+import mods.betterfoliage.model.SpecialRenderModel
+import mods.betterfoliage.model.SpriteSetDelegate
+import mods.betterfoliage.model.buildTufts
+import mods.betterfoliage.model.fullCubeTextured
+import mods.betterfoliage.model.tuftModelSet
+import mods.betterfoliage.model.tuftShapeSet
+import mods.betterfoliage.render.lighting.LightingPreferredFace
+import mods.betterfoliage.render.pipeline.RenderCtxBase
+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.util.Atlas
+import mods.betterfoliage.util.LazyInvalidatable
+import mods.betterfoliage.util.LazyMapInvalidatable
+import mods.betterfoliage.util.averageColor
+import mods.betterfoliage.util.colorOverride
+import mods.betterfoliage.util.get
+import mods.betterfoliage.util.logColorOverride
+import mods.betterfoliage.util.randomI
+import net.minecraft.util.Direction.DOWN
+import net.minecraft.util.Direction.UP
+import net.minecraft.util.ResourceLocation
+
+object StandardGrassDiscovery : ConfigurableModelDiscovery() {
+    override val matchClasses: ConfigurableBlockMatcher get() = BlockConfig.grassBlocks
+    override val modelTextures: List<ModelTextureList> get() = BlockConfig.grassModels.modelList
+
+    override fun processModel(ctx: ModelDiscoveryContext, textureMatch: List<ResourceLocation>) {
+        ctx.addReplacement(StandardGrassKey(textureMatch[0], null))
+        BetterFoliage.blockTypes.grass.add(ctx.blockState)
+    }
+}
+
+data class StandardGrassKey(
+    val grassLocation: ResourceLocation,
+    val overrideColor: Color?
+) : HalfBakedWrapperKey() {
+    val tintIndex: Int get() = if (overrideColor == null) 0 else -1
+
+    override fun bake(ctx: ModelBakingContext, wrapped: SpecialRenderModel): SpecialRenderModel {
+        val grassSpriteColor = Atlas.BLOCKS[grassLocation].averageColor.let { hsb ->
+            logColorOverride(BetterFoliageMod.detailLogger(this), Config.shortGrass.saturationThreshold, hsb)
+            hsb.colorOverride(Config.shortGrass.saturationThreshold)
+        }
+        return StandardGrassModel(wrapped, this.copy(overrideColor = grassSpriteColor))
+    }
+}
+
+class StandardGrassModel(
+    wrapped: SpecialRenderModel,
+    key: StandardGrassKey
+) : HalfBakedSpecialWrapper(wrapped) {
+
+    val tuftNormal by grassTuftMeshesNormal.delegate(key)
+    val tuftSnowed by grassTuftMeshesSnowed.delegate(key)
+    val fullBlock by grassFullBlockMeshes.delegate(key)
+    val tuftLighting = LightingPreferredFace(UP)
+
+    override fun render(ctx: RenderCtxBase, noDecorations: Boolean) {
+        if (!Config.enabled || noDecorations) return super.render(ctx, noDecorations)
+
+        val stateBelow = ctx.state(DOWN)
+        val stateAbove = ctx.state(UP)
+        val isAir = ctx.isAir(UP)
+        val isSnowed = stateAbove.isSnow
+        val connected = Config.connectedGrass.enabled &&
+                (!isSnowed || Config.connectedGrass.snowEnabled) &&
+                BetterFoliage.blockTypes.run { stateBelow in grass || stateBelow in dirt }
+
+        if (connected) {
+            ctx.renderQuads(if (isSnowed) snowFullBlockMeshes[ctx.random] else fullBlock[ctx.random])
+        } else {
+            super.render(ctx, noDecorations)
+        }
+
+        if (Config.shortGrass.enabled(ctx.random) && (isAir || isSnowed)) {
+            ctx.vertexLighter = tuftLighting
+            ShadersModIntegration.grass(ctx, Config.shortGrass.shaderWind) {
+                ctx.renderQuads(if (isSnowed) tuftSnowed[ctx.random] else tuftNormal[ctx.random])
+            }
+        }
+    }
+
+    companion object {
+        val grassTuftSprites by SpriteSetDelegate(Atlas.BLOCKS) { idx ->
+            ResourceLocation(BetterFoliageMod.MOD_ID, "blocks/better_grass_long_$idx")
+        }
+        val grassTuftShapes by LazyInvalidatable(BakeWrapperManager) {
+            Config.shortGrass.let { tuftShapeSet(it.size, it.heightMin, it.heightMax, it.hOffset) }
+        }
+        val grassTuftMeshesNormal = LazyMapInvalidatable(BakeWrapperManager) { key: StandardGrassKey ->
+            tuftModelSet(grassTuftShapes, key.tintIndex) { idx -> grassTuftSprites[randomI()] }.buildTufts()
+        }
+        val grassTuftMeshesSnowed = LazyMapInvalidatable(BakeWrapperManager) { key: StandardGrassKey ->
+            tuftModelSet(grassTuftShapes, -1) { idx -> grassTuftSprites[randomI()] }.buildTufts()
+        }
+        val grassFullBlockMeshes = LazyMapInvalidatable(BakeWrapperManager) { key: StandardGrassKey ->
+            Array(64) { fullCubeTextured(key.grassLocation, key.tintIndex) }
+        }
+        val snowFullBlockMeshes by LazyInvalidatable(BakeWrapperManager) {
+            Array(64) { fullCubeTextured(ResourceLocation("block/snow"), -1) }
+        }
+    }
+}

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

@@ -0,0 +1,101 @@
+package mods.betterfoliage.render.block.vanilla
+
+import mods.betterfoliage.BetterFoliage
+import mods.betterfoliage.BetterFoliageMod
+import mods.betterfoliage.config.BlockConfig
+import mods.betterfoliage.config.Config
+import mods.betterfoliage.config.isSnow
+import mods.betterfoliage.integration.ShadersModIntegration
+import mods.betterfoliage.model.Color
+import mods.betterfoliage.model.HalfBakedSpecialWrapper
+import mods.betterfoliage.model.HalfBakedWrapperKey
+import mods.betterfoliage.model.SpecialRenderModel
+import mods.betterfoliage.model.SpriteSetDelegate
+import mods.betterfoliage.model.crossModelsRaw
+import mods.betterfoliage.model.crossModelsTextured
+import mods.betterfoliage.render.lighting.RoundLeafLightingPreferUp
+import mods.betterfoliage.render.particle.LeafBlockModel
+import mods.betterfoliage.render.particle.LeafParticleKey
+import mods.betterfoliage.render.particle.LeafParticleRegistry
+import mods.betterfoliage.render.pipeline.RenderCtxBase
+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.LazyMapInvalidatable
+import mods.betterfoliage.util.averageColor
+import mods.betterfoliage.util.colorOverride
+import mods.betterfoliage.util.logColorOverride
+import net.minecraft.util.Direction.UP
+import net.minecraft.util.ResourceLocation
+import org.apache.logging.log4j.Level.INFO
+
+object StandardLeafDiscovery : ConfigurableModelDiscovery() {
+    override val matchClasses: ConfigurableBlockMatcher get() = BlockConfig.leafBlocks
+    override val modelTextures: List<ModelTextureList> get() = BlockConfig.leafModels.modelList
+
+    override fun processModel(ctx: ModelDiscoveryContext, textureMatch: List<ResourceLocation>) {
+        val leafType = LeafParticleRegistry.typeMappings.getType(textureMatch[0]) ?: "default"
+        val generated = GeneratedLeafSprite(textureMatch[0], leafType)
+            .register(BetterFoliage.generatedPack)
+            .apply { ctx.sprites.add(this) }
+
+        detailLogger.log(INFO, "     particle $leafType")
+        ctx.addReplacement(StandardLeafKey(generated, leafType, null))
+    }
+}
+
+data class StandardLeafKey(
+    val roundLeafTexture: ResourceLocation,
+    override val leafType: String,
+    override val overrideColor: Color?
+) : HalfBakedWrapperKey(), LeafParticleKey {
+    val tintIndex: Int get() = if (overrideColor == null) 0 else -1
+
+    override fun bake(ctx: ModelBakingContext, wrapped: SpecialRenderModel): SpecialRenderModel {
+        val leafSpriteColor = Atlas.BLOCKS[roundLeafTexture].averageColor.let { hsb ->
+            logColorOverride(BetterFoliageMod.detailLogger(this), Config.leaves.saturationThreshold, hsb)
+            hsb.colorOverride(Config.leaves.saturationThreshold)
+        }
+        return StandardLeafModel(wrapped, this.copy(overrideColor = leafSpriteColor))
+    }
+}
+
+class StandardLeafModel(
+    model: SpecialRenderModel,
+    override val key: StandardLeafKey
+) : HalfBakedSpecialWrapper(model), LeafBlockModel {
+    val leafNormal by leafModelsNormal.delegate(key)
+    val leafSnowed by leafModelsSnowed.delegate(key)
+
+    override fun render(ctx: RenderCtxBase, noDecorations: Boolean) {
+        ShadersModIntegration.leaves(ctx, true) {
+            super.render(ctx, noDecorations)
+            if (!Config.enabled || !Config.leaves.enabled || noDecorations) return
+
+            ctx.vertexLighter = RoundLeafLightingPreferUp
+            val leafIdx = ctx.random.nextInt(64)
+            ctx.renderQuads(leafNormal[leafIdx])
+            if (ctx.state(UP).isSnow) ctx.renderQuads(leafSnowed[leafIdx])
+        }
+    }
+
+    companion object {
+        val leafSpritesSnowed by SpriteSetDelegate(Atlas.BLOCKS) { idx ->
+            ResourceLocation(BetterFoliageMod.MOD_ID, "blocks/better_leaves_snowed_$idx")
+        }
+        val leafModelsBase = LazyMapInvalidatable(BakeWrapperManager) { key: StandardLeafKey ->
+            Config.leaves.let { crossModelsRaw(64, it.size, it.hOffset, it.vOffset) }
+        }
+        val leafModelsNormal = LazyMapInvalidatable(BakeWrapperManager) { key: StandardLeafKey ->
+            crossModelsTextured(leafModelsBase[key], key.tintIndex, true) { key.roundLeafTexture }
+        }
+        val leafModelsSnowed = LazyMapInvalidatable(BakeWrapperManager) { key: StandardLeafKey ->
+            crossModelsTextured(leafModelsBase[key], -1, false) { leafSpritesSnowed[it].name }
+        }
+    }
+}

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

@@ -0,0 +1,78 @@
+package mods.betterfoliage.render.block.vanilla
+
+import mods.betterfoliage.BetterFoliageMod
+import mods.betterfoliage.config.Config
+import mods.betterfoliage.config.LILYPAD_BLOCKS
+import mods.betterfoliage.integration.ShadersModIntegration
+import mods.betterfoliage.model.HalfBakedSpecialWrapper
+import mods.betterfoliage.model.HalfBakedWrapperKey
+import mods.betterfoliage.model.SpecialRenderModel
+import mods.betterfoliage.model.SpriteSetDelegate
+import mods.betterfoliage.model.buildTufts
+import mods.betterfoliage.model.transform
+import mods.betterfoliage.model.tuftModelSet
+import mods.betterfoliage.model.tuftShapeSet
+import mods.betterfoliage.render.pipeline.RenderCtxBase
+import mods.betterfoliage.resource.discovery.AbstractModelDiscovery
+import mods.betterfoliage.resource.discovery.BakeWrapperManager
+import mods.betterfoliage.resource.discovery.ModelBakingContext
+import mods.betterfoliage.resource.discovery.ModelBakingKey
+import mods.betterfoliage.resource.discovery.ModelDiscoveryContext
+import mods.betterfoliage.util.Atlas
+import mods.betterfoliage.util.LazyInvalidatable
+import mods.betterfoliage.util.get
+import net.minecraft.block.BlockState
+import net.minecraft.block.Blocks
+import net.minecraft.client.renderer.model.BlockModel
+import net.minecraft.client.renderer.model.ModelBakery
+import net.minecraft.util.Direction.DOWN
+import net.minecraft.util.ResourceLocation
+
+object StandardLilypadDiscovery : AbstractModelDiscovery() {
+    override fun processModel(ctx: ModelDiscoveryContext) {
+        if (ctx.getUnbaked() is BlockModel && ctx.blockState.block in LILYPAD_BLOCKS) {
+            ctx.addReplacement(StandardLilypadKey)
+        }
+        super.processModel(ctx)
+    }
+}
+
+object StandardLilypadKey : HalfBakedWrapperKey() {
+    override fun bake(ctx: ModelBakingContext, wrapped: SpecialRenderModel) = StandardLilypadModel(wrapped)
+}
+
+class StandardLilypadModel(
+    wrapped: SpecialRenderModel
+) : HalfBakedSpecialWrapper(wrapped) {
+    override fun render(ctx: RenderCtxBase, noDecorations: Boolean) {
+        ctx.checkSides = false
+        super.render(ctx, noDecorations)
+        if (!Config.enabled || !Config.lilypad.enabled) return
+
+        ShadersModIntegration.grass(ctx, Config.lilypad.shaderWind) {
+            ctx.renderQuads(lilypadRootModels[ctx.random])
+        }
+        if (Config.lilypad.enabled(ctx.random)) ctx.renderQuads(lilypadFlowerModels[ctx.random])
+    }
+
+    companion object {
+        val lilypadRootSprites by SpriteSetDelegate(Atlas.BLOCKS) { idx ->
+            ResourceLocation(BetterFoliageMod.MOD_ID, "blocks/better_lilypad_roots_$idx")
+        }
+        val lilypadFlowerSprites by SpriteSetDelegate(Atlas.BLOCKS) { idx ->
+            ResourceLocation(BetterFoliageMod.MOD_ID, "blocks/better_lilypad_flower_$idx")
+        }
+        val lilypadRootModels by LazyInvalidatable(BakeWrapperManager) {
+            val shapes = tuftShapeSet(1.0, 1.0, 1.0, Config.lilypad.hOffset)
+            tuftModelSet(shapes, -1) { lilypadRootSprites[it] }
+                .transform { move(2.0 to DOWN) }
+                .buildTufts()
+        }
+        val lilypadFlowerModels by LazyInvalidatable(BakeWrapperManager) {
+            val shapes = tuftShapeSet(0.5, 0.5, 0.5, Config.lilypad.hOffset)
+            tuftModelSet(shapes, -1) { lilypadFlowerSprites[it] }
+                .transform { move(1.0 to DOWN) }
+                .buildTufts()
+        }
+    }
+}

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

@@ -0,0 +1,72 @@
+package mods.betterfoliage.render.block.vanilla
+
+import mods.betterfoliage.BetterFoliageMod
+import mods.betterfoliage.config.Config
+import mods.betterfoliage.config.MYCELIUM_BLOCKS
+import mods.betterfoliage.model.HalfBakedSpecialWrapper
+import mods.betterfoliage.model.HalfBakedWrapperKey
+import mods.betterfoliage.model.SpecialRenderModel
+import mods.betterfoliage.model.SpriteSetDelegate
+import mods.betterfoliage.model.buildTufts
+import mods.betterfoliage.model.tuftModelSet
+import mods.betterfoliage.model.tuftShapeSet
+import mods.betterfoliage.render.lighting.LightingPreferredFace
+import mods.betterfoliage.render.pipeline.RenderCtxBase
+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.randomI
+import net.minecraft.block.Blocks
+import net.minecraft.client.renderer.RenderType
+import net.minecraft.client.renderer.RenderTypeLookup
+import net.minecraft.client.renderer.model.BlockModel
+import net.minecraft.util.Direction
+import net.minecraft.util.ResourceLocation
+
+object StandardMyceliumDiscovery : AbstractModelDiscovery() {
+    override fun processModel(ctx: ModelDiscoveryContext) {
+        if (ctx.getUnbaked() is BlockModel && ctx.blockState.block in MYCELIUM_BLOCKS) {
+            ctx.addReplacement(StandardMyceliumKey)
+            RenderTypeLookup.setRenderLayer(ctx.blockState.block, RenderType.cutout())
+        }
+        super.processModel(ctx)
+    }
+}
+
+object StandardMyceliumKey : HalfBakedWrapperKey() {
+    override fun bake(ctx: ModelBakingContext, wrapped: SpecialRenderModel) = StandardMyceliumModel(wrapped)
+}
+
+class StandardMyceliumModel(
+    wrapped: SpecialRenderModel
+) : HalfBakedSpecialWrapper(wrapped) {
+
+    val tuftLighting = LightingPreferredFace(Direction.UP)
+
+    override fun render(ctx: RenderCtxBase, noDecorations: Boolean) {
+        super.render(ctx, noDecorations)
+
+        if (Config.shortGrass.enabled &&
+            Config.shortGrass.myceliumEnabled &&
+            Config.shortGrass.enabled(ctx.random) &&
+            ctx.state(Direction.UP).isAir(ctx.world, ctx.pos)
+        ) {
+            ctx.vertexLighter = tuftLighting
+            ctx.renderQuads(myceliumTuftModels[ctx.random])
+        }
+    }
+
+    companion object {
+        val myceliumTuftSprites by SpriteSetDelegate(Atlas.BLOCKS) { idx ->
+            ResourceLocation(BetterFoliageMod.MOD_ID, "blocks/better_mycel_$idx")
+        }
+        val myceliumTuftModels by LazyInvalidatable(BakeWrapperManager) {
+            val shapes = Config.shortGrass.let { tuftShapeSet(it.size, it.heightMin, it.heightMax, it.hOffset) }
+            tuftModelSet(shapes, -1) { idx -> myceliumTuftSprites[randomI()] }.buildTufts()
+        }
+    }
+}

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

@@ -0,0 +1,81 @@
+package mods.betterfoliage.render.block.vanilla
+
+import mods.betterfoliage.BetterFoliageMod
+import mods.betterfoliage.BetterFoliage
+import mods.betterfoliage.config.Config
+import mods.betterfoliage.config.NETHERRACK_BLOCKS
+import mods.betterfoliage.model.HalfBakedSpecialWrapper
+import mods.betterfoliage.model.HalfBakedWrapperKey
+import mods.betterfoliage.model.SpecialRenderModel
+import mods.betterfoliage.model.SpriteSetDelegate
+import mods.betterfoliage.model.buildTufts
+import mods.betterfoliage.model.transform
+import mods.betterfoliage.model.tuftModelSet
+import mods.betterfoliage.model.tuftShapeSet
+import mods.betterfoliage.render.lighting.LightingPreferredFace
+import mods.betterfoliage.render.pipeline.RenderCtxBase
+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.randomI
+import net.minecraft.block.Blocks
+import net.minecraft.client.renderer.RenderType
+import net.minecraft.client.renderer.RenderTypeLookup
+import net.minecraft.client.renderer.model.BlockModel
+import net.minecraft.util.Direction.DOWN
+import net.minecraft.util.ResourceLocation
+
+object StandardNetherrackDiscovery : AbstractModelDiscovery() {
+    fun canRenderInLayer(layer: RenderType) = when {
+        !Config.enabled -> layer == RenderType.solid()
+        !Config.netherrack.enabled -> layer == RenderType.solid()
+        else -> layer == RenderType.cutoutMipped()
+    }
+
+    override fun processModel(ctx: ModelDiscoveryContext) {
+        if (ctx.getUnbaked() is BlockModel && 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 : HalfBakedWrapperKey() {
+    override fun bake(ctx: ModelBakingContext, wrapped: SpecialRenderModel) = StandardNetherrackModel(wrapped)
+}
+
+class StandardNetherrackModel(
+    wrapped: SpecialRenderModel
+) : HalfBakedSpecialWrapper(wrapped) {
+
+    val tuftLighting = LightingPreferredFace(DOWN)
+
+    override fun render(ctx: RenderCtxBase, noDecorations: Boolean) {
+        super.render(ctx, noDecorations)
+        if (!Config.enabled || !Config.netherrack.enabled) return
+
+        if (ctx.isAir(DOWN)) {
+            ctx.vertexLighter = tuftLighting
+            ctx.renderQuads(netherrackTuftModels[ctx.random])
+        }
+    }
+
+    companion object {
+        val netherrackTuftSprites by SpriteSetDelegate(Atlas.BLOCKS) { idx ->
+            ResourceLocation(BetterFoliageMod.MOD_ID, "blocks/better_netherrack_$idx")
+        }
+        val netherrackTuftModels by LazyInvalidatable(BakeWrapperManager) {
+            val shapes = Config.netherrack.let { tuftShapeSet(it.size, it.heightMin, it.heightMax, it.hOffset) }
+            tuftModelSet(shapes, -1) { netherrackTuftSprites[randomI()] }
+                .transform { rotate(Rotation.fromUp[DOWN.ordinal]).rotateUV(2) }
+                .buildTufts()
+        }
+    }
+}

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

@@ -0,0 +1,98 @@
+package mods.betterfoliage.render.block.vanilla
+
+import mods.betterfoliage.BetterFoliage
+import mods.betterfoliage.config.ACCEPTED_ROUND_LOG_MATERIALS
+import mods.betterfoliage.config.BlockConfig
+import mods.betterfoliage.config.Config
+import mods.betterfoliage.model.HalfBakedWrapperKey
+import mods.betterfoliage.model.SpecialRenderModel
+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.LazyMapInvalidatable
+import mods.betterfoliage.util.tryDefault
+import net.minecraft.block.BlockState
+import net.minecraft.block.RotatedPillarBlock
+import net.minecraft.util.Direction.Axis
+import net.minecraft.util.ResourceLocation
+import org.apache.logging.log4j.Level.INFO
+
+interface RoundLogKey : ColumnBlockKey, ModelBakingKey {
+    val barkSprite: ResourceLocation
+    val endSprite: ResourceLocation
+}
+
+object RoundLogOverlayLayer : ColumnRenderLayer() {
+    override fun getColumnKey(state: BlockState) = BetterFoliage.blockTypes.getTypedOrNull<ColumnBlockKey>(state)
+    override val connectSolids: Boolean get() = Config.roundLogs.connectSolids
+    override val lenientConnect: Boolean get() = Config.roundLogs.lenientConnect
+    override val defaultToY: Boolean get() = Config.roundLogs.defaultY
+}
+
+object StandardRoundLogDiscovery : ConfigurableModelDiscovery() {
+    override val matchClasses: ConfigurableBlockMatcher get() = BlockConfig.logBlocks
+    override val modelTextures: List<ModelTextureList> get() = BlockConfig.logModels.modelList
+
+    override fun processModel(ctx: ModelDiscoveryContext, textureMatch: List<ResourceLocation>) {
+        val axis = getAxis(ctx.blockState)
+
+        detailLogger.log(INFO, "       axis $axis, material ${ctx.blockState.material}")
+        if (!Config.roundLogs.plantsOnly || ctx.blockState.material in ACCEPTED_ROUND_LOG_MATERIALS)
+            ctx.addReplacement(StandardRoundLogKey(axis, textureMatch[0], textureMatch[1]))
+    }
+
+    fun getAxis(state: BlockState): Axis? {
+        val axis = tryDefault(null) { state.getValue(RotatedPillarBlock.AXIS).toString() } ?:
+        state.values.entries.find { it.key.name.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: ResourceLocation,
+    override val endSprite: ResourceLocation
+) : RoundLogKey, HalfBakedWrapperKey() {
+    override fun bake(ctx: ModelBakingContext, wrapped: SpecialRenderModel) = StandardRoundLogModel(this, wrapped)
+}
+
+class StandardRoundLogModel(
+    val key: StandardRoundLogKey,
+    wrapped: SpecialRenderModel
+) : ColumnModelBase(wrapped) {
+    override val enabled: Boolean get() = Config.enabled && Config.roundLogs.enabled
+    override val overlayLayer: ColumnRenderLayer get() = RoundLogOverlayLayer
+    override val connectPerpendicular: Boolean get() = Config.roundLogs.connectPerpendicular
+
+    val modelSet by modelSets.delegate(key)
+    override fun getMeshSet(axis: Axis, quadrant: Int) = modelSet
+
+    companion object {
+        val modelSets = LazyMapInvalidatable(BakeWrapperManager) { key: StandardRoundLogKey ->
+            val barkSprite = Atlas.BLOCKS[key.barkSprite]
+            val endSprite = Atlas.BLOCKS[key.endSprite]
+            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,107 @@
+package mods.betterfoliage.render.block.vanilla
+
+import mods.betterfoliage.BetterFoliage
+import mods.betterfoliage.BetterFoliageMod
+import mods.betterfoliage.config.Config
+import mods.betterfoliage.config.SALTWATER_BIOMES
+import mods.betterfoliage.config.SAND_BLOCKS
+import mods.betterfoliage.model.HalfBakedSpecialWrapper
+import mods.betterfoliage.model.HalfBakedWrapperKey
+import mods.betterfoliage.model.Quad
+import mods.betterfoliage.model.SpecialRenderModel
+import mods.betterfoliage.model.SpriteSetDelegate
+import mods.betterfoliage.model.bake
+import mods.betterfoliage.model.buildTufts
+import mods.betterfoliage.model.transform
+import mods.betterfoliage.model.tuftModelSet
+import mods.betterfoliage.model.tuftShapeSet
+import mods.betterfoliage.render.lighting.LightingPreferredFace
+import mods.betterfoliage.render.pipeline.RenderCtxBase
+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.mapArray
+import mods.betterfoliage.util.randomB
+import mods.betterfoliage.util.randomD
+import mods.betterfoliage.util.randomI
+import net.minecraft.block.material.Material
+import net.minecraft.client.renderer.RenderType
+import net.minecraft.client.renderer.RenderTypeLookup
+import net.minecraft.client.renderer.model.BlockModel
+import net.minecraft.util.Direction
+import net.minecraft.util.Direction.UP
+import net.minecraft.util.ResourceLocation
+
+object StandardSandDiscovery : AbstractModelDiscovery() {
+    override fun processModel(ctx: ModelDiscoveryContext) {
+        if (ctx.getUnbaked() is BlockModel && ctx.blockState.block in SAND_BLOCKS) {
+            BetterFoliage.blockTypes.dirt.add(ctx.blockState)
+            ctx.addReplacement(StandardSandKey)
+            RenderTypeLookup.setRenderLayer(ctx.blockState.block, RenderType.cutoutMipped())
+        }
+        super.processModel(ctx)
+    }
+}
+
+object StandardSandKey : HalfBakedWrapperKey() {
+    override fun bake(ctx: ModelBakingContext, wrapped: SpecialRenderModel) = StandardSandModel(wrapped)
+}
+
+class StandardSandModel(
+    wrapped: SpecialRenderModel
+) : HalfBakedSpecialWrapper(wrapped) {
+    val coralLighting = Direction.values().mapArray { LightingPreferredFace(it) }
+
+    override fun render(ctx: RenderCtxBase, noDecorations: Boolean) {
+        super.render(ctx, noDecorations)
+        if (noDecorations || !Config.enabled || !Config.coral.enabled(ctx.random)) return
+        if (ctx.biome?.biomeCategory !in SALTWATER_BIOMES) return
+
+        allDirections.filter { ctx.random.nextInt(64) < 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) {
+                ctx.vertexLighter = coralLighting[face]
+                ctx.renderQuads(coralCrustModels[face][ctx.random])
+                ctx.renderQuads(coralTuftModels[face][ctx.random])
+            }
+        }
+    }
+
+    companion object {
+        val coralTuftSprites by SpriteSetDelegate(Atlas.BLOCKS) { idx ->
+            ResourceLocation(BetterFoliageMod.MOD_ID, "blocks/better_coral_$idx")
+        }
+        val coralCrustSprites by SpriteSetDelegate(Atlas.BLOCKS) { idx ->
+            ResourceLocation(BetterFoliageMod.MOD_ID, "blocks/better_crust_$idx")
+        }
+        val coralTuftModels by LazyInvalidatable(BakeWrapperManager) {
+            val shapes = Config.coral.let { tuftShapeSet(it.size, 1.0, 1.0, it.hOffset) }
+            allDirections.mapArray { face ->
+                tuftModelSet(shapes, -1) { coralTuftSprites[randomI()] }
+                    .transform { rotate(Rotation.fromUp[face]) }
+                    .buildTufts()
+            }
+        }
+        val coralCrustModels by LazyInvalidatable(BakeWrapperManager) {
+            allDirections.map { face ->
+                Array(64) { idx ->
+                    listOf(
+                        Quad.horizontalRectangle(x1 = -0.5, x2 = 0.5, z1 = -0.5, z2 = 0.5, y = 0.0)
+                            .scale(Config.coral.crustSize)
+                            .move(0.5 + randomD(0.01, Config.coral.vOffset) to UP)
+                            .rotate(Rotation.fromUp[face])
+                            .mirrorUV(randomB(), randomB()).rotateUV(randomI(max = 4))
+                            .sprite(coralCrustSprites[idx]).colorAndIndex(null)
+                    ).bake(applyDiffuseLighting = false)
+                }
+            }.toTypedArray()
+        }
+    }
+}

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

@@ -0,0 +1,166 @@
+package mods.betterfoliage.render.column
+
+import mods.betterfoliage.config.Config
+import mods.betterfoliage.model.Quad
+import mods.betterfoliage.model.UV
+import mods.betterfoliage.model.Vertex
+import mods.betterfoliage.model.bake
+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.Double3
+import mods.betterfoliage.util.Rotation
+import net.minecraft.client.renderer.texture.TextureAtlasSprite
+import net.minecraft.util.Direction.Axis
+import net.minecraft.util.Direction.EAST
+import net.minecraft.util.Direction.SOUTH
+import net.minecraft.util.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: TextureAtlasSprite,
+    val spriteRight: TextureAtlasSprite,
+    val spriteTop: TextureAtlasSprite,
+    val spriteBottom: TextureAtlasSprite
+) {
+    protected fun sideRounded(radius: Double, yBottom: Double, yTop: Double): List<Quad> {
+        val halfRadius = radius * 0.5
+        return listOf(
+            // left side of the diagonal
+            Quad.verticalRectangle(0.0, 0.5, 0.5 - radius, 0.5, yBottom, yTop).clampUV(minU = 0.0, maxU = 0.5 - radius),
+            Quad.verticalRectangle(0.5 - radius, 0.5, 0.5 - halfRadius, 0.5 - halfRadius, yBottom, yTop).clampUV(minU = 0.5 - radius),
+            // right side of the diagonal
+            Quad.verticalRectangle(0.5 - halfRadius, 0.5 - halfRadius, 0.5, 0.5 - radius, yBottom, yTop).clampUV(maxU = radius - 0.5),
+            Quad.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(
+        Quad.verticalRectangle(0.0, 0.5, 0.5, 0.5, yBottom, yTop).clampUV(minU = 0.0),
+        Quad.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 Config.nVidia) 0 else 1) }
+            .map { it.rotate(rotation).rotateUV(quadrant) }
+            .map { it.sprite(if (isBottom) spriteBottom else spriteTop) }
+            .map { if (isBottom) it.flipped else it }
+    }
+
+    protected fun lidSquare(y: Double, isBottom: Boolean) = Array(4) { quadrant ->
+        val rotation = baseRotation(axis) + quadrantRotations[quadrant]
+        listOf(
+            Quad.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)
+                .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) }
+            .mapIndexed { idx, q -> if (idx % (2 * quadsPerSprite) >= quadsPerSprite) q.sprite(spriteRight) else q.sprite(spriteLeft) }
+            .bake(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).bake(false)
+    val lidTopRoundSmall = lidRounded(radiusSmall, 0.5, false).bake(false)
+    val lidTopRoundLarge = lidRounded(radiusLarge, 0.5, false).bake(false)
+
+    val lidBottomSquare = lidSquare(-0.5, true).bake(false)
+    val lidBottomRoundSmall = lidRounded(radiusSmall, -0.5, true).bake(false)
+    val lidBottomRoundLarge = lidRounded(radiusLarge, -0.5, true).bake(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,113 @@
+package mods.betterfoliage.render.column
+
+import mods.betterfoliage.chunk.ChunkOverlayManager
+import mods.betterfoliage.model.HalfBakedSpecialWrapper
+import mods.betterfoliage.model.SpecialRenderModel
+import mods.betterfoliage.render.column.ColumnLayerData.NormalRender
+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.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.render.lighting.ColumnLighting
+import mods.betterfoliage.render.pipeline.RenderCtxBase
+import net.minecraft.util.Direction.Axis
+
+abstract class ColumnModelBase(
+    wrapped: SpecialRenderModel
+) : HalfBakedSpecialWrapper(wrapped) {
+
+    abstract val enabled: Boolean
+    abstract val overlayLayer: ColumnRenderLayer
+    abstract val connectPerpendicular: Boolean
+    abstract fun getMeshSet(axis: Axis, quadrant: Int): ColumnMeshSet
+
+    override fun render(ctx: RenderCtxBase, noDecorations: Boolean) {
+        if (!enabled) return super.render(ctx, noDecorations)
+        
+        val roundLog = ChunkOverlayManager.get(overlayLayer, ctx)
+        when(roundLog) {
+            ColumnLayerData.SkipRender -> return
+            NormalRender -> return super.render(ctx, noDecorations)
+            ColumnLayerData.ResolveError, null -> {
+                return super.render(ctx, noDecorations)
+            }
+        }
+
+        // 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.render(ctx, noDecorations)
+        }
+
+        ctx.vertexLighter = ColumnLighting
+
+        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 { ctx.renderQuads(it) }
+            upMesh?.let { ctx.renderQuads(it) }
+            downMesh?.let { ctx.renderQuads(it) }
+        }
+
+    }
+}

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

@@ -0,0 +1,195 @@
+package mods.betterfoliage.render.column
+
+import mods.betterfoliage.chunk.BlockCtx
+import mods.betterfoliage.chunk.ChunkOverlayLayer
+import mods.betterfoliage.chunk.ChunkOverlayManager
+import mods.betterfoliage.chunk.dimType
+import mods.betterfoliage.config.Config
+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.plus
+import net.minecraft.block.BlockState
+import net.minecraft.util.Direction
+import net.minecraft.util.Direction.Axis
+import net.minecraft.util.math.BlockPos
+import net.minecraft.world.IBlockDisplayReader
+
+/** 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: IBlockDisplayReader, pos: BlockPos) {
+        allNeighborOffsets.forEach { offset -> ChunkOverlayManager.clear(world.dimType, this, pos + offset) }
+    }
+
+    override fun calculate(ctx: BlockCtx): ColumnLayerData {
+        // TODO detect round logs
+        if (allDirections.all { dir -> ctx.offset(dir).let { it.isFullBlock } }) 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 Direction.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).isFullBlock) SOLID else NONSOLID
+        } else {
+            (key.axis ?: if (Config.roundLogs.defaultY) Axis.Y else null)?.let {
+                if (it == axis) PARALLEL else PERPENDICULAR
+            } ?: SOLID
+        }
+    }
+}

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

@@ -0,0 +1,138 @@
+package mods.betterfoliage.render.lighting
+
+import mods.betterfoliage.util.get
+import mods.betterfoliage.util.mapArray
+import mods.betterfoliage.util.perpendiculars
+import net.minecraft.util.Direction
+import net.minecraft.util.Direction.*
+
+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
+}
+
+class AoSideHelper private constructor(face: Direction) {
+    val sides = faceSides[face]
+    val cornerSideDirections = faceCorners[face]
+    val aoIndex = faceCornersIdx.mapArray { corner ->
+        boxCornersDirIdx[face][sides[corner.first]][sides[corner.second]]!!
+    }
+
+    companion object {
+        /**
+         * Indexing for undirected box corners (component order does not matter).
+         * Array contains [Direction] triplets fully defining the corner.
+         */
+        @JvmField
+        val boxCornersUndir = 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 [boxCornersUndir]. Index 3 times with the corner's cardinal directions.
+         *  A null value indicates an invalid corner (multiple indexing along the same axis)
+         */
+        @JvmField
+        val boxCornersUndirIdx = Array(6) { idx1 -> Array(6) { idx2 -> Array(6) { idx3 ->
+            boxCornersUndir.findIdx(BoxCorner(
+                Direction.values()[idx1],
+                Direction.values()[idx2],
+                Direction.values()[idx3]
+            ))
+        } } }
+
+        /**
+         * Indexing for directed face sides
+         * First index is the face, second is index of side on face
+         */
+        @JvmField
+        val faceSides = Array(6) { faceIdx -> Array(4) { sideIdx ->
+            Direction.values()[faceIdx].perpendiculars[sideIdx]
+        } }
+
+        /**
+         * Pairs of [faceSides] side indexes that form a valid pair describing a corner
+         */
+        @JvmField
+        val faceCornersIdx = arrayOf(0 to 2, 0 to 3, 1 to 2, 1 to 3)
+
+        /**
+         * Indexing for directed face corners
+         * First index is the face, second is index of corner on face
+         */
+        @JvmField
+        val faceCorners = Array(6) { faceIdx -> Array(4) { cornerIdx ->
+            faceCornersIdx[cornerIdx].let { faceSides[faceIdx][it.first] to faceSides[faceIdx][it.second] }
+        } }
+
+        /**
+         * 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.
+         */
+        @JvmField
+        val boxCornersDir = Array(24) { idx ->
+            val faceIdx = idx / 4; val face = Direction.values()[faceIdx]
+            val cornerIdx = idx % 4; val corner = faceCorners[faceIdx][cornerIdx]
+            BoxCorner(face, corner.first, corner.second)
+        }
+
+        /**
+         * Reverse lookup for [boxCornersDir]. Index 3 times with the corner's cardinal directions.
+         * The first direction - the face - matters, the other two are unordered.
+         *  A null value indicates an invalid corner (multiple indexing along the same axis)
+         */
+        @JvmField
+        val boxCornersDirIdx = Array(6) { face -> Array(6) { side1 -> Array(6) { side2 ->
+            boxCornersDir.findIdx { boxCorner ->
+                boxCorner.first.ordinal == face && boxCorner.equalsUnordered(BoxCorner(
+                    Direction.values()[face],
+                    Direction.values()[side1],
+                    Direction.values()[side2]
+                ))
+            }
+        } } }
+
+        /**
+         * 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).
+         */
+        @JvmField
+        val boxCornersDirFromUndir = Array(6) { faceIdx -> Array(8) { undirIdx ->
+            val face = Direction.values()[faceIdx]
+            val corner = boxCornersUndir[undirIdx]
+            if (!corner.contains(face)) null
+            else boxCornersDir.findIdx { it.first == face && it.equalsUnordered(corner) }
+        } }
+
+        @JvmField
+        val forSide = Direction.values().mapArray { AoSideHelper(it) }
+
+        /**
+         * Get corner index for vertex coordinates
+         */
+        @JvmStatic
+        fun getCornerUndir(x: Double, y: Double, z: Double): Int {
+            var result = 0
+            if (x > 0.0) result += 1
+            if (y > 0.0) result += 2
+            if (z > 0.0) result += 4
+            return result
+        }
+    }
+}

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

@@ -0,0 +1,10 @@
+package mods.betterfoliage.render.lighting
+
+interface ForgeVertexLighterAccess {
+    var vertexLighter: ForgeVertexLighter
+}
+
+interface ForgeVertexLighter {
+    fun updateVertexLightmap(normal: FloatArray, lightmap: FloatArray, x: Float, y: Float, z: Float)
+    fun updateVertexColor(normal: FloatArray, color: FloatArray, x: Float, y: Float, z: Float, tint: Float, multiplier: Int)
+}

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

@@ -0,0 +1,147 @@
+package mods.betterfoliage.render.lighting
+
+import mods.betterfoliage.chunk.BlockCtx
+import net.minecraft.block.BlockState
+import net.minecraft.client.renderer.BlockModelRenderer
+import net.minecraft.util.Direction
+import net.minecraft.util.math.BlockPos
+import net.minecraft.world.IBlockDisplayReader
+
+data class LightingData(
+    @JvmField var packedLight: Int = 0,
+    @JvmField var colorMultiplier: Float = 1.0f
+) {
+    fun mixFrom(corner: LightingData, side1: LightingData, side2: LightingData, center: LightingData) {
+        colorMultiplier =
+            (center.colorMultiplier + side1.colorMultiplier + side2.colorMultiplier + corner.colorMultiplier) * 0.25f
+        packedLight = (
+                center.packedLight +
+                (side1.packedLight.takeUnless { it == 0 } ?: center.packedLight) +
+                (side2.packedLight.takeUnless { it == 0 } ?: center.packedLight) +
+                (corner.packedLight.takeUnless { it == 0 } ?: center.packedLight)
+            ).let { sum -> (sum shr 2) and 0xFF00FF }
+    }
+}
+
+/**
+ * Replacement for [BlockModelRenderer.AmbientOcclusionFace]
+ * This gets called on a LOT, so object instantiation is avoided.
+ * Not thread-safe, always use a [ThreadLocal] instance
+ */
+class VanillaAoCalculator {
+    lateinit var world: IBlockDisplayReader
+
+    /** [blockPos] is used to get block-related information (i.e. tint, opacity, etc.)
+     *  [lightPos] is used to get light-related information
+     *  this facilitates masquerade rendering of blocks */
+    lateinit var blockPos: BlockPos
+    lateinit var lightPos: BlockPos
+
+    private val probe = LightProbe(BlockModelRenderer.CACHE.get())
+
+    val isValid = BooleanArray(6)
+    val aoData = Array(24) { LightingData() }
+
+    // scratchpad values used during calculation
+    private val centerAo = LightingData()
+    private val sideAo = Array(4) { LightingData() }
+    private val cornerAo = Array(4) { LightingData() }
+    private val isOccluded = BooleanArray(4)
+
+    fun reset(ctx: BlockCtx) {
+        world = ctx.world; blockPos = ctx.pos; lightPos = ctx.pos
+        (0 until 6).forEach { isValid[it] = false }
+    }
+
+    fun fillLightData(lightFace: Direction, isOpaque: Boolean? = null) {
+        if (!isValid[lightFace.ordinal]) calculate(lightFace, isOpaque)
+    }
+
+    /**
+     * Replicate [BlockModelRenderer.AmbientOcclusionFace.updateVertexBrightness]
+     * Does not handle interpolation for non-cubic models, that should be
+     * done in a [VanillaVertexLighter]
+     * @param lightFace face of the block to calculate
+     * @param forceFull force full-block status for lighting calculation, null for auto
+     */
+    private fun calculate(lightFace: Direction, forceFull: Boolean?) {
+        if (isValid[lightFace.ordinal]) return
+        val sideHelper = AoSideHelper.forSide[lightFace.ordinal]
+
+        // Bit 0 of the bitset in vanilla calculations
+        // true if the block model is planar with the block boundary
+        val isFullBlock = forceFull ?: world.getBlockState(blockPos).isCollisionShapeFullBlock(world, blockPos)
+
+        val lightOrigin = if (isFullBlock) lightPos.relative(lightFace) else lightPos
+
+        // AO calculation for the face center
+        probe.position { set(lightOrigin) }.writeTo(centerAo)
+        if (!isFullBlock && !probe.position { move(lightFace) }.state.isSolidRender(world, probe.pos)) {
+            // if the neighboring block in the lightface direction is
+            // transparent (non-opaque), use its packed light instead of our own
+            // (if our block is a full block, we are already using this value)
+            centerAo.packedLight = probe.packedLight
+        }
+
+        // AO calculation for the 4 sides
+        sideHelper.sides.forEachIndexed { sideIdx, sideDir ->
+            // record light data in the block 1 step to the side
+            probe.position { set(lightOrigin).move(sideDir) }.writeTo(sideAo[sideIdx])
+            // side is considered occluded if the block 1 step to that side and
+            // 1 step forward (in the lightface direction) is not fully transparent
+            isOccluded[sideIdx] = probe.position { move(lightFace) }.isNonTransparent
+        }
+
+        // AO Calculation for the 4 corners
+        AoSideHelper.faceCornersIdx.forEachIndexed { cornerIdx, sideIndices ->
+            val bothOccluded = isOccluded[sideIndices.first] && isOccluded[sideIndices.second]
+            if (bothOccluded) cornerAo[cornerIdx].apply {
+                // if both sides are occluded, just use the packed light for one of the sides instead
+                val copyFrom = sideAo[sideIndices.first]
+                packedLight = copyFrom.packedLight; colorMultiplier = copyFrom.colorMultiplier
+            }
+            else {
+                // lookup actual packed light from the cornering block in the world
+                probe.position {
+                    set(lightOrigin)
+                        .move(sideHelper.sides[sideIndices.first])
+                        .move(sideHelper.sides[sideIndices.second])
+                }.writeTo(cornerAo[cornerIdx])
+            }
+        }
+
+        // Calculate and store final interpolated value for each corner
+        AoSideHelper.faceCornersIdx.forEachIndexed { cornerIdx, sideIndices ->
+            val aoIdx = sideHelper.aoIndex[cornerIdx]
+            aoData[aoIdx].mixFrom(
+                cornerAo[cornerIdx],
+                sideAo[sideIndices.first],
+                sideAo[sideIndices.second],
+                centerAo
+            )
+        }
+        isValid[lightFace.ordinal] = true
+    }
+
+    inner class LightProbe(
+        val cache: BlockModelRenderer.Cache
+    ) {
+        lateinit var state: BlockState
+        val pos = BlockPos.Mutable()
+
+        val packedLight: Int get() = cache.getLightColor(state, world, pos)
+        val colorMultiplier: Float get() = cache.getShadeBrightness(state, world, pos)
+        val isNonTransparent: Boolean get() = state.getLightBlock(world, pos) > 0
+
+        fun writeTo(data: LightingData) {
+            data.packedLight = packedLight
+            data.colorMultiplier = colorMultiplier
+        }
+
+        inline fun position(func: BlockPos.Mutable.() -> Unit): LightProbe {
+            pos.func()
+            state = world.getBlockState(pos)
+            return this
+        }
+    }
+}

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

@@ -0,0 +1,210 @@
+package mods.betterfoliage.render.lighting
+
+import mods.betterfoliage.model.HalfBakedQuad
+import mods.betterfoliage.util.Double3
+import mods.betterfoliage.util.EPSILON_ONE
+import mods.betterfoliage.util.EPSILON_ZERO
+import mods.betterfoliage.util.minBy
+import net.minecraft.client.renderer.color.BlockColors
+import net.minecraft.util.Direction
+import net.minecraft.util.Direction.*
+import net.minecraft.util.Direction.Axis
+import net.minecraftforge.client.model.pipeline.LightUtil
+import kotlin.math.abs
+
+class VanillaQuadLighting {
+    val packedLight = IntArray(4)
+    val colorMultiplier = FloatArray(4)
+    val tint = FloatArray(3)
+
+    val calc = VanillaAoCalculator()
+    lateinit var blockColors: BlockColors
+
+    fun updateBlockTint(tintIndex: Int) {
+        if (tintIndex == -1) {
+            tint[0] = 1.0f; tint[1] = 1.0f; tint[2] = 1.0f
+        } else {
+            val state = calc.world.getBlockState(calc.blockPos)
+            blockColors.getColor(state, calc.world, calc.blockPos, tintIndex).let { blockTint ->
+                tint[0] = (blockTint shr 16 and 255).toFloat() / 255.0f
+                tint[1] = (blockTint shr 8 and 255).toFloat() / 255.0f
+                tint[2] = (blockTint and 255).toFloat() / 255.0f
+            }
+        }
+    }
+
+    fun applyDiffuseLighting(face: Direction) {
+        val factor = LightUtil.diffuseLight(face)
+        tint[0] *= factor; tint[1] *= factor; tint[2] *= factor
+    }
+}
+
+abstract class VanillaVertexLighter {
+    abstract fun updateLightmapAndColor(quad: HalfBakedQuad, lighting: VanillaQuadLighting)
+
+    /**
+     * Update lighting for each vertex with AO values from one of the corners.
+     * Does not calculate missing AO values!
+     * @param quad the quad to shade
+     * @param func selector function from vertex position to directed corner index of desired AO values
+     */
+    inline fun VanillaQuadLighting.updateWithCornerAo(quad: HalfBakedQuad, func: (Double3)->Int?) {
+        quad.raw.verts.forEachIndexed { idx, vertex ->
+            func(vertex.xyz)?.let {
+                packedLight[idx] = calc.aoData[it].packedLight
+                colorMultiplier[idx] = calc.aoData[it].colorMultiplier
+            }
+        }
+    }
+}
+
+/**
+ * Replicates vanilla shading for full blocks. Interpolation for non-full blocks
+ * is not implemented.
+ */
+object VanillaFullBlockLighting : VanillaVertexLighter() {
+    override fun updateLightmapAndColor(quad: HalfBakedQuad, lighting: VanillaQuadLighting) {
+        // TODO bounds checking & interpolation
+        val face = quad.raw.face()
+        lighting.calc.fillLightData(face, true)
+        lighting.updateWithCornerAo(quad) { nearestCornerOnFace(it, face) }
+        lighting.updateBlockTint(quad.baked.tintIndex)
+        if (quad.baked.isShade) lighting.applyDiffuseLighting(face)
+    }
+}
+
+object RoundLeafLightingPreferUp : VanillaVertexLighter() {
+    override fun updateLightmapAndColor(quad: HalfBakedQuad, lighting: VanillaQuadLighting) {
+        val angles = getAngles45(quad)?.let { normalFaces ->
+            lighting.calc.fillLightData(normalFaces.first)
+            lighting.calc.fillLightData(normalFaces.second)
+            if (normalFaces.first != UP && normalFaces.second != UP) lighting.calc.fillLightData(UP)
+            lighting.updateWithCornerAo(quad) { vertex ->
+                val isUp = vertex.y > 0.5f
+                val cornerUndir = AoSideHelper.getCornerUndir(vertex.x, vertex.y, vertex.z)
+                val preferredFace = if (isUp) UP else normalFaces.minBy { faceDistance(it, vertex) }
+                AoSideHelper.boxCornersDirFromUndir[preferredFace.ordinal][cornerUndir]
+            }
+            lighting.updateBlockTint(quad.baked.tintIndex)
+        }
+    }
+}
+
+/**
+ * Lights vertices with the AO values from the nearest corner on either of
+ * the 2 faces the quad normal points towards.
+ */
+object RoundLeafLighting : VanillaVertexLighter() {
+    override fun updateLightmapAndColor(quad: HalfBakedQuad, lighting: VanillaQuadLighting) {
+        val angles = getAngles45(quad)?.let { normalFaces ->
+            lighting.calc.fillLightData(normalFaces.first)
+            lighting.calc.fillLightData(normalFaces.second)
+            lighting.updateWithCornerAo(quad) { vertex ->
+                val cornerUndir = AoSideHelper.getCornerUndir(vertex.x, vertex.y, vertex.z)
+                val preferredFace = normalFaces.minBy { faceDistance(it, vertex) }
+                AoSideHelper.boxCornersDirFromUndir[preferredFace.ordinal][cornerUndir]
+            }
+            lighting.updateBlockTint(quad.baked.tintIndex)
+        }
+    }
+}
+
+/**
+ * Lights vertices with the AO values from the nearest corner on the preferred face.
+ */
+class LightingPreferredFace(val face: Direction) : VanillaVertexLighter() {
+    override fun updateLightmapAndColor(quad: HalfBakedQuad, lighting: VanillaQuadLighting) {
+        lighting.calc.fillLightData(face)
+        lighting.updateWithCornerAo(quad) { nearestCornerOnFace(it, face) }
+        lighting.updateBlockTint(quad.baked.tintIndex)
+    }
+}
+
+object ColumnLighting : VanillaVertexLighter() {
+    override fun updateLightmapAndColor(quad: HalfBakedQuad, lighting: VanillaQuadLighting) {
+        // faces pointing in cardinal directions
+        getNormalFace(quad)?.let { face ->
+            lighting.calc.fillLightData(face)
+            lighting.updateWithCornerAo(quad) { nearestCornerOnFace(it, face) }
+            lighting.updateBlockTint(quad.baked.tintIndex)
+            return
+        }
+        // faces pointing at 45deg angles
+        getAngles45(quad)?.let { (face1, face2) ->
+            lighting.calc.fillLightData(face1)
+            lighting.calc.fillLightData(face2)
+            quad.raw.verts.forEachIndexed { idx, vertex ->
+                val cornerUndir = AoSideHelper.getCornerUndir(vertex.xyz.x, vertex.xyz.y, vertex.xyz.z)
+                val cornerDir1 = AoSideHelper.boxCornersDirFromUndir[face1.ordinal][cornerUndir]
+                val cornerDir2 = AoSideHelper.boxCornersDirFromUndir[face2.ordinal][cornerUndir]
+                if (cornerDir1 == null || cornerDir2 == null) return@let
+                val ao1 = lighting.calc.aoData[cornerDir1]
+                val ao2 = lighting.calc.aoData[cornerDir2]
+                lighting.packedLight[idx] = ((ao1.packedLight + ao2.packedLight) shr 1) and 0xFF00FF
+                lighting.colorMultiplier[idx] = (ao1.colorMultiplier + ao2.colorMultiplier) * 0.5f
+            }
+            lighting.updateBlockTint(quad.baked.tintIndex)
+            return
+        }
+        // something is wrong...
+        lighting.updateWithCornerAo(quad) { nearestCornerOnFace(it, quad.raw.face()) }
+        lighting.updateBlockTint(quad.baked.tintIndex)
+    }
+}
+
+/**
+ * Return the directed box corner index for the corner nearest the given vertex,
+ * which is on the given face. May return null if the vertex is closest to
+ * one of the opposite 4 corners
+ */
+fun nearestCornerOnFace(pos: Double3, face: Direction): Int? {
+    val cornerUndir = AoSideHelper.getCornerUndir(pos.x, pos.y, pos.z)
+    return AoSideHelper.boxCornersDirFromUndir[face.ordinal][cornerUndir]
+}
+
+/**
+ * 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: HalfBakedQuad): Pair<Direction, Direction>? {
+    val normal = quad.raw.normal
+    // one of the components must be close to zero
+    val zeroAxis = when {
+        abs(normal.x) < EPSILON_ZERO -> Axis.X
+        abs(normal.y) < EPSILON_ZERO -> Axis.Y
+        abs(normal.z) < EPSILON_ZERO -> 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_ZERO) 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 getNormalFace(quad: HalfBakedQuad) = quad.raw.normal.let { normal ->
+    when {
+        normal.x > EPSILON_ONE -> EAST
+        normal.x < -EPSILON_ONE -> WEST
+        normal.y > EPSILON_ONE -> UP
+        normal.y < -EPSILON_ONE -> DOWN
+        normal.z > EPSILON_ONE -> SOUTH
+        normal.z < -EPSILON_ONE -> NORTH
+        else -> null
+    }
+}
+
+fun faceDistance(face: Direction, pos: Double3) = when(face) {
+    WEST -> pos.x; EAST -> 1.0 - pos.x
+    DOWN -> pos.y; UP -> 1.0 - pos.y
+    NORTH -> pos.z; SOUTH -> 1.0 - pos.z
+}

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

@@ -0,0 +1,101 @@
+package mods.betterfoliage.render.particle
+
+import com.mojang.blaze3d.vertex.IVertexBuilder
+import mods.betterfoliage.util.Double3
+import net.minecraft.client.Minecraft
+import net.minecraft.client.particle.SpriteTexturedParticle
+import net.minecraft.client.renderer.ActiveRenderInfo
+import net.minecraft.client.renderer.texture.TextureAtlasSprite
+import net.minecraft.client.world.ClientWorld
+import net.minecraft.util.math.MathHelper
+import net.minecraft.util.math.vector.Vector3f
+
+abstract class AbstractParticle(world: ClientWorld, x: Double, y: Double, z: Double) : SpriteTexturedParticle(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(xo, yo, zo)
+        velocity.setTo(xd, yd, zd)
+        update()
+        x = currentPos.x; y = currentPos.y; z = currentPos.z;
+        xd = velocity.x; yd = velocity.y; zd = 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) Minecraft.getInstance().particleEngine.add(this) }
+
+    override fun render(vertexBuilder: IVertexBuilder, camera: ActiveRenderInfo, tickDelta: Float) {
+        super.render(vertexBuilder, 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: IVertexBuilder,
+                           camera: ActiveRenderInfo,
+                           tickDelta: Float,
+                           currentPos: Double3 = this.currentPos,
+                           prevPos: Double3 = this.prevPos,
+                           size: Double = quadSize.toDouble(),
+                           currentAngle: Float = this.roll,
+                           prevAngle: Float = this.oRoll,
+                           sprite: TextureAtlasSprite = this.sprite,
+                           alpha: Float = this.alpha) {
+
+        val center = Double3.lerp(tickDelta.toDouble(), prevPos, currentPos)
+        val angle = MathHelper.lerp(tickDelta, prevAngle, currentAngle)
+        val rotation = camera.rotation().copy().apply { mul(Vector3f.ZP.rotation(angle)) }
+        val lightmapCoord = getLightColor(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.position.x, camera.position.y, camera.position.z) }
+
+        fun renderVertex(vertex: Double3, u: Float, v: Float) = vertexConsumer
+            .vertex(vertex.x, vertex.y, vertex.z).uv(u, v)
+            .color(rCol, gCol, bCol, alpha).uv2(lightmapCoord)
+            .endVertex()
+
+        renderVertex(coords[0], sprite.u1, sprite.v1)
+        renderVertex(coords[1], sprite.u1, sprite.v0)
+        renderVertex(coords[2], sprite.u0, sprite.v0)
+        renderVertex(coords[3], sprite.u0, sprite.v1)
+    }
+
+    fun setColor(color: Int) {
+        bCol = (color and 255) / 256.0f
+        gCol = ((color shr 8) and 255) / 256.0f
+        rCol = ((color shr 16) and 255) / 256.0f
+    }
+}
+

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

@@ -0,0 +1,112 @@
+package mods.betterfoliage.render.particle
+
+import mods.betterfoliage.config.Config
+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.minecraft.client.particle.IParticleRenderType
+import net.minecraft.client.world.ClientWorld
+import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.MathHelper
+import net.minecraft.world.World
+import net.minecraftforge.common.MinecraftForge
+import net.minecraftforge.event.TickEvent
+import net.minecraftforge.eventbus.api.SubscribeEvent
+import net.minecraftforge.fml.LogicalSide
+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 {
+        roll = random.randomF(max = PI2)
+        oRoll = roll - rotationSpeed
+
+        lifetime = MathHelper.floor(randomD(0.6, 1.0) * Config.fallingLeaves.lifetime * 20.0)
+        yd = -Config.fallingLeaves.speed
+
+        quadSize = Config.fallingLeaves.size.toFloat() * 0.1f
+        setColor(leaf.overrideColor?.asInt ?: blockColor)
+        sprite = LeafParticleRegistry[leaf.leafType][randomI(max = 1024)]
+    }
+
+    override val isValid: Boolean get() = (sprite != null)
+
+
+    override fun update() {
+        if (random.nextFloat() > 0.95f) rotationSpeed *= -1.0f
+        if (age > lifetime - 20) alpha = 0.05f * (lifetime - age)
+
+        if (onGround || wasCollided) {
+            velocity.setTo(0.0, 0.0, 0.0)
+            if (!wasCollided) {
+                age = age.coerceAtLeast(lifetime - 20)
+                wasCollided = true
+            }
+        } else {
+            val cosRotation = cos(roll).toDouble(); val sinRotation = sin(roll).toDouble()
+            velocity.setTo(cosRotation, 0.0, sinRotation).mul(Config.fallingLeaves.perturb)
+                .add(LeafWindTracker.current).add(0.0, -1.0, 0.0).mul(Config.fallingLeaves.speed)
+            oRoll = roll
+            roll += rotationSpeed
+        }
+    }
+
+    override fun getRenderType(): IParticleRenderType = IParticleRenderType.PARTICLE_SHEET_TRANSLUCENT
+}
+
+object LeafWindTracker {
+    var random = Random()
+    val target = Double3.zero
+    val current = Double3.zero
+    var nextChange: Long = 0
+
+    init {
+        MinecraftForge.EVENT_BUS.register(this)
+    }
+
+    fun changeWind(world: World) {
+        nextChange = world.gameTime + 120 + random.nextInt(80)
+        val direction = PI2 * random.nextDouble()
+        val speed = abs(random.nextGaussian()) * Config.fallingLeaves.windStrength +
+                (if (!world.isRaining) 0.0 else abs(random.nextGaussian()) * Config.fallingLeaves.stormStrength)
+        target.setTo(cos(direction) * speed, 0.0, sin(direction) * speed)
+    }
+
+    @SubscribeEvent
+    fun handleWorldTick(event: TickEvent.WorldTickEvent) {
+        if (event.phase == TickEvent.Phase.START && event.side == LogicalSide.CLIENT) event.world.let { world ->
+            // change target wind speed
+            if (world.dayTime >= nextChange) changeWind(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)
+            )
+        }
+    }
+
+//    @SubscribeEvent
+//    fun handleWorldLoad(event: WorldEvent.Load) { if (event.world.isClientSide) changeWind(event.world) }
+}

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

@@ -0,0 +1,104 @@
+package mods.betterfoliage.render.particle
+
+import mods.betterfoliage.BetterFoliageMod
+import mods.betterfoliage.model.Color
+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.minecraft.client.renderer.texture.MissingTextureSprite
+import net.minecraft.util.ResourceLocation
+import net.minecraftforge.client.event.TextureStitchEvent
+import net.minecraftforge.eventbus.api.SubscribeEvent
+import org.apache.logging.log4j.Level.INFO
+
+interface LeafBlockModel {
+    val key: LeafParticleKey
+}
+
+interface LeafParticleKey {
+    val leafType: String
+    val overrideColor: Color?
+}
+
+object LeafParticleRegistry : HasLogger(), VeryEarlyReloadListener {
+    val typeMappings = TextureMatcher()
+    val allTypes get() = (typeMappings.mappings.map { it.type } + "default").distinct()
+
+    val particles = hashMapOf<String, SpriteSet>()
+
+    operator fun get(type: String) = particles[type] ?: particles["default"]!!
+
+    override fun onReloadStarted() {
+        typeMappings.loadMappings(ResourceLocation(BetterFoliageMod.MOD_ID, "leaf_texture_mappings.cfg"))
+        detailLogger.log(INFO, "Loaded leaf particle mappings, types = [${allTypes.joinToString(", ")}]")
+    }
+
+    @SubscribeEvent
+    fun handlePreStitch(event: TextureStitchEvent.Pre) {
+        if (event.map.location() == Atlas.PARTICLES.resourceId) {
+            allTypes.forEach { leafType ->
+                val locations = (0 until 16).map { idx ->
+                    ResourceLocation(BetterFoliageMod.MOD_ID, "particle/falling_leaf_${leafType}_$idx")
+                }.filter { resourceManager.hasResource(Atlas.PARTICLES.file(it)) }
+
+                detailLogger.log(INFO, "Registering sprites for leaf particle type [$leafType], ${locations.size} sprites found")
+                locations.forEach { event.addSprite(it) }
+            }
+        }
+    }
+
+    @SubscribeEvent
+    fun handlePostStitch(event: TextureStitchEvent.Post) {
+        if (event.map.location() == Atlas.PARTICLES.resourceId) {
+            (typeMappings.mappings.map { it.type } + "default").distinct().forEach { leafType ->
+                val sprites = (0 until 16).map { idx ->
+                    ResourceLocation(BetterFoliageMod.MOD_ID, "particle/falling_leaf_${leafType}_$idx")
+                }
+                    .map { event.map.getSprite(it) }
+                    .filter { it !is MissingTextureSprite }
+                detailLogger.log(INFO, "Leaf particle type [$leafType], ${sprites.size} sprites in atlas")
+                particles[leafType] = FixedSpriteSet(sprites)
+            }
+        }
+    }
+}
+
+class TextureMatcher {
+
+    data class Mapping(val domain: String?, val path: String, val type: String) {
+        fun matches(iconLocation: ResourceLocation): Boolean {
+            return (domain == null || domain == iconLocation.namespace) &&
+                    iconLocation.path.stripStart("blocks/").contains(path, ignoreCase = true)
+        }
+    }
+
+    val mappings: MutableList<Mapping> = mutableListOf()
+
+    fun getType(resource: ResourceLocation) = mappings.filter { it.matches(resource) }.map { it.type }.firstOrNull()
+
+    fun loadMappings(mappingLocation: ResourceLocation) {
+        mappings.clear()
+        resourceManager[mappingLocation]?.getLines()?.let { lines ->
+            lines.filter { !it.startsWith("//") }.filter { !it.isEmpty() }.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,90 @@
+package mods.betterfoliage.render.particle
+
+import com.mojang.blaze3d.vertex.IVertexBuilder
+import mods.betterfoliage.BetterFoliageMod
+import mods.betterfoliage.config.Config
+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.IParticleRenderType
+import net.minecraft.client.renderer.ActiveRenderInfo
+import net.minecraft.client.world.ClientWorld
+import net.minecraft.util.ResourceLocation
+import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.MathHelper
+import net.minecraft.world.World
+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<Double3>()
+    val initialPhase = randomD(max = PI2)
+
+    init {
+        yd = 0.1
+        gravity = 0.0f
+        sprite = headIcons[randomI(max = 1024)]
+        lifetime = MathHelper.floor((0.6 + 0.4 * randomD()) * 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(Config.risingSoul.perturb.let { Double3(cosPhase * it, 0.1, sinPhase * it) })
+
+        particleTrail.addFirst(currentPos.copy())
+        while (particleTrail.size > Config.risingSoul.trailLength) particleTrail.removeLast()
+
+        if (!Config.enabled) remove()
+    }
+
+    override fun render(vertexBuilder: IVertexBuilder, camera: ActiveRenderInfo, tickDelta: Float) {
+        var alpha = Config.risingSoul.opacity.toFloat()
+        if (age > lifetime - 40) alpha *= (lifetime - age) / 40.0f
+
+        renderParticleQuad(
+            vertexBuilder, camera, tickDelta,
+            size = Config.risingSoul.headSize * 0.25,
+            alpha = alpha
+        )
+
+        var scale = Config.risingSoul.trailSize * 0.25
+        particleTrail.forEachPairIndexed { idx, current, previous ->
+            scale *= Config.risingSoul.sizeDecay
+            alpha *= Config.risingSoul.opacityDecay.toFloat()
+            if (idx % Config.risingSoul.trailDensity == 0)
+                renderParticleQuad(
+                    vertexBuilder, camera, tickDelta,
+                    currentPos = current,
+                    prevPos = previous,
+                    size = scale,
+                    alpha = alpha,
+                    sprite = trackIcon
+                )
+        }
+    }
+
+    override fun getRenderType(): IParticleRenderType = IParticleRenderType.PARTICLE_SHEET_TRANSLUCENT
+
+    companion object {
+        val headIcons by SpriteSetDelegate(Atlas.PARTICLES) { idx ->
+            ResourceLocation(BetterFoliageMod.MOD_ID, "particle/rising_soul_$idx")
+        }
+        val trackIcon by SpriteDelegate(Atlas.PARTICLES) { ResourceLocation(BetterFoliageMod.MOD_ID, "particle/soul_track") }
+    }
+}

src/main/kotlin/mods/betterfoliage/render/pipeline/RenderCtxBase.kt

@@ -0,0 +1,66 @@
+package mods.betterfoliage.render.pipeline
+
+import com.mojang.blaze3d.matrix.MatrixStack
+import mods.betterfoliage.chunk.BasicBlockCtx
+import mods.betterfoliage.chunk.BlockCtx
+import mods.betterfoliage.model.HalfBakedQuad
+import mods.betterfoliage.model.SpecialRenderModel
+import mods.betterfoliage.render.lighting.VanillaFullBlockLighting
+import mods.betterfoliage.render.lighting.VanillaQuadLighting
+import mods.betterfoliage.render.lighting.VanillaVertexLighter
+import mods.betterfoliage.util.Int3
+import mods.betterfoliage.util.plus
+import net.minecraft.block.Block
+import net.minecraft.client.Minecraft
+import net.minecraft.util.Direction
+import net.minecraft.util.math.BlockPos
+import net.minecraft.world.IBlockDisplayReader
+import net.minecraftforge.client.model.data.IModelData
+import java.util.Random
+
+/**
+ * Rendering context for drawing [SpecialRenderModel] models.
+ *
+ * This class (and others in its constellation) basically form a replacement, highly customizable,
+ * push-based partial rendering pipeline for [SpecialRenderModel] instances.
+ */
+abstract class RenderCtxBase(
+    world: IBlockDisplayReader,
+    pos: BlockPos,
+    val matrixStack: MatrixStack,
+    var checkSides: Boolean,
+    val random: Random,
+    val modelData: IModelData
+) : BlockCtx by BasicBlockCtx(world, pos) {
+
+    abstract fun renderQuad(quad: HalfBakedQuad)
+
+    var hasRendered = false
+    val blockModelShapes = Minecraft.getInstance().blockRenderer.blockModelShaper
+    var vertexLighter: VanillaVertexLighter = VanillaFullBlockLighting
+    protected val lightingData = RenderCtxBase.lightingData.get().apply {
+        calc.reset(this@RenderCtxBase)
+        blockColors = Minecraft.getInstance().blockColors
+    }
+
+    inline fun Direction?.shouldRender() = this == null || !checkSides || Block.shouldRenderFace(state, world, pos, this)
+
+    fun renderQuads(quads: Iterable<HalfBakedQuad>) {
+        quads.forEach { quad ->
+            if (quad.raw.face.shouldRender()) {
+                renderQuad(quad)
+                hasRendered = true
+            }
+        }
+    }
+
+    fun renderMasquerade(offset: Int3, func: () -> Unit) {
+        lightingData.calc.blockPos += offset
+        func()
+        lightingData.calc.blockPos = pos
+    }
+
+    companion object {
+        val lightingData = ThreadLocal.withInitial { VanillaQuadLighting() }
+    }
+}

src/main/kotlin/mods/betterfoliage/render/pipeline/RenderCtxForge.kt

@@ -0,0 +1,74 @@
+package mods.betterfoliage.render.pipeline
+
+import com.mojang.blaze3d.matrix.MatrixStack
+import mods.betterfoliage.model.HalfBakedQuad
+import mods.betterfoliage.model.SpecialRenderModel
+import mods.betterfoliage.render.lighting.ForgeVertexLighter
+import mods.betterfoliage.render.lighting.ForgeVertexLighterAccess
+import net.minecraft.block.BlockState
+import net.minecraft.client.renderer.LightTexture
+import net.minecraft.util.math.BlockPos
+import net.minecraft.world.IBlockDisplayReader
+import net.minecraftforge.client.model.data.IModelData
+import net.minecraftforge.client.model.pipeline.VertexLighterFlat
+import java.util.Random
+
+class RenderCtxForge(
+    world: IBlockDisplayReader,
+    pos: BlockPos,
+    val lighter: VertexLighterFlat,
+    matrixStack: MatrixStack,
+    checkSides: Boolean,
+    random: Random,
+    modelData: IModelData
+): RenderCtxBase(world, pos, matrixStack, checkSides, random, modelData), ForgeVertexLighter {
+
+    override fun renderQuad(quad: HalfBakedQuad) {
+        // set Forge lighter AO calculator to us
+        vertexLighter.updateLightmapAndColor(quad, lightingData)
+        quad.baked.pipe(lighter)
+    }
+
+    // somewhat ugly hack to pipe lighting values into the Forge pipeline
+    var vIdx = 0
+    override fun updateVertexLightmap(normal: FloatArray, lightmap: FloatArray, x: Float, y: Float, z: Float) {
+        lightingData.packedLight[vIdx].let { packedLight ->
+            lightmap[0] = LightTexture.block(packedLight) / 0xF.toFloat()
+            lightmap[1] = LightTexture.sky(packedLight) / 0xF.toFloat()
+        }
+    }
+
+    override fun updateVertexColor(normal: FloatArray, color: FloatArray, x: Float, y: Float, z: Float, tint: Float, multiplier: Int) {
+        color[0] = lightingData.tint[0] * lightingData.colorMultiplier[vIdx]
+        color[1] = lightingData.tint[1] * lightingData.colorMultiplier[vIdx]
+        color[2] = lightingData.tint[2] * lightingData.colorMultiplier[vIdx]
+        vIdx++
+    }
+
+    companion object {
+        @JvmStatic
+        fun render(
+            lighter: VertexLighterFlat,
+            world: IBlockDisplayReader,
+            model: SpecialRenderModel,
+            state: BlockState,
+            pos: BlockPos,
+            matrixStack: MatrixStack,
+            checkSides: Boolean,
+            rand: Random, seed: Long,
+            modelData: IModelData
+        ): Boolean {
+            lighter.setWorld(world)
+            lighter.setState(state)
+            lighter.setBlockPos(pos)
+            rand.setSeed(seed)
+            lighter.updateBlockInfo()
+            return RenderCtxForge(world, pos, lighter, matrixStack, checkSides, rand, modelData).let {
+                (lighter as ForgeVertexLighterAccess).vertexLighter = it
+                model.render(it, false)
+                lighter.resetBlockInfo()
+                it.hasRendered
+            }
+        }
+    }
+}