exituser/Brewery
1
0
Fork 0
mirror of https://github.com/exituser/Brewery.git synced 2026-09-17 08:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite of the Custom item into RecipeItem

Browse Source 
and Ingredient with subclasses
Implemented adding custom items to Ingredients
Added support for plugin-items
This commit is contained in:
Sn0wStorm
2019-11-06 19:44:52 +01:00
parent d0263c611c
commit 7f2f9d75dd
41 changed files with 2010 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/dre/brewery/api/events/IngedientAddEvent.java
+17 -2
View File
@@ -1,6 +1,7 @@
package com.dre.brewery.api.events;
import com.dre.brewery.BCauldron;
import com.dre.brewery.recipe.RecipeItem;
import com.dre.brewery.utility.LegacyUtil;
import org.bukkit.block.Block;
import org.bukkit.block.data.BlockData;
@@ -21,14 +22,16 @@ public class IngedientAddEvent extends PlayerEvent implements Cancellable {
private final Block block;
private final BCauldron cauldron;
private ItemStack ingredient;
private RecipeItem rItem;
private boolean cancelled;
private boolean takeItem = true;
public IngedientAddEvent(Player who, Block block, BCauldron bCauldron, ItemStack ingredient) {
public IngedientAddEvent(Player who, Block block, BCauldron bCauldron, ItemStack ingredient, RecipeItem rItem) {
super(who);
this.block = block;
cauldron = bCauldron;
this.ingredient = ingredient.clone();
this.rItem = rItem;
this.ingredient = ingredient;
}
public Block getBlock() {
@@ -39,6 +42,15 @@ public class IngedientAddEvent extends PlayerEvent implements Cancellable {
return cauldron;
}
/**
* The Recipe item that matches the ingredient.
* This might not be the only recipe item that will match the ingredient
* Will be recalculated if the Ingredient is changed with the setIngredient Method
*/
public RecipeItem getRecipeItem() {
return rItem;
}
// Get the item currently being added to the cauldron by the player
// Can be changed directly (mutable) or with the setter Method
// The amount is ignored and always one added
@@ -49,8 +61,11 @@ public class IngedientAddEvent extends PlayerEvent implements Cancellable {
// Set the ingredient added to the cauldron to something else
// Will always be accepted, even when not in a recipe or the cooked list
// The amount is ignored and always one added
// This also recalculates the recipeItem!
public void setIngredient(ItemStack ingredient) {
this.ingredient = ingredient;
// The Ingredient has been changed. Recalculate RecipeItem!
rItem = RecipeItem.getMatchingRecipeItem(ingredient, true);
}
// If the amount of the item in the players hand should be decreased