From 811e4c53d3eba658bc63641f1784c463ad8d4b71 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Sat, 9 Nov 2013 03:28:58 -0500 Subject: [PATCH] Gave roots a random offset --- .../blocks/BlockStoneFormations.java | 2 +- .../blocks/renderers/PlantsRenderer.java | 26 +++++++++++++------ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/common/biomesoplenty/blocks/BlockStoneFormations.java b/common/biomesoplenty/blocks/BlockStoneFormations.java index 030bd0d6e..bcfcf42a0 100644 --- a/common/biomesoplenty/blocks/BlockStoneFormations.java +++ b/common/biomesoplenty/blocks/BlockStoneFormations.java @@ -36,7 +36,7 @@ public class BlockStoneFormations extends BlockFlower public BlockStoneFormations(int blockID) { - this(blockID, Material.rock); + this(blockID, Material.vine); } @Override diff --git a/common/biomesoplenty/blocks/renderers/PlantsRenderer.java b/common/biomesoplenty/blocks/renderers/PlantsRenderer.java index ca7baa88d..792d6ea43 100644 --- a/common/biomesoplenty/blocks/renderers/PlantsRenderer.java +++ b/common/biomesoplenty/blocks/renderers/PlantsRenderer.java @@ -40,7 +40,7 @@ public class PlantsRenderer implements ISimpleBlockRenderingHandler if (meta == 11) return renderer.renderBlockCrops(block, x, y, z); if (meta == 12) - return renderer.renderCrossedSquares(block, x, y, z); + return renderCrossedSquares(block, x, y, z, renderer, true); if (meta == 13) return renderer.renderBlockCrops(block, x, y, z); if (meta == 14) @@ -48,7 +48,7 @@ public class PlantsRenderer implements ISimpleBlockRenderingHandler return renderCrossedSquares(block, x, y, z, renderer, false); } if (meta == 15) - return renderer.renderCrossedSquares(block, x, y, z); + return renderCrossedSquares(block, x, y, z, renderer, true); } return true; } @@ -118,13 +118,23 @@ public class PlantsRenderer implements ISimpleBlockRenderingHandler double d2 = par4; long i1 = par2 * 3129871 ^ par4 * 116129781L ^ par3; - - i1 = i1 * i1 * 42317861L + i1 * 11L; - d0 += ((i1 >> 16 & 15L) / 15.0F - 0.5D) * 0.5D; - d1 += ((i1 >> 20 & 15L) / 15.0F - 1.0D) * 0.2D; - d2 += ((i1 >> 24 & 15L) / 15.0F - 0.5D) * 0.5D; - + int meta = renderer.blockAccess.getBlockMetadata(par2, par3, par4); + + if (meta == 15) + { + i1 = i1 * i1 * 42317861L + i1 * 11L; + d0 += ((i1 >> 16 & 15L) / 15.0F - 0.5D) * 0.2D; + d1 -= ((i1 >> 20 & 15L) / 15.0F - 1.0D) * 0.4D; + d2 += ((i1 >> 24 & 15L) / 15.0F - 0.5D) * 0.2D; + } + else + { + i1 = i1 * i1 * 42317861L + i1 * 11L; + d0 += ((i1 >> 16 & 15L) / 15.0F - 0.5D) * 0.5D; + d1 += ((i1 >> 20 & 15L) / 15.0F - 1.0D) * 0.2D; + d2 += ((i1 >> 24 & 15L) / 15.0F - 0.5D) * 0.5D; + } if (meta == 14) {