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

Fixed serialization of delegate spell types

Browse source
This commit is contained in:
Sollace 2021-11-22 00:48:22 +02:00
parent 7d830a3474
commit 9bb2818c2c
3 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/CompoundSpell.java
View file

@ -38,9 +38,8 @@ public class CompoundSpell extends AbstractDelegatingSpell {
public void toNBT(NbtCompound compound) {
super.toNBT(compound);
NbtList spells = new NbtList();
this.spells.forEach(spell -> {
spells.add(spell.toNBT());
});
this.spells.stream().map(SpellType::toNBT).forEach(spells::add);
compound.put("spells", spells);
}
@Override

4
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/PlaceableSpell.java
View file

@ -100,17 +100,19 @@ public class PlaceableSpell extends AbstractDelegatingSpell {
compound.putString("dimension", dimension.toString());
}
compound.put("castEntity", castEntity.toNBT());
compound.put("spell", SpellType.toNBT(spell));
}
@Override
public void fromNBT(NbtCompound compound) {
super.toNBT();
super.fromNBT(compound);
if (compound.contains("dimension")) {
dimension = new Identifier(compound.getString("dimension"));
}
if (compound.contains("castEntity")) {
castEntity.fromNBT(compound.getCompound("castEntity"));
}
spell = SpellType.fromNBT(compound.getCompound("spell"));
}
@Override

13
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/ThrowableSpell.java
View file

@ -12,6 +12,7 @@ import com.minelittlepony.unicopia.item.UItems;
import com.minelittlepony.unicopia.projectile.MagicProjectileEntity;
import net.minecraft.entity.LivingEntity;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.sound.SoundCategory;
import net.minecraft.sound.SoundEvents;
import net.minecraft.world.World;
@ -62,6 +63,18 @@ public class ThrowableSpell extends AbstractDelegatingSpell {
return Optional.empty();
}
@Override
public void toNBT(NbtCompound compound) {
super.toNBT(compound);
compound.put("spell", SpellType.toNBT(spell));
}
@Override
public void fromNBT(NbtCompound compound) {
super.fromNBT(compound);
spell = SpellType.fromNBT(compound.getCompound("spell"));
}
@Override
public ThrowableSpell toThrowable() {
return this;