From ff39121fc88192e057a89d15880ef3c11422e764 Mon Sep 17 00:00:00 2001
From: TomyLobo <tomylobo@nurfuerspam.de>
Date: Thu, 3 Nov 2011 15:48:41 +0100
Subject: [PATCH] Begun adding support for data/damage values to the blockbag.

---
 .../java/com/sk89q/worldedit/EditSession.java |  2 +-
 .../com/sk89q/worldedit/bags/BlockBag.java    | 26 ++++--
 .../bukkit/BukkitPlayerBlockBag.java          | 83 ++++++++++++-------
 3 files changed, 72 insertions(+), 39 deletions(-)

diff --git a/src/main/java/com/sk89q/worldedit/EditSession.java b/src/main/java/com/sk89q/worldedit/EditSession.java
index 96d93d3ba..e7630da40 100644
--- a/src/main/java/com/sk89q/worldedit/EditSession.java
+++ b/src/main/java/com/sk89q/worldedit/EditSession.java
@@ -209,7 +209,7 @@ public class EditSession {
 
             if (existing > 0) {
                 try {
-                    blockBag.storeDroppedBlock(existing);
+                    blockBag.storeDroppedBlock(existing, world.getBlockData(pt));
                 } catch (BlockBagException e) {
                 }
             }
diff --git a/src/main/java/com/sk89q/worldedit/bags/BlockBag.java b/src/main/java/com/sk89q/worldedit/bags/BlockBag.java
index dab52adb6..26fa77f1b 100644
--- a/src/main/java/com/sk89q/worldedit/bags/BlockBag.java
+++ b/src/main/java/com/sk89q/worldedit/bags/BlockBag.java
@@ -32,13 +32,15 @@ public abstract class BlockBag {
      * Stores a block as if it was mined.
      * 
      * @param id
+     * @param data 
      * @throws BlockBagException
      */
-    public void storeDroppedBlock(int id) throws BlockBagException {
-        int dropped = BlockType.getDroppedBlock(id);
-        if (dropped > 0) {
-            storeBlock(dropped);
-        }
+    public void storeDroppedBlock(int id, int data) throws BlockBagException {
+        BaseItem dropped = BlockType.getDroppedBlock(id, data);
+        if (dropped == null) return;
+        if (dropped.getType() == BlockID.AIR) return;
+
+        storeItem(dropped);
     }
     
     /**
@@ -122,7 +124,19 @@ public abstract class BlockBag {
      * @param id
      * @throws BlockBagException 
      */
-    public abstract void storeBlock(int id) throws BlockBagException;
+    public void storeBlock(int id) throws BlockBagException {
+        storeItem(new BaseItem(id));
+    }
+    
+    /**
+     * Store a block.
+     * 
+     * @param item
+     * @throws BlockBagException 
+     */
+    public void storeItem(BaseItem item) throws BlockBagException {
+        storeBlock(item.getType());
+    }
     
     /**
      * Checks to see if a block exists without removing it.
diff --git a/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayerBlockBag.java b/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayerBlockBag.java
index c6af1f0be..08f682a44 100644
--- a/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayerBlockBag.java
+++ b/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayerBlockBag.java
@@ -23,6 +23,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.bags.*;
+import com.sk89q.worldedit.blocks.BaseItem;
+import com.sk89q.worldedit.blocks.BaseItemStack;
 import com.sk89q.worldedit.blocks.BlockID;
 
 public class BukkitPlayerBlockBag extends BlockBag {
@@ -114,53 +116,70 @@ public class BukkitPlayerBlockBag extends BlockBag {
      * @param id
      */
     @Override
-    public void storeBlock(int id) throws BlockBagException {
+    public void storeItem(BaseItem item) throws BlockBagException {
+        final int id = item.getType();
+        final int damage = item.getDamage();
+        int amount = (item instanceof BaseItemStack) ? ((BaseItemStack) item).getAmount() : 1;
+        assert(amount <= 64);
+        boolean usesDamageValue = false; // TODO: Use ItemType.usesDamageValue once it's fixed.
+
         if (id == BlockID.AIR) {
             throw new IllegalArgumentException("Can't store air block");
         }
-        
+
         loadInventory();
-        
-        boolean found = false;
+
         int freeSlot = -1;
-        
+
         for (int slot = 0; slot < items.length; ++slot) {
-            ItemStack item = items[slot];
-            
-            // Delay using up a free slot until we know there are no stacks
-            // of this item to merge into
-            if (item == null) {
+            ItemStack bukkitItem = items[slot];
+
+            if (bukkitItem == null) {
+                // Delay using up a free slot until we know there are no stacks
+                // of this item to merge into
+                
                 if (freeSlot == -1) {
                     freeSlot = slot;
                 }
                 continue;
             }
-            
-            if (item.getTypeId() == id) {
-                int amount = item.getAmount();
-                
-                // Unlimited
-                if (amount < 0) {
-                    return;
-                }
-                
-                if (amount < 64) {
-                    item.setAmount(amount + 1);
-                    found = true;
-                    break;
-                }
+
+            if (bukkitItem.getTypeId() != id) {
+                // Type id doesn't fit
+                continue;
             }
+
+            if (usesDamageValue && bukkitItem.getDurability() != damage) {
+                // Damage value doesn't fit.
+                continue;
+            }
+
+            int currentAmount = bukkitItem.getAmount();
+            if (currentAmount < 0) {
+                // Unlimited
+                return;
+            }
+            if (currentAmount >= 64) {
+                // Full stack
+                continue;
+            }
+
+            int spaceLeft = 64 - currentAmount;
+            if (spaceLeft >= amount) {
+                bukkitItem.setAmount(currentAmount + amount);
+                return;
+            }
+
+            bukkitItem.setAmount(64);
+            amount -= spaceLeft;
         }
 
-        if (!found && freeSlot > -1) {
-            items[freeSlot] = new ItemStack(id, 1);
-            found = true;
-        }
-        
-        if (found) {
-        } else {
-            throw new OutOfSpaceException(id);
+        if (freeSlot > -1) {
+            items[freeSlot] = new ItemStack(id, amount);
+            return;
         }
+
+        throw new OutOfSpaceException(id);
     }
     
     /**