diff --git a/src/main/java/org/auraclient/auraclient/menus/CloakSelector.java b/src/main/java/org/auraclient/auraclient/menus/CloakSelector.java index 8f32ff4..941ce52 100644 --- a/src/main/java/org/auraclient/auraclient/menus/CloakSelector.java +++ b/src/main/java/org/auraclient/auraclient/menus/CloakSelector.java @@ -23,8 +23,6 @@ public class CloakSelector extends AuraUi { for (int i = 0; i < AuraClient.list.size(); i++) { String cloak = AuraClient.list.get(i); ImageButton img = new ImageButton(Identifier.of("auraclient", "textures/gui/cloaks/"+cloak.replaceAll("\\.(gif|png)", "")+".prev.png"), x, y, 32, 92); - img.textureHeight = 16; - img.textureWidth = 16; img.onClick = () -> { AuraClient.cape = cloak; }; diff --git a/src/main/java/org/auraclient/auraclient/ui/Box.java b/src/main/java/org/auraclient/auraclient/ui/Box.java index 55fcce1..510af75 100644 --- a/src/main/java/org/auraclient/auraclient/ui/Box.java +++ b/src/main/java/org/auraclient/auraclient/ui/Box.java @@ -1,13 +1,19 @@ package org.auraclient.auraclient.ui; import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.render.RenderLayer; +import net.minecraft.util.Identifier; public class Box extends AuraWidget { + public static Identifier BOX = Identifier.of("auraclient", "textures/gui/box/box.png"); + public Box(int x, int y, int width, int height) { super(x, y, width, height); } public void render(DrawContext context, boolean hover) { - context.fill(x1, y1, x2, y2, background); + int width = x2 - x1; + int height = y2 - y1; + context.drawTexture(RenderLayer::getGuiTextured, Box.BOX, x1, y1, 0, 0, width, height, width, height); } } diff --git a/src/main/java/org/auraclient/auraclient/ui/Button.java b/src/main/java/org/auraclient/auraclient/ui/Button.java index dc3caa6..e74edac 100644 --- a/src/main/java/org/auraclient/auraclient/ui/Button.java +++ b/src/main/java/org/auraclient/auraclient/ui/Button.java @@ -1,6 +1,8 @@ package org.auraclient.auraclient.ui; import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.render.RenderLayer; +import net.minecraft.util.Identifier; public class Button extends AuraWidget { public Runnable onClick; @@ -14,7 +16,9 @@ public class Button extends AuraWidget { } public void render(DrawContext context, boolean hover) { - context.fill(x1, y1, x2, y2, background); + int width = x2 - x1; + int height = y2 - y1; + context.drawTexture(RenderLayer::getGuiTextured, Box.BOX, x1, y1, 0, 0, width, height, width, height); context.drawText(client.textRenderer, text, (((x2 - x1) - client.textRenderer.getWidth(text)) / 2) + x1, (((y2 - y1) - 6) / 2) + y1, foreground, false); diff --git a/src/main/java/org/auraclient/auraclient/ui/ImageButton.java b/src/main/java/org/auraclient/auraclient/ui/ImageButton.java index eceb68c..b4dce91 100644 --- a/src/main/java/org/auraclient/auraclient/ui/ImageButton.java +++ b/src/main/java/org/auraclient/auraclient/ui/ImageButton.java @@ -7,23 +7,17 @@ import net.minecraft.util.Identifier; public class ImageButton extends AuraWidget { private final Identifier sprite; public int hoverBorder = 0xFFFFFFFF; - public int textureWidth; - public int textureHeight; public Runnable onClick; public ImageButton(Identifier sprite_, int x, int y, int width, int height) { super(x, y, width, height); this.sprite = sprite_; - this.textureWidth = width; - this.textureHeight = height; this.onClick = () -> {}; } public ImageButton(Identifier sprite_, int x, int y, int width, int height, int textureWidth, int textureHeight) { super(x, y, width, height); this.sprite = sprite_; - this.textureWidth = textureWidth; - this.textureHeight = textureHeight; this.onClick = () -> {}; } diff --git a/src/main/resources/assets/auraclient/textures/gui/box/box.png b/src/main/resources/assets/auraclient/textures/gui/box/box.png new file mode 100644 index 0000000..a408ab2 Binary files /dev/null and b/src/main/resources/assets/auraclient/textures/gui/box/box.png differ diff --git a/src/main/resources/assets/auraclient/textures/gui/cloaks/astelic.prev.png b/src/main/resources/assets/auraclient/textures/gui/cloaks/astelic.prev.png new file mode 100644 index 0000000..c25f318 Binary files /dev/null and b/src/main/resources/assets/auraclient/textures/gui/cloaks/astelic.prev.png differ diff --git a/src/main/resources/assets/auraclient/textures/gui/cloaks/glitch.prev.png b/src/main/resources/assets/auraclient/textures/gui/cloaks/glitch.prev.png index 898caef..6334e6a 100644 Binary files a/src/main/resources/assets/auraclient/textures/gui/cloaks/glitch.prev.png and b/src/main/resources/assets/auraclient/textures/gui/cloaks/glitch.prev.png differ