Revert "Use generics for Chromosome type, begin unifying code"

This reverts commit 43e41034f6.

Conflicts:
	src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java
	src/main/java/forestry/api/genetics/IAlleleSpeciesCustom.java
	src/main/java/forestry/core/proxy/ProxyRenderClient.java
This commit is contained in:
mezz committed 2016-03-03 20:50:38 -08:00
1 parent 87f2dc0a0a
commit efcab41e04
217 files changed
+2408 -3136

No files matched your search

@@ -5,8 +5,6 @@
******************************************************************************/
package forestry.api.apiculture;
import javax.annotation.Nonnull;
import forestry.api.genetics.EnumTolerance;
import forestry.api.genetics.IFlowerProvider;
import forestry.api.genetics.IGenome;
@@ -17,13 +15,11 @@ import forestry.api.genetics.IGenome;
* @author SirSengir
*
*/
public interface IBeeGenome extends IGenome<BeeChromosome> {
public interface IBeeGenome extends IGenome {
@Nonnull
@Override
IAlleleBeeSpecies getPrimary();
@Nonnull
@Override
IAlleleBeeSpecies getSecondary();
@@ -33,10 +29,8 @@ public interface IBeeGenome extends IGenome<BeeChromosome> {
int getFertility();
@Nonnull
EnumTolerance getToleranceTemp();
@Nonnull
EnumTolerance getToleranceHumid();
boolean getNocturnal();
@@ -45,17 +39,12 @@ public interface IBeeGenome extends IGenome<BeeChromosome> {
boolean getCaveDwelling();
@Nonnull
IFlowerProvider getFlowerProvider();
int getFlowering();
int[] getTerritory();
@Nonnull
IAlleleBeeEffect getEffect();
@Nonnull
@Override
IBeeRoot getSpeciesRoot();
}