From c9f17452cf567a643b6748c06d41678c03c232f4 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 19 May 2016 21:40:21 -0700 Subject: [PATCH] Fix leaves decaying immediately on large trees --- .../arboriculture/LeafDecayHelper.java | 105 ++++++++++++++++++ .../blocks/BlockForestryLeaves.java | 5 +- 2 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 src/main/java/forestry/arboriculture/LeafDecayHelper.java diff --git a/src/main/java/forestry/arboriculture/LeafDecayHelper.java b/src/main/java/forestry/arboriculture/LeafDecayHelper.java new file mode 100644 index 000000000..4a0ef529a --- /dev/null +++ b/src/main/java/forestry/arboriculture/LeafDecayHelper.java @@ -0,0 +1,105 @@ +package forestry.arboriculture; + +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockLeaves; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import forestry.core.utils.BlockUtil; + +/** + * Based on vanilla leaf decay in {@link BlockLeaves#updateTick(World, BlockPos, IBlockState, Random)} + * but accepts leaves that are connected further from a trunk + */ +public class LeafDecayHelper { + private static final byte SUSTAINS_LEAVES = 0; + private static final byte NOT_SUSTAINS_LEAVES = -1; + private static final byte IS_LEAVES = -2; + private static final int ARRAY_SIZE = 32; + private static final byte[] leafDecayValues; + + static { + leafDecayValues = new byte[ARRAY_SIZE * ARRAY_SIZE * ARRAY_SIZE]; + } + + public static void leafDecay(BlockLeaves leaves, World world, BlockPos pos) { + if (world.isRemote) { + return; + } + IBlockState state = world.getBlockState(pos); + + if (state.getValue(BlockLeaves.CHECK_DECAY) && state.getValue(BlockLeaves.DECAYABLE)) { + byte radius = 4; + int xArrayMult = ARRAY_SIZE * ARRAY_SIZE; + int arrayOffset = ARRAY_SIZE / 2; + + int radius1 = radius + 1; + if (BlockUtil.checkChunksExist(world, pos.getX() - radius1, pos.getY() - radius1, pos.getZ() - radius1, pos.getX() + radius1, pos.getY() + radius1, pos.getZ() + radius1)) { + for (int xOffset = -radius; xOffset <= radius; ++xOffset) { + for (int yOffset = -radius; yOffset <= radius; ++yOffset) { + for (int zOffset = -radius; zOffset <= radius; ++zOffset) { + BlockPos blockPos = pos.add(xOffset, yOffset, zOffset); + IBlockState blockState = world.getBlockState(blockPos); + Block block = blockState.getBlock(); + if (!block.canSustainLeaves(blockState, world, blockPos)) { + if (block.isLeaves(blockState, world, blockPos)) { + leafDecayValues[(xOffset + arrayOffset) * xArrayMult + (yOffset + arrayOffset) * ARRAY_SIZE + zOffset + arrayOffset] = IS_LEAVES; + } else { + leafDecayValues[(xOffset + arrayOffset) * xArrayMult + (yOffset + arrayOffset) * ARRAY_SIZE + zOffset + arrayOffset] = NOT_SUSTAINS_LEAVES; + } + } else { + leafDecayValues[(xOffset + arrayOffset) * xArrayMult + (yOffset + arrayOffset) * ARRAY_SIZE + zOffset + arrayOffset] = SUSTAINS_LEAVES; + } + } + } + } + + for (byte sustainedValue = 1; sustainedValue <= 8; ++sustainedValue) { + for (int xOffset = -radius; xOffset <= radius; ++xOffset) { + for (int yOffset = -radius; yOffset <= radius; ++yOffset) { + for (int zOffset = -radius; zOffset <= radius; ++zOffset) { + if (leafDecayValues[(xOffset + arrayOffset) * xArrayMult + (yOffset + arrayOffset) * ARRAY_SIZE + zOffset + arrayOffset] == sustainedValue - 1) { + if (leafDecayValues[(xOffset + arrayOffset - 1) * xArrayMult + (yOffset + arrayOffset) * ARRAY_SIZE + zOffset + arrayOffset] == IS_LEAVES) { + leafDecayValues[(xOffset + arrayOffset - 1) * xArrayMult + (yOffset + arrayOffset) * ARRAY_SIZE + zOffset + arrayOffset] = sustainedValue; + } + + if (leafDecayValues[(xOffset + arrayOffset + 1) * xArrayMult + (yOffset + arrayOffset) * ARRAY_SIZE + zOffset + arrayOffset] == IS_LEAVES) { + leafDecayValues[(xOffset + arrayOffset + 1) * xArrayMult + (yOffset + arrayOffset) * ARRAY_SIZE + zOffset + arrayOffset] = sustainedValue; + } + + if (leafDecayValues[(xOffset + arrayOffset) * xArrayMult + (yOffset + arrayOffset - 1) * ARRAY_SIZE + zOffset + arrayOffset] == IS_LEAVES) { + leafDecayValues[(xOffset + arrayOffset) * xArrayMult + (yOffset + arrayOffset - 1) * ARRAY_SIZE + zOffset + arrayOffset] = sustainedValue; + } + + if (leafDecayValues[(xOffset + arrayOffset) * xArrayMult + (yOffset + arrayOffset + 1) * ARRAY_SIZE + zOffset + arrayOffset] == IS_LEAVES) { + leafDecayValues[(xOffset + arrayOffset) * xArrayMult + (yOffset + arrayOffset + 1) * ARRAY_SIZE + zOffset + arrayOffset] = sustainedValue; + } + + if (leafDecayValues[(xOffset + arrayOffset) * xArrayMult + (yOffset + arrayOffset) * ARRAY_SIZE + zOffset + arrayOffset - 1] == IS_LEAVES) { + leafDecayValues[(xOffset + arrayOffset) * xArrayMult + (yOffset + arrayOffset) * ARRAY_SIZE + zOffset + arrayOffset - 1] = sustainedValue; + } + + if (leafDecayValues[(xOffset + arrayOffset) * xArrayMult + (yOffset + arrayOffset) * ARRAY_SIZE + zOffset + arrayOffset + 1] == IS_LEAVES) { + leafDecayValues[(xOffset + arrayOffset) * xArrayMult + (yOffset + arrayOffset) * ARRAY_SIZE + zOffset + arrayOffset + 1] = sustainedValue; + } + } + } + } + } + } + } + + byte sustainValue = leafDecayValues[arrayOffset * xArrayMult + arrayOffset * ARRAY_SIZE + arrayOffset]; + + if (sustainValue >= 0) { + world.setBlockState(pos, state.withProperty(BlockLeaves.CHECK_DECAY, false), 4); // stop trying to decay + } else { + leaves.dropBlockAsItem(world, pos, state, 0); + world.setBlockToAir(pos); + } + } + } +} diff --git a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java index 5dd113db5..599361921 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java @@ -61,6 +61,7 @@ import forestry.api.core.Tabs; import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.IButterfly; +import forestry.arboriculture.LeafDecayHelper; import forestry.arboriculture.PluginArboriculture; import forestry.arboriculture.genetics.TreeDefinition; import forestry.arboriculture.tiles.TileLeaves; @@ -231,11 +232,11 @@ public class BlockForestryLeaves extends BlockLeaves implements ITileEntityProvi @Override public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { - super.updateTick(world, pos, state, rand); + LeafDecayHelper.leafDecay(this, world, pos); TileLeaves tileLeaves = TileUtil.getTile(world, pos, TileLeaves.class); - // check leaves tile because they can decay in super.updateTick + // check leaves tile because they might have decayed if (tileLeaves != null && !tileLeaves.isInvalid() && world.rand.nextFloat() <= 0.1) { tileLeaves.onBlockTick(); }