Fix event-itemstack for ComplexRecipe (#7674)

* Fix event-itemstack for ComplexRecipe

* Fix inventoryClickedEvent with complexRecipe events

* Fix indendation of line 156 of EvtItem.java

Author: ChickChicky

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

@@ -402,11 +402,7 @@ else if (hand == EquipmentSlot.OFF_HAND)
 		EventValues.registerEventValue(InventoryClickEvent.class, Player.class,
 			event -> event.getWhoClicked() instanceof Player player ? player : null);
 		EventValues.registerEventValue(InventoryClickEvent.class, World.class, event -> event.getWhoClicked().getWorld());
-		EventValues.registerEventValue(InventoryClickEvent.class, ItemStack.class, event -> {
-			if (event instanceof CraftItemEvent craftItemEvent)
-				return craftItemEvent.getRecipe().getResult();
-			return event.getCurrentItem();
-		});
+		EventValues.registerEventValue(InventoryClickEvent.class, ItemStack.class, InventoryClickEvent::getCurrentItem);
 		EventValues.registerEventValue(InventoryClickEvent.class, Slot.class, event -> {
 			Inventory invi = event.getClickedInventory(); // getInventory is WRONG and dangerous
 			if (invi == null)
@@ -496,7 +492,12 @@ else if (hand == EquipmentSlot.OFF_HAND)
 			return null;
 		});
 		// CraftItemEvent
-		EventValues.registerEventValue(CraftItemEvent.class, ItemStack.class, event -> event.getRecipe().getResult());
+		EventValues.registerEventValue(CraftItemEvent.class, ItemStack.class, event -> {
+			Recipe recipe = event.getRecipe();
+			if (recipe instanceof ComplexRecipe)
+				return event.getCurrentItem();
+			return recipe.getResult();
+		});
 		//InventoryEvent
 		EventValues.registerEventValue(InventoryEvent.class, Inventory.class, InventoryEvent::getInventory);
 		//InventoryOpenEvent

src/main/java/ch/njol/skript/events/EvtItem.java

@@ -15,6 +15,7 @@
 import org.bukkit.event.player.PlayerDropItemEvent;
 import org.bukkit.event.player.PlayerItemConsumeEvent;
 import org.bukkit.event.player.PlayerPickupItemEvent;
+import org.bukkit.inventory.ComplexRecipe;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.Recipe;
 import org.jetbrains.annotations.Nullable;
@@ -161,7 +162,12 @@ public boolean check(final Event event) {
 		} else if (event instanceof EntityDropItemEvent entityDropItemEvent) {
 			itemStack = entityDropItemEvent.getItemDrop().getItemStack();
 		} else if (event instanceof CraftItemEvent craftItemEvent) {
-			itemStack = craftItemEvent.getRecipe().getResult();
+			Recipe recipe = craftItemEvent.getRecipe();
+			if (recipe instanceof ComplexRecipe) {
+				itemStack = craftItemEvent.getCurrentItem();
+			} else {
+				itemStack = recipe.getResult();
+			}
 		} else if (event instanceof PrepareItemCraftEvent prepareItemCraftEvent) {
 			Recipe recipe = prepareItemCraftEvent.getRecipe();
 			if (recipe != null) {