From 2a202c416033afad6b7d7f7f0842d6f7aec05908 Mon Sep 17 00:00:00 2001 From: Leo dev Date: Sun, 11 May 2025 04:36:14 -0500 Subject: [PATCH] added cosmetic menus --- .../saturnclient/menus/CloaksMenu.java | 158 ------------------ .../saturnclient/menus/HatsMenu.java | 133 --------------- .../org/saturnclient/ui2/RenderScope.java | 6 + .../ui2/components/CosmeticPreview.java | 60 +++++++ .../ui2/components/SkinPreview.java | 87 ++++++++++ .../saturnclient/ui2/screens/CloakMenu.java | 74 ++++++++ .../org/saturnclient/ui2/screens/HatMenu.java | 74 ++++++++ .../org/saturnclient/ui2/screens/ModMenu.java | 7 +- .../saturnclient/ui2/screens/ShiftMenu.java | 3 +- .../saturnclient/ui2/screens/TitleMenu.java | 3 +- 10 files changed, 308 insertions(+), 297 deletions(-) delete mode 100644 src/main/java/org/saturnclient/saturnclient/menus/CloaksMenu.java delete mode 100644 src/main/java/org/saturnclient/saturnclient/menus/HatsMenu.java create mode 100644 src/main/java/org/saturnclient/ui2/components/CosmeticPreview.java create mode 100644 src/main/java/org/saturnclient/ui2/components/SkinPreview.java create mode 100644 src/main/java/org/saturnclient/ui2/screens/CloakMenu.java create mode 100644 src/main/java/org/saturnclient/ui2/screens/HatMenu.java diff --git a/src/main/java/org/saturnclient/saturnclient/menus/CloaksMenu.java b/src/main/java/org/saturnclient/saturnclient/menus/CloaksMenu.java deleted file mode 100644 index e34a3d4..0000000 --- a/src/main/java/org/saturnclient/saturnclient/menus/CloaksMenu.java +++ /dev/null @@ -1,158 +0,0 @@ -package org.saturnclient.saturnclient.menus; - -import net.minecraft.text.Text; -import org.saturnclient.saturnclient.SaturnClientConfig; -import org.saturnclient.saturnclient.auth.Auth; -import org.saturnclient.saturnclient.config.Property; -import org.saturnclient.saturnclient.cosmetics.cloaks.Cloaks; -import org.saturnclient.ui.SaturnUi; -import org.saturnclient.ui.Textures; -import org.saturnclient.ui.components.SkinPreview; -import org.saturnclient.ui.widgets.SaturnClickableImage; -import org.saturnclient.ui.widgets.SaturnClickableSprite; -import org.saturnclient.ui.widgets.SaturnImage; -import org.saturnclient.ui.widgets.SaturnInputBox; -import org.saturnclient.ui.widgets.SaturnScroll; -import org.saturnclient.ui.widgets.SaturnSprite; - -public class CloaksMenu extends SaturnUi { - - private SaturnScroll scroll; - private Property search = new Property<>(""); - - public CloaksMenu() { - super(Text.of("Cloaks Menu")); - } - - @Override - protected void init() { - int rectWidth = 330; - int rectHeight = 228; - int rectX = (width - rectWidth) / 2; - int rectY = (height - rectHeight + 15) / 2; - - draw( - new SaturnSprite(Textures.SETTINGS_BG) - .setX(rectX) - .setY(rectY) - .setWidth(rectWidth) - .setHeight(rectHeight) - .setAnimations(SaturnClientConfig.getAnimations())); - - int tabsX = (width - 43) / 2; - int tabsY = rectY - 17; - - draw( - new SaturnSprite(Textures.RECT) - .setX(tabsX) - .setY(tabsY) - .setWidth(43) - .setHeight(15) - .setAnimations(SaturnClientConfig.getAnimations())); - - draw( - new SaturnInputBox(search, rectX + rectWidth - 72, tabsY, 70).onUpdate(() -> { - scroll.clear(); - drawItems(rectX, rectY, rectWidth, rectHeight); - }) - .setHeight(15) - .setWidth(72) - .setAnimations(SaturnClientConfig.getAnimations())); - - int tabSize = 9; - tabsX = (width - tabSize) / 2; - draw( - new SaturnClickableImage(Textures.HAT, () -> { - client.setScreen(new HatsMenu()); - }) - .setX(tabsX) - .setY(tabsY + 4) - .setWidth(tabSize) - .setHeight(7) - .setAnimations(SaturnClientConfig.getAnimations())); - - draw( - new SaturnClickableImage(Textures.CLOAK, () -> { - }) - .setSelected(true) - .setX(tabsX - 12) - .setY(tabsY + 3) - .setWidth(tabSize) - .setHeight(tabSize) - .setAnimations(SaturnClientConfig.getAnimations())); - - draw( - new SaturnClickableImage(Textures.SEARCH, () -> { - System.out.println("Pressed"); - }) - .setX(tabsX + 12) - .setY(tabsY + 3) - .setWidth(tabSize) - .setHeight(tabSize) - .setAnimations(SaturnClientConfig.getAnimations())); - - scroll = new SaturnScroll(); - - drawItems(rectX, rectY, rectWidth, rectHeight); - - draw(scroll - .setX(rectX + 17) - .setY(rectY + 10) - .setWidth(rectWidth - 17) - .setHeight(rectHeight - 10) - .setAnimations(SaturnClientConfig.getAnimations())); - - draw(new SkinPreview(-30.0f, false) - .setScale(3.0f) - .setX((rectX + rectWidth) - 180) - .setY(rectY + 8) - .setAnimations(SaturnClientConfig.getAnimations())); - - super.init(); - } - - private void drawItems(int rectX, int rectY, int rectWidth, int rectHeight) { - int cloakWidth = 28; - int cloakHeight = 61; - - int modX = 0; - int modY = 0; - int col = 0; - - String[] searchTokens = search.value.toLowerCase().split("\\ "); - - outer: for (String cloak : Cloaks.availableCloaks) { - for (String searchToken : searchTokens) { - if (!cloak.contains(searchToken)) { - continue outer; - } - } - - scroll.draw( - new SaturnClickableSprite(Textures.BUTTON_BORDER, () -> { - Cloaks.setCloak(Auth.uuid, cloak); - }) - .setX(modX) - .setY(modY) - .setWidth(cloakWidth + 6) - .setHeight(cloakHeight + 6)); - - scroll.draw( - new SaturnImage(Textures.getCloakPreview(cloak)) - .setX(modX + 3) - .setY(modY + 3) - .setWidth(cloakWidth) - .setHeight(cloakHeight)); - - col++; - - if (col < 4) { - modX += cloakWidth + 21; - } else { - modX = 0; - modY += cloakHeight + 20; - col = 0; - } - } - } -} diff --git a/src/main/java/org/saturnclient/saturnclient/menus/HatsMenu.java b/src/main/java/org/saturnclient/saturnclient/menus/HatsMenu.java deleted file mode 100644 index fb8616b..0000000 --- a/src/main/java/org/saturnclient/saturnclient/menus/HatsMenu.java +++ /dev/null @@ -1,133 +0,0 @@ -package org.saturnclient.saturnclient.menus; - -import net.minecraft.text.Text; -import org.saturnclient.saturnclient.SaturnClientConfig; -import org.saturnclient.saturnclient.auth.Auth; -import org.saturnclient.saturnclient.cosmetics.Hats; -import org.saturnclient.ui.SaturnUi; -import org.saturnclient.ui.Textures; -import org.saturnclient.ui.components.SkinPreview; -import org.saturnclient.ui.widgets.SaturnClickableImage; -import org.saturnclient.ui.widgets.SaturnClickableSprite; -import org.saturnclient.ui.widgets.SaturnImage; -import org.saturnclient.ui.widgets.SaturnScroll; -import org.saturnclient.ui.widgets.SaturnSprite; - -public class HatsMenu extends SaturnUi { - - public HatsMenu() { - super(Text.of("Hats Menu")); - } - - @Override - protected void init() { - int rectWidth = 330; - int rectHeight = 228; - int rectX = (width - rectWidth) / 2; - int rectY = (height - rectHeight + 15) / 2; - - draw( - new SaturnSprite(Textures.SETTINGS_BG) - .setX(rectX) - .setY(rectY) - .setWidth(rectWidth) - .setHeight(rectHeight) - .setAnimations(SaturnClientConfig.getAnimations())); - - int tabsX = (width - 43) / 2; - int tabsY = rectY - 17; - - draw( - new SaturnSprite(Textures.RECT) - .setX(tabsX) - .setY(tabsY) - .setWidth(43) - .setHeight(15) - .setAnimations(SaturnClientConfig.getAnimations())); - - int tabSize = 9; - tabsX = (width - tabSize) / 2; - draw( - new SaturnClickableImage(Textures.HAT, () -> { - client.setScreen(new HatsMenu()); - }) - .setSelected(true) - .setX(tabsX) - .setY(tabsY + 4) - .setWidth(tabSize) - .setHeight(7) - .setAnimations(SaturnClientConfig.getAnimations())); - - draw( - new SaturnClickableImage(Textures.CLOAK, () -> { - client.setScreen(new CloaksMenu()); - }) - .setX(tabsX - 12) - .setY(tabsY + 3) - .setWidth(tabSize) - .setHeight(tabSize) - .setAnimations(SaturnClientConfig.getAnimations())); - - draw( - new SaturnClickableImage(Textures.SEARCH, () -> { - System.out.println("Pressed"); - }) - .setX(tabsX + 12) - .setY(tabsY + 3) - .setWidth(tabSize) - .setHeight(tabSize) - .setAnimations(SaturnClientConfig.getAnimations())); - - int hatSize = 28; - - int modX = 0; - int modY = 0; - int col = 0; - - SaturnScroll modsScroll = new SaturnScroll(); - - for (String hat : Hats.availableHats) { - modsScroll.draw( - new SaturnClickableSprite(Textures.BUTTON_BORDER, () -> { - Hats.setHat(Auth.uuid, hat); - }) - .setX(modX) - .setY(modY) - .setWidth(hatSize + 6) - .setHeight(hatSize + 6)); - - modsScroll.draw( - new SaturnImage(Textures.getHatPreview(hat)) - .setX(modX + 3) - .setY(modY + 3) - .setWidth(hatSize) - .setHeight(hatSize)); - - col++; - - if (col < 4) { - modX += hatSize + 21; - } else { - modX = 0; - modY += hatSize + 20; - col = 0; - } - } - - draw( - modsScroll - .setX(rectX + 17) - .setY(rectY + 10) - .setWidth(rectWidth - 17) - .setHeight(rectHeight - 10) - .setAnimations(SaturnClientConfig.getAnimations())); - - draw(new SkinPreview(170f, true) - .setScale(3.0f) - .setX((rectX + rectWidth) - 180) - .setY(rectY + 8) - .setAnimations(SaturnClientConfig.getAnimations())); - - super.init(); - } -} diff --git a/src/main/java/org/saturnclient/ui2/RenderScope.java b/src/main/java/org/saturnclient/ui2/RenderScope.java index 6f6e114..53285c7 100644 --- a/src/main/java/org/saturnclient/ui2/RenderScope.java +++ b/src/main/java/org/saturnclient/ui2/RenderScope.java @@ -3,6 +3,7 @@ package org.saturnclient.ui2; import java.util.ArrayDeque; import java.util.Deque; import java.util.Objects; +import java.util.function.Consumer; import java.util.function.Function; import org.jetbrains.annotations.Nullable; @@ -241,6 +242,11 @@ public class RenderScope { this.vertexConsumers.draw(); } + public void draw(Consumer drawer) { + drawer.accept(this.vertexConsumers); + this.vertexConsumers.draw(); + } + static class ScissorStack { private final Deque stack = new ArrayDeque<>(); diff --git a/src/main/java/org/saturnclient/ui2/components/CosmeticPreview.java b/src/main/java/org/saturnclient/ui2/components/CosmeticPreview.java new file mode 100644 index 0000000..3a021ef --- /dev/null +++ b/src/main/java/org/saturnclient/ui2/components/CosmeticPreview.java @@ -0,0 +1,60 @@ +package org.saturnclient.ui2.components; + +import org.saturnclient.saturnclient.config.Property; +import org.saturnclient.saturnclient.config.ThemeManager; +import org.saturnclient.ui2.Element; +import org.saturnclient.ui2.ElementContext; +import org.saturnclient.ui2.RenderScope; + +import net.minecraft.client.render.RenderLayer; +import net.minecraft.util.Identifier; + +public class CosmeticPreview extends Element { + private static ThemeManager theme = new ThemeManager("CosmeticPreview", "selected", "hovering"); + private static Property bgColor = theme.property("bg-color", new Property(0xAA000000)); + private static Property fgColor = theme.property("fg-color", new Property(0xFFFFFFFF)); + private static Property padding = theme.property("padding", new Property(14)); + private static Property cornerRadius = theme.property("corner-radius", new Property(10)); + + static {} + + Identifier sprite; + private Runnable onClick; + private boolean isSelected; + + public CosmeticPreview(boolean isSelected, Identifier sprite, Runnable onClick) { + this.sprite = sprite; + this.onClick = onClick; + this.isSelected = isSelected; + + this.width = 50; + this.height = 111; + } + + @Override + public void render(RenderScope renderScope, ElementContext ctx) { + if (ctx.isHovering()) { + theme.setState("hovering"); + } else if (isSelected) { + theme.setState("selected"); + } + + renderScope.drawRoundedRectangle(0, 0, width, height, cornerRadius.value, bgColor.value); + + renderScope.setRenderLayer(RenderLayer::getGuiTextured); + + int texWidth = width - padding.value; + int texHeight = height - padding.value; + + renderScope.drawTexture(sprite, padding.value / 2, padding.value / 2, 0, 0, texWidth, texHeight, fgColor.value); + + theme.setState(null); + } + + @Override + public void click(int mouseX, int mouseY) { + if (onClick != null) { + onClick.run(); + } + } +} diff --git a/src/main/java/org/saturnclient/ui2/components/SkinPreview.java b/src/main/java/org/saturnclient/ui2/components/SkinPreview.java new file mode 100644 index 0000000..88407c0 --- /dev/null +++ b/src/main/java/org/saturnclient/ui2/components/SkinPreview.java @@ -0,0 +1,87 @@ +package org.saturnclient.ui2.components; + +import org.jetbrains.annotations.Nullable; +import org.joml.Quaternionf; +import org.joml.Vector3f; +import org.saturnclient.saturnclient.SaturnClient; +import org.saturnclient.ui2.Element; +import org.saturnclient.ui2.ElementContext; +import org.saturnclient.ui2.RenderScope; + +import net.minecraft.client.render.DiffuseLighting; +import net.minecraft.client.render.entity.EntityRenderDispatcher; +import net.minecraft.entity.LivingEntity; + +public class SkinPreview extends Element { + private boolean negativeAngle = false; + private float angle = 0.0f; + + public SkinPreview(float angle, boolean negativeAngle) { + this.angle = angle; + this.negativeAngle = negativeAngle; + } + + public static void drawEntity(RenderScope renderScope, int x1, int y1, int x2, int y2, int size, float f, float mouseX, + float mouseY, LivingEntity entity, float angle, boolean negativeAngle) { + float g = (float) (x1 + x2) / 2.0F; + float h = (float) (y1 + y2) / 2.0F; + renderScope.enableScissor(0, 6, x2, y2); + float i = (float) Math.atan((double) ((g - mouseX) / 40.0F)); + float j = (float) Math.atan((double) ((h - mouseY) / 40.0F)); + Quaternionf quaternionf = (new Quaternionf()).rotateZ(3.1415927F); + float k = entity.bodyYaw; + float l = entity.getYaw(); + float m = entity.getPitch(); + float n = entity.prevHeadYaw; + float o = entity.headYaw; + entity.setYaw(angle); + entity.bodyYaw = angle; + entity.setPitch(-(j * 20.0F)); + entity.headYaw = negativeAngle ? (i * 40.0F) + 180f : -(i * 40.0F); + entity.prevHeadYaw = entity.getHeadYaw(); + entity.setCustomNameVisible(false); + + float p = entity.getScale(); + Vector3f vector3f = new Vector3f(0.0F, entity.getHeight() / 2.0F + f * p, 0.0F); + float q = (float) size / p; + drawEntity(renderScope, g, h, q, vector3f, quaternionf, null, entity); + + entity.setCustomNameVisible(true); + entity.bodyYaw = k; + entity.setYaw(l); + entity.setPitch(m); + entity.prevHeadYaw = n; + entity.headYaw = o; + renderScope.disableScissor(); + } + + public static void drawEntity(RenderScope renderScope, float x, float y, float size, Vector3f vector3f, + Quaternionf quaternionf, @Nullable Quaternionf quaternionf2, LivingEntity entity) { + renderScope.matrices.push(); + renderScope.matrices.translate((double) x, (double) y, 50.0); + renderScope.matrices.scale(size, size, -size); + renderScope.matrices.translate(vector3f.x, vector3f.y, vector3f.z); + renderScope.matrices.multiply(quaternionf); + renderScope.draw(); + DiffuseLighting.method_34742(); + EntityRenderDispatcher entityRenderDispatcher = SaturnClient.client.getEntityRenderDispatcher(); + + entityRenderDispatcher.setRenderShadows(false); + renderScope.draw((vertexConsumers) -> { + entityRenderDispatcher.render(entity, 0.0, 0.0, 0.0, 1.0F, renderScope.matrices, vertexConsumers, + 15728880); + }); + renderScope.draw(); + entityRenderDispatcher.setRenderShadows(true); + renderScope.matrices.pop(); + DiffuseLighting.enableGuiDepthLighting(); + } + + @Override + public void render(RenderScope renderScope, ElementContext ctx) { + LivingEntity entity = SaturnClient.client.player; + if (entity != null) { + drawEntity(renderScope, 0, 0, 75, 78, 30, 0.0625F, ctx.mouseX / scale, ctx.mouseY / scale, entity, angle, negativeAngle); + } + } +} diff --git a/src/main/java/org/saturnclient/ui2/screens/CloakMenu.java b/src/main/java/org/saturnclient/ui2/screens/CloakMenu.java new file mode 100644 index 0000000..4626c36 --- /dev/null +++ b/src/main/java/org/saturnclient/ui2/screens/CloakMenu.java @@ -0,0 +1,74 @@ +package org.saturnclient.ui2.screens; + +import org.saturnclient.saturnclient.SaturnClient; +import org.saturnclient.saturnclient.auth.Auth; +import org.saturnclient.saturnclient.auth.SaturnPlayer; +import org.saturnclient.saturnclient.cosmetics.cloaks.Cloaks; +import org.saturnclient.saturnclient.menus.SaturnConfigEditor; +import org.saturnclient.ui.Textures; +import org.saturnclient.ui2.SaturnScreen; +import org.saturnclient.ui2.components.CosmeticPreview; +import org.saturnclient.ui2.components.Sidebar; +import org.saturnclient.ui2.components.SkinPreview; +import org.saturnclient.ui2.elements.Scroll; + +public class CloakMenu extends SaturnScreen { + public CloakMenu() { + super("Cloaks Menu"); + } + + @Override + public void ui() { + int p = 10; + int g = 10; + + Scroll scroll = new Scroll(p); + + int row = 0; + int col = 0; + + SaturnPlayer player = Auth.players.get(Auth.uuid); + + if (player != null) { + for (String cloak : Cloaks.availableCloaks) { + scroll.draw(new CosmeticPreview(cloak == player.cloak, Textures.getCloakPreview(cloak), () -> { + Cloaks.setCloak(Auth.uuid, cloak); + }).position((50 + g) * col, (111 + g) * row)); + + if (col == 5) { + col = 0; + row++; + } else { + col++; + } + } + } + + int scrollWidth = 480 + 10 + (g * 2) + (p * 2); + + draw(scroll.dimensions(scrollWidth, 350).center(width, height)); + + draw(new SkinPreview(-30.0f, false).scale(3.5f).position(scrollWidth - 40 - p, 200)); + + draw(new Sidebar( + 2, + new Sidebar.SidebarComponent(Textures.MODS_TAB, () -> { + SaturnClient.client.setScreen(new ModMenu()); + }, false), + new Sidebar.SidebarComponent(Textures.SETTINGS, () -> { + SaturnClient.client.setScreen(new SaturnConfigEditor()); + }, false), + + new Sidebar.SidebarComponent(Textures.CLOAK, () -> { + }, false), + + new Sidebar.SidebarComponent(Textures.HAT, () -> { + SaturnClient.client.setScreen(new HatMenu()); + }, false), + + new Sidebar.SidebarComponent(Textures.CLOSE, () -> { + this.close(); + }, true) + ).centerOffset(width, height, -(scrollWidth / 2 + 20), 0)); + } +} diff --git a/src/main/java/org/saturnclient/ui2/screens/HatMenu.java b/src/main/java/org/saturnclient/ui2/screens/HatMenu.java new file mode 100644 index 0000000..280fc11 --- /dev/null +++ b/src/main/java/org/saturnclient/ui2/screens/HatMenu.java @@ -0,0 +1,74 @@ +package org.saturnclient.ui2.screens; + +import org.saturnclient.saturnclient.SaturnClient; +import org.saturnclient.saturnclient.auth.Auth; +import org.saturnclient.saturnclient.auth.SaturnPlayer; +import org.saturnclient.saturnclient.cosmetics.Hats; +import org.saturnclient.saturnclient.menus.SaturnConfigEditor; +import org.saturnclient.ui.Textures; +import org.saturnclient.ui2.SaturnScreen; +import org.saturnclient.ui2.components.CosmeticPreview; +import org.saturnclient.ui2.components.Sidebar; +import org.saturnclient.ui2.components.SkinPreview; +import org.saturnclient.ui2.elements.Scroll; + +public class HatMenu extends SaturnScreen { + public HatMenu() { + super("Hats Menu"); + } + + @Override + public void ui() { + int p = 10; + int g = 10; + + Scroll scroll = new Scroll(p); + + int row = 0; + int col = 0; + + SaturnPlayer player = Auth.players.get(Auth.uuid); + + if (player != null) { + for (String hat : Hats.availableHats) { + scroll.draw(new CosmeticPreview(hat == player.hat, Textures.getHatPreview(hat), () -> { + Hats.setHat(Auth.uuid, hat); + }).dimensions(50, 50).position((50 + g) * col, (50 + g) * row)); + + if (col == 5) { + col = 0; + row++; + } else { + col++; + } + } + } + + int scrollWidth = 480 + 10 + (g * 2) + (p * 2); + + draw(scroll.dimensions(scrollWidth, 350).center(width, height)); + + draw(new SkinPreview(170f, true).scale(3.5f).position(scrollWidth - 40 - p, 200)); + + draw(new Sidebar( + 3, + new Sidebar.SidebarComponent(Textures.MODS_TAB, () -> { + SaturnClient.client.setScreen(new ModMenu()); + }, false), + new Sidebar.SidebarComponent(Textures.SETTINGS, () -> { + SaturnClient.client.setScreen(new SaturnConfigEditor()); + }, false), + + new Sidebar.SidebarComponent(Textures.CLOAK, () -> { + SaturnClient.client.setScreen(new CloakMenu()); + }, false), + + new Sidebar.SidebarComponent(Textures.HAT, () -> { + }, false), + + new Sidebar.SidebarComponent(Textures.CLOSE, () -> { + this.close(); + }, true) + ).centerOffset(width, height, -(scrollWidth / 2 + 20), 0)); + } +} diff --git a/src/main/java/org/saturnclient/ui2/screens/ModMenu.java b/src/main/java/org/saturnclient/ui2/screens/ModMenu.java index b28a07f..007c328 100644 --- a/src/main/java/org/saturnclient/ui2/screens/ModMenu.java +++ b/src/main/java/org/saturnclient/ui2/screens/ModMenu.java @@ -3,7 +3,6 @@ package org.saturnclient.ui2.screens; import org.saturnclient.modules.ModManager; import org.saturnclient.modules.Module; import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.menus.CloaksMenu; import org.saturnclient.saturnclient.menus.SaturnConfigEditor; import org.saturnclient.ui.Textures; import org.saturnclient.ui2.SaturnScreen; @@ -50,7 +49,11 @@ public class ModMenu extends SaturnScreen { }, false), new Sidebar.SidebarComponent(Textures.CLOAK, () -> { - SaturnClient.client.setScreen(new CloaksMenu()); + SaturnClient.client.setScreen(new CloakMenu()); + }, false), + + new Sidebar.SidebarComponent(Textures.HAT, () -> { + SaturnClient.client.setScreen(new HatMenu()); }, false), new Sidebar.SidebarComponent(Textures.CLOSE, () -> { diff --git a/src/main/java/org/saturnclient/ui2/screens/ShiftMenu.java b/src/main/java/org/saturnclient/ui2/screens/ShiftMenu.java index 6ab7923..3657f8f 100644 --- a/src/main/java/org/saturnclient/ui2/screens/ShiftMenu.java +++ b/src/main/java/org/saturnclient/ui2/screens/ShiftMenu.java @@ -2,7 +2,6 @@ package org.saturnclient.ui2.screens; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClientConfig; -import org.saturnclient.saturnclient.menus.CloaksMenu; import org.saturnclient.saturnclient.menus.HudEditor; import org.saturnclient.ui.Textures; import org.saturnclient.ui2.Element; @@ -30,7 +29,7 @@ public class ShiftMenu extends SaturnScreen { draw(button); draw(new TextureButton(Textures.COSMETICS, () -> { - client.setScreen(new CloaksMenu()); + client.setScreen(new CloakMenu()); }).dimensions(button.height, button.height).centerOffset(width, height, (button.width / 2) + (button.height / 2) + 4, 0)); draw(new TextureButton(Textures.HUD_ICON, () -> { diff --git a/src/main/java/org/saturnclient/ui2/screens/TitleMenu.java b/src/main/java/org/saturnclient/ui2/screens/TitleMenu.java index 7114d0b..48c9164 100644 --- a/src/main/java/org/saturnclient/ui2/screens/TitleMenu.java +++ b/src/main/java/org/saturnclient/ui2/screens/TitleMenu.java @@ -2,7 +2,6 @@ package org.saturnclient.ui2.screens; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClientConfig; -import org.saturnclient.saturnclient.menus.CloaksMenu; import org.saturnclient.saturnclient.menus.HudEditor; import org.saturnclient.ui.Textures; import org.saturnclient.ui2.SaturnScreen; @@ -56,7 +55,7 @@ public class TitleMenu extends SaturnScreen { }).dimensions(s, s).centerHorizontal(width, height, 0, 8).animation(new SlideY(700, s + 8))); draw(new TextureButton(Textures.CLOAK, () -> { - client.setScreen(new CloaksMenu()); + client.setScreen(new CloakMenu()); }).dimensions(s, s).centerHorizontal(width, height, s + 2, 8).animation(new SlideY(700, s + 8))); } }