re-add potion effect curing

cech12 · Dec 21, 2023 · d7d80c1 · d7d80c1
1 parent fcf3e9b
commit d7d80c1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/common/src/main/java/de/cech12/bucketlib/api/item/UniversalBucketItem.java b/common/src/main/java/de/cech12/bucketlib/api/item/UniversalBucketItem.java
@@ -363,7 +363,7 @@ public ItemStack finishUsingItem(@Nonnull ItemStack itemStack, @Nonnull Level le
             serverPlayer.awardStat(Stats.ITEM_USED.get(Items.MILK_BUCKET));
         }
         if (!level.isClientSide) {
-            //TODO player.curePotionEffects(new ItemStack(Items.MILK_BUCKET));
+            Services.FLUID.curePotionEffects(player, new ItemStack(Items.MILK_BUCKET));
         }
         if (BucketLibUtil.notCreative(player)) {
             return BucketLibUtil.removeMilk(itemStack);

diff --git a/common/src/main/java/de/cech12/bucketlib/platform/services/IFluidHelper.java b/common/src/main/java/de/cech12/bucketlib/platform/services/IFluidHelper.java
@@ -6,6 +6,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.util.Tuple;
 import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
@@ -36,4 +37,6 @@ public interface IFluidHelper {
 
     Tuple<Boolean, ItemStack> tryPlaceFluid(ItemStack stack, Player player, Level level, InteractionHand interactionHand, BlockPos pos);
 
+    void curePotionEffects(LivingEntity entity, ItemStack curativeItem);
+
 }
diff --git a/forge/src/main/java/de/cech12/bucketlib/platform/ForgeFluidHelper.java b/forge/src/main/java/de/cech12/bucketlib/platform/ForgeFluidHelper.java
@@ -1,17 +1,15 @@
 package de.cech12.bucketlib.platform;
 
 import de.cech12.bucketlib.platform.services.IFluidHelper;
-import de.cech12.bucketlib.util.BucketLibUtil;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.dispenser.BlockSource;
 import net.minecraft.network.chat.Component;
 import net.minecraft.util.Tuple;
 import net.minecraft.world.InteractionHand;
-import net.minecraft.world.InteractionResultHolder;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.ItemUtils;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.material.Fluid;
 import net.minecraftforge.common.ForgeMod;
@@ -91,5 +89,9 @@ public Tuple<Boolean, ItemStack> tryPlaceFluid(ItemStack stack, Player player, L
         return new Tuple<>(fluidActionResult.isSuccess(), fluidActionResult.getResult());
     }
 
+    @Override
+    public void curePotionEffects(LivingEntity entity, ItemStack curativeItem) {
+        entity.curePotionEffects(curativeItem);
+    }
 
 }