mirrors/SpecialMobs
1
0
Fork 1
mirror of https://github.com/FatherToast/SpecialMobs.git synced 2025-04-24 14:25:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '1.16.5' of https://github.com/FatherToast/SpecialMobs into 1.16.5

Browse source
This commit is contained in:
Sarinsa 2022-09-13 19:40:07 +02:00
commit 0424da67a7
3 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/fathertoast/specialmobs/common/entity/skeleton/SniperSkeletonEntity.java
View file

@ -5,6 +5,7 @@ import fathertoast.specialmobs.common.bestiary.MobFamily;
import fathertoast.specialmobs.common.bestiary.SpecialMob;
import fathertoast.specialmobs.common.config.species.SkeletonSpeciesConfig;
import fathertoast.specialmobs.common.config.species.SpeciesConfig;
import fathertoast.specialmobs.common.event.PlayerVelocityWatcher;
import fathertoast.specialmobs.common.util.References;
import fathertoast.specialmobs.datagen.loot.LootTableBuilder;
import net.minecraft.entity.EntityType;
@ -17,6 +18,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.util.SoundEvents;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.world.World;
@SpecialMob
@ -71,14 +73,20 @@ public class SniperSkeletonEntity extends _SpecialSkeletonEntity {
/** Called to attack the target with a ranged attack. */
@Override
public void performRangedAttack( LivingEntity target, float damageMulti ) {
// Would be nice if we could lead the target, maybe someday when we can more easily read player velocity
final double dX = target.getX() - getX();
final double dY = target.getY( 0.5 ) - getEyeY() + 0.1;
final double dZ = target.getZ() - getZ();
final double dH = MathHelper.sqrt( dX * dX + dZ * dZ );
final double g = 0.05; // Gravitational acceleration for AbstractArrowEntity
final float v = 1.6F;
// Try to lead the target
final double dist = distanceTo( target );
final double arcFactor = dist * 0.012;
final float ticksToTarget = (float) (dist / v * (1.0 + arcFactor * arcFactor * arcFactor));
final Vector3d targetV = PlayerVelocityWatcher.getVelocity( target );
final double dX = target.getX() + targetV.x * ticksToTarget - getX();
final double dY = target.getY( 0.5 ) - getEyeY() + 0.1;
final double dZ = target.getZ() + targetV.z * ticksToTarget - getZ();
final double dH = MathHelper.sqrt( dX * dX + dZ * dZ );
final double radical = v * v * v * v - g * (g * dH * dH + 2 * dY * v * v);
if( radical < 0.0 ) {
// No firing solution, just fall back to the default

20
src/main/java/fathertoast/specialmobs/common/entity/witherskeleton/SniperWitherSkeletonEntity.java
View file

@ -5,6 +5,7 @@ import fathertoast.specialmobs.common.bestiary.MobFamily;
import fathertoast.specialmobs.common.bestiary.SpecialMob;
import fathertoast.specialmobs.common.config.species.SkeletonSpeciesConfig;
import fathertoast.specialmobs.common.config.species.SpeciesConfig;
import fathertoast.specialmobs.common.event.PlayerVelocityWatcher;
import fathertoast.specialmobs.common.util.References;
import fathertoast.specialmobs.datagen.loot.LootTableBuilder;
import net.minecraft.entity.EntityType;
@ -17,6 +18,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.util.SoundEvents;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.world.World;
@SpecialMob
@ -71,14 +73,20 @@ public class SniperWitherSkeletonEntity extends _SpecialWitherSkeletonEntity {
/** Called to attack the target with a ranged attack. */
@Override
public void performRangedAttack( LivingEntity target, float damageMulti ) {
// Would be nice if we could lead the target, maybe someday when we can more easily read player velocity
final double dX = target.getX() - getX();
final double dY = target.getY( 0.5 ) - getEyeY() + 0.1;
final double dZ = target.getZ() - getZ();
final double dH = MathHelper.sqrt( dX * dX + dZ * dZ );
final double g = 0.05; // Gravitational acceleration for AbstractArrowEntity
final float v = 1.6F;
// Try to lead the target
final double dist = distanceTo( target );
final double arcFactor = dist * 0.012;
final float ticksToTarget = (float) (dist / v * (1.0 + arcFactor * arcFactor * arcFactor));
final Vector3d targetV = PlayerVelocityWatcher.getVelocity( target );
final double dX = target.getX() + targetV.x * ticksToTarget - getX();
final double dY = target.getY( 0.5 ) - getEyeY() + 0.1;
final double dZ = target.getZ() + targetV.z * ticksToTarget - getZ();
final double dH = MathHelper.sqrt( dX * dX + dZ * dZ );
final double radical = v * v * v * v - g * (g * dH * dH + 2 * dY * v * v);
if( radical < 0.0 ) {
// No firing solution, just fall back to the default

6
src/main/java/fathertoast/specialmobs/common/event/PlayerVelocityWatcher.java
View file

@ -1,6 +1,7 @@
package fathertoast.specialmobs.common.event;
import fathertoast.specialmobs.common.core.SpecialMobs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.server.management.PlayerList;
import net.minecraft.util.math.vector.Vector3d;
@ -37,6 +38,11 @@ public class PlayerVelocityWatcher {
return trackerEntry;
}
/** @return The entity's velocity. Uses the player tracker to work for players, too. */
public static Vector3d getVelocity( Entity entity ) {
return entity instanceof PlayerEntity ? get( (PlayerEntity) entity ).velocity() : entity.getDeltaMovement();
}
/** Called for every player tick event. */
@SubscribeEvent
protected static void onPlayerTick( TickEvent.PlayerTickEvent event ) {