saturnclientmc/saturnclient
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 5 Wiki Activity

ui and branding update

Browse Source
This commit is contained in:
selimaj-dev
2025-03-18 01:37:34 +01:00
parent 03a3914dff
commit abed0205d2
8 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/saturnclient/saturnclient/menus/CloaksMenu.java
+3 -3
View File
@@ -4,7 +4,7 @@ import org.saturnclient.saturnclient.auth.SaturnSocket;
import org.saturnclient.saturnclient.cloaks.Cloaks;
import org.saturnclient.ui.SaturnUi;
import org.saturnclient.ui.Textures;
import org.saturnclient.ui.animations.FadeIn;
import org.saturnclient.ui.animations.Slide;
import org.saturnclient.ui.widgets.SaturnClickableSprite;
import org.saturnclient.ui.widgets.SaturnSprite;
import org.saturnclient.ui.widgets.SaturnImage;
@@ -29,7 +29,7 @@ public class CloaksMenu extends SaturnUi {
.setY(rectY)
.setWidth(rectWidth)
.setHeight(rectHeight)
.setAnimations(new FadeIn(1)));
.setAnimations(new Slide(1, 10)));
int tabsX = (width - 43) / 2;
int tabsY = rectY - 17;
@@ -39,7 +39,7 @@ public class CloaksMenu extends SaturnUi {
.setY(tabsY)
.setWidth(43)
.setHeight(15)
.setAnimations(new FadeIn(1)));
.setAnimations(new Slide(1, 10)));
int cloakWidth = 32;
int cloakHeight = 70;
src/main/java/org/saturnclient/saturnclient/menus/SettingsMenu.java
+6 -3
View File
@@ -52,7 +52,8 @@ public class SettingsMenu extends SaturnUi {
.setY(tabsY + 3)
.setWidth(tabSize)
.setHeight(tabSize)
.setAnimations(new FadeIn(1)));
.setAnimations(new FadeIn(1))
.setAnimations(new Slide(1, 10)));
draw(new SaturnClickableImage(Textures.MODS_TAB, () -> {
System.out.println("Pressed");
@@ -61,7 +62,8 @@ public class SettingsMenu extends SaturnUi {
.setY(tabsY + 3)
.setWidth(tabSize)
.setHeight(tabSize)
.setAnimations(new FadeIn(1)));
.setAnimations(new FadeIn(1))
.setAnimations(new Slide(1, 10)));
draw(new SaturnClickableImage(Textures.SEARCH, () -> {
System.out.println("Pressed");
@@ -70,7 +72,8 @@ public class SettingsMenu extends SaturnUi {
.setY(tabsY + 3)
.setWidth(tabSize)
.setHeight(tabSize)
.setAnimations(new FadeIn(1)));
.setAnimations(new FadeIn(1))
.setAnimations(new Slide(1, 10)));
int modX = 0;
int modY = 0;
src/main/java/org/saturnclient/ui/SaturnUi.java
+7
View File
@@ -7,9 +7,16 @@ import org.lwjgl.glfw.GLFW;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.text.MutableText;
import net.minecraft.text.Style;
import net.minecraft.text.Text;
import net.minecraft.util.Identifier;
public class SaturnUi extends Screen {
public static MutableText text(String text) {
return Text.literal(text).setStyle(Style.EMPTY.withFont(Identifier.of("saturnclient:panton")));
}
public List<SaturnWidget> widgets = new ArrayList<>();
private int tick = 0;
src/main/java/org/saturnclient/ui/widgets/SaturnButton.java
+3 -5
View File
@@ -3,15 +3,13 @@ package org.saturnclient.ui.widgets;
import java.util.function.Consumer;
import org.lwjgl.opengl.GL11;
import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.ui.SaturnUi;
import org.saturnclient.ui.SaturnWidget;
import org.saturnclient.ui.Textures;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.RenderLayer;
import net.minecraft.text.Style;
import net.minecraft.text.Text;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.ColorHelper;
import net.minecraft.util.math.MathHelper;
@@ -54,8 +52,8 @@ public class SaturnButton extends SaturnWidget {
if (alpha != 0.0f) {
int i = this.active ? 16777215 : 10526880;
context.drawText(minecraftClient.textRenderer,
Text.literal(text).setStyle(Style.EMPTY.withFont(Identifier.of("saturnclient:panton"))),
this.x + ((this.width - minecraftClient.textRenderer.getWidth(this.text)) / 2),
SaturnUi.text(text),
this.x + ((this.width - minecraftClient.textRenderer.getWidth(SaturnUi.text(text))) / 2),
this.y + ((this.height - minecraftClient.textRenderer.fontHeight + 1) / 2),
hovering ? hoverColor : i | MathHelper.ceil(this.alpha * 255.0F) << 24, false);
}
src/main/java/org/saturnclient/ui/widgets/SaturnInputBox.java
+8 -7
View File
@@ -1,6 +1,7 @@
package org.saturnclient.ui.widgets;
import org.lwjgl.glfw.GLFW;
import org.saturnclient.ui.SaturnUi;
import org.saturnclient.ui.SaturnWidget;
import org.saturnclient.ui.Textures;
@@ -8,9 +9,6 @@ import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.RenderLayer;
import net.minecraft.text.Style;
import net.minecraft.text.Text;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.ColorHelper;
public class SaturnInputBox extends SaturnWidget {
@@ -72,10 +70,13 @@ public class SaturnInputBox extends SaturnWidget {
String visibleText = text.substring(scrollOffset);
int textColor = focused ? 0xFFFFFF : 0xAAAAAA;
context.drawText(textRenderer, Text.literal(visibleText).setStyle(Style.EMPTY.withFont(Identifier.of("saturnclient:panton"))), x + 5, y + 5, textColor, false);
context.drawText(textRenderer,
SaturnUi.text(visibleText), x + 5,
y + 5, textColor, false);
if (focused) {
int cursorX = x + 5 + textRenderer.getWidth(visibleText.substring(0, cursorPosition - scrollOffset));
int cursorX = x + 5
+ textRenderer.getWidth(SaturnUi.text(visibleText.substring(0, cursorPosition - scrollOffset)));
context.fill(cursorX, y + 3, cursorX + 1, y + height - 3, 0xFFFFFFFF);
}
}
@@ -93,11 +94,11 @@ public class SaturnInputBox extends SaturnWidget {
int offset = 0;
if (cursorPosition == text.length()) {
while (textRenderer.getWidth(text.substring(offset)) > width) {
while (textRenderer.getWidth(SaturnUi.text(text.substring(offset))) > width) {
offset++;
}
} else {
while (textRenderer.getWidth(text.substring(offset, cursorPosition)) > width) {
while (textRenderer.getWidth(SaturnUi.text(text.substring(offset, cursorPosition))) > width) {
offset++;
}
}
src/main/java/org/saturnclient/ui/widgets/SaturnText.java
+3 -5
View File
@@ -1,11 +1,9 @@
package org.saturnclient.ui.widgets;
import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.ui.SaturnUi;
import org.saturnclient.ui.SaturnWidget;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.text.Style;
import net.minecraft.text.Text;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.ColorHelper;
import net.minecraft.util.math.MathHelper;
@@ -15,7 +13,7 @@ public class SaturnText extends SaturnWidget {
public SaturnText(String text) {
this.text = text;
this.width = SaturnClient.textRenderer.getWidth(text);
this.width = SaturnClient.textRenderer.getWidth(SaturnUi.text(text));
this.height = SaturnClient.textRenderer.fontHeight;
}
@@ -27,7 +25,7 @@ public class SaturnText extends SaturnWidget {
@Override
public void render(DrawContext context, boolean hovering, int mouseX, int mouseY) {
context.drawText(SaturnClient.textRenderer,
Text.literal(text).setStyle(Style.EMPTY.withFont(Identifier.of("saturnclient:panton"))), x, y,
SaturnUi.text(text), x, y,
color | MathHelper.ceil(this.alpha * 255.0F) << 24, false);
}
}
src/main/resources/assets/saturnclient/icon.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 450 KiB

src/main/resources/fabric.mod.json
+2 -2
View File
@@ -3,8 +3,8 @@
"id": "saturnclient",
"version": "${version}",
"name": "saturnclient",
"description": "A Minecraft client mod",
"authors": ["IIpho3nix", "kleo-dev"],
"description": "The ultimate open source client",
"authors": ["Saturn Mc", "ORUS"],
"contact": {
"website": "https://kleo-dev.netlify.app",
"sources": "https://github.com/kleo-dev/saturnclient"