From f58938ff3264f980386a0d94a91230606a35ca21 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Tue, 25 Oct 2016 00:27:26 +0200 Subject: [PATCH] Improve IPollinatable --- .../api/genetics/ICheckPollinatable.java | 5 +-- .../forestry/api/genetics/IPollinatable.java | 4 +- .../pollination/CheckPollinatableTree.java | 14 ++++--- .../arboriculture/tiles/TileLeaves.java | 41 +++++++++++-------- 4 files changed, 35 insertions(+), 29 deletions(-) diff --git a/src/main/java/forestry/api/genetics/ICheckPollinatable.java b/src/main/java/forestry/api/genetics/ICheckPollinatable.java index 28d062969..bbbbab5eb 100644 --- a/src/main/java/forestry/api/genetics/ICheckPollinatable.java +++ b/src/main/java/forestry/api/genetics/ICheckPollinatable.java @@ -10,7 +10,6 @@ ******************************************************************************/ package forestry.api.genetics; -import forestry.api.arboriculture.ITree; import net.minecraftforge.common.EnumPlantType; /** @@ -28,7 +27,7 @@ public interface ICheckPollinatable { /** * @return IIndividual containing the genetic information of this IPollinatable */ - ITree getPollen(); + IIndividual getPollen(); /** * Checks whether this can mate with the given pollen. @@ -38,7 +37,7 @@ public interface ICheckPollinatable { * @param pollen IIndividual representing the pollen. * @return true if mating is possible, false otherwise. */ - boolean canMateWith(ITree pollen); + boolean canMateWith(IIndividual pollen); /** * @return true if this has already been pollinated. diff --git a/src/main/java/forestry/api/genetics/IPollinatable.java b/src/main/java/forestry/api/genetics/IPollinatable.java index 782aece05..7a6d0a54e 100644 --- a/src/main/java/forestry/api/genetics/IPollinatable.java +++ b/src/main/java/forestry/api/genetics/IPollinatable.java @@ -5,8 +5,6 @@ ******************************************************************************/ package forestry.api.genetics; -import forestry.api.arboriculture.ITree; - /** * Can be implemented by tile entities, if they wish to be pollinatable. * @@ -20,5 +18,5 @@ public interface IPollinatable extends ICheckPollinatable { * @param pollen * IIndividual representing the pollen. */ - void mateWith(ITree pollen); + void mateWith(IIndividual pollen); } diff --git a/src/main/java/forestry/arboriculture/genetics/pollination/CheckPollinatableTree.java b/src/main/java/forestry/arboriculture/genetics/pollination/CheckPollinatableTree.java index 0ee9cb5fb..4b4bf7b26 100644 --- a/src/main/java/forestry/arboriculture/genetics/pollination/CheckPollinatableTree.java +++ b/src/main/java/forestry/arboriculture/genetics/pollination/CheckPollinatableTree.java @@ -12,6 +12,7 @@ package forestry.arboriculture.genetics.pollination; import forestry.api.arboriculture.ITree; import forestry.api.genetics.ICheckPollinatable; +import forestry.api.genetics.IIndividual; import net.minecraftforge.common.EnumPlantType; public class CheckPollinatableTree implements ICheckPollinatable { @@ -33,12 +34,15 @@ public class CheckPollinatableTree implements ICheckPollinatable { } @Override - public boolean canMateWith(ITree pollen) { - if (tree.getMate() != null) { - return false; + public boolean canMateWith(IIndividual pollen) { + if(pollen instanceof ITree){ + if (tree.getMate() != null) { + return false; + } + + return !tree.isGeneticEqual(pollen); } - - return !tree.isGeneticEqual(pollen); + return false; } @Override diff --git a/src/main/java/forestry/arboriculture/tiles/TileLeaves.java b/src/main/java/forestry/arboriculture/tiles/TileLeaves.java index f8d6e15e5..f985ff9e4 100644 --- a/src/main/java/forestry/arboriculture/tiles/TileLeaves.java +++ b/src/main/java/forestry/arboriculture/tiles/TileLeaves.java @@ -269,28 +269,33 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru } @Override - public boolean canMateWith(ITree individual) { - ITree tree = getTree(); - if (tree == null) { - return false; + public boolean canMateWith(IIndividual individual) { + if(individual instanceof ITree){ + ITree tree = getTree(); + if (tree == null) { + return false; + } + if (tree.getMate() != null) { + return false; + } + + return !tree.isGeneticEqual(individual); } - if (tree.getMate() != null) { - return false; - } - - return !tree.isGeneticEqual(individual); + return false; } @Override - public void mateWith(ITree individual) { - ITree tree = getTree(); - if (tree == null || worldObj == null) { - return; - } - - tree.mate(individual); - if (!worldObj.isRemote) { - sendNetworkUpdate(); + public void mateWith(IIndividual individual) { + if(individual instanceof ITree){ + ITree tree = getTree(); + if (tree == null || worldObj == null) { + return; + } + + tree.mate((ITree) individual); + if (!worldObj.isRemote) { + sendNetworkUpdate(); + } } }