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

When switching bodies you will now inherit the race and abilities of whoever you switch with

Browse source
This commit is contained in:
Sollace 2022-10-14 16:22:09 +02:00
parent 9a19ed36c1
commit 8b38c54df0
4 changed files with 34 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,6 +4,7 @@ import com.minelittlepony.unicopia.ability.magic.Caster;
import com.minelittlepony.unicopia.ability.magic.spell.*;
import com.minelittlepony.unicopia.ability.magic.spell.trait.Trait;
import com.minelittlepony.unicopia.entity.EntityReference;
import com.minelittlepony.unicopia.entity.Living;
import com.minelittlepony.unicopia.particle.FollowingParticleEffect;
import com.minelittlepony.unicopia.particle.MagicParticleEffect;
import com.minelittlepony.unicopia.particle.UParticles;
@ -120,6 +121,7 @@ public class AttractiveSpell extends ShieldSpell implements ProjectileSpell, Hom
}
}
target.setVelocity(x, y, z);
Living.updateVelocity(target);
}
@Override

2
src/main/java/com/minelittlepony/unicopia/client/gui/UHud.java
View file

@ -125,7 +125,7 @@ public class UHud extends DrawableHelper {
matrices.pop();
if (pony.getSpecies().canCast()) {
if (pony.getActualSpecies().canCast()) {
renderSpell(pony.getCharms().getEquippedSpell(Hand.MAIN_HAND), hudX + 15 - xDirection * 13, hudY + 3);
renderSpell(pony.getCharms().getEquippedSpell(Hand.OFF_HAND), hudX + 15 - xDirection * 2, hudY - 3);
}

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

@ -348,13 +348,18 @@ public class EntityAppearance implements NbtSerialisable, PlayerDimensions.Provi
entityNbt.putString("playerName", profile.getName());
entityNbt.putByte("playerVisibleParts", player.getDataTracker().get(Disguise.PlayerAccess.getModelBitFlag()));
NbtCompound playerNbt = player.writeNbt(new NbtCompound());
return NbtSerialisable.subTag("playerNbt", entityNbt, playerNbt -> {
player.writeNbt(playerNbt);
playerNbt.remove("unicopia_caster");
entityNbt.put("playerNbt", playerNbt);
} else {
Pony pony = Pony.of(player);
if (pony != null) {
NbtSerialisable.subTag("unicopia_caster", playerNbt, pony::toSyncronisedNbt);
}
});
}
entity.saveSelfNbt(entityNbt);
entityNbt.remove("unicopia_caster");
}
return entityNbt;
}

21
src/main/java/com/minelittlepony/unicopia/util/NbtSerialisable.java
View file

@ -1,7 +1,7 @@
package com.minelittlepony.unicopia.util;
import java.util.*;
import java.util.function.Function;
import java.util.function.*;
import java.util.stream.Stream;
import com.mojang.datafixers.util.Pair;
@ -54,6 +54,17 @@ public interface NbtSerialisable {
return codec.encodeStart(NbtOps.INSTANCE, value).result().get();
}
static NbtCompound subTag(String name, NbtCompound parent) {
NbtCompound child = new NbtCompound();
parent.put(name, child);
return child;
}
static NbtCompound subTag(String name, NbtCompound parent, Consumer<NbtCompound> writer) {
writer.accept(subTag(name, parent));
return parent;
}
interface Serializer<T> {
T read(NbtCompound compound);
@ -83,6 +94,14 @@ public interface NbtSerialisable {
return list.stream().map(this::read).filter(Objects::nonNull);
}
static <T extends NbtSerialisable> Serializer<T> of(Supplier<T> factory) {
return of(nbt -> {
T value = factory.get();
value.fromNBT(nbt);
return value;
}, value -> value.toNBT());
}
static <T> Serializer<T> of(Function<NbtCompound, T> read, Function<T, NbtCompound> write) {
return new Serializer<>() {
@Override