From 97fe20f6aa4b6fcbdf1ec433bdd4d6a64bd69937 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Wed, 18 Mar 2015 17:00:23 +0000 Subject: [PATCH] The Spectranthemum can no longer teleport Mana Tablets and other mana containing items. --- .../block/subtile/functional/SubTileSpectranthemum.java | 6 ++++++ src/main/resources/assets/botania/lang/en_US.lang | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index d56d4a92f..a6c56e932 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -15,11 +15,13 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChunkCoordinates; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; import cpw.mods.fml.relauncher.Side; @@ -53,6 +55,10 @@ public class SubTileSpectranthemum extends SubTileFunctional { ItemStack stack = item.getEntityItem(); if(stack != null) { + Item sitem = stack.getItem(); + if(sitem instanceof IManaItem) + continue; + int cost = stack.stackSize * COST; if(mana >= cost) { spawnExplosionParticles(item); diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index c938b48f0..1a210b8d4 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1522,7 +1522,7 @@ botania.page.vinculotus1=&oTouch this black lotus with your fingers&r. # -- SPECTRANTHEMUM botania.entry.spectranthemum=Spectranthemum -botania.page.spectranthemum0=Transporting items a long distance can be an arduous task. Water channels and &1Daffomills&0 won't cut it forever.
The &1Spectranthemum&0, at the cost of &4Mana&0 wraps the fabric of reality of any dropped items around it, teleporting them somewhere else in the world. +botania.page.spectranthemum0=Transporting items a long distance can be an arduous task. Water channels and &1Daffomills&0 won't cut it forever.
The &1Spectranthemum&0, at the cost of &4Mana&0 wraps the fabric of reality of any dropped items that do not contain &4Mana&0 around it, teleporting them somewhere else in the world. botania.page.spectranthemum1=In order to specify where the items go, one would use a &1Wand of the Forest&0 in bind mode and bind the flower to a block somewhere, similarly to binding it to a pool.
In order to view what block the flower is bound to rather than the pool it's pulling &4Mana&0, one would sneak while looking at it with a wand. botania.page.spectranthemum2=This flower is governed by the &4axiom of chunkloading&0, by which it'll not function on chunks not loaded. This topic is not addressed in full extent this lexicon.
&oRecommended Reading: "Chunks and Chicken", "Anchors of the World". botania.page.spectranthemum3=&o(n)spooky(n+2)me&r.