From 1fec98c443e0beea3e55f0ec64c7452cc168bde5 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 27 Jun 2014 04:14:01 +0100 Subject: [PATCH] Garble Flarg. --- .../crafting/ModManaInfusionRecipes.java | 2 + .../botania/common/entity/EntityPixie.java | 7 +- .../botania/common/item/ItemBottledMana.java | 161 ++++++++++++++++-- 3 files changed, 157 insertions(+), 13 deletions(-) diff --git a/MODSRC/vazkii/botania/common/crafting/ModManaInfusionRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModManaInfusionRecipes.java index 47273eaa0..f0488218a 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModManaInfusionRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModManaInfusionRecipes.java @@ -57,6 +57,8 @@ public final class ModManaInfusionRecipes { mycelSeedsRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.grassSeeds, 1, 2), new ItemStack(Blocks.brown_mushroom), 6500)); manaQuartzRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.quartz, 1, 1), new ItemStack(Items.quartz), 250); + + BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaBottle), new ItemStack(Items.glass_bottle), 5000); } } diff --git a/MODSRC/vazkii/botania/common/entity/EntityPixie.java b/MODSRC/vazkii/botania/common/entity/EntityPixie.java index 4637b6614..a79564816 100644 --- a/MODSRC/vazkii/botania/common/entity/EntityPixie.java +++ b/MODSRC/vazkii/botania/common/entity/EntityPixie.java @@ -62,7 +62,7 @@ public class EntityPixie extends EntityFlyingCreature { public void onEntityUpdate() { super.onEntityUpdate(); - if(ticksExisted > 100) + if(getAttackTarget() == null && ticksExisted > 100) die(); if(worldObj.isRemote) @@ -78,4 +78,9 @@ public class EntityPixie extends EntityFlyingCreature { Botania.proxy.sparkleFX(worldObj, posX + (Math.random() - 0.5) * 0.25, posY + 0.5 + (Math.random() - 0.5) * 0.25, posZ + (Math.random() - 0.5) * 0.25, 1F, 0.25F, 0.9F, 1F + (float) Math.random() * 0.25F, 5); } + @Override + protected boolean canDespawn() { + return false; + } + } \ No newline at end of file diff --git a/MODSRC/vazkii/botania/common/item/ItemBottledMana.java b/MODSRC/vazkii/botania/common/item/ItemBottledMana.java index 653e9a5c3..053d2ee6f 100644 --- a/MODSRC/vazkii/botania/common/item/ItemBottledMana.java +++ b/MODSRC/vazkii/botania/common/item/ItemBottledMana.java @@ -11,66 +11,203 @@ */ package vazkii.botania.common.item; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.DamageSource; import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.entity.EntityPixie; +import vazkii.botania.common.entity.EntitySignalFlare; import vazkii.botania.common.lib.LibItemNames; public class ItemBottledMana extends ItemMod { IIcon[] icons; - + public ItemBottledMana() { setUnlocalizedName(LibItemNames.MANA_BOTTLE); setMaxStackSize(1); setMaxDamage(6); } - - public void randomEffect(EntityPlayer player) { - + + public void effect(EntityPlayer player, int id) { + switch(id) { + case 0 : { // Random motion + player.motionX = (Math.random() - 0.5) * 3; + player.motionZ = (Math.random() - 0.5) * 3; + break; + } + case 1 : { // Water + if(!player.worldObj.isRemote) + player.worldObj.setBlock((int) MathHelper.floor_double(player.posX), (int) MathHelper.floor_double(player.posY), (int) MathHelper.floor_double(player.posZ), Blocks.flowing_water); + break; + } + case 2 : { // Set on Fire + player.setFire(4); + break; + } + case 3 : { // Mini Explosion + if(!player.worldObj.isRemote) + player.worldObj.createExplosion(null, player.posX, player.posY, player.posZ, 0.25F, false); + break; + } + case 4 : { // Mega Jump + player.motionY = 6; + player.addPotionEffect(new PotionEffect(Potion.resistance.id, 200, 5)); + break; + } + case 5 : { // Randomly set HP + player.setHealth(player.worldObj.rand.nextInt(19) + 1); + break; + } + case 6 : { // Lots O' Hearts + player.addPotionEffect(new PotionEffect(Potion.field_76444_x.id, 20 * 60 * 2, 9)); + break; + } + case 7 : { // All your inventory is belong to us + for(int i = 0; i < player.inventory.getSizeInventory(); i++) + if(i != player.inventory.currentItem) { + ItemStack stackAt = player.inventory.getStackInSlot(i); + if(stackAt != null) + player.dropPlayerItemWithRandomChoice(stackAt, true); + player.inventory.setInventorySlotContents(i, null); + } + + break; + } + case 8 : { // Break your neck + player.rotationPitch = (float) Math.random() * 360F; + player.rotationYaw = (float) Math.random() * 180F; + + + break; + } + case 9 : { // Highest Possible + int x = (int) MathHelper.floor_double(player.posX); + int y = (int) MathHelper.floor_double(player.posY); + int z = (int) MathHelper.floor_double(player.posZ); + for(int i = 256; i > 0; i--) { + Block block = player.worldObj.getBlock(x, i, z); + if(!block.isAir(player.worldObj, x, i, z)) { + if(player instanceof EntityPlayerMP) { + EntityPlayerMP mp = (EntityPlayerMP) player; + mp.playerNetServerHandler.setPlayerLocation(player.posX, i + 1.6, player.posZ, player.rotationYaw, player.rotationPitch); + } + break; + } + } + + break; + } + case 10 : { // HYPERSPEEEEEED + player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 60, 200)); + break; + } + case 11 : { // Night Vision + player.addPotionEffect(new PotionEffect(Potion.nightVision.id, 6000, 0)); + break; + } + case 12 : { // Flare + if(!player.worldObj.isRemote) { + EntitySignalFlare flare = new EntitySignalFlare(player.worldObj); + flare.setPosition(player.posX, player.posY, player.posZ); + flare.setColor(player.worldObj.rand.nextInt(16)); + player.worldObj.playSoundAtEntity(player, "random.explode", 40F, (1.0F + (player.worldObj.rand.nextFloat() - player.worldObj.rand.nextFloat()) * 0.2F) * 0.7F); + + player.worldObj.spawnEntityInWorld(flare); + + int range = 5; + List entities = player.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); + for(EntityLivingBase entity : entities) + if(entity != player && (!(entity instanceof EntityPlayer) || MinecraftServer.getServer() == null || MinecraftServer.getServer().isPVPEnabled())) + entity.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 50, 5)); + } + + break; + } + case 13 : { // Pixie Friend + if(!player.worldObj.isRemote) { + EntityPixie pixie = new EntityPixie(player.worldObj); + pixie.setPosition(player.posX, player.posY + 1.5, player.posZ); + player.worldObj.spawnEntityInWorld(pixie); + } + break; + } + case 14 : { // Nausea + Blindness :3 + player.addPotionEffect(new PotionEffect(Potion.confusion.id, 160, 3)); + player.addPotionEffect(new PotionEffect(Potion.blindness.id, 160, 0)); + break; + } + case 15 : { + player.attackEntityFrom(DamageSource.magic, player.getHealth() - 1); + ItemStack stack = new ItemStack(Items.skull, 1, 3); + ItemNBTHelper.setString(stack, "SkullOwner", player.getCommandSenderName()); + player.dropPlayerItemWithRandomChoice(stack, true); + break; + } + } } - + + public void randomEffect(EntityPlayer player) { + effect(player, 15); + } + @Override public void registerIcons(IIconRegister par1IconRegister) { icons = new IIcon[6]; for(int i = 0; i < icons.length; i++) icons[i] = IconHelper.forItem(par1IconRegister, this, i); } - + @Override public IIcon getIconFromDamage(int par1) { return icons[Math.min(icons.length - 1, par1)]; } - + @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); return par1ItemStack; } - + @Override public ItemStack onEaten(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { randomEffect(par3EntityPlayer); par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() + 1); - + if(par1ItemStack.getItemDamage() == 6) return new ItemStack(Items.glass_bottle); return par1ItemStack; } - + @Override public int getMaxItemUseDuration(ItemStack par1ItemStack) { return 20; } - + @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { return EnumAction.drink; } - + }