Change use entity event and fix gui fixes

Author: BlueZeeKing

src/main/java/io/icker/factions/api/events/PlayerEvents.java

@@ -18,22 +18,6 @@
 
 /** Events related to player actions */
 public class PlayerEvents {
-    /** Called when a player tries to interact with an entity */
-    public static final Event<UseEntity> USE_ENTITY =
-            EventFactory.createArrayBacked(
-                    UseEntity.class,
-                    callbacks ->
-                            (source, target, world) -> {
-                                for (UseEntity callback : callbacks) {
-                                    InteractionResult result =
-                                            callback.onUseEntity(source, target, world);
-                                    if (result != InteractionResult.PASS) {
-                                        return result;
-                                    }
-                                }
-                                return InteractionResult.PASS;
-                            });
-
     public static final Event<PlaceBlock> PLACE_BLOCK =
             EventFactory.createArrayBacked(
                     PlaceBlock.class,

src/main/java/io/icker/factions/core/InteractionManager.java

@@ -12,6 +12,7 @@
 import net.fabricmc.fabric.api.event.player.AttackEntityCallback;
 import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents;
 import net.fabricmc.fabric.api.event.player.UseBlockCallback;
+import net.fabricmc.fabric.api.event.player.UseEntityCallback;
 import net.fabricmc.fabric.api.event.player.UseItemCallback;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerPlayer;
@@ -37,6 +38,8 @@
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.EntityHitResult;
 
+import org.jspecify.annotations.Nullable;
+
 public class InteractionManager {
     public static void register() {
         PlayerBlockBreakEvents.BEFORE.register(InteractionManager::onBreakBlock);
@@ -45,8 +48,8 @@ public static void register() {
         UseBlockCallback.EVENT.register(InteractionManager::onUseBlock);
         UseItemCallback.EVENT.register(InteractionManager::onUseBucket);
         AttackEntityCallback.EVENT.register(InteractionManager::onAttackEntity);
+        UseEntityCallback.EVENT.register(InteractionManager::onUseEntity);
         PlayerEvents.IS_INVULNERABLE.register(InteractionManager::isInvulnerableTo);
-        PlayerEvents.USE_ENTITY.register(InteractionManager::onUseEntity);
         PlayerEvents.USE_INVENTORY.register(InteractionManager::onUseInventory);
         PlayerEvents.PLACE_BLOCK.register(InteractionManager::onPlaceBlock);
     }
@@ -199,7 +202,8 @@ private static InteractionResult onUseBucket(Player player, Level world, Interac
             net.minecraft.world.level.ClipContext.Fluid handling =
                     fluid == Fluids.EMPTY ? ClipContext.Fluid.SOURCE_ONLY : ClipContext.Fluid.NONE;
 
-            BlockHitResult raycastResult = ItemInvoker.getPlayerPOVHitResult(world, player, handling);
+            BlockHitResult raycastResult =
+                    ItemInvoker.getPlayerPOVHitResult(world, player, handling);
 
             if (raycastResult.getType() != BlockHitResult.Type.MISS) {
                 BlockPos raycastPos = raycastResult.getBlockPos();
@@ -242,15 +246,20 @@ && checkPermissions(
         return InteractionResult.PASS;
     }
 
-    private static InteractionResult onUseEntity(Player player, Entity entity, Level world) {
+    private static InteractionResult onUseEntity(
+            Player player,
+            Level level,
+            InteractionHand hand,
+            Entity entity,
+            @Nullable EntityHitResult hitResult) {
         BlockPos pos;
         if (entity == null) {
             pos = player.blockPosition();
         } else {
             pos = entity.blockPosition();
         }
 
-        if (checkPermissions(player, pos, world, Permissions.USE_ENTITIES)
+        if (checkPermissions(player, pos, level, Permissions.USE_ENTITIES)
                 == InteractionResult.FAIL) {
             InteractionsUtil.warn((ServerPlayer) player, InteractionsUtilActions.USE_ENTITIES);
             return InteractionResult.FAIL;

src/main/java/io/icker/factions/mixin/ItemInvoker.java

@@ -12,7 +12,8 @@
 @Mixin(Item.class)
 public interface ItemInvoker {
     @Invoker("getPlayerPOVHitResult")
-    static BlockHitResult getPlayerPOVHitResult(Level world, Player player, ClipContext.Fluid fluidHandling) {
+    static BlockHitResult getPlayerPOVHitResult(
+            Level world, Player player, ClipContext.Fluid fluidHandling) {
         throw new AssertionError();
     }
 }

src/main/java/io/icker/factions/mixin/ServerGamePacketListenerImplMixin.java

@@ -7,13 +7,9 @@
 
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.PlayerChatMessage;
-import net.minecraft.network.protocol.game.ServerboundInteractPacket;
 import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.ServerGamePacketListenerImpl;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.Level;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -53,16 +49,4 @@ public void broadcastChatMessage(PlayerChatMessage signedMessage, CallbackInfo c
             ci.cancel();
         }
     }
-
-    @Inject(method = "handleInteract", at = @At("HEAD"), cancellable = true)
-    public void handleInteract(ServerboundInteractPacket packet, CallbackInfo ci) {
-        Level world = player.level();
-        Entity entity = world.getEntity(packet.entityId());
-        if (entity == null) return;
-
-        if (PlayerEvents.USE_ENTITY.invoker().onUseEntity(player, entity, world)
-                == InteractionResult.FAIL) {
-            ci.cancel();
-        }
-    }
 }

src/main/java/io/icker/factions/ui/PagedGui.java

@@ -13,6 +13,7 @@
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.inventory.Slot;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
 
 import org.jetbrains.annotations.ApiStatus;
@@ -126,7 +127,7 @@ protected DisplayElement getNavElement(int id) {
 
     public record DisplayElement(@Nullable GuiElement element, @Nullable Slot slot) {
         private static final DisplayElement EMPTY =
-                DisplayElement.of(new GuiElementBuilder().build());
+                DisplayElement.of(GuiElementBuilder.from(ItemStack.EMPTY).build());
         private static final DisplayElement FILLER =
                 DisplayElement.of(
                         new GuiElementBuilder(Items.WHITE_STAINED_GLASS_PANE)