AttackEntityEvent

Author: coderbot16

patchwork-events-entity/build.gradle

@@ -3,4 +3,5 @@ version = getSubprojectVersion(project, "0.1.0")
 
 dependencies {
 	compile project(path: ':patchwork-fml', configuration: 'dev')
+	compile project(path: ':patchwork-extensions-item', configuration: 'dev')
 }

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

@@ -20,6 +20,7 @@
 package com.patchworkmc.impl.event.entity;
 
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.common.extensions.IForgeItem;
 import net.minecraftforge.event.entity.EntityEvent;
 import net.minecraftforge.event.entity.EntityJoinWorldEvent;
 import net.minecraftforge.event.entity.living.LivingAttackEvent;
@@ -30,6 +31,7 @@
 import net.minecraftforge.event.entity.living.LivingSpawnEvent;
 import net.minecraftforge.event.entity.living.LivingEvent;
 import net.minecraftforge.event.entity.living.LivingFallEvent;
+import net.minecraftforge.event.entity.player.AttackEntityEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.event.entity.player.PlayerFlyableFallEvent;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
@@ -46,6 +48,7 @@
 import net.minecraft.entity.damage.DamageSource;
 import net.minecraft.entity.mob.MobEntity;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
@@ -140,7 +143,8 @@ public static boolean canEntitySpawnFromSpawner(MobEntity entity, World world, d
 		Result result = canEntitySpawn(entity, world, x, y, z, spawner, SpawnType.SPAWNER);
 
 		if (result == Result.DEFAULT) {
-			return entity.canSpawn(world, SpawnType.SPAWNER) && entity.canSpawn(world); //vanilla logic, but inverted since we're checking if it CAN spawn instead of if it CAN'T
+			// Vanilla logic, but inverted since we're checking if it CAN spawn instead of if it CAN'T
+			return entity.canSpawn(world, SpawnType.SPAWNER) && entity.canSpawn(world);
 		} else {
 			return result == Result.ALLOW;
 		}
@@ -150,7 +154,8 @@ public static boolean canEntitySpawnNaturally(MobEntity entity, IWorld world, do
 		Result result = canEntitySpawn(entity, world, x, y, z, spawner, spawnType);
 
 		if (result == Result.DEFAULT) {
-			return !(sqDistanceFromPlayer > 16384.0D && entity.canImmediatelyDespawn(sqDistanceFromPlayer)) && entity.canSpawn(world, SpawnType.NATURAL) && entity.canSpawn(world); //vanilla logic, but inverted since we're checking if it CAN spawn instead of if it CAN'T
+			// Vanilla logic, but inverted since we're checking if it CAN spawn instead of if it CAN'T
+			return !(sqDistanceFromPlayer > 16384.0D && entity.canImmediatelyDespawn(sqDistanceFromPlayer)) && entity.canSpawn(world, SpawnType.NATURAL) && entity.canSpawn(world);
 		} else {
 			return result == Result.ALLOW;
 		}
@@ -160,6 +165,22 @@ public static boolean doSpecialSpawn(MobEntity entity, IWorld world, double x, d
 		return MinecraftForge.EVENT_BUS.post(new LivingSpawnEvent.SpecialSpawn(entity, world, x, y, z, spawner, spawnType));
 	}
 
+	public static boolean attackEntity(PlayerEntity player, Entity target) {
+		if (MinecraftForge.EVENT_BUS.post(new AttackEntityEvent(player, target))) {
+			return false;
+		}
+
+		ItemStack stack = player.getMainHandStack();
+
+		if (stack.isEmpty()) {
+			return true;
+		}
+
+		IForgeItem item = (IForgeItem) stack.getItem();
+
+		return !item.onLeftClickEntity(stack, player, target);
+	}
+
 	@Override
 	public void onInitialize() {
 		UseItemCallback.EVENT.register((player, world, hand) -> {

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

@@ -119,4 +119,13 @@ private float hookApplyDamageForDamageEvent(float damage, DamageSource source) {
 
 		return EntityEvents.onLivingDamage(entity, source, damage);
 	}
+
+	@Inject(method = "attack(Lnet/minecraft/entity/Entity;)V", at = @At("HEAD"), cancellable = true)
+	private void onAttackEntity(Entity target, CallbackInfo callback) {
+		PlayerEntity player = (PlayerEntity) (Object) this;
+
+		if (!EntityEvents.attackEntity(player, target)) {
+			callback.cancel();
+		}
+	}
 }

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

@@ -36,7 +36,7 @@
  * <p>This event is cancellable.
  * If this event is cancelled, the {@link LivingEntity} does not take fall damage.</p>
  *
- * <p>This event is fired on the {@link MinecraftForge#EVENT_BUS}.</p>
+ * <p>This event is fired on the {@link net.minecraftforge.common.MinecraftForge#EVENT_BUS}.</p>
  */
 public class LivingFallEvent extends LivingEvent {
 	private float distance;

patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/player/AttackEntityEvent.java

@@ -0,0 +1,63 @@
+/*
+ * 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.player;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.PlayerEntity;
+
+/**
+ * AttackEntityEvent is fired when a player attacks an Entity.
+ *
+ * <p>This event is fired whenever a player attacks an Entity in
+ * {@link PlayerEntity#attack(Entity)} on either the client or the server.
+ *
+ * <p>This event is cancellable.
+ * If this event is canceled, the player does not attack the Entity.
+ *
+ * <p>This event is fired on the {@link net.minecraftforge.common.MinecraftForge#EVENT_BUS}.
+ */
+public class AttackEntityEvent extends PlayerEvent {
+	private final Entity target;
+
+	// For EventBus
+	public AttackEntityEvent() {
+		super();
+
+		this.target = null;
+	}
+
+	public AttackEntityEvent(PlayerEntity player, Entity target) {
+		super(player);
+
+		this.target = target;
+	}
+
+	/**
+	 * @return the {@link Entity} that was damaged by the player.
+	 */
+	public Entity getTarget() {
+		return target;
+	}
+
+	@Override
+	public boolean isCancelable() {
+		return true;
+	}
+}

patchwork-events-entity/src/main/resources/fabric.mod.json

@@ -18,7 +18,8 @@
   "depends": {
     "fabricloader": ">=0.4.0",
     "fabric": "*",
-    "patchwork-fml": "*"
+    "patchwork-fml": "*",
+    "patchwork-extensions-item": "*"
   },
   "mixins": [
     "patchwork-events-entity.mixins.json"

patchwork-extensions-item/README.md

@@ -62,9 +62,6 @@ Patches: **LivingEntity**
 Forge classes: IForgeItemStack  
 void onUsingTick(ItemStack stack, LivingEntity player, int count)
 
-Forge classes: ForgeHooks  
-boolean onLeftClickEntity(ItemStack stack, PlayerEntity player, Entity entity)
-
 Patches: **BannerDuplicateRecipe**, **BookCloningRecipe**, **Recipe**, **BrewingStandBlockEntity**, **AbstractFurnaceBlockEntity**  
 Forge classes: IForgeItemStack, ForgeHooks  
 ItemStack getContainerItem(ItemStack itemStack)

patchwork-extensions-item/src/main/java/net/minecraftforge/common/extensions/IForgeItem.java

@@ -194,7 +194,6 @@ default boolean onBlockStartBreak(ItemStack itemstack, BlockPos pos, PlayerEntit
 	default void onUsingTick(ItemStack stack, LivingEntity player, int count) {
 	}
 
-	// TODO: Call locations: Forge classes: ForgeHooks
 	/**
 	 * Called when the player Left Clicks (attacks) an entity. Processed before
 	 * damage is done, if return value is true further processing is canceled and