Implement LivingDamageEvent.

Author: kitlith

patchwork-events-entity/src/main/java/com/patchworkmc/impl/event/entity/EntityEvents.java

@@ -25,6 +25,7 @@
 import net.minecraftforge.event.entity.living.LivingSetAttackTargetEvent;
 import net.minecraftforge.event.entity.living.LivingDeathEvent;
 import net.minecraftforge.event.entity.living.LivingHurtEvent;
+import net.minecraftforge.event.entity.living.LivingDamageEvent;
 import net.minecraftforge.event.entity.living.LivingSpawnEvent;
 import net.minecraftforge.event.entity.living.LivingEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent;
@@ -92,6 +93,11 @@ public static float onLivingHurt(LivingEntity entity, DamageSource src, float da
 		return MinecraftForge.EVENT_BUS.post(event) ? 0 : event.getAmount();
 	}
 
+	public static float onLivingDamage(LivingEntity entity, DamageSource src, float damage) {
+		LivingDamageEvent event = new LivingDamageEvent(entity, src, damage);
+		return MinecraftForge.EVENT_BUS.post(event) ? 0 : event.getAmount();
+	}
+
 	public static Result canEntitySpawn(MobEntity entity, IWorld world, double x, double y, double z, MobSpawnerLogic spawner, SpawnType spawnType) {
 		if (entity == null) {
 			return Result.DEFAULT;

patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinLivingEntity.java

@@ -75,4 +75,13 @@ private void hookApplyDamageForHurtEventCancel(DamageSource source, float damage
 			info.cancel();
 		}
 	}
+
+	// No shift, because we are specifically not modifying the value for this function call.
+	// TODO: Forge patches a bit later into the function here, being inconsistent with their patch for PlayerEntity. For the moment, I don't feel like finding an injection point for that, and this may be a Forge bug?
+	@ModifyVariable(method = "applyDamage", argsOnly = true, at = @At(value = "INVOKE", target = "net/minecraft/entity/LivingEntity.setAbsorptionAmount (F)V", ordinal = 0))
+	private float hookApplyDamageForDamageEvent(float damage, DamageSource source) {
+		LivingEntity entity = (LivingEntity) (Object) this;
+
+		return EntityEvents.onLivingDamage(entity, source, damage);
+	}
 }

patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinPlayerEntity.java

@@ -98,4 +98,12 @@ private void hookApplyDamageForHurtEventCancel(DamageSource source, float damage
 			info.cancel();
 		}
 	}
+
+	// No shift, because we are specifically not modifying the value for this function call.
+	@ModifyVariable(method = "applyDamage", argsOnly = true, at = @At(value = "INVOKE", target = "net/minecraft/entity/player/PlayerEntity.setAbsorptionAmount (F)V", ordinal = 0))
+	private float hookApplyDamageForDamageEvent(float damage, DamageSource source) {
+		LivingEntity entity = (LivingEntity) (Object) this;
+
+		return EntityEvents.onLivingDamage(entity, source, damage);
+	}
 }

patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingDamageEvent.java

@@ -0,0 +1,66 @@
+/*
+ * Minecraft Forge, Patchwork Project
+ * Copyright (c) 2016-2020, 2019-2020
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation version 2.1
+ * of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package net.minecraftforge.event.entity.living;
+
+import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.entity.LivingEntity;
+
+/**
+ * LivingDamageEvent is fired just before damage is applied to entity.
+ *
+ * <p>At this point armor, potion and absorption modifiers have already been applied to damage - this is FINAL value.</p>
+ * <p>Also note that appropriate resources (like armor durability and absorption extra hearths) have already been consumed.</p>
+ * <p>This event is fired whenever an Entity is damaged in
+ * {@link LivingEntity#applyDamage(DamageSource, float)} and
+ * {@link net.minecraft.entity.player.PlayerEntity#applyDamage(DamageSource, float)}.</p>
+ *
+ * <p>This event is fired via the {@link com.patchworkmc.impl.event.entity.EntityEvents#onLivingDamage(LivingEntity, DamageSource, float)}.</p>
+ *
+ * <p>{@link #source} contains the DamageSource that caused this Entity to be hurt. </p>
+ * <p>{@link #amount} contains the final amount of damage that will be dealt to entity. </p>
+ *
+ * <p>This event is cancelable.</p>
+ * <p>If this event is canceled, the Entity is not hurt. Used resources WILL NOT be restored.</p>
+ *
+ * <p>This event does not have a result.</p>
+ * @see LivingHurtEvent
+ */
+public class LivingDamageEvent extends LivingEvent {
+	private final DamageSource source;
+	private float amount;
+
+	public LivingDamageEvent(LivingEntity entity, DamageSource source, float amount) {
+		super(entity);
+		this.source = source;
+		this.amount = amount;
+	}
+
+	public DamageSource getSource() {
+		return source;
+	}
+
+	public float getAmount() {
+		return amount;
+	}
+
+	public void setAmount(float amount) {
+		this.amount = amount;
+	}
+}