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

Changelings can now untransform by using their ability on something they've already transformed into

Browse source
This commit is contained in:
Sollace 2023-11-07 18:20:04 +00:00
parent a2238640dd
commit ca8cf8371a
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
6 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,7 @@ import com.minelittlepony.unicopia.ability.data.Hit;
import com.minelittlepony.unicopia.ability.magic.spell.AbstractDisguiseSpell;
import com.minelittlepony.unicopia.ability.magic.spell.CastingMethod;
import com.minelittlepony.unicopia.ability.magic.spell.effect.SpellType;
import com.minelittlepony.unicopia.entity.behaviour.Disguise;
import com.minelittlepony.unicopia.entity.player.Pony;
import com.minelittlepony.unicopia.mixin.MixinFallingBlockEntity;
import com.minelittlepony.unicopia.particle.UParticles;
@ -50,9 +51,13 @@ public class ChangelingDisguiseAbility extends ChangelingFeedAbility {
player.getEntityWorld().playSound(null, player.getBlockPos(), USounds.ENTITY_PLAYER_CHANGELING_TRANSFORM, SoundCategory.PLAYERS, 1.4F, 0.4F);
iplayer.getSpellSlot().get(SpellType.CHANGELING_DISGUISE, true)
.orElseGet(() -> SpellType.CHANGELING_DISGUISE.withTraits().apply(iplayer, CastingMethod.INNATE))
.setDisguise(looked);
Disguise currentDisguise = iplayer.getSpellSlot().get(SpellType.CHANGELING_DISGUISE, true)
.orElseGet(() -> SpellType.CHANGELING_DISGUISE.withTraits().apply(iplayer, CastingMethod.INNATE));
if (currentDisguise.isOf(looked)) {
looked = null;
}
currentDisguise.setDisguise(looked);
if (!player.isCreative()) {
iplayer.getMagicalReserves().getMana().multiply(0.1F);
@ -65,7 +70,7 @@ public class ChangelingDisguiseAbility extends ChangelingFeedAbility {
@Override
public void warmUp(Pony player, AbilitySlot slot) {
player.getMagicalReserves().getEnergy().add(20);
player.getMagicalReserves().getEnergy().add(2F);
player.spawnParticles(UParticles.CHANGELING_MAGIC, 5);
}

4
src/main/java/com/minelittlepony/unicopia/entity/behaviour/Disguise.java
View file

@ -46,6 +46,10 @@ public interface Disguise extends FlightType.Provider, PlayerDimensions.Provider
return getAppearance().flatMap(d -> d.getTargetDimensions(player));
}
default boolean isOf(@Nullable Entity entity) {
return getDisguise().isOf(entity);
}
default Disguise setDisguise(@Nullable Entity entity) {
if (entity == getDisguise().getAppearance()) {
entity = null;

4
src/main/java/com/minelittlepony/unicopia/entity/behaviour/EntityAppearance.java
View file

@ -109,6 +109,10 @@ public class EntityAppearance implements NbtSerialisable, PlayerDimensions.Provi
return entity != null;
}
public boolean isOf(@Nullable Entity entity) {
return isPresent() && entity != null && EntityBehaviour.forEntity(this.entity).isEqual(this.entity, entity);
}
public NbtCompound getOrCreateTag() {
if (tag == null) {
tag = new NbtCompound();

4
src/main/java/com/minelittlepony/unicopia/entity/behaviour/EntityBehaviour.java
View file

@ -74,6 +74,10 @@ public class EntityBehaviour<T extends Entity> {
entity.remove(RemovalReason.KILLED);
}
public boolean isEqual(T a, Entity b) {
return a.getType() == b.getType();
}
public Optional<Double> getCameraDistance(Entity entity, Pony player) {
if (entity == null) {
return Optional.empty();

5
src/main/java/com/minelittlepony/unicopia/entity/behaviour/FallingBlockBehaviour.java
View file

@ -53,6 +53,11 @@ public class FallingBlockBehaviour extends EntityBehaviour<FallingBlockEntity> {
}
}
@Override
public boolean isEqual(FallingBlockEntity a, Entity b) {
return b instanceof FallingBlockEntity f && f.getBlockState() == a.getBlockState();
}
private FallingBlockEntity configure(FallingBlockEntity entity, Block block) {
if (block instanceof MixinFallingBlock) {
((MixinFallingBlock)block).invokeConfigureFallingBlockEntity(entity);

7
src/main/java/com/minelittlepony/unicopia/entity/behaviour/PlayerBehaviour.java
View file

@ -4,6 +4,7 @@ import com.minelittlepony.unicopia.entity.Living;
import com.minelittlepony.unicopia.entity.duck.*;
import com.minelittlepony.unicopia.entity.player.Pony;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.PlayerEntity;
public class PlayerBehaviour extends EntityBehaviour<PlayerEntity> {
@ -29,8 +30,12 @@ public class PlayerBehaviour extends EntityBehaviour<PlayerEntity> {
entity.setSwimming(source.asEntity().isSwimming());
}
if (source.asEntity() instanceof LivingEntityDuck duck) {
// TODO: CopyAngles
duck.copyLeaningAnglesFrom(((LivingEntityDuck)entity));
}
}
@Override
public boolean isEqual(PlayerEntity a, Entity b) {
return b instanceof PlayerEntity p && p.getUuid().equals(b.getUuid());
}
}