diff --git a/src/api b/src/api index b60245f21..bd03e27c4 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit b60245f21a43398a8d499f397ac9baaa690fff88 +Subproject commit bd03e27c472f27d6054df40bd0c7a03a73f051d3 diff --git a/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java b/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java index 1ebc173f6..fb8ea2698 100644 --- a/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java @@ -2,11 +2,12 @@ package noppes.npcs.scripted.event; import cpw.mods.fml.common.eventhandler.Cancelable; import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.api.event.IRecipeEvent; import noppes.npcs.api.item.IItemStack; import noppes.npcs.controllers.data.RecipeScript; import noppes.npcs.scripted.event.player.PlayerEvent; -public class RecipeScriptEvent extends PlayerEvent { +public class RecipeScriptEvent extends PlayerEvent implements IRecipeEvent { public final Object recipe; public final IItemStack[] items; public final boolean isAnvil; @@ -18,20 +19,23 @@ public class RecipeScriptEvent extends PlayerEvent { this.isAnvil = anvil; } + @Override public Object getRecipe() { return recipe; } + @Override public IItemStack[] getItems() { return items; } + @Override public boolean isAnvil() { return isAnvil; } @Cancelable - public static class Pre extends RecipeScriptEvent { + public static class Pre extends RecipeScriptEvent implements IRecipeEvent.Pre { private String message = ""; private int xpCost = 0; private int materialUsage = 0; @@ -40,27 +44,33 @@ public class RecipeScriptEvent extends PlayerEvent { super(player, recipe, isAnvil, items); } + @Override public void setMessage(String message) { this.message = message == null ? "" : message; } + @Override public String getMessage() { return message; } + @Override public int getXpCost() { return xpCost; } + @Override public void setXpCost(int xpCost) { if (this.isAnvil) this.xpCost = xpCost; } + @Override public int getMaterialUsage() { return materialUsage; } + @Override public void setMaterialUsage(int materialUsage) { if (this.isAnvil) this.materialUsage = materialUsage; @@ -71,7 +81,7 @@ public class RecipeScriptEvent extends PlayerEvent { } } - public static class Post extends RecipeScriptEvent { + public static class Post extends RecipeScriptEvent implements IRecipeEvent.Post { private IItemStack result; public Post(IPlayer player, Object recipe, boolean isAnvil, IItemStack[] items, IItemStack result) { @@ -79,10 +89,12 @@ public class RecipeScriptEvent extends PlayerEvent { this.result = result; } + @Override public IItemStack getCraft() { return result; } + @Override public void setResult(IItemStack stack) { this.result = stack; }