Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ public ItemStack assemble(CraftingContainer container, RegistryAccess registryAc
IntAttached<ItemStack> copyCheck = copyCheck(container);
if (copyCheck == null)
return ItemStack.EMPTY;

ItemStack itemToCopy = copyCheck.getValue();
if (!(itemToCopy.getItem() instanceof SupportsItemCopying sic))
return ItemStack.EMPTY;

return sic.createCopy(itemToCopy, copyCheck.getFirst() + 1);
}

Expand All @@ -62,27 +62,37 @@ private IntAttached<ItemStack> copyCheck(CraftingContainer inv) {
ItemStack itemToCopy = ItemStack.EMPTY;
int copyTargets = 0;

for (int j = 0; j < inv.getContainerSize(); ++j) {
for (int j = 0; j < inv.getContainerSize(); ++j){
ItemStack itemInSlot = inv.getItem(j);
if (itemInSlot.isEmpty())
continue;
if (!itemToCopy.isEmpty() && itemToCopy.getItem() != itemInSlot.getItem())
if(!(itemInSlot.getItem() instanceof SupportsItemCopying sic))
return null;
if (!(itemInSlot.getItem() instanceof SupportsItemCopying sic))
if (!sic.canCopyFromItem(itemInSlot))
continue;
itemToCopy = itemInSlot;
break;
}

if (sic.canCopyFromItem(itemInSlot)) {
if (!itemToCopy.isEmpty())
return null;
itemToCopy = itemInSlot;
continue;
}
if(itemToCopy.isEmpty())
return null;

if (sic.canCopyToItem(itemInSlot))
copyTargets++;
for (int j = 0; j < inv.getContainerSize(); ++j) {
ItemStack itemInSlot = inv.getItem(j);
if (itemInSlot.isEmpty() || itemInSlot == itemToCopy)
continue;
if (itemToCopy.getItem() != itemInSlot.getItem())
return null;
if (!(itemInSlot.getItem() instanceof SupportsItemCopying sic))
return null;
if (sic.canCopyFromItem(itemInSlot))
return null;
if (!sic.canCopyToItem(itemInSlot))
return null;
copyTargets++;
}

if (itemToCopy.isEmpty() || copyTargets == 0)
if (copyTargets == 0)
return null;

return IntAttached.with(copyTargets, itemToCopy);
Expand Down