Call FluidManager.init() after EntityManager.init()

Author: ExE-Boss

minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/launcher/NovaMinecraft.java

@@ -177,6 +177,7 @@ public void preInit(FMLPreInitializationEvent evt) {
 			Game.blocks().init();
 			Game.items().init();
 			Game.entities().init();
+			Game.fluids().init();
 
 			//Load preInit
 			progressBar = ProgressManager.push("Pre-initializing NOVA wrappers", (novaModWrappers.isEmpty() ? 1 : novaModWrappers.size()) + novaWrappers.size());

minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/launcher/NovaMinecraft.java

@@ -182,6 +182,7 @@ public void preInit(FMLPreInitializationEvent evt) {
 			Game.blocks().init();
 			Game.items().init();
 			Game.entities().init();
+			Game.fluids().init();
 
 			//Load preInit
 			progressBar = ProgressManager.push("Pre-initializing NOVA wrappers", (novaModWrappers.isEmpty() ? 1 : novaModWrappers.size()) + novaWrappers.size());

src/main/java/nova/core/component/fluid/Fluid.java

@@ -129,7 +129,7 @@ public boolean sameType(Fluid stack) {
 	}
 
 	void initFactory(FluidFactory factory) {
-		if (factory == null) {
+		if (this.factory == null) {
 			this.factory = factory;
 		} else {
 			throw new ComponentException("Attempt to add two components of the type %s to " + this, FactoryProvider.class);

src/main/java/nova/core/component/fluid/FluidFilter.java

@@ -34,8 +34,8 @@ public interface FluidFilter extends Predicate<Fluid> {
 	 * Returns an {@link FluidFilter} that accepts an {@link Fluid} of the same
 	 * type as the provided.
 	 *
-	 * @param item
-	 * @return ItemFilter
+	 * @param fluid
+	 * @return FluidFilter
 	 */
 	static FluidFilter of(Fluid fluid) {
 		return fluid::sameType;
@@ -46,7 +46,7 @@ static FluidFilter of(Fluid fluid) {
 	 * type as provided.
 	 *
 	 * @param id
-	 * @return ItemFilter
+	 * @return FluidFilter
 	 */
 	static FluidFilter of(String id) {
 		return (other) -> id.equals(other.getID());
@@ -56,7 +56,7 @@ static FluidFilter of(String id) {
 	 * Accepts any {@link Fluid} that has a &gt;= amount than provided.
 	 *
 	 * @param amount
-	 * @return
+	 * @return FluidFilter
 	 */
 	static FluidFilter of(int amount) {
 		return (other) -> other.amount() >= amount;

src/main/java/nova/core/component/fluid/FluidProvider.java

@@ -37,7 +37,7 @@ public interface FluidProvider {
 
 	/**
 	 * Attempt to extract fluid from this FluidProvider
-	 * @param amount Amount of fluid to extract
+	 * @param fluid The fluid type and max amount to extract
 	 * @return Extracted {@link Fluid}
 	 */
 	default Optional<Fluid> removeFluid(Fluid fluid) {

src/test/java/nova/wrappertests/NovaLauncherTestFactory.java

@@ -93,6 +93,7 @@ public NovaLauncher createLauncher(Class<?>... modClasses) {
 		Game.blocks().init();
 		Game.items().init();
 		Game.entities().init();
+		Game.fluids().init();
 		Game.recipes().init();
 
 		return launcher;