PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-27 15:17:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove some deprecation warnings

Browse source
This commit is contained in:
Sollace 2023-08-04 18:29:06 +01:00
parent 7868db90b5
commit f16632e5fe
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
3 changed files with 35 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,16 +6,14 @@ import com.minelittlepony.unicopia.ability.data.Hit;
import com.minelittlepony.unicopia.ability.data.Pos;
import com.minelittlepony.unicopia.ability.magic.Caster;
import com.minelittlepony.unicopia.ability.magic.spell.effect.SpellType;
import com.minelittlepony.unicopia.block.state.StatePredicate;
import com.minelittlepony.unicopia.entity.Living;
import com.minelittlepony.unicopia.entity.player.Pony;
import com.minelittlepony.unicopia.particle.MagicParticleEffect;
import com.minelittlepony.unicopia.util.Trace;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.FenceBlock;
import net.minecraft.block.LeavesBlock;
import net.minecraft.block.WallBlock;
import net.minecraft.block.ShapeContext;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.predicate.entity.EntityPredicates;
@ -24,6 +22,7 @@ import net.minecraft.text.Text;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.shape.VoxelShape;
import net.minecraft.world.World;
/**
@ -158,12 +157,21 @@ public class UnicornTeleportAbility implements Ability<Pos> {
Living.transmitPassengers(mount);
}
Vec3d offset = teleportee.getOriginVector().subtract(teleporter.getOriginVector());
Vec3d offset = teleportee.getOriginVector()
.subtract(teleporter.getOriginVector())
.add(
participant.getX() - Math.floor(participant.getX()),
0,
participant.getZ() - Math.floor(participant.getZ())
);
Vec3d dest = destination.vec().add(offset);
participant.teleport(
destination.x + offset.x + (participant.getX() - Math.floor(participant.getX())),
destination.y + offset.y,
destination.z + offset.z + (participant.getZ() - Math.floor(participant.getZ())));
dest.x,
getTargetYPosition(participant.getEntityWorld(), BlockPos.ofFloored(dest), ShapeContext.of(participant)),
dest.z
);
teleporter.subtractEnergyCost(distance);
participant.fallDistance /= distance;
@ -173,23 +181,22 @@ public class UnicornTeleportAbility implements Ability<Pos> {
private boolean enterable(World w, BlockPos pos) {
BlockState state = w.getBlockState(pos);
Block block = state.getBlock();
return w.isAir(pos)
|| !state.isOpaque()
|| (block instanceof LeavesBlock);
return w.isAir(pos) || !state.isOpaque();
}
private boolean exception(World w, BlockPos pos, PlayerEntity player) {
BlockState state = w.getBlockState(pos);
VoxelShape shape;
Block c = state.getBlock();
return state.hasSolidTopSurface(w, pos, player)
|| state.isLiquid()
|| (c instanceof WallBlock)
|| (c instanceof FenceBlock)
|| (c instanceof LeavesBlock);
|| StatePredicate.isFluid(state)
|| (shape = state.getCollisionShape(w, pos, ShapeContext.of(player))).isEmpty()
|| shape.getBoundingBox().getYLength() > 1;
}
private double getTargetYPosition(World world, BlockPos pos, ShapeContext context) {
VoxelShape shape = world.getBlockState(pos).getCollisionShape(world, pos, context);
return pos.getY() + (shape.isEmpty() ? 0 : shape.getBoundingBox().getYLength());
}
@Override

9
src/main/java/com/minelittlepony/unicopia/block/state/StatePredicate.java
View file

@ -124,11 +124,16 @@ public abstract class StatePredicate implements Predicate<BlockState> {
}
static boolean isWater(BlockState s) {
return s.isLiquid() && s.getFluidState().isIn(FluidTags.WATER);
return isFluid(s) && s.getFluidState().isIn(FluidTags.WATER);
}
static boolean isLava(BlockState s) {
return s.isLiquid() && s.getFluidState().isIn(FluidTags.LAVA);
return isFluid(s) && s.getFluidState().isIn(FluidTags.LAVA);
}
@SuppressWarnings("deprecation")
public static boolean isFluid(BlockState s) {
return s.isLiquid();
}
public static Predicate<BlockState> ofState(String state) {

3
src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java
View file

@ -15,6 +15,7 @@ import com.minelittlepony.unicopia.ability.magic.SpellContainer;
import com.minelittlepony.unicopia.ability.magic.SpellContainer.Operation;
import com.minelittlepony.unicopia.ability.magic.spell.Situation;
import com.minelittlepony.unicopia.ability.magic.spell.Spell;
import com.minelittlepony.unicopia.block.state.StatePredicate;
import com.minelittlepony.unicopia.entity.EntityPhysics;
import com.minelittlepony.unicopia.entity.EntityReference;
import com.minelittlepony.unicopia.entity.Physics;
@ -183,7 +184,7 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster<Ma
getSpellSlot().get(true).filter(spell -> spell.tick(this, Situation.PROJECTILE));
if (getHydrophobic()) {
if (getWorld().getBlockState(getBlockPos()).isLiquid()) {
if (StatePredicate.isFluid(getWorld().getBlockState(getBlockPos()))) {
Vec3d vel = getVelocity();
double velY = vel.y;