diff --git a/common/src/main/java/dev/architectury/hooks/fluid/FluidBucketHooks.java b/common/src/main/java/dev/architectury/hooks/fluid/FluidBucketHooks.java
new file mode 100644
index 00000000..3c4e414a
--- /dev/null
+++ b/common/src/main/java/dev/architectury/hooks/fluid/FluidBucketHooks.java
@@ -0,0 +1,38 @@
+/*
+ * This file is part of architectury.
+ * Copyright (C) 2020, 2021, 2022 architectury
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package dev.architectury.hooks.fluid;
+
+import dev.architectury.injectables.annotations.ExpectPlatform;
+import net.minecraft.world.item.BucketItem;
+import net.minecraft.world.level.material.Fluid;
+
+public final class FluidBucketHooks {
+    /**
+     * Returns the fluid contained in the bucket.
+     * This requires special handling since forge defers the fiuid.
+     *
+     * @param item the bucket item
+     * @return the fluid contained in the bucket
+     */
+    @ExpectPlatform
+    public static Fluid getFluid(BucketItem item) {
+        throw new AssertionError();
+    }
+}
diff --git a/fabric/src/main/java/dev/architectury/hooks/fluid/fabric/FluidBucketHooksImpl.java b/fabric/src/main/java/dev/architectury/hooks/fluid/fabric/FluidBucketHooksImpl.java
new file mode 100644
index 00000000..27e00235
--- /dev/null
+++ b/fabric/src/main/java/dev/architectury/hooks/fluid/fabric/FluidBucketHooksImpl.java
@@ -0,0 +1,30 @@
+/*
+ * This file is part of architectury.
+ * Copyright (C) 2020, 2021, 2022 architectury
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package dev.architectury.hooks.fluid.fabric;
+
+import dev.architectury.mixin.fabric.BucketItemAccessor;
+import net.minecraft.world.item.BucketItem;
+import net.minecraft.world.level.material.Fluid;
+
+public class FluidBucketHooksImpl {
+    public static Fluid getFluid(BucketItem item) {
+        return ((BucketItemAccessor) item).getContent();
+    }
+}
diff --git a/fabric/src/main/java/dev/architectury/mixin/fabric/BucketItemAccessor.java b/fabric/src/main/java/dev/architectury/mixin/fabric/BucketItemAccessor.java
new file mode 100644
index 00000000..46ff906c
--- /dev/null
+++ b/fabric/src/main/java/dev/architectury/mixin/fabric/BucketItemAccessor.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of architectury.
+ * Copyright (C) 2020, 2021, 2022 architectury
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package dev.architectury.mixin.fabric;
+
+import net.minecraft.world.item.BucketItem;
+import net.minecraft.world.level.material.Fluid;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(BucketItem.class)
+public interface BucketItemAccessor {
+    @Accessor("content")
+    Fluid getContent();
+}
diff --git a/fabric/src/main/resources/architectury.mixins.json b/fabric/src/main/resources/architectury.mixins.json
index 79cb1f92..0a6c3dba 100644
--- a/fabric/src/main/resources/architectury.mixins.json
+++ b/fabric/src/main/resources/architectury.mixins.json
@@ -5,6 +5,7 @@
   "compatibilityLevel": "JAVA_16",
   "minVersion": "0.7.11",
   "client": [
+    "client.ClientPlayerAttackInvoker",
     "client.MixinAbstractContainerScreen",
     "client.MixinClientLevel",
     "client.MixinClientPacketListener",
@@ -17,10 +18,10 @@
     "client.MixinMouseHandler",
     "client.MixinMultiPlayerGameMode",
     "client.MixinScreen",
-    "client.MixinTextureAtlas",
-    "client.ClientPlayerAttackInvoker"
+    "client.MixinTextureAtlas"
   ],
   "mixins": [
+    "BucketItemAccessor",
     "ExplosionPreInvoker",
     "HorseTameInvoker",
     "LivingDeathInvoker",
diff --git a/forge/src/main/java/dev/architectury/hooks/fluid/forge/FluidBucketHooksImpl.java b/forge/src/main/java/dev/architectury/hooks/fluid/forge/FluidBucketHooksImpl.java
new file mode 100644
index 00000000..b4eb4d3f
--- /dev/null
+++ b/forge/src/main/java/dev/architectury/hooks/fluid/forge/FluidBucketHooksImpl.java
@@ -0,0 +1,29 @@
+/*
+ * This file is part of architectury.
+ * Copyright (C) 2020, 2021, 2022 architectury
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package dev.architectury.hooks.fluid.forge;
+
+import net.minecraft.world.item.BucketItem;
+import net.minecraft.world.level.material.Fluid;
+
+public class FluidBucketHooksImpl {
+    public static Fluid getFluid(BucketItem item) {
+        return item.getFluid();
+    }
+}