Skip to content

Commit

Permalink
Feature blocks (#154)
Browse files Browse the repository at this point in the history
* Added Insanity Lava

Signed-off-by: Fi0x <felpech@aol.com>

* Update Branch (#153)

* Feature blocks (#147)

* Added charged and breakable spell
Updated mana tooltips

Signed-off-by: Fi0x <felpech@aol.com>

* Added Mana Altar

Signed-off-by: Fi0x <felpech@aol.com>

* Bug fixes (#150)

* Added insanity blocks to dwarf mining whitelist

Signed-off-by: Fi0x <felpech@aol.com>

* Fixed Demon Summoning Ritual
Corrected name of demon crystal

Signed-off-by: Fi0x <felpech@aol.com>

* Added explosion spell for mage

Signed-off-by: Fi0x <felpech@aol.com>

* Removed ManaWaster
Started work on Mage Attack animation
Updated Todo and polishing lists

Signed-off-by: Fi0x <felpech@aol.com>

* Added mob animation packages for attack and defence animations of mobs

Signed-off-by: Fi0x <felpech@aol.com>

* Improved animation packets for rock troll defence state and synced defence timer

Signed-off-by: Fi0x <felpech@aol.com>

* Fixed Animations for Mage attack and Troll defence

Signed-off-by: Fi0x <felpech@aol.com>

* Bug fixes (#152)

* Added insanity blocks to dwarf mining whitelist

Signed-off-by: Fi0x <felpech@aol.com>

* Fixed Demon Summoning Ritual
Corrected name of demon crystal

Signed-off-by: Fi0x <felpech@aol.com>

* Added explosion spell for mage

Signed-off-by: Fi0x <felpech@aol.com>

* Removed ManaWaster
Started work on Mage Attack animation
Updated Todo and polishing lists

Signed-off-by: Fi0x <felpech@aol.com>

* Added mob animation packages for attack and defence animations of mobs

Signed-off-by: Fi0x <felpech@aol.com>

* Improved animation packets for rock troll defence state and synced defence timer

Signed-off-by: Fi0x <felpech@aol.com>

* Fixed Animations for Mage attack and Troll defence

Signed-off-by: Fi0x <felpech@aol.com>

* Fixed skilltree updating bug

Signed-off-by: Fi0x <felpech@aol.com>

* Corrected Target selection bug with spell and spellstone

Signed-off-by: Fi0x <felpech@aol.com>

* Added weakness and speed effects to insanity water
Removed Insanity lava due to texture bugs

Signed-off-by: Fi0x <felpech@aol.com>
  • Loading branch information
Fi0x authored Oct 29, 2020
1 parent bb83815 commit 0e2293a
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions src/main/java/com/fi0x/deepmagic/blocks/BlockFluid.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,14 @@
import com.fi0x.deepmagic.init.ModItems;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.init.MobEffects;
import net.minecraft.item.ItemBlock;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.EnumBlockRenderType;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fluids.BlockFluidClassic;
import net.minecraftforge.fluids.Fluid;

Expand All @@ -30,4 +36,14 @@ public EnumBlockRenderType getRenderType(@Nonnull IBlockState state)
{
return EnumBlockRenderType.MODEL;
}

@Override
public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn)
{
if(entityIn instanceof EntityLivingBase)
{
((EntityLivingBase) entityIn).addPotionEffect(new PotionEffect(MobEffects.WEAKNESS, 30*20, 0, false, true));
((EntityLivingBase) entityIn).addPotionEffect(new PotionEffect(MobEffects.SPEED, 30*20, 0, false, true));
}
}
}

0 comments on commit 0e2293a

Please sign in to comment.