Merge pull request #2378 from Kubuxu/6.3.x

Fix JavaDoc for Java8 compability

api/buildcraft/api/recipes/IFlexibleRecipeViewable.java

@@ -25,7 +25,7 @@ public interface IFlexibleRecipeViewable {
 	
 	/**
 	 * With BuildCraft's implementation (as of 6.1.3), this might
-	 * contain either an ItemStack, a List<ItemStack> or a FluidStack.
+	 * contain either an ItemStack, a List&lt;ItemStack&gt; or a FluidStack.
 	 */
 	Collection<Object> getInputs();
 	

api/buildcraft/api/statements/IStatement.java

@@ -18,7 +18,7 @@ public interface IStatement {
 
 	/**
 	 * Every trigger needs a unique tag, it should be in the format of
-	 * "<modid>:<name>".
+	 * "&lt;modid&gt;:&lt;name&gt;.
 	 *
 	 * @return the unique id
 	 */

api/buildcraft/api/statements/IStatementParameter.java

@@ -20,7 +20,7 @@ public interface IStatementParameter {
 	
 	/**
 	 * Every parameter needs a unique tag, it should be in the format of
-	 * "<modid>:<name>".
+	 * "&lt;modi&gt;:&lt;name&gt;".
 	 *
 	 * @return the unique id
 	 */

common/buildcraft/core/utils/MatrixTranformations.java

@@ -31,7 +31,7 @@ public final class MatrixTranformations {
 
 	/**
 	 * Shifts the coordinates around effectively rotating something. Zero state
-	 * is DOWN then -> NORTH -> WEST Note - To obtain Position, do a mirrorY() before
+	 * is DOWN then -> NORTH -> WEST Note - To obtain Position, do a mirrorY() before
 	 * rotating
 	 *
 	 * @param targetArray the array that should be rotated

common/buildcraft/energy/BlockBuildcraftFluid.java

@@ -71,8 +71,9 @@ public class BlockBuildcraftFluid extends BlockFluidClassic {
 
 	@Override
 	public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) {
-
+		if (!dense || entity == null) {
-		if(!dense || entity == null) return;
+			return;
+		}
 
 		entity.motionY = Math.min(0.0, entity.motionY);