Skip to content

Commit

Permalink
anvil event feedback 2
Browse files Browse the repository at this point in the history
  • Loading branch information
Lildirt committed Jun 30, 2024
1 parent 5f4a1be commit 5db854f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -563,12 +563,8 @@ public void setResult(MCItemStack i) {
}

@Override
public List<MCHumanEntity> getViewers() {
List<MCHumanEntity> viewers = new ArrayList<>();
for(HumanEntity viewer : e.getViewers()) {
viewers.add(new BukkitMCHumanEntity(viewer));
}
return viewers;
public MCPlayer getPlayer() {
return new BukkitMCPlayer(e.getViewers().get(0));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package com.laytonsmith.abstraction.events;

import com.laytonsmith.abstraction.MCHumanEntity;
import com.laytonsmith.abstraction.MCPlayer;
import com.laytonsmith.abstraction.MCItemStack;

import java.util.List;

public interface MCPrepareAnvilEvent extends MCInventoryEvent {
List<MCHumanEntity> getViewers();
MCPlayer getPlayer();

void setResult(MCItemStack i);
}
Original file line number Diff line number Diff line change
Expand Up @@ -1002,7 +1002,7 @@ public String getName() {
public String docs() {
return "{}"
+ " Fires when a recipe is formed in an anvil, but the result has not yet been clicked."
+ " { viewers: all players viewing this anvil's interface."
+ " { player: the player using the anvil."
+ " | first_item: the first item being used in the recipe."
+ " | second_item: the second item being used in the recipe."
+ " | result: the result of the recipe."
Expand Down Expand Up @@ -1032,12 +1032,7 @@ public Map<String, Mixed> evaluate(BindableEvent event) throws EventException {
MCAnvilInventory anvil = (MCAnvilInventory) e.getInventory();
Map<String, Mixed> ret = evaluate_helper(e);

CArray viewers = new CArray(Target.UNKNOWN);
for(MCHumanEntity viewer : e.getViewers()) {
viewers.push(new CString(viewer.getName(), Target.UNKNOWN), Target.UNKNOWN);
}

ret.put("viewers", viewers);
ret.put("player", new CString(e.getPlayer().getName(), Target.UNKNOWN));
ret.put("first_item", ObjectGenerator.GetGenerator().item(anvil.getFirstItem(), Target.UNKNOWN));
ret.put("second_item", ObjectGenerator.GetGenerator().item(anvil.getSecondItem(), Target.UNKNOWN));
ret.put("result", ObjectGenerator.GetGenerator().item(anvil.getResult(), Target.UNKNOWN));
Expand Down

0 comments on commit 5db854f

Please sign in to comment.