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

Tiny bit of cleanup

Browse source
This commit is contained in:
Sollace 2021-12-24 00:38:02 +02:00
parent d026a6c06a
commit 62e5ab01cc
11 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/com/minelittlepony/unicopia/WorldTribeManager.java
View file

@ -29,6 +29,7 @@ public class WorldTribeManager extends PersistentState {
return tag;
}
@SuppressWarnings("deprecation")
public static String nameFor(DimensionType dimension) {
return "unicopia:tribes" + dimension.getSuffix();
}

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

@ -7,7 +7,6 @@ import com.minelittlepony.unicopia.ability.data.Hit;
import com.minelittlepony.unicopia.ability.magic.SpellPredicate;
import com.minelittlepony.unicopia.ability.magic.spell.AbstractDisguiseSpell;
import com.minelittlepony.unicopia.ability.magic.spell.effect.SpellType;
import com.minelittlepony.unicopia.ability.magic.spell.trait.SpellTraits;
import com.minelittlepony.unicopia.entity.behaviour.EntityAppearance;
import com.minelittlepony.unicopia.entity.player.Pony;
import com.minelittlepony.unicopia.particle.UParticles;

1
src/main/java/com/minelittlepony/unicopia/command/DisguiseCommand.java
View file

@ -5,7 +5,6 @@ import java.util.function.Function;
import com.minelittlepony.unicopia.InteractionManager;
import com.minelittlepony.unicopia.ability.magic.SpellPredicate;
import com.minelittlepony.unicopia.ability.magic.spell.effect.SpellType;
import com.minelittlepony.unicopia.ability.magic.spell.trait.SpellTraits;
import com.minelittlepony.unicopia.entity.player.Pony;
import com.mojang.authlib.GameProfile;
import com.mojang.brigadier.CommandDispatcher;

1
src/main/java/com/minelittlepony/unicopia/entity/ButterflyEntity.java
View file

@ -302,6 +302,7 @@ public class ButterflyEntity extends AmbientEntity {
protected void fall(double y, boolean onGroundIn, BlockState state, BlockPos pos) {
}
@SuppressWarnings("deprecation")
@Override
public boolean canSpawn(WorldAccess world, SpawnReason reason) {
return reason != SpawnReason.NATURAL || (getY() >= world.getSeaLevel() && world.getLightLevel(getBlockPos()) > 3);

1
src/main/java/com/minelittlepony/unicopia/particle/DiskParticleEffect.java
View file

@ -8,6 +8,7 @@ import net.minecraft.particle.ParticleType;
import net.minecraft.util.math.Vec3f;
public class DiskParticleEffect extends SphereParticleEffect {
@SuppressWarnings("deprecation")
public static final Factory<DiskParticleEffect> FACTORY = ParticleFactoryHelper.of(DiskParticleEffect::new, DiskParticleEffect::new);
protected DiskParticleEffect(ParticleType<DiskParticleEffect> type, StringReader reader) throws CommandSyntaxException {

1
src/main/java/com/minelittlepony/unicopia/particle/FollowingParticleEffect.java
View file

@ -13,6 +13,7 @@ import net.minecraft.util.registry.Registry;
import net.minecraft.world.World;
public class FollowingParticleEffect implements ParticleEffect {
@SuppressWarnings("deprecation")
public static final Factory<FollowingParticleEffect> FACTORY = ParticleFactoryHelper.of(FollowingParticleEffect::new, FollowingParticleEffect::new);
private final ParticleType<FollowingParticleEffect> type;

1
src/main/java/com/minelittlepony/unicopia/particle/MagicParticleEffect.java
View file

@ -15,6 +15,7 @@ import net.minecraft.util.registry.Registry;
public class MagicParticleEffect implements ParticleEffect {
public static final MagicParticleEffect UNICORN = new MagicParticleEffect(false, Vec3f.ZERO);
@SuppressWarnings("deprecation")
public static final ParticleEffect.Factory<MagicParticleEffect> FACTORY = ParticleFactoryHelper.of(MagicParticleEffect::new, MagicParticleEffect::new);
private final boolean tinted;

1
src/main/java/com/minelittlepony/unicopia/particle/OrientedBillboardParticleEffect.java
View file

@ -12,6 +12,7 @@ import net.minecraft.util.math.Vec3d;
import net.minecraft.util.registry.Registry;
public class OrientedBillboardParticleEffect implements ParticleEffect {
@SuppressWarnings("deprecation")
public static final ParticleEffect.Factory<OrientedBillboardParticleEffect> FACTORY = ParticleFactoryHelper.of(OrientedBillboardParticleEffect::new, OrientedBillboardParticleEffect::new);
private final boolean fixed;

1
src/main/java/com/minelittlepony/unicopia/particle/ParticleFactoryHelper.java
View file

@ -28,6 +28,7 @@ public interface ParticleFactoryHelper {
return reader.readFloat();
}
@SuppressWarnings("deprecation")
static <T extends ParticleEffect> ParticleEffect.Factory<T> of(CommandReader<T> commandReader, PacketReader<T> packetReader) {
return new ParticleEffect.Factory<>() {
@Override

1
src/main/java/com/minelittlepony/unicopia/particle/SphereParticleEffect.java
View file

@ -14,6 +14,7 @@ import net.minecraft.util.math.Vec3f;
import net.minecraft.util.registry.Registry;
public class SphereParticleEffect implements ParticleEffect {
@SuppressWarnings("deprecation")
public static final Factory<SphereParticleEffect> FACTORY = ParticleFactoryHelper.of(SphereParticleEffect::new, SphereParticleEffect::new);
private final Vec3f color;

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

@ -39,7 +39,6 @@ import net.minecraft.particle.ParticleTypes;
import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.util.hit.EntityHitResult;
import net.minecraft.util.hit.HitResult;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
@ -60,8 +59,6 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster<Li
private final EntityPhysics<MagicProjectileEntity> physics = new EntityPhysics<>(this, GRAVITY, false);
private BlockPos lastBlockPos;
public MagicProjectileEntity(EntityType<MagicProjectileEntity> type, World world) {
super(type, world);
}
@ -162,15 +159,9 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster<Li
setNoGravity(false);
}
if (getSpellSlot().isPresent()) {
if (lastBlockPos == null || !lastBlockPos.equals(getBlockPos())) {
lastBlockPos = getBlockPos();
}
if (!getSpellSlot().get(true).filter(spell -> spell.tick(this, Situation.PROJECTILE)).isPresent()) {
discard();
}
}
if (getHydrophobic()) {
if (world.getBlockState(getBlockPos()).getMaterial().isLiquid()) {