Fix: Poison Buckets Fluidhandler Capability

closes #289
closes #287

Author: TunefulTurnip

src/main/java/io/github/razordevs/deep_aether/DeepAether.java

@@ -30,6 +30,7 @@
 import io.github.razordevs.deep_aether.init.*;
 import io.github.razordevs.deep_aether.item.component.DADataComponentTypes;
 import io.github.razordevs.deep_aether.item.gear.DAArmorMaterials;
+import io.github.razordevs.deep_aether.item.misc.SkyrootPoisonBucketWrapper;
 import io.github.razordevs.deep_aether.networking.attachment.DAAttachments;
 import io.github.razordevs.deep_aether.networking.packet.DAPlayerSyncPacket;
 import io.github.razordevs.deep_aether.recipe.DARecipeSerializers;
@@ -70,12 +71,15 @@
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.config.ModConfig;
 import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
+import net.neoforged.neoforge.capabilities.Capabilities;
+import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
 import net.neoforged.neoforge.common.NeoForgeMod;
 import net.neoforged.neoforge.common.data.DatapackBuiltinEntriesProvider;
 import net.neoforged.neoforge.common.data.ExistingFileHelper;
 import net.neoforged.neoforge.data.event.GatherDataEvent;
 import net.neoforged.neoforge.event.AddPackFindersEvent;
 import net.neoforged.neoforge.fluids.FluidInteractionRegistry;
+import net.neoforged.neoforge.fluids.capability.wrappers.FluidBucketWrapper;
 import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
 import net.neoforged.neoforge.network.registration.PayloadRegistrar;
 import org.slf4j.Logger;
@@ -118,6 +122,7 @@ public static boolean IsHalloweenContentEnabled() {
 	public DeepAether(ModContainer mod, IEventBus bus, Dist dist) {
 		bus.addListener(this::dataSetup);
 		bus.addListener(this::commonSetup);
+        bus.addListener(this::registerCapabilities);
 		bus.addListener(this::registerPackets);
 		bus.addListener(this::addAetherAdditionalResourcesPack);
 
@@ -242,6 +247,14 @@ private void registerFluidInteractions(){
 		));
 	}
 
+
+
+    public void registerCapabilities(RegisterCapabilitiesEvent event) {
+        event.registerItem(Capabilities.FluidHandler.ITEM, (stack, ctx) -> new FluidBucketWrapper(stack), DAItems.PLACEABLE_POISON_BUCKET.get());
+        event.registerItem(Capabilities.FluidHandler.ITEM, (stack, ctx) -> new SkyrootPoisonBucketWrapper(stack), AetherItems.SKYROOT_POISON_BUCKET.get());
+
+    }
+
 	private void getFlawlessBossDrop(EntityType<?> type, String string, Item fallBack) {
 		if(string.equals("null")) {
 			DAGeneralEvents.FLAWLESS_BOSS_DROP.put(type, null);

src/main/java/io/github/razordevs/deep_aether/block/behavior/DABlockInteractionBehavior.java

@@ -17,7 +17,6 @@
 import net.minecraft.stats.Stats;
 import net.minecraft.world.Containers;
 import net.minecraft.world.InteractionResult;
-import net.minecraft.world.MenuProvider;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
@@ -148,7 +147,7 @@ private static void handleSkyrootPoisonBucket(PlayerInteractEvent.RightClickBloc
         if (blockRayTraceResult.getType() == HitResult.Type.MISS ||
                 blockRayTraceResult.getType() != HitResult.Type.BLOCK ||
                 blockHitState.getBlock() == Blocks.CAULDRON ||
-                (!(player.isShiftKeyDown()) && blockHitState.hasBlockEntity() && (level.getBlockEntity(blockRayTraceResult.getBlockPos()) instanceof MenuProvider))) {
+                (!(player.isShiftKeyDown()) && blockHitState.hasBlockEntity())) {
             event.setCancellationResult(InteractionResult.PASS);
         }
         else {
@@ -168,8 +167,8 @@ private static void handleSkyrootPoisonBucket(PlayerInteractEvent.RightClickBloc
                 level.playSound(null, relativePos, SoundEvents.BUCKET_EMPTY, SoundSource.BLOCKS, 1.0F, 1.0F);
                 level.gameEvent(null, GameEvent.FLUID_PLACE, relativePos);
                 event.setCancellationResult(InteractionResult.SUCCESS);
+                event.setCanceled(true);
             }
         }
-        event.setCanceled(true);
     }
- }
+}

src/main/java/io/github/razordevs/deep_aether/item/misc/SkyrootPoisonBucketWrapper.java

@@ -0,0 +1,19 @@
+package io.github.razordevs.deep_aether.item.misc;
+
+import com.aetherteam.aether.item.miscellaneous.bucket.SkyrootBucketWrapper;
+import io.github.razordevs.deep_aether.init.DAFluids;
+import net.minecraft.world.item.ItemStack;
+import net.neoforged.neoforge.fluids.FluidStack;
+import net.neoforged.neoforge.fluids.FluidType;
+
+
+public class SkyrootPoisonBucketWrapper extends SkyrootBucketWrapper {
+    public SkyrootPoisonBucketWrapper(ItemStack container) {
+        super(container);
+    }
+
+    @Override
+    public FluidStack getFluid() {
+        return new FluidStack(DAFluids.POISON_FLUID.get(), FluidType.BUCKET_VOLUME);
+    }
+}