From 39d0c4ab6de2dd0debad21087e55829e4e8fa574 Mon Sep 17 00:00:00 2001 From: YannickMG Date: Fri, 12 Jan 2024 16:52:10 -0500 Subject: [PATCH] Simplified tank filling code --- .../java/tconstruct/smeltery/blocks/LavaTankBlock.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java b/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java index 3e0e9ec3..b7026419 100644 --- a/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java @@ -151,7 +151,7 @@ public class LavaTankBlock extends BlockContainer { if (amount == liquid.amount) { logic.fill(ForgeDirection.UNKNOWN, liquid, true); if (!entityplayer.capabilities.isCreativeMode) { - replaceHeldItem(entityplayer, getEmptyContainer(current)); + replaceHeldItem(entityplayer, FluidContainerRegistry.drainFluidContainer(current)); } // update @@ -190,14 +190,6 @@ public class LavaTankBlock extends BlockContainer { return false; } - private static ItemStack getEmptyContainer(ItemStack stack) { - Item item = stack.getItem(); - if (item != null && item.hasContainerItem(stack)) return item.getContainerItem(stack); - else if (FluidContainerRegistry.isFilledContainer(stack)) - return FluidContainerRegistry.drainFluidContainer(stack); - else return null; - } - /** * Replace one currently held item for a given player. *