FurnaceEvents, Expressions

src/main/java/ch/njol/skript/Skript.java

@@ -96,6 +96,7 @@
 import org.skriptlang.skript.bukkit.SkriptMetrics;
 import org.skriptlang.skript.bukkit.breeding.BreedingModule;
 import org.skriptlang.skript.bukkit.displays.DisplayModule;
+import org.skriptlang.skript.bukkit.furnace.FurnaceModule;
 import org.skriptlang.skript.bukkit.fishing.FishingModule;
 import org.skriptlang.skript.bukkit.input.InputModule;
 import org.skriptlang.skript.bukkit.loottables.LootTableModule;
@@ -550,6 +551,7 @@ public void onEnable() {
 			BreedingModule.load();
 			DisplayModule.load();
 			InputModule.load();
+			FurnaceModule.load();
 			LootTableModule.load();
 		} catch (final Exception e) {
 			exception(e, "Could not load required .class files: " + e.getLocalizedMessage());

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

@@ -1,14 +1,5 @@
 package ch.njol.skript.classes.data;
 
-import java.time.Duration;
-import java.time.temporal.TemporalAmount;
-import java.time.temporal.TemporalUnit;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.function.Function;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.aliases.ItemType;
 import ch.njol.skript.bukkitutil.InventoryUtils;
@@ -27,11 +18,6 @@
 import com.destroystokyo.paper.event.entity.ProjectileCollideEvent;
 import com.destroystokyo.paper.event.player.PlayerArmorChangeEvent;
 import io.papermc.paper.event.entity.EntityMoveEvent;
-import io.papermc.paper.event.player.PlayerInventorySlotChangeEvent;
-import io.papermc.paper.event.player.PlayerStonecutterRecipeSelectEvent;
-import io.papermc.paper.event.player.PlayerStopUsingItemEvent;
-import io.papermc.paper.event.player.PlayerTradeEvent;
-import org.bukkit.*;
 import io.papermc.paper.event.player.*;
 import org.bukkit.*;
 import org.bukkit.block.Block;
@@ -66,9 +52,13 @@
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 import org.bukkit.potion.PotionType;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 public final class BukkitEventValues {
 
 	public BukkitEventValues() {
@@ -1792,6 +1782,12 @@ public RegainReason get(EntityRegainHealthEvent event) {
 			}
 		}, EventValues.TIME_NOW);
 
+		// FurnaceExtractEvent
+		EventValues.registerEventValue(FurnaceExtractEvent.class, Player.class, FurnaceExtractEvent::getPlayer);
+		EventValues.registerEventValue(FurnaceExtractEvent.class, ItemStack[].class,
+			event -> new ItemStack[]{ItemStack.of(event.getItemType(), event.getItemAmount())
+		});
+
 		// BlockDropItemEvent
 		EventValues.registerEventValue(BlockDropItemEvent.class, Block.class, new Getter<Block, BlockDropItemEvent>() {
 			@Override

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

@@ -132,14 +132,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

@@ -38,14 +38,12 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
 	}
 
 	@Override
-	@Nullable
-	public Timespan convert(Entity entity) {
+	public @Nullable Timespan convert(Entity entity) {
 		return new Timespan(TimePeriod.TICK, (max ? entity.getMaxFireTicks() : Math.max(entity.getFireTicks(), 0)));
 	}
 
 	@Override
-	@Nullable
-	public Class<?>[] acceptChange(ChangeMode mode) {
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
 		if (max)
 			return null;
 		return switch (mode) {
@@ -77,7 +75,7 @@ public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 	}
 
 	@Override
-	public Class<? extends Timespan> getReturnType() {
+	public Class<Timespan> getReturnType() {
 		return Timespan.class;
 	}