From dcdf4be68433e5224434b1b72322d8758fae9c79 Mon Sep 17 00:00:00 2001 From: Kuba Sztandera Date: Sun, 11 Jan 2015 15:23:10 +0100 Subject: [PATCH 1/2] Fix JavaDoc for Java8 compability --- api/buildcraft/api/recipes/IFlexibleRecipeViewable.java | 2 +- api/buildcraft/api/statements/IStatement.java | 2 +- api/buildcraft/api/statements/IStatementParameter.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/buildcraft/api/recipes/IFlexibleRecipeViewable.java b/api/buildcraft/api/recipes/IFlexibleRecipeViewable.java index afda123c..c63e0105 100644 --- a/api/buildcraft/api/recipes/IFlexibleRecipeViewable.java +++ b/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 or a FluidStack. + * contain either an ItemStack, a List<ItemStack> or a FluidStack. */ Collection getInputs(); diff --git a/api/buildcraft/api/statements/IStatement.java b/api/buildcraft/api/statements/IStatement.java index 6c31436b..c9c3cd6b 100644 --- a/api/buildcraft/api/statements/IStatement.java +++ b/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>. * * @return the unique id */ diff --git a/api/buildcraft/api/statements/IStatementParameter.java b/api/buildcraft/api/statements/IStatementParameter.java index 2b437005..0dbf97e2 100755 --- a/api/buildcraft/api/statements/IStatementParameter.java +++ b/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 - * ":". + * "<modi>:<name>". * * @return the unique id */ From cf2a8f6f3f195e2e0f15a2fd9706601575f64555 Mon Sep 17 00:00:00 2001 From: Kuba Sztandera Date: Sun, 11 Jan 2015 15:33:03 +0100 Subject: [PATCH 2/2] Fix CheckSyle error --- common/buildcraft/core/utils/MatrixTranformations.java | 2 +- common/buildcraft/energy/BlockBuildcraftFluid.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/buildcraft/core/utils/MatrixTranformations.java b/common/buildcraft/core/utils/MatrixTranformations.java index b9d39ec8..57dfb22b 100644 --- a/common/buildcraft/core/utils/MatrixTranformations.java +++ b/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 diff --git a/common/buildcraft/energy/BlockBuildcraftFluid.java b/common/buildcraft/energy/BlockBuildcraftFluid.java index b25135a8..84ff3c79 100644 --- a/common/buildcraft/energy/BlockBuildcraftFluid.java +++ b/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) return; + if (!dense || entity == null) { + return; + } entity.motionY = Math.min(0.0, entity.motionY);