Only register on 1.17+ and cleanup (#2405)

DenizenScript · Dec 2, 2022 · f2a8c47 · f2a8c47
1 parent 6247103
commit f2a8c47
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git 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/...nts/block/FurnaceStartsSmeltingEvent.java → ...ock/FurnaceStartsSmeltingScriptEvent.java b/...nts/block/FurnaceStartsSmeltingEvent.java → ...ock/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
-    // <context.location> returns a LocationTag of the furnace.
+    // <context.location> returns a LocationTag of the furnace's location.
     // <context.item> returns an ItemTag of the item being smelted.
     // <context.recipe_id> returns an ElementTag of the recipe ID being used.
     // <context.total_cook_time> 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 <item>");
     }
 
@@ -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);