From 4c4ac530d1aa7eeadf82c64496faa30ca977a0c5 Mon Sep 17 00:00:00 2001 From: CJ Apar Date: Mon, 12 Jun 2023 23:58:01 -0700 Subject: [PATCH 1/4] Fixed issue with Give Air message when trying to grab an item with a full stack on the cursor. --- src/main/java/mezz/jei/util/CommandUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/mezz/jei/util/CommandUtil.java b/src/main/java/mezz/jei/util/CommandUtil.java index bc5db3041..1945d5072 100644 --- a/src/main/java/mezz/jei/util/CommandUtil.java +++ b/src/main/java/mezz/jei/util/CommandUtil.java @@ -57,7 +57,9 @@ public static void setHotbarStack(ItemStack itemStack, int hotbarSlot) { if (ServerInfo.isJeiOnServer()) { ItemStack sendStack = ItemHandlerHelper.copyStackWithSize(itemStack, itemStack.getMaxStackSize()); PacketSetHotbarItemStack packet = new PacketSetHotbarItemStack(sendStack, hotbarSlot); - Network.sendPacketToServer(packet); + if (player.inventoryMenu.getCarried().getCount() < player.inventoryMenu.getCarried().getMaxStackSize()-1) { + Network.sendPacketToServer(packet); + } } } From 5629640d893a261671055508ec39b41e677c2885 Mon Sep 17 00:00:00 2001 From: CJ Apar Date: Tue, 13 Jun 2023 00:12:54 -0700 Subject: [PATCH 2/4] Fixed issue with Give Air message when trying to grab an item with a full stack on the cursor. --- src/main/java/mezz/jei/util/CommandUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mezz/jei/util/CommandUtil.java b/src/main/java/mezz/jei/util/CommandUtil.java index 1945d5072..350ff547d 100644 --- a/src/main/java/mezz/jei/util/CommandUtil.java +++ b/src/main/java/mezz/jei/util/CommandUtil.java @@ -57,7 +57,7 @@ public static void setHotbarStack(ItemStack itemStack, int hotbarSlot) { if (ServerInfo.isJeiOnServer()) { ItemStack sendStack = ItemHandlerHelper.copyStackWithSize(itemStack, itemStack.getMaxStackSize()); PacketSetHotbarItemStack packet = new PacketSetHotbarItemStack(sendStack, hotbarSlot); - if (player.inventoryMenu.getCarried().getCount() < player.inventoryMenu.getCarried().getMaxStackSize()-1) { + if (player.inventoryMenu.getCarried().getCount() < player.inventoryMenu.getCarried().getMaxStackSize()) { Network.sendPacketToServer(packet); } } From 236a18648d8b22bfe96cc0d73483a6bf555dd49e Mon Sep 17 00:00:00 2001 From: CJ Apar Date: Tue, 13 Jun 2023 00:38:26 -0700 Subject: [PATCH 3/4] test commit. changed email. --- src/main/java/mezz/jei/util/CommandUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/mezz/jei/util/CommandUtil.java b/src/main/java/mezz/jei/util/CommandUtil.java index 350ff547d..bf8e3216e 100644 --- a/src/main/java/mezz/jei/util/CommandUtil.java +++ b/src/main/java/mezz/jei/util/CommandUtil.java @@ -57,6 +57,7 @@ public static void setHotbarStack(ItemStack itemStack, int hotbarSlot) { if (ServerInfo.isJeiOnServer()) { ItemStack sendStack = ItemHandlerHelper.copyStackWithSize(itemStack, itemStack.getMaxStackSize()); PacketSetHotbarItemStack packet = new PacketSetHotbarItemStack(sendStack, hotbarSlot); + // test commit if (player.inventoryMenu.getCarried().getCount() < player.inventoryMenu.getCarried().getMaxStackSize()) { Network.sendPacketToServer(packet); } From 63b25bd24647a26ad806ff5301f5645e9d2431bd Mon Sep 17 00:00:00 2001 From: CJ Apar Date: Tue, 13 Jun 2023 00:39:17 -0700 Subject: [PATCH 4/4] Removed comment for test commit. --- src/main/java/mezz/jei/util/CommandUtil.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/mezz/jei/util/CommandUtil.java b/src/main/java/mezz/jei/util/CommandUtil.java index bf8e3216e..350ff547d 100644 --- a/src/main/java/mezz/jei/util/CommandUtil.java +++ b/src/main/java/mezz/jei/util/CommandUtil.java @@ -57,7 +57,6 @@ public static void setHotbarStack(ItemStack itemStack, int hotbarSlot) { if (ServerInfo.isJeiOnServer()) { ItemStack sendStack = ItemHandlerHelper.copyStackWithSize(itemStack, itemStack.getMaxStackSize()); PacketSetHotbarItemStack packet = new PacketSetHotbarItemStack(sendStack, hotbarSlot); - // test commit if (player.inventoryMenu.getCarried().getCount() < player.inventoryMenu.getCarried().getMaxStackSize()) { Network.sendPacketToServer(packet); }