CrackShot: consider guns as ranged weapons for autoswitch

mcmonkeyprojects · May 11, 2024 · b0941a7 · b0941a7
1 parent 83cb3e4
commit b0941a7
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/src/main/java/org/mcmonkey/sentinel/SentinelIntegration.java b/src/main/java/org/mcmonkey/sentinel/SentinelIntegration.java
@@ -1,6 +1,7 @@
 package org.mcmonkey.sentinel;
 
 import org.bukkit.entity.LivingEntity;
+import org.bukkit.inventory.ItemStack;
 
 /**
  * Represents an integration of an external plugin or system into Sentinel.
@@ -53,4 +54,12 @@ public boolean isTarget(LivingEntity ent, String text) {
     public boolean tryAttack(SentinelTrait st, LivingEntity ent) {
         return false;
     }
+
+    /**
+     * For autoswitch logic, return 'true' if the item should be considered a valid ranged weapon to swap to.
+     * If Sentinel's core and all integrations return 'false', the item will be considered a melee weapon.
+     */
+    public boolean itemIsRanged(SentinelTrait sentinel, ItemStack item) {
+        return false;
+    }
 }
diff --git a/src/main/java/org/mcmonkey/sentinel/SentinelItemHelper.java b/src/main/java/org/mcmonkey/sentinel/SentinelItemHelper.java
@@ -289,7 +289,7 @@ public boolean isRanged() {
      * Returns whether the NPC is holding a ranged weapon.
      */
     public boolean isRanged(ItemStack item) {
-        return usesBow(item)
+        if (usesBow(item)
                 || usesFireball(item)
                 || usesSnowball(item)
                 || usesLightning(item)
@@ -300,7 +300,15 @@ public boolean isRanged(ItemStack item) {
                 || usesSpectral(item)
                 || usesPotion(item)
                 || usesLlamaSpit(item)
-                || usesShulkerBullet(item);
+                || usesShulkerBullet(item)) {
+            return true;
+        }
+        for (SentinelIntegration integration : SentinelPlugin.integrations) {
+            if (integration.itemIsRanged(sentinel, item)) {
+                return true;
+            }
+        }
+        return false;
     }
 
     /**

diff --git a/src/main/java/org/mcmonkey/sentinel/integration/SentinelCrackShot.java b/src/main/java/org/mcmonkey/sentinel/integration/SentinelCrackShot.java
@@ -22,6 +22,15 @@ public String[] getTargetPrefixes() {
         return new String[0];
     }
 
+    @Override
+    public boolean itemIsRanged(SentinelTrait sentinel, ItemStack item) {
+        if (!(sentinel.getLivingEntity() instanceof Player)) {
+            return false;
+        }
+        CSDirector direc = (CSDirector) Bukkit.getPluginManager().getPlugin("CrackShot");
+        return direc.itemParentNode(item, (Player) sentinel.getLivingEntity()) != null;
+    }
+
     @Override
     public boolean tryAttack(SentinelTrait st, LivingEntity ent) {
         if (!(st.getLivingEntity() instanceof Player)) {