Skip to content

Commit

Permalink
Some minor world event cleanup.
Browse files Browse the repository at this point in the history
  • Loading branch information
@davidcernat
davidcernat committed Oct 17, 2013
1 parent 24a7661 commit fd1d590
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 33 deletions.
6 changes: 5 additions & 1 deletion src/main/java/net/aufdemrand/denizen/objects/dItem.java
View file
Expand Up @@ -490,7 +490,11 @@ else if (isItemscript()) {
}

// Else, return the material name
return "i@" + dMaterial.getMaterialFrom(item.getType(), item.getData().getData()).identify().replace("m@", "");
return "i@" + identifyMaterial().replace("m@", "");
}

public String identifyMaterial() {
return "m@" + dMaterial.getMaterialFrom(item.getType(), item.getData().getData()).identify();
}

@Override
Expand Down
55 changes: 23 additions & 32 deletions src/main/java/net/aufdemrand/denizen/scripts/containers/core/WorldScriptHelper.java
View file
Expand Up @@ -249,15 +249,16 @@ public void blockBreak(BlockBreakEvent event) {
context.put("material", material);

dItem item = new dItem(event.getPlayer().getItemInHand());
dMaterial itemMaterial = item.getMaterial();

List<String> events = new ArrayList<String>();
events.add("player breaks block");
events.add("player breaks " + material.identify());
events.add("player breaks block with " + item.identify());
events.add("player breaks " + material.identify() + " with " + item.identify());
events.add("player breaks block with " + itemMaterial.identify());
events.add("player breaks " + material.identify() + " with " + itemMaterial.identify());
events.add("player breaks " + material.identify() +
" with " + item.identify());
events.add("player breaks block with " + item.identifyMaterial());
events.add("player breaks " + material.identify() +
" with " + item.identifyMaterial());

String determination = doEvents(events, null, event.getPlayer(), context, true);

Expand Down Expand Up @@ -880,7 +881,7 @@ public void furnaceExtract(FurnaceExtractEvent event) {
String determination = doEvents(Arrays.asList
("player takes item from furnace",
"player takes " + item.identify() + " from furnace",
"player takes " + itemMaterial.identify() + " from furnace"),
"player takes " + item.identifyMaterial() + " from furnace"),
null, event.getPlayer(), context, true);

if (Argument.valueOf(determination)
Expand Down Expand Up @@ -2240,15 +2241,14 @@ public void itemDespawn(ItemDespawnEvent event) {

Map<String, dObject> context = new HashMap<String, dObject>();
dItem item = new dItem(event.getEntity().getItemStack());
dMaterial itemMaterial = item.getMaterial();

context.put("item", item);
context.put("entity", new dEntity(event.getEntity()));

List<String> events = new ArrayList<String>();
events.add("item despawns");
events.add(item.identify() + " despawns");
events.add(itemMaterial.identify() + " despawns");
events.add(item.identifyMaterial() + " despawns");

String determination = doEvents(events, null, null, context, true);

Expand Down Expand Up @@ -2276,15 +2276,14 @@ public void itemSpawn(ItemSpawnEvent event) {

Map<String, dObject> context = new HashMap<String, dObject>();
dItem item = new dItem(event.getEntity().getItemStack());
dMaterial itemMaterial = item.getMaterial();

context.put("item", item);
context.put("entity", new dEntity(event.getEntity()));

List<String> events = new ArrayList<String>();
events.add("item spawns");
events.add(item.identify() + " spawns");
events.add(itemMaterial.identify() + " spawns");
events.add(item.identifyMaterial() + " spawns");

String determination = doEvents(events, null, null, context, true);

Expand Down Expand Up @@ -2598,7 +2597,6 @@ public void inventoryClickEvent(InventoryClickEvent event) {
if (event.getCurrentItem() != null) {

item = new dItem(event.getCurrentItem());
dMaterial itemMaterial = item.getMaterial();

events.add("player clicks " +
item.identify() + " in inventory");
Expand All @@ -2607,11 +2605,11 @@ public void inventoryClickEvent(InventoryClickEvent event) {
events.add(interaction +
item.identify() + " in " + type);
events.add("player clicks " +
itemMaterial.identify() + " in inventory");
item.identifyMaterial() + " in inventory");
events.add(interaction +
itemMaterial.identify() + " in inventory");
item.identifyMaterial() + " in inventory");
events.add(interaction +
itemMaterial.identify() + " in " + type);
item.identifyMaterial() + " in " + type);
}

events = trimEvents(events);
Expand Down Expand Up @@ -2690,7 +2688,6 @@ public void inventoryDragEvent(InventoryDragEvent event) {
if (event.getOldCursor() != null) {

item = new dItem(event.getOldCursor());
dMaterial itemMaterial = item.getMaterial();

events.add("player drags " +
item.identify());
Expand All @@ -2699,11 +2696,11 @@ public void inventoryDragEvent(InventoryDragEvent event) {
events.add("player drags " +
item.identify() + " in " + type);
events.add("player drags " +
itemMaterial.identify());
item.identifyMaterial());
events.add("player drags " +
itemMaterial.identify() + " in inventory");
item.identifyMaterial() + " in inventory");
events.add("player drags " +
itemMaterial.identify() + " in " + type);
item.identifyMaterial() + " in " + type);
}

events = trimEvents(events);
Expand Down Expand Up @@ -3377,7 +3374,6 @@ public void playerInteract(PlayerInteractEvent event) {
Map<String, dObject> context = new HashMap<String, dObject>();
Action action = event.getAction();
dItem item = null;
dMaterial itemMaterial = null;

List<String> events = new ArrayList<String>();

Expand All @@ -3395,12 +3391,11 @@ else if (action == Action.RIGHT_CLICK_AIR || action == Action.RIGHT_CLICK_BLOCK)

if (event.hasItem()) {
item = new dItem(event.getItem());
itemMaterial = item.getMaterial();
context.put("item", item);

events.add(interaction + " with item");
events.add(interaction + " with " + item.identify());
events.add(interaction + " with " + itemMaterial.identify());
events.add(interaction + " with " + item.identifyMaterial());
}

if (event.hasBlock()) {
Expand All @@ -3414,13 +3409,13 @@ else if (action == Action.RIGHT_CLICK_AIR || action == Action.RIGHT_CLICK_BLOCK)
if (event.hasItem()) {
events.add(interaction + " block with item");
events.add(interaction + " block with " + item.identify());
events.add(interaction + " block with " + itemMaterial.identify());
events.add(interaction + " block with " + item.identifyMaterial());
events.add(interaction + " " + blockMaterial.identify() +
" with item");
events.add(interaction + " " + blockMaterial.identify() +
" with " + item.identify());
events.add(interaction + " " + blockMaterial.identify() +
" with " + itemMaterial.identify());
" with " + item.identifyMaterial());
}
}

Expand Down Expand Up @@ -3450,7 +3445,6 @@ public void playerInteractEntity(PlayerInteractEntityEvent event) {
dNPC npc = null;

dItem item = new dItem(event.getPlayer().getItemInHand());
dMaterial itemMaterial = item.getMaterial();
dEntity entity = new dEntity(event.getRightClicked());

Map<String, dObject> context = new HashMap<String, dObject>();
Expand All @@ -3467,19 +3461,18 @@ public void playerInteractEntity(PlayerInteractEntityEvent event) {
events.add("player right clicks " + entity.identifyType() + " with " +
item.identify());
events.add("player right clicks entity with " +
itemMaterial.identify());
item.identifyMaterial());
events.add("player right clicks " + entity.identifyType() + " with " +
itemMaterial.identify());
item.identifyMaterial());

if (entity.getBukkitEntity() instanceof ItemFrame) {
dItem itemFrame = new dItem(((ItemFrame) entity.getBukkitEntity()).getItem());
dMaterial itemFrameMaterial = itemFrame.getMaterial();
context.put("itemframe", itemFrame);

events.add("player right clicks " + entity.identifyType() + " " +
itemFrame.identify());
events.add("player right clicks " + entity.identifyType() + " " +
itemFrameMaterial.identify());
itemFrame.identifyMaterial());
}

determination = doEvents(events, npc, event.getPlayer(), context, true);
Expand All @@ -3505,14 +3498,13 @@ public void playerInteractEntity(PlayerInteractEntityEvent event) {
public void playerItemConsume(PlayerItemConsumeEvent event) {

dItem item = new dItem(event.getItem());
dMaterial itemMaterial = item.getMaterial();

Map<String, dObject> context = new HashMap<String, dObject>();
context.put("item", item);

List<String> events = new ArrayList<String>();
events.add("player consumes " + item.identify());
events.add("player consumes " + itemMaterial.identify());
events.add("player consumes " + item.identifyMaterial());

String determination = doEvents(events, null, event.getPlayer(), context, true);

Expand Down Expand Up @@ -3711,7 +3703,6 @@ public void playerPickupItem(PlayerPickupItemEvent event) {

Map<String, dObject> context = new HashMap<String, dObject>();
dItem item = new dItem(event.getItem().getItemStack());
dMaterial itemMaterial = item.getMaterial();
context.put("item", item);
context.put("entity", new dEntity(event.getItem()));
context.put("location", new dLocation(event.getItem().getLocation()));
Expand All @@ -3720,10 +3711,10 @@ public void playerPickupItem(PlayerPickupItemEvent event) {

events.add("player picks up item");
events.add("player picks up " + item.identify());
events.add("player picks up " + itemMaterial.identify());
events.add("player picks up " + item.identifyMaterial());
events.add("player takes item");
events.add("player takes " + item.identify());
events.add("player takes " + itemMaterial.identify());
events.add("player takes " + item.identifyMaterial());

String determination = doEvents(events, null, event.getPlayer(), context, true);

Expand Down

0 comments on commit fd1d590

Please sign in to comment.