mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-20 20:12:19 +00:00
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:
1 parent
87f2dc0a0a
commit
efcab41e04
217 files changed
+2408
-3136
No files matched your search
@@ -5,8 +5,6 @@
|
||||
******************************************************************************/
|
||||
package forestry.api.genetics;
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* Biological classifications from domain down to genus.
|
||||
*
|
||||
@@ -76,7 +74,7 @@ public interface IClassification {
|
||||
/**
|
||||
* @return Member groups of this one.
|
||||
*/
|
||||
Collection<IClassification> getMemberGroups();
|
||||
IClassification[] getMemberGroups();
|
||||
|
||||
/**
|
||||
* Adds subgroups to this group.
|
||||
@@ -86,14 +84,14 @@ public interface IClassification {
|
||||
/**
|
||||
* @return Member species of this group.
|
||||
*/
|
||||
Collection<IAlleleSpecies<?>> getMemberSpecies();
|
||||
IAlleleSpecies[] getMemberSpecies();
|
||||
|
||||
/**
|
||||
* Used by the allele registry to populate internal collection of branch members on the fly.
|
||||
*
|
||||
* @param species
|
||||
*/
|
||||
void addMemberSpecies(IAlleleSpecies<?> species);
|
||||
void addMemberSpecies(IAlleleSpecies species);
|
||||
|
||||
/**
|
||||
* @return Parent classification, null if this is root.
|
||||
|
||||
Reference in new issue
Block a user