From 0def8c3f348381d2dbbab671cca3c026bfae141b Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 11 Aug 2015 22:34:31 -0700 Subject: [PATCH] Let players walk through willow leaves slowly --- .../gadgets/ForestryBlockLeaves.java | 19 ++++++++++++++++++- .../arboriculture/gadgets/TileLeaves.java | 7 +++++++ .../genetics/TreeDefinition.java | 4 ++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/main/java/forestry/arboriculture/gadgets/ForestryBlockLeaves.java b/src/main/java/forestry/arboriculture/gadgets/ForestryBlockLeaves.java index b27f4ee46..5570c838e 100644 --- a/src/main/java/forestry/arboriculture/gadgets/ForestryBlockLeaves.java +++ b/src/main/java/forestry/arboriculture/gadgets/ForestryBlockLeaves.java @@ -22,11 +22,13 @@ import net.minecraft.block.ITileEntityProvider; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; @@ -49,6 +51,7 @@ import forestry.api.core.Tabs; import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.IButterfly; import forestry.arboriculture.LeafDecayHelper; +import forestry.arboriculture.genetics.TreeDefinition; import forestry.arboriculture.items.ItemLeavesBlock; import forestry.arboriculture.render.LeafTexture; import forestry.core.proxy.Proxies; @@ -210,7 +213,21 @@ public class ForestryBlockLeaves extends BlockNewLeaf implements ITileEntityProv } super.beginLeavesDecay(world, x, y, z); } - + + @Override + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { + TileLeaves tileLeaves = getLeafTile(world, x, y, z); + if (tileLeaves != null && TreeDefinition.Willow.getUID().equals(tileLeaves.getSpeciesUID())) { + return null; + } + return super.getCollisionBoundingBoxFromPool(world, x, y, z); + } + + @Override + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { + entity.motionX *= 0.4D; + entity.motionZ *= 0.4D; + } @Override public void updateTick(World world, int x, int y, int z, Random random) { diff --git a/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java b/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java index 9f05d787c..5702768bd 100755 --- a/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java +++ b/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java @@ -451,6 +451,13 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru sendNetworkUpdateRipening(); } + public String getSpeciesUID() { + if (species == null) { + return null; + } + return species.getUID(); + } + /* IBUTTERFLYNURSERY */ private IButterfly caterpillar; diff --git a/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java b/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java index 34a53d5c9..50a7fe6a5 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeDefinition.java @@ -1064,6 +1064,10 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator { return Arrays.copyOf(template, template.length); } + public final String getUID() { + return species.getUID(); + } + @Override public final ITreeGenome getGenome() { return genome;