From 49181f3df6dde72a9fed8937591f99036dc8e939 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 --- .../container/ContainerFluidConfigurable.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) 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..1a589258 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,22 @@ public abstract class ContainerFluidConfigurable extends ContainerUpgradeable { break; } } + this.standardDetectAndSendChanges(); + return null; + } else { + if(idx < this.availableUpgrades()){ + if(!mergeItemStack(tis, this.getFakeFluidInv().getSizeInventory()+this.availableUpgrades(), this.inventorySlots.size(), false)) return null; + }else if(idx>=this.getFakeFluidInv().getSizeInventory()+this.availableUpgrades()){ + if(!mergeItemStack(tis, 0, this.availableUpgrades(), false)) return null; + } + if (tis.stackSize == 0) { + clickSlot.putStack(null); + } else { + clickSlot.onSlotChanged(); + } + this.standardDetectAndSendChanges(); + return tis; } - this.standardDetectAndSendChanges(); - return null; } protected void setupConfig()