Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2025-01-23 09:41:20 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Crafting Station Recipes can now have no ingredients if there are conditions.

Browse Source
This commit is contained in:
Ethan 2020-08-09 19:44:57 -04:00
parent 2515e563a7
commit d75629b66a
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/net/Indyuce/mmoitems/api/crafting/recipe/Recipe.java
View File

@ -1,14 +1,5 @@
package net.Indyuce.mmoitems.api.crafting.recipe;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
import org.apache.commons.lang.Validate;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.inventory.ItemStack;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.crafting.CraftingStation;
import net.Indyuce.mmoitems.api.crafting.IngredientInventory;
@ -17,6 +8,14 @@ import net.Indyuce.mmoitems.api.crafting.ingredient.Ingredient;
import net.Indyuce.mmoitems.api.crafting.trigger.Trigger;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.mmogroup.mmolib.api.MMOLineConfig;
import org.apache.commons.lang.Validate;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.inventory.ItemStack;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
public abstract class Recipe {
private final String id;
@ -50,7 +49,6 @@ public abstract class Recipe {
"Could not load ingredient '" + format + "': " + exception.getMessage());
}
Validate.notEmpty(ingredients, id + ": Ingredients must not be empty");
/*
* load conditions
@ -65,6 +63,10 @@ public abstract class Recipe {
"Could not load condition '" + format + "': " + exception.getMessage());
}
if (conditions.isEmpty() && ingredients.isEmpty()) {
throw new IllegalArgumentException("No conditions or ingredients set.");
}
/*
* load triggers
*/