Finish inventory actions

Author: bensku

src/main/java/ch/njol/skript/classes/data/BukkitClasses.java

@@ -479,11 +479,11 @@ public String getVariableNamePattern() {
 					}
 				}).changer(DefaultChangers.inventoryChanger));
 
-		Classes.registerClass(new ClassInfo<InventoryAction>(InventoryAction.class, "inventory action")
+		Classes.registerClass(new ClassInfo<InventoryAction>(InventoryAction.class, "inventoryaction")
 				.user("inventory actions?")
 				.name("Inventory Action")
 				.description("There are multiple ways to perform clicks in inventories. Inventory actions represent them.")
-				.user(InventoryActions.getAllNames())
+				.usage(InventoryActions.getAllNames())
 				.examples("")
 				.since("2.2-dev16")
 				.defaultExpression(new EventValueExpression<InventoryAction>(InventoryAction.class))

src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java

@@ -61,6 +61,7 @@
 import org.bukkit.event.hanging.HangingEvent;
 import org.bukkit.event.hanging.HangingPlaceEvent;
 import org.bukkit.event.inventory.CraftItemEvent;
+import org.bukkit.event.inventory.InventoryAction;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.PrepareItemCraftEvent;
 import org.bukkit.event.hanging.HangingEvent;
@@ -709,6 +710,13 @@ public ItemType get(final InventoryClickEvent e) {
 				return new ItemType(e.getCurrentItem());
 			}
 		}, 0);
+		EventValues.registerEventValue(InventoryClickEvent.class, InventoryAction.class, new Getter<InventoryAction, InventoryClickEvent>() {
+			@Override
+			@Nullable
+			public InventoryAction get(final InventoryClickEvent e) {
+				return e.getAction();
+			}
+		}, 0);
 		// CraftItemEvent
 		EventValues.registerEventValue(CraftItemEvent.class, ItemStack.class, new Getter<ItemStack, CraftItemEvent>() {
 			@Override
@@ -719,6 +727,7 @@ public ItemStack get(final CraftItemEvent e) {
 		}, 0);
 		// PrepareItemCraftEvent
 		EventValues.registerEventValue(PrepareItemCraftEvent.class, Slot.class, new Getter<Slot, PrepareItemCraftEvent>() {
+			@SuppressWarnings("null")
 			@Override
 			@Nullable
 			public Slot get(final PrepareItemCraftEvent e) {

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

@@ -0,0 +1,56 @@
+/*
+ *   This file is part of Skript.
+ *
+ *  Skript is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Skript is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * 
+ * Copyright 2011-2016 Peter Güttinger and contributors
+ * 
+ */
+
+package ch.njol.skript.expressions;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.inventory.InventoryAction;
+import org.eclipse.jdt.annotation.Nullable;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.Since;
+import ch.njol.skript.expressions.base.EventValueExpression;
+import ch.njol.skript.lang.ExpressionType;
+
+@Name("Inventory Action")
+@Description("The <a href='../classes/#inventoryaction'>inventory action</a> of an inventory event. Please click on the link for more information.")
+@Examples("inventory action is pickup all")
+@Since("2.2-dev16")
+public class ExprInventoryAction extends EventValueExpression<InventoryAction> {
+
+	static {
+		Skript.registerExpression(ExprInventoryAction.class, InventoryAction.class, ExpressionType.SIMPLE, "[the] inventory action");
+	}
+	
+	public ExprInventoryAction() {
+		super(InventoryAction.class);
+	}
+	
+	@Override
+	public String toString(final @Nullable Event e, final boolean debug) {
+		return "the inventory action";
+	}
+	
+}

src/main/java/ch/njol/skript/util/InventoryActions.java

@@ -21,10 +21,17 @@
 
 package ch.njol.skript.util;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.bukkit.block.Biome;
 import org.bukkit.event.inventory.InventoryAction;
 import org.eclipse.jdt.annotation.Nullable;
 
+import ch.njol.skript.localization.Language;
+import ch.njol.skript.localization.LanguageChangeListener;
+import ch.njol.skript.localization.Noun;
+
 /**
  * Inventory action utils...
  */

src/main/resources/lang/english.lang

@@ -960,6 +960,28 @@ visual effects:
 		pattern: [sprinting] dust of [%itemtype%]
 	area_expression: [with [offset of %number%, %number%(,| and) %number%][[and ]speed %number%]]
 
+# -- Inventory Actions --
+inventory actions:
+	nothing: nothing, do nothing
+	pickup_all: pickup all, pickup all items
+	pickup_some: pickup some, pickup some items
+	pickup_half: pickup half, pickup half stack
+	pickup_one: pickup one item, pickup single item, pickup single
+	place_all: place all, place all items
+	place_some: place some, place some items
+	place_one: place one, place one item
+	swap_with_cursor: swap with cursor, swap stack with cursor, swap cursor, swap cursor stack
+	drop_all_cursor: drop all from cursor, drop stack from cursor, drop items from cursor, drop stack from cursor, drop cursor, drop cursor stack
+	drop_one_cursor: drop one from cursor, drop one item from cursor, drop single item from cursor, drop cursor item
+	drop_all_slot: drop all from slot, drop stack from slot, drop items from slot, drop stack from slot, drop slot, drop slot stack
+	drop_one_slot: drop one from slot, drop one item from slot, drop single item from slot, drop slot item
+	move_to_other_inventory: instant move, move to other inventory, shift move
+	hotbar_move_and_readd: hotbar move and readd
+	hotbar_swap: swap with hotbar, swap items with hotbar, hotbar swap, hotbar swap items
+	clone_stack: clone stack
+	collect_to_cursor: collect to cursor, collect items to cursor
+	unknown: unknown, unsupported, custom
+
 # -- Boolean --
 boolean:
 	true: