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

Added WoS reagent use, general touch ups.

Browse source
This commit is contained in:
WayofTime 2015-04-13 13:10:10 -04:00
parent efa5d89539
commit f2b4f3db9e
11 changed files with 166 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java
View file

@ -105,8 +105,13 @@ public class AlchemicalWizardryEventHooks
@SubscribeEvent(priority=EventPriority.HIGHEST)
public void onLivingHurtEvent(LivingHurtEvent event)
{
System.out.println("IsRemote: " + event.entity.worldObj.isRemote);
if(!event.isCanceled() && event.entityLiving instanceof EntityPlayer && !event.entityLiving.worldObj.isRemote)
{
if(event.entityLiving.getHealth() > event.entityLiving.getMaxHealth())
{
event.entityLiving.setHealth(event.entityLiving.getMaxHealth());
}
EntityPlayer player = (EntityPlayer)event.entityLiving;
float prevHp = APISpellHelper.getCurrentAdditionalHP((EntityPlayer)event.entityLiving);
@ -155,7 +160,7 @@ public class AlchemicalWizardryEventHooks
if(event.ammount <= 0.3)
{
if(rand.nextInt(10) == 0)
// if(rand.nextInt(10) == 0)
{
event.ammount++;
}
@ -216,6 +221,13 @@ public class AlchemicalWizardryEventHooks
}
}
}
}else
{
reagentAmount = 0;
APISpellHelper.setPlayerMaxReagentAmount(player, 0);
NewPacketHandler.INSTANCE.sendTo(NewPacketHandler.getReagentBarPacket(null, 0, 0), (EntityPlayerMP)player);
APISpellHelper.setCurrentAdditionalHP(player, 0);
NewPacketHandler.INSTANCE.sendTo(NewPacketHandler.getAddedHPPacket(0, 0), (EntityPlayerMP)player);
}
//Consumes the amount
float costPerTick = parad.getCostPerTickOfUse(player);
@ -238,14 +250,22 @@ public class AlchemicalWizardryEventHooks
if(reagentAmount <= 0)
{
boolean hasRevertedArmour = false;
ItemStack[] armourInventory = player.inventory.armorInventory;
for(ItemStack stack : armourInventory)
{
if(stack != null && stack.getItem() instanceof OmegaArmour)
{
((OmegaArmour)stack.getItem()).revertArmour(player, stack);
hasRevertedArmour = true;
}
}
if(hasRevertedArmour)
{
APISpellHelper.setCurrentAdditionalHP(player, 0);
NewPacketHandler.INSTANCE.sendTo(NewPacketHandler.getAddedHPPacket(0, 0), (EntityPlayerMP)player);
}
}
if(player instanceof EntityPlayerMP)