Merge remote-tracking branch 'remotes/origin/mc1710' into forestry_unstable

This commit is contained in:
bdew committed 2015-01-16 11:07:23 +02:00
commit ef3f4c17ba
4 files changed
+15 -10

No files matched your search

+2 -4
View File
@@ -3,10 +3,8 @@
/build
/run
/deps/run
/.idea/workspace.xml
/.idea/dictionaries
/.idea
/eclipse
/.gradle
/*.iml
/*.ipr
/.idea/libraries/Gradle__*
/*.ipr
@@ -39,6 +39,7 @@ object GeneTemplate extends SimpleItem("GeneTemplate") {
case GendustryCreativeTabs.templates =>
l.addAll(
Misc.filterType(AlleleManager.alleleRegistry.getRegisteredAlleles.values(), classOf[IAlleleSpecies])
.filter(sp => sp.getRoot.getTemplate(sp.getUID) != null)
.toList.sortBy(_.getUID)
.map(sp => GeneticsHelper.templateFromSpeciesUID(sp.getUID)))
case _ =>
@@ -14,6 +14,7 @@ import java.util.List
import _root_.forestry.api.genetics.{AlleleManager, IAlleleSpecies}
import net.bdew.gendustry.forestry.GeneticsHelper
import net.bdew.lib.Misc
import net.minecraft.command.{CommandBase, ICommandSender, WrongUsageException}
class CommandGiveTemplate extends CommandBase {
@@ -24,9 +25,10 @@ class CommandGiveTemplate extends CommandBase {
import scala.collection.JavaConversions._
lazy val validSpecies =
AlleleManager.alleleRegistry.getRegisteredAlleles
.filter(_._2.isInstanceOf[IAlleleSpecies])
.map(_._2.getUID)
AlleleManager.alleleRegistry.getRegisteredAlleles.values
.flatMap(Misc.asInstanceOpt(classOf[IAlleleSpecies]))
.filter(sp => sp.getRoot.getTemplate(sp.getUID) != null)
.map(_.getUID)
.toList
def processCommand(sender: ICommandSender, params: Array[String]) {
@@ -91,9 +91,13 @@ object GeneticsCache {
Gendustry.logInfo("%d mutation inputs", speciesUsedMutations.size)
for (species <- Misc.filterType(AlleleManager.alleleRegistry.getRegisteredAlleles.values(), classOf[IAlleleSpecies])) {
for ((allele, chromosome) <- species.getRoot.getTemplate(species.getUID).zipWithIndex) {
if (allele != null && !AlleleManager.alleleRegistry.isBlacklisted(allele.getUID))
speciesChromosomes(GeneSampleInfo(species.getRoot, chromosome, allele)) += species
if (species.getRoot.getTemplate(species.getUID) == null) {
Gendustry.logWarn("getTemplate returned null for species %s (root: %s)", species.getUID, species.getRoot.getUID)
} else {
for ((allele, chromosome) <- species.getRoot.getTemplate(species.getUID).zipWithIndex) {
if (allele != null && !AlleleManager.alleleRegistry.isBlacklisted(allele.getUID))
speciesChromosomes(GeneSampleInfo(species.getRoot, chromosome, allele)) += species
}
}
}