- Mod integration can now specify a required version prefix

- Ingredients can now also be liquids
- Added some checks that should fix #87
- Temporarily disabled BuildCraft support for BC 6.1 (BC 6.0 still has support)
- Started work on BC 6.1 support (not yet functional and currently disabled)
This commit is contained in:
Stan Hebben committed 2014-11-09 18:29:00 +01:00
1 parent cd322e04a7
commit 6500f03cda
37 files changed
+1153 -15

No files matched your search

@@ -1,6 +1,7 @@
package minetweaker.api.item;
import java.util.List;
import minetweaker.api.liquid.ILiquidStack;
import minetweaker.api.player.IPlayer;
import stanhebben.zenscript.annotations.OperatorType;
import stanhebben.zenscript.annotations.ZenClass;
@@ -51,6 +52,17 @@ public interface IIngredient {
@ZenGetter("items")
public List<IItemStack> getItems();
/**
* Gets all possible liquids for this ingredient.
*
* If there is no liquid list (for example, it is the &lt;*&ft; wildcard item)
* null should be returned.
*
* @return the liquids for this ingredient, or null
*/
@ZenGetter("liquids")
public List<ILiquidStack> getLiquids();
/**
* Returns a new ingredient with the given stack size.
*
@@ -100,7 +112,8 @@ public interface IIngredient {
public IIngredient marked(String mark);
/**
* Checks if this ingredient matches the given item.
* Checks if this ingredient matches the given item. For liquids, will
* match the item if it is a valid container.
*
* @param item item to check
* @return true if the item matches
@@ -108,6 +121,15 @@ public interface IIngredient {
@ZenMethod
public boolean matches(IItemStack item);
/**
* Checks if this ingredient matches the given liquid.
*
* @param liquid
* @return
*/
@ZenMethod
public boolean matches(ILiquidStack liquid);
/**
* Check if this ingredient contains all possible values for the given
* ingredient.