upstream/NotEnoughEnergistics
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/NotEnoughEnergistics.git synced 2026-11-14 01:04:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix item loss when pulling NEI bookmarks into a full inventory (#92)

Browse Source
This commit is contained in:
Kogepan229 authored and GitHub committed 2026-10-26 16:02:48 +01:00
1 parent daf331d6aa
commit c22a5f8355
1 file changed
+26 -38
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/github/vfyjxf/nee/network/packet/PacketNEIBookmark.java
+26 -38
View File
@@ -1,6 +1,5 @@
package com.github.vfyjxf.nee.network.packet;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.inventory.Container;
import net.minecraft.item.ItemStack;
@@ -9,6 +8,7 @@ import net.minecraftforge.common.util.ForgeDirection;
import com.github.vfyjxf.nee.utils.ItemUtils;
import appeng.api.config.Actionable;
import appeng.api.networking.energy.IEnergySource;
import appeng.api.networking.security.BaseActionSource;
import appeng.api.storage.IMEMonitor;
@@ -21,8 +21,6 @@ import cpw.mods.fml.common.network.ByteBufUtils;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import cpw.mods.fml.relauncher.ReflectionHelper;
import cpw.mods.fml.relauncher.ReflectionHelper.UnableToFindFieldException;
import io.netty.buffer.ByteBuf;
public class PacketNEIBookmark implements IMessage {
@@ -61,52 +59,42 @@ public class PacketNEIBookmark implements IMessage {
if (monitor != null) {
final IEnergySource energy = monitorable.getPowerSource();
final BaseActionSource actionSource = monitorable.getActionSource();
final InventoryAdaptor playerInventory = InventoryAdaptor
.getAdaptor(player, ForgeDirection.UNKNOWN);
for (Object key : message.bookmarkItems.func_150296_c()) {
for (String key : message.bookmarkItems.func_150296_c()) {
final ItemStack bookmarkItem = ItemUtils
.loadItemStackFromNBT(message.bookmarkItems.getCompoundTag((String) key));
bookmarkItem.stackSize = getFreeStackSize(player, bookmarkItem);
.loadItemStackFromNBT(message.bookmarkItems.getCompoundTag(key));
if (bookmarkItem == null || bookmarkItem.stackSize <= 0) {
continue;
}
if (bookmarkItem.stackSize > 0) {
final AEItemStack requestStack = AEItemStack.create(bookmarkItem);
final IAEItemStack extractedStack = Platform
.poweredExtraction(energy, monitor, requestStack, actionSource);
final AEItemStack requestStack = AEItemStack.create(bookmarkItem);
final ItemStack overflow = playerInventory.simulateAdd(bookmarkItem);
if (overflow != null) {
requestStack.decStackSize(overflow.stackSize);
}
if (requestStack.getStackSize() <= 0) {
continue;
}
if (extractedStack != null) {
InventoryAdaptor.getAdaptor(player, ForgeDirection.UNKNOWN)
.addItems(extractedStack.getItemStack());
final IAEItemStack extractedStack = Platform
.poweredExtraction(energy, monitor, requestStack, actionSource);
if (extractedStack != null) {
final ItemStack leftover = playerInventory.addItems(extractedStack.getItemStack());
if (leftover != null) {
final IAEItemStack rejected = monitor
.injectItems(AEItemStack.create(leftover), Actionable.MODULATE, actionSource);
if (rejected != null) {
Platform.addToPlayerInvOrDrop(player, rejected.getItemStack());
}
}
}
}
}
}
return null;
}
private int getFreeStackSize(EntityPlayer player, ItemStack itemStack) {
int freeStackSize = 0;
for (ItemStack slotStack : player.inventory.mainInventory) {
if (slotStack == null) { // Empty slot, stack fits completely
freeStackSize += itemStack.getMaxStackSize();
} else if (slotStack.isItemEqual(itemStack)) {
freeStackSize += itemStack.getMaxStackSize() - slotStack.stackSize;
}
}
return Math.min(itemStack.stackSize, freeStackSize);
}
private IMEMonitor<IAEItemStack> getMonitor(Container container) {
try {
return (IMEMonitor<IAEItemStack>) ReflectionHelper.findField(container.getClass(), "monitor")
.get(container);
} catch (UnableToFindFieldException | IllegalAccessException e) {}
return null;
}
}
}