From 0356a3f4796fd801eb82c93dc0a436e9a70ba852 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 9 Mar 2017 22:32:43 -0800 Subject: [PATCH] Prevent butterflies from converting vanilla leaves to Forestry leaves --- lang | 2 +- .../forestry/apiculture/genetics/Bee.java | 2 +- .../arboriculture/genetics/TreeRoot.java | 14 ++--- .../arboriculture/items/ItemGermlingGE.java | 2 +- .../java/forestry/core/tiles/TileUtil.java | 2 +- .../forestry/core/utils/GeneticsUtil.java | 54 ++++++++----------- .../entities/AIButterflyMate.java | 5 +- .../entities/AIButterflyPollinate.java | 2 +- .../genetics/ButterflyRoot.java | 12 ++--- .../items/ItemButterflyGE.java | 2 +- 10 files changed, 42 insertions(+), 55 deletions(-) diff --git a/lang b/lang index 1e2fae7a2..1d2fa53e1 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 1e2fae7a268b5ab1912f8416034ec2c3894537e1 +Subproject commit 1d2fa53e1a8a74ead6158a9caf1c430627f53ca2 diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index a6fec4099..64bfbfa4d 100644 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -721,7 +721,7 @@ public class Bee extends IndividualLiving implements IBee { continue; } - IPollinatable realPollinatable = GeneticsUtil.getOrCreatePollinatable(housing.getOwner(), world, posBlock); + IPollinatable realPollinatable = GeneticsUtil.getOrCreatePollinatable(housing.getOwner(), world, posBlock, Config.pollinateVanillaTrees); if (realPollinatable != null) { realPollinatable.mateWith(pollen); diff --git a/src/main/java/forestry/arboriculture/genetics/TreeRoot.java b/src/main/java/forestry/arboriculture/genetics/TreeRoot.java index f5c265527..c7bcdf78a 100644 --- a/src/main/java/forestry/arboriculture/genetics/TreeRoot.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeRoot.java @@ -436,13 +436,15 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot { } @Override - public IPollinatable tryConvertToPollinatable(@Nullable GameProfile owner, World world, BlockPos pos, IIndividual pollen) { - Preconditions.checkArgument(pollen instanceof ITree, "pollen must be an instance of ITree"); - if (Config.pollinateVanillaTrees) { - ((ITree) pollen).setLeaves(world, owner, pos); - return (IPollinatable) world.getTileEntity(pos); + @Nullable + public IPollinatable tryConvertToPollinatable(@Nullable GameProfile owner, World world, BlockPos pos, IIndividual individual) { + Preconditions.checkArgument(individual instanceof ITree, "pollen must be an instance of ITree"); + ITree pollen = (ITree) individual; + if (pollen.setLeaves(world, owner, pos)) { + return TileUtil.getTile(world, pos, IPollinatable.class); + } else { + return null; } - return null; } } diff --git a/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java b/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java index 814b672ae..1cac1b42e 100755 --- a/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java +++ b/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java @@ -156,7 +156,7 @@ public class ItemGermlingGE extends ItemGE implements IVariableFermentable, ICol return new ActionResult<>(EnumActionResult.FAIL, itemStackIn); } - IPollinatable pollinatable = GeneticsUtil.getOrCreatePollinatable(playerIn.getGameProfile(), worldIn, pos); + IPollinatable pollinatable = GeneticsUtil.getOrCreatePollinatable(playerIn.getGameProfile(), worldIn, pos, true); if (pollinatable == null || !pollinatable.canMateWith(tree)) { return new ActionResult<>(EnumActionResult.FAIL, itemStackIn); } diff --git a/src/main/java/forestry/core/tiles/TileUtil.java b/src/main/java/forestry/core/tiles/TileUtil.java index 0fd4b5b41..4e4c26694 100644 --- a/src/main/java/forestry/core/tiles/TileUtil.java +++ b/src/main/java/forestry/core/tiles/TileUtil.java @@ -46,7 +46,7 @@ public abstract class TileUtil { * see {@link BlockFlowerPot#getActualState(IBlockState, IBlockAccess, BlockPos)} */ @Nullable - public static T getTile(IBlockAccess world, BlockPos pos, Class tileClass) { + public static T getTile(IBlockAccess world, BlockPos pos, Class tileClass) { TileEntity tileEntity; if (world instanceof ChunkCache) { diff --git a/src/main/java/forestry/core/utils/GeneticsUtil.java b/src/main/java/forestry/core/utils/GeneticsUtil.java index 940284d37..255cc8caa 100644 --- a/src/main/java/forestry/core/utils/GeneticsUtil.java +++ b/src/main/java/forestry/core/utils/GeneticsUtil.java @@ -33,6 +33,7 @@ import forestry.api.genetics.ISpeciesRootPollinatable; import forestry.api.lepidopterology.IButterfly; import forestry.api.lepidopterology.IButterflyNursery; import forestry.core.genetics.ItemGE; +import forestry.core.tiles.TileUtil; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -102,31 +103,27 @@ public class GeneticsUtil { * Returns an IPollinatable that can be mated. This will convert vanilla leaves to Forestry leaves. */ @Nullable - public static IPollinatable getOrCreatePollinatable(@Nullable GameProfile owner, World world, final BlockPos pos) { - TileEntity tile = world.getTileEntity(pos); - - if (tile instanceof IPollinatable) { - return (IPollinatable) tile; - } - - 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); + public static IPollinatable getOrCreatePollinatable(@Nullable GameProfile owner, World world, final BlockPos pos, boolean convertVanilla) { + IPollinatable pollinatable = TileUtil.getTile(world, pos, IPollinatable.class); + if (pollinatable == null && convertVanilla) { + final IIndividual pollen = getPollen(world, pos); + if (pollen != null) { + ISpeciesRoot root = pollen.getGenome().getSpeciesRoot(); + if (root instanceof ISpeciesRootPollinatable) { + ISpeciesRootPollinatable rootPollinatable = (ISpeciesRootPollinatable) root; + pollinatable = rootPollinatable.tryConvertToPollinatable(owner, world, pos, pollen); + } } } - - return null; + return pollinatable; } - - public static IButterflyNursery getOrCreateNursery(World world, BlockPos pos, GameProfile gameProfile) { + + @Nullable + public static IButterflyNursery getOrCreateNursery(@Nullable GameProfile gameProfile, World world, BlockPos pos, boolean convertVanilla) { IButterflyNursery nursery = getNursery(world, pos); - - if (nursery == null) { + if (nursery == null && convertVanilla) { IIndividual pollen = GeneticsUtil.getPollen(world, pos); - - if (pollen != null && pollen instanceof ITree) { + if (pollen instanceof ITree) { ITree treeLeave = (ITree) pollen; if (treeLeave.setLeaves(world, gameProfile, pos)) { nursery = getNursery(world, pos); @@ -140,14 +137,10 @@ public class GeneticsUtil { IIndividual pollen = GeneticsUtil.getPollen(world, pos); return pollen != null && pollen instanceof ITree; } - - public static IButterflyNursery getNursery(World world, BlockPos pos) { - TileEntity tileEntity = world.getTileEntity(pos); - if (tileEntity instanceof IButterflyNursery) { - return (IButterflyNursery) tileEntity; - } - return null; + @Nullable + public static IButterflyNursery getNursery(World world, BlockPos pos) { + return TileUtil.getTile(world, pos, IButterflyNursery.class); } /** @@ -159,10 +152,9 @@ public class GeneticsUtil { return null; } - TileEntity tile = world.getTileEntity(pos); - - if (tile instanceof ICheckPollinatable) { - return ((ICheckPollinatable) tile).getPollen(); + ICheckPollinatable checkPollinatable = TileUtil.getTile(world, pos, ICheckPollinatable.class); + if (checkPollinatable != null) { + return checkPollinatable.getPollen(); } IBlockState blockState = world.getBlockState(pos); diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java index dd5977e06..cfcbbb9f6 100644 --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyMate.java @@ -56,9 +56,8 @@ public class AIButterflyMate extends AIButterflyInteract { entity.cooldownMate = EntityButterfly.COOLDOWNS; } } else if (rest != null) { - IPollinatable tile = GeneticsUtil.getOrCreatePollinatable(null, entity.world, rest); - if (tile instanceof IButterflyNursery) { - IButterflyNursery nursery = (IButterflyNursery) tile; + IButterflyNursery nursery = GeneticsUtil.getOrCreateNursery(null, entity.world, rest, false); + if (nursery != null) { if (nursery.canNurse(entity.getButterfly())) { nursery.setCaterpillar(entity.getButterfly().spawnCaterpillar(entity.world, nursery)); //Log.finest("A butterfly '%s' laid an egg at %s/%s/%s.", entity.getButterfly().getIdent(), rest.posX, rest.posY, rest.posZ); diff --git a/src/main/java/forestry/lepidopterology/entities/AIButterflyPollinate.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyPollinate.java index bb5f9f098..e28f52810 100644 --- a/src/main/java/forestry/lepidopterology/entities/AIButterflyPollinate.java +++ b/src/main/java/forestry/lepidopterology/entities/AIButterflyPollinate.java @@ -55,7 +55,7 @@ public class AIButterflyPollinate extends AIButterflyInteract { entity.setPollen(checkPollinatable.getPollen()); // Log.finest("A butterfly '%s' grabbed a pollen '%s' at %s/%s/%s.", entity.getButterfly().getIdent(), entity.getPollen().getIdent(), rest.posX, rest.posY, rest.posZ); } else if (checkPollinatable.canMateWith(entity.getPollen())) { - IPollinatable realPollinatable = GeneticsUtil.getOrCreatePollinatable(null, entity.world, rest); + IPollinatable realPollinatable = GeneticsUtil.getOrCreatePollinatable(null, entity.world, rest, false); if (realPollinatable != null) { realPollinatable.mateWith(entity.getPollen()); // Log.finest("A butterfly '%s' unloaded pollen '%s' at %s/%s/%s.", entity.getButterfly().getIdent(), entity.getPollen().getIdent(), rest.posX, rest.posY, rest.posZ); diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java index 23eee7cb6..28c5c6bb5 100644 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyRoot.java @@ -242,21 +242,15 @@ public class ButterflyRoot extends SpeciesRoot implements IButterflyRoot { if(isNurseryValid(nursery, caterpillar, gameProfile)){ return true; }else if(createNursery && GeneticsUtil.canCreateNursery(world, nurseryPos)){ - nursery = GeneticsUtil.getOrCreateNursery(world, nurseryPos, gameProfile); + nursery = GeneticsUtil.getOrCreateNursery(gameProfile, world, nurseryPos, false); return isNurseryValid(nursery, caterpillar, gameProfile); } } return false; } - private boolean isNurseryValid(IButterflyNursery nursery, IButterfly caterpillar, GameProfile gameProfile){ - if(nursery != null){ - if(!nursery.canNurse(caterpillar)){ - return false; - } - return true; - } - return false; + private boolean isNurseryValid(@Nullable IButterflyNursery nursery, IButterfly caterpillar, GameProfile gameProfile) { + return nursery != null && nursery.canNurse(caterpillar); } @Override diff --git a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java index bc0181528..b25a2f916 100755 --- a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java +++ b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java @@ -241,7 +241,7 @@ public class ItemButterflyGE extends ItemGE implements ISpriteRegister, IColored return EnumActionResult.PASS; } } else if (type == EnumFlutterType.CATERPILLAR) { - IButterflyNursery nursery = GeneticsUtil.getOrCreateNursery(world, pos, player.getGameProfile()); + IButterflyNursery nursery = GeneticsUtil.getOrCreateNursery(player.getGameProfile(), world, pos, true); if (nursery != null) { if (!nursery.canNurse(flutter)) { return EnumActionResult.PASS;