Cleanup, move ILeafSpriteProvider around

This commit is contained in:
mezz committed 2016-02-27 01:31:24 -08:00
1 parent 315e5ba1cf
commit 2f711b0493
8 files changed
+44 -56

No files matched your search

@@ -10,7 +10,7 @@ import forestry.api.genetics.IAllele;
/**
* Simple allele encapsulating an {@link IFruitProvider}.
*/
public interface IAlleleFruit extends IAllele, Comparable<IAlleleFruit> {
public interface IAlleleFruit extends IAllele {
IFruitProvider getProvider();
@@ -7,7 +7,6 @@ package forestry.api.arboriculture;
import java.util.Collection;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraftforge.common.EnumPlantType;
@@ -18,7 +17,7 @@ import forestry.api.core.IModelManager;
import forestry.api.genetics.IAlleleSpecies;
import forestry.api.genetics.IFruitFamily;
public interface IAlleleTreeSpecies extends IAlleleSpecies<TreeChromosome>, Comparable<IAlleleTreeSpecies> {
public interface IAlleleTreeSpecies extends IAlleleSpecies<TreeChromosome> {
@Override
ITreeRoot getRoot();
@@ -49,10 +48,8 @@ public interface IAlleleTreeSpecies extends IAlleleSpecies<TreeChromosome>, Comp
String getModelName();
/* TEXTURES AND OVERRIDES */
int getLeafColour(boolean pollinated);
@SideOnly(Side.CLIENT)
TextureAtlasSprite getLeafSprite(boolean pollinated, boolean fancy);
ILeafSpriteProvider getLeafSpriteProvider();
@SideOnly(Side.CLIENT)
ModelResourceLocation getGermlingModel(EnumGermlingType type);
@@ -8,7 +8,7 @@ package forestry.api.genetics;
import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
public interface IAlleleSpeciesBuilder<C extends IChromosomeType<C>> {
public interface IAlleleSpeciesBuilder<C extends IChromosomeType> {
IAlleleSpecies<C> build();