fixed: fluid of entity buckets was not placed

cech12 · Dec 31, 2023 · 3a0282e · 3a0282e
1 parent 03b7ea6
commit 3a0282e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/cicd-workflow.yml b/.github/workflows/cicd-workflow.yml
@@ -55,6 +55,7 @@ jobs:
     with:
       java-version: 17
       subproject: forge
+      title-prefix: forge-
       curseforge-id: 560156
       game-versions: |
         1.20.2
@@ -72,6 +73,7 @@ jobs:
     with:
       java-version: 17
       subproject: forge
+      title-prefix: forge-
       modrinth-id: DItE655o
       game-versions: |
         1.20.2
@@ -89,6 +91,7 @@ jobs:
     with:
       java-version: 17
       subproject: neoforge
+      title-prefix: neoforge-
       curseforge-id: 560156
       game-versions: |
         1.20.2
@@ -106,6 +109,7 @@ jobs:
     with:
       java-version: 17
       subproject: neoforge
+      title-prefix: neoforge-
       modrinth-id: DItE655o
       game-versions: |
         1.20.2

diff --git a/forge/src/main/java/de/cech12/bucketlib/platform/ForgeFluidHelper.java b/forge/src/main/java/de/cech12/bucketlib/platform/ForgeFluidHelper.java
@@ -52,7 +52,7 @@ public ItemStack dispenseFluidContainer(BlockSource source, ItemStack stack) {
 
     @Override
     public Fluid getContainedFluid(ItemStack stack) {
-        return FluidUtil.getFluidContained(stack).orElse(FluidStack.EMPTY).getFluid();
+        return FluidUtil.getFluidHandler(stack).map(fluidHandler -> fluidHandler.getFluidInTank(0)).orElse(FluidStack.EMPTY).getFluid();
     }
 
     @Override

diff --git a/neoforge/src/main/java/de/cech12/bucketlib/platform/NeoforgeFluidHelper.java b/neoforge/src/main/java/de/cech12/bucketlib/platform/NeoforgeFluidHelper.java
@@ -52,7 +52,7 @@ public ItemStack dispenseFluidContainer(BlockSource source, ItemStack stack) {
 
     @Override
     public Fluid getContainedFluid(ItemStack stack) {
-        return FluidUtil.getFluidContained(stack).orElse(FluidStack.EMPTY).getFluid();
+        return FluidUtil.getFluidHandler(stack).map(fluidHandler -> fluidHandler.getFluidInTank(0)).orElse(FluidStack.EMPTY).getFluid();
     }
 
     @Override