lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bucket recipe fix and Creative Sacrificial Dagger fix (#827)

Browse source 
* Bucket recipe fix and Creative Sacrificial Dagger fix

* Do #808

* Add a Sacrificial Dagger conversion config

* Put the conversion everywhere
This commit is contained in:
Arcaratus 2016-06-28 11:55:58 -04:00 • committed by WayofTime
parent 81a5e3c956
commit 81d7cd4093
5 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java
View file

@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import WayofTime.bloodmagic.ConfigHandler;
import WayofTime.bloodmagic.client.IMeshProvider;
import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
@ -105,7 +106,7 @@ public class ItemSacrificialDagger extends Item implements IMeshProvider
return new ActionResult<ItemStack>(EnumActionResult.SUCCESS, stack);
}
int lpAdded = 200;
int lpAdded = getMetadata(stack) == 1 ? Integer.MAX_VALUE : ConfigHandler.sacrificialDaggerConversion * ConfigHandler.sacrificialDaggerDamage;
RayTraceResult rayTrace = rayTrace(world, player, false);
if (rayTrace != null && rayTrace.typeOfHit == RayTraceResult.Type.BLOCK)
@ -118,7 +119,7 @@ public class ItemSacrificialDagger extends Item implements IMeshProvider
if (!player.capabilities.isCreativeMode)
{
SacrificeKnifeUsedEvent evt = new SacrificeKnifeUsedEvent(player, true, true, 2, lpAdded);
SacrificeKnifeUsedEvent evt = new SacrificeKnifeUsedEvent(player, true, true, ConfigHandler.sacrificialDaggerDamage, lpAdded);
if (MinecraftForge.EVENT_BUS.post(evt))
return super.onItemRightClick(stack, world, player, hand);
@ -126,7 +127,7 @@ public class ItemSacrificialDagger extends Item implements IMeshProvider
{
player.hurtResistantTime = 0;
player.attackEntityFrom(BloodMagicAPI.getDamageSource(), 0.001F);
player.setHealth(Math.max(player.getHealth() - 2, 0.0001f));
player.setHealth(Math.max(player.getHealth() - ConfigHandler.sacrificialDaggerDamage, 0.0001f));
if (player.getHealth() <= 0.001f)
{
player.onDeath(BloodMagicAPI.getDamageSource());