Skip to content

Commit e720d12

Browse files
committed
fix: use right click on bundles when client sorting
closes #19
1 parent 4b8e597 commit e720d12

2 files changed

Lines changed: 12 additions & 2 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
- Remove sort buttons from Traveler's Backpack screens (#22 - see #23 for full support in future).
1+
- Remove sort buttons from Traveler's Backpack screens (#22 - see #23 for full support in future).
2+
- Fix bundles when client sorting (#19).

common/src/client/java/io/github/jamalam360/sort_it_out/client/ClientPacketWorkQueue.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
99
import net.minecraft.network.HashedStack;
1010
import net.minecraft.network.protocol.game.ServerboundContainerClickPacket;
11+
import net.minecraft.tags.ItemTags;
1112
import net.minecraft.world.inventory.AbstractContainerMenu;
1213
import net.minecraft.world.inventory.ClickType;
1314
import net.minecraft.world.item.ItemStack;
@@ -82,11 +83,19 @@ public ServerboundContainerClickPacket toPacket() {
8283
this.menu().containerId,
8384
this.menu().getStateId(),
8485
Shorts.checkedCast(this.slot()),
85-
SignedBytes.checkedCast(GLFW.GLFW_MOUSE_BUTTON_LEFT),
86+
SignedBytes.checkedCast(getPlaceButton(newSlotItem, newCarriedItem)),
8687
ClickType.PICKUP,
8788
Int2ObjectMaps.singleton(this.slot(), HashedStack.create(this.newSlotItem(), Minecraft.getInstance().getConnection().decoratedHashOpsGenenerator())),
8889
HashedStack.create(this.newCarriedItem(), Minecraft.getInstance().getConnection().decoratedHashOpsGenenerator())
8990
);
9091
}
92+
93+
private static int getPlaceButton(ItemStack stack1, ItemStack stack2) {
94+
if ((stack1.is(ItemTags.BUNDLES) && !stack2.isEmpty()) || (stack2.is(ItemTags.BUNDLES) && !stack1.isEmpty())) {
95+
return GLFW.GLFW_MOUSE_BUTTON_RIGHT;
96+
} else {
97+
return GLFW.GLFW_MOUSE_BUTTON_LEFT;
98+
}
99+
}
91100
}
92101
}

0 commit comments

Comments
 (0)