merge errors

This commit is contained in:
gnembon committed 2019-12-25 03:19:57 -04:00
1 parent 3e6f83905c
commit b09982e02c
1 file changed
-9
@@ -1289,15 +1289,6 @@ public class CarpetExpression
return (_c, _t) -> res; return (_c, _t) -> res;
}); });
this.expr.addLazyFunction("item_category", 1, (c, t, lv) ->
{
ItemStackArgument item = NBTSerializableValue.parseItem(lv.get(0).evalValue(c).getString());
Value res = new StringValue(item.getItem().getGroup().getName());
return (_c, _t) -> res;
});
this.expr.addLazyFunction("inventory_size", -1, (c, t, lv) -> this.expr.addLazyFunction("inventory_size", -1, (c, t, lv) ->
{ {
CarpetContext cc = (CarpetContext) c; CarpetContext cc = (CarpetContext) c;