From 3b8af4e4c983c9a8dcc9e9509074ba65d9b4b8a9 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Tue, 25 Oct 2016 00:47:49 +0200 Subject: [PATCH] Fix IPollinatable and New Version --- gradle.properties | 2 +- .../java/forestry/api/apiculture/IBee.java | 6 ++--- .../forestry/api/arboriculture/ITreeRoot.java | 4 ++-- .../genetics/ISpeciesRootPollinatable.java | 18 +++++++++++++++ .../api/lepidopterology/IEntityButterfly.java | 6 ++--- .../forestry/apiculture/BeekeepingLogic.java | 4 ++-- .../forestry/apiculture/genetics/Bee.java | 7 +++--- .../arboriculture/genetics/TreeRoot.java | 23 +++++++++++++++++++ .../forestry/core/utils/GeneticsUtil.java | 23 +++++++++++-------- .../entities/EntityButterfly.java | 7 +++--- 10 files changed, 71 insertions(+), 29 deletions(-) create mode 100644 src/main/java/forestry/api/genetics/ISpeciesRootPollinatable.java diff --git a/gradle.properties b/gradle.properties index 733e3b684..e371242d9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,4 +8,4 @@ ic2_version=2.6.76-ex110 version_major=5 version_minor=2 -version_patch=15 +version_patch=16 diff --git a/src/main/java/forestry/api/apiculture/IBee.java b/src/main/java/forestry/api/apiculture/IBee.java index b6fff1b12..bb28b2d07 100644 --- a/src/main/java/forestry/api/apiculture/IBee.java +++ b/src/main/java/forestry/api/apiculture/IBee.java @@ -13,9 +13,9 @@ import java.util.Set; import net.minecraft.item.ItemStack; import net.minecraft.world.biome.Biome; -import forestry.api.arboriculture.ITree; import forestry.api.core.IErrorState; import forestry.api.genetics.IEffectData; +import forestry.api.genetics.IIndividual; import forestry.api.genetics.IIndividualLiving; /** @@ -85,8 +85,8 @@ public interface IBee extends IIndividualLiving { void plantFlowerRandom(IBeeHousing housing); - ITree retrievePollen(IBeeHousing housing); + IIndividual retrievePollen(IBeeHousing housing); - boolean pollinateRandom(IBeeHousing housing, ITree pollen); + boolean pollinateRandom(IBeeHousing housing, IIndividual pollen); } diff --git a/src/main/java/forestry/api/arboriculture/ITreeRoot.java b/src/main/java/forestry/api/arboriculture/ITreeRoot.java index bd3c4c5ea..3eb73c57b 100644 --- a/src/main/java/forestry/api/arboriculture/ITreeRoot.java +++ b/src/main/java/forestry/api/arboriculture/ITreeRoot.java @@ -13,13 +13,13 @@ import java.util.List; import com.mojang.authlib.GameProfile; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosome; -import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.ISpeciesRootPollinatable; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public interface ITreeRoot extends ISpeciesRoot { +public interface ITreeRoot extends ISpeciesRootPollinatable { @Override boolean isMember(ItemStack itemstack); diff --git a/src/main/java/forestry/api/genetics/ISpeciesRootPollinatable.java b/src/main/java/forestry/api/genetics/ISpeciesRootPollinatable.java new file mode 100644 index 000000000..368517582 --- /dev/null +++ b/src/main/java/forestry/api/genetics/ISpeciesRootPollinatable.java @@ -0,0 +1,18 @@ +package forestry.api.genetics; + +import com.mojang.authlib.GameProfile; + +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +/** + * @since 5.12.16 + * @author Nedelosk + */ +public interface ISpeciesRootPollinatable extends ISpeciesRoot { + + ICheckPollinatable createPollinatable(IIndividual individual); + + IPollinatable tryConvertToPollinatable(GameProfile owner, World world, final BlockPos pos, final IIndividual pollen); + +} diff --git a/src/main/java/forestry/api/lepidopterology/IEntityButterfly.java b/src/main/java/forestry/api/lepidopterology/IEntityButterfly.java index a798642ee..7716170f0 100644 --- a/src/main/java/forestry/api/lepidopterology/IEntityButterfly.java +++ b/src/main/java/forestry/api/lepidopterology/IEntityButterfly.java @@ -8,7 +8,7 @@ package forestry.api.lepidopterology; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.passive.IAnimals; -import forestry.api.arboriculture.ITree; +import forestry.api.genetics.IIndividual; public interface IEntityButterfly extends IAnimals { @@ -23,9 +23,9 @@ public interface IEntityButterfly extends IAnimals { */ EntityCreature getEntity(); - ITree getPollen(); + IIndividual getPollen(); - void setPollen(ITree pollen); + void setPollen(IIndividual pollen); boolean canMateWith(IEntityButterfly butterfly); diff --git a/src/main/java/forestry/apiculture/BeekeepingLogic.java b/src/main/java/forestry/apiculture/BeekeepingLogic.java index 08e3cd660..b72423ddb 100755 --- a/src/main/java/forestry/apiculture/BeekeepingLogic.java +++ b/src/main/java/forestry/apiculture/BeekeepingLogic.java @@ -38,10 +38,10 @@ import forestry.api.apiculture.IBeeHousingInventory; import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; import forestry.api.apiculture.IBeekeepingLogic; -import forestry.api.arboriculture.ITree; import forestry.api.core.IErrorLogic; import forestry.api.core.IErrorState; import forestry.api.genetics.IEffectData; +import forestry.api.genetics.IIndividual; import forestry.apiculture.network.packets.PacketBeeLogicActive; import forestry.apiculture.network.packets.PacketBeeLogicActiveEntity; import forestry.core.config.Constants; @@ -528,7 +528,7 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable { private static class PollenHandler { private static final int MAX_POLLINATION_ATTEMPTS = 20; - private ITree pollen; + private IIndividual pollen; private int attemptedPollinations = 0; public void doPollination(IBee queen, IBeeHousing beeHousing, IBeeListener beeListener) { diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index 5860109d1..027d449b7 100644 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -43,7 +43,6 @@ import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeModifier; import forestry.api.apiculture.IBeeMutation; import forestry.api.apiculture.IBeekeepingMode; -import forestry.api.arboriculture.ITree; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.IErrorState; @@ -666,7 +665,7 @@ public class Bee extends IndividualLiving implements IBee { /* FLOWERS */ @Override - public ITree retrievePollen(IBeeHousing housing) { + public IIndividual retrievePollen(IBeeHousing housing) { IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); @@ -684,7 +683,7 @@ public class Bee extends IndividualLiving implements IBee { Vec3i offset = new Vec3i(-area.getX() / 2, -area.getY() / 4, -area.getZ() / 2); BlockPos housingPos = housing.getCoordinates(); - ITree pollen = null; + IIndividual pollen = null; for (int i = 0; i < 20; i++) { BlockPos randomPos = VectUtil.getRandomPositionInArea(random, area); @@ -709,7 +708,7 @@ public class Bee extends IndividualLiving implements IBee { } @Override - public boolean pollinateRandom(IBeeHousing housing, ITree pollen) { + public boolean pollinateRandom(IBeeHousing housing, IIndividual pollen) { IBeeModifier beeModifier = BeeManager.beeRoot.createBeeHousingModifier(housing); diff --git a/src/main/java/forestry/arboriculture/genetics/TreeRoot.java b/src/main/java/forestry/arboriculture/genetics/TreeRoot.java index 1a3cf56cb..6022506fd 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeRoot.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeRoot.java @@ -34,15 +34,19 @@ import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlyzerPlugin; +import forestry.api.genetics.ICheckPollinatable; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; +import forestry.api.genetics.IPollinatable; import forestry.api.genetics.ISpeciesType; import forestry.arboriculture.PluginArboriculture; import forestry.arboriculture.blocks.BlockFruitPod; import forestry.arboriculture.blocks.BlockSapling; +import forestry.arboriculture.genetics.pollination.CheckPollinatableTree; import forestry.arboriculture.tiles.TileFruitPod; import forestry.arboriculture.tiles.TileSapling; +import forestry.core.config.Config; import forestry.core.genetics.SpeciesRoot; import forestry.core.network.packets.PacketFXSignal; import forestry.core.proxy.Proxies; @@ -428,4 +432,23 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot { return TreeAlyzerPlugin.INSTANCE; } + @Override + public ICheckPollinatable createPollinatable(IIndividual individual) { + if(individual instanceof ITree){ + return new CheckPollinatableTree((ITree)individual); + } + return null; + } + + @Override + public IPollinatable tryConvertToPollinatable(GameProfile owner, World world, BlockPos pos, IIndividual pollen) { + if(pollen instanceof ITree){ + if (Config.pollinateVanillaTrees) { + ((ITree)pollen).setLeaves(world, owner, pos); + return (IPollinatable) world.getTileEntity(pos); + } + } + return null; + } + } diff --git a/src/main/java/forestry/core/utils/GeneticsUtil.java b/src/main/java/forestry/core/utils/GeneticsUtil.java index a13594387..81b0ac8c7 100644 --- a/src/main/java/forestry/core/utils/GeneticsUtil.java +++ b/src/main/java/forestry/core/utils/GeneticsUtil.java @@ -29,10 +29,10 @@ import forestry.api.genetics.ILeafTranslator; import forestry.api.genetics.IMutation; import forestry.api.genetics.IPollinatable; import forestry.api.genetics.ISaplingTranslator; +import forestry.api.genetics.ISpeciesRoot; +import forestry.api.genetics.ISpeciesRootPollinatable; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyNursery; -import forestry.arboriculture.genetics.pollination.CheckPollinatableTree; -import forestry.core.config.Config; import forestry.core.genetics.ItemGE; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -90,9 +90,12 @@ public class GeneticsUtil { return (IPollinatable) tile; } - ITree pollen = getPollen(world, pos); + IIndividual pollen = getPollen(world, pos); if (pollen != null) { - return new CheckPollinatableTree(pollen); + ISpeciesRoot root = pollen.getGenome().getSpeciesRoot(); + if(root instanceof ISpeciesRootPollinatable){ + return ((ISpeciesRootPollinatable)root).createPollinatable(pollen); + } } return null; @@ -108,11 +111,11 @@ public class GeneticsUtil { return (IPollinatable) tile; } - if (Config.pollinateVanillaTrees) { - ITree pollen = getPollen(world, pos); - if (pollen != null) { - pollen.setLeaves(world, owner, pos); - return (IPollinatable) world.getTileEntity(pos); + final IIndividual pollen = getPollen(world, pos); + if(pollen != null){ + ISpeciesRoot root = pollen.getGenome().getSpeciesRoot(); + if(root instanceof ISpeciesRootPollinatable){ + return ((ISpeciesRootPollinatable) root).tryConvertToPollinatable(owner, world, pos, pollen); } } @@ -123,7 +126,7 @@ public class GeneticsUtil { * Gets pollen from a location. Does not affect the pollen source. */ @Nullable - public static ITree getPollen(World world, final BlockPos pos) { + public static IIndividual getPollen(World world, final BlockPos pos) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof ICheckPollinatable) { diff --git a/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java b/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java index c58e4ed7e..d9111aa0b 100755 --- a/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java +++ b/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java @@ -43,7 +43,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.arboriculture.EnumGermlingType; -import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.TreeManager; import forestry.api.core.IToolScoop; import forestry.api.genetics.AlleleManager; @@ -80,7 +79,7 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly private Vec3d flightTarget; private int exhaustion; private IButterfly contained; - private ITree pollen; + private IIndividual pollen; public int cooldownPollination = 0; public int cooldownEgg = 0; @@ -270,12 +269,12 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly /* POLLEN */ @Override - public ITree getPollen() { + public IIndividual getPollen() { return pollen; } @Override - public void setPollen(ITree pollen) { + public void setPollen(IIndividual pollen) { this.pollen = pollen; }