Begin working with inventory events again

Author: bensku

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

@@ -23,6 +23,7 @@
 
 import java.io.NotSerializableException;
 import java.io.StreamCorruptedException;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map.Entry;
@@ -46,6 +47,7 @@
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.inventory.InventoryAction;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
@@ -68,6 +70,7 @@
 import ch.njol.skript.expressions.base.EventValueExpression;
 import ch.njol.skript.lang.ParseContext;
 import ch.njol.skript.lang.util.SimpleLiteral;
+import ch.njol.skript.localization.Language;
 import ch.njol.skript.localization.Message;
 import ch.njol.skript.registrations.Classes;
 import ch.njol.skript.util.BiomeUtils;
@@ -475,6 +478,39 @@ public String getVariableNamePattern() {
 					}
 				}).changer(DefaultChangers.inventoryChanger));
 
+		Classes.registerClass(new ClassInfo<InventoryAction>(InventoryAction.class, "inventory action")
+				.user("inventory actions?")
+				.name("Inventory Action")
+				.description("There are multiple ways to perform clicks in inventories. Inventory actions represent them.")
+				.user(Language.getList("inventory actions"))
+				.examples("")
+				.since("2.2-dev16")
+				.defaultExpression(new EventValueExpression<InventoryAction>(InventoryAction.class))
+				.parser(new Parser<InventoryAction>() {
+
+					@Override
+					@Nullable
+					public InventoryAction parse(String s, ParseContext context) {
+						return null; // TODO Do this, while supporting language changes... How?
+					}
+
+					@Override
+					public String toString(InventoryAction o, int flags) {
+						return Language.get("inventory actions." + o.toString().toLowerCase());
+					}
+
+					@Override
+					public String toVariableNameString(InventoryAction o) {
+						return Language.get("inventory actions." + o.toString().toLowerCase());
+					}
+
+					@Override
+					public String getVariableNamePattern() {
+						return "[a-z]+";
+					}
+					
+				}));
+		
 		Classes.registerClass(new ClassInfo<Player>(Player.class, "player")
 				.user("players?")
 				.name("Player")

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

@@ -90,6 +90,7 @@
 import org.eclipse.jdt.annotation.Nullable;
 
 import ch.njol.skript.Skript;
+import ch.njol.skript.aliases.ItemType;
 import ch.njol.skript.command.CommandEvent;
 import ch.njol.skript.events.EvtMoveOn;
 import ch.njol.skript.registrations.EventValues;
@@ -700,6 +701,14 @@ public Slot get(final InventoryClickEvent e) {
 				return new InventorySlot(e.getInventory(), e.getSlot());
 			}
 		}, 0);
+		EventValues.registerEventValue(InventoryClickEvent.class, ItemType.class, new Getter<ItemType, InventoryClickEvent>() {
+			@SuppressWarnings("null")
+			@Override
+			@Nullable
+			public ItemType get(final InventoryClickEvent e) {
+				return new ItemType(e.getCurrentItem());
+			}
+		}, 0);
 		// CraftItemEvent
 		EventValues.registerEventValue(CraftItemEvent.class, ItemStack.class, new Getter<ItemStack, CraftItemEvent>() {
 			@Override