Upstream
/
Minestom
mirror of https://github.com/Minestom/Minestom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix double clicking and fix tests

This commit is contained in:
GoldenStack 2024-04-27 12:54:36 -05:00
parent ed225efb11
commit b728031ca5
2 changed files with 51 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/main/java/net/minestom/server/inventory/click/Click.java
View File

@ -115,19 +115,53 @@ public final class Click {
final int slot = packet.slot() == -999 ? -999 :
containerSize == null ? PlayerInventoryUtils.protocolToMinestom(packet.slot()) : packet.slot();
final int maxSize = containerSize != null ? containerSize + PlayerInventoryUtils.INNER_SIZE : PlayerInventoryUtils.INVENTORY_SIZE;
if (slot == -999) {
if (packet.clickType() == ClientClickWindowPacket.ClickType.PICKUP) {
if (button == 0) return new Info.LeftDropCursor();
if (button == 1) return new Info.RightDropCursor();
} else if (packet.clickType() == ClientClickWindowPacket.ClickType.CLONE) { // Why Mojang, why?
if (button == 2) return new Info.MiddleDropCursor();
}
}
final boolean valid = slot >= 0 && slot < maxSize;
if (!valid) return null;
if (!valid) {
return slot == -999 ? processInvalidSlot(packet.clickType(), button) : null;
}
return process(packet.clickType(), slot, button);
}
private @Nullable Click.Info processInvalidSlot(@NotNull ClientClickWindowPacket.ClickType type, byte button) {
return switch (type) {
case PICKUP -> {
if (button == 0) yield new Info.LeftDropCursor();
if (button == 1) yield new Info.RightDropCursor();
yield null;
}
case CLONE -> {
if (button == 2) yield new Info.MiddleDropCursor(); // Why Mojang, why?
yield null;
}
case QUICK_CRAFT -> {
// Trust me, a switch would not make this cleaner
if (button == 2) {
var list = List.copyOf(leftDrag);
leftDrag.clear();
yield new Info.LeftDrag(list);
} else if (button == 6) {
var list = List.copyOf(rightDrag);
rightDrag.clear();
yield new Info.RightDrag(list);
} else if (button == 10) {
var list = List.copyOf(middleDrag);
middleDrag.clear();
yield new Info.MiddleDrag(list);
}
if (button == 0) leftDrag.clear();
if (button == 4) rightDrag.clear();
if (button == 8) middleDrag.clear();
yield null;
}
default -> null;
};
}
/**
* Processes a packet into click info.
*
@ -156,26 +190,7 @@ public final class Click {
case CLONE -> new Info.Middle(slot);
case THROW -> new Info.DropSlot(slot, button == 1);
case QUICK_CRAFT -> {
// Handle drag finishes
if (button == 2) {
var list = List.copyOf(leftDrag);
leftDrag.clear();
yield new Info.LeftDrag(list);
} else if (button == 6) {
var list = List.copyOf(rightDrag);
rightDrag.clear();
yield new Info.RightDrag(list);
} else if (button == 10) {
var list = List.copyOf(middleDrag);
middleDrag.clear();
yield new Info.MiddleDrag(list);
}
switch (button) {
case 0 -> leftDrag.clear();
case 4 -> rightDrag.clear();
case 8 -> middleDrag.clear();
case 1 -> leftDrag.add(slot);
case 5 -> rightDrag.add(slot);
case 9 -> middleDrag.add(slot);

11
src/test/java/net/minestom/server/inventory/click/ClickPreprocessorTest.java
View File

@ -1,6 +1,7 @@
package net.minestom.server.inventory.click;
import it.unimi.dsi.fastutil.ints.IntList;
import net.minestom.server.MinecraftServer;
import net.minestom.server.entity.GameMode;
import org.junit.jupiter.api.Test;
@ -9,6 +10,10 @@ import static net.minestom.server.network.packet.client.play.ClientClickWindowPa
public class ClickPreprocessorTest {
static {
MinecraftServer.init();
}
@Test
public void testPickupType() {
assertProcessed(new Click.Info.LeftDropCursor(), clickPacket(PICKUP, 1, 0, -999));
@ -80,17 +85,17 @@ public class ClickPreprocessorTest {
assertProcessed(processor, player, null, clickPacket(QUICK_CRAFT, 1, 0, 0));
assertProcessed(processor, player, null, clickPacket(QUICK_CRAFT, 1, 1, 0));
assertProcessed(processor, player, null, clickPacket(QUICK_CRAFT, 1, 1, 1));
assertProcessed(processor, player, new Click.Info.LeftDrag(IntList.of(0, 1)), clickPacket(QUICK_CRAFT, 1, 2, 0));
assertProcessed(processor, player, new Click.Info.LeftDrag(IntList.of(0, 1)), clickPacket(QUICK_CRAFT, 1, 2, -999));
assertProcessed(processor, player, null, clickPacket(QUICK_CRAFT, 1, 4, 0));
assertProcessed(processor, player, null, clickPacket(QUICK_CRAFT, 1, 5, 0));
assertProcessed(processor, player, null, clickPacket(QUICK_CRAFT, 1, 5, 1));
assertProcessed(processor, player, new Click.Info.RightDrag(IntList.of(0, 1)), clickPacket(QUICK_CRAFT, 1, 6, 0));
assertProcessed(processor, player, new Click.Info.RightDrag(IntList.of(0, 1)), clickPacket(QUICK_CRAFT, 1, 6, -999));
assertProcessed(processor, player, null, clickPacket(QUICK_CRAFT, 1, 8, 0));
assertProcessed(processor, player, null, clickPacket(QUICK_CRAFT, 1, 9, 0));
assertProcessed(processor, player, null, clickPacket(QUICK_CRAFT, 1, 9, 1));
assertProcessed(processor, player, new Click.Info.MiddleDrag(IntList.of(0, 1)), clickPacket(QUICK_CRAFT, 1, 10, 0));
assertProcessed(processor, player, new Click.Info.MiddleDrag(IntList.of(0, 1)), clickPacket(QUICK_CRAFT, 1, 10, -999));
}
}