Add Mana info tooltips for pools, spreaders and flowers

Pools show their storage capacity, spreaders show burst payload and in-flight loss, and generating flowers show their generation rate. Rates are defined per type in the language files because the source values are private constants that cannot be read safely from the item. English and Russian strings are included.

.github/workflows/optimize-images.yml

@@ -0,0 +1,17 @@
+name: Optimize images
+
+on:
+  pull_request:
+    branches: [ master, main, release/** ]
+    paths:
+      - "**/*.png"
+
+  push:
+    branches: [ master, main, release/** ]
+    paths:
+      - "**/*.png"
+
+jobs:
+  optimize-images:
+    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/optimize-images.yml@master
+    secrets: inherit

contributing.md

@@ -1,40 +0,0 @@
-Hey there. Looks like you want to contribute with an issue. Great. Here's what you have to do:
-* Have a look through the [Botania FAQ](http://botaniamod.net/faq.php), to see if your issue has been solved already;
-* Read through the steps on [Bug Reporting 101](http://vazkii.us/br101/) (You may skip this if you're already familiar with reporting issues, but it's good for newcomers);
-* Note the following points:
-  * Issues regarding MCPC+/Cauldron that are not reproducible with forge only are **not accepted**;
-  * Issues regarding outdated versions of the mod are **not accepted**;
-  * Unless you manually update every mod on the pack to the latest, issues regarding any public modpack that is not officially maintained or supported by the botania developers (the ones in the modpack section of the website are not) are **not accepted**;
-  * Duplicate issues or issues that have been solved already (use the search feature!) will be closed without asking.
-  * Do not tag your issues' names. "Something Broke" is prefered to "[Bug] Something Broke"  because there's a proper label system in place.
-  * Suggestions are **not** accepted here. Post them on the forums or reddit instead. If there's any still open they're old ones before this rule was added.
-
-The following "bugs" are not accepted:
-* Intended Behaviour
-  * Double tall flowers need be harvested with shears to not clutter the inventory
-* Already fixed but people keep reporting it for some reason
-  * Wearing a Ring of Loki or Ring of the Aesir shows a wireframe below bedrock
-* Not a botania problem/Not fixable
-  * Crash on startup with ChromatiCraft installed (update CC) 
-  * Crash on startup with Blocks3D Mod installed
-  * Crash on opening the Lexica Botania with Enchiridion installed (update Enchiridion)
-  * Flowers don't render (Optifine issue)
-  * Mana Bursts get destroyed on Cauldron by the ClearLagg plugin (add botania:manaBurst to the ClearLagg blacklist)
-  * Force Relays destroy blocks when used very fast (Can't fix due to the nature of the block)
-  * Terrasteel crafting won't start (make sure your checkerboard is correct, there's Livingrock under the plate)
-  * The Horn of the Canopy doesn't break Thaumcraft leaves (Thaumcraft doesn't use the typical class or material)
-  * Some Baubles don't work properly on LAN (Baubles bug)
-
-[Report the Issue](https://github.com/Vazkii/Botania/issues)!
-
-You can find me at most times on [#vazkii @ irc.esper.net](http://webchat.esper.net/?channels=vazkii), if you need to speak with me about the issue you would report. Just make sure to use common sense and read what the bot tells you.
-
----
-
-If you want to make a Pull Request keep these in mind:
-* Do NOT use the github editor. Test your damn PRs before you submit them.
-* I'm very strict when it comes to syntax. Make sure your PR's syntax matches the syntax of the rest of the code. That includes spacing after if/for/(etc), proper bracket usage, camel casing and copyleft headers on new classes.
-* If your pull request edits very small chunks of code and isn't flawless I'll close it as it'll probably take less time to fix it myself rather than pull yours and change the code.
-* Unless you have a very good reason for it, keep your PRs all in one commit. You can do it with [rebase](https://git-scm.com/docs/git-rebase).
-
-

dependencies.gradle

@@ -1,20 +1,20 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:Baubles-Expanded:2.2.6-GTNH:dev')
-    api('com.github.GTNewHorizons:GTNHLib:0.9.0:dev')
+    api('com.github.GTNewHorizons:Baubles-Expanded:2.2.14-GTNH:dev')
+    api('com.github.GTNewHorizons:GTNHLib:0.9.62:dev')
 
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.48:api') {transitive=false}
-    compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.7.2:dev') {transitive=false}
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.48-GTNH:dev')
-    compileOnly('com.github.GTNewHorizons:Railcraft:9.17.12:api') {transitive=false}
-    compileOnly('com.github.GTNewHorizons:StorageDrawers:2.2.5-GTNH:api') {transitive=false}
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.60:api') {transitive=false}
+    compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.7.10:dev') {transitive=false}
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.96-GTNH:dev')
+    compileOnly('com.github.GTNewHorizons:Railcraft:9.17.26:api') {transitive=false}
+    compileOnly('com.github.GTNewHorizons:StorageDrawers:2.2.20-GTNH:api') {transitive=false}
     compileOnly('curse.maven:cofh-lib-220333:2388748')
     compileOnly('curse.maven:minefactory-reloaded-66672:2366150')
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
     compileOnly("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
 
 
-    compileOnly("com.github.GTNewHorizons:StructureLib:1.4.27:dev")
+    compileOnly("com.github.GTNewHorizons:StructureLib:1.4.34:dev")
 }
 

gradle.properties

@@ -44,7 +44,7 @@ developmentEnvironmentUserName = Developer
 # - jabel: Jabel syntax-only support, compiles to J8 bytecode
 # - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs)
 # - modern: Native modern Java bytecode, no downgrading
-enableModernJavaSyntax = jabel
+enableModernJavaSyntax = jvmDowngrader
 
 # If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
 # and should *not* be used in most situations. -1 disables this.
@@ -65,7 +65,7 @@ enableModernJavaSyntax = jabel
 # - external: Another dependency provides stubs (no constraint, no warning)
 # - (empty): Warning reminding you to configure stubs
 # Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md
-# jvmDowngraderStubsProvider =
+jvmDowngraderStubsProvider = gtnhlib
 
 # Enables injecting missing generics into the decompiled source code for a better coding experience.
 # Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.

gradle/gradle-daemon-jvm.properties

@@ -1,12 +1,12 @@
 #This file is generated by updateDaemonJvm
-toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
-toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect
-toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
-toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect
-toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/46949723aaa20c7b64d7ecfed7207034/redirect
-toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d6690dfd71c4c91e08577437b5b2beb0/redirect
-toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
-toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect
-toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3cd7045fca9a72cd9bc7d14a385e594c/redirect
-toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/552c7bffe0370c66410a51c55985b511/redirect
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c2dd35c9d0aaf0ba6ad0791320f99dfc/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/e5810bd7fd1f8a586644409d395a7e55/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7b3c4877c0749019e6805bb61e421497/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d76df094a9cbbabd3b08251f9e61444a/redirect
 toolchainVersion=25

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.12'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.24'
 }
 
 

src/main/java/vazkii/botania/client/gui/bags/flowerBag/GuiFlowerBag.java

@@ -22,6 +22,6 @@ public class GuiFlowerBag extends GuiMagicPlantBag {
 
     @Override
     protected String getLocalizedNameKey() {
-        return "item.botania:flowerBag.name";
+        return "botania.gui.flowerBag.title";
     }
 }

src/main/java/vazkii/botania/client/gui/bags/shroomBag/GuiShroomBag.java

@@ -22,6 +22,6 @@ public class GuiShroomBag extends GuiMagicPlantBag {
 
     @Override
     protected String getLocalizedNameKey() {
-        return "item.botania:shroomBag.name";
+        return "botania.gui.shroomBag.title";
     }
 }

src/main/java/vazkii/botania/client/integration/nei/IMCForNEI.java

@@ -0,0 +1,22 @@
+package vazkii.botania.client.integration.nei;
+
+import cpw.mods.fml.common.event.FMLInterModComms;
+import net.minecraft.nbt.NBTTagCompound;
+import vazkii.botania.client.integration.nei.recipe.RecipeHandlerBrewery;
+
+public class IMCForNEI {
+    public static void IMCSender() {
+        sendCatalyst(RecipeHandlerBrewery.OVERLAY, "Botania:vial", -1);
+        sendCatalyst(RecipeHandlerBrewery.OVERLAY, "Botania:vial:1", -1);
+        sendCatalyst(RecipeHandlerBrewery.OVERLAY, "Botania:incenseStick", -1);
+        sendCatalyst(RecipeHandlerBrewery.OVERLAY, "Botania:bloodPendant", -1);
+    }
+
+    private static void sendCatalyst(String handlerName, String stack, int priority) {
+        NBTTagCompound nbt = new NBTTagCompound();
+        nbt.setString("handlerID", handlerName);
+        nbt.setString("itemName", stack);
+        nbt.setInteger("priority", priority);
+        FMLInterModComms.sendMessage("NotEnoughItems", "registerCatalystInfo", nbt);
+    }
+}

src/main/java/vazkii/botania/client/integration/nei/NEIHelper.java

@@ -0,0 +1,18 @@
+package vazkii.botania.client.integration.nei;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.renderer.entity.RenderItem;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.item.ItemStack;
+
+public class NEIHelper {
+    public static final RenderItem renderItem = new RenderItem();
+    public static final Minecraft mc = Minecraft.getMinecraft();
+    public static final TextureManager textureManager = mc.getTextureManager();
+    public static final FontRenderer font = mc.fontRenderer;
+
+    public static void renderItemIntoGUI(ItemStack stack, int x, int y) {
+        renderItem.renderItemIntoGUI(font, textureManager, stack, x, y);
+    }
+}

src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerBrewery.java

@@ -23,118 +23,123 @@ import codechicken.nei.recipe.TemplateRecipeHandler;
 
 public class RecipeHandlerBrewery extends TemplateRecipeHandler {
 
-	public class CachedBreweryRecipe extends CachedRecipe {
+    public static final String OVERLAY = "botania.brewery";
 
-		public List<PositionedStack> inputs = new ArrayList<>();
-		public PositionedStack output;
-		public int mana;
+    public class CachedBreweryRecipe extends CachedRecipe {
 
-		public CachedBreweryRecipe(RecipeBrew recipe, ItemStack vial) {
-			if(recipe == null)
-				return;
+        public List<PositionedStack> inputs = new ArrayList<>();
+        public PositionedStack output;
+        public int mana;
 
-			setIngredients(recipe.getInputs());
-			ItemStack toVial;
-			if (vial == null)
-				toVial = new ItemStack(ModItems.vial);
-			else
-				toVial = vial.copy();
-			toVial.stackSize = 1;
-			inputs.add(new PositionedStack(toVial, 39, 42));
+        public CachedBreweryRecipe(RecipeBrew recipe, ItemStack vial) {
+            if (recipe == null) return;
 
-			output = new PositionedStack(recipe.getOutput(toVial), 87, 42);
-		}
+            setIngredients(recipe.getInputs());
+            ItemStack toVial;
+            if (vial == null) {
+                toVial = new ItemStack(ModItems.vial);
+            } else {
+                toVial = vial.copy();
+                toVial.stackSize = 1;
+            }
+            inputs.add(new PositionedStack(toVial, 39, 42));
 
-		public CachedBreweryRecipe(RecipeBrew recipe) {
-			this(recipe, null);
-		}
+            output = new PositionedStack(recipe.getOutput(toVial), 87, 42);
+        }
 
-		public void setIngredients(List<Object> inputs) {
-			int left = 96 - inputs.size() * 18 / 2;
+        public CachedBreweryRecipe(RecipeBrew recipe) {
+            this(recipe, null);
+        }
 
-			int i = 0;
-			for (Object o : inputs) {
-				if (o instanceof String)
-					this.inputs.add(new PositionedStack(OreDictionary.getOres((String) o), left + i * 18, 6));
-				else
-					this.inputs.add(new PositionedStack(o, left + i * 18, 6));
+        public void setIngredients(List<Object> inputs) {
+            int left = 96 - inputs.size() * 18 / 2;
 
-				i++;
-			}
-		}
+            for (int i = 0; i < inputs.size(); i++) {
+                Object o = inputs.get(i);
+                if (o instanceof String oreName) {
+                    o = OreDictionary.getOres(oreName);
+                }
+                this.inputs.add(new PositionedStack(o, left + i * 18, 6));
+            }
+        }
 
-		@Override
-		public List<PositionedStack> getIngredients() {
-			return getCycledIngredients(cycleticks / 20, inputs);
-		}
+        @Override
+        public List<PositionedStack> getIngredients() {
+            return inputs;
+        }
 
-		@Override
-		public PositionedStack getResult() {
-			return output;
-		}
+        @Override
+        public PositionedStack getResult() {
+            return output;
+        }
 
-	}
+    }
 
-	@Override
-	public String getRecipeName() {
-		return StatCollector.translateToLocal("botania.nei.brewery");
-	}
+    @Override
+    public String getRecipeName() {
+        return StatCollector.translateToLocal("botania.nei.brewery");
+    }
 
-	@Override
-	public String getGuiTexture() {
-		return LibResources.GUI_NEI_BREWERY;
-	}
+    @Override
+    public String getOverlayIdentifier() {
+        return OVERLAY;
+    }
 
-	@Override
-	public void loadTransferRects() {
-		transferRects.add(new RecipeTransferRect(new Rectangle(87, 25, 15, 14), "botania.brewery"));
-	}
+    @Override
+    public String getGuiTexture() {
+        return LibResources.GUI_NEI_BREWERY;
+    }
 
-	@Override
-	public void drawBackground(int recipe) {
-		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-		GuiDraw.changeTexture(getGuiTexture());
-		GuiDraw.drawTexturedModalRect(0, 0, 0, 0, 166, 65);
-	}
+    @Override
+    public void loadTransferRects() {
+        transferRects.add(new RecipeTransferRect(new Rectangle(87, 25, 15, 14), getOverlayIdentifier()));
+    }
 
-	@Override
-	public void loadCraftingRecipes(String outputId, Object... results) {
-		if(outputId.equals("botania.brewery"))
-			for(RecipeBrew recipe : BotaniaAPI.brewRecipes)
-				arecipes.add(new CachedBreweryRecipe(recipe));
-		else super.loadCraftingRecipes(outputId, results);
-	}
+    @Override
+    public void drawBackground(int recipe) {
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+        GuiDraw.changeTexture(getGuiTexture());
+        GuiDraw.drawTexturedModalRect(0, 0, 0, 0, 166, 65);
+    }
 
-	@Override
-	public void loadCraftingRecipes(ItemStack result) {
-		if(result.getItem() instanceof IBrewItem)
-			for(RecipeBrew recipe : BotaniaAPI.brewRecipes) {
-				if(recipe == null)
-					continue;
+    @Override
+    public void loadCraftingRecipes(String outputId, Object... results) {
+        if (outputId.equals(getOverlayIdentifier())) {
+            for (RecipeBrew recipe : BotaniaAPI.brewRecipes) {
+                arecipes.add(new CachedBreweryRecipe(recipe));
+            }
+        } else {
+            super.loadCraftingRecipes(outputId, results);
+        }
+    }
 
-				if(((IBrewItem) result.getItem()).getBrew(result) == recipe.getBrew())
-					arecipes.add(new CachedBreweryRecipe(recipe));
-			}
-	}
+    @Override
+    public void loadCraftingRecipes(ItemStack result) {
+        if (!(result.getItem() instanceof IBrewItem brew)) return;
+        for (RecipeBrew recipe : BotaniaAPI.brewRecipes) {
+            if (recipe != null && brew.getBrew(result) == recipe.getBrew()) {
+                arecipes.add(new CachedBreweryRecipe(recipe));
+            }
+        }
+    }
 
-	@Override
-	public void loadUsageRecipes(ItemStack ingredient) {
-		if(ingredient.getItem() instanceof IBrewContainer) {
-			for(RecipeBrew recipe : BotaniaAPI.brewRecipes) {
-				if(recipe == null)
-					continue;
-
-				if(recipe.getOutput(ingredient) != null)
-					arecipes.add(new CachedBreweryRecipe(recipe, ingredient));
-			}
-		} else for(RecipeBrew recipe : BotaniaAPI.brewRecipes) {
-			if(recipe == null)
-				continue;
-
-			CachedBreweryRecipe crecipe = new CachedBreweryRecipe(recipe);
-			if(ItemNBTHelper.cachedRecipeContainsWithNBT(crecipe.inputs, ingredient))
-				arecipes.add(crecipe);
-		}
-	}
+    @Override
+    public void loadUsageRecipes(ItemStack ingredient) {
+        if (ingredient.getItem() instanceof IBrewContainer) {
+            for (RecipeBrew recipe : BotaniaAPI.brewRecipes) {
+                if (recipe != null && recipe.getOutput(ingredient) != null) {
+                    arecipes.add(new CachedBreweryRecipe(recipe, ingredient));
+                }
+            }
+        } else {
+            for (RecipeBrew recipe : BotaniaAPI.brewRecipes) {
+                if (recipe == null) continue;
+                CachedBreweryRecipe crecipe = new CachedBreweryRecipe(recipe);
+                if (ItemNBTHelper.cachedRecipeContainsWithNBT(crecipe.inputs, ingredient)) {
+                    arecipes.add(crecipe);
+                }
+            }
+        }
+    }
 
 }

src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java

@@ -4,8 +4,8 @@ import java.awt.Rectangle;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
+import com.google.common.collect.Iterables;
 import net.minecraft.client.renderer.entity.RenderItem;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.item.ItemStack;
@@ -26,144 +26,122 @@ import vazkii.botania.common.core.helper.ItemNBTHelper;
 
 public class RecipeHandlerElvenTrade extends TemplateRecipeHandler {
 
-	public class CachedElvenTradeRecipe extends CachedRecipe {
+    public static final String OVERLAY = "botania.elvenTrade";
 
-		public List<PositionedStack> inputs = new ArrayList<>();
-		public PositionedStack output;
+    public class CachedElvenTradeRecipe extends CachedRecipe {
 
-		public CachedElvenTradeRecipe(RecipeElvenTrade recipe) {
-			if(recipe == null)
-				return;
+        public List<PositionedStack> inputs = new ArrayList<>();
+        public PositionedStack output;
 
-			setIngredients(recipe.getInputs());
-			output = new PositionedStack(recipe.getOutput(), 107, 46);
-		}
+        public CachedElvenTradeRecipe(RecipeElvenTrade recipe) {
+            if (recipe == null) return;
+            setIngredients(recipe.getInputs());
+            output = new PositionedStack(recipe.getOutput(), 107, 46);
+        }
 
-		public void setIngredients(List<Object> inputs) {
-			int i = 0;
-			for(Object o : inputs) {
-				if(o instanceof String)
-					this.inputs.add(new PositionedStack(OreDictionary.getOres((String) o), 60 + i * 18, 6));
-				else this.inputs.add(new PositionedStack(o, 60 + i * 18, 6));
+        public void setIngredients(List<Object> inputs) {
+            for (int i = 0; i < inputs.size(); i++) {
+                Object o = inputs.get(i);
+                if (o instanceof String oreName) {
+                    o = OreDictionary.getOres(oreName);
+                }
+                this.inputs.add(new PositionedStack(o, 60 + i * 18, 6));
+            }
+        }
 
-				i++;
-			}
-		}
+        @Override
+        public List<PositionedStack> getIngredients() {
+            return inputs;
+        }
 
-		@Override
-		public List<PositionedStack> getIngredients() {
-			return getCycledIngredients(cycleticks / 20, inputs);
-		}
+        @Override
+        public PositionedStack getResult() {
+            return output;
+        }
+    }
 
-		@Override
-		public PositionedStack getResult() {
-			return output;
-		}
+    @Override
+    public String getRecipeName() {
+        return StatCollector.translateToLocal("botania.nei.elvenTrade");
+    }
 
-	}
+    @Override
+    public String getOverlayIdentifier() {
+        return OVERLAY;
+    }
 
-	@Override
-	public String getRecipeName() {
-		return StatCollector.translateToLocal("botania.nei.elvenTrade");
-	}
+    @Override
+    public String getGuiTexture() {
+        return LibResources.GUI_NEI_BLANK;
+    }
 
-	@Override
-	public String getGuiTexture() {
-		return LibResources.GUI_NEI_BLANK;
-	}
+    @Override
+    public void loadTransferRects() {
+        transferRects.add(new RecipeTransferRect(new Rectangle(35, 30, 48, 48), getOverlayIdentifier()));
+    }
 
-	@Override
-	public void loadTransferRects() {
-		transferRects.add(new RecipeTransferRect(new Rectangle(35, 30, 48, 48), "botania.elvenTrade"));
-	}
+    @Override
+    public void drawBackground(int recipe) {
+        super.drawBackground(recipe);
+        GL11.glEnable(GL11.GL_BLEND);
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.7F);
+        GuiDraw.changeTexture(LibResources.GUI_ELVEN_TRADE_OVERLAY);
+        GuiDraw.drawTexturedModalRect(30, 10, 17, 17, 100, 80);
+        GL11.glDisable(GL11.GL_BLEND);
+        GuiDraw.changeTexture(TextureMap.locationBlocksTexture);
+        RenderItem.getInstance().renderIcon(35, 29, BlockAlfPortal.portalTex, 48, 48);
+    }
 
-	@Override
-	public int recipiesPerPage() {
-		return 1;
-	}
+    @Override
+    public void loadCraftingRecipes(String outputId, Object... results) {
+        if (outputId.equals(getOverlayIdentifier())) {
+            for (RecipeElvenTrade recipe : filteredElvenTradeRecipes()) {
+                arecipes.add(new CachedElvenTradeRecipe(recipe));
+            }
+        } else {
+            super.loadCraftingRecipes(outputId, results);
+        }
+    }
 
-	@Override
-	public void drawBackground(int recipe) {
-		super.drawBackground(recipe);
-		GL11.glEnable(GL11.GL_BLEND);
-		GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.7F);
-		GuiDraw.changeTexture(LibResources.GUI_ELVEN_TRADE_OVERLAY);
-		GuiDraw.drawTexturedModalRect(30, 10, 17, 17, 100, 80);
-		GL11.glDisable(GL11.GL_BLEND);
-		GuiDraw.changeTexture(TextureMap.locationBlocksTexture);
-		RenderItem.getInstance().renderIcon(35, 29, BlockAlfPortal.portalTex, 48, 48);
-	}
+    @Override
+    public void loadCraftingRecipes(ItemStack result) {
+        for (RecipeElvenTrade recipe : filteredElvenTradeRecipes()) {
+            if (NEIServerUtils.areStacksSameTypeCrafting(recipe.getOutput(), result)) {
+                arecipes.add(new CachedElvenTradeRecipe(recipe));
+            }
+        }
+    }
 
-	private static boolean hasElvenKnowledge() {
-		/*EntityPlayer player = Minecraft.getMinecraft().thePlayer;
-		if (player != null) {
-			for (ItemStack stack : player.inventory.mainInventory) {
-				if (stack != null && stack.getItem() instanceof ILexicon) {
-					ILexicon lexicon = (ILexicon) stack.getItem();
-					if (lexicon.isKnowledgeUnlocked(stack, BotaniaAPI.elvenKnowledge)) {
-						return true;
-					}
-				}
-			}
-		}
-		return false;*/
-		return true;
-	}
+    @Override
+    public void loadUsageRecipes(ItemStack ingredient) {
+        for (RecipeElvenTrade recipe : filteredElvenTradeRecipes()) {
+            CachedElvenTradeRecipe crecipe = new CachedElvenTradeRecipe(recipe);
+            if (crecipe.contains(crecipe.inputs, ingredient)) {
+                arecipes.add(crecipe);
+            }
+        }
+    }
 
-	@Override
-	public void loadCraftingRecipes(String outputId, Object... results) {
-		if(outputId.equals("botania.elvenTrade") && hasElvenKnowledge()) {
-			if(hasElvenKnowledge()) {
-				for(RecipeElvenTrade recipe : filteredElvenTradeRecipes()) {
-					arecipes.add(new CachedElvenTradeRecipe(recipe));
-				}
-			}
-		} else super.loadCraftingRecipes(outputId, results);
-	}
+    private Iterable<RecipeElvenTrade> filteredElvenTradeRecipes() {
+        return Iterables.filter(
+                BotaniaAPI.elvenTradeRecipes,
+                recipe -> recipe != null
+                        && (recipe.getInputs().size() != 1
+                        || !stackSame(recipe.getOutput(), recipe.getInputs().getFirst())));
+    }
 
-	@Override
-	public void loadCraftingRecipes(ItemStack result) {
-		if(hasElvenKnowledge()) {
-			for(RecipeElvenTrade recipe : filteredElvenTradeRecipes()) {
-				if(NEIServerUtils.areStacksSameTypeCrafting(recipe.getOutput(), result))
-					arecipes.add(new CachedElvenTradeRecipe(recipe));
-			}
-		}
-	}
-
-	@Override
-	public void loadUsageRecipes(ItemStack ingredient) {
-		if(hasElvenKnowledge()) {
-			for(RecipeElvenTrade recipe : filteredElvenTradeRecipes()) {
-				CachedElvenTradeRecipe crecipe = new CachedElvenTradeRecipe(recipe);
-				if(crecipe.contains(crecipe.inputs, ingredient))
-					arecipes.add(crecipe);
-			}
-		}
-	}
-
-	// hide dummy recipes
-	private List<RecipeElvenTrade> filteredElvenTradeRecipes() {
-		return BotaniaAPI.elvenTradeRecipes
-			.stream()
-			.filter(recipe -> {
-				if (recipe == null) {
-					return false;
-				}
-				if (recipe.getInputs().size() == 1) {
-					return !stackSame(recipe.getOutput(), recipe.getInputs().get(0));
-				}
-				return true;
-			})
-			.collect(Collectors.toList());
-	}
-
-	private boolean stackSame(ItemStack stack, Object obj) {
-		if (obj instanceof String) {
-			return OreDictionary.getOres((String) obj).stream().anyMatch(s -> ItemNBTHelper.areStacksSameTypeCraftingWithNBT(stack, s));
-		} else {
-			return Arrays.stream(NEIServerUtils.extractRecipeItems(obj)).anyMatch(s -> ItemNBTHelper.areStacksSameTypeCraftingWithNBT(stack, s));
-		}
-	}
+    private boolean stackSame(ItemStack stack, Object obj) {
+        if (obj instanceof String oreName) {
+            return Iterables.any(
+                    OreDictionary.getOres(oreName),
+                    s -> ItemNBTHelper.areStacksSameTypeCraftingWithNBT(stack, s)
+            );
+        } else {
+            return Iterables.any(
+                    Arrays.asList(NEIServerUtils.extractRecipeItems(obj)),
+                    s -> ItemNBTHelper.areStacksSameTypeCraftingWithNBT(stack, s)
+            );
+        }
+    }
 
 }

src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerFloatingFlowers.java

@@ -17,65 +17,70 @@ import codechicken.nei.recipe.TemplateRecipeHandler;
 
 public class RecipeHandlerFloatingFlowers extends TemplateRecipeHandler {
 
-	public class CachedFloatingFlowerRecipe extends CachedRecipe {
+    public class CachedFloatingFlowerRecipe extends CachedRecipe {
 
-		public List<PositionedStack> inputs = new ArrayList<>();
-		public PositionedStack output;
+        public List<PositionedStack> inputs = new ArrayList<>();
+        public PositionedStack output;
 
-		public CachedFloatingFlowerRecipe(ItemStack floatingFlower, ItemStack specialFlower, ItemStack output) {
-			inputs.add(new PositionedStack(floatingFlower, 25, 6));
-			inputs.add(new PositionedStack(specialFlower, 43, 6));
-			this.output = new PositionedStack(output, 119, 24);
-			this.output.setMaxSize(1);
-		}
+        public CachedFloatingFlowerRecipe(ItemStack floatingFlower, ItemStack specialFlower, ItemStack output) {
+            inputs.add(new PositionedStack(floatingFlower, 25, 6));
+            inputs.add(new PositionedStack(specialFlower, 43, 6));
+            this.output = new PositionedStack(output, 119, 24);
+            this.output.setMaxSize(1);
+        }
 
-		@Override
-		public List<PositionedStack> getIngredients() {
-			return getCycledIngredients(cycleticks / 20, inputs);
-		}
+        @Override
+        public List<PositionedStack> getIngredients() {
+            return inputs;
+        }
 
-		@Override
-		public PositionedStack getResult() {
-			return output;
-		}
+        @Override
+        public PositionedStack getResult() {
+            return output;
+        }
 
-	}
+    }
+
+    @Override
+    public String getRecipeName() {
+        return StatCollector.translateToLocal("botania.nei.floatingFlowers");
+    }
 
 	@Override
-	public String getRecipeName() {
-		return StatCollector.translateToLocal("botania.nei.floatingFlowers");
+	public String getOverlayIdentifier() {
+		return "crafting2x2";
 	}
 
-	@Override
-	public void loadTransferRects() {
-		transferRects.add(new RecipeTransferRect(new Rectangle(84, 23, 24, 18), "crafting"));
-	}
+    @Override
+    public void loadTransferRects() {
+        transferRects.add(new RecipeTransferRect(new Rectangle(84, 23, 24, 18), "crafting"));
+    }
 
-	@Override
-	public String getGuiTexture() {
-		return "textures/gui/container/crafting_table.png";
-	}
+    @Override
+    public String getGuiTexture() {
+        return "textures/gui/container/crafting_table.png";
+    }
 
-	@Override
-	public void loadCraftingRecipes(ItemStack result) {
-		if(Block.getBlockFromItem(result.getItem()) instanceof BlockFloatingSpecialFlower) {
-			ItemStack floatingFlower = new ItemStack(ModBlocks.floatingFlower, 1, OreDictionary.WILDCARD_VALUE);
-			ItemStack specialFlower = new ItemStack(ModBlocks.specialFlower);
-			specialFlower.setTagCompound((NBTTagCompound) result.getTagCompound().copy());
+    @Override
+    public void loadCraftingRecipes(ItemStack result) {
+        if (Block.getBlockFromItem(result.getItem()) instanceof BlockFloatingSpecialFlower) {
+            ItemStack floatingFlower = new ItemStack(ModBlocks.floatingFlower, 1, OreDictionary.WILDCARD_VALUE);
+            ItemStack specialFlower = new ItemStack(ModBlocks.specialFlower);
+            specialFlower.setTagCompound((NBTTagCompound) result.getTagCompound().copy());
 
-			arecipes.add(new CachedFloatingFlowerRecipe(floatingFlower, specialFlower, result.copy()));
-		}
-	}
+            arecipes.add(new CachedFloatingFlowerRecipe(floatingFlower, specialFlower, result.copy()));
+        }
+    }
 
-	@Override
-	public void loadUsageRecipes(ItemStack ingredient) {
-		if(Block.getBlockFromItem(ingredient.getItem()) instanceof BlockSpecialFlower) {
-			ItemStack floatingFlower = new ItemStack(ModBlocks.floatingFlower, 1, OreDictionary.WILDCARD_VALUE);
-			ItemStack result = new ItemStack(ModBlocks.floatingSpecialFlower);
-			result.setTagCompound((NBTTagCompound) ingredient.getTagCompound().copy());
+    @Override
+    public void loadUsageRecipes(ItemStack ingredient) {
+        if (Block.getBlockFromItem(ingredient.getItem()) instanceof BlockSpecialFlower) {
+            ItemStack floatingFlower = new ItemStack(ModBlocks.floatingFlower, 1, OreDictionary.WILDCARD_VALUE);
+            ItemStack result = new ItemStack(ModBlocks.floatingSpecialFlower);
+            result.setTagCompound((NBTTagCompound) ingredient.getTagCompound().copy());
 
-			arecipes.add(new CachedFloatingFlowerRecipe(floatingFlower, ingredient.copy(), result));
-		}
-	}
+            arecipes.add(new CachedFloatingFlowerRecipe(floatingFlower, ingredient.copy(), result));
+        }
+    }
 
 }

src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java

@@ -2,21 +2,19 @@
  * This class was created by <Vazkii>. It's distributed as
  * part of the Botania Mod. Get the Source Code in github:
  * https://github.com/Vazkii/Botania
- * 
+ * <p>
  * Botania is Open Source and distributed under the
  * Botania License: http://botaniamod.net/license.php
- * 
+ * <p>
  * File Created @ [12/12/2015, 23:25:47 (GMT)]
  */
 package vazkii.botania.client.integration.nei.recipe;
 
 import java.awt.Rectangle;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
@@ -26,129 +24,146 @@ import vazkii.botania.api.BotaniaAPI;
 import vazkii.botania.api.lexicon.KnowledgeType;
 import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.api.lexicon.LexiconRecipeMappings;
+import vazkii.botania.client.integration.nei.NEIHelper;
 import vazkii.botania.client.lib.LibResources;
 import vazkii.botania.common.item.ModItems;
 import vazkii.botania.common.lexicon.page.PageText;
+import codechicken.lib.gui.GuiDraw;
 import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.TemplateRecipeHandler;
 
 public class RecipeHandlerLexicaBotania extends TemplateRecipeHandler {
+    private static final ItemStack LEXICA = new ItemStack(ModItems.lexicon);
 
-	public class CachedLexicaBotaniaRecipe extends CachedRecipe {
+    public class CachedLexicaBotaniaRecipe extends CachedRecipe {
 
-		public LexiconEntry entry;
-		public PositionedStack item;
-		public List<PositionedStack> otherStacks = new ArrayList<>();
+        public LexiconEntry entry;
+        public PositionedStack item;
 
-		public CachedLexicaBotaniaRecipe(ItemStack stack, LexiconEntry entry) {
-			otherStacks.add(new PositionedStack(new ItemStack(ModItems.lexicon), 51, 5));
-			item = new PositionedStack(stack, 91, 5);
-			this.entry = entry;
-		}
+        public CachedLexicaBotaniaRecipe(ItemStack stack, LexiconEntry entry) {
+            item = new PositionedStack(stack, 91, 5);
+            this.entry = entry;
+        }
 
-		@Override
-		public List<PositionedStack> getIngredients() {
-			return otherStacks;
-		}
+        @Override
+        public PositionedStack getResult() {
+            return item;
+        }
 
-		@Override
-		public PositionedStack getResult() {
-			return item;
-		}
+        @Override
+        public boolean contains(Collection<PositionedStack> ingredients, ItemStack ingredient) {
+            return ingredient.getItem() == ModItems.lexicon;
+        }
 
-		@Override
-		public List<PositionedStack> getOtherStacks() {
-			return otherStacks;
-		}
+    }
 
-		@Override
-		public boolean contains(Collection<PositionedStack> ingredients, ItemStack ingredient) {
-			return ingredient.getItem() == ModItems.lexicon;
-		}
+    @Override
+    public String getRecipeName() {
+        return StatCollector.translateToLocal("botania.nei.lexica");
+    }
 
-	}
+    @Override
+    public String getOverlayIdentifier() {
+        return "botania.lexica";
+    }
 
-	@Override
-	public String getRecipeName() {
-		return StatCollector.translateToLocal("botania.nei.lexica");
-	}
+    @Override
+    public String getGuiTexture() {
+        return LibResources.GUI_NEI_BLANK;
+    }
 
-	@Override
-	public String getGuiTexture() {
-		return LibResources.GUI_NEI_BLANK;
-	}
+    @Override
+    public void loadTransferRects() {
+        transferRects.add(new RecipeTransferRect(new Rectangle(50, 4, 18, 18), getOverlayIdentifier()));
+    }
 
-	@Override
-	public int recipiesPerPage() {
-		return 1;
-	}
-	
-	@Override
-	public void loadTransferRects() {
-		transferRects.add(new RecipeTransferRect(new Rectangle(50, 4, 18, 18), "botania.lexica"));
-	}
-	
-	@Override
-	public void drawBackground(int recipe) {
-		super.drawBackground(recipe);
-		
-		FontRenderer font = Minecraft.getMinecraft().fontRenderer;
-		CachedLexicaBotaniaRecipe recipeObj = ((CachedLexicaBotaniaRecipe) arecipes.get(recipe));
+    @Override
+    public void drawBackground(int recipe) {
+        super.drawBackground(recipe);
 
-		String s = EnumChatFormatting.UNDERLINE + StatCollector.translateToLocal(recipeObj.entry.getUnlocalizedName());
-		font.drawString(s, 82 - font.getStringWidth(s) / 2, 30, 4210752);
-		
-		KnowledgeType type = recipeObj.entry.getKnowledgeType();
-		s = type.color + StatCollector.translateToLocal(type.getUnlocalizedName()).replaceAll("\\&.", "");
-		font.drawString(s, 82 - font.getStringWidth(s) / 2, 42, 4210752);
-		
-		s = "\"" + StatCollector.translateToLocal(recipeObj.entry.getTagline()) + "\"";
-		PageText.renderText(5, 42, 160, 200, s);
-		
-		String key = LexiconRecipeMappings.stackToString(recipeObj.item.item);
-		String quickInfo = "botania.nei.quickInfo:" + key;
-		String quickInfoLocal = StatCollector.translateToLocal(quickInfo);
-		
-		if(GuiScreen.isShiftKeyDown() && GuiScreen.isCtrlKeyDown() && Minecraft.getMinecraft().gameSettings.advancedItemTooltips)
-			s = "name: " + key;
-		else if(quickInfo.equals(quickInfoLocal))
-			s = StatCollector.translateToLocal("botania.nei.lexicaNoInfo");
-		else {
-			s = StatCollector.translateToLocal("botania.nei.lexicaSeparator");
-			font.drawString(s, 82 - font.getStringWidth(s) / 2, 80, 4210752);
-			s = quickInfoLocal;
-		}
-		
-		PageText.renderText(5, 80, 160, 200, s);
-	}
+        CachedLexicaBotaniaRecipe recipeObj = ((CachedLexicaBotaniaRecipe) arecipes.get(recipe));
 
-	@Override
-	public void loadCraftingRecipes(String outputId, Object... results) {
-		if(outputId.equals("botania.lexica")) {
-			for(LexiconEntry entry : BotaniaAPI.getAllEntries()) {
-				List<ItemStack> stacks = entry.getDisplayedRecipes();
-				for(ItemStack stack : stacks)
-					arecipes.add(new CachedLexicaBotaniaRecipe(stack, entry));
-			}
-		} else super.loadCraftingRecipes(outputId, results);
-	}
+        NEIHelper.renderItemIntoGUI(LEXICA, 51, 5);
 
-	@Override
-	public void loadCraftingRecipes(ItemStack result) {
-		for(LexiconEntry entry : BotaniaAPI.getAllEntries()) {
-			List<ItemStack> stacks = entry.getDisplayedRecipes();
-			for(ItemStack stack : stacks) {
-				String key1 = LexiconRecipeMappings.stackToString(stack);
-				String key2 = LexiconRecipeMappings.stackToString(result);
-				if(key1.equals(key2))
-					arecipes.add(new CachedLexicaBotaniaRecipe(stack, entry));
-			}
-		}
-	}
+        GuiDraw.drawStringC(
+                EnumChatFormatting.UNDERLINE + StatCollector.translateToLocal(recipeObj.entry.getUnlocalizedName()),
+                82,
+                30,
+                0x404040,
+                false);
 
-	@Override
-	public void loadUsageRecipes(ItemStack ingredient) {
-		// NO-OP
-	}
+        KnowledgeType type = recipeObj.entry.getKnowledgeType();
+        GuiDraw.drawStringC(
+                type.color + StatCollector.translateToLocal(type.getUnlocalizedName()).replaceAll("&[0-9a-fklmnor]", ""),
+                82,
+                42,
+                0x404040,
+                false);
+
+        PageText.renderText(
+                5,
+                42,
+                160,
+                200,
+                "\"" + StatCollector.translateToLocal(recipeObj.entry.getTagline()) + "\"");
+
+        String key = LexiconRecipeMappings.stackToString(recipeObj.item.item);
+        String quickInfo = "botania.nei.quickInfo:" + key;
+        String quickInfoLocal = StatCollector.translateToLocal(quickInfo);
+
+        String s;
+        if (GuiScreen.isShiftKeyDown() && GuiScreen.isCtrlKeyDown() && Minecraft.getMinecraft().gameSettings.advancedItemTooltips)
+            s = "name: " + key;
+        else if (quickInfo.equals(quickInfoLocal))
+            s = StatCollector.translateToLocal("botania.nei.lexicaNoInfo");
+        else {
+            GuiDraw.drawStringC(
+                    StatCollector.translateToLocal("botania.nei.lexicaSeparator"),
+                    82,
+                    80,
+                    0x404040,
+                    false);
+            s = quickInfoLocal;
+        }
+
+        PageText.renderText(5, 80, 160, 200, s);
+    }
+
+    @Override
+    public void loadCraftingRecipes(String outputId, Object... results) {
+        if (outputId.equals(getOverlayIdentifier())) {
+            for (LexiconEntry entry : BotaniaAPI.getAllEntries()) {
+                List<ItemStack> stacks = entry.getDisplayedRecipes();
+                for (ItemStack stack : stacks)
+                    arecipes.add(new CachedLexicaBotaniaRecipe(stack, entry));
+            }
+        } else {
+            super.loadCraftingRecipes(outputId, results);
+        }
+    }
+
+    @Override
+    public void loadCraftingRecipes(ItemStack result) {
+        for (LexiconEntry entry : BotaniaAPI.getAllEntries()) {
+            List<ItemStack> stacks = entry.getDisplayedRecipes();
+            for (ItemStack stack : stacks) {
+                String key1 = LexiconRecipeMappings.stackToString(stack);
+                String key2 = LexiconRecipeMappings.stackToString(result);
+                if (key1.equals(key2)) {
+                    arecipes.add(new CachedLexicaBotaniaRecipe(stack, entry));
+                }
+            }
+        }
+    }
+
+    @Override
+    public void loadUsageRecipes(String outputId, Object... ingredients) {
+        loadCraftingRecipes(outputId, ingredients);
+    }
+
+    @Override
+    public void loadUsageRecipes(ItemStack ingredient) {
+        loadCraftingRecipes(ingredient);
+    }
 
 }

src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java

@@ -1,13 +1,9 @@
 package vazkii.botania.client.integration.nei.recipe;
 
 import java.awt.Rectangle;
-import java.util.ArrayList;
-import java.util.List;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.item.Item;
+import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.StatCollector;
 import net.minecraftforge.oredict.OreDictionary;
@@ -17,6 +13,7 @@ import org.lwjgl.opengl.GL11;
 import vazkii.botania.api.BotaniaAPI;
 import vazkii.botania.api.recipe.RecipeManaInfusion;
 import vazkii.botania.client.core.handler.HUDHandler;
+import vazkii.botania.client.integration.nei.NEIHelper;
 import vazkii.botania.client.lib.LibResources;
 import vazkii.botania.client.render.tile.RenderTilePool;
 import vazkii.botania.common.block.ModBlocks;
@@ -28,120 +25,138 @@ import vazkii.botania.common.core.helper.ItemNBTHelper;
 
 public class RecipeHandlerManaPool extends TemplateRecipeHandler {
 
-	public class CachedManaPoolRecipe extends CachedRecipe {
+    private static final ItemStack POOL = new ItemStack(ModBlocks.pool);
 
-		public List<PositionedStack> inputs = new ArrayList<>();
-		public PositionedStack output;
-		public List<PositionedStack> otherStacks = new ArrayList<>();
-		public int mana;
+    public class CachedManaPoolRecipe extends CachedRecipe {
 
-		public CachedManaPoolRecipe(RecipeManaInfusion recipe) {
-			if(recipe == null)
-				return;
-			inputs.add(new PositionedStack(new ItemStack(ModBlocks.pool, 1, recipe.getOutput().getItem() == Item.getItemFromBlock(ModBlocks.pool) ? 2 : 0), 71, 37));
+        private static final PositionedStack ALCHEMY = new PositionedStack(new ItemStack(ModBlocks.alchemyCatalyst), 10, 37);
+        private static final PositionedStack CONJURATION = new PositionedStack(new ItemStack(ModBlocks.conjurationCatalyst), 10, 37);
+        public PositionedStack input;
+        public PositionedStack output;
+        public PositionedStack catalyst;
+        public int mana;
 
-			if(recipe.getInput() instanceof String)
-				inputs.add(new PositionedStack(OreDictionary.getOres((String) recipe.getInput()), 42, 37));
-			else inputs.add(new PositionedStack(recipe.getInput(), 42, 37));
+        public CachedManaPoolRecipe(RecipeManaInfusion recipe) {
+            if (recipe == null) return;
 
-			if(recipe.isAlchemy())
-				otherStacks.add(new PositionedStack(new ItemStack(ModBlocks.alchemyCatalyst), 10, 37));
-			else if (recipe.isConjuration())
-				otherStacks.add(new PositionedStack(new ItemStack(ModBlocks.conjurationCatalyst), 10, 37));
+            Object o = recipe.getInput();
+            if (o instanceof String oreName) {
+                o = OreDictionary.getOres(oreName);
+            }
+            input = new PositionedStack(o, 42, 37);
 
-			output = new PositionedStack(recipe.getOutput(), 101, 37);
-			// This value is where the mana bar is stored initially
-			mana = recipe.getManaToConsume();
-		}
+            if (recipe.isAlchemy()) {
+                catalyst = ALCHEMY;
+            } else if (recipe.isConjuration()) {
+                catalyst = CONJURATION;
+            }
 
-		@Override
-		public List<PositionedStack> getIngredients() {
-			return getCycledIngredients(cycleticks / 20, inputs);
-		}
+            output = new PositionedStack(recipe.getOutput(), 101, 37);
+            mana = recipe.getManaToConsume();
+        }
 
-		@Override
-		public PositionedStack getResult() {
-			return output;
-		}
+        @Override
+        public PositionedStack getIngredient() {
+            return input;
+        }
 
-		@Override
-		public List<PositionedStack> getOtherStacks() {
-			return otherStacks;
-		}
+        @Override
+        public PositionedStack getResult() {
+            return output;
+        }
 
-	}
+        @Override
+        public PositionedStack getOtherStack() {
+            return catalyst;
+        }
 
-	@Override
-	public String getRecipeName() {
-		return StatCollector.translateToLocal("botania.nei.manaPool");
-	}
+    }
 
-	@Override
-	public String getGuiTexture() {
-		return LibResources.GUI_NEI_BLANK;
-	}
+    @Override
+    public String getRecipeName() {
+        return StatCollector.translateToLocal("botania.nei.manaPool");
+    }
 
-	@Override
-	public int recipiesPerPage() {
-		return 1;
-	}
+    @Override
+    public String getOverlayIdentifier() {
+        return "botania.manaPool";
+    }
 
-	@Override
-	public void loadTransferRects() {
-		transferRects.add(new RecipeTransferRect(new Rectangle(70, 36, 18, 18), "botania.manaPool"));
-	}
+    @Override
+    public String getGuiTexture() {
+        return LibResources.GUI_NEI_BLANK;
+    }
 
-	@Override
-	public void drawBackground(int recipe) {
-		super.drawBackground(recipe);
-		GL11.glEnable(GL11.GL_BLEND);
-		GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.5F);
-		// Mana infusion is the mana pool, super weird.
-		GuiDraw.changeTexture(LibResources.GUI_MANA_INFUSION_OVERLAY);
-		GuiDraw.drawTexturedModalRect(45, 20, 38, 35, 92, 50);
-		// Below is where the mana bar actually drawn.
-		int tempMana = ((CachedManaPoolRecipe) arecipes.get(recipe)).mana;
-		HUDHandler.renderManaBar(32, 80, 0x0000FF, 0.75F, GuiScreen.isShiftKeyDown() ? tempMana : tempMana * 10, TilePool.MAX_MANA / 10);
-		FontRenderer font = Minecraft.getMinecraft().fontRenderer;
-		String size = GuiScreen.isShiftKeyDown() ? "1x " : "10x ";
-		String localized = StatCollector.translateToLocal("botaniamisc.neiratio");
-		font.drawString(size + localized, 84 - font.getStringWidth(size + localized) / 2, 71, 0x000000);
-		RenderTilePool.forceMana = true;
-	}
+    @Override
+    public void loadTransferRects() {
+        transferRects.add(new RecipeTransferRect(new Rectangle(70, 36, 18, 18), getOverlayIdentifier()));
+    }
 
-	@Override
-	public void loadCraftingRecipes(String outputId, Object... results) {
-		if(outputId.equals("botania.manaPool")) {
-			for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) {
-				if(recipe == null)
-					continue;
+    @Override
+    public void drawBackground(int recipe) {
+        super.drawBackground(recipe);
+        GL11.glEnable(GL11.GL_BLEND);
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.5F);
+        // Arrows
+        GuiDraw.changeTexture(LibResources.GUI_MANA_INFUSION_OVERLAY);
+        GuiDraw.drawTexturedModalRect(45, 20, 38, 35, 92, 50);
+        // Mana bar
+        int tempMana = ((CachedManaPoolRecipe) arecipes.get(recipe)).mana;
+        HUDHandler.renderManaBar(
+                32,
+                80,
+                0x0000FF,
+                0.75F,
+                GuiScreen.isShiftKeyDown() ? tempMana : tempMana * 10,
+                TilePool.MAX_MANA / 10);
+        String size = GuiScreen.isShiftKeyDown() ? "1x" : "10x";
+        String localized = StatCollector.translateToLocalFormatted("botaniamisc.neiratio", size);
+        GuiDraw.drawStringC(localized, 84, 71, 0x000000, false);
+        GL11.glDisable(GL11.GL_BLEND);
+        // Mana pool item
+        RenderHelper.enableGUIStandardItemLighting();
+        GL11.glEnable(GL11.GL_DEPTH_TEST);
+        RenderTilePool.forceMana = true;
+        NEIHelper.renderItemIntoGUI(POOL, 71, 37);
+        GL11.glDisable(GL11.GL_DEPTH_TEST);
+        RenderHelper.disableStandardItemLighting();
+    }
 
-				arecipes.add(new CachedManaPoolRecipe(recipe));
-			}
-		} else super.loadCraftingRecipes(outputId, results);
-	}
+    @Override
+    public void loadCraftingRecipes(String outputId, Object... results) {
+        if (outputId.equals(getOverlayIdentifier())) {
+            for (RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) {
+                if (recipe == null) continue;
 
-	@Override
-	public void loadCraftingRecipes(ItemStack result) {
-		for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) {
-			if(recipe == null)
-				continue;
+                arecipes.add(new CachedManaPoolRecipe(recipe));
+            }
+        } else {
+            super.loadCraftingRecipes(outputId, results);
+        }
+    }
 
-			if(ItemNBTHelper.areStacksSameTypeCraftingWithNBT(recipe.getOutput(), result))
-				arecipes.add(new CachedManaPoolRecipe(recipe));
-		}
-	}
+    @Override
+    public void loadCraftingRecipes(ItemStack result) {
+        for (RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) {
+            if (recipe == null) continue;
 
-	@Override
-	public void loadUsageRecipes(ItemStack ingredient) {
-		for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) {
-			if(recipe == null)
-				continue;
+            if (ItemNBTHelper.areStacksSameTypeCraftingWithNBT(recipe.getOutput(), result)) {
+                arecipes.add(new CachedManaPoolRecipe(recipe));
+            }
+        }
+    }
 
-			CachedManaPoolRecipe crecipe = new CachedManaPoolRecipe(recipe);
-			if(ItemNBTHelper.cachedRecipeContainsWithNBT(crecipe.getIngredients(), ingredient) || ItemNBTHelper.cachedRecipeContainsWithNBT(crecipe.getOtherStacks(), ingredient))
-				arecipes.add(crecipe);
-		}
-	}
+    @Override
+    public void loadUsageRecipes(ItemStack ingredient) {
+        for (RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) {
+            if (recipe == null) continue;
+
+            CachedManaPoolRecipe crecipe = new CachedManaPoolRecipe(recipe);
+            if (ItemNBTHelper.positionedStackContainsWithNBT(crecipe.input, ingredient) ||
+                ItemNBTHelper.positionedStackContainsWithNBT(crecipe.catalyst, ingredient)) {
+                arecipes.add(crecipe);
+            }
+        }
+    }
 
 }

src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPetalApothecary.java

@@ -4,6 +4,7 @@ import java.awt.Rectangle;
 import java.util.ArrayList;
 import java.util.List;
 
+import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.StatCollector;
@@ -13,6 +14,7 @@ import org.lwjgl.opengl.GL11;
 
 import vazkii.botania.api.BotaniaAPI;
 import vazkii.botania.api.recipe.RecipePetals;
+import vazkii.botania.client.integration.nei.NEIHelper;
 import vazkii.botania.client.lib.LibResources;
 import vazkii.botania.common.block.ModBlocks;
 import codechicken.lib.gui.GuiDraw;
@@ -22,122 +24,137 @@ import codechicken.nei.recipe.TemplateRecipeHandler;
 import vazkii.botania.common.core.helper.ItemNBTHelper;
 
 public class RecipeHandlerPetalApothecary extends TemplateRecipeHandler {
+    private static final ItemStack APOTHECARY = new ItemStack(ModBlocks.altar);
 
-	public class CachedPetalApothecaryRecipe extends CachedRecipe {
+    public class CachedPetalApothecaryRecipe extends CachedRecipe {
+        public List<PositionedStack> inputs = new ArrayList<>();
+        public PositionedStack output;
 
-		public List<PositionedStack> inputs = new ArrayList<>();
-		public PositionedStack output;
+        public CachedPetalApothecaryRecipe(RecipePetals recipe, PositionedStack centerItem) {
+            this(recipe);
+            inputs.add(centerItem);
+        }
 
-		public CachedPetalApothecaryRecipe(RecipePetals recipe, boolean addCenterItem) {
-			setIngredients(recipe.getInputs());
-			output = new PositionedStack(recipe.getOutput(), 111, 21);
-			if(addCenterItem)
-				inputs.add(new PositionedStack(new ItemStack(ModBlocks.altar), 73, 55));
-		}
+        public CachedPetalApothecaryRecipe(RecipePetals recipe) {
+            setIngredients(recipe.getInputs());
+            output = new PositionedStack(recipe.getOutput(), 111, 21);
+        }
 
-		public CachedPetalApothecaryRecipe(RecipePetals recipe) {
-			this(recipe, true);
-		}
+        public void setIngredients(List<Object> inputs) {
+            float degreePerInput = 360F / inputs.size();
+            float currentDegree = -90F;
 
-		public void setIngredients(List<Object> inputs) {
-			float degreePerInput = 360F / inputs.size();
-			float currentDegree = -90F;
+            for (Object o : inputs) {
+                int posX = (int) Math.round(73 + Math.cos(currentDegree * Math.PI / 180D) * 32);
+                int posY = (int) Math.round(55 + Math.sin(currentDegree * Math.PI / 180D) * 32);
 
-			for(Object o : inputs) {
-				int posX = (int) Math.round(73 + Math.cos(currentDegree * Math.PI / 180D) * 32);
-				int posY = (int) Math.round(55 + Math.sin(currentDegree * Math.PI / 180D) * 32);
+                if (o instanceof String oreName) {
+                    o = OreDictionary.getOres(oreName);
+                }
+                this.inputs.add(new PositionedStack(o, posX, posY));
+                currentDegree += degreePerInput;
+            }
+        }
 
-				if(o instanceof String)
-					this.inputs.add(new PositionedStack(OreDictionary.getOres((String) o), posX, posY));
-				else this.inputs.add(new PositionedStack(o, posX, posY));
-				currentDegree += degreePerInput;
-			}
-		}
+        @Override
+        public List<PositionedStack> getIngredients() {
+            return inputs;
+        }
 
-		@Override
-		public List<PositionedStack> getIngredients() {
-			return getCycledIngredients(cycleticks / 20, inputs);
-		}
+        @Override
+        public PositionedStack getResult() {
+            return output;
+        }
+    }
 
-		@Override
-		public PositionedStack getResult() {
-			return output;
-		}
+    @Override
+    public String getRecipeName() {
+        return StatCollector.translateToLocal("botania.nei.petalApothecary");
+    }
 
-	}
+    @Override
+    public String getOverlayIdentifier() {
+        return "botania.petalApothecary";
+    }
 
-	@Override
-	public String getRecipeName() {
-		return StatCollector.translateToLocal("botania.nei.petalApothecary");
-	}
+    // Used by the Alfheim addon, identical to getOverlayIdentifier()
+    @Deprecated
+    public String getRecipeID() {
+        return "botania.petalApothecary";
+    }
 
-	public String getRecipeID() {
-		return "botania.petalApothecary";
-	}
+    @Override
+    public String getGuiTexture() {
+        return LibResources.GUI_NEI_BLANK;
+    }
 
-	@Override
-	public String getGuiTexture() {
-		return LibResources.GUI_NEI_BLANK;
-	}
+    @Override
+    public void loadTransferRects() {
+        transferRects.add(new RecipeTransferRect(new Rectangle(73, 56, 16, 16), getOverlayIdentifier()));
+    }
 
-	@Override
-	public void loadTransferRects() {
-		transferRects.add(new RecipeTransferRect(new Rectangle(72, 54, 18, 18), getRecipeID()));
-	}
+    @Override
+    public void drawBackground(int recipe) {
+        super.drawBackground(recipe);
+        // Background circle graphic
+        GL11.glEnable(GL11.GL_BLEND);
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.5F);
+        GuiDraw.changeTexture(LibResources.GUI_PETAL_OVERLAY);
+        GuiDraw.drawTexturedModalRect(45, 10, 38, 7, 92, 92);
+        // Item
+        RenderHelper.enableGUIStandardItemLighting();
+        GL11.glEnable(GL11.GL_DEPTH_TEST);
+        NEIHelper.renderItemIntoGUI(getRenderItem(), 73, 55);
+        GL11.glDisable(GL11.GL_DEPTH_TEST);
+        RenderHelper.disableStandardItemLighting();
+    }
 
-	@Override
-	public int recipiesPerPage() {
-		return 1;
-	}
+    protected ItemStack getRenderItem() {
+        return APOTHECARY;
+    }
 
-	@Override
-	public void drawBackground(int recipe) {
-		super.drawBackground(recipe);
-		GL11.glEnable(GL11.GL_BLEND);
-		GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.5F);
-		GuiDraw.changeTexture(LibResources.GUI_PETAL_OVERLAY);
-		GuiDraw.drawTexturedModalRect(45, 10, 38, 7, 92, 92);
-	}
+    public List<? extends RecipePetals> getRecipes() {
+        return BotaniaAPI.petalRecipes;
+    }
 
-	public List<? extends RecipePetals> getRecipes() {
-		return BotaniaAPI.petalRecipes;
-	}
+    public CachedPetalApothecaryRecipe getCachedRecipe(RecipePetals recipe) {
+        ItemStack seedStack = new ItemStack(Items.wheat_seeds);
+        seedStack.setStackDisplayName(StatCollector.translateToLocal("botania.nei.anySeed"));
+        return new CachedPetalApothecaryRecipe(recipe, new PositionedStack(seedStack, 73, 39));
+    }
 
-	public CachedPetalApothecaryRecipe getCachedRecipe(RecipePetals recipe) {
-		return new CachedPetalApothecaryRecipe(recipe);
-	}
+    @Override
+    public void loadCraftingRecipes(String outputId, Object... results) {
+        if (outputId.equals(getOverlayIdentifier())) {
+            for (RecipePetals recipe : getRecipes())
+                if (recipe.getOutput().getItem() != Items.skull)
+                    arecipes.add(getCachedRecipe(recipe));
+        } else {
+            super.loadCraftingRecipes(outputId, results);
+        }
+    }
 
-	@Override
-	public void loadCraftingRecipes(String outputId, Object... results) {
-		if(outputId.equals(getRecipeID())) {
-			for(RecipePetals recipe : getRecipes())
-				if(recipe.getOutput().getItem() != Items.skull)
-					arecipes.add(getCachedRecipe(recipe));
-		} else super.loadCraftingRecipes(outputId, results);
-	}
+    @Override
+    public void loadCraftingRecipes(ItemStack result) {
+        for (RecipePetals recipe : getRecipes()) {
+            if (recipe == null) continue;
 
-	@Override
-	public void loadCraftingRecipes(ItemStack result) {
-		for(RecipePetals recipe : getRecipes()){
-			if(recipe == null)
-				continue;
+            if (recipe.getOutput().stackTagCompound != null && ItemNBTHelper.areStacksSameTypeWithNBT(recipe.getOutput(), result) || recipe.getOutput().stackTagCompound == null && NEIServerUtils.areStacksSameTypeCrafting(recipe.getOutput(), result) && recipe.getOutput().getItem() != Items.skull) {
+                arecipes.add(getCachedRecipe(recipe));
+            }
+        }
+    }
 
-			if(recipe.getOutput().stackTagCompound != null && ItemNBTHelper.areStacksSameTypeWithNBT(recipe.getOutput(), result) || recipe.getOutput().stackTagCompound == null && NEIServerUtils.areStacksSameTypeCrafting(recipe.getOutput(), result) && recipe.getOutput().getItem() != Items.skull)
-				arecipes.add(getCachedRecipe(recipe));
-		}
-	}
-
-	@Override
-	public void loadUsageRecipes(ItemStack ingredient) {
-		for(RecipePetals recipe : getRecipes()) {
-			if(recipe == null)
-				continue;
-
-			CachedPetalApothecaryRecipe crecipe = getCachedRecipe(recipe);
-			if(ItemNBTHelper.cachedRecipeContainsWithNBT(crecipe.inputs, ingredient) && recipe.getOutput().getItem() != Items.skull)
-				arecipes.add(crecipe);
-		}
-	}
+    @Override
+    public void loadUsageRecipes(ItemStack ingredient) {
+        for (RecipePetals recipe : getRecipes()) {
+            if (recipe == null) continue;
 
+            CachedPetalApothecaryRecipe crecipe = getCachedRecipe(recipe);
+            if (ItemNBTHelper.cachedRecipeContainsWithNBT(crecipe.inputs, ingredient) && recipe.getOutput().getItem() != Items.skull) {
+                arecipes.add(crecipe);
+            }
+        }
+    }
 
 }

src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPureDaisy.java

@@ -1,8 +1,6 @@
 package vazkii.botania.client.integration.nei.recipe;
 
 import java.awt.Rectangle;
-import java.util.ArrayList;
-import java.util.List;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
@@ -13,6 +11,7 @@ import org.lwjgl.opengl.GL11;
 
 import vazkii.botania.api.BotaniaAPI;
 import vazkii.botania.api.recipe.RecipePureDaisy;
+import vazkii.botania.client.integration.nei.NEIHelper;
 import vazkii.botania.client.lib.LibResources;
 import vazkii.botania.common.core.helper.ItemNBTHelper;
 import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
@@ -23,103 +22,102 @@ import codechicken.nei.recipe.TemplateRecipeHandler;
 
 public class RecipeHandlerPureDaisy extends TemplateRecipeHandler {
 
-	public class CachedPureDaisyRecipe extends CachedRecipe {
+    private static final ItemStack DAISY = ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY);
 
-		public List<PositionedStack> inputs = new ArrayList<>();
-		public PositionedStack output;
-		public List<PositionedStack> otherStacks = new ArrayList<>();
+    public class CachedPureDaisyRecipe extends CachedRecipe {
 
-		public CachedPureDaisyRecipe(RecipePureDaisy recipe) {
-			if(recipe == null)
-				return;
-			inputs.add(new PositionedStack(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY), 71, 23));
+        public PositionedStack inputs;
+        public PositionedStack output;
 
-			if(recipe.getInput() instanceof String)
-				inputs.add(new PositionedStack(OreDictionary.getOres((String) recipe.getInput()), 42, 23));
-			else inputs.add(new PositionedStack(new ItemStack((Block) recipe.getInput()), 42, 23));
+        public CachedPureDaisyRecipe(RecipePureDaisy recipe) {
+            if (recipe == null) return;
 
-			output = new PositionedStack(new ItemStack(recipe.getOutput()), 101, 23);
-		}
+            Object o = recipe.getInput();
+            if (o instanceof String oreName) {
+                o = OreDictionary.getOres(oreName);
+            } else {
+                o = new ItemStack((Block) o);
+            }
+            inputs = new PositionedStack(o, 42, 23);
+            output = new PositionedStack(new ItemStack(recipe.getOutput()), 101, 23);
+        }
 
-		@Override
-		public List<PositionedStack> getIngredients() {
-			return getCycledIngredients(cycleticks / 20, inputs);
-		}
+        @Override
+        public PositionedStack getIngredient() {
+            return inputs;
+        }
 
-		@Override
-		public PositionedStack getResult() {
-			return output;
-		}
+        @Override
+        public PositionedStack getResult() {
+            return output;
+        }
 
-		@Override
-		public List<PositionedStack> getOtherStacks() {
-			return otherStacks;
-		}
+    }
 
-	}
+    @Override
+    public String getRecipeName() {
+        return StatCollector.translateToLocal("botania.nei.pureDaisy");
+    }
 
 	@Override
-	public String getRecipeName() {
-		return StatCollector.translateToLocal("botania.nei.pureDaisy");
+	public String getOverlayIdentifier() {
+		return "botania.pureDaisy";
 	}
 
-	@Override
-	public String getGuiTexture() {
-		return LibResources.GUI_NEI_BLANK;
-	}
+    @Override
+    public String getGuiTexture() {
+        return LibResources.GUI_NEI_BLANK;
+    }
 
-	@Override
-	public int recipiesPerPage() {
-		return 2;
-	}
+    @Override
+    public void loadTransferRects() {
+        transferRects.add(new RecipeTransferRect(new Rectangle(70, 22, 18, 18), getOverlayIdentifier()));
+    }
 
-	@Override
-	public void loadTransferRects() {
-		transferRects.add(new RecipeTransferRect(new Rectangle(70, 22, 18, 18), "botania.pureDaisy"));
-	}
+    @Override
+    public void drawBackground(int recipe) {
+        super.drawBackground(recipe);
+        // Arrows
+        GL11.glEnable(GL11.GL_BLEND);
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.5F);
+        GuiDraw.changeTexture(LibResources.GUI_PURE_DAISY_OVERLAY);
+        GuiDraw.drawTexturedModalRect(48, 10, 0, 0, 65, 44);
+        // Flower item
+        NEIHelper.renderItemIntoGUI(DAISY, 71, 23);
+    }
 
-	@Override
-	public void drawBackground(int recipe) {
-		super.drawBackground(recipe);
-		GL11.glEnable(GL11.GL_BLEND);
-		GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.5F);
-		GuiDraw.changeTexture(LibResources.GUI_PURE_DAISY_OVERLAY);
-		GuiDraw.drawTexturedModalRect(45, 10, 0, 0, 65, 44);
-	}
+    @Override
+    public void loadCraftingRecipes(String outputId, Object... results) {
+        if (outputId.equals(getOverlayIdentifier())) {
+            for (RecipePureDaisy recipe : BotaniaAPI.pureDaisyRecipes) {
+                if (recipe != null) arecipes.add(new CachedPureDaisyRecipe(recipe));
+            }
+        } else {
+            super.loadCraftingRecipes(outputId, results);
+        }
+    }
 
-	@Override
-	public void loadCraftingRecipes(String outputId, Object... results) {
-		if(outputId.equals("botania.pureDaisy")) {
-			for(RecipePureDaisy recipe : BotaniaAPI.pureDaisyRecipes) {
-				if(recipe == null)
-					continue;
+    @Override
+    public void loadCraftingRecipes(ItemStack result) {
+        for (RecipePureDaisy recipe : BotaniaAPI.pureDaisyRecipes) {
+            if (recipe == null) continue;
 
-				arecipes.add(new CachedPureDaisyRecipe(recipe));
-			}
-		} else super.loadCraftingRecipes(outputId, results);
-	}
+            if (ItemNBTHelper.areStacksSameTypeCraftingWithNBT(new ItemStack(recipe.getOutput()), result)) {
+                arecipes.add(new CachedPureDaisyRecipe(recipe));
+            }
+        }
+    }
 
-	@Override
-	public void loadCraftingRecipes(ItemStack result) {
-		for(RecipePureDaisy recipe : BotaniaAPI.pureDaisyRecipes) {
-			if(recipe == null)
-				continue;
+    @Override
+    public void loadUsageRecipes(ItemStack ingredient) {
+        for (RecipePureDaisy recipe : BotaniaAPI.pureDaisyRecipes) {
+            if (recipe == null) continue;
 
-			if(ItemNBTHelper.areStacksSameTypeCraftingWithNBT(new ItemStack(recipe.getOutput()), result))
-				arecipes.add(new CachedPureDaisyRecipe(recipe));
-		}
-	}
-
-	@Override
-	public void loadUsageRecipes(ItemStack ingredient) {
-		for(RecipePureDaisy recipe : BotaniaAPI.pureDaisyRecipes) {
-			if(recipe == null)
-				continue;
-
-			CachedPureDaisyRecipe crecipe = new CachedPureDaisyRecipe(recipe);
-			if(ItemNBTHelper.cachedRecipeContainsWithNBT(crecipe.getIngredients(), ingredient) || ItemNBTHelper.cachedRecipeContainsWithNBT(crecipe.getOtherStacks(), ingredient))
-				arecipes.add(crecipe);
-		}
-	}
+            CachedPureDaisyRecipe crecipe = new CachedPureDaisyRecipe(recipe);
+            if (ItemNBTHelper.cachedRecipeContainsWithNBT(crecipe.getIngredients(), ingredient) || ItemNBTHelper.cachedRecipeContainsWithNBT(crecipe.getOtherStacks(), ingredient)) {
+                arecipes.add(crecipe);
+            }
+        }
+    }
 
 }

src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerRunicAltar.java

@@ -14,44 +14,48 @@ import codechicken.nei.PositionedStack;
 
 public class RecipeHandlerRunicAltar extends RecipeHandlerPetalApothecary {
 
-	public class CachedRunicAltarRecipe extends CachedPetalApothecaryRecipe {
+    private static final ItemStack ALTAR = new ItemStack(ModBlocks.runeAltar);
+    private static final PositionedStack LIVINGROCK = new PositionedStack(new ItemStack(ModBlocks.livingrock), 73, 39);
 
-		public int manaUsage;
+    public class CachedRunicAltarRecipe extends CachedPetalApothecaryRecipe {
 
-		public CachedRunicAltarRecipe(RecipeRuneAltar recipe) {
-			super(recipe, false);
-			if(recipe == null)
-				return;
-			manaUsage = recipe.getManaUsage();
-			inputs.add(new PositionedStack(new ItemStack(ModBlocks.runeAltar), 73, 55));
-		}
+        public int manaUsage;
 
-	}
+        public CachedRunicAltarRecipe(RecipeRuneAltar recipe, PositionedStack centerItem) {
+            super(recipe, centerItem);
+            manaUsage = recipe.getManaUsage();
+        }
+    }
+
+    @Override
+    public String getRecipeName() {
+        return StatCollector.translateToLocal("botania.nei.runicAltar");
+    }
+
+    @Override
+    public String getOverlayIdentifier() {
+        return "botania.runicAltar";
+    }
+
+    @Override
+    public void drawBackground(int recipe) {
+        super.drawBackground(recipe);
+        HUDHandler.renderManaBar(32, 113, 0x0000FF, 0.75F, ((CachedRunicAltarRecipe) arecipes.get(recipe)).manaUsage, TilePool.MAX_MANA / 10);
+    }
+
+    @Override
+    public List<? extends RecipePetals> getRecipes() {
+        return BotaniaAPI.runeAltarRecipes;
+    }
+
+    @Override
+    public CachedPetalApothecaryRecipe getCachedRecipe(RecipePetals recipe) {
+        return new CachedRunicAltarRecipe((RecipeRuneAltar) recipe, LIVINGROCK);
+    }
 
 	@Override
-	public String getRecipeName() {
-		return StatCollector.translateToLocal("botania.nei.runicAltar");
-	}
-
-	@Override
-	public String getRecipeID() {
-		return "botania.runicAltar";
-	}
-
-	@Override
-	public void drawBackground(int recipe) {
-		super.drawBackground(recipe);
-		HUDHandler.renderManaBar(32, 113, 0x0000FF, 0.75F, ((CachedRunicAltarRecipe) arecipes.get(recipe)).manaUsage, TilePool.MAX_MANA / 10);
-	}
-
-	@Override
-	public List<? extends RecipePetals> getRecipes() {
-		return BotaniaAPI.runeAltarRecipes;
-	}
-
-	@Override
-	public CachedPetalApothecaryRecipe getCachedRecipe(RecipePetals recipe) {
-		return new CachedRunicAltarRecipe((RecipeRuneAltar) recipe);
-	}
+    protected ItemStack getRenderItem() {
+        return ALTAR;
+    }
 
 }

src/main/java/vazkii/botania/client/render/item/RenderLens.java

@@ -12,10 +12,8 @@ package vazkii.botania.client.render.item;
 
 import java.awt.Color;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.ItemRenderer;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.entity.RenderItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraftforge.client.IItemRenderer;
@@ -27,9 +25,6 @@ import vazkii.botania.common.item.lens.ItemLens;
 
 public class RenderLens implements IItemRenderer {
 
-	static RenderItem render = new RenderItem();
-	ItemRenderer renderer  = new ItemRenderer(Minecraft.getMinecraft());
-
 	@Override
 	public boolean handleRenderType(ItemStack item, ItemRenderType type) {
 		return type != ItemRenderType.INVENTORY;
@@ -42,25 +37,22 @@ public class RenderLens implements IItemRenderer {
 
 	@Override
 	public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
-		switch(type) {
-		case ENTITY : {
-			GL11.glPushMatrix();
-			GL11.glTranslatef(-0.5F, 0F, 0F);
-			if(item.isOnItemFrame())
-				GL11.glTranslatef(0F, -0.3F, 0.01F);
-			render(item);
-			GL11.glPopMatrix();
-			break;
-		}
-		case EQUIPPED : {
-			render(item);
-			break;
-		}
-		case EQUIPPED_FIRST_PERSON : {
-			render(item);
-			break;
-		}
-		default : break;
+		switch (type) {
+			case ENTITY: {
+				GL11.glPushMatrix();
+				GL11.glTranslatef(-0.5F, 0F, 0F);
+				if (item.isOnItemFrame())
+					GL11.glTranslatef(0F, -0.3F, 0.01F);
+				render(item);
+				GL11.glPopMatrix();
+				break;
+			}
+			case EQUIPPED, EQUIPPED_FIRST_PERSON: {
+				render(item);
+				break;
+			}
+			default:
+				break;
 		}
 	}
 
@@ -111,7 +103,7 @@ public class RenderLens implements IItemRenderer {
 		float zLevel = 0F;
 		Tessellator tessellator = Tessellator.instance;
 		tessellator.startDrawingQuads();
-		if(shiny)
+		if (shiny)
 			tessellator.setBrightness(240);
 		tessellator.addVertexWithUV(par1 + 0, par2 + par5, zLevel, icon.getMinU(), icon.getMaxV());
 		tessellator.addVertexWithUV(par1 + par4, par2 + par5, zLevel, icon.getMaxU(), icon.getMaxV());

src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java

@@ -17,7 +17,6 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.ItemRenderer;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.entity.RenderItem;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.init.Blocks;
@@ -52,7 +51,6 @@ public class RenderTileAltar extends TileEntitySpecialRenderer {
 	private static final ResourceLocation textureMossy = new ResourceLocation(LibResources.MODEL_ALTAR_MOSSY);
 
 	ModelAltar model = new ModelAltar();
-	RenderItem renderItem = new RenderItem();
 	RenderBlocks renderBlocks = new RenderBlocks();
 	public static int forceMeta = -1;
 

src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java

@@ -61,6 +61,7 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer {
 		model.render(this, time);
 		GL11.glEnable(GL12.GL_RESCALE_NORMAL);
 		GL11.glPopMatrix();
+		brewery = null;
 	}
 
 	public void renderItemStack(ItemStack stack) {

src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java

@@ -11,7 +11,6 @@
 package vazkii.botania.client.render.tile;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.entity.Render;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.entity.item.EntityItem;
@@ -33,15 +32,12 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer {
 
 	private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_CRYSTAL_CUBE);
 	ModelCrystalCube model = new ModelCrystalCube();
-	EntityItem entity = null;
+	EntityItem entity = new EntityItem(null, 0, 0, 0, new ItemStack(Blocks.stone));
 
 	@Override
 	public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTicks) {
 		TileCorporeaCrystalCube cube = (TileCorporeaCrystalCube) tileEntity;
 
-		if(entity == null)
-			entity = new EntityItem(cube.getWorldObj(), cube.xCoord, cube.yCoord, cube.zCoord, new ItemStack(Blocks.stone));
-
 		entity.age = ClientTickHandler.ticksInGame;
 		ItemStack stack = cube.getRequestTarget();
 		entity.setEntityItemStack(stack);
@@ -67,7 +63,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer {
 			GL11.glTranslatef(0F, 0.8F, 0F);
 			GL11.glScalef(s, s, s);
 			GL11.glRotatef(180F, 0F, 0F, 1F);
-			((Render) RenderManager.instance.entityRenderMap.get(EntityItem.class)).doRender(entity, 0, 0, 0, 1F, partialTicks);
+			RenderManager.instance.entityRenderMap.get(EntityItem.class).doRender(entity, 0, 0, 0, 1F, partialTicks);
 			GL11.glPopMatrix();
 			mc.renderEngine.bindTexture(texture);
 		}

src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java

@@ -12,15 +12,13 @@ package vazkii.botania.client.render.tile;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.OpenGlHelper;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.entity.Render;
-import net.minecraft.client.renderer.entity.RenderItem;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.entity.item.EntityItem;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
 
 import org.lwjgl.opengl.GL11;
 
@@ -32,8 +30,7 @@ import vazkii.botania.common.block.tile.TileEnchanter;
 
 public class RenderTileEnchanter extends TileEntitySpecialRenderer {
 
-	RenderItem renderItem = new RenderItem();
-	EntityItem item;
+	EntityItem item = new EntityItem(null, 0, 0, 0, new ItemStack(Blocks.stone));
 
 	@Override
 	public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTicks) {
@@ -48,15 +45,12 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer {
 			alphaMod = 1F;
 
 		if(enchanter.itemToEnchant != null) {
-			if(item == null)
-				item = new EntityItem(enchanter.getWorldObj(), enchanter.xCoord, enchanter.yCoord + 1, enchanter.zCoord, enchanter.itemToEnchant);
-
 			item.age = ClientTickHandler.ticksInGame;
 			item.setEntityItemStack(enchanter.itemToEnchant);
 
 			GL11.glColor4f(1F, 1F, 1F, 1F);
 			GL11.glTranslatef(0.5F, 1.25F, 0.5F);
-			((Render) RenderManager.instance.entityRenderMap.get(EntityItem.class)).doRender(item, x, y, z, 1F, partialTicks);
+			RenderManager.instance.entityRenderMap.get(EntityItem.class).doRender(item, x, y, z, 1F, partialTicks);
 			GL11.glTranslatef(-0.5F, -1.25F, -0.5F);
 		}
 

src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java

@@ -15,8 +15,6 @@ import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.entity.RenderItem;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.entity.passive.EntitySheep;
@@ -44,7 +42,6 @@ public class RenderTilePool extends TileEntitySpecialRenderer {
 	private static final ResourceLocation textureDil = new ResourceLocation(LibResources.MODEL_DILUTED_POOL);
 
 	private static final ModelPool model = new ModelPool();
-	RenderItem renderItem = new RenderItem();
 
 	public static int forceMeta = 0;
 	public static boolean forceMana = false;

src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java

@@ -47,9 +47,6 @@ public class SkyblockSkyRenderer extends IRenderHandler {
 
 	@Override
 	public void render(float partialTicks, WorldClient world, Minecraft mc) {
-		boolean test = false;
-		if(test)
-			return;
 
 		int glSkyList = ReflectionHelper.getPrivateValue(RenderGlobal.class, mc.renderGlobal, LibObfuscation.GL_SKY_LIST);
 		int starGLCallList = ReflectionHelper.getPrivateValue(RenderGlobal.class, mc.renderGlobal, LibObfuscation.STAR_GL_CALL_LIST);

src/main/java/vazkii/botania/common/Botania.java

@@ -43,6 +43,7 @@ public class Botania {
 	public static boolean etFuturumLoaded = false;
 	public static boolean storageDrawersLoaded = false;
 	public static boolean structureLibLoaded = false;
+	public static boolean neiLoaded = false;
 
 	public static ILightHelper lightHelper;
 
@@ -63,6 +64,7 @@ public class Botania {
 		etFuturumLoaded = Loader.isModLoaded("etfuturum");
 		storageDrawersLoaded = Loader.isModLoaded("StorageDrawers");
 		structureLibLoaded = Loader.isModLoaded("structurelib");
+		neiLoaded = Loader.isModLoaded("NotEnoughItems");
 		
 		lightHelper = coloredLightsLoaded ? new LightHelperColored() : new LightHelperVanilla();
 		proxy.preInit(event);

src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java

@@ -42,7 +42,7 @@ import vazkii.botania.common.block.BlockModContainer;
 import vazkii.botania.common.block.ModBlocks;
 import vazkii.botania.common.block.tile.mana.TileSpreader;
 import vazkii.botania.common.item.ModItems;
-import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
+import vazkii.botania.common.item.block.ItemBlockSpreader;
 import vazkii.botania.common.lexicon.LexiconData;
 import vazkii.botania.common.lib.LibBlockNames;
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -67,7 +67,7 @@ public class BlockSpreader extends BlockModContainer<TileSpreader> implements IW
 
 	@Override
 	public Block setBlockName(String name) {
-		GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name);
+		GameRegistry.registerBlock(this, ItemBlockSpreader.class, name);
 		return super.setBlockName(name);
 	}
 

src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java

@@ -22,7 +22,6 @@ import net.minecraftforge.oredict.OreDictionary;
 
 import javax.annotation.Nullable;
 import java.util.Collection;
-import java.util.Set;
 
 public final class ItemNBTHelper {
 
@@ -221,6 +220,7 @@ public final class ItemNBTHelper {
 	 * NBT-friendly version of {@link codechicken.nei.recipe.TemplateRecipeHandler.CachedRecipe#contains(Collection, ItemStack)}
 	 */
 	public static boolean cachedRecipeContainsWithNBT(Collection<PositionedStack> ingredients, ItemStack ingredient) {
+		if (ingredients == null) return false;
 		for (PositionedStack stack : ingredients)
 			if (positionedStackContainsWithNBT(stack, ingredient))
 				return true;
@@ -232,6 +232,7 @@ public final class ItemNBTHelper {
 	 * NBT-friendly version of {@link codechicken.nei.PositionedStack#contains(ItemStack)}
 	 */
 	public static boolean positionedStackContainsWithNBT(PositionedStack stack, ItemStack ingredient) {
+		if (stack == null) return false;
 		for(ItemStack item : stack.items)
 			if(areStacksSameTypeCraftingWithNBT(item, ingredient))
 				return true;

src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java

@@ -33,6 +33,7 @@ import vazkii.botania.api.BotaniaAPI;
 import vazkii.botania.api.lexicon.ITwoNamedPage;
 import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.api.lexicon.LexiconPage;
+import vazkii.botania.client.integration.nei.IMCForNEI;
 import vazkii.botania.common.Botania;
 import vazkii.botania.common.achievement.ModAchievements;
 import vazkii.botania.common.block.ModBlocks;
@@ -152,6 +153,10 @@ public class CommonProxy {
 			new StatementAPIPlugin();
 
 		LexiconData.init();
+
+		if (Botania.neiLoaded) {
+			IMCForNEI.IMCSender();
+		}
 	}
 
 	public void postInit(FMLPostInitializationEvent event) {

src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java

@@ -25,9 +25,15 @@ public class ItemBlockPool extends ItemBlockWithMetadataAndName {
 
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
-		if(stack.getItemDamage() == 1)
+		if(stack.getItemDamage() == 1) {
 			for(int i = 0; i < 2; i++)
 				infoList.add(StatCollector.translateToLocal("botaniamisc.creativePool" + i));
+			return;
+		}
+
+		// Mirrors TilePool.MAX_MANA / MAX_MANA_DILLUTED
+		int capacity = stack.getItemDamage() == 2 ? 10000 : 1000000;
+		infoList.add(StatCollector.translateToLocalFormatted("botaniamisc.poolStorage", String.format("%,d", capacity)));
 	}
 
 }

src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java

@@ -85,6 +85,12 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr
 
 		sig.addTooltip(stack, player, infoList);
 
+		// Generation rate line, only present for generating flowers (see en_US.lang)
+		String genKey = "botania.generationRate." + type;
+		String genLoc = StatCollector.translateToLocal(genKey);
+		if(!genLoc.equals(genKey))
+			infoList.add(EnumChatFormatting.GRAY + genLoc);
+
 		if(ConfigHandler.referencesEnabled) {
 			String refUnlocalized = sig.getUnlocalizedLoreTextForStack(stack);
 			String refLocalized = StatCollector.translateToLocal(refUnlocalized);

src/main/java/vazkii/botania/common/item/block/ItemBlockSpreader.java

@@ -0,0 +1,34 @@
+/**
+ * This class was created by <Vazkii>. It's distributed as
+ * part of the Botania Mod. Get the Source Code in github:
+ * https://github.com/Vazkii/Botania
+ *
+ * Botania is Open Source and distributed under the
+ * Botania License: http://botaniamod.net/license.php
+ */
+package vazkii.botania.common.item.block;
+
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
+
+public class ItemBlockSpreader extends ItemBlockWithMetadataAndName {
+
+	public ItemBlockSpreader(Block block) {
+		super(block);
+	}
+
+	@Override
+	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
+		int meta = stack.getItemDamage();
+		// Burst payload / mana loss per tick, mirrors TileSpreader.getBurst
+		int transfer = meta == 3 ? 640 : meta == 2 ? 240 : 160;
+		int loss = meta == 3 ? 20 : 4;
+		infoList.add(StatCollector.translateToLocalFormatted("botaniamisc.spreaderTransfer", transfer));
+		infoList.add(StatCollector.translateToLocalFormatted("botaniamisc.spreaderLoss", loss));
+	}
+
+}

src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java

@@ -10,14 +10,13 @@
  */
 package vazkii.botania.common.item.equipment.bauble;
 
+import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
 import java.util.ArrayList;
+import java.util.HexFormat;
 import java.util.List;
 
-import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.ScaledResolution;
@@ -121,44 +120,44 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub
 		infoList.add(StatCollector.translateToLocal("botania.wings" + stack.getItemDamage()));
 	}
 
+	/**
+	 * The original solution for "16E1BDFD1D6AE1A954C9C5E1B2D9099780F3E1724541F1F2F77310B769CFFBAC" has been lost
+	 * to time. It's supposed to be a 19 character long Matrix reference, but hash() is broken and gives
+	 * inconsistent output, so it probably wouldn't even be recognized if you got it right. It was later
+	 * replaced with the name of an Aqours single, but the name is too long for anvils in 1.7.10.
+	 * It has been fixed to be consistent (and considerably simplified since doing weird random obfuscation before
+	 * hashing is pointless at best), but it required replacing it with my own solution.
+	 * If you have the original solution, I will gladly replace this one with it.
+	 * Here are a few hints:
+	 * It's the title of a song that aligns with Vazkii's interests.
+	 * For authenticity, this song was released before this secret was originally added (2015).
+	 * This song has a special segment only present in one of the single-member versions.
+	 * -koolkrafter5
+	 */
 	@Override
 	public void onEquipped(ItemStack stack, EntityLivingBase player) {
 		super.onEquipped(stack, player);
-		if(stack.getItemDamage() != WING_TYPES && hash(stack.getDisplayName()).equals("16E1BDFD1D6AE1A954C9C5E1B2D9099780F3E1724541F1F2F77310B769CFFBAC")) {
+		if (stack.getItemDamage() != WING_TYPES &&
+				hash(stack.getDisplayName()).equals("04E789FA6BC538F7645606141A1CFECECF4E84C301CB892779E761FD3FFF6386")) {
 			stack.setItemDamage(WING_TYPES);
 			stack.getTagCompound().removeTag("display");
 		}
 	}
 
 	String hash(String str) {
-		if(str != null)
-			try {
-				MessageDigest md = MessageDigest.getInstance("SHA-256");
-				return new HexBinaryAdapter().marshal(md.digest(salt(str).getBytes()));
-			} catch (NoSuchAlgorithmException e) {
-				e.printStackTrace();
-			}
-		return "";
+		try {
+			MessageDigest md = MessageDigest.getInstance("SHA-256");
+            byte[] digest = md.digest(salt(str).getBytes(StandardCharsets.UTF_8));
+            return HexFormat.of().withUpperCase().formatHex(digest);
+		} catch (NoSuchAlgorithmException e) {
+			e.printStackTrace();
+			return "";
+		}
 	}
 
 	// Might as well be called sugar given it's not secure at all :D
 	String salt(String str) {
-		str = str += "wowsuchsaltmuchsecurityverywow";
-		SecureRandom rand = new SecureRandom(str.getBytes());
-		int l = str.length();
-		int steps = rand.nextInt(l);
-		char[] chrs = str.toCharArray();
-		for(int i = 0; i < steps; i++) {
-			int indA = rand.nextInt(l);
-			int indB;
-			do {
-				indB = rand.nextInt(l);
-			} while(indB == indA);
-			char c = (char) (chrs[indA] ^ chrs[indB]);
-			chrs[indA] = c;
-		}
-
-		return String.copyValueOf(chrs);
+		return str + "wowsuchsaltmuchsecurityverywow";
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMiningRing.java

@@ -36,10 +36,9 @@ public class ItemMiningRing extends ItemBauble implements IManaUsingItem {
 			if(!hasMana)
 				onUnequipped(stack, player);
 			else {
-				if(player.getActivePotionEffect(Potion.digSpeed) != null)
-					player.removePotionEffect(Potion.digSpeed.id);
-
-				player.addPotionEffect(new PotionEffect(Potion.digSpeed.id, Integer.MAX_VALUE, 1, true));
+				PotionEffect currentEffect = player.getActivePotionEffect(Potion.digSpeed);
+				if(currentEffect == null || currentEffect.getAmplifier() < 1)
+					player.addPotionEffect(new PotionEffect(Potion.digSpeed.id, Integer.MAX_VALUE, 1, true));
 			}
 
 			if(player.swingProgress == 0.25F)

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

@@ -31,6 +31,25 @@ botaniamisc.filter1=Pickup only items not in Frames
 botaniamisc.filter2=Pickup any items
 botaniamisc.creativePool0=Creative Mana Pool, has infinite Mana
 botaniamisc.creativePool1=Worthy of an Egoist
+botaniamisc.poolStorage=Stores %s Mana
+botaniamisc.spreaderTransfer=Transfers %s Mana per burst
+botaniamisc.spreaderLoss=Loses %s Mana per tick in flight
+botania.generationRate.daybloom=Generates 1 Mana every 12 ticks during the day
+botania.generationRate.daybloomPrime=Generates 1 Mana every 10 ticks during the day
+botania.generationRate.nightshade=Generates 1 Mana every 12 ticks at night
+botania.generationRate.nightshadePrime=Generates 1 Mana every 10 ticks at night
+botania.generationRate.hydroangeas=Generates 1 Mana every 2 ticks, consuming water
+botania.generationRate.endoflame=Generates 3 Mana every 2 ticks while burning fuel
+botania.generationRate.thermalily=Generates 20 Mana per tick from Lava, then cools down
+botania.generationRate.arcanerose=Generates 50 Mana per Experience point
+botania.generationRate.spectrolus=Generates 300 Mana per Wool block of the cycling color
+botania.generationRate.munchdew=Generates 160 Mana per Leaf block eaten
+botania.generationRate.kekimurus=Generates 1800 Mana per bite of Cake
+botania.generationRate.rafflowsia=Generates 2100 Mana per passive flower eaten, less on repeats
+botania.generationRate.narslimmus=Generates Mana from natural Slimes, scaling with size
+botania.generationRate.gourmaryllis=Generates Mana from Food, scaling with saturation
+botania.generationRate.entropinnyum=Generates 6500 Mana per TNT explosion
+botania.generationRate.dandelifeon=Generates 150 Mana per cell generation consumed
 botaniamisc.savedByLaurel=Your Golden Laurel Crown shatters, as it saves you from death.
 botaniamisc.toolRank=%s&7 Rank
 botaniamisc.edition=%s Edition
@@ -50,7 +69,7 @@ botaniamisc.clickToSee=Click to read
 botaniamisc.shiftToRemove=Shift-click to remove
 botaniamisc.clickToAdd=Add Bookmark
 botaniamisc.ratio=%sx Zoom (hover to zoom out)
-botaniamisc.neiratio=Zoom (shift to zoom out)
+botaniamisc.neiratio=%s Zoom (shift to zoom out)
 botaniamisc.bottleTooltip=It has an acquired taste
 botaniamisc.coarseDirt0=Coarse Dirt, grass
 botaniamisc.coarseDirt1=won't grow on it
@@ -184,6 +203,8 @@ botania.nei.pureDaisy=Pure Daisy
 botania.nei.lexica=Lexica Botania
 nei.options.keys.gui.botania_corporea_request=Corporea Request
 
+botania.nei.anySeed=Any Seed
+
 botania.nei.lexicaSeparator=Extra Info:
 botania.nei.lexicaNoInfo=(there's no Extra Info for this entry, sorry!)
 
@@ -1717,6 +1738,9 @@ botania.potion.clear=Absolution
 botania.gui.lexicon.header=Lexica Botania, %s Edition Table of Contents
 botania.gui.lexicon.wip=(This entry is a Work In Progress. It's not even its final form)
 
+botania.gui.flowerBag.title=Flower Pouch
+botania.gui.shroomBag.title=Mushroom Pouch
+
 # MUSIC DISCS
 item.record.botania:gaia1.desc=Kain Vinosec - Endure Emptiness
 item.record.botania:gaia2.desc=Kain Vinosec - Fight For Quiescence

src/main/resources/assets/botania/lang/es_ES.lang

@@ -1471,6 +1471,8 @@ botania.potion.clear=Absolución
 botania.gui.lexicon.header=Lexica Botania, %s edición tabla de contenidos
 botania.gui.lexicon.wip=(Esta entrada es Trabajo en Curso. No está en su forma final)
 
+botania.gui.flowerBag.title=Bolsa de flores
+
 # MUSIC DISCS
 item.record.botania:gaia1.desc=Kain Vinosec - Endure Emptiness
 item.record.botania:gaia2.desc=Kain Vinosec - Fight For Quiescence

src/main/resources/assets/botania/lang/fr_FR.lang

@@ -1494,6 +1494,8 @@ botania.potion.clear=Absolution
 botania.gui.lexicon.header=Lexica Botania, Edition %s Table des matières
 botania.gui.lexicon.wip=(Ce passage est un travail en cours. Ce n'est même pas sa forme finale)
 
+botania.gui.flowerBag.title=Poche à fleur
+
 # MUSIC DISCS
 item.record.botania:gaia1.desc=Kain Vinosec - Supportez le vide
 item.record.botania:gaia2.desc=Kain Vinosec - Combat pour la quiétude

src/main/resources/assets/botania/lang/ja_JP.lang

@@ -1462,6 +1462,9 @@ item.botania:speedUpBelt.name=大地を闊歩するもののたすき
 item.botania:baubleBox.name=装飾品入れ
 item.botania:manaPowder.name=マナの粉末
 
+# GUI TEXT
+botania.gui.flowerBag.title=花入れ小袋
+
 # LEXICON CATEGORIES
 botania.category.basics=基本と機構
 botania.category.mana=マナの取り扱い

src/main/resources/assets/botania/lang/ko_KR.lang

@@ -1493,6 +1493,8 @@ botania.potion.clear=면죄
 botania.gui.lexicon.header=보타니아 사전, %s 번째 제본판  목차 - 배우길 원하는 카테고리를 클릭하세요. :
 botania.gui.lexicon.wip=(이 부분은 작성중입니다. 내용이 완전하지 않을수도 있습니다.)
 
+botania.gui.flowerBag.title=꽃 파우치
+
 # MUSIC DISCS
 item.record.botania:gaia1.desc=Kain Vinosec - Endure Emptiness
 item.record.botania:gaia2.desc=Kain Vinosec - Fight For Quiescence

src/main/resources/assets/botania/lang/nl_NL.lang

@@ -1653,6 +1653,8 @@ botania.potion.clear=Totaalheid
 botania.gui.lexicon.header=Lexica Botania, %s Editie Inhoudsopgave
 botania.gui.lexicon.wip=(Hier wordt nog aan gewerkt.)
 
+botania.gui.flowerBag.title=Bloementas
+
 # MUSIC DISCS
 item.record.botania:gaia1.desc=Kain Vinosec - Endure Emptiness
 item.record.botania:gaia2.desc=Kain Vinosec - Fight For Quiescence

src/main/resources/assets/botania/lang/pt_BR.lang

@@ -1693,6 +1693,8 @@ botania.potion.clear=Absolução
 botania.gui.lexicon.header=Lexica Botania, Edição %s - Índice
 botania.gui.lexicon.wip=(Esse tópico está em progresso. Nem ao menos está na forma final)
 
+botania.gui.flowerBag.title=Cesto de Flores
+
 # MUSIC DISCS
 item.record.botania:gaia1.desc=Kain Vinosec - Endure Emptiness
 item.record.botania:gaia2.desc=Kain Vinosec - Fight For Quiescence

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

@@ -31,6 +31,25 @@ botaniamisc.filter1=Предмет в рамке: игнорировать
 botaniamisc.filter2=Собирать любые предметы
 botaniamisc.creativePool0=Творческий бассейн маны, бесконечная мана
 botaniamisc.creativePool1=Достоин эгоиста
+botaniamisc.poolStorage=Хранит %s маны
+botaniamisc.spreaderTransfer=Передаёт %s маны за всплеск
+botaniamisc.spreaderLoss=Теряет %s маны за тик в полёте
+botania.generationRate.daybloom=Генерирует 1 ману каждые 12 тиков днём
+botania.generationRate.daybloomPrime=Генерирует 1 ману каждые 10 тиков днём
+botania.generationRate.nightshade=Генерирует 1 ману каждые 12 тиков ночью
+botania.generationRate.nightshadePrime=Генерирует 1 ману каждые 10 тиков ночью
+botania.generationRate.hydroangeas=Генерирует 1 ману каждые 2 тика, расходуя воду
+botania.generationRate.endoflame=Генерирует 3 маны каждые 2 тика, пока горит топливо
+botania.generationRate.thermalily=Генерирует 20 маны за тик из лавы, затем остывает
+botania.generationRate.arcanerose=Генерирует 50 маны за единицу опыта
+botania.generationRate.spectrolus=Генерирует 300 маны за блок шерсти нужного цвета
+botania.generationRate.munchdew=Генерирует 160 маны за съеденный блок листвы
+botania.generationRate.kekimurus=Генерирует 1800 маны за откушенный кусок торта
+botania.generationRate.rafflowsia=Генерирует 2100 маны за новый вид пассивного цветка, меньше при повторе
+botania.generationRate.narslimmus=Генерирует ману из природных слизней, тем больше, чем крупнее слизень
+botania.generationRate.gourmaryllis=Генерирует ману из еды, тем больше, чем сытнее
+botania.generationRate.entropinnyum=Генерирует 6500 маны за взрыв ТНТ
+botania.generationRate.dandelifeon=Генерирует 150 маны за поглощённое поколение клеток
 botaniamisc.savedByLaurel=Ваш Золотой Лавровый Венец исчезает, спасая Вас от смерти.
 botaniamisc.toolRank=Ранг: %s&7
 botaniamisc.edition=Издание %s
@@ -1704,6 +1723,8 @@ botania.potion.clear=Очищение
 botania.gui.lexicon.header=Лексика Botania, %s Выберите категорию:
 botania.gui.lexicon.wip=(Эта секция в разработке. Это даже не конечный вариант)
 
+botania.gui.flowerBag.title=Цветочный мешочек
+
 # MUSIC DISCS
 item.record.botania:gaia1.desc=Kain Vinosec - Endure Emptiness
 item.record.botania:gaia2.desc=Kain Vinosec - Fight For Quiescence

src/main/resources/assets/botania/lang/zh_CN.lang

@@ -1699,6 +1699,8 @@ botania.potion.clear=赦免
 botania.gui.lexicon.header=植物魔法辞典 第%s版 - 目录
 botania.gui.lexicon.wip=(本条目的编纂工作仍在进行,其当前内容仍未完全定稿)
 
+botania.gui.flowerBag.title=采花袋
+
 # MUSIC DISCS
 item.record.botania:gaia1.desc=Kain Vinosec - Endure Emptiness
 item.record.botania:gaia2.desc=Kain Vinosec - Fight For Quiescence

src/main/resources/assets/botania/lang/zh_TW.lang

@@ -1696,6 +1696,8 @@ botania.potion.clear=赦免
 botania.gui.lexicon.header=植物魔法辭典 第%s版 - 目錄
 botania.gui.lexicon.wip=(本條目的編纂工作仍在進行,其當前內容仍未完全定稿)
 
+botania.gui.flowerBag.title=採花袋
+
 # MUSIC DISCS
 item.record.botania:gaia1.desc=Kain Vinosec - Endure Emptiness
 item.record.botania:gaia2.desc=Kain Vinosec - Fight For Quiescence