From 0feded48cafdd4eeb7fd024a1bcb018e82d1e093 Mon Sep 17 00:00:00 2001 From: Leo dev Date: Wed, 12 Mar 2025 14:03:39 +0100 Subject: [PATCH] we need svg rendering --- .../saturnclient/menus/MainMenu.java | 2 +- .../saturnclient/ui/widgets/SaturnButton.java | 10 ++++++++-- .../saturnclient/ui/widgets/SaturnInputBox.java | 2 +- .../gui/sprites/widget/saturn/button.png | Bin 0 -> 581 bytes .../button.png.mcmeta} | 6 +++--- .../gui/sprites/widget/saturn/button_border.png | Bin 0 -> 650 bytes .../widget/saturn/button_border.png.mcmeta | 10 ++++++++++ .../button_disabled.png} | Bin .../button_disabled.png.mcmeta} | 0 .../button_highlighted.png} | Bin .../button_highlighted.png.mcmeta} | 0 .../gui/sprites/widget/saturn_button.png | Bin 391 -> 0 bytes .../assets/saturnclient/textures/logo/text.png | Bin 0 -> 1757 bytes 13 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button.png rename src/main/resources/assets/minecraft/textures/gui/sprites/widget/{saturn_button_highlighted.png.mcmeta => saturn/button.png.mcmeta} (54%) create mode 100644 src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_border.png create mode 100644 src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_border.png.mcmeta rename src/main/resources/assets/minecraft/textures/gui/sprites/widget/{saturn_button_disabled.png => saturn/button_disabled.png} (100%) rename src/main/resources/assets/minecraft/textures/gui/sprites/widget/{saturn_button.png.mcmeta => saturn/button_disabled.png.mcmeta} (100%) rename src/main/resources/assets/minecraft/textures/gui/sprites/widget/{saturn_button_highlighted.png => saturn/button_highlighted.png} (100%) rename src/main/resources/assets/minecraft/textures/gui/sprites/widget/{saturn_button_disabled.png.mcmeta => saturn/button_highlighted.png.mcmeta} (100%) delete mode 100644 src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button.png create mode 100644 src/main/resources/assets/saturnclient/textures/logo/text.png diff --git a/src/main/java/org/saturnclient/saturnclient/menus/MainMenu.java b/src/main/java/org/saturnclient/saturnclient/menus/MainMenu.java index 7a03d33..2b777eb 100644 --- a/src/main/java/org/saturnclient/saturnclient/menus/MainMenu.java +++ b/src/main/java/org/saturnclient/saturnclient/menus/MainMenu.java @@ -16,6 +16,6 @@ public class MainMenu extends SaturnUi { draw( new SaturnButton("Settings", () -> { client.setScreen(new SettingsMenu()); - }).setX(10).setY(10).setWidth(100).setHeight(20).setAnimation(SaturnAnimation.FADE_SLIDE.distance(15))); + }).setX(10).setY(10).setWidth(96).setHeight(25).setAnimation(SaturnAnimation.FADE_SLIDE.distance(15))); } } \ No newline at end of file diff --git a/src/main/java/org/saturnclient/ui/widgets/SaturnButton.java b/src/main/java/org/saturnclient/ui/widgets/SaturnButton.java index 75049ed..1cb1bf2 100644 --- a/src/main/java/org/saturnclient/ui/widgets/SaturnButton.java +++ b/src/main/java/org/saturnclient/ui/widgets/SaturnButton.java @@ -11,9 +11,10 @@ import net.minecraft.util.math.ColorHelper; import net.minecraft.util.math.MathHelper; public class SaturnButton extends SaturnWidget { + public static final Identifier BORDER_TEXTURE = Identifier.ofVanilla("widget/saturn/button_border"); public static final ButtonTextures TEXTURES = new ButtonTextures( - Identifier.ofVanilla("widget/saturn_button"), Identifier.ofVanilla("widget/saturn_button_disabled"), - Identifier.ofVanilla("widget/saturn_button_highlighted")); + Identifier.ofVanilla("widget/saturn/button"), Identifier.ofVanilla("widget/saturn/button_disabled"), + Identifier.ofVanilla("widget/saturn/button")); public boolean active = true; public String text; @@ -31,6 +32,11 @@ public class SaturnButton extends SaturnWidget { context.drawGuiTexture(RenderLayer::getGuiTextured, TEXTURES.get(this.active, hovering), this.x, this.y, this.width, this.height, ColorHelper.getWhite(this.alpha)); + if (hovering) { + context.drawGuiTexture(RenderLayer::getGuiTextured, BORDER_TEXTURE, this.x, + this.y, this.width, this.height, ColorHelper.getArgb(255, 251, 60, 79)); + } + int i = this.active ? 16777215 : 10526880; context.drawText(minecraftClient.textRenderer, this.text, this.x + ((this.width - minecraftClient.textRenderer.getWidth(this.text)) / 2), diff --git a/src/main/java/org/saturnclient/ui/widgets/SaturnInputBox.java b/src/main/java/org/saturnclient/ui/widgets/SaturnInputBox.java index 9744f33..ba46442 100644 --- a/src/main/java/org/saturnclient/ui/widgets/SaturnInputBox.java +++ b/src/main/java/org/saturnclient/ui/widgets/SaturnInputBox.java @@ -11,7 +11,7 @@ import net.minecraft.util.Identifier; import net.minecraft.util.math.ColorHelper; public class SaturnInputBox extends SaturnWidget { - public static final Identifier TEXTURE = Identifier.ofVanilla("widget/saturn_button"); + public static final Identifier TEXTURE = Identifier.ofVanilla("widget/saturn/button"); public String text = ""; public String placeholder = ""; diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button.png b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button.png new file mode 100644 index 0000000000000000000000000000000000000000..537a50e9553909bee337c0823c44df5463c0f426 GIT binary patch literal 581 zcmeAS@N?(olHy`uVBq!ia0vp^0U*r51|<6gKdl8)oCO|{#S9GG!XV7ZFl&wkP>``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eBxm%ttjv*C{Z|^P)VhWUKdnhl%8?az1J$61>XY`bi7{paVGuaXQGgxyp4Ape#|9Kr7W&koUPf)ZSPuEWxgshQ zJGRKxAIvSdwyb(?l3x{M<6bq*zKl6_%cr*0;T)A$Zc5lBbce--*ufl~9zxw`2sY<_*U;WhhZ$wg0A~4n& NJYD@<);T3K0RWYz-~<2w literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button_highlighted.png.mcmeta b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button.png.mcmeta similarity index 54% rename from src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button_highlighted.png.mcmeta rename to src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button.png.mcmeta index 9768602..46f3896 100644 --- a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button_highlighted.png.mcmeta +++ b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button.png.mcmeta @@ -2,9 +2,9 @@ "gui": { "scaling": { "type": "nine_slice", - "width": 300, - "height": 30, - "border": 9 + "width": 80, + "height": 80, + "border": 15 } } } diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_border.png b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_border.png new file mode 100644 index 0000000000000000000000000000000000000000..fac642fdef81da3cc8bba3b406f026c52e37dd0d GIT binary patch literal 650 zcmeAS@N?(olHy`uVBq!ia0vp^0U*r51|<6gKdl8)oCO|{#S9GG!XV7ZFl&wkP>``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&di3{3K#E{-7;jBoE=418=L;`T6G%Y##|k#7O> z3x*X9B@LGuWm|+iSR1((G%sPk)VRYd#Z6<9m_-D+3Y)4Z(jZJN$aj$o%wdxHb3}(%{%`4zOr7m)1UOe?AzDn z8^2ZA+Wh5*E4RMCNzQ0f7*yM<)D|v5tLLYwl@0i!oZ)kpW z-_(Vv!F%>^I+Z^A{l2zS*YB?Du75WBkK}S=lc{_4c!Zd`I5dA^ew iwe6Jct9LkOKQ^Cp!&dRuA$w4&WAJqKb6Mw<&;$T8_!b}l literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_border.png.mcmeta b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_border.png.mcmeta new file mode 100644 index 0000000..46f3896 --- /dev/null +++ b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_border.png.mcmeta @@ -0,0 +1,10 @@ +{ + "gui": { + "scaling": { + "type": "nine_slice", + "width": 80, + "height": 80, + "border": 15 + } + } +} diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button_disabled.png b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_disabled.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button_disabled.png rename to src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_disabled.png diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button.png.mcmeta b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_disabled.png.mcmeta similarity index 100% rename from src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button.png.mcmeta rename to src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_disabled.png.mcmeta diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button_highlighted.png b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_highlighted.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button_highlighted.png rename to src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_highlighted.png diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button_disabled.png.mcmeta b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_highlighted.png.mcmeta similarity index 100% rename from src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button_disabled.png.mcmeta rename to src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn/button_highlighted.png.mcmeta diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button.png b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button.png deleted file mode 100644 index c90a966ae5da02f59b0035e9e6f5b190be401367..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmeAS@N?(olHy`uVBq!ia0y~yVAKJ!G6*(Hg4;y zI)*0?fzl^DT^vIy=DfXikn50v0Lz7(3oNr&y!cZ{Qc2wEPC1Q=C5`5a&Fx@trh-SK`&={dgN5G*D`uf%q~4_ z`s}5qW_9kG;vI<>CXwj{i!W4eIrqSAscm2RN}rQfP0AYHjH#LnbXcb>ZP+9dFpcR{ zkV7OFP;kF>k)-{lBGGV@BG&2kMa=7_9!)xwpm>#?+b7Y1P)`ah!f@p*0PGH>$>`uV)v%m(XC5lw# z#BTYWgCm&)AwEC=e3&R9At50lAt50lAt50lVUNh%1g*6)k8?v~L%E?f(>Fs;S(a54 z03&B=9wYv_aLbwe+&l`3!<~_{=CTu(UzxN8b=PCf^;nC%g6cN5;RV#zW>bF5^&nq8 zoccoE6ZHVgxuAM%Kow_s$A;U9@4is@w-oB@)-`6_Oxc-JcEahM?YDhqc<)47LH_Y_ zfj)W3ga8b{oL&d52~d!!DfmGC3M%t>7D-U9ONVD>9yb(+Gb5*T<(ssO+Uug-@*;0Z zVV$-xbS)IvU8aUQnD!w8t`a47Ou z(3Q2~NhEn@Iv&b)fK2SD%T9Tbx76WyZjim`;$gm`i>IRvH@faa<>8q&wUP6lb!`P> zzKQXfH>9hsKKIC6aG!Vf0e@#X1mB5eq-_@jw+4$)QEk1ECoL8lf9jE|_=&P3CRnqD z;K9uMFgIMwp{QO6xl}(In!AhoU&m!hryu%yV zICku7)FFana2ey~9`;i3Oldg4nEV&Q$o1`vci$N!)+Ojq?3%0>tdjpP((*QDESQ)Y z-3%*nA^1yr4LP>*jtJ{OKG}y?15W7N&?=NUW(Vb+acyX-JJxqYz$$qq(iDdoV~U5| znJM}CO{AUE@!^Yj_bEJ-tK@em_?uX%V+BvfTSN1Gdw8qlu*`A*3qv**#q*KlsJug- z8>#?uYeyYR$ine0CT$^-eO5B3deAJUJq^X*1RD_y8Q$$+qvRaRVNbKkQrQC!EJBuS z<#U%wzaDs4lq|cVZBJ3qVPdYg7qbWv9z{O-=GG^G!?RK(eWgDXyufaw?;$dT-rWQk z(B3!^AAB+&f~CT&f{SjmLIvl2cG8u2cTWisvRv^yto_?<9SwuZ(7%BTI!pw`@9HgL z&UeD4CogmzLwvXguMZ;{eMlC96X$~!3D?2yHm7>f&gpegik*^)b37~e(cM!w@L46_ zge>mq;Q_#2UjT9^{Va6HLJXSi55(rT^oL={vjD1f4jy1Hd*>f~nVWNeqsWF(3CuF7 zn7`t0b~Q@m-AMOE^(>XxYYf&C*cLtIV`PwRE7lP6I8mF!8(Usc+y`!ge_y%0n96{aS`K6x%@T%w4SXGHcB4yZ9clkSX6X`5FQY_QWXsZ zxlb1AV;^?Rw_=ub5DmQNZ_o z$VHi%ZoY*$*5Q~qWl{ebg|!#$8RQmX)>1I1I<~W&2Fq1u2kZtl|6Pm3ee~>jE-M9t z71^F&0BB=%%ppobLPA19LPA19LPA19!cpTVMuQr-V>M9900000NkvXXu0mjfq-amQ literal 0 HcmV?d00001