From f0dc640180e80fe08734f1d0e0a5fea45931c5d9 Mon Sep 17 00:00:00 2001 From: Tristan Date: Tue, 15 Jul 2025 14:53:46 -0400 Subject: [PATCH] render logo on mainmenu --- .../mixin/client/ui/CustomButtonMixin.java | 4 --- .../client/ui/WatermarkTitleScreenMixin.java | 35 +++++-------------- 2 files changed, 9 insertions(+), 30 deletions(-) diff --git a/src/client/java/works/alya/mixin/client/ui/CustomButtonMixin.java b/src/client/java/works/alya/mixin/client/ui/CustomButtonMixin.java index 1eb2379..39b0161 100644 --- a/src/client/java/works/alya/mixin/client/ui/CustomButtonMixin.java +++ b/src/client/java/works/alya/mixin/client/ui/CustomButtonMixin.java @@ -60,10 +60,6 @@ private void renderCustomButton(DrawContext context, int mouseX, int mouseY, flo RenderUtility.drawRoundedRect(context, x, y, width, height, radius, backgroundColor); - if(isHovered && isActive) { - RenderUtility.drawRoundedRectOutline(context, x, y, width, height, 6.0f, 1.0f, 0xFF7A7A7A); - } - String buttonText = message.getString(); int textWidth = TextRendererUtility.getTextWidth(buttonText); int textHeight = TextRendererUtility.getTextHeight(); diff --git a/src/client/java/works/alya/mixin/client/ui/WatermarkTitleScreenMixin.java b/src/client/java/works/alya/mixin/client/ui/WatermarkTitleScreenMixin.java index aa7968a..4c0225e 100644 --- a/src/client/java/works/alya/mixin/client/ui/WatermarkTitleScreenMixin.java +++ b/src/client/java/works/alya/mixin/client/ui/WatermarkTitleScreenMixin.java @@ -16,9 +16,10 @@ package works.alya.mixin.client.ui; +import net.minecraft.util.Identifier; import works.alya.AlyaClient; -import works.alya.utilities.misc.AlyaConstants; import works.alya.utilities.render.ColorUtility; +import works.alya.utilities.render.RenderUtility; import works.alya.utilities.render.TextRendererUtility; import net.minecraft.client.gui.*; import net.minecraft.client.gui.screen.SplashTextRenderer; @@ -44,33 +45,15 @@ public void onHudRender(DrawContext context, int mouseX, int mouseY, float delta } @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/LogoDrawer;draw(Lnet/minecraft/client/gui/DrawContext;IF)V")) - private void renderRyeLogo(LogoDrawer logoDrawer, DrawContext context, int width, float alpha) { - String text = "Alya"; - String versionText = AlyaConstants.VERSION; + private void renderAlyaLogo(LogoDrawer logoDrawer, DrawContext context, int width, float alpha) { + Identifier logo = Identifier.of("alya", "icons/icon.png"); - int tX = context.getScaledWindowWidth() / 2 - TextRendererUtility.getXlTextWidth(text) / 2; - int tY = Math.round(context.getScaledWindowHeight() / 4.5f); + int logoWidth = 64; + int logoHeight = 64; + int x = (context.getScaledWindowWidth() / 2) - (logoWidth / 2); + int y = (context.getScaledWindowHeight() / 2) - logoHeight - (context.getScaledWindowHeight() / 5); - int vX = tX + TextRendererUtility.getXlTextWidth(text); - int vY = tY - TextRendererUtility.getXlTextHeight() * 3; - - TextRendererUtility.renderXlText( - context, - text, - ColorUtility.Colors.WHITE, - tX, - tY, - false - ); - - TextRendererUtility.renderText( - context, - versionText, - ColorUtility.Colors.WHITE, - vX, - vY, - false - ); + RenderUtility.drawImage(logo, x, y, logoWidth, logoHeight, logoWidth, logoHeight, context); } @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawTextWithShadow(Lnet/minecraft/client/font/TextRenderer;Ljava/lang/String;III)V"))