account for vanilla fluid blocks (#74)

GTNewHorizons · Sep 29, 2024 · ea50d8f · ea50d8f
1 parent 5d611ae
commit ea50d8f
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/main/java/com/gtnewhorizon/gtnhlib/client/renderer/util/WorldUtil.java b/src/main/java/com/gtnewhorizon/gtnhlib/client/renderer/util/WorldUtil.java
@@ -6,6 +6,7 @@
 import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.IFluidBlock;
 
 import org.joml.Vector3d;
@@ -112,8 +113,17 @@ public static boolean shouldDisplayFluidOverlay(Block block) {
         return !block.getMaterial().isOpaque() || block.getMaterial() == Material.leaves;
     }
 
+    public static boolean isFluidBlock(Block block) {
+        return block instanceof IFluidBlock || block instanceof BlockLiquid;
+    }
+
     public static Fluid getFluid(Block b) {
-        return b instanceof IFluidBlock ? ((IFluidBlock) b).getFluid() : null;
+        if (b instanceof IFluidBlock fluidBlock) return fluidBlock.getFluid();
+        if (b instanceof BlockLiquid) {
+            if (b.getMaterial() == Material.water) return FluidRegistry.WATER;
+            if (b.getMaterial() == Material.lava) return FluidRegistry.LAVA;
+        }
+        return null;
     }
 
     /**