From f72606f44cab06c5ffded49a0d75b602dae6b654 Mon Sep 17 00:00:00 2001 From: JAWolfe04 Date: Sat, 30 Jan 2016 21:33:23 -0600 Subject: [PATCH] Fix player damage and health potions Vanilla player damage and health potions are scaled to TFC health --- build.prop | 2 +- builds/[1.7.10]TerraFirmaPunkTweaks-1.01.jar | Bin 6339 -> 0 bytes builds/[1.7.10]TerraFirmaPunkTweaks-1.02.jar | Bin 0 -> 6744 bytes ...1.7.10]TerraFirmaPunkTweaks-deobf-1.01.jar | Bin 6119 -> 0 bytes ...1.7.10]TerraFirmaPunkTweaks-deobf-1.02.jar | Bin 0 -> 6517 bytes ...[1.7.10]TerraFirmaPunkTweaks-src-1.02.jar} | Bin 3896 -> 4079 bytes .../com/onewolfe/tfptweaks/PlayerHandler.java | 23 ++++++++++++++++++ 7 files changed, 24 insertions(+), 1 deletion(-) delete mode 100644 builds/[1.7.10]TerraFirmaPunkTweaks-1.01.jar create mode 100644 builds/[1.7.10]TerraFirmaPunkTweaks-1.02.jar delete mode 100644 builds/[1.7.10]TerraFirmaPunkTweaks-deobf-1.01.jar create mode 100644 builds/[1.7.10]TerraFirmaPunkTweaks-deobf-1.02.jar rename builds/{[1.7.10]TerraFirmaPunkTweaks-src-1.01.jar => [1.7.10]TerraFirmaPunkTweaks-src-1.02.jar} (70%) diff --git a/build.prop b/build.prop index afd0d40..bd577f6 100644 --- a/build.prop +++ b/build.prop @@ -1,6 +1,6 @@ minecraft_version=1.7.10 forge_version=10.13.4.1558-1.7.10 tfc_version=0.79.27 -mod_version=1.01 +mod_version=1.02 mod_id=TerraFirmaPunkTweaks group_name=com.onewolfe.tfptweaks \ No newline at end of file diff --git a/builds/[1.7.10]TerraFirmaPunkTweaks-1.01.jar b/builds/[1.7.10]TerraFirmaPunkTweaks-1.01.jar deleted file mode 100644 index ecc4411586f559648e135b4427502996241a7620..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6339 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 vj&Y*jivE5@{Z;gs<0X|)Y& diff --git a/builds/[1.7.10]TerraFirmaPunkTweaks-1.02.jar b/builds/[1.7.10]TerraFirmaPunkTweaks-1.02.jar new file mode 100644 index 0000000000000000000000000000000000000000..02e346efb98df6c61b1cf862d29dd17947e366fb GIT binary patch literal 6744 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 literal 0 HcmV?d00001 diff --git a/builds/[1.7.10]TerraFirmaPunkTweaks-deobf-1.01.jar b/builds/[1.7.10]TerraFirmaPunkTweaks-deobf-1.01.jar deleted file mode 100644 index 28f5340aa50dde39d86631d72c1d192de8b633f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6119 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

hlv_b8D<)kh|^iP;S<;4 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 diff --git a/src/main/java/com/onewolfe/tfptweaks/PlayerHandler.java b/src/main/java/com/onewolfe/tfptweaks/PlayerHandler.java index 91ecc2c..98d63ef 100644 --- a/src/main/java/com/onewolfe/tfptweaks/PlayerHandler.java +++ b/src/main/java/com/onewolfe/tfptweaks/PlayerHandler.java @@ -5,11 +5,15 @@ import java.util.Random; import com.bioxx.tfc.api.TFCBlocks; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.DamageSource; +import net.minecraftforge.event.entity.living.LivingHealEvent; +import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; public class PlayerHandler @@ -33,4 +37,23 @@ public class PlayerHandler player.inventory.addItemStackToInventory(new ItemStack(TFCBlocks.chest, 1, 0)); } } + + @SubscribeEvent + public void onDamaged(LivingHurtEvent event) + { + if(event.ammount <= 20 && event.entity instanceof EntityPlayer) + { + event.ammount = event.ammount * 50; + + if(event.source == DamageSource.magic && (event.entityLiving.getHealth() - event.ammount) <= 0) + event.setCanceled(true); + } + } + + @SubscribeEvent + public void onHeal(LivingHealEvent event) + { + if(event.amount > 1 && event.amount < 9) + event.amount = event.amount * 50; + } }