From 403b90b8494f92cea028f17e472851d7d2d91df1 Mon Sep 17 00:00:00 2001
From: Lizbeth Rika <vazkii@hotmail.com>
Date: Thu, 6 Nov 2014 17:01:47 +0000
Subject: [PATCH] Added messages if the summoning of a Gaia Guardian fails.

---
 .../botania/common/entity/EntityDoppleganger.java  | 14 +++++++++++---
 .../botania/common/item/ItemManaResource.java      |  2 +-
 src/main/resources/assets/botania/lang/en_US.lang  |  2 ++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java
index 47fb494c7..705c1efd6 100644
--- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java
+++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java
@@ -32,8 +32,11 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.ChatStyle;
 import net.minecraft.util.ChunkCoordinates;
 import net.minecraft.util.DamageSource;
+import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.EnumDifficulty;
@@ -80,11 +83,13 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi
 		experienceValue = 825;
 	}
 
-	public static boolean spawn(ItemStack par1ItemStack, World par3World, int par4, int par5, int par6) {
+	public static boolean spawn(EntityPlayer player, ItemStack par1ItemStack, World par3World, int par4, int par5, int par6) {
 		Block block = par3World.getBlock(par4, par5, par6);
 		if(block == Blocks.beacon && !par3World.isRemote) {
-			if(par3World.difficultySetting == EnumDifficulty.PEACEFUL)
+			if(par3World.difficultySetting == EnumDifficulty.PEACEFUL) {
+				player.addChatMessage(new ChatComponentTranslation("botaniamisc.peacefulNoob").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED)));
 				return false;
+			}
 
 			for(int[] coords : PYLON_LOCATIONS) {
 				int x = par4 + coords[0];
@@ -93,8 +98,10 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi
 
 				Block blockat = par3World.getBlock(x, y, z);
 				int meta = par3World.getBlockMetadata(x, y, z);
-				if(blockat != ModBlocks.pylon || meta != 2)
+				if(blockat != ModBlocks.pylon || meta != 2) {
+					player.addChatMessage(new ChatComponentTranslation("botaniamisc.needsCatalysts").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED)));
 					return false;
+				}
 			}
 
 			par1ItemStack.stackSize--;
@@ -107,6 +114,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi
 			par3World.spawnEntityInWorld(e);
 			return true;
 		}
+		
 		return false;
 	}
 
diff --git a/src/main/java/vazkii/botania/common/item/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/ItemManaResource.java
index e99ccc673..0a9c14b16 100644
--- a/src/main/java/vazkii/botania/common/item/ItemManaResource.java
+++ b/src/main/java/vazkii/botania/common/item/ItemManaResource.java
@@ -43,7 +43,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve
 	@Override
 	public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) {
 		if(par1ItemStack.getItemDamage() == 4)
-			return EntityDoppleganger.spawn(par1ItemStack, par3World, par4, par5, par6);
+			return EntityDoppleganger.spawn(par2EntityPlayer, par1ItemStack, par3World, par4, par5, par6);
 
 		return super.onItemUse(par1ItemStack, par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10);
 	}
diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang
index 21b8b45a2..da1109d06 100644
--- a/src/main/resources/assets/botania/lang/en_US.lang
+++ b/src/main/resources/assets/botania/lang/en_US.lang
@@ -64,6 +64,8 @@ botaniamisc.wandMode.bind=Bind Mode
 botaniamisc.wandMode.function=Function Mode
 botaniamisc.playVideo=Play Video
 botaniamisc.brewOf=Brew of %s
+botaniamisc.needsCatalysts=No matter how hard you try to push the Terrasteel Ingot into the Beacon, nothing seems to happen, perhaps your configuration of catalyst pylons might be off.
+botaniamisc.peacefulNoob=You try to offer the Terrasteel Ingot, but the peaceful vibes of your world prevent you from doing so. Perhaps you should do something about that.
 
 # NEI INTEGRATION
 botania.nei.brewery=Botanical Brewery