imports/architectury-api
1
0
Fork 0
mirror of https://github.com/architectury/architectury-api.git synced 2026-03-28 03:56:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add PlayerEvent.ATTACK_ENTITY (#380)

Browse Source 
[ci skip]

* Add PlayerEvent.ATTACK_ENTITY
* Fired from Forge's AttackEntityEvent and Fabric's AttackEntityCallback
* When player is about to attack any entity (not just living) with left-click
* javadoc parameter alignment
* import cleanup
This commit is contained in:
desht
2023-02-06 16:53:43 +00:00
committed by GitHub
parent d022087cd5
commit 1524550146
3 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
common/src/main/java/dev/architectury/event/events/common/PlayerEvent.java
View File

@@ -27,11 +27,14 @@ import net.minecraft.advancements.Advancement;
import net.minecraft.resources.ResourceKey;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.Container;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.item.ItemEntity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.inventory.AbstractContainerMenu;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import net.minecraft.world.phys.EntityHitResult;
import net.minecraft.world.phys.HitResult;
import org.jetbrains.annotations.Nullable;
@@ -92,6 +95,10 @@ public interface PlayerEvent {
* @see FillBucket#fill(Player, Level, ItemStack, HitResult)
*/
Event<FillBucket> FILL_BUCKET = EventFactory.createCompoundEventResult();
/**
* @see AttackEntity#attack(Player, Level, Entity, InteractionHand, EntityHitResult)
*/
Event<AttackEntity> ATTACK_ENTITY = EventFactory.createEventResult();
interface PlayerJoin {
/**
@@ -262,4 +269,20 @@ public interface PlayerEvent {
*/
CompoundEventResult<ItemStack> fill(Player player, Level level, ItemStack stack, @Nullable HitResult target);
}
interface AttackEntity {
/**
* Invoked when a player is about to attack an entity using left-click.
* Equivalent to Forge's {@code AttackEntityEvent} and Fabric API's {@code AttackEntityCallback} events.
*
* @param player The player attacking the entity.
* @param level The level the player is in.
* @param target The entity about to be attacked.
* @param hand The hand the player is using.
* @param result The entity hit result.
* @return An {@link EventResult} determining the outcome of the event,
* the attack may be cancelled by the result.
*/
EventResult attack(Player player, Level level, Entity target, InteractionHand hand, @Nullable EntityHitResult result);
}
}

2
fabric/src/main/java/dev/architectury/event/fabric/EventHandlerImpl.java
View File

@@ -35,6 +35,7 @@ import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents;
import net.fabricmc.fabric.api.event.player.AttackBlockCallback;
import net.fabricmc.fabric.api.event.player.AttackEntityCallback;
import net.fabricmc.fabric.api.event.player.UseBlockCallback;
import net.fabricmc.fabric.api.event.player.UseItemCallback;
import net.fabricmc.fabric.api.loot.v2.LootTableEvents;
@@ -74,6 +75,7 @@ public class EventHandlerImpl {
UseItemCallback.EVENT.register((player, world, hand) -> InteractionEvent.RIGHT_CLICK_ITEM.invoker().click(player, hand).asMinecraft());
UseBlockCallback.EVENT.register((player, world, hand, hitResult) -> InteractionEvent.RIGHT_CLICK_BLOCK.invoker().click(player, hand, hitResult.getBlockPos(), hitResult.getDirection()).asMinecraft());
AttackBlockCallback.EVENT.register((player, world, hand, pos, face) -> InteractionEvent.LEFT_CLICK_BLOCK.invoker().click(player, hand, pos, face).asMinecraft());
AttackEntityCallback.EVENT.register((player, world, hand, entity, hitResult) -> PlayerEvent.ATTACK_ENTITY.invoker().attack(player, world, entity, hand, hitResult).asMinecraft());
LootTableEvents.MODIFY.register((resourceManager, lootManager, id, tableBuilder, source) -> LootEvent.MODIFY_LOOT_TABLE.invoker().modifyLootTable(lootManager, id, new LootTableModificationContextImpl(tableBuilder), source.isBuiltin()));
}

8
forge/src/main/java/dev/architectury/event/forge/EventHandlerImplCommon.java
View File

@@ -431,6 +431,14 @@ public class EventHandlerImplCommon {
LootEvent.MODIFY_LOOT_TABLE.invoker().modifyLootTable(event.getLootTableManager(), event.getName(), new LootTableModificationContextImpl(event.getTable()), true);
}
@SubscribeEvent(priority = EventPriority.HIGH)
public static void event(AttackEntityEvent event) {
EventResult result = PlayerEvent.ATTACK_ENTITY.invoker().attack(event.getPlayer(), event.getPlayer().level, event.getTarget(), event.getPlayer().getUsedItemHand(), null);
if (result.isFalse()) {
event.setCanceled(true);
}
}
public interface WorldEventAttachment {
LevelAccessor architectury$getAttachedLevel();