mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-21 20:42:35 +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,10 +5,6 @@
|
||||
******************************************************************************/
|
||||
package forestry.api.genetics;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
import forestry.api.core.INbtWritable;
|
||||
|
||||
/**
|
||||
@@ -16,25 +12,19 @@ import forestry.api.core.INbtWritable;
|
||||
*
|
||||
* Only the default implementation is supported.
|
||||
*/
|
||||
public interface IGenome<C extends IChromosomeType> extends INbtWritable {
|
||||
public interface IGenome extends INbtWritable {
|
||||
|
||||
@Nonnull
|
||||
IAlleleSpecies<C> getPrimary();
|
||||
IAlleleSpecies getPrimary();
|
||||
|
||||
@Nonnull
|
||||
IAlleleSpecies<C> getSecondary();
|
||||
IAlleleSpecies getSecondary();
|
||||
|
||||
@Nonnull
|
||||
ImmutableMap<C, IChromosome> getChromosomes();
|
||||
IChromosome[] getChromosomes();
|
||||
|
||||
@Nonnull
|
||||
IAllele getActiveAllele(C chromosomeType);
|
||||
IAllele getActiveAllele(IChromosomeType chromosomeType);
|
||||
|
||||
@Nonnull
|
||||
IAllele getInactiveAllele(C chromosomeType);
|
||||
IAllele getInactiveAllele(IChromosomeType chromosomeType);
|
||||
|
||||
boolean isGeneticEqual(IGenome<C> other);
|
||||
|
||||
@Nonnull
|
||||
ISpeciesRoot<C> getSpeciesRoot();
|
||||
boolean isGeneticEqual(IGenome other);
|
||||
|
||||
ISpeciesRoot getSpeciesRoot();
|
||||
}
|
||||
Reference in new issue
Block a user