Skip to content

Commit

Permalink
Rewrote "on player holds item/scrolls hotbar" event in new ScriptEven…
Browse files Browse the repository at this point in the history
…t format.
  • Loading branch information
Talamar1 committed Jun 11, 2015
1 parent 3647753 commit bb0cbd9
Show file tree
Hide file tree
Showing 3 changed files with 92 additions and 98 deletions.
2 changes: 1 addition & 1 deletion src/main/java/net/aufdemrand/denizen/Denizen.java
Expand Up @@ -572,7 +572,6 @@ public void onEnable() {
OldEventManager.registerSmartEvent(new EntityInteractSmartEvent());
OldEventManager.registerSmartEvent(new EntitySpawnSmartEvent());
OldEventManager.registerSmartEvent(new FlagSmartEvent());
OldEventManager.registerSmartEvent(new ItemScrollSmartEvent());
OldEventManager.registerSmartEvent(new ListPingSmartEvent());
OldEventManager.registerSmartEvent(new NPCNavigationSmartEvent());
OldEventManager.registerSmartEvent(new PlayerEquipsArmorSmartEvent());
Expand All @@ -598,6 +597,7 @@ public void onEnable() {
ScriptEvent.registerScriptEvent(new EntityKilledScriptEvent());
ScriptEvent.registerScriptEvent(new EntityTeleportScriptEvent());
ScriptEvent.registerScriptEvent(new ItemMoveScriptEvent());
ScriptEvent.registerScriptEvent(new ItemScrollScriptEvent());
ScriptEvent.registerScriptEvent(new LiquidSpreadScriptEvent());
ScriptEvent.registerScriptEvent(new ResourcePackStatusScriptEvent());
ScriptEvent.registerScriptEvent(new VehicleMoveScriptEvent());
Expand Down

This file was deleted.

@@ -0,0 +1,91 @@
package net.aufdemrand.denizen.events.scriptevents;

import net.aufdemrand.denizencore.objects.Element;
import net.aufdemrand.denizen.utilities.DenizenAPI;
import net.aufdemrand.denizencore.events.ScriptEvent;
import net.aufdemrand.denizencore.objects.dObject;
import net.aufdemrand.denizencore.scripts.containers.ScriptContainer;
import net.aufdemrand.denizencore.utilities.CoreUtilities;
import org.bukkit.event.player.PlayerItemHeldEvent;

import org.bukkit.Bukkit;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;

import java.util.HashMap;

public class ItemScrollScriptEvent extends ScriptEvent implements Listener {

// <--[event]
// @Events
// player scrolls their hotbar
// player holds item
//
// @Cancellable true
//
// @Triggers when a player scrolls through their hotbar.
//
// @Context
// <context.new_slot> returns the number of the new inventory slot.
// <context.previous_slot> returns the number of the old inventory slot.
//
// -->

public ItemScrollScriptEvent() {
instance = this;
}
public static ItemScrollScriptEvent instance;
public Element new_slot;
public Element previous_slot;
public PlayerItemHeldEvent event;

@Override
public boolean couldMatch(ScriptContainer scriptContainer, String s) {
String lower = CoreUtilities.toLowerCase(s);
return lower.equals("player holds item")
|| lower.equals("player scrolls their hotbar");
}

@Override
public boolean matches(ScriptContainer scriptContainer, String s) {
return true;
}

@Override
public String getName() {
return "PlayerScrollsItem";
}

@Override
public void init() {
Bukkit.getServer().getPluginManager().registerEvents(this, DenizenAPI.getCurrentInstance());
}

@Override
public void destroy() {
PlayerItemHeldEvent.getHandlerList().unregister(this);
}

@Override
public boolean applyDetermination(ScriptContainer container, String determination) {
return super.applyDetermination(container, determination);
}

@Override
public HashMap<String, dObject> getContext() {
HashMap<String, dObject> context = super.getContext();
context.put("new_slot", new_slot);
context.put("previous_slot", previous_slot);
return context;
}

@EventHandler
public void onPlayerScrollsHotbar(PlayerItemHeldEvent event) {
new_slot = new Element(event.getNewSlot() + 1);
previous_slot = new Element(event.getPreviousSlot() + 1);
cancelled = event.isCancelled();
this.event = event;
fire();
event.setCancelled(cancelled);
}
}

0 comments on commit bb0cbd9

Please sign in to comment.