diff --git a/src/net/bdew/gendustry/compat/ExtraBeesProxy.scala b/src/net/bdew/gendustry/compat/ExtraBeesProxy.scala new file mode 100644 index 0000000..8aeeaee --- /dev/null +++ b/src/net/bdew/gendustry/compat/ExtraBeesProxy.scala @@ -0,0 +1,52 @@ +/* + * Copyright (c) bdew, 2013 + * https://github.com/bdew/gendustry + * + * This mod is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * https://raw.github.com/bdew/gendustry/master/MMPL-1.0.txt + */ + +package net.bdew.gendustry.compat + +import net.bdew.lib.Misc +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.genetics.AlleleManager + +object ExtraBeesProxy { + val ebLoaded = Misc.haveModVersion("ExtraBees@[1.6-pre15,)") + val itemSerum = + if (ebLoaded) + try { + Class.forName("binnie.extrabees.ExtraBees").getField("serum").get(null).asInstanceOf[Item] + } catch { + case e: Throwable => + Gendustry.logWarn("Failed to load ExtraBees serum item") + e.printStackTrace() + null + } + else + null + + if (itemSerum != null) Gendustry.logInfo("ExtraBees serum item ID: ", itemSerum.itemID) + + def isSerum(stack: ItemStack) = if (itemSerum != null) stack.itemID == itemSerum.itemID else false + + def getSerumSample(stack: ItemStack): GeneSampleInfo = { + if (!isSerum(stack)) return null + val nbt: NBTTagCompound = stack.getTagCompound + if (nbt.hasKey("chromosome") && nbt.hasKey("uid")) { + var chromosome = nbt.getInteger("chromosome") + val allele = nbt.getString("uid") + if (chromosome >= EnumBeeChromosome.HUMIDITY.ordinal) + chromosome = chromosome + 1 + val alleleObj = AlleleManager.alleleRegistry.getAllele(allele) + return new GeneSampleInfo(AlleleManager.alleleRegistry.getSpeciesRoot("rootBees"), chromosome, alleleObj) + } + return null + } +} diff --git a/src/net/bdew/gendustry/machines/sampler/TileSampler.scala b/src/net/bdew/gendustry/machines/sampler/TileSampler.scala index 2038045..cd56290 100644 --- a/src/net/bdew/gendustry/machines/sampler/TileSampler.scala +++ b/src/net/bdew/gendustry/machines/sampler/TileSampler.scala @@ -16,6 +16,7 @@ import scala.util.Random import net.bdew.gendustry.forestry.GeneSampleInfo import net.bdew.lib.power.TileItemProcessor import net.bdew.gendustry.power.TilePowered +import net.bdew.gendustry.compat.ExtraBeesProxy class TileSampler extends TileItemProcessor with TilePowered { lazy val cfg = Machines.imprinter @@ -24,6 +25,11 @@ class TileSampler extends TileItemProcessor with TilePowered { def getSizeInventory = 4 def selectRandomAllele(stack: ItemStack): ItemStack = { + if (ExtraBeesProxy.isSerum(stack)) { + val sample = ExtraBeesProxy.getSerumSample(stack) + if (sample != null) return Items.geneSample.newStack(sample) + } + val root = AlleleManager.alleleRegistry.getSpeciesRoot(stack) if (root == null) return new ItemStack(Items.waste) val member = root.getMember(stack) @@ -60,7 +66,7 @@ class TileSampler extends TileItemProcessor with TilePowered { case 1 => return itemstack.getItem == Items.labware case 2 => - return AlleleManager.alleleRegistry.getIndividual(itemstack) != null + return AlleleManager.alleleRegistry.getIndividual(itemstack) != null || ExtraBeesProxy.isSerum(itemstack) case _ => return false }