Fix packet usage in spacenpc

Author: Tofaa2

spaceNPC/src/main/java/me/tofaa/entitylib/npc/NPC.java

@@ -178,7 +178,7 @@ public void spawn(@NotNull Location location) {
         }
         entity.setLocation(location);
 
-        if (entityType == com.github.retrooper.packetevents.protocol.entity.type.EntityTypes.PLAYER) {
+        if (entityType == EntityTypes.PLAYER) {
             entity.getEntityMeta().setCustomNameVisible(false);
             registerScoreboardTeam();
         } else if (options.hasDisplayName()) {

spaceNPC/src/main/java/me/tofaa/entitylib/npc/NPCListenerManager.java

@@ -45,12 +45,13 @@ public static void register(org.bukkit.plugin.java.JavaPlugin plugin) {
             public void onPacketReceive(PacketReceiveEvent event) {
                 UUID playerId = event.getUser().getUUID();
 
-                if (event.getPacketType() == PacketType.Play.Client.USE_ITEM) {
-                    WrapperPlayClientUseItem useItemPacket = new WrapperPlayClientUseItem(event);
-                    playersHoldingShift.add(playerId);
-                    handleInteraction(event, playerId, false, true);
-                    return;
-                }
+//                if (event.getPacketType() == PacketType.Play.Client.USE_ITEM) {
+//                    WrapperPlayClientUseItem useItemPacket = new WrapperPlayClientUseItem(event);
+//                    playersHoldingShift.add(playerId);
+//                    useItemPacket.get
+//                    handleInteraction(event, playerId, false, true);
+//                    return;
+//                }
 
                 if (event.getPacketType() == PacketType.Play.Client.INTERACT_ENTITY) {
                     WrapperPlayClientInteractEntity packet = new WrapperPlayClientInteractEntity(event);
@@ -64,9 +65,9 @@ public void onPacketReceive(PacketReceiveEvent event) {
                     boolean isShift = playersHoldingShift.contains(playerId);
 
                     if (isLeftClick) {
-                        handleInteraction(event, playerId, isLeftClick, isShift);
+                        handleInteraction(event, playerId, isLeftClick, isShift, npc);
                     } else {
-                        handleInteraction(event, playerId, isLeftClick, isShift);
+                        handleInteraction(event, playerId, isLeftClick, isShift, npc);
                     }
                 }
             }
@@ -90,12 +91,17 @@ public void onPacketReceive(PacketReceiveEvent event) {
         });
     }
 
-    private static void handleInteraction(PacketReceiveEvent event, UUID playerId, boolean isLeftClick, boolean isShift) {
-        WrapperPlayClientInteractEntity packet = new WrapperPlayClientInteractEntity(event);
-        int entityId = packet.getEntityId();
-
-        NPC npc = NPCRegistry.getByEntityId(entityId);
-        if (npc == null) return;
+    private static void handleInteraction(
+            PacketReceiveEvent event,
+            UUID playerId,
+            boolean isLeftClick,
+            boolean isShift,
+            NPC npc
+    ) {
+//        WrapperPlayClientInteractEntity packet = new WrapperPlayClientInteractEntity(event);
+//        int entityId = packet.getEntityId();
+//        NPC npc = NPCRegistry.getByEntityId(npcId);
+//        if (npc == null) return;
 
         InteractionType interactionType = getInteractionType(isLeftClick, isShift);
 

spaceNPC/src/main/java/me/tofaa/entitylib/npc/command/NPCCommand.java

@@ -1780,7 +1780,8 @@ public List<String> tabComplete(
                     "right_click",
                     "left_click",
                     "shift_right_click",
-                    "shift_left_click"
+                    "shift_left_click",
+                    "any"
                 );
                 return types
                     .stream()

spaceNPC/src/main/java/me/tofaa/entitylib/npc/interactions/InteractionHandler.java

@@ -19,8 +19,15 @@ public static void handleInteraction(NPC npc, Player player, InteractionType int
         }
 
         NPCOptions options = npc.getOptions();
+
+        List<InteractionAction> anyActions = options.getInteractions(InteractionType.ANY);
+        executeActions(anyActions, player, npc);
+
         List<InteractionAction> actions = options.getInteractions(interactionType);
-        
+        executeActions(actions, player, npc);
+    }
+
+    private static void executeActions(List<InteractionAction> actions, Player player, NPC npc) {
         if (actions == null || actions.isEmpty()) {
             return;
         }

spaceNPC/src/main/java/me/tofaa/entitylib/npc/interactions/InteractionType.java

@@ -4,7 +4,8 @@ public enum InteractionType {
     RIGHT_CLICK("right_click", "rightclick"),
     LEFT_CLICK("left_click", "leftclick"),
     SHIFT_RIGHT_CLICK("shift_right_click", "shiftrightclick", "shift_right", "shiftright"),
-    SHIFT_LEFT_CLICK("shift_left_click", "shiftleftclick", "shift_left", "shiftleft");
+    SHIFT_LEFT_CLICK("shift_left_click", "shiftleftclick", "shift_left", "shiftleft"),
+    ANY("any", "all");
 
     private final String[] aliases;