PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-03-23 11:37:13 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move the collides predicate out of the RayTraceHelper class

Browse source
This commit is contained in:
Sollace 2021-12-31 15:36:31 +02:00
parent 0532aafa83
commit 1b17ab24c9
8 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/minelittlepony/unicopia/ability/BatPonyHangAbility.java
View file

@ -44,7 +44,7 @@ public class BatPonyHangAbility implements Ability<Multi> {
return new Multi(BlockPos.ZERO, 0); return new Multi(BlockPos.ZERO, 0);
} }
BlockPos poss = RayTraceHelper.doTrace(player.getMaster(), 3, 1, EntityPredicates.EXCEPT_SPECTATOR).getBlockPos().orElse(null); BlockPos poss = RayTraceHelper.doTrace(player.getMaster(), 3, 1, EntityPredicates.CAN_COLLIDE).getBlockPos().orElse(null);
if (poss != null) { if (poss != null) {
boolean air = player.getWorld().isAir(poss.down()) && player.getWorld().isAir(poss.down(2)); boolean air = player.getWorld().isAir(poss.down()) && player.getWorld().isAir(poss.down(2));

2
src/main/java/com/minelittlepony/unicopia/ability/ChangelingDisguiseAbility.java
View file

@ -42,7 +42,7 @@ public class ChangelingDisguiseAbility extends ChangelingFeedAbility {
return; return;
} }
RayTraceHelper.Trace trace = RayTraceHelper.doTrace(player, 10, 1, EntityPredicates.EXCEPT_SPECTATOR.and(e -> !(e instanceof LightningEntity))); RayTraceHelper.Trace trace = RayTraceHelper.doTrace(player, 10, 1, EntityPredicates.CAN_COLLIDE.and(e -> !(e instanceof LightningEntity)));
Entity looked = trace.getEntity().filter(e -> !(e instanceof AbstractDecorationEntity)).map(e -> { Entity looked = trace.getEntity().filter(e -> !(e instanceof AbstractDecorationEntity)).map(e -> {
return e instanceof PlayerEntity ? Pony.of((PlayerEntity)e) return e instanceof PlayerEntity ? Pony.of((PlayerEntity)e)

3
src/main/java/com/minelittlepony/unicopia/ability/UnicornCastingAbility.java
View file

@ -15,6 +15,7 @@ import com.minelittlepony.unicopia.particle.MagicParticleEffect;
import com.minelittlepony.unicopia.util.RayTraceHelper; import com.minelittlepony.unicopia.util.RayTraceHelper;
import com.minelittlepony.unicopia.util.VecHelper; import com.minelittlepony.unicopia.util.VecHelper;
import net.minecraft.entity.Entity;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.particle.ParticleTypes; import net.minecraft.particle.ParticleTypes;
import net.minecraft.predicate.entity.EntityPredicates; import net.minecraft.predicate.entity.EntityPredicates;
@ -107,7 +108,7 @@ public class UnicornCastingAbility implements Ability<Hit> {
player.playSound(SoundEvents.ENTITY_ITEM_BREAK, 1, 0.5F); player.playSound(SoundEvents.ENTITY_ITEM_BREAK, 1, 0.5F);
} else { } else {
if (s instanceof HomingSpell) { if (s instanceof HomingSpell) {
RayTraceHelper.doTrace(player.getMaster(), 600, 1, EntityPredicates.EXCEPT_SPECTATOR).getEntity().ifPresent(((HomingSpell)s)::setTarget); RayTraceHelper.doTrace(player.getMaster(), 600, 1, EntityPredicates.CAN_COLLIDE).getEntity().ifPresent(((HomingSpell)s)::setTarget);
} }
player.playSound(SoundEvents.BLOCK_BEACON_POWER_SELECT, 0.05F, 2.2F); player.playSound(SoundEvents.BLOCK_BEACON_POWER_SELECT, 0.05F, 2.2F);
} }

2
src/main/java/com/minelittlepony/unicopia/ability/UnicornProjectileAbility.java
View file

@ -70,7 +70,7 @@ public class UnicornProjectileAbility implements Ability<Hit> {
spell.toThrowable().throwProjectile(player).ifPresent(projectile -> { spell.toThrowable().throwProjectile(player).ifPresent(projectile -> {
if (spell instanceof HomingSpell) { if (spell instanceof HomingSpell) {
RayTraceHelper.doTrace(player.getMaster(), 600, 1, EntityPredicates.EXCEPT_SPECTATOR).getEntity().filter(((HomingSpell)spell)::setTarget).ifPresent(target -> { RayTraceHelper.doTrace(player.getMaster(), 600, 1, EntityPredicates.CAN_COLLIDE).getEntity().filter(((HomingSpell)spell)::setTarget).ifPresent(target -> {
projectile.setHomingTarget(target); projectile.setHomingTarget(target);
}); });
} }

2
src/main/java/com/minelittlepony/unicopia/ability/UnicornTeleportAbility.java
View file

@ -67,7 +67,7 @@ public class UnicornTeleportAbility implements Ability<Pos> {
@Override @Override
public Pos tryActivate(Pony player) { public Pos tryActivate(Pony player) {
int maxDistance = player.getMaster().isCreative() ? 1000 : 100; int maxDistance = player.getMaster().isCreative() ? 1000 : 100;
HitResult ray = RayTraceHelper.doTrace(player.getMaster(), maxDistance, 1, EntityPredicates.EXCEPT_SPECTATOR).getResult(); HitResult ray = RayTraceHelper.doTrace(player.getMaster(), maxDistance, 1, EntityPredicates.CAN_COLLIDE).getResult();
World w = player.getWorld(); World w = player.getWorld();

2
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/CatapultSpell.java
View file

@ -86,7 +86,7 @@ public class CatapultSpell extends AbstractSpell implements ProjectileSpell {
double maxDistance = 2 + (getTraits().get(Trait.FOCUS) - 50) * 8; double maxDistance = 2 + (getTraits().get(Trait.FOCUS) - 50) * 8;
HitResult ray = RayTraceHelper.doTrace(caster.getMaster(), maxDistance, 1, EntityPredicates.EXCEPT_SPECTATOR).getResult(); HitResult ray = RayTraceHelper.doTrace(caster.getMaster(), maxDistance, 1, EntityPredicates.CAN_COLLIDE).getResult();
if (ray.getType() == HitResult.Type.ENTITY) { if (ray.getType() == HitResult.Type.ENTITY) {
EntityHitResult result = (EntityHitResult)ray; EntityHitResult result = (EntityHitResult)ray;

2
src/main/java/com/minelittlepony/unicopia/item/ZapAppleItem.java
View file

@ -43,7 +43,7 @@ public class ZapAppleItem extends AppleItem implements ChameleonItem {
public TypedActionResult<ItemStack> use(World world, PlayerEntity player, Hand hand) { public TypedActionResult<ItemStack> use(World world, PlayerEntity player, Hand hand) {
ItemStack stack = player.getStackInHand(hand); ItemStack stack = player.getStackInHand(hand);
Optional<Entity> entity = RayTraceHelper.doTrace(player, 5, 1, EntityPredicates.EXCEPT_SPECTATOR.and(e -> canFeedTo(stack, e))).getEntity(); Optional<Entity> entity = RayTraceHelper.doTrace(player, 5, 1, EntityPredicates.CAN_COLLIDE.and(e -> canFeedTo(stack, e))).getEntity();
if (entity.isPresent()) { if (entity.isPresent()) {
return onFedTo(stack, player, entity.get()); return onFedTo(stack, player, entity.get());

6
src/main/java/com/minelittlepony/unicopia/util/RayTraceHelper.java
View file

@ -18,7 +18,7 @@ import net.minecraft.util.math.Vec3d;
public class RayTraceHelper { public class RayTraceHelper {
public static <T extends Entity> Optional<T> findEntity(Entity e, double distance, float tickDelta, Predicate<Entity> predicate) { public static <T extends Entity> Optional<T> findEntity(Entity e, double distance, float tickDelta, Predicate<Entity> predicate) {
return doTrace(e, distance, tickDelta, EntityPredicates.EXCEPT_SPECTATOR.and(predicate)).getEntity(); return doTrace(e, distance, tickDelta, EntityPredicates.CAN_COLLIDE.and(predicate)).getEntity();
} }
/** /**
@ -33,7 +33,7 @@ public class RayTraceHelper {
* @return A Trace describing what was found. * @return A Trace describing what was found.
*/ */
public static Trace doTrace(Entity e, double distance, float tickDelta) { public static Trace doTrace(Entity e, double distance, float tickDelta) {
return doTrace(e, distance, tickDelta, EntityPredicates.EXCEPT_SPECTATOR); return doTrace(e, distance, tickDelta, EntityPredicates.CAN_COLLIDE);
} }
/** /**
@ -55,7 +55,7 @@ public class RayTraceHelper {
final Box box = e.getBoundingBox().stretch(ray).expand(1); final Box box = e.getBoundingBox().stretch(ray).expand(1);
EntityHitResult pointedEntity = ProjectileUtil.raycast(e, start, start.add(ray), box, predicate.and(Entity::collides), distance); EntityHitResult pointedEntity = ProjectileUtil.raycast(e, start, start.add(ray), box, predicate, distance);
if (pointedEntity != null) { if (pointedEntity != null) {
return new Trace(pointedEntity); return new Trace(pointedEntity);