Prep for a future feature

src/main/java/com/minelittlepony/unicopia/advancement/CustomEventCriterion.java

@@ -83,7 +83,7 @@ public class CustomEventCriterion extends AbstractCriterion<CustomEventCriterion
 
         public boolean test(String event, int count, ServerPlayerEntity player) {
             return this.event.equalsIgnoreCase(event)
-                    && (races.isEmpty() || races.contains(Pony.of(player).getSpecies()))
+                    && (races.isEmpty() || races.contains(Pony.of(player).getActualSpecies()))
                     && (flying == null || flying == Pony.of(player).getPhysics().isFlying())
                     && (repeatCount <= 0 || (count > 0 && count % repeatCount == 0));
         }

src/main/java/com/minelittlepony/unicopia/advancement/RaceChangeCriterion.java

@@ -44,7 +44,7 @@ public class RaceChangeCriterion extends AbstractCriterion<RaceChangeCriterion.C
         }
 
         public boolean test(ServerPlayerEntity player) {
-            return Pony.of(player).getSpecies() == race;
+            return Pony.of(player).getActualSpecies() == race;
         }
 
         @Override

src/main/java/com/minelittlepony/unicopia/client/gui/DismissSpellScreen.java

@@ -84,7 +84,7 @@ public class DismissSpellScreen extends GameGui {
         DrawableUtil.drawArc(matrices, 160, 1600, 0, DrawableUtil.TAU, 0x00000020, false);
 
         super.render(matrices, mouseX, mouseY, delta);
-        DrawableUtil.renderRaceIcon(matrices, pony.getSpecies(), 0, 0, 16);
+        DrawableUtil.renderRaceIcon(matrices, pony.getActualSpecies(), 0, 0, 16);
         matrices.pop();
 
         DrawableUtil.drawLine(matrices, mouseX, mouseY - 4, mouseX, mouseY + 4, 0xFFAAFF99);

src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookProfilePageContent.java

@@ -36,7 +36,7 @@ public class SpellbookProfilePageContent extends DrawableHelper implements Spell
 
         screen.addDrawable(new SpellbookScreen.ImageButton(x, y, size, size))
             .getStyle()
-                .setIcon(TribeButton.createSprite(pony.getSpecies(), 0, 0, size))
+                .setIcon(TribeButton.createSprite(pony.getActualSpecies(), 0, 0, size))
                 .setTooltip(ProfileTooltip.get(pony));
 
 

src/main/java/com/minelittlepony/unicopia/command/SpeciesCommand.java

@@ -70,7 +70,7 @@ class SpeciesCommand {
     }
 
     static int get(ServerCommandSource source, PlayerEntity player, boolean isSelf) {
-        Race spec = Pony.of(player).getSpecies();
+        Race spec = Pony.of(player).getActualSpecies();
 
         String name = "commands.race.tell.";
         name += isSelf ? "self" : "other";

src/main/java/com/minelittlepony/unicopia/entity/effect/RaceChangeStatusEffect.java

@@ -75,7 +75,7 @@ public class RaceChangeStatusEffect extends StatusEffect {
 
         int progression = ticks % (stage.ordinal() * STAGE_DURATION);
 
-        if (eq.getSpecies() == race || !race.isPermitted(entity instanceof PlayerEntity ? (PlayerEntity)entity : null)) {
+        if ((eq instanceof Pony pony ? pony.getActualSpecies() : eq.getSpecies()) == race || !race.isPermitted(entity instanceof PlayerEntity ? (PlayerEntity)entity : null)) {
             if (progression == 0 && entity instanceof PlayerEntity && stage == Stage.CRAWLING) {
                 ((PlayerEntity)entity).sendMessage(Stage.INITIAL.getMessage(race), true);
             }

src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java

@@ -166,11 +166,11 @@ public class Pony extends Living<PlayerEntity> implements Transmittable, Copieab
 
     @Override
     public Race getSpecies() {
-        if (getMaster() == null) {
+        return getActualSpecies();
-            return Race.HUMAN;
+    }
-        }
 
-        return Race.fromName(getMaster().getDataTracker().get(RACE), Race.HUMAN);
+    public Race getActualSpecies() {
+        return Race.fromName(entity.getDataTracker().get(RACE), Race.HUMAN);
     }
 
     @Override
@@ -285,7 +285,7 @@ public class Pony extends Living<PlayerEntity> implements Transmittable, Copieab
             if (race != clientPreferredRace) {
                 clientPreferredRace = race;
 
-                if (race != getSpecies()) {
+                if (race != getActualSpecies()) {
                     Channel.CLIENT_REQUEST_SPECIES_CHANGE.send(new MsgRequestSpeciesChange(race));
                 }
             }
@@ -552,7 +552,7 @@ public class Pony extends Living<PlayerEntity> implements Transmittable, Copieab
     @Override
     public void toNBT(NbtCompound compound) {
         super.toNBT(compound);
-        compound.putString("playerSpecies", Race.REGISTRY.getId(getSpecies()).toString());
+        compound.putString("playerSpecies", Race.REGISTRY.getId(getActualSpecies()).toString());
         compound.putFloat("magicExhaustion", magicExhaustion);
         compound.putInt("ticksHanging", ticksHanging);
         NbtSerialisable.writeBlockPos("hangingPosition", hangingPosition, compound);
@@ -616,7 +616,7 @@ public class Pony extends Living<PlayerEntity> implements Transmittable, Copieab
             oldPlayer.getSpellSlot().stream(true).filter(SpellPredicate.IS_PLACED).forEach(getSpellSlot()::put);
         }
         oldPlayer.getSpellSlot().put(null);
-        setSpecies(oldPlayer.getSpecies());
+        setSpecies(oldPlayer.getActualSpecies());
         getDiscoveries().copyFrom(oldPlayer.getDiscoveries());
         getCharms().equipSpell(Hand.MAIN_HAND, oldPlayer.getCharms().getEquippedSpell(Hand.MAIN_HAND));
         getCharms().equipSpell(Hand.OFF_HAND, oldPlayer.getCharms().getEquippedSpell(Hand.OFF_HAND));

src/main/java/com/minelittlepony/unicopia/network/MsgPlayerCapabilities.java

@@ -42,7 +42,7 @@ public class MsgPlayerCapabilities implements Packet<PlayerEntity> {
 
     public MsgPlayerCapabilities(boolean full, Pony player) {
         playerId = player.getMaster().getUuid();
-        newRace = player.getSpecies();
+        newRace = player.getActualSpecies();
         compoundTag = full ? player.toNBT() : new NbtCompound();
     }
 

src/main/java/com/minelittlepony/unicopia/network/MsgRequestSpeciesChange.java

@@ -45,7 +45,7 @@ public class MsgRequestSpeciesChange implements Packet<ServerPlayerEntity> {
 
         Race worldDefaultRace = WorldTribeManager.forWorld((ServerWorld)player.getReferenceWorld()).getDefaultRace();
 
-        if (force || player.getSpecies().isDefault() || (player.getSpecies() == worldDefaultRace && !player.isSpeciesPersisted())) {
+        if (force || player.getActualSpecies().isDefault() || (player.getActualSpecies() == worldDefaultRace && !player.isSpeciesPersisted())) {
             player.setSpecies(newRace.isPermitted(sender) ? newRace : worldDefaultRace);
         }