--- ../src-base/minecraft/net/minecraft/entity/EntityLivingBase.java +++ ../src-work/minecraft/net/minecraft/entity/EntityLivingBase.java @@ -199,10 +199,11 @@ { float f = (float)MathHelper.func_76123_f(this.field_70143_R - 3.0F); - if (p_184231_4_.func_185904_a() != Material.field_151579_a) + if (!p_184231_4_.func_177230_c().isAir(p_184231_4_, field_70170_p, p_184231_5_)) { double d0 = Math.min((double)(0.2F + f / 15.0F), 2.5D); int i = (int)(150.0D * d0); + if (!p_184231_4_.func_177230_c().addLandingEffects(p_184231_4_, (WorldServer)this.field_70170_p, p_184231_5_, p_184231_4_, this, i)) ((WorldServer)this.field_70170_p).func_175739_a(EnumParticleTypes.BLOCK_DUST, this.field_70165_t, this.field_70163_u, this.field_70161_v, i, 0.0D, 0.0D, 0.0D, 0.15000000596046448D, new int[] {Block.func_176210_f(p_184231_4_)}); } } @@ -279,7 +280,7 @@ } } - if (!this.field_70170_p.field_72995_K && this.func_184218_aH() && this.func_184187_bx() instanceof EntityLivingBase) + if (!this.field_70170_p.field_72995_K && this.func_184218_aH() && this.func_184187_bx() != null && this.func_184187_bx().shouldDismountInWater(this)) { this.func_184210_p(); } @@ -378,7 +379,7 @@ if (!this.field_70170_p.field_72995_K && (this.func_70684_aJ() || this.field_70718_bc > 0 && this.func_146066_aG() && this.field_70170_p.func_82736_K().func_82766_b("doMobLoot"))) { int i = this.func_70693_a(this.field_70717_bb); - + i = net.minecraftforge.event.ForgeEventFactory.getExperienceDrop(this, this.field_70717_bb, i); while (i > 0) { int j = EntityXPOrb.func_70527_a(i); @@ -440,6 +441,7 @@ { this.field_70755_b = p_70604_1_; this.field_70756_c = this.field_70173_aa; + net.minecraftforge.common.ForgeHooks.onLivingSetAttackTarget(this, p_70604_1_); } public EntityLivingBase func_110144_aD() @@ -812,6 +814,8 @@ public void func_70691_i(float p_70691_1_) { + p_70691_1_ = net.minecraftforge.event.ForgeEventFactory.onLivingHeal(this, p_70691_1_); + if (p_70691_1_ <= 0) return; float f = this.func_110143_aJ(); if (f > 0.0F) @@ -832,6 +836,7 @@ public boolean func_70097_a(DamageSource p_70097_1_, float p_70097_2_) { + if (!net.minecraftforge.common.ForgeHooks.onLivingAttack(this, p_70097_1_, p_70097_2_)) return false; if (this.func_180431_b(p_70097_1_)) { return false; @@ -918,9 +923,9 @@ this.field_70718_bc = 100; this.field_70717_bb = (EntityPlayer)entity1; } - else if (entity1 instanceof EntityWolf) + else if (entity1 instanceof net.minecraft.entity.passive.EntityTameable) { - EntityWolf entitywolf = (EntityWolf)entity1; + net.minecraft.entity.passive.EntityTameable entitywolf = (net.minecraft.entity.passive.EntityTameable)entity1; if (entitywolf.func_70909_n()) { @@ -1107,6 +1112,7 @@ public void func_70645_a(DamageSource p_70645_1_) { + if (net.minecraftforge.common.ForgeHooks.onLivingDeath(this, p_70645_1_)) return; if (!this.field_70729_aU) { Entity entity = p_70645_1_.func_76346_g(); @@ -1127,18 +1133,26 @@ if (!this.field_70170_p.field_72995_K) { - int i = 0; + int i = net.minecraftforge.common.ForgeHooks.getLootingLevel(this, entity, p_70645_1_); - if (entity instanceof EntityPlayer) - { - i = EnchantmentHelper.func_185283_h((EntityLivingBase)entity); - } + captureDrops = true; + capturedDrops.clear(); if (this.func_146066_aG() && this.field_70170_p.func_82736_K().func_82766_b("doMobLoot")) { boolean flag = this.field_70718_bc > 0; this.func_184610_a(flag, i, p_70645_1_); } + + captureDrops = false; + + if (!net.minecraftforge.common.ForgeHooks.onLivingDrops(this, p_70645_1_, capturedDrops, i, field_70718_bc > 0)) + { + for (EntityItem item : capturedDrops) + { + field_70170_p.func_72838_d(item); + } + } } this.field_70170_p.func_72960_a(this, (byte)3); @@ -1215,7 +1229,7 @@ BlockPos blockpos = new BlockPos(i, j, k); IBlockState iblockstate = this.field_70170_p.func_180495_p(blockpos); Block block = iblockstate.func_177230_c(); - return block != Blocks.field_150468_ap && block != Blocks.field_150395_bd ? block instanceof BlockTrapDoor && this.func_184604_a(blockpos, iblockstate) : true; + return net.minecraftforge.common.ForgeHooks.isLivingOnLadder(iblockstate, field_70170_p, new BlockPos(i, j, k), this); } } @@ -1241,6 +1255,9 @@ public void func_180430_e(float p_180430_1_, float p_180430_2_) { + float[] ret = net.minecraftforge.common.ForgeHooks.onLivingFall(this, p_180430_1_, p_180430_2_); + if (ret == null) return; + p_180430_1_ = ret[0]; p_180430_2_ = ret[1]; super.func_180430_e(p_180430_1_, p_180430_2_); PotionEffect potioneffect = this.func_70660_b(MobEffects.field_76430_j); float f = potioneffect == null ? 0.0F : (float)(potioneffect.func_76458_c() + 1); @@ -1257,7 +1274,7 @@ if (iblockstate.func_185904_a() != Material.field_151579_a) { - SoundType soundtype = iblockstate.func_177230_c().func_185467_w(); + SoundType soundtype = iblockstate.func_177230_c().getSoundType(iblockstate, field_70170_p, new BlockPos(j, k, l), this); this.func_184185_a(soundtype.func_185842_g(), soundtype.func_185843_a() * 0.5F, soundtype.func_185847_b() * 0.75F); } } @@ -1334,6 +1351,8 @@ { if (!this.func_180431_b(p_70665_1_)) { + p_70665_2_ = net.minecraftforge.common.ForgeHooks.onLivingHurt(this, p_70665_1_, p_70665_2_); + if (p_70665_2_ <= 0) return; p_70665_2_ = this.func_70655_b(p_70665_1_, p_70665_2_); p_70665_2_ = this.func_70672_c(p_70665_1_, p_70665_2_); float f = p_70665_2_; @@ -1383,6 +1402,11 @@ public void func_184609_a(EnumHand p_184609_1_) { + ItemStack stack = this.func_184586_b(p_184609_1_); + if (stack != null && stack.func_77973_b() != null) + { + if (stack.func_77973_b().onEntitySwing(this, stack)) return; + } if (!this.field_82175_bq || this.field_110158_av >= this.func_82166_i() / 2 || this.field_110158_av < 0) { this.field_110158_av = -1; @@ -1613,7 +1637,7 @@ if (!this.field_70170_p.func_184143_b(axisalignedbb1)) { - if (this.field_70170_p.func_180495_p(new BlockPos(d11, this.field_70163_u, d12)).func_185896_q()) + if (this.field_70170_p.func_180495_p(new BlockPos(d11, this.field_70163_u, d12)).isSideSolid(field_70170_p, new BlockPos(d11, this.field_70163_u, d12), EnumFacing.UP)) { this.func_70634_a(d11, this.field_70163_u + 1.0D, d12); return; @@ -1621,14 +1645,14 @@ BlockPos blockpos = new BlockPos(d11, this.field_70163_u - 1.0D, d12); - if (this.field_70170_p.func_180495_p(blockpos).func_185896_q() || this.field_70170_p.func_180495_p(blockpos).func_185904_a() == Material.field_151586_h) + if (this.field_70170_p.func_180495_p(blockpos).isSideSolid(field_70170_p, blockpos, EnumFacing.UP) || this.field_70170_p.func_180495_p(blockpos).func_185904_a() == Material.field_151586_h) { d1 = d11; d13 = this.field_70163_u + 1.0D; d14 = d12; } } - else if (!this.field_70170_p.func_184143_b(axisalignedbb1.func_72317_d(0.0D, 1.0D, 0.0D)) && this.field_70170_p.func_180495_p(new BlockPos(d11, this.field_70163_u + 1.0D, d12)).func_185896_q()) + else if (!this.field_70170_p.func_184143_b(axisalignedbb1.func_72317_d(0.0D, 1.0D, 0.0D)) && this.field_70170_p.func_180495_p(new BlockPos(d11, this.field_70163_u + 1.0D, d12)).isSideSolid(field_70170_p, new BlockPos(d11, this.field_70163_u + 1.0D, d12), EnumFacing.UP)) { d1 = d11; d13 = this.field_70163_u + 2.0D; @@ -1700,6 +1724,7 @@ } this.field_70160_al = true; + net.minecraftforge.common.ForgeHooks.onLivingJump(this); } protected void func_70629_bd() @@ -1972,6 +1997,7 @@ public void func_70071_h_() { + if (net.minecraftforge.common.ForgeHooks.onLivingUpdate(this)) return; super.func_70071_h_(); this.func_184608_ct(); @@ -2488,6 +2514,40 @@ this.field_70752_e = true; } + /*** + * Removes all potion effects that have curativeItem as a curative item for its effect + * @param curativeItem The itemstack we are using to cure potion effects + */ + public void curePotionEffects(ItemStack curativeItem) + { + if (field_70170_p.field_72995_K) return; + Iterator iterator = this.field_70713_bf.values().iterator(); + + while (iterator.hasNext()) + { + PotionEffect effect = iterator.next(); + + if (effect.isCurativeItem(curativeItem)) + { + func_70688_c(effect); + iterator.remove(); + this.field_70752_e = true; + } + } + } + + /** + * Returns true if the entity's rider (EntityPlayer) should face forward when mounted. + * currently only used in vanilla code by pigs. + * + * @param player The player who is riding the entity. + * @return If the player should orient the same direction as this entity. + */ + public boolean shouldRiderFaceForward(EntityPlayer player) + { + return this instanceof net.minecraft.entity.passive.EntityPig; + } + public abstract EnumHandSide func_184591_cq(); public boolean func_184587_cr() @@ -2508,12 +2568,19 @@ if (itemstack == this.field_184627_bm) { + if (this.field_184627_bm != null) + { + field_184628_bn = net.minecraftforge.event.ForgeEventFactory.onItemUseTick(this, field_184627_bm, field_184628_bn); + if (field_184628_bn > 0) + field_184627_bm.func_77973_b().onUsingTick(field_184627_bm, this, field_184628_bn); + } + if (this.func_184605_cv() <= 25 && this.func_184605_cv() % 4 == 0) { this.func_184584_a(this.field_184627_bm, 5); } - if (--this.field_184628_bn == 0 && !this.field_70170_p.field_72995_K) + if (--this.field_184628_bn <= 0 && !this.field_70170_p.field_72995_K) { this.func_71036_o(); } @@ -2531,8 +2598,10 @@ if (!itemstack.func_190926_b() && !this.func_184587_cr()) { + int duration = net.minecraftforge.event.ForgeEventFactory.onItemUseStart(this, itemstack, itemstack.func_77988_m()); + if (duration <= 0) return; this.field_184627_bm = itemstack; - this.field_184628_bn = itemstack.func_77988_m(); + this.field_184628_bn = duration; if (!this.field_70170_p.field_72995_K) { @@ -2613,7 +2682,9 @@ if (!this.field_184627_bm.func_190926_b() && this.func_184587_cr()) { this.func_184584_a(this.field_184627_bm, 16); - this.func_184611_a(this.func_184600_cs(), this.field_184627_bm.func_77950_b(this.field_70170_p, this)); + ItemStack itemstack = this.field_184627_bm.func_77950_b(this.field_70170_p, this); + itemstack = net.minecraftforge.event.ForgeEventFactory.onItemUseFinish(this, field_184627_bm, func_184605_cv(), itemstack); + this.func_184611_a(this.func_184600_cs(), itemstack); this.func_184602_cy(); } } @@ -2637,7 +2708,8 @@ { if (!this.field_184627_bm.func_190926_b()) { - this.field_184627_bm.func_77974_b(this.field_70170_p, this, this.func_184605_cv()); + if (!net.minecraftforge.event.ForgeEventFactory.onUseItemStop(this, field_184627_bm, this.func_184605_cv())) + this.field_184627_bm.func_77974_b(this.field_70170_p, this, this.func_184605_cv()); } this.func_184602_cy(); @@ -2761,4 +2833,29 @@ { return true; } + + // FORGE + private final net.minecraftforge.items.IItemHandlerModifiable handHandler = new net.minecraftforge.items.ItemStackHandler(field_184630_bs); + private final net.minecraftforge.items.IItemHandlerModifiable armorHandler = new net.minecraftforge.items.ItemStackHandler(field_184631_bt); + private final net.minecraftforge.items.IItemHandler joinedHandler = new net.minecraftforge.items.wrapper.CombinedInvWrapper(armorHandler, handHandler); + + @SuppressWarnings("unchecked") + @Override + @Nullable + public T getCapability(net.minecraftforge.common.capabilities.Capability capability, @Nullable net.minecraft.util.EnumFacing facing) + { + if (capability == net.minecraftforge.items.CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) + { + if (facing == null) return (T) joinedHandler; + else if (facing.func_176740_k().func_176720_b()) return (T) handHandler; + else if (facing.func_176740_k().func_176722_c()) return (T) armorHandler; + } + return super.getCapability(capability, facing); + } + + @Override + public boolean hasCapability(net.minecraftforge.common.capabilities.Capability capability, @Nullable net.minecraft.util.EnumFacing facing) + { + return capability == net.minecraftforge.items.CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing); + } }