From 92e5c4adc77e61534c3de185d841216d2e8addfb Mon Sep 17 00:00:00 2001 From: zy <854865755@163.com> Date: Sat, 3 Sep 2022 18:55:42 +0800 Subject: [PATCH] add fluid bus shift click transfer upgrade card into the slot --- .../gui/container/ContainerFluidConfigurable.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidConfigurable.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidConfigurable.java index d4818dc6..a5952662 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidConfigurable.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidConfigurable.java @@ -18,6 +18,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -41,6 +43,7 @@ public abstract class ContainerFluidConfigurable extends ContainerUpgradeable { ItemStack tis = clickSlot.getStack(); FluidStack fs = Util.getFluidFromItem(tis); + ItemStack itemstack = tis.copy();; if( fs != null ) { final AppEngInternalAEInventory inv = this.getFakeFluidInv(); @@ -57,9 +60,17 @@ public abstract class ContainerFluidConfigurable extends ContainerUpgradeable { break; } } + } else { + if(!mergeItemStack(itemstack, 0, this.inventorySlots.size(), false)) return null; + Slot slot = (Slot) this.inventorySlots.get(idx); + if (itemstack.stackSize == 0) { + slot.putStack(null); + } else { + slot.onSlotChanged(); + } } this.standardDetectAndSendChanges(); - return null; + return itemstack; } protected void setupConfig()