Version 1.1.3-forge-119

- Made Homing arrows target all players

Author: itscrystalline

build.gradle

@@ -19,7 +19,7 @@ plugins {
 apply plugin: 'org.spongepowered.mixin'
 apply plugin: 'org.parchmentmc.librarian.forgegradle'
 
-version = '1.1.2'
+version = '1.1.3'
 group = 'com.thaddev.iw2thshortbows' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'iw2thshortbows'
 

src/main/java/com/thaddev/iw2thshortbows/IWant2TryHardsShortbows.java

@@ -25,7 +25,7 @@ public class IWant2TryHardsShortbows {
     public static final String MODID = "iw2thshortbows";
     public static final Logger LOGGER = LogUtils.getLogger();
     public static IWant2TryHardsShortbows instance;
-    public static String VERSION = "1.1.2";
+    public static String VERSION = "1.1.3";
 
     public static final String MESSAGE_WELCOME = "message.iw2thshortbows.welcome";
     public static final String SCREEN_VERSION_MISMATCH = "menu.iw2thshortbows.modmismatch";

src/main/java/com/thaddev/iw2thshortbows/content/entities/projectiles/DiamondHeadedArrow.java

@@ -37,6 +37,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.UUID;
 
 public class DiamondHeadedArrow extends AbstractArrow {
     private static final int EXPOSED_POTION_DECAY_TIME = 600;
@@ -315,47 +316,38 @@ protected void onHitEntity(@NotNull EntityHitResult result) {
     //HOMING BEHAVIOR
     private void setTarget() {
         if (target == null || target.isDeadOrDying() || (target instanceof EnderDragon dragon && dragon.getPhaseManager().getCurrentPhase().getPhase() == EnderDragonPhase.DYING)) {
-            AABB aabb = (new AABB(new BlockPos(this.position()))).inflate(20).expandTowards(0.0D, level.getHeight(), 0.0D);
-            List<LivingEntity> potentialTargets = this.level.getEntitiesOfClass(LivingEntity.class, aabb);
-
-            if (potentialTargets.size() == 0) {
-                target = null;
-                return;
-            }
-
-            potentialTargets.removeIf(LivingEntity::isDeadOrDying);
-            potentialTargets.removeIf(entity -> !(entity instanceof Enemy));
-            potentialTargets.removeIf(entity -> !entity.hasLineOfSight(this));
-            potentialTargets.removeIf(entity -> entity instanceof EnderMan);
-            potentialTargets.removeIf(entity -> (entity instanceof WitherBoss boss && boss.isPowered()));
-            potentialTargets.removeIf(entity -> {
-                if (entity instanceof EnderDragon){
-                    EnderDragonPhase<? extends DragonPhaseInstance> phase = ((EnderDragon) entity).getPhaseManager().getCurrentPhase().getPhase();
-                    return phase == EnderDragonPhase.SITTING_ATTACKING ||
-                        phase == EnderDragonPhase.SITTING_SCANNING ||
-                        phase == EnderDragonPhase.SITTING_FLAMING ||
-                        phase == EnderDragonPhase.DYING;
-                }
-                return false;
-            });
-            potentialTargets.removeIf(entity ->
-                entity instanceof Player player &&
-                    player.getUUID().equals(Objects.requireNonNull(this.getOwner()).getUUID())
-            );
-            potentialTargets.removeIf(entity ->
-                entity instanceof Player player && (player.isCreative() || player.isSpectator())
-            );
-            potentialTargets.removeIf(entity ->
-                entity instanceof Player player && this.getOwner() instanceof Player owner && !owner.canHarmPlayer(player)
-            );
-
-
-            if (potentialTargets.size() == 0) {
+            AABB aabb = new AABB(new BlockPos(this.position())).inflate(20).expandTowards(0.0D, level.getHeight(), 0.0D);
+            List<LivingEntity> potentialTargets = level.getEntitiesOfClass(LivingEntity.class, aabb)
+                    .stream()
+                    .filter(entity -> !entity.isDeadOrDying() &&
+                            entity instanceof Enemy &&
+                            entity.hasLineOfSight(this) &&
+                            !(entity instanceof EnderMan) &&
+                            (!(entity instanceof WitherBoss) || !((WitherBoss) entity).isPowered()) &&
+                            !(entity instanceof EnderDragon) ||
+                            !isDragonSittingOrDying((EnderDragon) entity) &&
+                                    !(entity instanceof Player) ||
+                            !playerMatchesOwner((Player) entity))
+                    .toList();
+
+            if (potentialTargets.isEmpty()) {
                 target = null;
                 return;
             }
 
             target = potentialTargets.get(random.nextInt(potentialTargets.size()));
         }
     }
+    private boolean isDragonSittingOrDying(EnderDragon dragon) {
+        EnderDragonPhase<? extends DragonPhaseInstance> phase = dragon.getPhaseManager().getCurrentPhase().getPhase();
+        return phase == EnderDragonPhase.SITTING_ATTACKING ||
+                phase == EnderDragonPhase.SITTING_SCANNING ||
+                phase == EnderDragonPhase.SITTING_FLAMING ||
+                phase == EnderDragonPhase.DYING;
+    }
+
+    private boolean playerMatchesOwner(Player player) {
+        UUID ownerUUID = Objects.requireNonNull(this.getOwner()).getUUID();
+        return player.getUUID().equals(ownerUUID) || player.isCreative() || player.isSpectator();
+    }
 }

src/main/java/com/thaddev/iw2thshortbows/content/items/weapons/ShortBowBase.java

@@ -96,9 +96,6 @@ public int getUseDuration(@NotNull ItemStack p_40680_) {
                     if (strengthBoost > 0){
                         PotionUtils.getPotion(itemstack).getEffects().forEach(effect -> {
                             if (effect.getEffect().isInstantenous()){
-//                                player.addEffect(new MobEffectInstance(effect.getEffect(), 1, (effect.getAmplifier() + 1) > 1 ?
-//                                        (int) Math.round(Math.floor(effect.getAmplifier() / 2f)) :
-//                                        effect.getAmplifier()));
                                 effect.getEffect().applyInstantenousEffect(null, player, player, (effect.getAmplifier() + 1) > 1 ?
                                         (int) Math.round(Math.floor(effect.getAmplifier() / 2f)) :
                                         effect.getAmplifier(), 1);

src/main/resources/META-INF/mods.toml

@@ -4,7 +4,7 @@ license="MIT"
 
 [[mods]]
 modId = "iw2thshortbows"
-version = "1.1.2" #mandatory
+version = "1.1.3" #mandatory
 displayName = "IWant2TryHard's Shortbows" #mandatory
 #updateJSONURL="https://change.me.example.invalid/updates.json" #optional
 displayURL = "https://github.com/MyNameTsThad/IW2THs-Shortbows" #optional