From f7cb42c3c8288e0bfa641b0ffc15cf6b236d1a30 Mon Sep 17 00:00:00 2001 From: bdew Date: Thu, 19 Feb 2015 02:04:53 +0200 Subject: [PATCH] Fixed pollen collection kit producing invalid items from binnie's flowers (#82) --- build.gradle | 2 +- src/net/bdew/gendustry/items/PollenKit.scala | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index c695e1e..b910dca 100644 --- a/build.gradle +++ b/build.gradle @@ -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 diff --git a/src/net/bdew/gendustry/items/PollenKit.scala b/src/net/bdew/gendustry/items/PollenKit.scala index 664cc10..d7c5f68 100644 --- a/src/net/bdew/gendustry/items/PollenKit.scala +++ b/src/net/bdew/gendustry/items/PollenKit.scala @@ -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) }