-
Notifications
You must be signed in to change notification settings - Fork 790
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve behavior of tanks and drains
- Loading branch information
1 parent
a963cc0
commit 9d951ab
Showing
5 changed files
with
157 additions
and
109 deletions.
There are no files selected for viewing
150 changes: 150 additions & 0 deletions
150
src/main/java/slimeknights/tconstruct/library/fluid/FluidTransferUtil.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,150 @@ | ||
| package slimeknights.tconstruct.library.fluid; | ||
|
|
||
| import lombok.AccessLevel; | ||
| import lombok.NoArgsConstructor; | ||
| import net.minecraft.entity.player.PlayerEntity; | ||
| import net.minecraft.fluid.Fluid; | ||
| import net.minecraft.fluid.Fluids; | ||
| import net.minecraft.item.BucketItem; | ||
| import net.minecraft.item.ItemStack; | ||
| import net.minecraft.tileentity.TileEntity; | ||
| import net.minecraft.util.Direction; | ||
| import net.minecraft.util.DrinkHelper; | ||
| import net.minecraft.util.Hand; | ||
| import net.minecraft.util.SoundCategory; | ||
| import net.minecraft.util.math.BlockPos; | ||
| import net.minecraft.util.math.BlockRayTraceResult; | ||
| import net.minecraft.world.World; | ||
| import net.minecraftforge.common.util.LazyOptional; | ||
| import net.minecraftforge.fluids.FluidAttributes; | ||
| import net.minecraftforge.fluids.FluidStack; | ||
| import net.minecraftforge.fluids.capability.CapabilityFluidHandler; | ||
| import net.minecraftforge.fluids.capability.IFluidHandler; | ||
| import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction; | ||
| import net.minecraftforge.fluids.capability.templates.EmptyFluidHandler; | ||
| import net.minecraftforge.items.ItemHandlerHelper; | ||
| import slimeknights.tconstruct.TConstruct; | ||
|
|
||
| /** | ||
| * Alternative to {@link net.minecraftforge.fluids.FluidUtil} since no one has time to make the forge util not a buggy mess | ||
| */ | ||
| @NoArgsConstructor(access = AccessLevel.PRIVATE) | ||
| public class FluidTransferUtil { | ||
| public static boolean tryTransfer(IFluidHandler input, IFluidHandler output, int maxFill) { | ||
| // first, figure out how much we can drain | ||
| FluidStack simulated = input.drain(maxFill, FluidAction.SIMULATE); | ||
| if (!simulated.isEmpty()) { | ||
| // next, find out how much we can fill | ||
| int simulatedFill = output.fill(simulated, FluidAction.SIMULATE); | ||
| if (simulatedFill > 0) { | ||
| // actually drain | ||
| FluidStack drainedFluid = input.drain(simulatedFill, FluidAction.EXECUTE); | ||
| if (!drainedFluid.isEmpty()) { | ||
| // acutally fill | ||
| int actualFill = output.fill(drainedFluid, FluidAction.EXECUTE); | ||
| if (actualFill != drainedFluid.getAmount()) { | ||
| TConstruct.log.error("Lost {} fluid during transfer", drainedFluid.getAmount() - actualFill); | ||
| } | ||
| } | ||
| return true; | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| /** | ||
| * Attempts to interact with a flilled bucket on a fluid tank. This is unique as it handles fish buckets, which don't expose fluid capabilities | ||
| * @param world World instance | ||
| * @param pos Block position | ||
| * @param player Player | ||
| * @param hand Hand | ||
| * @param hit Hit side | ||
| * @param offset Direction to place fish | ||
| * @return True if using a bucket | ||
| */ | ||
| public static boolean interactWithBucket(World world, BlockPos pos, PlayerEntity player, Hand hand, Direction hit, Direction offset) { | ||
| ItemStack held = player.getHeldItem(hand); | ||
| if (held.getItem() instanceof BucketItem) { | ||
| BucketItem bucket = (BucketItem) held.getItem(); | ||
| Fluid fluid = bucket.getFluid(); | ||
| if (fluid != Fluids.EMPTY) { | ||
| if (!world.isRemote) { | ||
| TileEntity te = world.getTileEntity(pos); | ||
| if (te != null) { | ||
| te.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, hit) | ||
| .ifPresent(handler -> { | ||
| FluidStack fluidStack = new FluidStack(bucket.getFluid(), FluidAttributes.BUCKET_VOLUME); | ||
| // must empty the whole bucket | ||
| if (handler.fill(fluidStack, FluidAction.SIMULATE) == FluidAttributes.BUCKET_VOLUME) { | ||
| handler.fill(fluidStack, FluidAction.EXECUTE); | ||
| bucket.onLiquidPlaced(world, held, pos.offset(offset)); | ||
| world.playSound(null, pos, fluid.getAttributes().getEmptySound(), SoundCategory.BLOCKS, 1.0F, 1.0F); | ||
| if (!player.isCreative()) { | ||
| player.setHeldItem(hand, held.getContainerItem()); | ||
| } | ||
| } | ||
| }); | ||
| } | ||
| } | ||
| return true; | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| /** | ||
| * Base logic to interact with a tank | ||
| * @param world World instance | ||
| * @param pos Tank position | ||
| * @param player Player instance | ||
| * @param hand Hand used | ||
| * @param hit Hit position | ||
| * @return True if further interactions should be blocked, false otherwise | ||
| */ | ||
| public static boolean interactWithFluidItem(World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { | ||
| // success if the item is a fluid handler, regardless of if fluid moved | ||
| ItemStack stack = player.getHeldItem(hand); | ||
| Direction face = hit.getFace(); | ||
| // fetch capability before copying, bit more work when its a fluid handler, but saves copying time when its not | ||
| if (stack.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY).isPresent()) { | ||
| TileEntity te = world.getTileEntity(pos); | ||
| if (te != null) { | ||
| LazyOptional<IFluidHandler> teCapability = te.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, face); | ||
| if (teCapability.isPresent()) { | ||
| IFluidHandler teHandler = teCapability.orElse(EmptyFluidHandler.INSTANCE); | ||
| ItemStack copy = ItemHandlerHelper.copyStackWithSize(stack, 1); | ||
| copy.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY).ifPresent(itemHandler -> { | ||
| // first, try filling the TE from the item | ||
| boolean isSuccess = false; | ||
| if (tryTransfer(teHandler, itemHandler, Integer.MAX_VALUE)) { | ||
| isSuccess = true; | ||
| // if that failed, try filling the item handler from the TE | ||
| } else if (tryTransfer(itemHandler, teHandler, Integer.MAX_VALUE)) { | ||
| isSuccess = true; | ||
| } | ||
| // if either worked, update the player's inventory | ||
| if (isSuccess) { | ||
| player.setHeldItem(hand, DrinkHelper.fill(stack, player, itemHandler.getContainer())); | ||
| } | ||
| }); | ||
| } | ||
| } | ||
| return true; | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| /** | ||
| * Utility to try fluid item then bucket | ||
| * @param world World instance | ||
| * @param pos Tank position | ||
| * @param player Player instance | ||
| * @param hand Hand used | ||
| * @param hit Hit position | ||
| * @return True if interacted | ||
| */ | ||
| public static boolean interactWithTank(World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { | ||
| return interactWithFluidItem(world, pos, player, hand, hit) | ||
| || interactWithBucket(world, pos, player, hand, hit.getFace(), hit.getFace()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters