Refine fluid interaction slightly

Technici4n · Jul 21, 2024 · e4fcf81 · e4fcf81
1 parent a866cf4
commit e4fcf81
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/src/main/java/owmii/powah/lib/client/screen/container/AbstractTileScreen.java b/src/main/java/owmii/powah/lib/client/screen/container/AbstractTileScreen.java
@@ -63,10 +63,12 @@ protected void renderTooltip(GuiGraphics gui, int x, int y) {
     @Override
     public boolean mouseClicked(double mouseX, double mouseY, int button) {
 
-        for (var tankArea : tankAreas) {
-            if (tankArea.contains(mouseX - leftPos, mouseY - topPos)) {
-                menu.interactWithTank();
-                return true;
+        if (button == 0 || button == 1) {
+            for (var tankArea : tankAreas) {
+                if (tankArea.contains(mouseX - leftPos, mouseY - topPos)) {
+                    menu.interactWithTank(button == 1);
+                    return true;
+                }
             }
         }
 

diff --git a/src/main/java/owmii/powah/lib/logistics/inventory/AbstractTileContainer.java b/src/main/java/owmii/powah/lib/logistics/inventory/AbstractTileContainer.java
@@ -10,6 +10,7 @@
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.neoforged.neoforge.fluids.FluidActionResult;
 import net.neoforged.neoforge.fluids.FluidUtil;
 import net.neoforged.neoforge.network.PacketDistributor;
 import org.jetbrains.annotations.Nullable;
@@ -80,9 +81,9 @@ public ItemStack quickMoveStack(Player playerIn, int index) {
         return stack;
     }
 
-    public void interactWithTank() {
+    public void interactWithTank(boolean drain) {
         if (player.level().isClientSide()) {
-            PacketDistributor.sendToServer(new InteractWithTankPacket(containerId));
+            PacketDistributor.sendToServer(new InteractWithTankPacket(containerId, drain));
         }
 
         var carried = getCarried();
@@ -95,9 +96,16 @@ public void interactWithTank() {
             return;
         }
 
-        var result = FluidUtil.tryEmptyContainer(carried, tank, tank.getCapacity(), player, true);
-        if (!result.isSuccess()) {
+        FluidActionResult result;
+        if (drain) {
             result = FluidUtil.tryFillContainer(carried, tank, tank.getCapacity(), player, true);
+        } else {
+            result = FluidUtil.tryEmptyContainer(carried, tank, tank.getCapacity(), player, true);
+
+            // If that didn't succeed, but the held item is *empty*, try filling it
+            if (!result.isSuccess() && FluidUtil.getFluidContained(carried).isEmpty()) {
+                result = FluidUtil.tryFillContainer(carried, tank, tank.getCapacity(), player, true);
+            }
         }
         if (result.isSuccess()) {
             setCarried(result.getResult());

diff --git a/src/main/java/owmii/powah/network/packet/InteractWithTankPacket.java b/src/main/java/owmii/powah/network/packet/InteractWithTankPacket.java
@@ -9,7 +9,7 @@
 import owmii.powah.lib.logistics.inventory.AbstractTileContainer;
 import owmii.powah.network.ServerboundPacket;
 
-public record InteractWithTankPacket(int containerId) implements ServerboundPacket {
+public record InteractWithTankPacket(int containerId, boolean drain) implements ServerboundPacket {
 
     @Override
     public Type<? extends CustomPacketPayload> type() {
@@ -20,12 +20,13 @@ public Type<? extends CustomPacketPayload> type() {
 
     public static final StreamCodec<RegistryFriendlyByteBuf, InteractWithTankPacket> STREAM_CODEC = StreamCodec.composite(
             ByteBufCodecs.INT, InteractWithTankPacket::containerId,
+            ByteBufCodecs.BOOL, InteractWithTankPacket::drain,
             InteractWithTankPacket::new);
 
     @Override
     public void handleOnServer(ServerPlayer player) {
         if (player.containerMenu instanceof AbstractTileContainer<?> tileContainer && tileContainer.containerId == containerId) {
-            tileContainer.interactWithTank();
+            tileContainer.interactWithTank(drain);
         }
     }
 }