diff --git a/src/main/java/com/minelittlepony/unicopia/client/gui/Slot.java b/src/main/java/com/minelittlepony/unicopia/client/gui/Slot.java index bbab1c35..0ed68472 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/gui/Slot.java +++ b/src/main/java/com/minelittlepony/unicopia/client/gui/Slot.java @@ -58,7 +58,7 @@ class Slot { matrices.translate(x, y, 0); AbilityDispatcher.Stat stat = abilities.getStat(slot); - float cooldown = 0.99999F;// stat.getFillProgress(); + float cooldown = stat.getFillProgress(); // background UHud.drawTexture(matrices, 0, 0, textureU, textureV, size, size, 128, 128); diff --git a/src/main/java/com/minelittlepony/unicopia/client/gui/UHud.java b/src/main/java/com/minelittlepony/unicopia/client/gui/UHud.java index 5ccfb8a1..6cc5f900 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/gui/UHud.java +++ b/src/main/java/com/minelittlepony/unicopia/client/gui/UHud.java @@ -28,7 +28,7 @@ public class UHud extends DrawableHelper { private final MinecraftClient client = MinecraftClient.getInstance(); private final List slots = Util.make(new ArrayList<>(), slots -> { - slots.add(new Slot(this, AbilitySlot.PRIMARY, 0, 0, 8, 49, 38, 24).foreground(0, 59)); + slots.add(new Slot(this, AbilitySlot.PRIMARY, 0, 0, 8, 49, 38, 24).background(0, 5).foreground(0, 59)); slots.add(new Slot(this, AbilitySlot.SECONDARY, 26, -5, 3, 22, 17, 18).background(80, 105)); slots.add(new Slot(this, AbilitySlot.TERTIARY, 36, 19, 3, 22, 17, 18).background(80, 105)); }); @@ -45,7 +45,7 @@ public class UHud extends DrawableHelper { int scaledHeight = client.getWindow().getScaledHeight(); matrices.push(); - matrices.translate(104 + (scaledWidth - 50) / 2, 20 + scaledHeight - /*70*/ 80, 0); + matrices.translate(104 + (scaledWidth - 50) / 2, 20 + scaledHeight - 70, 0); RenderSystem.enableAlphaTest(); RenderSystem.enableBlend(); 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 07e809b3..3a640bf6 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/cloud.png b/src/main/resources/assets/unicopia/textures/gui/ability/cloud.png deleted file mode 100644 index c9a56888..00000000 Binary files a/src/main/resources/assets/unicopia/textures/gui/ability/cloud.png and /dev/null differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/disguise.png b/src/main/resources/assets/unicopia/textures/gui/ability/disguise.png index 7376a678..a2fe153a 100644 Binary files a/src/main/resources/assets/unicopia/textures/gui/ability/disguise.png and b/src/main/resources/assets/unicopia/textures/gui/ability/disguise.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/feed.png b/src/main/resources/assets/unicopia/textures/gui/ability/feed.png index 7376a678..8f954ea1 100644 Binary files a/src/main/resources/assets/unicopia/textures/gui/ability/feed.png and b/src/main/resources/assets/unicopia/textures/gui/ability/feed.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/grow.png b/src/main/resources/assets/unicopia/textures/gui/ability/grow.png index 7376a678..fcf5f223 100644 Binary files a/src/main/resources/assets/unicopia/textures/gui/ability/grow.png and b/src/main/resources/assets/unicopia/textures/gui/ability/grow.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 index c9a56888..be49dcae 100644 Binary files a/src/main/resources/assets/unicopia/textures/gui/ability/stomp.png and b/src/main/resources/assets/unicopia/textures/gui/ability/stomp.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/ability/teleport.png b/src/main/resources/assets/unicopia/textures/gui/ability/teleport.png index 3bd33fbe..61094c24 100644 Binary files a/src/main/resources/assets/unicopia/textures/gui/ability/teleport.png and b/src/main/resources/assets/unicopia/textures/gui/ability/teleport.png differ diff --git a/src/main/resources/assets/unicopia/textures/gui/hud.png b/src/main/resources/assets/unicopia/textures/gui/hud.png index da5da08e..5bdc5ac1 100644 Binary files a/src/main/resources/assets/unicopia/textures/gui/hud.png and b/src/main/resources/assets/unicopia/textures/gui/hud.png differ