diff --git a/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyKickAbility.java b/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyKickAbility.java index 6dc7fffd..2698b36c 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyKickAbility.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyKickAbility.java @@ -31,6 +31,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.predicate.entity.EntityPredicates; import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; import net.minecraft.util.math.Vec3d; @@ -57,6 +58,14 @@ public class EarthPonyKickAbility implements Ability { return race.canUseEarth(); } + @Override + public Identifier getIcon(Pony player) { + Identifier id = Abilities.REGISTRY.getId(this); + return new Identifier(id.getNamespace(), "textures/gui/ability/" + id.getPath() + + "_" + player.getObservedSpecies().getId().getPath() + + ".png"); + } + @Override public double getCostEstimate(Pony player) { return TraceHelper.findBlock(player.asEntity(), getKickDirection(player) * 6, 1) diff --git a/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyStompAbility.java b/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyStompAbility.java index 544ae467..79bb48d2 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyStompAbility.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyStompAbility.java @@ -27,6 +27,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.registry.tag.BlockTags; import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockBox; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; @@ -61,6 +62,14 @@ public class EarthPonyStompAbility implements Ability { return race.canUseEarth(); } + @Override + public Identifier getIcon(Pony player) { + Identifier id = Abilities.REGISTRY.getId(this); + return new Identifier(id.getNamespace(), "textures/gui/ability/" + id.getPath() + + "_" + player.getObservedSpecies().getId().getPath() + + ".png"); + } + @Override public double getCostEstimate(Pony player) { return rad; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/PegasusFlightToggleAbility.java b/src/main/java/com/minelittlepony/unicopia/ability/PegasusFlightToggleAbility.java index 11ef53fc..c0736de0 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/PegasusFlightToggleAbility.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/PegasusFlightToggleAbility.java @@ -45,7 +45,7 @@ public class PegasusFlightToggleAbility implements Ability { Identifier id = Abilities.REGISTRY.getId(this); return new Identifier(id.getNamespace(), "textures/gui/ability/" + id.getPath() + (player.getPhysics().isFlying() ? "_land" : "_takeoff") - + (player.getObservedSpecies() == Race.CHANGELING ? "_changeling" : "") + + "_" + player.getObservedSpecies().getId().getPath() + ".png"); } diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/kick.png b/src/main/resources/assets/unicopia/textures/gui/ability/kick.png deleted file mode 100644 index de75f52f..00000000 Binary files a/src/main/resources/assets/unicopia/textures/gui/ability/kick.png and /dev/null differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/kick_alicorn.png b/src/main/resources/assets/unicopia/textures/gui/ability/kick_alicorn.png new file mode 100644 index 00000000..7952d24e Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/kick_alicorn.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/kick_earth.png b/src/main/resources/assets/unicopia/textures/gui/ability/kick_earth.png new file mode 100644 index 00000000..54626e5b Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/kick_earth.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 bbf65511..72eb1dcc 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.png b/src/main/resources/assets/unicopia/textures/gui/ability/stomp.png deleted file mode 100644 index add9938b..00000000 Binary files a/src/main/resources/assets/unicopia/textures/gui/ability/stomp.png and /dev/null differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/stomp_alicorn.png b/src/main/resources/assets/unicopia/textures/gui/ability/stomp_alicorn.png new file mode 100644 index 00000000..ff4a71f6 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/stomp_alicorn.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/stomp_earth.png b/src/main/resources/assets/unicopia/textures/gui/ability/stomp_earth.png new file mode 100644 index 00000000..73b51d6e Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/stomp_earth.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_land_alicorn.png b/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_land_alicorn.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_alicorn.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_land_bat.png b/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_land_bat.png new file mode 100644 index 00000000..b3ef9926 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_land_bat.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_land.png b/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_land_pegasus.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_land.png rename to src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_land_pegasus.png diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_takeoff_alicorn.png b/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_takeoff_alicorn.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_alicorn.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_takeoff_bat.png b/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_takeoff_bat.png new file mode 100644 index 00000000..3c511704 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_takeoff_bat.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_takeoff.png b/src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_takeoff_pegasus.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_takeoff.png rename to src/main/resources/assets/unicopia/textures/gui/ability/toggle_flight_takeoff_pegasus.png