Adds Explicit ItemStack Support to ExprItemAmount, fixing issue with item amount of variables. (#5513)

Author: sovdeeth

src/main/java/ch/njol/skript/expressions/ExprItemAmount.java

@@ -19,7 +19,6 @@
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.aliases.ItemType;
-import ch.njol.skript.classes.Changer;
 import ch.njol.skript.classes.Changer.ChangeMode;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
@@ -29,71 +28,80 @@
 import ch.njol.skript.util.slot.Slot;
 import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.event.Event;
+import org.bukkit.inventory.ItemStack;
 import org.eclipse.jdt.annotation.Nullable;
 
 @Name("Item Amount")
 @Description("The amount of an <a href='classes.html#itemstack'>item stack</a>.")
 @Examples("send \"You have got %item amount of player's tool% %player's tool% in your hand!\" to player")
 @Since("2.2-dev24")
 public class ExprItemAmount extends SimplePropertyExpression<Object, Long> {
-	
-    static {
-        register(ExprItemAmount.class, Long.class, "item[[ ]stack] (amount|size|number)", "slots/itemtypes");
-    }
 
-	
+	static {
+		register(ExprItemAmount.class, Long.class, "item[[ ]stack] (amount|size|number)", "slots/itemtypes/itemstacks");
+	}
+
 	@Override
 	public Long convert(final Object item) {
-    	return (long) (item instanceof ItemType ? ((ItemType) item).getAmount() : ((Slot) item).getAmount());
+		if (item instanceof ItemType) {
+			return (long) ((ItemType) item).getAmount();
+		} else if (item instanceof Slot) {
+			return (long) ((Slot) item).getAmount();
+		} else {
+			return (long) ((ItemStack) item).getAmount();
+		}
 	}
-	
+
 	@Override
-    public @Nullable Class<?>[] acceptChange(Changer.ChangeMode mode) {
-        return (mode != ChangeMode.REMOVE_ALL) ? CollectionUtils.array(Number.class) : null;
-    }
+	@Nullable
+	public Class<?>[] acceptChange(ChangeMode mode) {
+		switch (mode) {
+			case SET:
+			case ADD:
+			case RESET:
+			case DELETE:
+			case REMOVE:
+				return CollectionUtils.array(Long.class);
+		}
+		return null;
+	}
 
-    @Override
-    public void change(Event event, @Nullable Object[] delta, Changer.ChangeMode mode) {
-    	int amount = delta != null ? ((Number) delta[0]).intValue() : 0;
-        switch (mode) {
-            case ADD:
-            	for (Object obj : getExpr().getArray(event))
+	@Override
+	public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
+		int amount = delta != null ? ((Number) delta[0]).intValue() : 0;
+		switch (mode) {
+			case REMOVE:
+				amount = -amount;
+				// fall through
+			case ADD:
+				for (Object obj : getExpr().getArray(event))
 					if (obj instanceof ItemType) {
 						ItemType item = ((ItemType) obj);
 						item.setAmount(item.getAmount() + amount);
-					} else {
+					} else if (obj instanceof Slot) {
 						Slot slot = ((Slot) obj);
 						slot.setAmount(slot.getAmount() + amount);
+					} else {
+						ItemStack item = ((ItemStack) obj);
+						item.setAmount(item.getAmount() + amount);
 					}
-                break;
-            case SET:
+				break;
+			case RESET:
+			case DELETE:
+				amount = 1;
+				// fall through
+			case SET:
 				for (Object obj : getExpr().getArray(event))
-					if (obj instanceof ItemType)
+					if (obj instanceof ItemType) {
 						((ItemType) obj).setAmount(amount);
-					else
+					} else if (obj instanceof Slot) {
 						((Slot) obj).setAmount(amount);
-                break;
-            case REMOVE:
-				for (Object obj : getExpr().getArray(event))
-					if (obj instanceof ItemType) {
-						ItemType item = ((ItemType) obj);
-						item.setAmount(item.getAmount() - amount);
 					} else {
-						Slot slot = ((Slot) obj);
-						slot.setAmount(slot.getAmount() - amount);
+						((ItemStack) obj).setAmount(amount);
 					}
-                break;
-            case REMOVE_ALL:
-            case RESET:
-			case DELETE:
-				for (Object obj : getExpr().getArray(event))
-					if (obj instanceof ItemType)
-						((ItemType) obj).setAmount(1);
-					else
-						((Slot) obj).setAmount(1);
 				break;
-        }
-    }
+		}
+	}
 
 	@Override
 	public Class<? extends Long> getReturnType() {
@@ -104,5 +112,4 @@ public Class<? extends Long> getReturnType() {
 	protected String getPropertyName() {
 		return "item[[ ]stack] (amount|size|number)";
 	}
-
 }

src/test/skript/tests/regressions/551-item amount on itemstacks.sk

@@ -0,0 +1,27 @@
+test "item amount of itemstack":
+	set {_loc} to spawn of world "world"
+	set {_old-block} to type of block at {_loc}
+	set block at {_loc} to chest
+	add 10 stone to inventory of block at {_loc}
+	set {_item} to slot 0 of inventory of block at {_loc}
+	assert item amount of {_item} is 10 with "Amount of itemstack is not 10: %{_amount}%"
+	remove 1 from item amount of {_item}
+	assert item amount of {_item} is 9 with "Amount of itemstack is not 9: %{_amount}%"
+	set block at {_loc} to {_old-block}
+
+test "item amount of itemtype":
+	set {_item} to 10 stone
+	set {_amount} to item amount of {_item}
+	assert item amount of {_item} is 10 with "Amount of itemtype is not 10: %{_amount}%"
+	remove 1 from item amount of {_item}
+	assert item amount of {_item} is 9 with "Amount of itemtype is not 9: %{_amount}%"
+
+test "item amount of slot":
+	set {_loc} to spawn of world "world"
+	set {_old-block} to type of block at {_loc}
+	set block at {_loc} to chest
+	add 10 stone to inventory of block at {_loc}
+	assert item amount of (slot 0 of inventory of block at {_loc}) is 10 with "Amount of slot is not 10: %{_amount}%"
+	remove 1 from item amount of (slot 0 of inventory of block at {_loc})
+	assert item amount of (slot 0 of inventory of block at {_loc}) is 9 with "Amount of slot is not 9: %{_amount}%"
+	set block at {_loc} to {_old-block}