fix texture atlas stitch event handlers firing in wrong order

bump version

README.md

@@ -4,6 +4,6 @@ Minecraft mod that alters the appearance of leaves & grass
 
 More info: http://www.minecraftforum.net/topic/2776217-better-foliage/
 
-Download
+Latest Download
 ========
-[BetterFoliage 0.9.6-beta] (http://goo.gl/8qVKMl) (MC 1.7.2 & 1.7.10)
+[BetterFoliage 0.9.10-beta] (http://goo.gl/5tE6QX) (MC 1.7.2 & 1.7.10)

build.gradle

@@ -22,7 +22,7 @@ minecraft {
 
 jar.baseName = 'BetterFoliage'
 group = 'com.github.octarine-noise'
-version='0.9.7b'
+version='0.9.10b'
 
 processResources {
 	inputs.property "version", project.version

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

@@ -1,25 +1,29 @@
 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.EntityFXFallingLeaves;
 import mods.betterfoliage.client.render.impl.RenderBlockBetterAlgae;
 import mods.betterfoliage.client.render.impl.RenderBlockBetterCactus;
+import mods.betterfoliage.client.render.impl.RenderBlockBetterCoral;
 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.LeafTextureGenerator;
+import mods.betterfoliage.client.resource.LeafGenerator;
+import mods.betterfoliage.client.resource.LeafParticleTextures;
+import mods.betterfoliage.client.resource.LeafTextureEnumerator;
+import mods.betterfoliage.client.resource.ReedGenerator;
+import mods.betterfoliage.client.resource.ShortGrassGenerator;
 import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.resources.IResource;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
 
 import com.google.common.collect.Maps;
@@ -29,11 +33,17 @@ import cpw.mods.fml.common.FMLCommonHandler;
 
 public class BetterFoliageClient {
 
+	public static ResourceLocation missingTexture = new ResourceLocation("betterfoliage", "textures/blocks/missing_leaf.png");
+	
 	public static Map<Integer, IRenderBlockDecorator> decorators = Maps.newHashMap();
-	public static LeafTextureGenerator leafGenerator;
+	public static LeafGenerator leafGenerator = new LeafGenerator();
+	public static LeafParticleTextures leafParticles = new LeafParticleTextures(0);
+	public static WindTracker wind = new WindTracker();
 	
 	public static BlockMatcher leaves = new BlockMatcher();
 	public static BlockMatcher crops = new BlockMatcher();
+	public static BlockMatcher dirt = new BlockMatcher();
+	public static BlockMatcher grass = new BlockMatcher();
 	
 	public static void preInit() {
 		FMLCommonHandler.instance().bus().register(new KeyHandler());
@@ -45,6 +55,10 @@ public class BetterFoliageClient {
 		registerRenderer(new RenderBlockBetterLilypad());
 		registerRenderer(new RenderBlockBetterReed());
 		registerRenderer(new RenderBlockBetterAlgae());
+		registerRenderer(new RenderBlockBetterCoral());
+
+		MinecraftForge.EVENT_BUS.register(wind);
+		FMLCommonHandler.instance().bus().register(wind);
 		
 		leaves.load(new File(BetterFoliage.configDir, "classesLeaves.cfg"), new ResourceLocation("betterfoliage:classesLeavesDefault.cfg"));
 		MinecraftForge.EVENT_BUS.register(leaves);
@@ -52,24 +66,21 @@ public class BetterFoliageClient {
 		crops.load(new File(BetterFoliage.configDir, "classesCrops.cfg"), new ResourceLocation("betterfoliage:classesCropsDefault.cfg"));
 		MinecraftForge.EVENT_BUS.register(crops);
 		
-		BetterFoliage.log.info("Registering leaf texture generator");
-		leafGenerator = new LeafTextureGenerator();
-		MinecraftForge.EVENT_BUS.register(leafGenerator);
+		dirt.load(new File(BetterFoliage.configDir, "classesDirt.cfg"), new ResourceLocation("betterfoliage:classesDirtDefault.cfg"));
+		MinecraftForge.EVENT_BUS.register(dirt);
 		
-		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());
+		grass.load(new File(BetterFoliage.configDir, "classesGrass.cfg"), new ResourceLocation("betterfoliage:classesGrassDefault.cfg"));
+		MinecraftForge.EVENT_BUS.register(grass);
+		
+		BetterFoliage.log.info("Registering texture generators");
+		MinecraftForge.EVENT_BUS.register(leafGenerator);
+		MinecraftForge.EVENT_BUS.register(leafParticles);
+		MinecraftForge.EVENT_BUS.register(new LeafTextureEnumerator());
+		
+		MinecraftForge.EVENT_BUS.register(new ReedGenerator("bf_reed_bottom", missingTexture, true));
+		MinecraftForge.EVENT_BUS.register(new ReedGenerator("bf_reed_top", missingTexture, false));
+		MinecraftForge.EVENT_BUS.register(new ShortGrassGenerator("bf_shortgrass", missingTexture, false));
+		MinecraftForge.EVENT_BUS.register(new ShortGrassGenerator("bf_shortgrass_snow", missingTexture, true));
 		
 		ShadersModIntegration.init();
 	}
@@ -91,6 +102,13 @@ public class BetterFoliageClient {
 		return original;
 	}
 	
+	public static void onRandomDisplayTick(Block block, World world, int x, int y, int z) {
+		if (!BetterFoliage.config.fallingLeavesEnabled) return;
+		if (!leaves.matchesID(block) || !world.isAirBlock(x, y - 1, z)) return;
+		if (Math.random() > BetterFoliage.config.fallingLeavesChance.value) return;
+		Minecraft.getMinecraft().effectRenderer.addEffect(new EntityFXFallingLeaves(world, x, y, z));
+	}
+	
 	public static void registerRenderer(IRenderBlockDecorator decorator) {
 		int renderId = RenderingRegistry.getNextAvailableRenderId();
 		decorators.put(renderId, decorator);

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

@@ -2,9 +2,17 @@ package mods.betterfoliage.client;
 
 import java.lang.reflect.Field;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
+import net.minecraft.util.ResourceLocation;
 
+/** Call hooks and helper methods for dealing with Shaders Mod.
+ * @author octarine-noise
+ */
+@SideOnly(Side.CLIENT)
 public class ShadersModIntegration {
 
 	private static boolean hasShadersMod = false;
@@ -13,6 +21,7 @@ public class ShadersModIntegration {
 	private static Field shadersEntityData;
 	private static Field shadersEntityDataIndex;
 	
+	/** Hide constructor */
 	private ShadersModIntegration() {}
 	
 	public static void init() {
@@ -28,16 +37,24 @@ public class ShadersModIntegration {
 		}
 	}
 	
+	/** Signal start of grass-type quads
+	 */
 	public static void startGrassQuads() {
 		if (!hasShadersMod) return;
 		setShadersEntityData(tallGrassEntityData);
 	}
 
+	/** Signal start of leaf-type quads
+	 */
 	public static void startLeavesQuads() {
 		if (!hasShadersMod) return;
 		setShadersEntityData(leavesEntityData);
 	}
 	
+	/** Change the entity data (containing block ID) for the currently rendered block.
+	 *  Quads drawn afterwards will have the altered data.
+	 * @param data
+	 */
 	private static void setShadersEntityData(int data) {
 		try {
 			int[] entityData = (int[]) shadersEntityData.get(null);
@@ -47,9 +64,22 @@ public class ShadersModIntegration {
 		}
 	}
 	
+	/** Call hook from transformed ShadersMod class
+	 * @param original entity data of currently rendered block
+	 * @param block the block
+	 * @return entity data to use
+	 */
 	public static int getBlockIdOverride(int original, Block block) {
 		if (BetterFoliageClient.leaves.matchesID(original & 0xFFFF)) return leavesEntityData;
 		if (BetterFoliageClient.crops.matchesID(original & 0xFFFF)) return tallGrassEntityData;
 		return original;
 	}
+	
+	/**
+	 * @param resource texture resource
+	 * @return true if texture is a normal or specular map
+	 */
+	public static boolean isSpecialTexture(ResourceLocation resource) {
+		return resource.getResourcePath().toLowerCase().endsWith("_n.png") || resource.getResourcePath().toLowerCase().endsWith("_s.png");
+	}
 }

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

@@ -0,0 +1,64 @@
+package mods.betterfoliage.client;
+
+import java.util.Random;
+
+import mods.betterfoliage.BetterFoliage;
+import net.minecraft.client.Minecraft;
+import net.minecraft.world.World;
+import net.minecraftforge.event.world.WorldEvent;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.common.gameevent.TickEvent;
+import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent;
+
+public class WindTracker {
+
+	public Random random = new Random();
+	
+	public double targetX;
+	public double targetZ;
+
+	public double currentX;
+	public double currentZ;
+	
+	public long nextChange = 0;
+	
+	public void changeWind(World world) {
+		long changeTime = 120;
+		nextChange = world.getWorldInfo().getWorldTime() + changeTime;
+		
+		double direction = 2.0 * Math.PI * random.nextDouble();
+		double speed = Math.abs(random.nextGaussian()) * BetterFoliage.config.fallingLeavesWindStrength.value;
+		if (world.isRaining()) speed += Math.abs(random.nextGaussian()) * BetterFoliage.config.fallingLeavesStormStrength.value;
+		
+		targetX = Math.cos(direction) * speed;
+		targetZ = Math.sin(direction) * speed;
+	}
+	
+	@SubscribeEvent
+	public void handleWorldTick(ClientTickEvent event) {
+		if (event.phase != TickEvent.Phase.START) return;
+		World world = Minecraft.getMinecraft().theWorld;
+		if (world == null) return;
+		
+		// change target wind speed
+		if (world.getWorldInfo().getWorldTime() >= nextChange) changeWind(world);
+		
+		// change current wind speed
+		double changeRate = world.isRaining() ? 0.015 : 0.005;
+		
+		double deltaX = targetX - currentX;
+		if (deltaX < -changeRate) deltaX = -changeRate;
+		if (deltaX > changeRate) deltaX = changeRate;
+		double deltaZ = targetZ - currentZ;
+		if (deltaZ < -changeRate) deltaZ = -changeRate;
+		if (deltaZ > changeRate) deltaZ = changeRate;
+		
+		currentX += deltaX;
+		currentZ += deltaZ;
+	}
+	
+	@SubscribeEvent
+	public void handleWorldLoad(WorldEvent.Load event) {
+		if (event.world.isRemote) changeWind(event.world);
+	}
+}

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

@@ -7,7 +7,10 @@ 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 ConfigGuiAlgae extends ConfigGuiScreenBase {
 
 	public ConfigGuiAlgae(GuiScreen parent) {

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

@@ -0,0 +1,34 @@
+package mods.betterfoliage.client.gui;
+
+import cpw.mods.fml.client.FMLClientHandler;
+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;
+
+public class ConfigGuiCoral extends ConfigGuiScreenBase {
+
+	public ConfigGuiCoral(GuiScreen parent) {
+		super(parent);
+		int id = 10;
+		widgets.add(new OptionDoubleWidget(BetterFoliage.config.coralCrustSize, -100, -100, 200, 50, id++, id++, "message.betterfoliage.crustSize", "%.2f"));
+		widgets.add(new OptionDoubleWidget(BetterFoliage.config.coralVOffset, -100, -70, 200, 50, id++, id++, "message.betterfoliage.vOffset", "%.3f"));
+		widgets.add(new OptionDoubleWidget(BetterFoliage.config.coralSize, -100, -40, 200, 50, id++, id++, "message.betterfoliage.size", "%.2f"));
+		widgets.add(new OptionDoubleWidget(BetterFoliage.config.coralHOffset, -100, -10, 200, 50, id++, id++, "message.betterfoliage.hOffset", "%.3f"));
+		widgets.add(new OptionIntegerWidget(BetterFoliage.config.coralPopulation, -100, 20, 200, 50, id++, id++, "message.betterfoliage.coralPopulation"));
+		widgets.add(new OptionIntegerWidget(BetterFoliage.config.coralChance, -100, 50, 200, 50, id++, id++, "message.betterfoliage.coralChance"));
+	}
+	
+	@SuppressWarnings("unchecked")
+	@Override
+	public void addButtons(int x, int y) {
+		buttonList.add(new GuiButton(0, x - 50, y + 80, 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/ConfigGuiFallingLeaves.java

@@ -0,0 +1,34 @@
+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 ConfigGuiFallingLeaves extends ConfigGuiScreenBase {
+
+	public ConfigGuiFallingLeaves(GuiScreen parent) {
+		super(parent);
+		int id = 10;
+		widgets.add(new OptionDoubleWidget(BetterFoliage.config.fallingLeavesSize, -100, -100, 200, 50, id++, id++, "message.betterfoliage.size", "%.2f"));
+		widgets.add(new OptionDoubleWidget(BetterFoliage.config.fallingLeavesSpeed, -100, -70, 200, 50, id++, id++, "message.betterfoliage.speed", "%.2f"));
+		widgets.add(new OptionDoubleWidget(BetterFoliage.config.fallingLeavesWindStrength, -100, -40, 200, 50, id++, id++, "message.betterfoliage.windStrength", "%.1f"));
+		widgets.add(new OptionDoubleWidget(BetterFoliage.config.fallingLeavesStormStrength, -100, -10, 200, 50, id++, id++, "message.betterfoliage.stormStrength", "%.1f"));
+		widgets.add(new OptionDoubleWidget(BetterFoliage.config.fallingLeavesPerturb, -100, 20, 200, 50, id++, id++, "message.betterfoliage.fallingLeafPerturbation", "%.2f"));
+		widgets.add(new OptionDoubleWidget(BetterFoliage.config.fallingLeavesChance, -100, 50, 200, 50, id++, id++, "message.betterfoliage.fallingLeafChance", "%.3f"));
+		widgets.add(new OptionDoubleWidget(BetterFoliage.config.fallingLeavesLifetime, -100, 80, 200, 50, id++, id++, "message.betterfoliage.fallingLeafLifetime", "%.2f"));
+	}
+	
+	@SuppressWarnings("unchecked")
+	@Override
+	public void addButtons(int x, int y) {
+		buttonList.add(new GuiButton(0, x - 50, y + 110, 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/ConfigGuiGrass.java

@@ -6,27 +6,38 @@ 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 ConfigGuiGrass extends ConfigGuiScreenBase {
 
+	public enum Button {CLOSE, GRASS_USE_GENERATED}
+	
 	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"));
+		widgets.add(new OptionDoubleWidget(BetterFoliage.config.grassHOffset, -100, -10, 200, 50, id++, id++, "message.betterfoliage.hOffset", "%.3f"));
+		widgets.add(new OptionDoubleWidget(BetterFoliage.config.grassHeightMin, -100, 20, 200, 50, id++, id++, "message.betterfoliage.minHeight", "%.2f"));
+		widgets.add(new OptionDoubleWidget(BetterFoliage.config.grassHeightMax, -100, 50, 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")));
+		buttonList.add(new GuiButton(Button.CLOSE.ordinal(), x - 50, y + 80, 100, 20, I18n.format("message.betterfoliage.back")));
+		buttonList.add(new GuiButton(Button.GRASS_USE_GENERATED.ordinal(), x - 100, y - 40, 200, 20, ""));
 	}
 
+	protected void updateButtons() {
+		setButtonOptionBoolean(Button.GRASS_USE_GENERATED.ordinal(), "message.betterfoliage.genShortgrass", BetterFoliage.config.grassUseGenerated);
+	}
+	
 	@Override
 	protected void onButtonPress(int id) {
-		if (id == 0) FMLClientHandler.instance().showGuiScreen(parent);
+		if (id == Button.CLOSE.ordinal()) FMLClientHandler.instance().showGuiScreen(parent);
+		if (id == Button.GRASS_USE_GENERATED.ordinal()) BetterFoliage.config.grassUseGenerated = !BetterFoliage.config.grassUseGenerated;
 		
 		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

@@ -6,7 +6,10 @@ 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 ConfigGuiLeaves extends ConfigGuiScreenBase {
 
 	public enum Button {CLOSE, LEAVES_OFFSET_MODE}

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

@@ -7,7 +7,10 @@ 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 ConfigGuiLilypad extends ConfigGuiScreenBase {
 
 	public ConfigGuiLilypad(GuiScreen parent) {

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

@@ -14,11 +14,13 @@ public class ConfigGuiMain extends ConfigGuiScreenBase {
 
 	public enum Button {CLOSE, 
 						TOGGLE_LEAVES, CONFIG_LEAVES,
+						TOGGLE_FALLING_LEAVES, CONFIG_FALLING_LEAVES,
 						TOGGLE_GRASS, CONFIG_GRASS,
 						TOGGLE_CACTUS, CONFIG_CACTUS,
 						TOGGLE_LILYPAD, CONFIG_LILYPAD,
 						TOGGLE_REED, CONFIG_REED,
-						TOGGLE_ALGAE, CONFIG_ALGAE}
+						TOGGLE_ALGAE, CONFIG_ALGAE,
+						TOGGLE_CORAL, CONFIG_CORAL}
 	
 	public ConfigGuiMain(GuiScreen parent) {
 		super(parent);
@@ -28,10 +30,13 @@ public class ConfigGuiMain extends ConfigGuiScreenBase {
 	@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.CLOSE.ordinal(), x - 50, y + 110, 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_LEAVES.ordinal(), x - 100, y - 130, 150, 20, ""));
+		buttonList.add(new GuiButton(Button.CONFIG_LEAVES.ordinal(), x + 60, y - 130, 40, 20, I18n.format("message.betterfoliage.config")));
+		
+		buttonList.add(new GuiButton(Button.TOGGLE_FALLING_LEAVES.ordinal(), x - 100, y - 100, 150, 20, ""));
+		buttonList.add(new GuiButton(Button.CONFIG_FALLING_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")));
@@ -47,15 +52,20 @@ public class ConfigGuiMain extends ConfigGuiScreenBase {
 		
 		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")));
+		
+		buttonList.add(new GuiButton(Button.TOGGLE_CORAL.ordinal(), x - 100, y + 80, 150, 20, ""));
+		buttonList.add(new GuiButton(Button.CONFIG_CORAL.ordinal(), x + 60, y + 80, 40, 20, I18n.format("message.betterfoliage.config")));
 	}
 
 	protected void updateButtons() {
 		setButtonOptionBoolean(Button.TOGGLE_LEAVES.ordinal(), "message.betterfoliage.betterLeaves", BetterFoliage.config.leavesEnabled);
+		setButtonOptionBoolean(Button.TOGGLE_FALLING_LEAVES.ordinal(), "message.betterfoliage.fallingLeaves", BetterFoliage.config.fallingLeavesEnabled);
 		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);
+		setButtonOptionBoolean(Button.TOGGLE_CORAL.ordinal(), "message.betterfoliage.betterCoral", BetterFoliage.config.coralEnabled);
 		((GuiButton) buttonList.get(Button.CONFIG_CACTUS.ordinal())).enabled = false;
 	}
 	
@@ -67,17 +77,21 @@ public class ConfigGuiMain extends ConfigGuiScreenBase {
 			FMLClientHandler.instance().showGuiScreen(parent);
 		}
 		if (id == Button.TOGGLE_LEAVES.ordinal()) BetterFoliage.config.leavesEnabled = !BetterFoliage.config.leavesEnabled;
+		if (id == Button.TOGGLE_FALLING_LEAVES.ordinal()) BetterFoliage.config.fallingLeavesEnabled = !BetterFoliage.config.fallingLeavesEnabled;
 		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.TOGGLE_CORAL.ordinal()) BetterFoliage.config.coralEnabled = !BetterFoliage.config.coralEnabled;
 		
 		if (id== Button.CONFIG_LEAVES.ordinal()) FMLClientHandler.instance().showGuiScreen(new ConfigGuiLeaves(this));
+		if (id== Button.CONFIG_FALLING_LEAVES.ordinal()) FMLClientHandler.instance().showGuiScreen(new ConfigGuiFallingLeaves(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));
+		if (id== Button.CONFIG_CORAL.ordinal()) FMLClientHandler.instance().showGuiScreen(new ConfigGuiCoral(this));
 	}
 
 }

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

@@ -7,7 +7,10 @@ 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 ConfigGuiReed extends ConfigGuiScreenBase {
 
 	public ConfigGuiReed(GuiScreen parent) {

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

@@ -2,6 +2,8 @@ package mods.betterfoliage.client.gui;
 
 import java.util.List;
 
+import org.lwjgl.input.Keyboard;
+
 import mods.betterfoliage.client.gui.widget.IOptionWidget;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
@@ -10,6 +12,10 @@ import net.minecraft.util.EnumChatFormatting;
 
 import com.google.common.collect.Lists;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+@SideOnly(Side.CLIENT)
 public class ConfigGuiScreenBase extends GuiScreen {
 
 	protected GuiScreen parent;
@@ -47,7 +53,7 @@ public class ConfigGuiScreenBase extends GuiScreen {
 	@Override
 	protected void actionPerformed(GuiButton button) {
 		super.actionPerformed(button);
-		for (IOptionWidget widget : widgets) widget.onAction(button.id);
+		for (IOptionWidget widget : widgets) widget.onAction(button.id, Keyboard.isKeyDown(42));
 		onButtonPress(button.id);
 		updateButtons();
 	}

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

@@ -2,14 +2,18 @@ package mods.betterfoliage.client.gui.widget;
 
 import java.util.List;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
 
+@SideOnly(Side.CLIENT)
 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);
+	public void onAction(int buttonId, boolean shiftPressed);
 
 }

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

@@ -46,8 +46,8 @@ public class OptionDoubleWidget implements IOptionWidget {
 		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();
+	public void onAction(int buttonId, boolean shiftPressed) {
+		if (buttonId == idDecrement) option.decrement(shiftPressed ? 5 :1);
+		if (buttonId == idIncrement) option.increment(shiftPressed ? 5 :1);
 	}
 }

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

@@ -43,8 +43,8 @@ public class OptionIntegerWidget implements IOptionWidget {
 		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();
+	public void onAction(int buttonId, boolean shiftPressed) {
+		if (buttonId == idDecrement) option.decrement(shiftPressed ? 5 :1);
+		if (buttonId == idIncrement) option.increment(shiftPressed ? 5 :1);
 	}
 }

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

@@ -6,10 +6,25 @@ import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.world.IBlockAccess;
 
+/** Block rendering handler that is only used under certain conditions
+ * @author octarine-noise
+ */
 @SideOnly(Side.CLIENT)
 public interface IRenderBlockDecorator extends ISimpleBlockRenderingHandler {
 
+	/** Initialize necessary helper values
+	 */
 	public void init();
+	
+	/**
+	 * @param blockAccess the world
+	 * @param x
+	 * @param y
+	 * @param z
+	 * @param block
+	 * @param original renderType of the block
+	 * @return true if this renderer should handle this block
+	 */
 	public boolean isBlockAccepted(IBlockAccess blockAccess, int x, int y, int z, Block block, int original);
 	
 }

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

@@ -7,7 +7,7 @@ import net.minecraft.util.ResourceLocation;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-/** Loads an indexed set of textures
+/** Holds an indexed set of textures
  * @author octarine-noise
  */
 @SideOnly(Side.CLIENT)

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

@@ -37,6 +37,9 @@ public class RenderBlockAOBase extends RenderBlocks {
 		public float red;
 		public float green;
 		public float blue;
+		public void setGray(float value) {
+			red = value; green = value; blue = value;
+		}
 	}
 	
 	protected double[] uValues = new double[] {0.0, 16.0, 16.0, 0.0};

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

@@ -0,0 +1,132 @@
+package mods.betterfoliage.client.render.impl;
+
+import java.awt.Color;
+
+import mods.betterfoliage.BetterFoliage;
+import mods.betterfoliage.client.BetterFoliageClient;
+import mods.betterfoliage.common.util.Double3;
+import net.minecraft.block.Block;
+import net.minecraft.client.particle.EntityFX;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+@SideOnly(Side.CLIENT)
+public class EntityFXFallingLeaves extends EntityFX {
+
+	protected static double[] cos = new double[64];
+	protected static double[] sin = new double[64];
+	
+	static {
+		for (int idx = 0; idx < 64; idx++) {
+			cos[idx] = Math.cos(2.0 * Math.PI / 64.0 * idx);
+			sin[idx] = Math.sin(2.0 * Math.PI / 64.0 * idx);
+		}
+	}
+	
+	public static float biomeBrightnessMultiplier = 0.5f;
+	public boolean wasOnGround = false;
+	public boolean isMirrored;
+	public int particleRotation = 0;
+	public boolean rotationPositive = true;
+	
+	public EntityFXFallingLeaves(World world, int x, int y, int z) {
+		super(world, x + 0.5, y, z + 0.5);
+		particleMaxAge = MathHelper.floor_double((0.6 + 0.4 * rand.nextDouble()) * BetterFoliage.config.fallingLeavesLifetime.value * 20.0);
+		isMirrored = (rand.nextInt() & 1) == 1;
+		motionY = -BetterFoliage.config.fallingLeavesSpeed.value;
+		particleRotation = rand.nextInt(64);
+		
+		particleScale = (float) BetterFoliage.config.fallingLeavesSize.value;
+		particleIcon = BetterFoliageClient.leafParticles.icons.get(rand.nextInt(1024));
+		
+		Block block = world.getBlock(x, y, z);
+		IIcon blockIcon = block.getIcon(world, x, y, z, ForgeDirection.DOWN.ordinal());
+		calculateParticleColor(BetterFoliageClient.leafParticles.getColor(blockIcon), block.colorMultiplier(world, x, y, z));
+	}
+
+	@Override
+	public void onUpdate() {
+		super.onUpdate();
+		
+		particleScale = (float) BetterFoliage.config.fallingLeavesSize.value;
+		if (rand.nextFloat() > 0.95f) rotationPositive = !rotationPositive;
+		if (particleAge > particleMaxAge - 20) particleAlpha = 0.05f * (particleMaxAge - particleAge);
+		
+		if (onGround || wasOnGround) {
+			motionX = 0.0;
+			motionZ = 0.0;
+			motionZ = 0.0;
+			if (!wasOnGround) {
+				particleAge = Math.max(particleAge, particleMaxAge - 20);
+			}
+			wasOnGround = true;
+		} else {
+			motionX = (BetterFoliageClient.wind.currentX + cos[particleRotation] * BetterFoliage.config.fallingLeavesPerturb.value) * BetterFoliage.config.fallingLeavesSpeed.value;
+			motionZ = (BetterFoliageClient.wind.currentZ + sin[particleRotation] * BetterFoliage.config.fallingLeavesPerturb.value) * BetterFoliage.config.fallingLeavesSpeed.value;
+			motionY = -BetterFoliage.config.fallingLeavesSpeed.value;
+			particleRotation = (particleRotation + (rotationPositive ? 1 : -1)) & 63;
+		}
+	}
+
+	@Override
+    public void renderParticle(Tessellator tessellator, float partialTickTime, float rotX, float rotZ, float rotYZ, float rotXY, float rotXZ)
+    {
+        float minU = isMirrored ? particleIcon.getMinU() : particleIcon.getMaxU();
+        float maxU = isMirrored ? particleIcon.getMaxU() : particleIcon.getMinU();
+        float minV = particleIcon.getMinV();
+        float maxV = particleIcon.getMaxV();
+        float scale = 0.1F * this.particleScale;
+        
+        Double3 center = new Double3(prevPosX + (posX - prevPosX) * partialTickTime - interpPosX, 
+        							 prevPosY + (posY - prevPosY) * partialTickTime - interpPosY,
+        							 prevPosZ + (posZ - prevPosZ) * partialTickTime - interpPosZ);
+        Double3 vec1 = new Double3(rotX + rotXY, rotZ, rotYZ + rotXZ).scale(scale);
+        Double3 vec2 = new Double3(rotX - rotXY, -rotZ, rotYZ - rotXZ).scale(scale);
+        Double3 vec1Rot = vec1.scale(cos[particleRotation]).add(vec2.scale(sin[particleRotation]));
+        Double3 vec2Rot = vec1.scale(-sin[particleRotation]).add(vec2.scale(cos[particleRotation]));
+        
+        tessellator.setColorRGBA_F(this.particleRed, this.particleGreen, this.particleBlue, this.particleAlpha);
+        addVertex(tessellator, center.sub(vec1Rot), maxU, maxV);
+        addVertex(tessellator, center.sub(vec2Rot), maxU, minV);
+        addVertex(tessellator, center.add(vec1Rot), minU, minV);
+        addVertex(tessellator, center.add(vec2Rot), minU, maxV);
+    }
+    
+	protected void addVertex(Tessellator tessellator, Double3 coord, double u, double v) {
+		tessellator.addVertexWithUV(coord.x, coord.y, coord.z, u, v);
+	}
+	/** Calculates and sets the color of the particle by blending the average color of the block texture with the current biome color
+	 *  Blending is done in HSB color space, weighted by the relative saturation of the colors
+	 * @param textureAvgColor average color of the block texture
+	 * @param blockColor biome color at the spawning block
+	 */
+	public void calculateParticleColor(int textureAvgColor, int blockColor) {
+		float[] hsbTexture = Color.RGBtoHSB((textureAvgColor >> 16) & 0xFF, (textureAvgColor >> 8) & 0xFF, textureAvgColor & 0xFF, null);
+		float[] hsbBlock = Color.RGBtoHSB((blockColor >> 16) & 0xFF, (blockColor >> 8) & 0xFF, blockColor & 0xFF, null);
+		
+		float weightTex = hsbTexture[1] / (hsbTexture[1] + hsbBlock[1]);
+		float weightBlock = 1.0f - weightTex;
+		
+		// avoid circular average for hue for performance reasons
+		// one of the color components should dominate anyway
+		float h = weightTex * hsbTexture[0] + weightBlock * hsbBlock[0];
+		float s = weightTex * hsbTexture[1] + weightBlock * hsbBlock[1];
+		float b = weightTex * hsbTexture[2] + weightBlock * hsbBlock[2] * biomeBrightnessMultiplier;
+		int particleColor = Color.HSBtoRGB(h, s, b);
+		
+		particleBlue = (particleColor & 0xFF) / 256.0f;
+		particleGreen = ((particleColor >> 8) & 0xFF) / 256.0f;
+		particleRed = ((particleColor >> 16) & 0xFF) / 256.0f;
+	}
+	
+	@Override
+	public int getFXLayer() {
+		return 1;
+	}
+
+}

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

@@ -3,12 +3,12 @@ package mods.betterfoliage.client.render.impl;
 import java.util.Random;
 
 import mods.betterfoliage.BetterFoliage;
+import mods.betterfoliage.client.BetterFoliageClient;
 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;
@@ -31,7 +31,7 @@ public class RenderBlockBetterAlgae extends RenderBlockAOBase implements IRender
 	
 	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 (!(BetterFoliageClient.dirt.matchesID(block))) 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;
@@ -43,6 +43,13 @@ public class RenderBlockBetterAlgae extends RenderBlockAOBase implements IRender
 		// store world for later use
 		blockAccess = world;
 		
+		// use original renderer for block breaking overlay
+		if (renderer.hasOverrideBlockTexture()) {
+			renderer.setRenderBoundsFromBlock(block);
+			renderer.renderStandardBlock(block, x, y, z);
+			return true;
+		}
+		
 		// render dirt block
 		setPassCounters(1);
 		setRenderBoundsFromBlock(block);

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

@@ -24,7 +24,10 @@ public class RenderBlockBetterCactus extends FakeRenderBlockAOBase implements IR
 	public IIcon cactusRoundIcon;
 	public IconSet cactusSideIcons = new IconSet("bettergrassandleaves", "better_cactus_arm_%d");
 	
+	/** Possible directions for cactus side growth*/
 	public static ForgeDirection[] cactusDirections = new ForgeDirection[] { ForgeDirection.NORTH, ForgeDirection.SOUTH, ForgeDirection.EAST, ForgeDirection.WEST};
+	
+	/** Inner radius of cactus stem */
 	public static double cactusRadius = 0.4375;
 	
 	public boolean isBlockAccepted(IBlockAccess blockAccess, int x, int y, int z, Block block, int original) {
@@ -35,12 +38,17 @@ public class RenderBlockBetterCactus extends FakeRenderBlockAOBase implements IR
 		// store world for later use
 		blockAccess = world;
 		
+		// use original renderer for block breaking overlay
+		if (renderer.hasOverrideBlockTexture()) {
+			renderer.renderBlockCactus(block, x, y, z);
+			return true;
+		}
+		
 		// render cactus center
 		setPassCounters(1);
-		setRenderBoundsFromBlock(block);
+		renderStandardBlock(block, x, y, z);
 		
 		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()),

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

@@ -0,0 +1,105 @@
+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.material.Material;
+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.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;
+
+public class RenderBlockBetterCoral extends RenderBlockAOBase implements IRenderBlockDecorator {
+
+	public IconSet coralCrustIcons = new IconSet("bettergrassandleaves", "better_crust_%d");
+	public IconSet coralCrossIcons = new IconSet("bettergrassandleaves", "better_coral_%d");
+	public NoiseGeneratorSimplex noise;
+	
+	public boolean isBlockAccepted(IBlockAccess blockAccess, int x, int y, int z, Block block, int original) {
+		if (!BetterFoliage.config.coralEnabled) return false;
+		if (block != Blocks.sand) return false;
+		int terrainVariation = MathHelper.floor_double((noise.func_151605_a(x * 0.1, z * 0.1) + 1.0) * 32.0);
+		return terrainVariation < BetterFoliage.config.coralPopulation.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;
+		
+		// use original renderer for block breaking overlay
+		if (renderer.hasOverrideBlockTexture()) {
+			renderer.setRenderBoundsFromBlock(block);
+			renderer.renderStandardBlock(block, x, y, z);
+			return true;
+		}
+		
+		// render sand block
+		setPassCounters(1);
+		setRenderBoundsFromBlock(block);
+		renderStandardBlock(block, x, y, z);
+		
+		Double3 blockCenter = new Double3(x + 0.5, y + 0.5, z + 0.5);
+		double offset = pRand[getSemiRandomFromPos(x, y, z, 6)] * BetterFoliage.config.coralVOffset.value;
+		double halfSize = BetterFoliage.config.coralSize.value * 0.5;
+		double halfCrustSize = BetterFoliage.config.coralCrustSize.value * 0.5;
+		
+		Tessellator.instance.setBrightness(getBrightness(block, x, y, z));
+		for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
+			if (blockAccess.getBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ).getMaterial() != Material.water) continue;
+			if (blockAccess.isAirBlock(x + dir.offsetX, y + dir.offsetY + 1, z + dir.offsetZ)) continue;
+				
+			int variation = getSemiRandomFromPos(x, y, z, dir.ordinal());
+			if (variation < BetterFoliage.config.coralChance.value) {
+				IIcon crustIcon = coralCrustIcons.get(variation);
+				IIcon coralIcon = coralCrossIcons.get(variation);
+				if (crustIcon != null) renderCoralCrust(blockCenter, dir, offset, halfCrustSize, crustIcon, variation);
+				if (coralIcon != null) renderCrossedSideQuads(blockCenter.add(new Double3(dir).scale(0.5)), dir, 
+														      halfSize, halfSize, 
+														      pRot[variation], BetterFoliage.config.coralHOffset.value,
+														      coralIcon, 0, false);
+			}
+		}
+		
+		return true;
+	}
+	
+	protected void renderCoralCrust(Double3 blockCenter, ForgeDirection dir, double offset, double scale, IIcon icon, int uvRot) {
+		Double3 face1 = new Double3(faceDir1[dir.ordinal()]).scale(scale);
+		Double3 face2 = new Double3(faceDir2[dir.ordinal()]).scale(scale);
+		Double3 drawCenter = blockCenter.add(new Double3(dir).scale(0.5 + offset));
+		if (Minecraft.isAmbientOcclusionEnabled()) {
+			setShadingForFace(dir);
+			renderQuadWithShading(icon, drawCenter, face1, face2, uvRot, faceAOPP, faceAONP, faceAONN, faceAOPN);
+		} else {
+			renderQuad(icon, drawCenter, face1, face2, uvRot);
+		}
+	}
+	
+	@SubscribeEvent
+	public void handleTextureReload(TextureStitchEvent.Pre event) {
+		if (event.map.getTextureType() != 0) return;
+		
+		coralCrustIcons.registerIcons(event.map);
+		coralCrossIcons.registerIcons(event.map);
+		BetterFoliage.log.info(String.format("Found %d coral crust textures", coralCrustIcons.numLoaded));
+		BetterFoliage.log.info(String.format("Found %d coral textures", coralCrossIcons.numLoaded));
+	}
+	
+	@SubscribeEvent
+	public void handleWorldLoad(WorldEvent.Load event) {
+		noise = new NoiseGeneratorSimplex(new Random(event.world.getWorldInfo().getSeed() + 2));
+	}
+}

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

@@ -1,13 +1,14 @@
 package mods.betterfoliage.client.render.impl;
 
 import mods.betterfoliage.BetterFoliage;
+import mods.betterfoliage.client.BetterFoliageClient;
 import mods.betterfoliage.client.ShadersModIntegration;
 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 mods.betterfoliage.common.util.Utils;
 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;
@@ -15,6 +16,7 @@ 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.client.registry.ISimpleBlockRenderingHandler;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -23,13 +25,15 @@ import cpw.mods.fml.relauncher.SideOnly;
 public class RenderBlockBetterGrass extends RenderBlockAOBase implements IRenderBlockDecorator {
 
 	public IconSet grassIcons = new IconSet("bettergrassandleaves", "better_grass_long_%d");
+	public IconSet snowGrassIcons = new IconSet("bettergrassandleaves", "better_grass_snowed_%d");
 	public IconSet myceliumIcons = new IconSet("bettergrassandleaves", "better_mycel_%d");
-	
+	public IIcon grassGenIcon;
+	public IIcon snowGrassGenIcon;
 	
 	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;
+		if (!(BetterFoliageClient.grass.matchesID(block) || block == Blocks.mycelium)) return false;
+		if (!blockAccess.isAirBlock(x, y + 1, z) && blockAccess.getBlock(x, y + 1, z) != Blocks.snow_layer) return false;
 		return true;
 	}
 	
@@ -37,24 +41,52 @@ public class RenderBlockBetterGrass extends RenderBlockAOBase implements IRender
 		// store world for later use
 		blockAccess = world;
 		
+		// use original renderer for block breaking overlay
+		if (renderer.hasOverrideBlockTexture()) {
+			renderer.setRenderBoundsFromBlock(block);
+			renderer.renderStandardBlock(block, x, y, z);
+			return true;
+		}
+		
 		// render grass block
 		setPassCounters(1);
 		setRenderBoundsFromBlock(block);
-		renderStandardBlock(block, x, y, z);
+		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);
+		}
 		
 		int variation = getSemiRandomFromPos(x, y, z, 0);
 		int heightVariation = getSemiRandomFromPos(x, y, z, 1);
+		boolean isSnowed = blockAccess.getBlock(x, y + 1, z) == Blocks.snow_layer;
 		
-		IIcon renderIcon = (block == Blocks.mycelium) ? myceliumIcons.get(variation) : grassIcons.get(variation);
+		IIcon renderIcon = null;
+		if (BetterFoliageClient.grass.matchesID(block)) {
+			if (BetterFoliage.config.grassUseGenerated) {
+				renderIcon = isSnowed ? snowGrassGenIcon : grassGenIcon;
+			} else {
+				renderIcon = isSnowed ? snowGrassIcons.get(variation) : grassIcons.get(variation);
+			}
+		} else if (block == Blocks.mycelium && !isSnowed) {
+			renderIcon = myceliumIcons.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));
 		
+		if (isSnowed) {
+			aoYPXZNN.setGray(0.9f); aoYPXZNP.setGray(0.9f); aoYPXZPN.setGray(0.9f); aoYPXZPP.setGray(0.9f);
+			Tessellator.instance.setColorOpaque(230, 230, 230);
+		}
+		
 		// render short grass
 		ShadersModIntegration.startGrassQuads();
 		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);
+		Tessellator.instance.setColorOpaque_I(block.colorMultiplier(blockAccess, x, y, z));
+		renderCrossedSideQuads(new Double3(x + 0.5, y + 1.0 + (isSnowed ? 0.0625 : 0.0), z + 0.5), ForgeDirection.UP, scale, halfHeight, pRot[variation], BetterFoliage.config.grassHOffset.value, renderIcon, 0, false);
 		
 		return true;
 	}
@@ -64,8 +96,12 @@ public class RenderBlockBetterGrass extends RenderBlockAOBase implements IRender
 		if (event.map.getTextureType() != 0) return;
 		
 		grassIcons.registerIcons(event.map);
+		snowGrassIcons.registerIcons(event.map);
 		myceliumIcons.registerIcons(event.map);
+		grassGenIcon = event.map.registerIcon("bf_shortgrass:minecraft:tallgrass");
+		snowGrassGenIcon = event.map.registerIcon("bf_shortgrass_snow:minecraft:tallgrass");
 		BetterFoliage.log.info(String.format("Found %d short grass textures", grassIcons.numLoaded));
+		BetterFoliage.log.info(String.format("Found %d snowy grass textures", snowGrassIcons.numLoaded));
 		BetterFoliage.log.info(String.format("Found %d mycelium textures", myceliumIcons.numLoaded));
 	}
 

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

@@ -7,10 +7,12 @@ 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.block.material.Material;
 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.init.Blocks;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -31,6 +33,13 @@ public class RenderBlockBetterLeaves extends RenderBlockAOBase implements IRende
 		// store world for later use
 		blockAccess = world;
 		
+		// use original renderer for block breaking overlay
+		if (renderer.hasOverrideBlockTexture()) {
+			renderer.setRenderBoundsFromBlock(block);
+			renderer.renderStandardBlock(block, x, y, z);
+			return true;
+		}
+		
 		// render leaves center
 		setPassCounters(1);
 		setRenderBoundsFromBlock(block);
@@ -43,7 +52,11 @@ public class RenderBlockBetterLeaves extends RenderBlockAOBase implements IRende
 
 		// 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());
+		TextureAtlasSprite blockLeafIcon = null;
+		try {
+			blockLeafIcon = (TextureAtlasSprite) block.getIcon(world, x, y, z, ForgeDirection.NORTH.ordinal());
+		} catch (ClassCastException e) {
+		}
 		if (blockLeafIcon == null) {
 			BetterFoliage.log.debug(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;
@@ -78,13 +91,16 @@ public class RenderBlockBetterLeaves extends RenderBlockAOBase implements IRende
 	}
 
 	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;
+		if (isBlockNonSurrounding(blockAccess.getBlock(x + 1, y, z))) return false;
+		if (isBlockNonSurrounding(blockAccess.getBlock(x - 1, y, z))) return false;
+		if (isBlockNonSurrounding(blockAccess.getBlock(x, y + 1, z))) return false;
+		if (isBlockNonSurrounding(blockAccess.getBlock(x, y - 1, z))) return false;
+		if (isBlockNonSurrounding(blockAccess.getBlock(x, y, z + 1))) return false;
+		if (isBlockNonSurrounding(blockAccess.getBlock(x, y, z - 1))) return false;
 		return true;
 	}
 	
+	protected boolean isBlockNonSurrounding(Block block) {
+		return block.getMaterial() == Material.air || block == Blocks.snow_layer;
+	}
 }

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

@@ -30,6 +30,12 @@ public class RenderBlockBetterLilypad extends FakeRenderBlockAOBase implements I
 		// store world for later use
 		blockAccess = world;
 		
+		// use original renderer for block breaking overlay
+		if (renderer.hasOverrideBlockTexture()) {
+			renderer.renderBlockLilyPad(block, x, y, z);
+			return true;
+		}
+		
 		// render lilypad block
 		renderBlockLilyPad(block, x, y, z);
 		

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

@@ -3,13 +3,13 @@ package mods.betterfoliage.client.render.impl;
 import java.util.Random;
 
 import mods.betterfoliage.BetterFoliage;
+import mods.betterfoliage.client.BetterFoliageClient;
 import mods.betterfoliage.client.ShadersModIntegration;
 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;
@@ -33,7 +33,7 @@ public class RenderBlockBetterReed extends RenderBlockAOBase implements IRenderB
 	
 	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 (!(BetterFoliageClient.dirt.matchesID(block))) 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;
@@ -45,6 +45,13 @@ public class RenderBlockBetterReed extends RenderBlockAOBase implements IRenderB
 		// store world for later use
 		blockAccess = world;
 		
+		// use original renderer for block breaking overlay
+		if (renderer.hasOverrideBlockTexture()) {
+			renderer.setRenderBoundsFromBlock(block);
+			renderer.renderStandardBlock(block, x, y, z);
+			return true;
+		}
+		
 		// render dirt block
 		setPassCounters(1);
 		setRenderBoundsFromBlock(block);

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

@@ -21,6 +21,10 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
+/** Base class for texture generators. Registers itself as a domain resource manager for the duration of block texture stitching.
+ * @author octarine-noise
+ *
+ */
 @SideOnly(Side.CLIENT)
 public abstract class BlockTextureGenerator implements IResourceManager {
 
@@ -33,32 +37,22 @@ public abstract class BlockTextureGenerator implements IResourceManager {
 	/** 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
@@ -69,8 +63,6 @@ public abstract class BlockTextureGenerator implements IResourceManager {
 		// don't leave a mess
 		Map<String, IResourceManager> domainManagers = Utils.getDomainResourceManagers();
 		if (domainManagers != null) domainManagers.remove(domainName);
-		
-		onStitchEnd(event);
 	}
 	
 	public Set<String> getResourceDomains() {
@@ -88,4 +80,13 @@ public abstract class BlockTextureGenerator implements IResourceManager {
 	public ResourceLocation unwrapResource(ResourceLocation wrapped) {
 		return new ResourceLocation(wrapped.getResourcePath().substring(16));
 	}
+	
+	protected static int blendRGB(int rgbOrig, int rgbBlend, int weightOrig, int weightBlend) {
+		int r = (((rgbOrig >> 16) & 0xFF) * weightOrig + ((rgbBlend >> 16) & 0xFF) * weightBlend) / (weightOrig + weightBlend);
+		int g = (((rgbOrig >> 8) & 0xFF) * weightOrig + ((rgbBlend >> 8) & 0xFF) * weightBlend) / (weightOrig + weightBlend);
+		int b = ((rgbOrig & 0xFF) * weightOrig + (rgbBlend & 0xFF) * weightBlend) / (weightOrig + weightBlend);
+		int a = (rgbOrig >> 24) & 0xFF;
+		int result = (int) (a << 24 | r << 16 | g << 8 | b);
+		return result;
+	}
 }

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

@@ -0,0 +1,51 @@
+package mods.betterfoliage.client.resource;
+
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.imageio.ImageIO;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import net.minecraft.client.resources.IResource;
+import net.minecraft.client.resources.data.IMetadataSection;
+
+/** {@link IResource} for a {@link BufferedImage}
+ * @author octarine-noise
+ */
+@SideOnly(Side.CLIENT)
+public class BufferedImageResource implements IResource {
+
+	/** Raw PNG data*/
+	protected byte[] data = null;
+	
+	public BufferedImageResource(BufferedImage image) {
+		// create PNG image
+		try {
+			ByteArrayOutputStream baos = new ByteArrayOutputStream();
+			ImageIO.write(image, "PNG", baos);
+			data = baos.toByteArray();
+		} catch (IOException e) {
+		}
+	}
+	
+	@Override
+	public InputStream getInputStream() {
+		return data == null ? null : new ByteArrayInputStream(data);
+	}
+
+	@Override
+	public boolean hasMetadata() {
+		return false;
+	}
+
+	@Override
+	public IMetadataSection getMetadata(String var1) {
+		return null;
+	}
+
+}

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/LeafGenerator.java

@@ -0,0 +1,68 @@
+package mods.betterfoliage.client.resource;
+
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
+
+import mods.betterfoliage.BetterFoliage;
+import mods.betterfoliage.client.BetterFoliageClient;
+import mods.betterfoliage.client.ShadersModIntegration;
+import net.minecraft.client.Minecraft;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.client.event.TextureStitchEvent.Post;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+@SideOnly(Side.CLIENT)
+public class LeafGenerator extends LeafGeneratorBase {
+
+	/** Name of the default alpha mask to use */
+	public static String defaultMask = "default";
+	
+	public LeafGenerator() {
+		super("bf_leaves", "betterfoliage", "textures/blocks/%s/%s", "betterfoliage:textures/blocks/leafmask_%d_%s.png", BetterFoliageClient.missingTexture);
+	}
+
+	@Override
+	protected BufferedImage generateLeaf(ResourceLocation originalWithDirs) throws IOException, TextureGenerationException {
+		// load normal leaf texture
+		BufferedImage origImage = ImageIO.read(Minecraft.getMinecraft().getResourceManager().getResource(originalWithDirs).getInputStream());
+		if (origImage.getWidth() != origImage.getHeight()) throw new TextureGenerationException();
+		int size = origImage.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
+		if (!ShadersModIntegration.isSpecialTexture(originalWithDirs)) {
+			// load alpha mask of appropriate size
+			BufferedImage maskImage = loadLeafMaskImage(defaultMask, size * 2);
+			int scale = size * 2 / maskImage.getWidth();
+			
+			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));
+			}
+		}
+		
+		return overlayIcon;
+	}
+	
+	@Override
+	@SubscribeEvent
+	public void endTextureReload(Post event) {
+		super.endTextureReload(event);
+		if (event.map.getTextureType() != 0) return;
+		BetterFoliage.log.info(String.format("Found %d pre-drawn leaf textures", drawnCounter));
+		BetterFoliage.log.info(String.format("Generated %d leaf textures", generatedCounter));
+	}
+}

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

@@ -0,0 +1,119 @@
+package mods.betterfoliage.client.resource;
+
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
+
+import mods.betterfoliage.client.resource.LeafTextureEnumerator.LeafTextureFoundEvent;
+import mods.betterfoliage.common.util.Utils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.IResource;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.client.event.TextureStitchEvent.Pre;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+/** Texture generator base class for textures based on leaf blocks.
+ * Supports loading from resource packs instead of generating if available.
+ * @author octarine-noise
+ */
+@SideOnly(Side.CLIENT)
+public abstract class LeafGeneratorBase extends BlockTextureGenerator {
+
+	@SideOnly(Side.CLIENT)
+	public static class TextureGenerationException extends Exception {
+		private static final long serialVersionUID = 7339757761980002651L;
+	};
+	
+	/** Format string of pre-drawn texture location */
+	public String handDrawnLocationFormat;
+	
+	/** Format string of alpha mask location */
+	public String maskImageLocationFormat;
+	
+	/** Resource domain name of pre-drawn textures */
+	public String nonGeneratedDomain;
+	
+	/** Number of textures generated in the current run */
+	public int generatedCounter = 0;
+	
+	/** Number of pre-drawn textures found in the current run */
+	public int drawnCounter = 0;
+	
+	public LeafGeneratorBase(String domain, String nonGeneratedDomain, String handDrawnLocationFormat, String maskImageLocationFormat, ResourceLocation missingResource) {
+		super(domain, missingResource);
+		this.nonGeneratedDomain = nonGeneratedDomain;
+		this.handDrawnLocationFormat = handDrawnLocationFormat;
+		this.maskImageLocationFormat = maskImageLocationFormat;
+	}
+
+	@Override
+	public IResource getResource(ResourceLocation resourceLocation) throws IOException {
+		IResourceManager resourceManager = Minecraft.getMinecraft().getResourceManager();
+		ResourceLocation originalNoDirs = unwrapResource(resourceLocation);
+		ResourceLocation originalWithDirs = new ResourceLocation(originalNoDirs.getResourceDomain(), "textures/blocks/" + originalNoDirs.getResourcePath());
+		
+		// check for provided texture
+		ResourceLocation handDrawnLocation = new ResourceLocation(nonGeneratedDomain, String.format(handDrawnLocationFormat, originalNoDirs.getResourceDomain(), originalNoDirs.getResourcePath())); 
+		if (Utils.resourceExists(handDrawnLocation)) {
+			drawnCounter++;
+			return resourceManager.getResource(handDrawnLocation);
+		}
+		
+		// generate our own
+		if (!Utils.resourceExists(originalWithDirs)) return getMissingResource();
+		
+		BufferedImage result;
+		try {
+			result = generateLeaf(originalWithDirs);
+		} catch (TextureGenerationException e) {
+			return getMissingResource();
+		}
+		generatedCounter++;
+		return new BufferedImageResource(result);
+	}
+	
+	protected abstract BufferedImage generateLeaf(ResourceLocation originalWithDirs) throws IOException, TextureGenerationException;
+	
+	/** 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 >= 1) {
+			try {
+				maskResource = resourceManager.getResource(new ResourceLocation(String.format(maskImageLocationFormat, size, type)));
+			} catch (Exception e) {}
+			size /= 2;
+		}
+		
+		try {
+			return maskResource == null ? null : ImageIO.read(maskResource.getInputStream());
+		} catch (IOException e) {
+			return null;
+		}
+	}
+	
+	@Override
+	@SubscribeEvent
+	public void handleTextureReload(Pre event) {
+		super.handleTextureReload(event);
+		if (event.map.getTextureType() != 0) return;
+		generatedCounter = 0;
+		drawnCounter = 0;
+	}
+
+	@SubscribeEvent
+	public void handleRegisterTexture(LeafTextureFoundEvent event) {
+		event.blockTextures.registerIcon(new ResourceLocation(domainName, event.icon.getIconName()).toString());
+	}
+
+}

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

@@ -0,0 +1,93 @@
+package mods.betterfoliage.client.resource;
+
+import java.awt.Color;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.Map;
+
+import javax.imageio.ImageIO;
+
+import mods.betterfoliage.client.render.IconSet;
+import mods.betterfoliage.client.resource.LeafTextureEnumerator.LeafTextureFoundEvent;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.client.event.TextureStitchEvent;
+
+import com.google.common.collect.Maps;
+
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+/** Holds the texture for the falling leaf particles, and stores average texture color values for leaf textures
+ * @author octarine-noise
+ */
+@SideOnly(Side.CLIENT)
+public class LeafParticleTextures {
+
+	/** Icons for leaf particles */
+	public IconSet icons = new IconSet("betterfoliage", "falling_leaf_default_%d");
+	
+	/** Map of average color values */
+	public Map<IIcon, Integer> colors = Maps.newHashMap();
+	
+	/** Default color value */
+	public int defaultColor = 0x208040;
+	
+	public LeafParticleTextures(int defaultColor) {
+		this.defaultColor = defaultColor;
+	}
+	
+	public int getColor(IIcon icon) {
+		Integer result = colors.get(icon);
+		return result == null ? defaultColor : result;
+	}
+	
+	/** Calculate average color value (in HSB color space) for a texture and store it in the map.
+	 * @param icon texture
+	 */
+	protected void addAtlasTexture(TextureAtlasSprite icon) {
+		ResourceLocation locationNoDirs = new ResourceLocation(icon.getIconName());
+		ResourceLocation locationWithDirs = new ResourceLocation(locationNoDirs.getResourceDomain(), String.format("textures/blocks/%s.png", locationNoDirs.getResourcePath()));
+		try {
+			BufferedImage image = ImageIO.read(Minecraft.getMinecraft().getResourceManager().getResource(locationWithDirs).getInputStream());
+			
+			int numOpaque = 0;
+			float sumHueX = 0.0f;
+			float sumHueY = 0.0f;
+			float sumSaturation = 0.0f;
+			float sumBrightness = 0.0f;
+			for (int x = 0; x < image.getWidth(); x++) for (int y = 0; y < image.getHeight(); y++) {
+				int pixel = image.getRGB(x, y);
+				int alpha = (pixel >> 24) & 0xFF;
+				float[] hsbVals = Color.RGBtoHSB((pixel >> 16) & 0xFF, (pixel >> 8) & 0xFF, pixel & 0xFF, null);
+				if (alpha == 255) {
+					numOpaque++;
+					sumHueX += Math.cos((hsbVals[0] - 0.5) * 2.0 * Math.PI);
+					sumHueY += Math.sin((hsbVals[0] - 0.5) * 2.0 * Math.PI);
+					sumSaturation += hsbVals[1];
+					sumBrightness += hsbVals[2];
+				}
+			}
+			
+			// average hue as usual for circular values - transform average unit vector back to polar angle
+			float avgHue = (float) (Math.atan2(sumHueY, sumHueX) / (2.0 * Math.PI) + 0.5);
+			colors.put(icon, Color.HSBtoRGB(avgHue, sumSaturation / numOpaque, sumBrightness / numOpaque));
+		} catch (IOException e) {
+		}
+	}
+	
+	@SubscribeEvent
+	public void handleTextureReload(TextureStitchEvent.Pre event) {
+		if (event.map.getTextureType() != 0) return;
+		colors.clear();
+		icons.registerIcons(event.map);
+	}
+	
+	@SubscribeEvent
+	public void handleRegisterTexture(LeafTextureFoundEvent event) {
+		addAtlasTexture(event.icon);
+	}
+}

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

@@ -0,0 +1,108 @@
+package mods.betterfoliage.client.resource;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import mods.betterfoliage.BetterFoliage;
+import mods.betterfoliage.client.BetterFoliageClient;
+import mods.betterfoliage.common.util.Utils;
+import mods.betterfoliage.loader.DeobfHelper;
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.util.IIcon;
+import net.minecraftforge.client.event.TextureStitchEvent;
+import net.minecraftforge.common.MinecraftForge;
+
+import com.google.common.collect.Sets;
+
+import cpw.mods.fml.common.eventhandler.Event;
+import cpw.mods.fml.common.eventhandler.EventPriority;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+/** Enumerates all leaf textures at stitch time and emits an event for each.
+ * @author octarine-noise
+ */
+@SideOnly(Side.CLIENT)
+public class LeafTextureEnumerator implements IIconRegister {
+
+	/**{@link Event} that is emitted for each texture belonging to a leaf block.
+	 * @author octarine-noise
+	 */
+	@SideOnly(Side.CLIENT)
+	public static class LeafTextureFoundEvent extends Event {
+		
+		public TextureMap blockTextures;
+		public TextureAtlasSprite icon;
+		
+		private LeafTextureFoundEvent(TextureMap blockTextures, TextureAtlasSprite icon) {
+			super();
+			this.blockTextures = blockTextures;
+			this.icon = icon;
+		}
+	}
+	
+	/** Texture atlas for block textures used in the current run */
+	public TextureMap blockTextures;
+	
+	/** Leaf blocks register their textures here.
+	 *  @return the originally registered {@link IIcon} already in the atlas
+	 */
+	public IIcon registerIcon(String resourceLocation) {
+		TextureAtlasSprite original = blockTextures.getTextureExtry(resourceLocation);
+		MinecraftForge.EVENT_BUS.post(new LeafTextureFoundEvent(blockTextures, original));
+		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
+	 */
+	@SubscribeEvent(priority=EventPriority.LOWEST)
+	@SuppressWarnings("unchecked")
+	public void handleTextureReload(TextureStitchEvent.Pre event) {
+		if (event.map.getTextureType() != 0) return;
+		blockTextures = event.map;
+		
+		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, DeobfHelper.transformElementSearge("mapRegisteredSprites"), Map.class);
+		if (mapAtlas == null) mapAtlas = Utils.getField(blockTextures, "mapRegisteredSprites", Map.class);
+		
+		if (mapAtlas == null) {
+			BetterFoliage.log.warn("Failed to reflect texture atlas, textures may be missing");
+		} else {
+			Set<TextureAtlasSprite> foundLeafTextures = Sets.newHashSet();
+			for (TextureAtlasSprite icon : mapAtlas.values())
+				if (BetterFoliageClient.isLeafTexture(icon)) foundLeafTextures.add(icon);
+			for (TextureAtlasSprite icon : foundLeafTextures) {
+				BetterFoliage.log.debug(String.format("Found non-block-registered leaf texture: %s", icon.getIconName()));
+				MinecraftForge.EVENT_BUS.post(new LeafTextureFoundEvent(blockTextures, icon));
+			}
+		}
+	}
+	
+	@SubscribeEvent
+	public void endTextureReload(TextureStitchEvent.Post event) {
+		if (event.map.getTextureType() != 0) return;
+		blockTextures = null;
+	}
+	
+}

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

@@ -1,112 +0,0 @@
-package mods.betterfoliage.client.resource;
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import mods.betterfoliage.BetterFoliage;
-import mods.betterfoliage.client.BetterFoliageClient;
-import mods.betterfoliage.common.util.Utils;
-import mods.betterfoliage.loader.DeobfHelper;
-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.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"));
-	}
-
-	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, DeobfHelper.transformElementSearge("mapRegisteredSprites"), Map.class);
-		if (mapAtlas == null) mapAtlas = Utils.getField(blockTextures, "mapRegisteredSprites", 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())
-				if (BetterFoliageClient.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,122 +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 {
-			ResourceLocation origResource = new ResourceLocation(resLeaf.getResourceDomain(), "textures/blocks/" + resLeaf.getResourcePath());
-			if (origResource.getResourcePath().toLowerCase().endsWith("_n.png") || origResource.getResourcePath().toLowerCase().endsWith("_s.png")) {
-				// Don't alter ShaderMod normal and specular maps
-				fallbackResource = resourceManager.getResource(origResource);
-				return;
-			}
-			
-			// load normal leaf texture
-			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/client/resource/ReedGenerator.java

@@ -0,0 +1,44 @@
+package mods.betterfoliage.client.resource;
+
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.IResource;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.util.ResourceLocation;
+
+@SideOnly(Side.CLIENT)
+public class ReedGenerator extends BlockTextureGenerator {
+
+	public boolean isBottom;
+	
+	public ReedGenerator(String domainName, ResourceLocation missingResource, boolean isBottom) {
+		super(domainName, missingResource);
+		this.isBottom = isBottom;
+	}
+
+	@Override
+	public IResource getResource(ResourceLocation resourceLocation) throws IOException {
+		IResourceManager resourceManager = Minecraft.getMinecraft().getResourceManager();
+		ResourceLocation originalNoDirs = unwrapResource(resourceLocation);
+		ResourceLocation originalWithDirs = new ResourceLocation(originalNoDirs.getResourceDomain(), "textures/blocks/" + originalNoDirs.getResourcePath());
+		
+		// load full texture
+		BufferedImage origImage = ImageIO.read(resourceManager.getResource(originalWithDirs).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, isBottom ? -origImage.getHeight() / 2 : 0, null);
+		
+		return new BufferedImageResource(result);
+	}
+
+}

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

@@ -0,0 +1,56 @@
+package mods.betterfoliage.client.resource;
+
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+import mods.betterfoliage.client.ShadersModIntegration;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.IResource;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.util.ResourceLocation;
+
+@SideOnly(Side.CLIENT)
+public class ShortGrassGenerator extends BlockTextureGenerator {
+
+	protected boolean isSnowed = false;
+	
+	protected int snowOriginalWeight = 2;
+	
+	protected int snowWhiteWeight = 3;
+	
+	public ShortGrassGenerator(String domainName, ResourceLocation missingResource, boolean isSnowed) {
+		super(domainName, missingResource);
+		this.isSnowed = isSnowed;
+	}
+
+	@Override
+	public IResource getResource(ResourceLocation resourceLocation) throws IOException {
+		IResourceManager resourceManager = Minecraft.getMinecraft().getResourceManager();
+		ResourceLocation originalNoDirs = unwrapResource(resourceLocation);
+		ResourceLocation originalWithDirs = new ResourceLocation(originalNoDirs.getResourceDomain(), "textures/blocks/" + originalNoDirs.getResourcePath());
+		
+		// load full texture
+		BufferedImage origImage = ImageIO.read(resourceManager.getResource(originalWithDirs).getInputStream());
+
+		// draw bottom half of texture
+		BufferedImage result = new BufferedImage(origImage.getWidth(), origImage.getHeight(), BufferedImage.TYPE_4BYTE_ABGR);
+		Graphics2D graphics = result.createGraphics();
+		graphics.drawImage(origImage, 0, 3 * origImage.getHeight() / 8, null);
+
+		// blend with white if snowed
+		if (isSnowed && !ShadersModIntegration.isSpecialTexture(originalWithDirs)) {
+			for (int x = 0; x < result.getWidth(); x++) for (int y = 0; y < result.getHeight(); y++) {
+				result.setRGB(x, y, blendRGB(result.getRGB(x, y), 0xFFFFFF, 2, 3));
+			}
+		}
+		
+		return new BufferedImageResource(result);
+	}
+
+}

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

@@ -11,6 +11,9 @@ public class BetterFoliageConfig extends ConfigBase {
 	@CfgElement(category="grass", key="enabled")
 	public boolean grassEnabled = true;
 	
+	@CfgElement(category="grass", key="useGenerated")
+	public boolean grassUseGenerated = false;
+	
 	@CfgElement(category="cactus", key="enabled")
 	public boolean cactusEnabled = true;
 	
@@ -23,6 +26,12 @@ public class BetterFoliageConfig extends ConfigBase {
 	@CfgElement(category="algae", key="enabled")
 	public boolean algaeEnabled = true;
 	
+	@CfgElement(category="coral", key="enabled")
+	public boolean coralEnabled = true;
+	
+	@CfgElement(category="fallingLeaves", key="enabled")
+	public boolean fallingLeavesEnabled = true;
+	
 	@CfgElement(category="leaves", key="horizontalOffset")
 	public OptionDouble leavesHOffset = new OptionDouble(0.0, 0.4, 0.025, 0.2);
 	
@@ -37,7 +46,7 @@ public class BetterFoliageConfig extends ConfigBase {
 	
 	@CfgElement(category="grass", key="heightMin")
 	@Limit(max="grassHeightMax")
-	public OptionDouble grassHeightMin = new OptionDouble(0.1, 1.5, 0.05, 0.5);
+	public OptionDouble grassHeightMin = new OptionDouble(0.1, 1.5, 0.05, 0.8);
 	
 	@CfgElement(category="grass", key="heightMax") 
 	public OptionDouble grassHeightMax = new OptionDouble(0.1, 1.5, 0.05, 1.0);
@@ -79,4 +88,43 @@ public class BetterFoliageConfig extends ConfigBase {
 	
 	@CfgElement(category="algae", key="chance")
 	public OptionInteger algaeChance = new OptionInteger(0, 64, 1, 48);
+	
+	@CfgElement(category="coral", key="population")
+	public OptionInteger coralPopulation = new OptionInteger(0, 64, 1, 32);
+	
+	@CfgElement(category="coral", key="chance")
+	public OptionInteger coralChance = new OptionInteger(0, 64, 1, 32);
+	
+	@CfgElement(category="coral", key="verticalOffset")
+	public OptionDouble coralVOffset = new OptionDouble(0.0, 0.25, 0.025, 0.1);
+	
+	@CfgElement(category="coral", key="horizontalOffset")
+	public OptionDouble coralHOffset = new OptionDouble(0.0, 0.4, 0.025, 0.2);
+	
+	@CfgElement(category="coral", key="crustSize")
+	public OptionDouble coralCrustSize = new OptionDouble(0.75, 1.75, 0.05, 1.4);
+	
+	@CfgElement(category="coral", key="size")
+	public OptionDouble coralSize = new OptionDouble(0.25, 1.0, 0.05, 0.7);
+	
+	@CfgElement(category="fallingLeaves", key="speed")
+	public OptionDouble fallingLeavesSpeed = new OptionDouble(0.01, 0.15, 0.01, 0.05);
+	
+	@CfgElement(category="fallingLeaves", key="windStrength")
+	public OptionDouble fallingLeavesWindStrength = new OptionDouble(0.1, 2.0, 0.1, 0.5);
+	
+	@CfgElement(category="fallingLeaves", key="stormStrength")
+	public OptionDouble fallingLeavesStormStrength = new OptionDouble(0.1, 2.0, 0.1, 0.8);
+	
+	@CfgElement(category="fallingLeaves", key="size")
+	public OptionDouble fallingLeavesSize = new OptionDouble(0.25, 1.5, 0.05, 0.75);
+	
+	@CfgElement(category="fallingLeaves", key="chance")
+	public OptionDouble fallingLeavesChance = new OptionDouble(0.005, 1.0, 0.005, 0.05);
+	
+	@CfgElement(category="fallingLeaves", key="perturbation")
+	public OptionDouble fallingLeavesPerturb = new OptionDouble(0.05, 1.0, 0.05, 0.25);
+	
+	@CfgElement(category="fallingLeaves", key="lifetime")
+	public OptionDouble fallingLeavesLifetime = new OptionDouble(1.0, 10.0, 0.1, 5.0);
 }

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

@@ -10,8 +10,14 @@ import java.lang.reflect.Field;
 import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.common.config.Property;
 
+/** Config base class using annotations
+ * @author octarine-noise
+ */
 public class ConfigBase {
 
+	/** Annotates a field linked to a config file property
+	 * @author octarine-noise
+	 */
 	@Target(ElementType.FIELD)
 	@Retention(RetentionPolicy.RUNTIME)
 	public static @interface CfgElement {
@@ -20,6 +26,9 @@ public class ConfigBase {
 		String comment() default "";
 	}
 	
+	/** Declares a min/max limit on another field
+	 * @author octarine-noise
+	 */
 	@Target(ElementType.FIELD)
 	@Retention(RetentionPolicy.RUNTIME)
 	public static @interface Limit {

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

@@ -14,13 +14,13 @@ public class OptionDouble {
 		this.value = value;
 	}
 	
-	public void increment() {
-		value += step;
+	public void increment(int times) {
+		value += times * step;
 		if (value > max) value = max;
 	}
 	
-	public void decrement() {
-		value -= step;
+	public void decrement(int times) {
+		value -= times * step;
 		if (value < min) value = min;
 	}
 }

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

@@ -14,13 +14,13 @@ public class OptionInteger {
 		this.value = value;
 	}
 	
-	public void increment() {
-		value += step;
+	public void increment(int times) {
+		value += times * step;
 		if (value > max) value = max;
 	}
 	
-	public void decrement() {
-		value -= step;
+	public void decrement(int times) {
+		value -= times * step;
 		if (value < min) value = min;
 	}
 }

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

@@ -2,6 +2,9 @@ package mods.betterfoliage.common.util;
 
 import net.minecraftforge.common.util.ForgeDirection;
 
+/** Immutable 3D vector of double precision.
+ * @author octarine-noise
+ */
 public class Double3 {
 
 	public final double x;
@@ -24,6 +27,10 @@ public class Double3 {
 		return new Double3(x + other.x, y + other.y, z + other.z);
 	}
 	
+	public Double3 sub(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);
 	}

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

@@ -14,19 +14,24 @@ import mods.betterfoliage.loader.DeobfHelper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.IResource;
 import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.client.resources.SimpleReloadableResourceManager;
 import net.minecraft.util.ResourceLocation;
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 
 public class Utils {
 
+	/** Hide constructor */
 	private Utils() {}
 	
+	/** 
+	 * @return (({@link SimpleReloadableResourceManager}) Minecraft.getMinecraft().getResourceManager()).domainResourceManagers
+	 */
 	@SuppressWarnings("unchecked")
 	public static Map<String, IResourceManager> getDomainResourceManagers() {
 		IResourceManager manager = Minecraft.getMinecraft().getResourceManager();
-		Map<String, IResourceManager> result = getField(manager, "domainResourceManagers", Map.class);
-		if (result == null) result = getField(manager, DeobfHelper.transformElementSearge("domainResourceManagers"), Map.class);
+		Map<String, IResourceManager> result = getField(manager, DeobfHelper.transformElementSearge("domainResourceManagers"), Map.class);
+		if (result == null) result = getField(manager, "domainResourceManagers", Map.class);
 		return result;
 	}
 	
@@ -52,6 +57,10 @@ public class Utils {
 		}
 	}
 	
+	/** Retrieve a specific rendering handler from the registry
+	 * @param renderType render type of block
+	 * @return {@link ISimpleBlockRenderingHandler} if defined, null otherwise
+	 */
 	@SuppressWarnings("unchecked")
 	public static ISimpleBlockRenderingHandler getRenderingHandler(int renderType) {
 		try {
@@ -66,6 +75,10 @@ public class Utils {
 		}
 	}
 	
+	/** Check for the existence of a {@link IResource}
+	 * @param resourceLocation
+	 * @return true if the resource exists
+	 */
 	public static boolean resourceExists(ResourceLocation resourceLocation) {
 		try {
 			IResource resource = Minecraft.getMinecraft().getResourceManager().getResource(resourceLocation);
@@ -75,6 +88,10 @@ public class Utils {
 		return false;
 	}
 	
+	/** Copy a text file from a resource to the filesystem 
+	 * @param resourceLocation resource location of text file
+	 * @param target target file
+	 */
 	public static void copyFromTextResource(ResourceLocation resourceLocation, File target) {
 		try {
 			IResource defaults = Minecraft.getMinecraft().getResourceManager().getResource(resourceLocation);

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

@@ -1,55 +1,79 @@
 package mods.betterfoliage.loader;
 
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.AbstractInsnNode;
-import org.objectweb.asm.tree.FieldInsnNode;
-import org.objectweb.asm.tree.MethodInsnNode;
+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.ClassNode;
 import org.objectweb.asm.tree.MethodNode;
-import org.objectweb.asm.tree.VarInsnNode;
 
 import com.google.common.collect.ImmutableList;
 
 import cpw.mods.fml.relauncher.FMLInjectionData;
 
-public class BetterFoliageTransformer extends EZTransformerBase {
+public class BetterFoliageTransformer implements IClassTransformer {
 
+	protected Iterable<MethodTransformerBase> transformers = ImmutableList.<MethodTransformerBase>of(
+		new TransformRenderBlockOverride(),
+		new TransformShaderModBlockOverride(),
+		new TransformRandomDisplayTick()
+	);
+	
+	protected Logger logger = LogManager.getLogger(getClass().getSimpleName());
+	
 	public BetterFoliageTransformer() {
 		String mcVersion = FMLInjectionData.data()[4].toString();
 		if (!ImmutableList.<String>of("1.7.2", "1.7.10").contains(mcVersion))
-			logger.warn(String.format("Unsupported Minecraft version %s", mcVersion));
+		logger.warn(String.format("Unsupported Minecraft version %s", mcVersion));
 		
 		DeobfHelper.init();
 	}
 	
-	@MethodTransform(className="net.minecraft.client.renderer.RenderBlocks",
-					 methodName="renderBlockByRenderType",
-					 signature="(Lnet/minecraft/block/Block;III)Z",
-					 log="Applying RenderBlocks.renderBlockByRenderType() render type ovverride")
-	public void handleRenderBlockOverride(MethodNode method) {
-		AbstractInsnNode invokeGetRenderType = findNext(method.instructions.getFirst(), matchInvokeAny());
-		AbstractInsnNode storeRenderType = findNext(invokeGetRenderType, matchOpcode(Opcodes.ISTORE));
-		insertAfter(method.instructions, storeRenderType,
-			new VarInsnNode(Opcodes.ALOAD, 0),
-			new FieldInsnNode(Opcodes.GETFIELD, className("net/minecraft/client/renderer/RenderBlocks"), element("blockAccess"), signature("Lnet/minecraft/world/IBlockAccess;")),
-			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),
-			new MethodInsnNode(Opcodes.INVOKESTATIC, "mods/betterfoliage/client/BetterFoliageClient", "getRenderTypeOverride", signature("(Lnet/minecraft/world/IBlockAccess;IIILnet/minecraft/block/Block;I)I")),
-			new VarInsnNode(Opcodes.ISTORE, 5)
-		);
-	}
-	
-	@MethodTransform(className="shadersmodcore.client.Shaders",
-					 methodName="pushEntity",
-					 signature="(Lnet/minecraft/client/renderer/RenderBlocks;Lnet/minecraft/block/Block;III)V",
-					 log="Applying Shaders.pushEntity() block id ovverride")
-	public void handleGLSLBlockIDOverride(MethodNode method) {
-		AbstractInsnNode arrayStore = findNext(method.instructions.getFirst(), matchOpcode(Opcodes.IASTORE));
-		insertAfter(method.instructions, arrayStore.getPrevious(),
-			new VarInsnNode(Opcodes.ALOAD, 1),
-			new MethodInsnNode(Opcodes.INVOKESTATIC, "mods/betterfoliage/client/ShadersModIntegration", "getBlockIdOverride", signature("(ILnet/minecraft/block/Block;)I"))
-		);
+	@Override
+	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 (MethodTransformerBase transformer : transformers) {
+        	// try to find specified method in class
+			if (!transformedName.equals(transformer.getClassName())) continue;
+			
+			logger.debug(String.format("Found class: %s -> %s", name, transformedName));
+			for (MethodNode methodNode : classNode.methods) {
+				logger.trace(String.format("Checking method: %s, sig: %s", methodNode.name, methodNode.desc));
+				Boolean isObfuscated = null;
+				if (methodNode.name.equals(DeobfHelper.transformElementName(transformer.getMethodName())) && methodNode.desc.equals(DeobfHelper.transformSignature(transformer.getSignature()))) {
+					isObfuscated = true;
+				} else if (methodNode.name.equals(transformer.getMethodName()) && methodNode.desc.equals(transformer.getSignature())) {
+					isObfuscated = false;
+				}
+				
+				if (isObfuscated != null) {
+					// transform
+					hasTransformed = true;
+					try {
+						transformer.transform(methodNode, isObfuscated);
+						logger.info(String.format("%s: SUCCESS", transformer.getLogMessage()));
+					} catch (Exception e) {
+						logger.info(String.format("%s: FAILURE", transformer.getLogMessage()));
+					}
+					break;
+				}
+			}
+        }
+        
+        // return result
+ 		ClassWriter writer = new ClassWriter(0);
+ 		if (hasTransformed) classNode.accept(writer);
+ 		return !hasTransformed ? basicClass : writer.toByteArray();
 	}
+
 }

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

@@ -20,33 +20,55 @@ public class DeobfHelper {
 			obfClasses.put("net/minecraft/client/renderer/RenderBlocks", "ble");
 			obfClasses.put("net/minecraft/world/IBlockAccess", "afx");
 			obfClasses.put("net/minecraft/block/Block", "ahu");
+			obfClasses.put("net/minecraft/client/multiplayer/WorldClient", "biz");
+			obfClasses.put("net/minecraft/world/World", "afn");
 			
 			obfElements.put("blockAccess", "a");
 			obfElements.put("renderBlockByRenderType", "b");
 			obfElements.put("mapRegisteredSprites", "bpr");
+			obfElements.put("doVoidFogParticles", "C");
 		} else if ("1.7.10".equals(mcVersion)) {
 			obfClasses.put("net/minecraft/client/renderer/RenderBlocks", "blm");
 			obfClasses.put("net/minecraft/world/IBlockAccess", "ahl");
 			obfClasses.put("net/minecraft/block/Block", "aji");
+			obfClasses.put("net/minecraft/client/multiplayer/WorldClient", "bjf");
+			obfClasses.put("net/minecraft/world/World", "ahb");
 			
 			obfElements.put("blockAccess", "a");
 			obfElements.put("renderBlockByRenderType", "b");
 			obfElements.put("mapRegisteredSprites", "bpr");
+			obfElements.put("doVoidFogParticles", "C");
 		}
 	}
 	
+	/** Transform a class name from MCP to obfuscated names.
+	 * @param className MCP name
+	 * @return obfuscated name
+	 */
 	public static String transformClassName(String className) {
 		return obfClasses.containsKey(className) ? obfClasses.get(className) : className;
 	}
 	
+	/** Transform a method or field name from MCP to obfuscated names.
+	 * @param elementName MCP name
+	 * @return obfuscated name
+	 */
 	public static String transformElementName(String elementName) {
 		return obfElements.containsKey(elementName) ? obfElements.get(elementName) : elementName;
 	}
 	
+	/** Transform a method or field name from MCP to SRG names.
+	 * @param elementName MCP name
+	 * @return SRG name
+	 */
 	public static String transformElementSearge(String elementName) {
 		return srgElements.containsKey(elementName) ? srgElements.get(elementName) : elementName;
 	}
 	
+	/** Transform an ASM signature from MCP to obfuscated names.
+	 * @param signature MCP signature
+	 * @return obfuscated signature
+	 */
 	public static String transformSignature(String signature) {
 		String result = signature;
 		boolean hasChanged = false;

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

@@ -1,153 +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);
-	}
-	
-	@Target(ElementType.METHOD)
-	@Retention(RetentionPolicy.RUNTIME)
-	public static @interface MethodTransform {
-		public String className();
-		public String methodName();
-		public String signature();
-		public String log();
-	}
-	
-	protected Logger logger = LogManager.getLogger(getClass().getSimpleName());
-	
-	protected Boolean isObfuscated;
-	
-	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
-			String aClassName = null;
-			String aMethodName = null;
-			String aSignature = null;
-			String aLog = null;
-			synchronized (this) {
-				MethodTransform annotation = classMethod.getAnnotation(MethodTransform.class);
-				if (annotation != null) {
-					aClassName = annotation.className();
-					aMethodName = annotation.methodName();
-					aSignature = annotation.signature();
-					aLog = annotation.log();
-				}
-			}
-			
-			if (aClassName == null) continue;
-			if (classMethod.getParameterTypes().length != 1) continue;
-			if (!classMethod.getParameterTypes()[0].equals(MethodNode.class)) continue;
-			
-			// try to find specified method in class
-			if (!transformedName.equals(aClassName)) continue;
-			logger.debug(String.format("Found class: %s -> %s", name, transformedName));
-			for (MethodNode methodNode : classNode.methods) {
-				logger.trace(String.format("Checking method: %s, sig: %s", methodNode.name, methodNode.desc));
-				isObfuscated = null;
-				if (methodNode.name.equals(DeobfHelper.transformElementName(aMethodName)) && methodNode.desc.equals(DeobfHelper.transformSignature(aSignature))) {
-					isObfuscated = true;
-				} else if (methodNode.name.equals(aMethodName) && methodNode.desc.equals(aSignature)) {
-					isObfuscated = false;
-				}
-				
-				if (isObfuscated != null) {
-					// transform
-					hasTransformed = true;
-					try {
-						classMethod.invoke(this, new Object[] {methodNode});
-						logger.info(String.format("%s: SUCCESS", aLog));
-					} catch (Exception e) {
-						logger.info(String.format("%s: FAILURE", aLog));
-					}
-					break;
-				}
-			}
-		}
-		
-		// return result
-		ClassWriter writer = new ClassWriter(0);
-		if (hasTransformed) classNode.accept(writer);
-		return !hasTransformed ? basicClass : writer.toByteArray();
-	}
-
-	protected String className(String className) {
-		return isObfuscated ? DeobfHelper.transformClassName(className) : className;
-	}
-	
-	protected String element(String fieldName) {
-		return isObfuscated ? DeobfHelper.transformElementName(fieldName) : fieldName;
-	}
-	
-	protected String signature(String signature) {
-		return isObfuscated ? DeobfHelper.transformSignature(signature) : signature;
-	}
-	
-	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/loader/MethodTransformerBase.java

@@ -0,0 +1,144 @@
+package mods.betterfoliage.loader;
+
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.InsnList;
+import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.MethodNode;
+
+/** Base class for class transformers operating on a single method.
+ * @author octarine-noise
+ */
+public abstract class MethodTransformerBase {
+
+	/** Instruction node filter
+	 * @author octarine-noise
+	 */
+	public static interface IInstructionMatch {
+		public boolean matches(AbstractInsnNode node);
+	}
+	
+	/**
+	 * @return MCP name of the class to transform
+	 */
+	public abstract String getClassName();
+	
+	/**
+	 * @return MCP name of the method to transform
+	 */
+	public abstract String getMethodName();
+	
+	/**
+	 * @return ASM signature of the method to transform using MCP names
+	 */
+	public abstract String getSignature();
+	
+	/**
+	 * @return Log message to write when method is found
+	 */
+	public abstract String getLogMessage();
+	
+	/** Transform method node
+	 * @param method method node
+	 * @param isObfuscated true for obfuscated environment
+	 */
+	public abstract void transform(MethodNode method, boolean isObfuscated);
+	
+	/** Transform a class name from MCP to obfuscated names if necessary.
+	 * @param className MCP name
+	 * @param isObfuscated true for obfuscated environment
+	 * @return transformed name
+	 */
+	protected static String className(String className, boolean isObfuscated) {
+		return isObfuscated ? DeobfHelper.transformClassName(className) : className;
+	}
+	
+	/** Transform a method or field name from MCP to obfuscated names if necessary.
+	 * @param fieldName MCP name
+	 * @param isObfuscated true for obfuscated environment
+	 * @return transformed name
+	 */
+	protected static String element(String fieldName, boolean isObfuscated) {
+		return isObfuscated ? DeobfHelper.transformElementName(fieldName) : fieldName;
+	}
+	
+	/** Transform an ASM signature from MCP to obfuscated names if necessary.
+	 * @param signature MCP signature
+	 * @param isObfuscated true for obfuscated environment
+	 * @return transformed signature
+	 */
+	protected static String signature(String signature, boolean isObfuscated) {
+		return isObfuscated ? DeobfHelper.transformSignature(signature) : signature;
+	}
+	
+	/** Find the next instruction node in an instruction list starting from a given node, matching a given filter
+	 * @param start start node
+	 * @param match filter
+	 * @return instruction node if found, null otherwise
+	 */
+	protected AbstractInsnNode findNext(AbstractInsnNode start, IInstructionMatch match) {
+		AbstractInsnNode current = start;
+		while(current != null) {
+			if (match.matches(current)) break;
+			current = current.getNext();
+		}
+		return current;
+	}
+	
+	/** Find the previous instruction node in a list starting from a given node, matching a given filter
+	 * @param start start node
+	 * @param match filter
+	 * @return instruction node if found, null otherwise
+	 */
+	protected AbstractInsnNode findPrevious(AbstractInsnNode start, IInstructionMatch match) {
+		AbstractInsnNode current = start;
+		while(current != null) {
+			if (match.matches(current)) break;
+			current = current.getPrevious();
+		}
+		return current;
+	}
+	
+	/**
+	 * @return an instruction node filter matching any invoke instruction
+	 */
+	protected IInstructionMatch matchInvokeAny() {
+		return new IInstructionMatch() {
+			public boolean matches(AbstractInsnNode node) {
+				return node instanceof MethodInsnNode;
+			}
+		};
+	}
+	
+	/**
+	 * @return an instruction node filter matching the given opcode
+	 */
+	protected IInstructionMatch matchOpcode(final int opcode) {
+		return new IInstructionMatch() {
+			public boolean matches(AbstractInsnNode node) {
+				return node.getOpcode() == opcode;
+			}
+		};
+	}
+	
+	/** Insert a list of instruction nodes in a list after a given node
+	 * @param insnList instruction list
+	 * @param node start node
+	 * @param added instructions to add
+	 */
+	protected void insertAfter(InsnList insnList, AbstractInsnNode node, AbstractInsnNode... added) {
+		InsnList listAdd = new InsnList();
+		for (AbstractInsnNode inst : added) listAdd.add(inst);
+		insnList.insert(node, listAdd);
+	}
+	
+	/** Insert a list of instruction nodes in a list before a given node
+	 * @param insnList instruction list
+	 * @param node start node
+	 * @param added instructions to add
+	 */
+	protected void insertBefore(InsnList insnList, AbstractInsnNode node, AbstractInsnNode... added) {
+		InsnList listAdd = new InsnList();
+		for (AbstractInsnNode inst : added) listAdd.add(inst);
+		insnList.insertBefore(node, listAdd);
+	}
+}

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

@@ -0,0 +1,43 @@
+package mods.betterfoliage.loader;
+
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.VarInsnNode;
+
+public class TransformRandomDisplayTick extends MethodTransformerBase {
+
+	@Override
+	public String getClassName() {
+		return "net.minecraft.client.multiplayer.WorldClient";
+	}
+
+	@Override
+	public String getMethodName() {
+		return "doVoidFogParticles";
+	}
+
+	@Override
+	public String getSignature() {
+		return "(III)V";
+	}
+
+	@Override
+	public String getLogMessage() {
+		return "Applying random display tick call hook";
+	}
+
+	@Override
+	public void transform(MethodNode method, boolean obf) {
+		AbstractInsnNode endLoop = findNext(method.instructions.getFirst(), matchOpcode(Opcodes.IINC));
+		insertBefore(method.instructions, endLoop,
+			new VarInsnNode(Opcodes.ALOAD, 10),
+			new VarInsnNode(Opcodes.ALOAD, 0),
+			new VarInsnNode(Opcodes.ILOAD, 7),
+			new VarInsnNode(Opcodes.ILOAD, 8),
+			new VarInsnNode(Opcodes.ILOAD, 9),
+			new MethodInsnNode(Opcodes.INVOKESTATIC, "mods/betterfoliage/client/BetterFoliageClient", "onRandomDisplayTick", signature("(Lnet/minecraft/block/Block;Lnet/minecraft/world/World;III)V", obf))
+		);
+	}
+}

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

@@ -0,0 +1,49 @@
+package mods.betterfoliage.loader;
+
+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 TransformRenderBlockOverride extends MethodTransformerBase {
+
+	@Override
+	public String getClassName() {
+		return "net.minecraft.client.renderer.RenderBlocks";
+	}
+
+	@Override
+	public String getMethodName() {
+		return "renderBlockByRenderType";
+	}
+
+	@Override
+	public String getSignature() {
+		return "(Lnet/minecraft/block/Block;III)Z";
+	}
+
+	@Override
+	public String getLogMessage() {
+		return "Applying RenderBlocks.renderBlockByRenderType() render type override";
+	}
+
+	@Override
+	public void transform(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),
+			new FieldInsnNode(Opcodes.GETFIELD, className("net/minecraft/client/renderer/RenderBlocks", obf), element("blockAccess", obf), signature("Lnet/minecraft/world/IBlockAccess;", obf)),
+			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),
+			new MethodInsnNode(Opcodes.INVOKESTATIC, "mods/betterfoliage/client/BetterFoliageClient", "getRenderTypeOverride", signature("(Lnet/minecraft/world/IBlockAccess;IIILnet/minecraft/block/Block;I)I", obf)),
+			new VarInsnNode(Opcodes.ISTORE, 5)
+		);
+	}
+
+}

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

@@ -0,0 +1,40 @@
+package mods.betterfoliage.loader;
+
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.VarInsnNode;
+
+public class TransformShaderModBlockOverride extends MethodTransformerBase {
+
+	@Override
+	public String getClassName() {
+		return "shadersmodcore.client.Shaders";
+	}
+
+	@Override
+	public String getMethodName() {
+		return "pushEntity";
+	}
+
+	@Override
+	public String getSignature() {
+		return "(Lnet/minecraft/client/renderer/RenderBlocks;Lnet/minecraft/block/Block;III)V";
+	}
+
+	@Override
+	public String getLogMessage() {
+		return "Applying Shaders.pushEntity() block id override";
+	}
+
+	@Override
+	public void transform(MethodNode method, boolean obf) {
+		AbstractInsnNode arrayStore = findNext(method.instructions.getFirst(), matchOpcode(Opcodes.IASTORE));
+		insertAfter(method.instructions, arrayStore.getPrevious(),
+			new VarInsnNode(Opcodes.ALOAD, 1),
+			new MethodInsnNode(Opcodes.INVOKESTATIC, "mods/betterfoliage/client/ShadersModIntegration", "getBlockIdOverride", signature("(ILnet/minecraft/block/Block;)I", obf))
+		);
+	}
+
+}

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

@@ -0,0 +1,5 @@
+// Vanilla
+net.minecraft.block.BlockDirt
+
+// Enhanced Biomes
+enhancedbiomes.blocks.BlockSoilEB

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

@@ -0,0 +1,5 @@
+// Vanilla
+net.minecraft.block.BlockGrass
+
+// Enhanced Biomes
+enhancedbiomes.blocks.BlockGrassEB

src/main/resources/assets/betterfoliage/lang/en_US.lang

@@ -12,6 +12,8 @@ message.betterfoliage.betterCactus=Better Cactus: %s
 message.betterfoliage.betterLilypad=Better Lilypad: %s
 message.betterfoliage.betterReed=Reeds: %s
 message.betterfoliage.betterAlgae=Algae: %s
+message.betterfoliage.betterCoral=Coral: %s
+message.betterfoliage.fallingLeaves=Falling Leaves: %s
 
 message.betterfoliage.size=Size
 message.betterfoliage.hOffset=H.Offset
@@ -19,8 +21,19 @@ message.betterfoliage.vOffset=V.Offset
 message.betterfoliage.minHeight=Min.Height
 message.betterfoliage.maxHeight=Max.Height
 message.betterfoliage.flowerChance=Flower Chance
-message.betterfoliage.reedChance=Reed Chance
+message.betterfoliage.reedChance=Reed Population
 message.betterfoliage.leavesMode=Leaves Offset: %s
+message.betterfoliage.genShortgrass=Use generated: %s
 message.betterfoliage.leavesSkew=Skew
 message.betterfoliage.leavesTranslate=Translate
-message.betterfoliage.algaeChance=Algae Chance
+message.betterfoliage.algaeChance=Algae Population
+message.betterfoliage.crustSize=Crust Size
+message.betterfoliage.coralChance=Coral Chance
+message.betterfoliage.coralPopulation=Coral Population
+
+message.betterfoliage.speed=Speed
+message.betterfoliage.windStrength=Wind Strength
+message.betterfoliage.stormStrength=Storm Strength
+message.betterfoliage.fallingLeafChance=Particle Chance
+message.betterfoliage.fallingLeafPerturbation=Perturbation
+message.betterfoliage.fallingLeafLifetime=Max. lifetime

src/main/resources/assets/betterfoliage/lang/ru_RU.lang

@@ -0,0 +1,31 @@
+key.betterfoliage.gui=Открыть настройки
+
+message.betterfoliage.optionOn=Вкл.
+message.betterfoliage.optionOff=Выкл.
+message.betterfoliage.config=Конфиг
+message.betterfoliage.back=Назад
+message.betterfoliage.close=Закрыть
+
+message.betterfoliage.betterLeaves=Доп. листва: %s
+message.betterfoliage.betterGrass=Короткая трава: %s
+message.betterfoliage.betterCactus=Красивый кактус: %s
+message.betterfoliage.betterLilypad=Красивая кувшинка: %s
+message.betterfoliage.betterReed=Тростник: %s
+message.betterfoliage.betterAlgae=Водоросли: %s
+message.betterfoliage.betterCoral=Кораллы: %s
+
+message.betterfoliage.size=Размер
+message.betterfoliage.hOffset=H.Offset
+message.betterfoliage.vOffset=V.Offset
+message.betterfoliage.minHeight=Мин. высота
+message.betterfoliage.maxHeight=Макс. высота
+message.betterfoliage.flowerChance=Шанс цветов
+message.betterfoliage.reedChance=Популяция тростника
+message.betterfoliage.leavesMode=Корректировка листвы: %s
+message.betterfoliage.genShortgrass=Использовать сгенерированную: %s
+message.betterfoliage.leavesSkew=Косая
+message.betterfoliage.leavesTranslate=Плавная
+message.betterfoliage.algaeChance=Популяция водорослей
+message.betterfoliage.crustSize=Размер коры
+message.betterfoliage.coralChance=Шанс кораллов
+message.betterfoliage.coralPopulation=Популяция кораллов