diff --git a/src/main/java/org/saturnclient/saturnclient/SaturnClientConfig.java b/src/main/java/org/saturnclient/saturnclient/SaturnClientConfig.java index 2bfbbca..0cd8689 100644 --- a/src/main/java/org/saturnclient/saturnclient/SaturnClientConfig.java +++ b/src/main/java/org/saturnclient/saturnclient/SaturnClientConfig.java @@ -4,9 +4,11 @@ import org.saturnclient.saturnclient.config.Property; import org.saturnclient.saturnclient.config.ConfigManager; import org.saturnclient.ui.SaturnAnimation; import org.saturnclient.ui.SaturnUi; +import org.saturnclient.ui.Textures; import org.saturnclient.ui.animations.FadeIn; import net.minecraft.client.font.TextRenderer; +import net.minecraft.util.Identifier; import net.minecraft.util.math.ColorHelper; public class SaturnClientConfig { @@ -14,16 +16,20 @@ public class SaturnClientConfig { public static Property COLOR = config.property( "Primary color", - new Property( + new Property<>( ColorHelper.getArgb(255, 251, 60, 79), Property.PropertyType.HEX)); public static Property NORMAL = config.property( "Default color", - new Property( + new Property<>( ColorHelper.getArgb(255, 182, 182, 182), Property.PropertyType.HEX)); + public static Property REALISTIC_LOGO = config.property( + "Realistic logo", + new Property<>(false)); + public static int WHITE = ColorHelper.getArgb(255, 255, 255, 255); public static TextRenderer textRenderer = null; @@ -38,4 +44,12 @@ public class SaturnClientConfig { public static SaturnAnimation[] getAnimations() { return new SaturnAnimation[] { new FadeIn(1) }; } + + public static Identifier getLogo() { + return REALISTIC_LOGO.value ? Textures.REALISTIC_LOGO : Textures.LOGO; + } + + public static String getSaturnIndicator() { + return REALISTIC_LOGO.value ? "" : ""; + } } diff --git a/src/main/java/org/saturnclient/saturnclient/menus/MainMenu.java b/src/main/java/org/saturnclient/saturnclient/menus/MainMenu.java index 5693fe6..3508c41 100644 --- a/src/main/java/org/saturnclient/saturnclient/menus/MainMenu.java +++ b/src/main/java/org/saturnclient/saturnclient/menus/MainMenu.java @@ -2,6 +2,7 @@ package org.saturnclient.saturnclient.menus; import net.minecraft.client.MinecraftClient; import net.minecraft.text.Text; + import org.saturnclient.saturnclient.SaturnClientConfig; import org.saturnclient.ui.SaturnUi; import org.saturnclient.ui.Textures; @@ -65,7 +66,7 @@ public class MainMenu extends SaturnUi { .setAnimations(new FadeIn(2))); draw( - new SaturnImage(Textures.LOGO) + new SaturnImage(SaturnClientConfig.getLogo()) .setX((width - logoSize) / 2) .setY(height / 2 - logoSize - 24) .setWidth(logoSize) diff --git a/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java b/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java index ce744f1..041fee7 100644 --- a/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java +++ b/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java @@ -13,6 +13,7 @@ import net.minecraft.text.Text; import net.minecraft.util.math.Vec3d; import net.minecraft.client.render.LightmapTextureManager; +import org.saturnclient.saturnclient.SaturnClientConfig; import org.saturnclient.saturnclient.auth.SaturnSocket; import org.joml.Matrix4f; import org.spongepowered.asm.mixin.Mixin; @@ -32,7 +33,7 @@ public abstract class NameTagMixin { @Overwrite public void renderLabelIfPresent(S state, Text text_o, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light) { - Text text = isSaturn(state) ? Text.literal("" + text_o.getString()) : text_o; + Text text = isSaturn(state) ? Text.literal(SaturnClientConfig.getSaturnIndicator() + text_o.getString()) : text_o; Vec3d vec3d = state.nameLabelPos; if (vec3d != null) { diff --git a/src/main/java/org/saturnclient/saturnclient/mixin/TabListMixin.java b/src/main/java/org/saturnclient/saturnclient/mixin/TabListMixin.java index c621a32..ebab482 100644 --- a/src/main/java/org/saturnclient/saturnclient/mixin/TabListMixin.java +++ b/src/main/java/org/saturnclient/saturnclient/mixin/TabListMixin.java @@ -3,6 +3,7 @@ package org.saturnclient.saturnclient.mixin; import net.minecraft.client.network.PlayerListEntry; import net.minecraft.text.Text; import org.jetbrains.annotations.Nullable; +import org.saturnclient.saturnclient.SaturnClientConfig; import org.saturnclient.saturnclient.auth.SaturnSocket; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; @@ -29,6 +30,6 @@ public abstract class TabListMixin { String uuid = profile.getId().toString().replaceAll("-", ""); return Text.literal( - SaturnSocket.players.containsKey(uuid) ? "" + name : name); + SaturnSocket.players.containsKey(uuid) ? SaturnClientConfig.getSaturnIndicator() + name : name); } } diff --git a/src/main/java/org/saturnclient/ui/Textures.java b/src/main/java/org/saturnclient/ui/Textures.java index 4d30e10..f8b90f9 100644 --- a/src/main/java/org/saturnclient/ui/Textures.java +++ b/src/main/java/org/saturnclient/ui/Textures.java @@ -17,6 +17,7 @@ public class Textures { public static final Identifier TOGGLE_BG = Identifier.of("saturnclient", "textures/gui/components/toggle_bg.png"); public static final Identifier LOGO = Identifier.of("saturnclient", "textures/logo/logo.png"); + public static final Identifier REALISTIC_LOGO = Identifier.of("saturnclient", "textures/logo/realistic.png"); public static final Identifier LOGO_TEXT = Identifier.of("saturnclient", "textures/logo/text.png"); // Widgets diff --git a/src/main/resources/assets/minecraft/font/include/default.json b/src/main/resources/assets/minecraft/font/include/default.json index e88f241..e3abe77 100644 --- a/src/main/resources/assets/minecraft/font/include/default.json +++ b/src/main/resources/assets/minecraft/font/include/default.json @@ -6,6 +6,13 @@ "ascent": 7, "height": 8, "chars": ["\uE002"] + }, + { + "type": "bitmap", + "file": "minecraft:font/custom/saturn_realistic.png", + "ascent": 7, + "height": 8, + "chars": ["\uE003"] } ] } diff --git a/src/main/resources/assets/minecraft/textures/font/custom/saturn_realistic.png b/src/main/resources/assets/minecraft/textures/font/custom/saturn_realistic.png new file mode 100644 index 0000000..271937a Binary files /dev/null and b/src/main/resources/assets/minecraft/textures/font/custom/saturn_realistic.png differ diff --git a/src/main/resources/assets/saturnclient/textures/logo/realistic.png b/src/main/resources/assets/saturnclient/textures/logo/realistic.png new file mode 100644 index 0000000..36b7526 Binary files /dev/null and b/src/main/resources/assets/saturnclient/textures/logo/realistic.png differ