From 8636eb18838725162fc1d267d187d7d0a1d3888a Mon Sep 17 00:00:00 2001
From: cpw <cpw@weeksfamily.ca>
Date: Thu, 9 Jul 2015 16:53:31 -0400
Subject: [PATCH] Wake up the FluidRegistry before any mods start loading.
 Should stop mods claiming to own water or lava (depending on who accessed
 FluidRegistry first)

---
 src/main/java/net/minecraftforge/common/MinecraftForge.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/net/minecraftforge/common/MinecraftForge.java b/src/main/java/net/minecraftforge/common/MinecraftForge.java
index d820f4c29..4eb72a4eb 100644
--- a/src/main/java/net/minecraftforge/common/MinecraftForge.java
+++ b/src/main/java/net/minecraftforge/common/MinecraftForge.java
@@ -12,6 +12,7 @@ import cpw.mods.fml.relauncher.Side;
 import net.minecraft.crash.CrashReport;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.ForgeHooks.SeedEntry;
+import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.oredict.OreDictionary;
 
 public class MinecraftForge
@@ -156,6 +157,8 @@ public class MinecraftForge
        }
 
        UsernameCache.load();
+       // Load before all the mods, so MC owns the MC fluids
+       FluidRegistry.validateFluidRegistry();
    }