From 2aae1e6aa0ee9a562d0d1464e572e470be6c2e38 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sat, 13 Feb 2021 23:12:02 +0200 Subject: [PATCH] group_teleport -> teleport_group so it's sorted to the right page --- .../minelittlepony/unicopia/ability/Abilities.java | 3 +-- src/main/resources/assets/unicopia/lang/en_us.json | 2 +- ...roup_teleport_far.png => teleport_group_far.png} | Bin ...up_teleport_near.png => teleport_group_near.png} | Bin 4 files changed, 2 insertions(+), 3 deletions(-) rename src/main/resources/assets/unicopia/textures/gui/ability/{group_teleport_far.png => teleport_group_far.png} (100%) rename src/main/resources/assets/unicopia/textures/gui/ability/{group_teleport_near.png => teleport_group_near.png} (100%) diff --git a/src/main/java/com/minelittlepony/unicopia/ability/Abilities.java b/src/main/java/com/minelittlepony/unicopia/ability/Abilities.java index 3b99a868..e8c374f3 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/Abilities.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/Abilities.java @@ -4,7 +4,6 @@ import java.util.EnumMap; import java.util.HashSet; import java.util.Map; import java.util.Set; - import com.minelittlepony.unicopia.util.Registries; import net.minecraft.util.Identifier; @@ -17,7 +16,7 @@ public interface Abilities { // unicorn / alicorn Ability CAST = register(new UnicornCastingAbility(), "cast", AbilitySlot.PRIMARY); Ability TELEPORT = register(new UnicornTeleportAbility(), "teleport", AbilitySlot.SECONDARY); - Ability GROUP_TELEPORT = register(new UnicornGroupTeleportAbility(), "group_teleport", AbilitySlot.SECONDARY); + Ability GROUP_TELEPORT = register(new UnicornGroupTeleportAbility(), "teleport_group", AbilitySlot.SECONDARY); Ability SHOOT = register(new UnicornProjectileAbility(), "shoot", AbilitySlot.TERTIARY); // earth / alicorn diff --git a/src/main/resources/assets/unicopia/lang/en_us.json b/src/main/resources/assets/unicopia/lang/en_us.json index b5ce7b7c..3cf64b0c 100644 --- a/src/main/resources/assets/unicopia/lang/en_us.json +++ b/src/main/resources/assets/unicopia/lang/en_us.json @@ -132,7 +132,7 @@ "ability.unicopia.shoot": "Magic Missle", "ability.unicopia.cast": "Counterspell", "ability.unicopia.teleport": "Teleport", - "ability.unicopia.group_teleport": "Teleport (Group)", + "ability.unicopia.teleport_group": "Teleport (Group)", "ability.unicopia.grow": "Earthly Nourishment", "ability.unicopia.stomp": "Ground Pound", "ability.unicopia.kick": "Crushing Blow", diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/group_teleport_far.png b/src/main/resources/assets/unicopia/textures/gui/ability/teleport_group_far.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/gui/ability/group_teleport_far.png rename to src/main/resources/assets/unicopia/textures/gui/ability/teleport_group_far.png diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/group_teleport_near.png b/src/main/resources/assets/unicopia/textures/gui/ability/teleport_group_near.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/gui/ability/group_teleport_near.png rename to src/main/resources/assets/unicopia/textures/gui/ability/teleport_group_near.png