From 2f199cbf06d05aa344b6dea558637bcf2a024e95 Mon Sep 17 00:00:00 2001 From: bdew Date: Mon, 23 Dec 2013 21:15:33 +0200 Subject: [PATCH] Made Serum->Sample conversion configurable, improved NEI recipe handler --- .../assets/gendustry/gendustry-tuning.cfg | 3 ++- .../gendustry/compat/ExtraBeesProxy.scala | 23 ++++++++++++++++--- .../gendustry/forestry/GeneSampleInfo.scala | 2 +- .../machines/sampler/MachineSampler.scala | 1 + .../machines/sampler/TileSampler.scala | 6 ++--- .../bdew/gendustry/nei/SamplerHandler.scala | 15 ++++++++++++ 6 files changed, 42 insertions(+), 8 deletions(-) diff --git a/resources/assets/gendustry/gendustry-tuning.cfg b/resources/assets/gendustry/gendustry-tuning.cfg index e9486ac..f43f08f 100644 --- a/resources/assets/gendustry/gendustry-tuning.cfg +++ b/resources/assets/gendustry/gendustry-tuning.cfg @@ -75,6 +75,7 @@ cfg Machines { ActivationEnergy = 10 LabwareConsumeChance = 100 // Chance that the Genetic Labware will be consumed, 0-100 + ConvertEBSerums = Y } cfg Imprinter { @@ -221,7 +222,7 @@ cfg Upgrades { cfg Power { RF_MJ_Ratio = 10 // 10 RF = 1 MJ - EU_MJ_Ratio = 2.5 // 5 MJ = 2 EU + EU_MJ_Ratio = 2.5 // 5 EU = 2 MJ cfg EU { // Maximum packet size before stuff explodes diff --git a/src/net/bdew/gendustry/compat/ExtraBeesProxy.scala b/src/net/bdew/gendustry/compat/ExtraBeesProxy.scala index 8aeeaee..7961594 100644 --- a/src/net/bdew/gendustry/compat/ExtraBeesProxy.scala +++ b/src/net/bdew/gendustry/compat/ExtraBeesProxy.scala @@ -14,7 +14,7 @@ import net.minecraft.item.{ItemStack, Item} import net.bdew.gendustry.Gendustry import net.bdew.gendustry.forestry.GeneSampleInfo import net.minecraft.nbt.NBTTagCompound -import forestry.api.apiculture.EnumBeeChromosome +import forestry.api.apiculture.{IBeeRoot, EnumBeeChromosome} import forestry.api.genetics.AlleleManager object ExtraBeesProxy { @@ -32,7 +32,7 @@ object ExtraBeesProxy { else null - if (itemSerum != null) Gendustry.logInfo("ExtraBees serum item ID: ", itemSerum.itemID) + if (itemSerum != null) Gendustry.logInfo("ExtraBees serum item: %s", itemSerum) def isSerum(stack: ItemStack) = if (itemSerum != null) stack.itemID == itemSerum.itemID else false @@ -49,4 +49,21 @@ object ExtraBeesProxy { } return null } -} + + def makeSerumFromSample(sample: GeneSampleInfo): ItemStack = { + if (itemSerum == null || !sample.root.isInstanceOf[IBeeRoot]) return null + val serum = new ItemStack(itemSerum) + val nbt = new NBTTagCompound + nbt.setString("uid", sample.allele.getUID) + + if (sample.chromosome >= EnumBeeChromosome.HUMIDITY.ordinal) + nbt.setInteger("chromosome", sample.chromosome - 1) + else + nbt.setInteger("chromosome", sample.chromosome) + + nbt.setInteger("quality", 10) + + serum.setTagCompound(nbt) + return serum + } +} \ No newline at end of file diff --git a/src/net/bdew/gendustry/forestry/GeneSampleInfo.scala b/src/net/bdew/gendustry/forestry/GeneSampleInfo.scala index 8b61672..efeaa58 100644 --- a/src/net/bdew/gendustry/forestry/GeneSampleInfo.scala +++ b/src/net/bdew/gendustry/forestry/GeneSampleInfo.scala @@ -42,7 +42,7 @@ case class GeneSampleInfo(root: ISpeciesRoot, chromosome: Int, allele: IAllele) case p: IAllelePlantType => if (p.getPlantTypes.isEmpty) "-" else p.getPlantTypes.asScala.mkString(", ") case b: IAlleleBoolean => if (b.getValue) Misc.toLocal("gendustry.allele.true") else Misc.toLocal("gendustry.allele.false") case g: IAlleleGrowth => g.getProvider.getDescription - case x => x.getName + case x => StringUtil.localize(x.getName) } return "%s: %s".format(Misc.toLocal("gendustry.chromosome." + chr), alstr) } diff --git a/src/net/bdew/gendustry/machines/sampler/MachineSampler.scala b/src/net/bdew/gendustry/machines/sampler/MachineSampler.scala index ec406a9..0885e9c 100644 --- a/src/net/bdew/gendustry/machines/sampler/MachineSampler.scala +++ b/src/net/bdew/gendustry/machines/sampler/MachineSampler.scala @@ -21,6 +21,7 @@ class MachineSampler extends Machine("Sampler", new BlockSampler(_)) with GuiPro type TEClass = TileSampler lazy val labwareConsumeChance = tuning.getInt("LabwareConsumeChance") + lazy val convertEBSerums = tuning.getBoolean("ConvertEBSerums") @SideOnly(Side.CLIENT) def getGui(te: TileSampler, player: EntityPlayer): GuiContainer = new GuiSampler(te, player) diff --git a/src/net/bdew/gendustry/machines/sampler/TileSampler.scala b/src/net/bdew/gendustry/machines/sampler/TileSampler.scala index cd56290..ae7ce4e 100644 --- a/src/net/bdew/gendustry/machines/sampler/TileSampler.scala +++ b/src/net/bdew/gendustry/machines/sampler/TileSampler.scala @@ -19,13 +19,13 @@ import net.bdew.gendustry.power.TilePowered import net.bdew.gendustry.compat.ExtraBeesProxy class TileSampler extends TileItemProcessor with TilePowered { - lazy val cfg = Machines.imprinter + lazy val cfg = Machines.sampler val outputSlots = Seq(3) def getSizeInventory = 4 def selectRandomAllele(stack: ItemStack): ItemStack = { - if (ExtraBeesProxy.isSerum(stack)) { + if (cfg.convertEBSerums && ExtraBeesProxy.isSerum(stack)) { val sample = ExtraBeesProxy.getSerumSample(stack) if (sample != null) return Items.geneSample.newStack(sample) } @@ -66,7 +66,7 @@ class TileSampler extends TileItemProcessor with TilePowered { case 1 => return itemstack.getItem == Items.labware case 2 => - return AlleleManager.alleleRegistry.getIndividual(itemstack) != null || ExtraBeesProxy.isSerum(itemstack) + return AlleleManager.alleleRegistry.getIndividual(itemstack) != null || (cfg.convertEBSerums && ExtraBeesProxy.isSerum(itemstack)) case _ => return false } diff --git a/src/net/bdew/gendustry/nei/SamplerHandler.scala b/src/net/bdew/gendustry/nei/SamplerHandler.scala index 6437ea6..fba0e9c 100644 --- a/src/net/bdew/gendustry/nei/SamplerHandler.scala +++ b/src/net/bdew/gendustry/nei/SamplerHandler.scala @@ -24,6 +24,7 @@ import java.util import net.bdew.lib.Misc import net.bdew.gendustry.forestry.GeneSampleInfo import scala.Some +import net.bdew.gendustry.compat.ExtraBeesProxy class SamplerHandler extends BaseRecipeHandler { lazy val offset = new Point(5, 13) @@ -65,6 +66,12 @@ class SamplerHandler extends BaseRecipeHandler { for (info <- NEICache.geneSamples; species <- NEICache.speciesChromosomes(info)) { arecipes.add(new SamplerRecipe(info, getRecipeStack(species))) } + if (Machines.sampler.convertEBSerums && ExtraBeesProxy.ebLoaded) { + for (sample <- NEICache.geneSamples if sample.root.isInstanceOf[IBeeRoot]) { + val serum = ExtraBeesProxy.makeSerumFromSample(sample) + if (serum != null) arecipes.add(new SamplerRecipe(sample, serum)) + } + } } override def loadUsageRecipes(outputId: String, results: AnyRef*): Unit = { @@ -83,6 +90,10 @@ class SamplerHandler extends BaseRecipeHandler { alleles += GeneSampleInfo(root, n, chromosome.getSecondaryAllele) } alleles.foreach(sample => arecipes.add(new SamplerRecipe(sample, stack))) + } else if (Machines.sampler.convertEBSerums && ExtraBeesProxy.isSerum(stack)) { + val sample = ExtraBeesProxy.getSerumSample(stack) + if (sample != null) + arecipes.add(new SamplerRecipe(sample, stack)) } case ("Sampler", _) => addAllRecipes() } @@ -95,6 +106,10 @@ class SamplerHandler extends BaseRecipeHandler { for (species <- NEICache.speciesChromosomes(info)) { arecipes.add(new SamplerRecipe(info, getRecipeStack(species))) } + if (Machines.sampler.convertEBSerums && ExtraBeesProxy.ebLoaded) { + val serum = ExtraBeesProxy.makeSerumFromSample(info) + if (serum != null) arecipes.add(new SamplerRecipe(info, serum)) + } case ("Sampler", _) => addAllRecipes() } }