upstream/Botania
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Botania.git synced 2026-11-13 16:54:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added messages if the summoning of a Gaia Guardian fails.

Browse Source
This commit is contained in:
Lizbeth Rika committed 2014-11-06 17:01:47 +00:00
1 parent 1b4a967b19
commit 403b90b849
3 files changed
+14 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java
+11 -3
View File
@@ -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;
}
src/main/java/vazkii/botania/common/item/ItemManaResource.java
+1 -1
View File
@@ -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);
}