From 9b417ae63b52d424dcb8935c8262849f29fadede Mon Sep 17 00:00:00 2001 From: bdew Date: Fri, 16 Jan 2015 09:47:16 +0200 Subject: [PATCH 1/2] Added workaround for crash if a registered species doesn't have a registered template (#75) --- .gitignore | 6 ++---- src/net/bdew/gendustry/misc/GeneticsCache.scala | 10 +++++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 7da7b46..dbef3e4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,10 +3,8 @@ /build /run /deps/run -/.idea/workspace.xml -/.idea/dictionaries +/.idea /eclipse /.gradle /*.iml -/*.ipr -/.idea/libraries/Gradle__* \ No newline at end of file +/*.ipr \ No newline at end of file diff --git a/src/net/bdew/gendustry/misc/GeneticsCache.scala b/src/net/bdew/gendustry/misc/GeneticsCache.scala index 5984060..69c98ca 100644 --- a/src/net/bdew/gendustry/misc/GeneticsCache.scala +++ b/src/net/bdew/gendustry/misc/GeneticsCache.scala @@ -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 + } } } From 09c35e000a011e7fe9b58ca539f4ffc1cfb66941 Mon Sep 17 00:00:00 2001 From: bdew Date: Fri, 16 Jan 2015 10:53:08 +0200 Subject: [PATCH 2/2] More fixes for species not having a registered template (#75, #76) --- src/net/bdew/gendustry/items/GeneTemplate.scala | 1 + src/net/bdew/gendustry/misc/CommandGiveTemplate.scala | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/net/bdew/gendustry/items/GeneTemplate.scala b/src/net/bdew/gendustry/items/GeneTemplate.scala index fa67905..110f5cf 100644 --- a/src/net/bdew/gendustry/items/GeneTemplate.scala +++ b/src/net/bdew/gendustry/items/GeneTemplate.scala @@ -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 _ => diff --git a/src/net/bdew/gendustry/misc/CommandGiveTemplate.scala b/src/net/bdew/gendustry/misc/CommandGiveTemplate.scala index 04ca1a0..593b85c 100644 --- a/src/net/bdew/gendustry/misc/CommandGiveTemplate.scala +++ b/src/net/bdew/gendustry/misc/CommandGiveTemplate.scala @@ -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]) {