Skip to content

Commit 27c02e5

Browse files
committed
Fix #1622
1 parent 107f6b5 commit 27c02e5

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/main/java/com/simibubi/create/compat/rei/category/ItemDrainCategory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import me.shedaniel.rei.api.common.entry.EntryStack;
2929
import me.shedaniel.rei.api.common.entry.type.VanillaEntryTypes;
3030
import me.shedaniel.rei.api.common.util.EntryIngredients;
31-
import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext;
3231
import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants;
3332
import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage;
3433
import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
@@ -75,7 +74,8 @@ public static void consumeRecipes(Consumer<EmptyingRecipe> consumer) {
7574
if (handler == null)
7675
return;
7776
FluidStack extracted = TransferUtil.extractAnyFluid(handler, FluidConstants.BUCKET);
78-
ItemStack result = ctx.getItemVariant().toStack(ItemHelper.truncateLong(ctx.getAmount()));
77+
int amount = ctx.getItemVariant().isBlank() ? 0 : (int) ctx.getAmount(); // GH#1622
78+
ItemStack result = ctx.getItemVariant().toStack(ItemHelper.truncateLong(amount));
7979
if (extracted.isEmpty())
8080
return;
8181
if (result.isEmpty())

src/main/java/com/simibubi/create/content/fluids/transfer/GenericItemEmptying.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction;
1919
import net.minecraft.world.Container;
2020
import net.minecraft.world.item.ItemStack;
21-
import net.minecraft.world.item.PotionItem;
2221
import net.minecraft.world.item.crafting.Recipe;
2322
import net.minecraft.world.level.Level;
2423

@@ -65,7 +64,8 @@ public static Pair<FluidStack, ItemStack> emptyItem(Level world, ItemStack stack
6564
return Pair.of(resultingFluid, resultingItem);
6665
try (Transaction t = TransferUtil.getTransaction()) {
6766
resultingFluid = TransferUtil.extractAnyFluid(tank, FluidConstants.BUCKET);
68-
resultingItem = ctx.getItemVariant().toStack((int) ctx.getAmount());
67+
int amount = ctx.getItemVariant().isBlank() ? 0 : (int) ctx.getAmount(); // GH#1622
68+
resultingItem = ctx.getItemVariant().toStack(amount);
6969
if (!simulate) {
7070
stack.shrink(1);
7171
t.commit();

0 commit comments

Comments
 (0)