26.1 Slot Modification and GUI fixes#10
Merged
Patbox merged 19 commits intoPatbox:mainfrom Apr 12, 2026
Merged
Conversation
…ts because of its presence, remove attributes for trinkets dropped from inventory resizing
…he same UUID if another trinket also has that attribute.
Prevents dropping trinkets when left clicking if their hover-slots extend past the inventory bounds.
… prevent the Recipe Book from intercepting trinket slot clicks.
Also, prevent rendering of trinket slots above recipe book if in narrow mode.
Resolves issues with double-click collection of stackable trinkets leaving attributes if a prior update would have removed its slot.
…han default. For example, from trinkets that grant additional slots.
…load, not the old.
…rop-modifier-fix # Conflicts: # src/main/java/eu/pb4/trinkets/impl/LivingEntityTrinketAttachment.java
…ots until after queried.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR contains many of the same changes as emilyploszaj#411, with most only undergoing changes to adapt the existing fixes to the new codebase.
Additionally, extra trinket slots no longer render when the Recipe Book is open, and the hover-slots no longer show up when mousing over where they would be under a narrow-view Recipe Book screen rendering over the top of the inventory window. When an item from a removed slot is handled, the previously held item is removed from tracking - this prevents it from being handled again if the slot is re-added.
The least polished part is likely the fix for crashing upon datapack reload with a number of Trinket Slots that doesn't match the default - for example, by having a trinket that modifies slot count equipped - which makes TrinketInventoryImpl.copyFrom() copy forced slot counts, and sends a SyncInventoryPayload before the SyncSlotsPlayload upon datapack refresh. Finally, old inventory invalidation has been moved to be set after the SlotReferences are created for the relevant dropped slots.
NOTE: not quite tested yet for NeoForge with the latest updates re: cached slotaccesses, working on it.