Skip to content

Commit

Permalink
Fix error during blueprint crafting
Browse files Browse the repository at this point in the history
  • Loading branch information
malte0811 committed Jan 21, 2024
1 parent 18d7406 commit ab20f12
Showing 1 changed file with 13 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -127,32 +127,25 @@ else if(maxCrafted.isPresent())
public NonNullList<ItemStack> consumeInputs(NonNullList<ItemStack> query, int crafted)
{
NonNullList<ItemStack> consumed = NonNullList.create();
Iterator<IngredientWithSize> inputIt = inputs.iterator();
while(inputIt.hasNext())
for(IngredientWithSize ingr : inputs)
{
IngredientWithSize ingr = inputIt.next();
int inputSize = ingr.getCount()*crafted;

for(int i = 0; i < query.size(); i++)
{
ItemStack queryStack = query.get(i);
if(!queryStack.isEmpty())
if(ingr.test(queryStack))
{
int taken = Math.min(queryStack.getCount(), inputSize);
consumed.add(ItemHandlerHelper.copyStackWithSize(queryStack, taken));
if(taken >= queryStack.getCount()&&queryStack.getItem().hasCraftingRemainingItem(queryStack))
query.set(i, queryStack.getItem().getCraftingRemainingItem(queryStack));
else
queryStack.shrink(taken);
inputSize -= taken;
if(inputSize <= 0)
{
inputIt.remove();
break;
}
}

if(!queryStack.isEmpty()&&ingr.test(queryStack))
{
int taken = Math.min(queryStack.getCount(), inputSize);
consumed.add(ItemHandlerHelper.copyStackWithSize(queryStack, taken));
if(taken >= queryStack.getCount()&&queryStack.getItem().hasCraftingRemainingItem(queryStack))
query.set(i, queryStack.getItem().getCraftingRemainingItem(queryStack));
else
queryStack.shrink(taken);
inputSize -= taken;
if(inputSize <= 0)
break;
}
}
}
return consumed;
Expand Down

0 comments on commit ab20f12

Please sign in to comment.