Rewrote "on entity food level changes" event in new ScriptEvent format.

src/main/java/net/aufdemrand/denizen/Denizen.java

@@ -606,6 +606,7 @@ public void onEnable() {
             ScriptEvent.registerScriptEvent(new EntityExitsPortalScriptEvent());
             ScriptEvent.registerScriptEvent(new EntityExplodesScriptEvent());
             ScriptEvent.registerScriptEvent(new EntityExplosionPrimesScriptEvent());
+            ScriptEvent.registerScriptEvent(new EntityFoodLevelChangeScriptEvent());
             ScriptEvent.registerScriptEvent(new EntityFormsBlock());
             ScriptEvent.registerScriptEvent(new EntityHealsScriptEvent());
             ScriptEvent.registerScriptEvent(new EntityInteractScriptEvent());

src/main/java/net/aufdemrand/denizen/events/entity/EntityFoodLevelChangeScriptEvent.java

@@ -0,0 +1,108 @@
+package net.aufdemrand.denizen.events.entity;
+
+import net.aufdemrand.denizen.BukkitScriptEntryData;
+import net.aufdemrand.denizen.events.BukkitScriptEvent;
+import net.aufdemrand.denizen.objects.dEntity;
+import net.aufdemrand.denizen.utilities.DenizenAPI;
+import net.aufdemrand.denizencore.objects.Element;
+import net.aufdemrand.denizencore.objects.aH;
+import net.aufdemrand.denizencore.objects.dObject;
+import net.aufdemrand.denizencore.scripts.ScriptEntryData;
+import net.aufdemrand.denizencore.scripts.containers.ScriptContainer;
+import net.aufdemrand.denizencore.utilities.CoreUtilities;
+
+import org.bukkit.Bukkit;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.FoodLevelChangeEvent;
+
+import java.util.HashMap;
+
+public class EntityFoodLevelChangeScriptEvent extends BukkitScriptEvent implements Listener {
+
+    // <--[event]
+    // @Events
+    // entity changes food level
+    // <entity> changes food level
+    //
+    // @Cancellable true
+    //
+    // @Triggers when an entity's food level changes.
+    //
+    // @Context
+    // <context.entity> returns the dEntity.
+    // <context.food> returns an Element(Number) of the entity's new food level.
+    //
+    // @Determine
+    // Element(Decimal) to set the entity's new food level.
+    //
+    // -->
+
+    public EntityFoodLevelChangeScriptEvent() {
+        instance = this;
+    }
+    public static EntityFoodLevelChangeScriptEvent instance;
+    public dEntity entity;
+    public Integer food;
+    public FoodLevelChangeEvent event;
+
+    @Override
+    public boolean couldMatch(ScriptContainer scriptContainer, String s) {
+        String lower = CoreUtilities.toLowerCase(s);
+        return (lower.endsWith("changes food level"));
+    }
+
+    @Override
+    public boolean matches(ScriptContainer scriptContainer, String s) {
+        return true;
+    }
+
+    @Override
+    public String getName() {
+        return "FoodLevelChanged";
+    }
+
+    @Override
+    public void init() {
+        Bukkit.getServer().getPluginManager().registerEvents(this, DenizenAPI.getCurrentInstance());
+    }
+
+    @Override
+    public void destroy() {
+        FoodLevelChangeEvent.getHandlerList().unregister(this);
+    }
+
+    @Override
+    public boolean applyDetermination(ScriptContainer container, String determination) {
+        if (aH.Argument.valueOf(determination).matchesPrimitive(aH.PrimitiveType.Integer)) {
+            food = aH.getIntegerFrom(determination);
+            return true;
+        }
+        return super.applyDetermination(container, determination);
+    }
+
+    @Override
+    public ScriptEntryData getScriptEntryData() {
+        return new BukkitScriptEntryData(entity.isPlayer() ? dEntity.getPlayerFrom(event.getEntity()): null,
+                entity.isCitizensNPC() ? dEntity.getNPCFrom(event.getEntity()): null);
+    }
+
+    @Override
+    public HashMap<String, dObject> getContext() {
+        HashMap<String, dObject> context = super.getContext();
+        context.put("entity", entity);
+        context.put("food", new Element(food));
+        return context;
+    }
+
+    @EventHandler
+    public void onEntityFoodLevelChanged(FoodLevelChangeEvent event) {
+        entity = new dEntity(event.getEntity());
+        food = event.getFoodLevel();
+        cancelled = event.isCancelled();
+        this.event = event;
+        fire();
+        event.setCancelled(cancelled);
+        event.setFoodLevel(food);
+    }
+}

src/main/java/net/aufdemrand/denizen/scripts/containers/core/BukkitWorldScriptHelper.java

@@ -137,49 +137,6 @@ public void timeEvent() {
     //   Additional EVENTS
     /////////////////
 
-    // <--[event]
-    // @Events
-    // entity changes food level
-    // <entity> changes food level
-    //
-    // @Triggers when an entity's food level changes.
-    // @Context
-    // <context.entity> returns the dEntity.
-    // <context.food> returns an Element(Number) of the entity's new food level.
-    //
-    // @Determine
-    // "CANCELLED" to stop the entity's food level from changing.
-    // Element(Decimal) to set the entity's new food level.
-    //
-    // -->
-    @EventHandler
-    public void foodLevelChange(FoodLevelChangeEvent event) {
-
-        dPlayer player = null;
-        dNPC npc = null;
-
-        Map<String, dObject> context = new HashMap<String, dObject>();
-        dEntity entity = new dEntity(event.getEntity());
-
-        context.put("food", new Element(event.getFoodLevel()));
-        context.put("entity", entity.getDenizenObject());
-
-        if (entity.isCitizensNPC()) npc = entity.getDenizenNPC();
-        else if (entity.isPlayer()) player = entity.getDenizenPlayer();
-
-        String determination = doEvents(Arrays.asList
-                ("entity changes food level",
-                        entity.identifyType() + " changes food level"),
-                npc, player, context, true);
-
-        if (determination.toUpperCase().startsWith("CANCELLED"))
-            event.setCancelled(true);
-        else if (Argument.valueOf(determination)
-                .matchesPrimitive(aH.PrimitiveType.Integer)) {
-            event.setFoodLevel(aH.getIntegerFrom(determination));
-        }
-    }
-
     // <--[event]
     // @Events
     // horse jumps