From 7dba583c26371137f52cb9b8862e9e35a9a3aa1d Mon Sep 17 00:00:00 2001 From: temp1011 <34900092+temp1011@users.noreply.github.com> Date: Sat, 24 Feb 2018 18:04:17 +0000 Subject: [PATCH 1/4] Add self-pollination of leaves near bees --- .../java/forestry/api/apiculture/IBee.java | 5 +++ .../forestry/apiculture/BeekeepingLogic.java | 6 +++ .../forestry/apiculture/ModuleApiculture.java | 4 ++ .../forestry/apiculture/genetics/Bee.java | 44 +++++++++++++++++++ 4 files changed, 59 insertions(+) diff --git a/src/main/java/forestry/api/apiculture/IBee.java b/src/main/java/forestry/api/apiculture/IBee.java index c5e119302..622919298 100644 --- a/src/main/java/forestry/api/apiculture/IBee.java +++ b/src/main/java/forestry/api/apiculture/IBee.java @@ -114,5 +114,10 @@ public interface IBee extends IIndividualLiving { IIndividual retrievePollen(IBeeHousing housing); boolean pollinateRandom(IBeeHousing housing, IIndividual pollen); + + //TODO - implement fully in 1.13 + default void selfPollinate(IBeeHousing housing) { + return; + } } diff --git a/src/main/java/forestry/apiculture/BeekeepingLogic.java b/src/main/java/forestry/apiculture/BeekeepingLogic.java index 3cf2e16a9..1b61f43ad 100644 --- a/src/main/java/forestry/apiculture/BeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/BeekeepingLogic.java @@ -50,6 +50,7 @@ import forestry.api.core.IErrorLogic; import forestry.api.core.IErrorState; import forestry.api.genetics.IEffectData; import forestry.api.genetics.IIndividual; +import forestry.apiculture.genetics.Bee; import forestry.apiculture.network.packets.PacketBeeLogicActive; import forestry.apiculture.network.packets.PacketBeeLogicActiveEntity; import forestry.core.config.Constants; @@ -570,6 +571,11 @@ public class BeekeepingLogic implements IBeekeepingLogic { pollen = null; } } + + //Other things may implement IBee + if(ModuleApiculture.doSelfPollination) { + queen.selfPollinate(beeHousing); + } } } diff --git a/src/main/java/forestry/apiculture/ModuleApiculture.java b/src/main/java/forestry/apiculture/ModuleApiculture.java index 4c5e68b8f..5bcd8840f 100644 --- a/src/main/java/forestry/apiculture/ModuleApiculture.java +++ b/src/main/java/forestry/apiculture/ModuleApiculture.java @@ -156,6 +156,8 @@ public class ModuleApiculture extends BlankForestryModule { public static boolean hivesDamageOnPeaceful = false; + public static boolean doSelfPollination = true; + public static int maxFlowersSpawnedPerHive = 20; @Nullable public static VillagerRegistry.VillagerProfession villagerApiarist; @@ -278,6 +280,8 @@ public class ModuleApiculture extends BlankForestryModule { ticksPerBeeWorkCycle = config.getIntLocalized("beekeeping", "ticks.work", 550, 250, 850); hivesDamageOnPeaceful = config.getBooleanLocalized("beekeeping", "hivedamage.peaceful", false); + + doSelfPollination = config.getBooleanLocalized("beekeeping", "self.pollination", false); config.save(); diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index 61ff64b9c..6ef59c32f 100755 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -729,6 +729,50 @@ public class Bee extends IndividualLiving implements IBee { return false; } + public void selfPollinate(IBeeHousing housing) { + + IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); + + int chance = (int) (genome.getFlowering() * beeModifier.getFloweringModifier(getGenome(), 1f)); + + World world = housing.getWorldObj(); + Random random = world.rand; + + // Correct speed + if (random.nextInt(100) >= chance) { + return; + } + + Vec3i area = getArea(genome, beeModifier); + Vec3i offset = new Vec3i(-area.getX() / 2, -area.getY() / 4, -area.getZ() / 2); + BlockPos housingPos = housing.getCoordinates(); + + for (int i = 0; i < 10; i++) { + + BlockPos randomPos = VectUtil.getRandomPositionInArea(random, area); + BlockPos posBlock = VectUtil.add(housingPos, randomPos, offset); + + ICheckPollinatable checkPollinatable = GeneticsUtil.getCheckPollinatable(world, posBlock); + if (checkPollinatable == null) { + continue; + } + + if (!genome.getFlowerProvider().isAcceptedPollinatable(world, checkPollinatable)) { + continue; + } + if (!checkPollinatable.canMateWith(checkPollinatable.getPollen())) { + continue; + } + + IPollinatable realPollinatable = GeneticsUtil.getOrCreatePollinatable(housing.getOwner(), world, posBlock, Config.pollinateVanillaTrees); + + if (realPollinatable != null) { + realPollinatable.mateWith(realPollinatable.getPollen()); + return; + } + } + } + @Override public void plantFlowerRandom(IBeeHousing housing) { plantFlowerRandom(housing, null); From bef36c15b0ca5da3674d6f6cac9df50eacaed403 Mon Sep 17 00:00:00 2001 From: temp1011 <34900092+temp1011@users.noreply.github.com> Date: Mon, 26 Feb 2018 21:39:19 +0000 Subject: [PATCH 2/4] Move self pollination into main pollination method - Only happens if normal pollination can't occur - Will not cause return otherwise would worsen chance for cross pollination --- .../java/forestry/api/apiculture/IBee.java | 5 -- .../forestry/apiculture/BeekeepingLogic.java | 6 --- .../forestry/apiculture/genetics/Bee.java | 51 +++---------------- 3 files changed, 7 insertions(+), 55 deletions(-) diff --git a/src/main/java/forestry/api/apiculture/IBee.java b/src/main/java/forestry/api/apiculture/IBee.java index 622919298..c5e119302 100644 --- a/src/main/java/forestry/api/apiculture/IBee.java +++ b/src/main/java/forestry/api/apiculture/IBee.java @@ -114,10 +114,5 @@ public interface IBee extends IIndividualLiving { IIndividual retrievePollen(IBeeHousing housing); boolean pollinateRandom(IBeeHousing housing, IIndividual pollen); - - //TODO - implement fully in 1.13 - default void selfPollinate(IBeeHousing housing) { - return; - } } diff --git a/src/main/java/forestry/apiculture/BeekeepingLogic.java b/src/main/java/forestry/apiculture/BeekeepingLogic.java index 1b61f43ad..3cf2e16a9 100644 --- a/src/main/java/forestry/apiculture/BeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/BeekeepingLogic.java @@ -50,7 +50,6 @@ import forestry.api.core.IErrorLogic; import forestry.api.core.IErrorState; import forestry.api.genetics.IEffectData; import forestry.api.genetics.IIndividual; -import forestry.apiculture.genetics.Bee; import forestry.apiculture.network.packets.PacketBeeLogicActive; import forestry.apiculture.network.packets.PacketBeeLogicActiveEntity; import forestry.core.config.Constants; @@ -571,11 +570,6 @@ public class BeekeepingLogic implements IBeekeepingLogic { pollen = null; } } - - //Other things may implement IBee - if(ModuleApiculture.doSelfPollination) { - queen.selfPollinate(beeHousing); - } } } diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index 6ef59c32f..6a920c6e5 100755 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -715,6 +715,13 @@ public class Bee extends IndividualLiving implements IBee { continue; } if (!checkPollinatable.canMateWith(pollen)) { + if(checkPollinatable.canMateWith(checkPollinatable.getPollen())) { + IPollinatable realPollinatable = GeneticsUtil.getOrCreatePollinatable(housing.getOwner(), world, posBlock, Config.pollinateVanillaTrees); + + if (realPollinatable != null) { + realPollinatable.mateWith(realPollinatable.getPollen()); + } + } continue; } @@ -728,50 +735,6 @@ public class Bee extends IndividualLiving implements IBee { return false; } - - public void selfPollinate(IBeeHousing housing) { - - IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); - - int chance = (int) (genome.getFlowering() * beeModifier.getFloweringModifier(getGenome(), 1f)); - - World world = housing.getWorldObj(); - Random random = world.rand; - - // Correct speed - if (random.nextInt(100) >= chance) { - return; - } - - Vec3i area = getArea(genome, beeModifier); - Vec3i offset = new Vec3i(-area.getX() / 2, -area.getY() / 4, -area.getZ() / 2); - BlockPos housingPos = housing.getCoordinates(); - - for (int i = 0; i < 10; i++) { - - BlockPos randomPos = VectUtil.getRandomPositionInArea(random, area); - BlockPos posBlock = VectUtil.add(housingPos, randomPos, offset); - - ICheckPollinatable checkPollinatable = GeneticsUtil.getCheckPollinatable(world, posBlock); - if (checkPollinatable == null) { - continue; - } - - if (!genome.getFlowerProvider().isAcceptedPollinatable(world, checkPollinatable)) { - continue; - } - if (!checkPollinatable.canMateWith(checkPollinatable.getPollen())) { - continue; - } - - IPollinatable realPollinatable = GeneticsUtil.getOrCreatePollinatable(housing.getOwner(), world, posBlock, Config.pollinateVanillaTrees); - - if (realPollinatable != null) { - realPollinatable.mateWith(realPollinatable.getPollen()); - return; - } - } - } @Override public void plantFlowerRandom(IBeeHousing housing) { From ed2f06c514cafd21ca0c8512cfd68844fb5c6a30 Mon Sep 17 00:00:00 2001 From: temp1011 <34900092+temp1011@users.noreply.github.com> Date: Mon, 26 Feb 2018 21:44:12 +0000 Subject: [PATCH 3/4] formatting, re-include config --- src/main/java/forestry/apiculture/genetics/Bee.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index 6a920c6e5..ab70d1b30 100755 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -61,6 +61,7 @@ import forestry.api.genetics.IFlowerProvider; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.api.genetics.IPollinatable; +import forestry.apiculture.ModuleApiculture; import forestry.core.config.Config; import forestry.core.config.Constants; import forestry.core.errors.EnumErrorCode; @@ -715,7 +716,7 @@ public class Bee extends IndividualLiving implements IBee { continue; } if (!checkPollinatable.canMateWith(pollen)) { - if(checkPollinatable.canMateWith(checkPollinatable.getPollen())) { + if (checkPollinatable.canMateWith(checkPollinatable.getPollen()) && ModuleApiculture.doSelfPollination) { IPollinatable realPollinatable = GeneticsUtil.getOrCreatePollinatable(housing.getOwner(), world, posBlock, Config.pollinateVanillaTrees); if (realPollinatable != null) { @@ -735,7 +736,7 @@ public class Bee extends IndividualLiving implements IBee { return false; } - + @Override public void plantFlowerRandom(IBeeHousing housing) { plantFlowerRandom(housing, null); From 1b262d6604095564ae691754b41fcc724cede380 Mon Sep 17 00:00:00 2001 From: temp1011 <34900092+temp1011@users.noreply.github.com> Date: Wed, 28 Feb 2018 19:33:09 +0000 Subject: [PATCH 4/4] Improve logic --- src/main/java/forestry/apiculture/genetics/Bee.java | 7 ------- .../arboriculture/genetics/CheckPollinatableTree.java | 4 +++- src/main/java/forestry/arboriculture/tiles/TileLeaves.java | 3 ++- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index ab70d1b30..e65608cf8 100755 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -716,13 +716,6 @@ public class Bee extends IndividualLiving implements IBee { continue; } if (!checkPollinatable.canMateWith(pollen)) { - if (checkPollinatable.canMateWith(checkPollinatable.getPollen()) && ModuleApiculture.doSelfPollination) { - IPollinatable realPollinatable = GeneticsUtil.getOrCreatePollinatable(housing.getOwner(), world, posBlock, Config.pollinateVanillaTrees); - - if (realPollinatable != null) { - realPollinatable.mateWith(realPollinatable.getPollen()); - } - } continue; } diff --git a/src/main/java/forestry/arboriculture/genetics/CheckPollinatableTree.java b/src/main/java/forestry/arboriculture/genetics/CheckPollinatableTree.java index 307cf697c..2f9de3618 100644 --- a/src/main/java/forestry/arboriculture/genetics/CheckPollinatableTree.java +++ b/src/main/java/forestry/arboriculture/genetics/CheckPollinatableTree.java @@ -13,6 +13,8 @@ package forestry.arboriculture.genetics; import forestry.api.arboriculture.ITree; import forestry.api.genetics.ICheckPollinatable; import forestry.api.genetics.IIndividual; +import forestry.apiculture.ModuleApiculture; + import net.minecraftforge.common.EnumPlantType; public class CheckPollinatableTree implements ICheckPollinatable { @@ -36,7 +38,7 @@ public class CheckPollinatableTree implements ICheckPollinatable { public boolean canMateWith(IIndividual pollen) { return pollen instanceof ITree && tree.getMate() == null && - !tree.isGeneticEqual(pollen); + (ModuleApiculture.doSelfPollination || !tree.isGeneticEqual(pollen)); } @Override diff --git a/src/main/java/forestry/arboriculture/tiles/TileLeaves.java b/src/main/java/forestry/arboriculture/tiles/TileLeaves.java index 5dc31cd55..5e40a7070 100644 --- a/src/main/java/forestry/arboriculture/tiles/TileLeaves.java +++ b/src/main/java/forestry/arboriculture/tiles/TileLeaves.java @@ -53,6 +53,7 @@ import forestry.api.lepidopterology.ButterflyManager; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyGenome; import forestry.api.lepidopterology.IButterflyNursery; +import forestry.apiculture.ModuleApiculture; import forestry.arboriculture.ModuleArboriculture; import forestry.arboriculture.genetics.TreeDefinition; import forestry.arboriculture.genetics.alleles.AlleleFruits; @@ -309,7 +310,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru ITree tree = getTree(); return tree != null && tree.getMate() == null && - !tree.isGeneticEqual(individual); + (ModuleApiculture.doSelfPollination ||!tree.isGeneticEqual(individual)); } return false; }