diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientAny.java b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientAny.java index 69f3057..dde3672 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientAny.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientAny.java @@ -1,101 +1,108 @@ package minetweaker.api.item; -import java.util.List; import minetweaker.api.liquid.ILiquidStack; import minetweaker.api.player.IPlayer; import minetweaker.util.ArrayUtil; +import java.util.List; + /** * Represents the wildcard ingredient (<*>). - * + * * @author Stan Hebben */ public class IngredientAny implements IIngredient { - public static final IngredientAny INSTANCE = new IngredientAny(); + public static final IngredientAny INSTANCE = new IngredientAny(); - public static Object INTERNAL_ANY = null; // platforms supporting an "any" - // item should fill it here + public static Object INTERNAL_ANY = null; // platforms supporting an "any" + // item should fill it here - private IngredientAny() { - } + private IngredientAny() { + } - @Override - public String getMark() { - return null; - } + @Override + public String getMark() { + return null; + } - @Override - public int getAmount() { - return -1; - } + @Override + public int getAmount() { + return -1; + } - @Override - public List getItems() { - return null; - } + @Override + public List getItems() { + return null; + } - @Override - public List getLiquids() { - return null; - } + @Override + public List getLiquids() { + return null; + } - @Override - public IIngredient amount(int amount) { - return new IngredientStack(this, amount); - } + @Override + public IIngredient amount(int amount) { + return new IngredientStack(this, amount); + } - @Override - public IIngredient transform(IItemTransformer transformer) { - return new IngredientAnyAdvanced(null, ArrayUtil.EMPTY_CONDITIONS, new IItemTransformer[] { transformer }); - } + @Override + public IIngredient transform(IItemTransformer transformer) { + return new IngredientAnyAdvanced(null, ArrayUtil.EMPTY_CONDITIONS, new IItemTransformer[]{transformer}); + } - @Override - public IIngredient only(IItemCondition condition) { - return new IngredientAnyAdvanced(null, new IItemCondition[] { condition }, ArrayUtil.EMPTY_TRANSFORMERS); - } + @Override + public IIngredient only(IItemCondition condition) { + return new IngredientAnyAdvanced(null, new IItemCondition[]{condition}, ArrayUtil.EMPTY_TRANSFORMERS); + } - @Override - public IIngredient marked(String mark) { - return new IngredientAnyAdvanced(mark, ArrayUtil.EMPTY_CONDITIONS, ArrayUtil.EMPTY_TRANSFORMERS); - } + @Override + public IIngredient marked(String mark) { + return new IngredientAnyAdvanced(mark, ArrayUtil.EMPTY_CONDITIONS, ArrayUtil.EMPTY_TRANSFORMERS); + } - @Override - public IIngredient or(IIngredient ingredient) { - return this; - } + @Override + public IIngredient or(IIngredient ingredient) { + return this; + } - @Override - public boolean matches(IItemStack item) { - return true; - } + @Override + public boolean matches(IItemStack item) { + return true; + } - @Override - public boolean matches(ILiquidStack liquid) { - return true; - } + @Override + public boolean matchesExact(IItemStack item) { + return true; + } - @Override - public boolean contains(IIngredient ingredient) { - return true; - } - @Override - public IItemStack applyTransform(IItemStack item, IPlayer byPlayer) { - return item; - } + @Override + public boolean matches(ILiquidStack liquid) { + return true; + } - @Override - public boolean hasTransformers() { - return false; - } + @Override + public boolean contains(IIngredient ingredient) { + return true; + } - @Override - public Object getInternal() { - return INTERNAL_ANY; - } + @Override + public IItemStack applyTransform(IItemStack item, IPlayer byPlayer) { + return item; + } - @Override - public String toString() { - return "<*>"; - } + @Override + public boolean hasTransformers() { + return false; + } + + @Override + public Object getInternal() { + return INTERNAL_ANY; + } + + @Override + public String toString() { + return "<*>"; + } } diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/oredict/IngredientOreDict.java b/MineTweaker3-API/src/main/java/minetweaker/api/oredict/IngredientOreDict.java index 2312bee..8735f74 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/oredict/IngredientOreDict.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/oredict/IngredientOreDict.java @@ -6,18 +6,14 @@ package minetweaker.api.oredict; -import java.util.Collections; -import java.util.List; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemCondition; -import minetweaker.api.item.IItemStack; -import minetweaker.api.item.IItemTransformer; -import minetweaker.api.item.IngredientOr; -import minetweaker.api.item.IngredientStack; +import minetweaker.api.item.*; import minetweaker.api.liquid.ILiquidStack; import minetweaker.api.player.IPlayer; import minetweaker.util.ArrayUtil; +import java.util.Collections; +import java.util.List; + /** * * @author Stan Hebben @@ -97,6 +93,19 @@ public class IngredientOreDict implements IIngredient { return true; } + @Override + public boolean matchesExact(IItemStack item) { + if (!entry.matchesExact(item)) + return false; + + for (IItemCondition condition : conditions) { + if (!condition.matches(item)) + return false; + } + + return true; + } + @Override public boolean matches(ILiquidStack liquid) { return false;