Anvilcraft/equivalent-exchange-3
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Closes #714 and #719 thanks Dynious!

Browse source
This commit is contained in:
pahimar 2015-04-10 08:32:55 -04:00
parent 6ab52f0dc1
commit 86d07610ec
2 changed files with 38 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/com/pahimar/ee3/handler/ItemEventHandler.java
View file

@ -1,5 +1,6 @@
package com.pahimar.ee3.handler;
import com.pahimar.ee3.inventory.ContainerAlchemicalBag;
import com.pahimar.ee3.util.NBTHelper;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent;
@ -14,6 +15,17 @@ public class ItemEventHandler
public void onItemTossEvent(ItemTossEvent itemTossEvent)
{
NBTHelper.clearStatefulNBTTags(itemTossEvent.entityItem.getEntityItem());
//Close the Alchemical Bag GUI when the Alchemical bag is tossed
if (itemTossEvent.player.openContainer instanceof ContainerAlchemicalBag)
{
if (((ContainerAlchemicalBag) itemTossEvent.player.openContainer).isItemStackParent(itemTossEvent.entityItem.getEntityItem()))
{
//We have to remove the itemstack we are throwing from the inventory now to prevent a loop (will also happen after this event has been fired)
itemTossEvent.player.inventory.setItemStack(null);
itemTossEvent.player.closeScreen();
}
}
}
@SubscribeEvent

60
src/main/java/com/pahimar/ee3/inventory/ContainerAlchemicalBag.java
View file

@ -2,14 +2,16 @@ package com.pahimar.ee3.inventory;
import com.pahimar.ee3.item.ItemAlchemicalBag;
import com.pahimar.ee3.reference.Names;
import com.pahimar.ee3.util.ItemHelper;
import com.pahimar.ee3.util.NBTHelper;
import cpw.mods.fml.common.FMLCommonHandler;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import java.util.UUID;
public class ContainerAlchemicalBag extends ContainerEE
{
// Small Bag
@ -22,7 +24,7 @@ public class ContainerAlchemicalBag extends ContainerEE
public static final int LARGE_BAG_INVENTORY_ROWS = 9;
public static final int LARGE_BAG_INVENTORY_COLUMNS = 13;
private final EntityPlayer entityPlayer;
protected final InventoryAlchemicalBag inventoryAlchemicalBag;
public final InventoryAlchemicalBag inventoryAlchemicalBag;
private int bagInventoryRows;
private int bagInventoryColumns;
@ -75,15 +77,15 @@ public class ContainerAlchemicalBag extends ContainerEE
{
if (inventoryAlchemicalBag.parentItemStack.getItemDamage() == 0)
{
this.addSlotToContainer(new SlotPlayerInventory(this, entityPlayer.inventory, inventoryColumnIndex + inventoryRowIndex * 9 + 9, 35 + inventoryColumnIndex * 18, 104 + inventoryRowIndex * 18));
this.addSlotToContainer(new Slot(entityPlayer.inventory, inventoryColumnIndex + inventoryRowIndex * 9 + 9, 35 + inventoryColumnIndex * 18, 104 + inventoryRowIndex * 18));
}
else if (inventoryAlchemicalBag.parentItemStack.getItemDamage() == 1)
{
this.addSlotToContainer(new SlotPlayerInventory(this, entityPlayer.inventory, inventoryColumnIndex + inventoryRowIndex * 9 + 9, 35 + inventoryColumnIndex * 18, 158 + inventoryRowIndex * 18));
this.addSlotToContainer(new Slot(entityPlayer.inventory, inventoryColumnIndex + inventoryRowIndex * 9 + 9, 35 + inventoryColumnIndex * 18, 158 + inventoryRowIndex * 18));
}
else if (inventoryAlchemicalBag.parentItemStack.getItemDamage() == 2)
{
this.addSlotToContainer(new SlotPlayerInventory(this, entityPlayer.inventory, inventoryColumnIndex + inventoryRowIndex * 9 + 9, 44 + inventoryColumnIndex * 18, 174 + inventoryRowIndex * 18));
this.addSlotToContainer(new Slot(entityPlayer.inventory, inventoryColumnIndex + inventoryRowIndex * 9 + 9, 44 + inventoryColumnIndex * 18, 174 + inventoryRowIndex * 18));
}
}
}
@ -93,15 +95,15 @@ public class ContainerAlchemicalBag extends ContainerEE
{
if (inventoryAlchemicalBag.parentItemStack.getItemDamage() == 0)
{
this.addSlotToContainer(new SlotPlayerInventory(this, entityPlayer.inventory, actionBarSlotIndex, 35 + actionBarSlotIndex * 18, 162));
this.addSlotToContainer(new Slot(entityPlayer.inventory, actionBarSlotIndex, 35 + actionBarSlotIndex * 18, 162));
}
else if (inventoryAlchemicalBag.parentItemStack.getItemDamage() == 1)
{
this.addSlotToContainer(new SlotPlayerInventory(this, entityPlayer.inventory, actionBarSlotIndex, 35 + actionBarSlotIndex * 18, 216));
this.addSlotToContainer(new Slot(entityPlayer.inventory, actionBarSlotIndex, 35 + actionBarSlotIndex * 18, 216));
}
else if (inventoryAlchemicalBag.parentItemStack.getItemDamage() == 2)
{
this.addSlotToContainer(new SlotPlayerInventory(this, entityPlayer.inventory, actionBarSlotIndex, 44 + actionBarSlotIndex * 18, 232));
this.addSlotToContainer(new Slot(entityPlayer.inventory, actionBarSlotIndex, 44 + actionBarSlotIndex * 18, 232));
}
}
}
@ -130,6 +132,16 @@ public class ContainerAlchemicalBag extends ContainerEE
}
}
public boolean isItemStackParent(ItemStack itemStack)
{
if (NBTHelper.hasUUID(itemStack))
{
UUID stackUUID = new UUID(itemStack.getTagCompound().getLong(Names.NBT.UUID_MOST_SIG), itemStack.getTagCompound().getLong(Names.NBT.UUID_LEAST_SIG));
return inventoryAlchemicalBag.matchesUUID(stackUUID);
}
return false;
}
@Override
public ItemStack transferStackInSlot(EntityPlayer entityPlayer, int slotIndex)
{
@ -204,17 +216,14 @@ public class ContainerAlchemicalBag extends ContainerEE
}
@Override
public void onPickupFromSlot(EntityPlayer entityPlayer, ItemStack itemStack)
public void onSlotChanged()
{
super.onPickupFromSlot(entityPlayer, itemStack);
containerAlchemicalBag.saveInventory(entityPlayer);
}
super.onSlotChanged();
@Override
public void putStack(ItemStack itemStack)
{
super.putStack(itemStack);
containerAlchemicalBag.saveInventory(entityPlayer);
if (FMLCommonHandler.instance().getEffectiveSide().isServer())
{
containerAlchemicalBag.saveInventory(entityPlayer);
}
}
/**
@ -226,21 +235,4 @@ public class ContainerAlchemicalBag extends ContainerEE
return !(itemStack.getItem() instanceof ItemAlchemicalBag);
}
}
private class SlotPlayerInventory extends Slot
{
private ContainerAlchemicalBag containerAlchemicalBag;
public SlotPlayerInventory(ContainerAlchemicalBag containerAlchemicalBag, IInventory inventory, int slotIndex, int x, int y)
{
super(inventory, slotIndex, x, y);
this.containerAlchemicalBag = containerAlchemicalBag;
}
@Override
public boolean canTakeStack(EntityPlayer entityPlayer)
{
return !ItemHelper.equals(this.getStack(), containerAlchemicalBag.inventoryAlchemicalBag.parentItemStack);
}
}
}