Simplify offhand swapping #5772
Open
Conversation
This file contains 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
TheLimeGlass
changed the title
TheLimeGlass
added
enhancement
Moderocky
requested changes
Sep 8, 2023
Moderocky
force-pushed
the
master
branch
3 times, most recently
from
bd134d0
to
3f08853
Compare
|
Closing due to inactivity. |
TheLimeGlass
requested review from
Moderocky,
sovdeeth,
AyhamAl-Ali and
APickledWalrus
sovdeeth
requested changes
Jul 18, 2024
| } else if (inventoryClickEvent.getClick() == ClickType.SWAP_OFFHAND) { | ||
| PlayerInventory inventory = inventoryClickEvent.getWhoClicked().getInventory(); | ||
| return new InventorySlot(inventory, inventoryClickEvent.getSlot()); | ||
| } else if (inventoryClickEvent.getSlot() == EquipmentSlot.EquipSlot.OFF_HAND.slotNumber) { |
There was a problem hiding this comment.
What about the case where another slot is being double clicked to collect_to_cursor, which pulls from the offhand? Currently it just says null for the future offhand tool.
There was a problem hiding this comment.
I don't believe Spigot/Minecraft has an API for determining the slots a double click is pulling from.
There was a problem hiding this comment.
Yeah you'd have to manually write checks for this (from my experience with skript-gui)
Moderocky
reviewed
Aug 15, 2024
Fusezion
suggested changes
Aug 15, 2024
sovdeeth
requested changes
Sep 13, 2024
| @@ -18,18 +18,6 @@ | |||
| */ | |||
| case PLACE_ONE: | ||
| case PLACE_SOME: | ||
| case SWAP_WITH_CURSOR: | ||
| return new CursorSlot((Player) inventoryClickEvent.getWhoClicked(), inventoryClickEvent.getCurrentItem()); |
There was a problem hiding this comment.
This should be returning the value of the future offhand slot. Right now it's returning the future cursor slot.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Simplify number key and swap offhand inventory click events.
So this may be hard to understand, but i'll explain.
I was helping a Skript user on SkUnity Discord and their problem was a hard understanding of how to only cancel an event when a specific item was swapped using the number keys in an inventory click event from the hotbar to the offhand player slot when having the player's inventory open, and the only solution was;
This pull request simplifies this process with
This will mean no matter how the click event happens, if the offhand is modified, it'll be tracked with this future state.
I also removed the default expression from the setTime as it makes no sense to restrict it here. This basically means that
offhand itemwould have worked andoffhand item of playerwould not, because it would only work if it was a default expression. It now works for both.Target Minecraft Versions: any
Requirements: none
Related Issues: none