Skip to content

Clean up NEI handlers#131

Merged
Dream-Master merged 32 commits into
masterfrom
nei
Jun 4, 2026
Merged

Clean up NEI handlers#131
Dream-Master merged 32 commits into
masterfrom
nei

Conversation

@koolkrafter5
Copy link
Copy Markdown

See the commit messages for all improvements.

Highlights:
Show lexicon entries when finding uses or recipes for items.
Let the Floating Flower handler use the overlay button to autocomplete recipes in the inventory/crafting table grid.
Fix transfer rects and prevent machines like the Mana Pool and Runic Altar from being added to bookmarked recipes for most handlers by rendering them in the background graphics step instead of adding them to the ingredients of the recipe.
Add seeds/livingrock to apothecary/runic handlers with a custom tooltip for seeds (can be changed with a lang key):
image
image

Most changes are fixing whitespace. Check this out to ignore the whitespace changes when reviewing. We really need to enable spotless because we will never actually sync with or contribute to upstream Botania from this fork due to the radical differences between them. New features already need to be backported manually (like the improvements to the Rosa Arcana) rather than being able to just cherrypick a commit or two.

GTNH's full pack works fine with these changes. I also already tested this with the Alfheim addon and needed to walk back some of my changes to make it work, since it extends the Petal Apothecary handler and what I can only assume is Kotlin nonsense didn't like my changes even though it should have been compatible. If somebody has a better solution that axes the stupid addCenterItem param for CachedPetalApothecaryRecipe and CachedRunicAltarRecipe, I'm all ears.

@koolkrafter5 koolkrafter5 requested a review from a team March 21, 2026 05:31
@koolkrafter5 koolkrafter5 added the enhancement New feature or request label Mar 21, 2026
@Dream-Master Dream-Master added the 🚧 Testing on Zeta Do not merge yet, testing this PR on Zeta label May 7, 2026
@Nikolay-Sitnikov Nikolay-Sitnikov self-assigned this May 19, 2026
Comment thread src/main/java/vazkii/botania/client/integration/nei/NEIHelper.java Outdated
…d jdk and using SecureRandom before comparing against a static hash was broken. I needed to make a new solution for it, see the comment on onEquipped.
Comment thread src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java Outdated
Comment thread gradle.properties Outdated
Copy link
Copy Markdown

@Nikolay-Sitnikov Nikolay-Sitnikov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this works well. Preferably, we'd also have the Botanical Brewery recipes display or cycle through the different possible flasks, but that can be a later PR.

@Dream-Master Dream-Master merged commit ffdce18 into master Jun 4, 2026
2 checks passed
@Dream-Master Dream-Master removed the 🚧 Testing on Zeta Do not merge yet, testing this PR on Zeta label Jun 4, 2026
@Dream-Master Dream-Master deleted the nei branch June 4, 2026 17:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants