etc
/
BiomesOPlenty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ripped out the old Nourishment potion effect completely

This commit is contained in:
Adubbz 2013-07-03 17:54:44 +10:00
parent 01c434df34
commit d9244f6fbc
4 changed files with 1 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/minecraft/biomesoplenty/api/Potions.java
View File

@ -6,6 +6,5 @@ import com.google.common.base.Optional;
public class Potions public class Potions
{ {
public static Optional<? extends Potion> nourishment = Optional.absent();
public static Optional<? extends Potion> paralysis = Optional.absent(); public static Optional<? extends Potion> paralysis = Optional.absent();
} }

4
src/minecraft/biomesoplenty/configuration/BOPPotions.java
View File

@ -8,7 +8,6 @@ import net.minecraft.potion.Potion;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import biomesoplenty.api.Potions; import biomesoplenty.api.Potions;
import biomesoplenty.potions.PotionEventHandler; import biomesoplenty.potions.PotionEventHandler;
import biomesoplenty.potions.PotionNourishment;
import biomesoplenty.potions.PotionParalysis; import biomesoplenty.potions.PotionParalysis;
import com.google.common.base.Optional; import com.google.common.base.Optional;
@ -32,8 +31,7 @@ public class BOPPotions
private static void intializePotions() private static void intializePotions()
{ {
Potions.nourishment = Optional.of((new PotionNourishment(potionOffset + 0, false, 0)).setPotionName("potion.nourishment")); Potions.paralysis = Optional.of((new PotionParalysis(potionOffset + 0, true, 16767262)).setPotionName("potion.paralysis"));
Potions.paralysis = Optional.of((new PotionParalysis(potionOffset + 1, true, 16767262)).setPotionName("potion.paralysis"));
} }
private static void registerPotionNames() private static void registerPotionNames()

18
src/minecraft/biomesoplenty/potions/PotionEventHandler.java
View File

@ -1,7 +1,6 @@
package biomesoplenty.potions; package biomesoplenty.potions;
import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.EntityCreeper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.ForgeSubscribe;
import net.minecraftforge.event.entity.living.EnderTeleportEvent; import net.minecraftforge.event.entity.living.EnderTeleportEvent;
import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
@ -12,23 +11,6 @@ public class PotionEventHandler
@ForgeSubscribe @ForgeSubscribe
public void onEntityUpdate(LivingUpdateEvent event) public void onEntityUpdate(LivingUpdateEvent event)
{ {
if (event.entityLiving.isPotionActive(Potions.nourishment.get()))
{
if (event.entityLiving.worldObj.rand.nextInt(150) == 0)
{
if (!event.entityLiving.worldObj.isRemote)
if (event.entityLiving instanceof EntityPlayer) {
((EntityPlayer)event.entityLiving).getFoodStats().addStats(1, 0);
}
}
if (event.entityLiving.getActivePotionEffect(Potions.nourishment.get()).getDuration() == 0)
{
event.entityLiving.removePotionEffect(Potions.nourishment.get().id);
return;
}
}
if (event.entityLiving.isPotionActive(Potions.paralysis.get())) if (event.entityLiving.isPotionActive(Potions.paralysis.get()))
{ {
event.entityLiving.motionX = 0.0; event.entityLiving.motionX = 0.0;

30
src/minecraft/biomesoplenty/potions/PotionNourishment.java
View File

@ -1,30 +0,0 @@
package biomesoplenty.potions;
import net.minecraft.client.Minecraft;
import net.minecraft.client.resources.ResourceLocation;
import net.minecraft.potion.Potion;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class PotionNourishment extends Potion
{
public PotionNourishment(int par1, boolean par2, int par3)
{
super(par1, par2, par3);
this.setIconIndex(0, 0);
}
@Override
@SideOnly(Side.CLIENT)
public int getStatusIconIndex()
{
Minecraft.getMinecraft().renderEngine.func_110577_a(new ResourceLocation("biomesoplenty:textures/potions/BOPPotionFX.png"));
return 0;
}
@Override
public boolean isReady(int par1, int par2)
{
return par1 >= 1;
}
}