From 5bcf0d1bf08c14cc6bf59c8f0eede4349f52899e Mon Sep 17 00:00:00 2001 From: bdew Date: Sun, 8 Feb 2015 16:26:24 +0200 Subject: [PATCH] Added pollen collection kit --- resources/assets/gendustry/config/recipes.cfg | 10 +++- resources/assets/gendustry/lang/en_US.lang | 1 + .../gendustry/textures/items/pollenkit.png | Bin 0 -> 961 bytes .../gendustry/textures/items/pollenkit.psd | Bin 0 -> 36008 bytes src/net/bdew/gendustry/config/Items.scala | 5 ++ .../gendustry/forestry/GeneticsHelper.scala | 12 +++++ src/net/bdew/gendustry/items/PollenKit.scala | 43 ++++++++++++++++++ 7 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 resources/assets/gendustry/textures/items/pollenkit.png create mode 100644 resources/assets/gendustry/textures/items/pollenkit.psd create mode 100644 src/net/bdew/gendustry/items/PollenKit.scala diff --git a/resources/assets/gendustry/config/recipes.cfg b/resources/assets/gendustry/config/recipes.cfg index 2f68b0a..02b1794 100644 --- a/resources/assets/gendustry/config/recipes.cfg +++ b/resources/assets/gendustry/config/recipes.cfg @@ -1,6 +1,4 @@ recipes { // TOOLS - // === Tools === - D = I:diamond P = I:gendustry:PowerModule @@ -16,6 +14,14 @@ recipes { // TOOLS P__ } +recipes { + L = I:gendustry:Labware + S = I:string + P = I:paper + + shapeless: LSP => I:gendustry:PollenKit +} + recipes { // CRAFTING ITEMS P = B:glass_pane S = B:piston diff --git a/resources/assets/gendustry/lang/en_US.lang b/resources/assets/gendustry/lang/en_US.lang index 99af960..742ae0d 100644 --- a/resources/assets/gendustry/lang/en_US.lang +++ b/resources/assets/gendustry/lang/en_US.lang @@ -29,6 +29,7 @@ item.gendustry.grafter.name=Industrial Grafter item.gendustry.scoop.name=Scooporator MX200 Turbo item.gendustry.ImportCover.name=Item Import Cover item.gendustry.EjectCover.name=Item Eject Cover +item.gendustry.PollenKit.name=Pollen Collection Kit # ==== FLUIDS ==== diff --git a/resources/assets/gendustry/textures/items/pollenkit.png b/resources/assets/gendustry/textures/items/pollenkit.png new file mode 100644 index 0000000000000000000000000000000000000000..c231d9dda0a0119aac148308ccd4d85232f5366b GIT binary patch literal 961 zcmV;y13vtTP)9&P~lf2B%&YPLI&ttrV0E zKN;p3fpc?nhUmLViI*>A_Gg|xyiaOf(}2(Cqd>q<;TvZF(x1N2qsLEVtx} z5}My5X>f4R9xp5`7^C+d(AUo&uci(xEiD;7Ux4!YyglCD-llM5Nbc`^zZw9ALV*Ik zz4GYj$Q}!+QK?j>P$<;dLNq=;-n33nPft^Spr54G;1hcur`+K$3Wvk8*_w1ZEm{UJ zF)>kJTU#R`1l4LacKa9cz={;W@g|=Jv}|7 zX&PlR8GA3Qcr^tf{`N7NoSf|FS88KpL$t&IB41owB){KJZnqmO5Lker8HRDr7i^$a ztU`2rd~8RLHQ8(yx1@CqU{h>{-s|;Rl`mi)ig&6H8dziyn9t>Mwl7ivW51RFU^8Bf z9_1HISQ==|bK^9^7xNyEhsx!0Q{R>tKonSv1K6-BM}(f=F$jPK^;io-D%xTIn`1*5 zN63dWNS+4>;uxm@-bDNrNjC}9A`U?EhM1;-4q+7T5F$2;DPqvVvZ z2>BV2!#ItO0dVdS73+ah!MVSv3m8~~wFN*G-$li94?i~b9jAqXJJJC1Z~xe^t`+D+ z8qnh))&Qd9d87rcSS;FWOQll#bpRW41;k;f@c@9s5Fz~3p06SLQ!&=9IpK%_z6pG_ z(6i7uH5l_%0{~P)Fu>Q+GQ;wBIbuMKL_J6apemlzbK(0S9BTj(^G8QLNKFC8tOI;A z@XR;lbe-l%16Z`OvO=*~>|B9S3lAcLCb;(Ny53-nYry*Y`lTWim;E`Nnwsj!Z-Uj; jRpAK0fAR15j{pMzUkhGNruFk-00000NkvXXu0mjfhpf4O literal 0 HcmV?d00001 diff --git a/resources/assets/gendustry/textures/items/pollenkit.psd b/resources/assets/gendustry/textures/items/pollenkit.psd new file mode 100644 index 0000000000000000000000000000000000000000..d002f713a634aafdae8da836b8a4529b217d91bf GIT binary patch literal 36008 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 root.getDefaultTemplate()(x.ordinal()) != null } map { x => x.ordinal() -> x } ).toMap + + lazy val leafBlocks = Set(GameRegistry.findBlock("minecraft", "leaves"), GameRegistry.findBlock("minecraft", "leaves2")) + + def getErsatzPollen(bl: Block, meta: Int): Option[IIndividual] = { + if (leafBlocks.contains(bl)) { + val fixedMeta = bl.damageDropped(meta) + import scala.collection.JavaConversions._ + AlleleManager.ersatzSaplings.find({ case (stack, _) => stack.getItemDamage == fixedMeta }) map (_._2) + } else None + } } \ No newline at end of file diff --git a/src/net/bdew/gendustry/items/PollenKit.scala b/src/net/bdew/gendustry/items/PollenKit.scala new file mode 100644 index 0000000..664cc10 --- /dev/null +++ b/src/net/bdew/gendustry/items/PollenKit.scala @@ -0,0 +1,43 @@ +/* + * Copyright (c) bdew, 2013 - 2015 + * 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 + * http://bdew.net/minecraft-mod-public-license/ + */ + +package net.bdew.gendustry.items + +import forestry.api.arboriculture.EnumGermlingType +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} +import net.minecraft.entity.player.EntityPlayer +import net.minecraft.item.ItemStack +import net.minecraft.world.World + +object PollenKit extends SimpleItem("PollenKit") { + override def onItemUse(stack: ItemStack, player: EntityPlayer, world: World, x: Int, y: Int, z: Int, side: Int, xOff: Float, yOff: Float, zOff: Float): Boolean = { + if (player.isSneaking) return false + if (!world.isRemote) { + if (player.inventory.getCurrentItem.getItem != this) return false + val blockRef = BlockRef(x, y, z) + (blockRef.getTile[IPollinatable](world) map { te => te.getPollen } + // 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) { + ItemUtils.dropItemToPlayer(world, player, newStack) + player.inventory.decrStackSize(player.inventory.currentItem, 1) + } + } + } + true + } + +}