Fixed pollen collection kit producing invalid items from binnie's flowers (#82)

This commit is contained in:
bdew committed 2015-02-19 02:04:53 +02:00
1 parent 41b3faa34a
commit f7cb42c3c8
2 files changed
+8 -6

No files matched your search

+1 -1
View File
@@ -23,7 +23,7 @@ apply plugin: 'scala'
apply plugin: 'forge'
version = "1.4.6"
ext.bdlibver = "1.6.3.42"
ext.bdlibver = "1.6.3.44"
ext.versuffix = "mc1710"
ext.apiVer = version
+7 -5
View File
@@ -9,9 +9,8 @@
package net.bdew.gendustry.items
import forestry.api.arboriculture.EnumGermlingType
import forestry.api.arboriculture.{EnumGermlingType, ITreeRoot}
import forestry.api.genetics.IPollinatable
import net.bdew.gendustry.compat.ForestryHelper
import net.bdew.gendustry.forestry.GeneticsHelper
import net.bdew.lib.block.BlockRef
import net.bdew.lib.items.{ItemUtils, SimpleItem}
@@ -29,9 +28,12 @@ object PollenKit extends SimpleItem("PollenKit") {
// If block is not IPollinatable, check for vanilla leafs conversion
orElse (blockRef.block(world) flatMap { bl => GeneticsHelper.getErsatzPollen(bl, blockRef.meta(world)) })
) map { individual =>
// Generate pollen item and consume kit
val newStack = ForestryHelper.getRoot("Trees").getMemberStack(individual, EnumGermlingType.POLLEN.ordinal())
if (newStack != null) {
(individual.getGenome.getSpeciesRoot match {
case trees: ITreeRoot => Option(trees.getMemberStack(individual, EnumGermlingType.POLLEN.ordinal()))
case root if root.getUID == "rootFlowers" => Option(root.getMemberStack(individual, 2))
case _ => None
}) map { newStack =>
// Generate pollen item and consume kit
ItemUtils.dropItemToPlayer(world, player, newStack)
player.inventory.decrStackSize(player.inventory.currentItem, 1)
}