mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-22 04:52:26 +00:00
Fix #1190 crash on pollination. Also rearrange IPollinatable classes
This commit is contained in:
1 parent
8981384385
commit
3a829c9990
12 files changed
+67
-178
No files matched your search
@@ -0,0 +1,50 @@
|
||||
/*******************************************************************************
|
||||
* Copyright (c) 2011-2014 SirSengir.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the GNU Lesser Public License v3
|
||||
* which accompanies this distribution, and is available at
|
||||
* http://www.gnu.org/licenses/lgpl-3.0.txt
|
||||
*
|
||||
* Various Contributors including, but not limited to:
|
||||
* SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
|
||||
******************************************************************************/
|
||||
package forestry.api.genetics;
|
||||
|
||||
import java.util.EnumSet;
|
||||
|
||||
import net.minecraftforge.common.EnumPlantType;
|
||||
|
||||
import forestry.api.arboriculture.ITree;
|
||||
|
||||
/**
|
||||
* Used to check for pollination traits without altering the world by changing vanilla leaves to forestry ones.
|
||||
* For a normal pollinatable that can be mated, see {@link IPollinatable}.
|
||||
*/
|
||||
public interface ICheckPollinatable {
|
||||
|
||||
/**
|
||||
* @return plant types this pollinatable is classified as.
|
||||
* (Can be used by bees to determine whether to interact or not.)
|
||||
*/
|
||||
EnumSet<EnumPlantType> getPlantType();
|
||||
|
||||
/**
|
||||
* @return IIndividual containing the genetic information of this IPollinatable
|
||||
*/
|
||||
ITree getPollen();
|
||||
|
||||
/**
|
||||
* Checks whether this can mate with the given pollen.
|
||||
*
|
||||
* Must be the one to check genetic equivalency.
|
||||
*
|
||||
* @param pollen IIndividual representing the pollen.
|
||||
* @return true if mating is possible, false otherwise.
|
||||
*/
|
||||
boolean canMateWith(ITree pollen);
|
||||
|
||||
/**
|
||||
* @return true if this has already been pollinated.
|
||||
*/
|
||||
boolean isPollinated();
|
||||
}
|
||||
@@ -11,7 +11,7 @@ import net.minecraft.world.World;
|
||||
|
||||
public interface IFlowerProvider {
|
||||
|
||||
boolean isAcceptedPollinatable(World world, IPollinatable pollinatable);
|
||||
boolean isAcceptedPollinatable(World world, ICheckPollinatable pollinatable);
|
||||
|
||||
/**
|
||||
* @return The unique type used for the IFlowerRegistry
|
||||
|
||||
@@ -5,10 +5,6 @@
|
||||
******************************************************************************/
|
||||
package forestry.api.genetics;
|
||||
|
||||
import java.util.EnumSet;
|
||||
|
||||
import net.minecraftforge.common.EnumPlantType;
|
||||
|
||||
import forestry.api.arboriculture.ITree;
|
||||
|
||||
/**
|
||||
@@ -16,28 +12,7 @@ import forestry.api.arboriculture.ITree;
|
||||
*
|
||||
* @author SirSengir
|
||||
*/
|
||||
public interface IPollinatable {
|
||||
|
||||
/**
|
||||
* @return plant types this pollinatable is classified as. (Can be used by bees to determine whether to interact or not.
|
||||
*/
|
||||
EnumSet<EnumPlantType> getPlantType();
|
||||
|
||||
/**
|
||||
* @return IIndividual containing the genetic information of this IPollinatable
|
||||
*/
|
||||
ITree getPollen();
|
||||
|
||||
/**
|
||||
* Checks whether this {@link IPollinatable} can mate with the given pollen.
|
||||
*
|
||||
* Must be the one to check genetic equivalency.
|
||||
*
|
||||
* @param pollen
|
||||
* IIndividual representing the pollen.
|
||||
* @return true if mating is possible, false otherwise.
|
||||
*/
|
||||
boolean canMateWith(ITree pollen);
|
||||
public interface IPollinatable extends ICheckPollinatable {
|
||||
|
||||
/**
|
||||
* Pollinates this entity.
|
||||
@@ -46,10 +21,4 @@ public interface IPollinatable {
|
||||
* IIndividual representing the pollen.
|
||||
*/
|
||||
void mateWith(ITree pollen);
|
||||
|
||||
/**
|
||||
* @return true if this IPollinatable has already been pollinated.
|
||||
* @since Forestry 4.1.0
|
||||
*/
|
||||
boolean isPollinated();
|
||||
}
|
||||
Reference in new issue
Block a user