From 62e5ab01ccc45607c183832b8e003986dd8fe61b Mon Sep 17 00:00:00 2001 From: Sollace Date: Fri, 24 Dec 2021 00:38:02 +0200 Subject: [PATCH] Tiny bit of cleanup --- .../minelittlepony/unicopia/WorldTribeManager.java | 1 + .../unicopia/ability/ChangelingDisguiseAbility.java | 1 - .../unicopia/command/DisguiseCommand.java | 1 - .../unicopia/entity/ButterflyEntity.java | 1 + .../unicopia/particle/DiskParticleEffect.java | 1 + .../unicopia/particle/FollowingParticleEffect.java | 1 + .../unicopia/particle/MagicParticleEffect.java | 1 + .../particle/OrientedBillboardParticleEffect.java | 1 + .../unicopia/particle/ParticleFactoryHelper.java | 1 + .../unicopia/particle/SphereParticleEffect.java | 1 + .../unicopia/projectile/MagicProjectileEntity.java | 13 ++----------- 11 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/WorldTribeManager.java b/src/main/java/com/minelittlepony/unicopia/WorldTribeManager.java index 42f17da4..add1afe4 100644 --- a/src/main/java/com/minelittlepony/unicopia/WorldTribeManager.java +++ b/src/main/java/com/minelittlepony/unicopia/WorldTribeManager.java @@ -29,6 +29,7 @@ public class WorldTribeManager extends PersistentState { return tag; } + @SuppressWarnings("deprecation") public static String nameFor(DimensionType dimension) { return "unicopia:tribes" + dimension.getSuffix(); } diff --git a/src/main/java/com/minelittlepony/unicopia/ability/ChangelingDisguiseAbility.java b/src/main/java/com/minelittlepony/unicopia/ability/ChangelingDisguiseAbility.java index 90cabd7b..8941c9a1 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/ChangelingDisguiseAbility.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/ChangelingDisguiseAbility.java @@ -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; diff --git a/src/main/java/com/minelittlepony/unicopia/command/DisguiseCommand.java b/src/main/java/com/minelittlepony/unicopia/command/DisguiseCommand.java index e47b8189..bf851faa 100644 --- a/src/main/java/com/minelittlepony/unicopia/command/DisguiseCommand.java +++ b/src/main/java/com/minelittlepony/unicopia/command/DisguiseCommand.java @@ -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; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/ButterflyEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/ButterflyEntity.java index 6812c111..9797700e 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/ButterflyEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/ButterflyEntity.java @@ -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); diff --git a/src/main/java/com/minelittlepony/unicopia/particle/DiskParticleEffect.java b/src/main/java/com/minelittlepony/unicopia/particle/DiskParticleEffect.java index dd049a15..4ee4d992 100644 --- a/src/main/java/com/minelittlepony/unicopia/particle/DiskParticleEffect.java +++ b/src/main/java/com/minelittlepony/unicopia/particle/DiskParticleEffect.java @@ -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 FACTORY = ParticleFactoryHelper.of(DiskParticleEffect::new, DiskParticleEffect::new); protected DiskParticleEffect(ParticleType type, StringReader reader) throws CommandSyntaxException { diff --git a/src/main/java/com/minelittlepony/unicopia/particle/FollowingParticleEffect.java b/src/main/java/com/minelittlepony/unicopia/particle/FollowingParticleEffect.java index defb2ddf..2111f761 100644 --- a/src/main/java/com/minelittlepony/unicopia/particle/FollowingParticleEffect.java +++ b/src/main/java/com/minelittlepony/unicopia/particle/FollowingParticleEffect.java @@ -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 FACTORY = ParticleFactoryHelper.of(FollowingParticleEffect::new, FollowingParticleEffect::new); private final ParticleType type; diff --git a/src/main/java/com/minelittlepony/unicopia/particle/MagicParticleEffect.java b/src/main/java/com/minelittlepony/unicopia/particle/MagicParticleEffect.java index 5a468fd0..c1264571 100644 --- a/src/main/java/com/minelittlepony/unicopia/particle/MagicParticleEffect.java +++ b/src/main/java/com/minelittlepony/unicopia/particle/MagicParticleEffect.java @@ -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 FACTORY = ParticleFactoryHelper.of(MagicParticleEffect::new, MagicParticleEffect::new); private final boolean tinted; diff --git a/src/main/java/com/minelittlepony/unicopia/particle/OrientedBillboardParticleEffect.java b/src/main/java/com/minelittlepony/unicopia/particle/OrientedBillboardParticleEffect.java index 6297efbe..cb7173c4 100644 --- a/src/main/java/com/minelittlepony/unicopia/particle/OrientedBillboardParticleEffect.java +++ b/src/main/java/com/minelittlepony/unicopia/particle/OrientedBillboardParticleEffect.java @@ -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 FACTORY = ParticleFactoryHelper.of(OrientedBillboardParticleEffect::new, OrientedBillboardParticleEffect::new); private final boolean fixed; diff --git a/src/main/java/com/minelittlepony/unicopia/particle/ParticleFactoryHelper.java b/src/main/java/com/minelittlepony/unicopia/particle/ParticleFactoryHelper.java index 2a227231..2f97ac6a 100644 --- a/src/main/java/com/minelittlepony/unicopia/particle/ParticleFactoryHelper.java +++ b/src/main/java/com/minelittlepony/unicopia/particle/ParticleFactoryHelper.java @@ -28,6 +28,7 @@ public interface ParticleFactoryHelper { return reader.readFloat(); } + @SuppressWarnings("deprecation") static ParticleEffect.Factory of(CommandReader commandReader, PacketReader packetReader) { return new ParticleEffect.Factory<>() { @Override diff --git a/src/main/java/com/minelittlepony/unicopia/particle/SphereParticleEffect.java b/src/main/java/com/minelittlepony/unicopia/particle/SphereParticleEffect.java index e85f06a0..7bef9e6c 100644 --- a/src/main/java/com/minelittlepony/unicopia/particle/SphereParticleEffect.java +++ b/src/main/java/com/minelittlepony/unicopia/particle/SphereParticleEffect.java @@ -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 FACTORY = ParticleFactoryHelper.of(SphereParticleEffect::new, SphereParticleEffect::new); private final Vec3f color; diff --git a/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java b/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java index 487a8e62..7bb9e320 100644 --- a/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java @@ -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
  • physics = new EntityPhysics<>(this, GRAVITY, false); - private BlockPos lastBlockPos; - public MagicProjectileEntity(EntityType type, World world) { super(type, world); } @@ -162,14 +159,8 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster
  • spell.tick(this, Situation.PROJECTILE)).isPresent()) { - discard(); - } + if (!getSpellSlot().get(true).filter(spell -> spell.tick(this, Situation.PROJECTILE)).isPresent()) { + discard(); } if (getHydrophobic()) {