Add support for item expression in click events

Author: bensku

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

@@ -84,6 +84,7 @@
 import org.bukkit.event.world.ChunkEvent;
 import org.bukkit.event.world.StructureGrowEvent;
 import org.bukkit.event.world.WorldEvent;
+import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
 import org.eclipse.jdt.annotation.Nullable;
 
@@ -104,6 +105,8 @@ public final class BukkitEventValues {
 
 	public BukkitEventValues() {}
 
+	protected static final boolean offHandSupport = Skript.isRunningMinecraft(1, 9);
+	
 	static {
 
 		// === WorldEvents ===
@@ -544,6 +547,20 @@ public Entity get(final PlayerInteractEntityEvent e) {
 				return e.getRightClicked();
 			}
 		}, 0);
+		EventValues.registerEventValue(PlayerInteractEntityEvent.class, ItemStack.class, new Getter<ItemStack, PlayerInteractEntityEvent>() {
+			@Override
+			@Nullable
+			public ItemStack get(final PlayerInteractEntityEvent e) {
+				if (offHandSupport) {
+					EquipmentSlot hand = e.getHand();
+					if (hand == EquipmentSlot.HAND) return e.getPlayer().getInventory().getItemInMainHand();
+					else if (hand == EquipmentSlot.OFF_HAND) return e.getPlayer().getInventory().getItemInOffHand();
+					else return null;
+				} else {
+					return e.getPlayer().getItemInHand();
+				}
+			}
+		}, 0);
 		// PlayerInteractEvent
 		EventValues.registerEventValue(PlayerInteractEvent.class, Block.class, new Getter<Block, PlayerInteractEvent>() {
 			@Override
@@ -552,6 +569,20 @@ public Block get(final PlayerInteractEvent e) {
 				return e.getClickedBlock();
 			}
 		}, 0);
+		EventValues.registerEventValue(PlayerInteractEvent.class, ItemStack.class, new Getter<ItemStack, PlayerInteractEvent>() {
+			@Override
+			@Nullable
+			public ItemStack get(final PlayerInteractEvent e) {
+				if (offHandSupport) {
+					EquipmentSlot hand = e.getHand();
+					if (hand == EquipmentSlot.HAND) return e.getPlayer().getInventory().getItemInMainHand();
+					else if (hand == EquipmentSlot.OFF_HAND) return e.getPlayer().getInventory().getItemInOffHand();
+					else return null;
+				} else {
+					return e.getPlayer().getItemInHand();
+				}
+			}
+		}, 0);
 		// PlayerShearEntityEvent
 		EventValues.registerEventValue(PlayerShearEntityEvent.class, Entity.class, new Getter<Entity, PlayerShearEntityEvent>() {
 			@Override

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

@@ -133,23 +133,6 @@ public ItemStack get(final EntityEquipment e) {
 			public void set(final EntityEquipment e, final @Nullable ItemStack item) {
 				e.setBoots(item);
 			}
-		},
-		OFF_TOOL {
-			@SuppressWarnings("deprecation")
-			@Override
-			@Nullable
-			public ItemStack get(final EntityEquipment e) {
-				return (Skript.isRunningMinecraft(1, 9) ? e.getItemInOffHand() : e.getItemInHand()); //Compatibility reasons
-			}
-
-			@SuppressWarnings("deprecation")
-			@Override
-			public void set(final EntityEquipment e, final @Nullable ItemStack item) {
-				if (Skript.isRunningMinecraft(1, 9))
-					e.setItemInOffHand(item);
-				else
-					e.setItemInHand(item); //Compatibility reasons
-			}
 		};
 
 		@Nullable