Fix bag dupe

For real this time. I'm pretty sure

Author: KryptonCaptain

build.gradle

@@ -17,7 +17,7 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "1.2.4"
+version = "1.2.5"
 group= "blusunrize"
 archivesBaseName = "WitchingGadgets-1.7.10"
 

src/main/java/witchinggadgets/common/gui/ContainerBag.java

@@ -7,6 +7,7 @@
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
+import witchinggadgets.common.WGContent;
 import witchinggadgets.common.items.tools.ItemBag;
 
 public class ContainerBag extends Container
@@ -26,7 +27,7 @@ public ContainerBag(InventoryPlayer iinventory, World world)
 		this.blockedSlot = (iinventory.currentItem + 45);
 
 		for (int a = 0; a < pouchSlotAmount; a++) {
-			this.addSlotToContainer(new Slot(this.input, a, 35 + a % 6 * 18, 9 + a/6 * 18));
+			this.addSlotToContainer(new SlotBag(this.input, this, a, 35 + a % 6 * 18, 9 + a/6 * 18));
 		}
 
 		bindPlayerInventory(iinventory);
@@ -107,11 +108,32 @@ public void onContainerClosed(EntityPlayer par1EntityPlayer)
 		if (!this.worldObj.isRemote)
 		{
 			((ItemBag)this.pouch.getItem()).setStoredItems(this.pouch, ((InventoryBag)this.input).stackList);
-
+			/*
 			if (!this.player.getCurrentEquippedItem().equals(this.pouch))
 				this.player.setCurrentItemOrArmor(0, this.pouch);
+			*/
 			this.player.inventory.markDirty();
 		}
 	}
+	
+	
+	private boolean isHoldingPouch() {
+		ItemStack is = this.player.getHeldItem();
+		return (is != null) && (is.getItem() == WGContent.ItemBag);
+	}
+	
+	public void detectAndSendChanges() {
+		super.detectAndSendChanges();
+		if ((!this.player.worldObj.isRemote) && (!isHoldingPouch())) {
+			this.player.closeScreen();
+		}
+	}
+	
+	public void saveCharmPouch() {
+        if (!this.player.worldObj.isRemote && this.isHoldingPouch()) {
+        	this.player.setCurrentItemOrArmor(0, this.pouch);
+        	//ItemBag.setStoredItems(this.player.getHeldItem(), new ItemStack[] { this.charmInv.getStackInSlot(0), this.charmInv.getStackInSlot(1), this.charmInv.getStackInSlot(2) });
+        }
+    }
 
 }

src/main/java/witchinggadgets/common/gui/SlotBag.java

@@ -0,0 +1,19 @@
+package witchinggadgets.common.gui;
+
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+
+public class SlotBag extends Slot
+{
+    private final ContainerBag pouchContainer;
+    
+    public SlotBag(final IInventory inv, final ContainerBag bagContainer, final int id, final int x, final int z) {
+        super(inv, id, x, z);
+        this.pouchContainer = bagContainer;
+    }
+    
+    public void onSlotChanged() {
+        super.onSlotChanged();
+        this.pouchContainer.saveCharmPouch();
+    }
+}

src/main/java/witchinggadgets/common/items/tools/ItemBag.java

@@ -180,7 +180,7 @@ public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List l
 		}
 	}
 
-	public ItemStack[] getStoredItems(ItemStack item)	
+	public static ItemStack[] getStoredItems(ItemStack item)	
 	{
 		ItemStack[] stackList = new ItemStack[18];
 
@@ -202,7 +202,7 @@ public ItemStack[] getStoredItems(ItemStack item)
 		return stackList;
 	}
 
-	public void setStoredItems(ItemStack item, ItemStack[] stackList)
+	public static void setStoredItems(ItemStack item, ItemStack[] stackList)
 	{
 		NBTTagList inv = new NBTTagList();