FurnaceEvents, Expressions

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

@@ -121,18 +121,7 @@
 import org.bukkit.event.hanging.HangingBreakEvent;
 import org.bukkit.event.hanging.HangingEvent;
 import org.bukkit.event.hanging.HangingPlaceEvent;
-import org.bukkit.event.inventory.ClickType;
-import org.bukkit.event.inventory.CraftItemEvent;
-import org.bukkit.event.inventory.DragType;
-import org.bukkit.event.inventory.InventoryAction;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.inventory.InventoryCloseEvent;
-import org.bukkit.event.inventory.InventoryDragEvent;
-import org.bukkit.event.inventory.InventoryMoveItemEvent;
-import org.bukkit.event.inventory.InventoryOpenEvent;
-import org.bukkit.event.inventory.InventoryPickupItemEvent;
-import org.bukkit.event.inventory.PrepareAnvilEvent;
-import org.bukkit.event.inventory.PrepareItemCraftEvent;
+import org.bukkit.event.inventory.*;
 import org.bukkit.event.player.PlayerBedEnterEvent;
 import org.bukkit.event.player.PlayerBedLeaveEvent;
 import org.bukkit.event.player.PlayerBucketEmptyEvent;
@@ -1964,5 +1953,19 @@ public RegainReason get(EntityRegainHealthEvent event) {
 				return event.getRegainReason();
 			}
 		}, EventValues.TIME_NOW);
+
+		// FurnaceExtractEvent
+		EventValues.registerEventValue(FurnaceExtractEvent.class, Player.class, new Getter<Player, FurnaceExtractEvent>() {
+			@Override
+			public Player get(FurnaceExtractEvent event) {
+				return event.getPlayer();
+			}
+		}, EventValues.TIME_NOW);
+		EventValues.registerEventValue(FurnaceExtractEvent.class, ItemStack[].class, new Getter<ItemStack[], FurnaceExtractEvent>() {
+			@Override
+			public ItemStack[] get(FurnaceExtractEvent event) {
+				return new ItemStack[]{ItemStack.of(event.getItemType(), event.getItemAmount())};
+			}
+		}, EventValues.TIME_NOW);
 	}
 }

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

@@ -0,0 +1,113 @@
+package ch.njol.skript.events;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.lang.Literal;
+import ch.njol.skript.lang.SkriptEvent;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.registrations.Classes;
+import org.bukkit.event.Event;
+import org.bukkit.event.inventory.FurnaceBurnEvent;
+import org.bukkit.event.inventory.FurnaceExtractEvent;
+import org.bukkit.event.inventory.FurnaceSmeltEvent;
+import org.bukkit.event.inventory.FurnaceStartSmeltEvent;
+import org.jetbrains.annotations.Nullable;
+
+public class EvtFurnace extends SkriptEvent {
+
+	static {
+		Skript.registerEvent("Smelt", EvtFurnace.class, FurnaceSmeltEvent.class,
+				"[furnace] [ore] smelt[ed|ing] [of %-itemtypes%]",
+				"[furnace] smelt[ed|ing] of ore")
+			.description("Called when a furnace smelts an item in its <a href='expressions.html#ExprFurnaceSlot'>input slot</a>.")
+			.examples(
+				"on smelt:",
+					"\tclear the smelted item",
+				"on smelt of raw iron:",
+					"\tbroadcast smelted item",
+					"\tset the smelted item to iron block"
+			)
+			.since("1.0, INSERT VERSION (specific item)");
+
+		Skript.registerEvent("Fuel Burn", EvtFurnace.class, FurnaceBurnEvent.class, "[furnace] fuel burn[ing] [of %-itemtypes%]")
+			.description("Called when a furnace burns an item from its <a href='expressions.html#ExprFurnaceSlot'>fuel slot</a>.")
+			.examples(
+				"on fuel burning:",
+					"\tbroadcast fuel burned",
+					"\tif burned fuel is coal:",
+						"\t\tadd 20 seconds to burn time"
+			)
+			.since("1.0, INSERT VERSION (specific item)");
+
+		Skript.registerEvent("Furnace Item Extract", EvtFurnace.class, FurnaceExtractEvent.class, "furnace [item] extract[ion] [of %-itemtypes%]")
+			.description("Called when a player takes any item out of the furnace.")
+			.examples(
+				"on furnace extract:",
+					"\tif event-items is an iron ingot:",
+						"\t\tremove event-items from event-player's inventory"
+			)
+			.since("INSERT VERSION");
+
+		Skript.registerEvent("Start Smelt", EvtFurnace.class, FurnaceStartSmeltEvent.class,
+			"[furnace] start [of] smelt[ing] [[of] %-itemtypes%]",
+			"[furnace] smelt[ing] start [of %-itemtypes%]")
+			.description("Called when a furnace starts smelting an item in its ore slot.")
+			.examples(
+				"on smelting start:",
+					"\tif the smelting item is raw iron:",
+						"\t\tset total cook time to 1 second",
+				"on smelting start of raw iron:",
+					"\tadd 20 seconds to total cook time"
+			)
+			.since("INSERT VERSION");
+	}
+
+	private @Nullable Literal<ItemType> types;
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public boolean init(Literal<?>[] exprs, int matchedPattern, ParseResult parseResult) {
+		if (exprs[0] != null)
+			types = (Literal<ItemType>) exprs[0];
+		return true;
+	}
+
+	@Override
+	public boolean check(Event event) {
+		if (types == null)
+			return true;
+
+		ItemType item;
+
+		if (event instanceof FurnaceSmeltEvent smeltEvent) {
+			item = new ItemType(smeltEvent.getSource());
+		} else if (event instanceof FurnaceBurnEvent burnEvent) {
+			item = new ItemType(burnEvent.getFuel());
+		} else if (event instanceof FurnaceExtractEvent extractEvent) {
+			item = new ItemType(extractEvent.getItemType());
+		} else if (event instanceof FurnaceStartSmeltEvent startEvent) {
+			item = new ItemType(startEvent.getSource());
+		} else {
+			assert false;
+			return false;
+		}
+
+		return types.check(event, itemType -> itemType.isSupertypeOf(item));
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		String result = "";
+		if (event instanceof FurnaceSmeltEvent) {
+			result = "smelt";
+		} else if (event instanceof FurnaceBurnEvent) {
+			result = "burn";
+		} else if (event instanceof FurnaceExtractEvent) {
+			result = "extract";
+		} else if (event instanceof FurnaceStartSmeltEvent) {
+			result = "start smelt";
+		}
+		return result + " of " + Classes.toString(types);
+	}
+
+}

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

@@ -70,8 +70,6 @@
 import org.bukkit.event.entity.SheepRegrowWoolEvent;
 import org.bukkit.event.entity.SlimeSplitEvent;
 import org.bukkit.event.entity.PiglinBarterEvent;
-import org.bukkit.event.inventory.FurnaceBurnEvent;
-import org.bukkit.event.inventory.FurnaceSmeltEvent;
 import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.event.inventory.InventoryDragEvent;
 import org.bukkit.event.inventory.InventoryOpenEvent;
@@ -222,14 +220,6 @@ public class SimpleEvents {
 				.description("Called when the hunger bar of a player changes, i.e. either increases by eating or decreases over time.")
 				.examples("on food bar change:")
 				.since("1.4.4");
-		Skript.registerEvent("Fuel Burn", SimpleEvent.class, FurnaceBurnEvent.class, "fuel burn[ing]")
-				.description("Called when a furnace burns an item from its <a href='expressions.html#ExprFurnaceSlot'>fuel slot</a>.")
-				.examples("on fuel burning:")
-				.since("1.0");
-		Skript.registerEvent("Smelt", SimpleEvent.class, FurnaceSmeltEvent.class, "[ore] smelt[ing]", "smelt[ing] of ore") //TODO SkriptEvent for "smelt[ing] of %itemtype%"
-		.description("Called when a furnace smelts an item in its <a href='expressions.html#ExprFurnaceSlot'>ore slot</a>.")
-				.examples("on smelt:")
-				.since("1.0");
 		Skript.registerEvent("Leaves Decay", SimpleEvent.class, LeavesDecayEvent.class, "leaves decay[ing]")
 				.description("Called when a leaf block decays due to not being connected to a tree.")
 				.examples("on leaves decay:")

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

@@ -41,21 +41,19 @@ public class ExprFireTicks extends SimplePropertyExpression<Entity, Timespan> {
 	}
 
 	@Override
-	@Nullable
-	public Timespan convert(Entity entity) {
-		return Timespan.fromTicks(Math.max(entity.getFireTicks(), 0));
+	public @Nullable Timespan convert(Entity entity) {
+		return new Timespan(Timespan.TimePeriod.TICK, Math.max(entity.getFireTicks(), 0));
 	}
 
 	@Override
-	@Nullable
-	public Class<?>[] acceptChange(ChangeMode mode) {
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
 		return (mode != ChangeMode.REMOVE_ALL) ? CollectionUtils.array(Timespan.class) :  null;
 	}
 
 	@Override
 	public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 		Entity[] entities = getExpr().getArray(event);
-		int change = delta == null ? 0 : (int) ((Timespan) delta[0]).getTicks();
+		int change = delta == null ? 0 : (int) ((Timespan) delta[0]).getAs(Timespan.TimePeriod.TICK);
 		switch (mode) {
 			case REMOVE:
 				change = -change;
@@ -75,7 +73,7 @@ public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 	}
 
 	@Override
-	public Class<? extends Timespan> getReturnType() {
+	public Class<Timespan> getReturnType() {
 		return Timespan.class;
 	}