From f2a8c47d0af4d1a14c59212410508a73dee55aa9 Mon Sep 17 00:00:00 2001 From: Aya <31237389+tal5@users.noreply.github.com> Date: Fri, 2 Dec 2022 03:22:41 +0200 Subject: [PATCH] Only register on 1.17+ and cleanup (#2405) --- .../denizen/events/ScriptEventRegistry.java | 4 +++- ...gEvent.java => FurnaceStartsSmeltingScriptEvent.java} | 9 ++++----- 2 files changed, 7 insertions(+), 6 deletions(-) rename plugin/src/main/java/com/denizenscript/denizen/events/block/{FurnaceStartsSmeltingEvent.java => FurnaceStartsSmeltingScriptEvent.java} (87%) diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/ScriptEventRegistry.java b/plugin/src/main/java/com/denizenscript/denizen/events/ScriptEventRegistry.java index ebde9654fe..2131bd4b0f 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/ScriptEventRegistry.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/ScriptEventRegistry.java @@ -78,7 +78,9 @@ public static void registerMainEvents() { ScriptEvent.registerScriptEvent(BrewsScriptEvent.class); ScriptEvent.registerScriptEvent(CauldronLevelChangeScriptEvent.class); ScriptEvent.registerScriptEvent(FurnaceBurnsItemScriptEvent.class); - ScriptEvent.registerScriptEvent(FurnaceStartsSmeltingEvent.class); + if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_17)) { + ScriptEvent.registerScriptEvent(FurnaceStartsSmeltingScriptEvent.class); + } ScriptEvent.registerScriptEvent(LeafDecaysScriptEvent.class); ScriptEvent.registerScriptEvent(LiquidLevelChangeScriptEvent.class); ScriptEvent.registerScriptEvent(LiquidSpreadScriptEvent.class); diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/block/FurnaceStartsSmeltingEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/block/FurnaceStartsSmeltingScriptEvent.java similarity index 87% rename from plugin/src/main/java/com/denizenscript/denizen/events/block/FurnaceStartsSmeltingEvent.java rename to plugin/src/main/java/com/denizenscript/denizen/events/block/FurnaceStartsSmeltingScriptEvent.java index a5f61ebc2c..0e4d82c441 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/block/FurnaceStartsSmeltingEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/block/FurnaceStartsSmeltingScriptEvent.java @@ -6,12 +6,11 @@ import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.objects.core.DurationTag; import com.denizenscript.denizencore.objects.core.ElementTag; -import org.bukkit.Keyed; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.inventory.FurnaceStartSmeltEvent; -public class FurnaceStartsSmeltingEvent extends BukkitScriptEvent implements Listener { +public class FurnaceStartsSmeltingScriptEvent extends BukkitScriptEvent implements Listener { // <--[event] // @Events @@ -24,7 +23,7 @@ public class FurnaceStartsSmeltingEvent extends BukkitScriptEvent implements Lis // @Triggers when a furnace starts smelting an item. // // @Context - // returns a LocationTag of the furnace. + // returns a LocationTag of the furnace's location. // returns an ItemTag of the item being smelted. // returns an ElementTag of the recipe ID being used. // returns a DurationTag of the total time it will take to smelt the item. @@ -43,7 +42,7 @@ public class FurnaceStartsSmeltingEvent extends BukkitScriptEvent implements Lis // - determine 2s // --> - public FurnaceStartsSmeltingEvent() { + public FurnaceStartsSmeltingScriptEvent() { registerCouldMatcher("furnace starts smelting "); } @@ -76,7 +75,7 @@ public ObjectTag getContext(String name) { switch (name) { case "location": return location; case "item": return item; - case "recipe_id": return new ElementTag(((Keyed) event.getRecipe()).getKey().toString()); + case "recipe_id": return new ElementTag(event.getRecipe().getKey().toString()); case "total_cook_time": return new DurationTag((long) event.getTotalCookTime()); } return super.getContext(name);