mirror of
https://github.com/GTNewHorizons/CraftTweaker.git
synced 2026-11-21 12:32:29 +00:00
- 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:
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 minetweaker.util.ArrayUtil;
|
||||
|
||||
@@ -35,6 +36,11 @@ public class IngredientAnyAdvanced implements IIngredient {
|
||||
public List<IItemStack> getItems() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ILiquidStack> getLiquids() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IIngredient amount(int amount) {
|
||||
@@ -63,6 +69,7 @@ public class IngredientAnyAdvanced implements IIngredient {
|
||||
|
||||
@Override
|
||||
public boolean matches(IItemStack item) {
|
||||
// TODO: what is the point of this?
|
||||
if (!item.matches(item)) return false;
|
||||
|
||||
for (IItemCondition condition : conditions) {
|
||||
@@ -71,6 +78,12 @@ public class IngredientAnyAdvanced implements IIngredient {
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean matches(ILiquidStack liquid) {
|
||||
// TODO: conditions on liquids?
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean contains(IIngredient ingredient) {
|
||||
|
||||
Reference in new issue
Block a user