mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-21 12:32:23 +00:00
Use generics for Chromosome type, begin unifying code
This commit is contained in:
1 parent
a8270ef365
commit
43e41034f6
217 files changed
+3148
-2417
No files matched your search
@@ -1,9 +1,15 @@
|
||||
package forestry.apiculture.genetics;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import java.util.EnumMap;
|
||||
import java.util.Map;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import forestry.api.apiculture.BeeChromosome;
|
||||
import forestry.api.apiculture.BeeManager;
|
||||
import forestry.api.apiculture.EnumBeeChromosome;
|
||||
import forestry.api.apiculture.EnumBeeType;
|
||||
import forestry.api.apiculture.IBee;
|
||||
import forestry.api.apiculture.IBeeGenome;
|
||||
@@ -12,19 +18,20 @@ import forestry.core.genetics.alleles.AlleleHelper;
|
||||
|
||||
public abstract class BeeVariation implements IBeeDefinition {
|
||||
|
||||
private final IAllele[] template;
|
||||
private final ImmutableMap<BeeChromosome, IAllele> template;
|
||||
private final IBeeGenome genome;
|
||||
|
||||
protected BeeVariation(IBeeDefinition bee) {
|
||||
template = bee.getTemplate();
|
||||
initializeTemplate(template);
|
||||
private BeeVariation(IBeeDefinition bee) {
|
||||
Map<BeeChromosome, IAllele> templateBuilder = new EnumMap<>(bee.getTemplate());
|
||||
initializeTemplate(templateBuilder);
|
||||
template = ImmutableMap.copyOf(templateBuilder);
|
||||
genome = BeeManager.beeRoot.templateAsGenome(template);
|
||||
}
|
||||
|
||||
protected abstract void initializeTemplate(IAllele[] template);
|
||||
protected abstract void initializeTemplate(@Nonnull Map<BeeChromosome, IAllele> template);
|
||||
|
||||
@Override
|
||||
public IAllele[] getTemplate() {
|
||||
public ImmutableMap<BeeChromosome, IAllele> getTemplate() {
|
||||
return template;
|
||||
}
|
||||
|
||||
@@ -50,8 +57,8 @@ public abstract class BeeVariation implements IBeeDefinition {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void initializeTemplate(IAllele[] template) {
|
||||
AlleleHelper.instance.set(template, EnumBeeChromosome.TOLERANT_FLYER, true);
|
||||
protected void initializeTemplate(@Nonnull Map<BeeChromosome, IAllele> template) {
|
||||
AlleleHelper.instance.set(template, BeeChromosome.TOLERANT_FLYER, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user