diff --git a/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyKickAbility.java b/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyKickAbility.java index 9f6bb09c..0affd0cf 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyKickAbility.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyKickAbility.java @@ -61,7 +61,7 @@ public class EarthPonyKickAbility implements Ability { @Override public Identifier getIcon(Pony player) { return getId().withPath(p -> "textures/gui/ability/" + p - + "_" + player.getObservedSpecies().getId().getPath() + + "_" + (player.getObservedSpecies().isHuman() ? Race.EARTH : player.getObservedSpecies()).getId().getPath() + "_" + (getKickDirection(player) > 0 ? "forward" : "backward") + ".png"); } diff --git a/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyStompAbility.java b/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyStompAbility.java index e81f5a0d..b702400f 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyStompAbility.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyStompAbility.java @@ -70,8 +70,9 @@ public class EarthPonyStompAbility implements Ability { @Override public Identifier getIcon(Pony player) { Identifier id = Abilities.REGISTRY.getId(this); + Race race = player.getObservedSpecies(); return new Identifier(id.getNamespace(), "textures/gui/ability/" + id.getPath() - + "_" + player.getObservedSpecies().getId().getPath() + + "_" + (race.isHuman() ? Race.EARTH : race).getId().getPath() + ".png"); } diff --git a/src/main/java/com/minelittlepony/unicopia/ability/ToggleFlightAbility.java b/src/main/java/com/minelittlepony/unicopia/ability/ToggleFlightAbility.java index d9811e74..4f20d77d 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/ToggleFlightAbility.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/ToggleFlightAbility.java @@ -43,9 +43,10 @@ public class ToggleFlightAbility implements Ability { @Override public Identifier getIcon(Pony player) { Identifier id = Abilities.REGISTRY.getId(this); + Race race = player.getObservedSpecies(); return new Identifier(id.getNamespace(), "textures/gui/ability/" + id.getPath() + (player.getPhysics().isFlying() ? "_land" : "_takeoff") - + "_" + player.getObservedSpecies().getId().getPath() + + "_" + (race.isHuman() ? Race.EARTH : race).getId().getPath() + ".png"); } diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/carry.png b/src/main/resources/assets/unicopia/textures/gui/ability/carry.png index 6dc5380d..68271d24 100644 Binary files a/src/main/resources/assets/unicopia/textures/gui/ability/carry.png and b/src/main/resources/assets/unicopia/textures/gui/ability/carry.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/cast.png b/src/main/resources/assets/unicopia/textures/gui/ability/cast.png index 097c07af..4af1518a 100644 Binary files a/src/main/resources/assets/unicopia/textures/gui/ability/cast.png and b/src/main/resources/assets/unicopia/textures/gui/ability/cast.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/dispell.png b/src/main/resources/assets/unicopia/textures/gui/ability/dispell.png index 7afef72e..f79663be 100644 Binary files a/src/main/resources/assets/unicopia/textures/gui/ability/dispell.png and b/src/main/resources/assets/unicopia/textures/gui/ability/dispell.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/kick_bat_backward.png b/src/main/resources/assets/unicopia/textures/gui/ability/kick_bat_backward.png new file mode 100644 index 00000000..e06dfedc Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/kick_bat_backward.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/kick_bat_forward.png b/src/main/resources/assets/unicopia/textures/gui/ability/kick_bat_forward.png new file mode 100644 index 00000000..80bd4a02 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/kick_bat_forward.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/kick_changeling_backward.png b/src/main/resources/assets/unicopia/textures/gui/ability/kick_changeling_backward.png new file mode 100644 index 00000000..21bed4d9 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/kick_changeling_backward.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/kick_changeling_forward.png b/src/main/resources/assets/unicopia/textures/gui/ability/kick_changeling_forward.png new file mode 100644 index 00000000..50500939 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/kick_changeling_forward.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/kick_hippogriff_backward.png b/src/main/resources/assets/unicopia/textures/gui/ability/kick_hippogriff_backward.png new file mode 100644 index 00000000..73b98514 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/kick_hippogriff_backward.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/kick_hippogriff_forward.png b/src/main/resources/assets/unicopia/textures/gui/ability/kick_hippogriff_forward.png new file mode 100644 index 00000000..03601d14 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/kick_hippogriff_forward.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/kick_kirin_backward.png b/src/main/resources/assets/unicopia/textures/gui/ability/kick_kirin_backward.png new file mode 100644 index 00000000..fcef4e75 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/kick_kirin_backward.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/kick_kirin_forward.png b/src/main/resources/assets/unicopia/textures/gui/ability/kick_kirin_forward.png new file mode 100644 index 00000000..54626e5b Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/kick_kirin_forward.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/kick_pegasus_backward.png b/src/main/resources/assets/unicopia/textures/gui/ability/kick_pegasus_backward.png new file mode 100644 index 00000000..e5660f02 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/kick_pegasus_backward.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/kick_pegasus_forward.png b/src/main/resources/assets/unicopia/textures/gui/ability/kick_pegasus_forward.png new file mode 100644 index 00000000..7a377704 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/kick_pegasus_forward.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/kick_unicorn_backward.png b/src/main/resources/assets/unicopia/textures/gui/ability/kick_unicorn_backward.png new file mode 100644 index 00000000..73b98514 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/kick_unicorn_backward.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/kick_unicorn_forward.png b/src/main/resources/assets/unicopia/textures/gui/ability/kick_unicorn_forward.png new file mode 100644 index 00000000..7952d24e Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/kick_unicorn_forward.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/shoot.png b/src/main/resources/assets/unicopia/textures/gui/ability/shoot.png index 72eb1dcc..f293d7ec 100644 Binary files a/src/main/resources/assets/unicopia/textures/gui/ability/shoot.png and b/src/main/resources/assets/unicopia/textures/gui/ability/shoot.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/stomp_bat.png b/src/main/resources/assets/unicopia/textures/gui/ability/stomp_bat.png new file mode 100644 index 00000000..3e2cdece Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/stomp_bat.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/stomp_changeling.png b/src/main/resources/assets/unicopia/textures/gui/ability/stomp_changeling.png new file mode 100644 index 00000000..5423656b Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/stomp_changeling.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/stomp_hippogriff.png b/src/main/resources/assets/unicopia/textures/gui/ability/stomp_hippogriff.png new file mode 100644 index 00000000..d928d59d Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/stomp_hippogriff.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/stomp_kirin.png b/src/main/resources/assets/unicopia/textures/gui/ability/stomp_kirin.png new file mode 100644 index 00000000..73b51d6e Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/stomp_kirin.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/stomp_pegasus.png b/src/main/resources/assets/unicopia/textures/gui/ability/stomp_pegasus.png new file mode 100644 index 00000000..88823358 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/stomp_pegasus.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/stomp_unicorn.png b/src/main/resources/assets/unicopia/textures/gui/ability/stomp_unicorn.png new file mode 100644 index 00000000..29fcde62 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/stomp_unicorn.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_land_earth.png b/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_land_earth.png new file mode 100644 index 00000000..d29305e5 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_land_earth.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_land_kirin.png b/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_land_kirin.png new file mode 100644 index 00000000..d29305e5 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_land_kirin.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_land_unicorn.png b/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_land_unicorn.png new file mode 100644 index 00000000..7b9c8ea5 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_land_unicorn.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_takeoff_earth.png b/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_takeoff_earth.png new file mode 100644 index 00000000..1587dceb Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_takeoff_earth.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_takeoff_kirin.png b/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_takeoff_kirin.png new file mode 100644 index 00000000..1587dceb Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_takeoff_kirin.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_takeoff_unicorn.png b/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_takeoff_unicorn.png new file mode 100644 index 00000000..17c52359 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_takeoff_unicorn.png differ