mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-20 12:19:47 +00:00
Merge branch 'master-MC1.10.2' of https://github.com/ForestryMC/Binnie into master-MC1.10.2
This commit is contained in:
commit
f288984833
39 files changed
+2277
-1436
No files matched your search
@@ -126,17 +126,7 @@ public class ForestryAllele {
|
||||
Highest;
|
||||
|
||||
public IAllele getAllele() {
|
||||
String s = this.toString();
|
||||
if (this == Saplings.Average) {
|
||||
s = "Default";
|
||||
}
|
||||
if (this == Saplings.High) {
|
||||
s = "Double";
|
||||
}
|
||||
if (this == Saplings.Higher) {
|
||||
s = "Triple";
|
||||
}
|
||||
return AlleleManager.alleleRegistry.getAllele("forestry.saplings" + s);
|
||||
return AlleleManager.alleleRegistry.getAllele("forestry.saplings" + name());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -257,8 +257,7 @@ public class TreeBreedingSystem extends BreedingSystem {
|
||||
switch ((EnumTreeChromosome) chromosome) {
|
||||
case FERTILITY: {
|
||||
for (final ForestryAllele.Saplings a : ForestryAllele.Saplings.values()) {
|
||||
//TODO
|
||||
//alleles.add(a.getAllele());
|
||||
alleles.add(a.getAllele());
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user