Saturn title screen

src/main/java/org/saturnclient/saturnclient/SaturnClient.java

@@ -2,11 +2,16 @@ package org.saturnclient.saturnclient;
 
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
+import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
+import net.minecraft.client.gui.screen.TitleScreen;
+
 import org.saturnclient.saturnclient.auth.SaturnSocket;
 import org.saturnclient.saturnclient.config.ConfigManager;
 import org.saturnclient.saturnclient.cosmetics.Hats;
 import org.saturnclient.saturnclient.cosmetics.cloaks.Cloaks;
 import org.saturnclient.saturnclient.event.KeyInputHandler;
+import org.saturnclient.saturnclient.menus.SaturnMenu;
+import org.saturnclient.saturnclient.menus.SaturnTitleScreen;
 import org.saturnclient.saturnmods.ModManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,6 +31,11 @@ public class SaturnClient implements ModInitializer {
         ConfigManager.load();
 
         ClientLifecycleEvents.CLIENT_STOPPING.register(_o -> ConfigManager.save());
+        ScreenEvents.BEFORE_INIT.register((client, screen, scaledWidth, scaledHeight) -> {
+            if (SaturnClientConfig.saturnTitleScreen.value && screen instanceof TitleScreen && !(screen instanceof SaturnMenu)) {
+                client.setScreen(new SaturnTitleScreen());
+            }
+        });
 
         KeyInputHandler.register();
         if (SaturnSocket.authenticate()) {

src/main/java/org/saturnclient/saturnclient/SaturnClientConfig.java

@@ -14,31 +14,35 @@ import net.minecraft.util.math.ColorHelper;
 public class SaturnClientConfig {
     public static ConfigManager config = new ConfigManager("Saturn Client");
 
-    public static Property<Integer> COLOR = config.property(
+    public static Property<Integer> color = config.property(
             "Primary color",
             new Property<>(
                     ColorHelper.getArgb(255, 251, 60, 79),
                     Property.PropertyType.HEX));
 
-    public static Property<Integer> NORMAL = config.property(
+    public static Property<Integer> normal = config.property(
             "Default color",
             new Property<>(
                     ColorHelper.getArgb(255, 182, 182, 182),
                     Property.PropertyType.HEX));
 
-    public static Property<Boolean> REALISTIC_LOGO = config.property(
+    public static Property<Boolean> realisticLogo = config.property(
             "Realistic logo",
             new Property<>(false));
 
+    public static Property<Boolean> saturnTitleScreen = config.property(
+            "Saturn client title screen",
+            new Property<>(true));
+
     public static int WHITE = ColorHelper.getArgb(255, 255, 255, 255);
     public static TextRenderer textRenderer = null;
 
     public static int getWhite(float alpha) {
-        return ((int) (alpha * 255) << 24) | (NORMAL.value & 0x00FFFFFF);
+        return ((int) (alpha * 255) << 24) | (normal.value & 0x00FFFFFF);
     }
 
     public static int getColor(boolean hovering, float alpha) {
-        return SaturnUi.getAlpha(hovering ? COLOR.value : NORMAL.value, alpha);
+        return SaturnUi.getAlpha(hovering ? color.value : normal.value, alpha);
     }
 
     public static SaturnAnimation[] getAnimations() {
@@ -46,10 +50,10 @@ public class SaturnClientConfig {
     }
 
     public static Identifier getLogo() {
-        return REALISTIC_LOGO.value ? Textures.REALISTIC_LOGO : Textures.LOGO;
+        return realisticLogo.value ? Textures.REALISTIC_LOGO : Textures.LOGO;
     }
 
     public static String getSaturnIndicator() {
-        return REALISTIC_LOGO.value ? "" : "";
+        return realisticLogo.value ? "" : "";
     }
 }

src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java

@@ -4,7 +4,7 @@ import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.InputUtil;
-import org.saturnclient.saturnclient.menus.MainMenu;
+import org.saturnclient.saturnclient.menus.SaturnMenu;
 import org.lwjgl.glfw.GLFW;
 
 /**
@@ -33,7 +33,7 @@ public class KeyInputHandler {
         // Register the event handler for the main menu key
         ClientTickEvents.END_CLIENT_TICK.register(client -> {
             if (mainMenuKeyBinding.wasPressed()) {
-                client.setScreen(new MainMenu());
+                client.setScreen(new SaturnMenu());
             }
         });
     }

src/main/java/org/saturnclient/saturnclient/menus/CloaksMenu.java

@@ -72,7 +72,6 @@ public class CloaksMenu extends SaturnUi {
 
         draw(
                 new SaturnClickableImage(Textures.CLOAK, () -> {
-                    client.setScreen(new CloaksMenu());
                 })
                         .setSelected(true)
                         .setX(tabsX - 12)

src/main/java/org/saturnclient/saturnclient/menus/HudEditor.java

@@ -10,6 +10,8 @@ import org.saturnclient.saturnmods.HudMod;
 import org.saturnclient.saturnmods.ModDimensions;
 import org.saturnclient.saturnmods.ModManager;
 import org.saturnclient.saturnmods.SaturnMod;
+import org.saturnclient.ui.SaturnUi;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -87,6 +89,10 @@ public class HudEditor extends Screen {
 
     @Override
     public void render(DrawContext context, int mouseX, int mouseY, float delta) {
+        if (client.world == null && client.getCurrentServerEntry() == null) {
+            SaturnUi.ROTATING_PANORAMA_RENDERER.render(context, this.width, this.height, 1.0F, delta);
+        }
+
         for (HudMod mod : hudMods) {
             ModDimensions dim = mod.getDimensions();
             MatrixStack matrices = context.getMatrices();

src/main/java/org/saturnclient/saturnclient/menus/SaturnMenu.java

@@ -12,9 +12,8 @@ import org.saturnclient.ui.widgets.SaturnButton;
 import org.saturnclient.ui.widgets.SaturnImage;
 import org.saturnclient.ui.widgets.SaturnImageButton;
 
-public class MainMenu extends SaturnUi {
+public class SaturnMenu extends SaturnUi {
-
+    public SaturnMenu() {
-    public MainMenu() {
         super(Text.literal("Saturn Client"));
     }
 

src/main/java/org/saturnclient/saturnclient/menus/SaturnTitleScreen.java

@@ -0,0 +1,76 @@
+package org.saturnclient.saturnclient.menus;
+
+import org.saturnclient.saturnclient.SaturnClientConfig;
+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.SaturnButton;
+import org.saturnclient.ui.widgets.SaturnImage;
+import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
+import net.minecraft.client.gui.screen.option.OptionsScreen;
+import net.minecraft.client.gui.screen.world.SelectWorldScreen;
+import net.minecraft.text.Text;
+
+public class SaturnTitleScreen extends SaturnUi {
+    public SaturnTitleScreen() {
+        super(Text.literal("Title Screen"));
+    }
+
+    @Override
+    protected void init() {
+        blur = false;
+
+        int logoSize = 49;
+        int bX = (width - 150) / 2;
+        int bY = height / 2 - logoSize - 24;
+
+        draw(
+                new SaturnImage(SaturnClientConfig.getLogo())
+                        .setX((width - logoSize) / 2)
+                        .setY(bY)
+                        .setWidth(logoSize)
+                        .setHeight(logoSize)
+                        .setAnimations(new Slide(2, 14)));
+
+        bY += 41;
+
+        draw(
+                new SaturnImage(Textures.LOGO_TEXT)
+                        .setX((width - logoSize) / 2)
+                        .setY(bY)
+                        .setWidth(logoSize)
+                        .setHeight(8)
+                        .setAnimations(new FadeIn(2)));
+
+        bY += 12;
+
+        draw(new SaturnButton("SINGLEPLAYER", () -> {
+            client.setScreen(new SelectWorldScreen(new SaturnTitleScreen()));
+        }).setBold(true).setWidth(210).setHeight(26).setX(bX).setY(bY).setScale(0.69f));
+
+        bY += 20;
+
+        draw(new SaturnButton("MULTIPLAYER", () -> {
+            client.setScreen(new MultiplayerScreen(new SaturnTitleScreen()));
+        }).setBold(true).setWidth(210).setHeight(26).setX(bX).setY(bY).setScale(0.69f));
+
+        bY += 20;
+
+        draw(new SaturnButton("OPTIONS", () -> {
+            client.setScreen(new OptionsScreen(new SaturnTitleScreen(), this.client.options));
+        }).setBold(true).setWidth(103).setHeight(26).setX(bX).setY(bY).setScale(0.69f));
+
+        draw(new SaturnButton("QUIT", () -> {
+            client.close();
+        }).setBold(true).setWidth(103).setHeight(26).setX(bX + 74).setY(bY).setScale(0.69f));
+
+        bY += 20;
+
+        draw(new SaturnButton("SATURN OPTIONS", () -> {
+            client.setScreen(new SaturnMenu());
+        }).setBold(true).setWidth(210).setHeight(26).setX(bX).setY(bY).setScale(0.69f));
+
+        super.init();
+    }
+}

src/main/java/org/saturnclient/saturnmods/mods/Particles.java

@@ -22,11 +22,11 @@ public class Particles implements SaturnMod {
 
     public static Property<Integer> totem_1 = totem.property(
             "Totem particle color 1",
-            new Property<>(SaturnClientConfig.COLOR.value, Property.PropertyType.HEX));
+            new Property<>(SaturnClientConfig.color.value, Property.PropertyType.HEX));
 
     public static Property<Integer> totem_2 = totem.property(
             "Totem particle color 2",
-            new Property<>(SaturnClientConfig.COLOR.value, Property.PropertyType.HEX));
+            new Property<>(SaturnClientConfig.color.value, Property.PropertyType.HEX));
 
     @Override
     public boolean isEnabled() {

src/main/java/org/saturnclient/ui/SaturnUi.java

@@ -7,7 +7,9 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
 import net.minecraft.client.gl.PostEffectProcessor;
+import net.minecraft.client.gui.CubeMapRenderer;
 import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.RotatingCubeMapRenderer;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.render.DefaultFramebufferSet;
 import net.minecraft.client.render.RenderLayer;
@@ -25,12 +27,28 @@ public class SaturnUi extends Screen {
 
     private final Pool pool = new Pool(3);
     private float f = 0.0f;
+    public boolean blur = true;
+    public boolean titleBackground = false;
+
+    protected static final CubeMapRenderer PANORAMA_RENDERER = new CubeMapRenderer(
+            Identifier.of("saturnclient", "textures/gui/title/background/panorama"));
+
+    public static final RotatingCubeMapRenderer ROTATING_PANORAMA_RENDERER;
+
+    static {
+        ROTATING_PANORAMA_RENDERER = new RotatingCubeMapRenderer(PANORAMA_RENDERER);
+    }
 
     public static MutableText text(String text) {
         return Text.literal(text).setStyle(
                 Style.EMPTY.withFont(Identifier.of("saturnclient:panton")));
     }
 
+    public static MutableText textBold(String text) {
+        return Text.literal(text).setStyle(
+                Style.EMPTY.withFont(Identifier.of("saturnclient:panton_bold")));
+    }
+
     public static void drawHighResTexture(DrawContext context, Identifier t, int x, int y, int w, int h) {
         MatrixStack matricies = context.getMatrices();
         matricies.push();
@@ -108,8 +126,13 @@ public class SaturnUi extends Screen {
             int mouseX,
             int mouseY,
             float delta) {
+
+        if (client.world == null && client.getCurrentServerEntry() == null) {
+            ROTATING_PANORAMA_RENDERER.render(context, this.width, this.height, 1.0F, delta);
+        }
+
         // Blur
-        if (!(f < 1.0F)) {
+        if (!(f < 1.0F) && blur) {
             PostEffectProcessor postEffectProcessor = this.client.getShaderLoader().loadPostEffect(
                     Identifier.ofVanilla("blur"),
                     DefaultFramebufferSet.MAIN_ONLY);

src/main/java/org/saturnclient/ui/components/SaturnFloat.java

@@ -111,7 +111,7 @@ public class SaturnFloat extends SaturnWidget {
                 this.width,
                 this.height,
                 focused
-                        ? SaturnClientConfig.COLOR.value
+                        ? SaturnClientConfig.color.value
                         : SaturnClientConfig.getWhite(this.alpha));
 
         int scrollOffset = getScrollOffset();

src/main/java/org/saturnclient/ui/components/SaturnHex.java

@@ -90,7 +90,7 @@ public class SaturnHex extends SaturnWidget {
                 this.width,
                 this.height,
                 focused
-                        ? SaturnClientConfig.COLOR.value
+                        ? SaturnClientConfig.color.value
                         : SaturnClientConfig.getWhite(this.alpha));
 
         int textColor = focused ? 0xFFFFFF : 0xAAAAAA;

src/main/java/org/saturnclient/ui/components/SaturnInteger.java

@@ -111,7 +111,7 @@ public class SaturnInteger extends SaturnWidget {
                 this.width,
                 this.height,
                 focused
-                        ? SaturnClientConfig.COLOR.value
+                        ? SaturnClientConfig.color.value
                         : SaturnClientConfig.getWhite(this.alpha));
 
         int scrollOffset = getScrollOffset();

src/main/java/org/saturnclient/ui/components/SaturnModComp.java

@@ -11,95 +11,95 @@ import org.saturnclient.ui.Textures;
 
 public class SaturnModComp extends SaturnWidget {
 
-        SaturnMod mod;
+    SaturnMod mod;
 
-        public SaturnModComp(SaturnMod mod) {
+    public SaturnModComp(SaturnMod mod) {
-                this.mod = mod;
+        this.mod = mod;
+    }
+
+    @Override
+    public void render(
+            DrawContext context,
+            boolean hovering,
+            int mouseX,
+            int mouseY) {
+        boolean enabled = mod.isEnabled();
+
+        boolean hovering_settings = settingsHovering(mouseX, mouseY);
+
+        int color = !hovering_settings && (enabled || hovering)
+                ? SaturnClientConfig.color.value
+                : SaturnClientConfig.getWhite(alpha);
+
+        int size = 12;
+
+        if (enabled) {
+            SaturnUi.drawHighResTexture(
+                    context,
+                    Textures.MOD_BG,
+                    0,
+                    0,
+                    86,
+                    20,
+                    SaturnClientConfig.color.value);
         }
 
-        @Override
+        SaturnUi.drawHighResTexture(
-        public void render(
+                context,
-                        DrawContext context,
+                Textures.MOD,
-                        boolean hovering,
+                0,
-                        int mouseX,
+                0,
-                        int mouseY) {
+                86,
-                boolean enabled = mod.isEnabled();
+                20,
+                color);
 
-                boolean hovering_settings = settingsHovering(mouseX, mouseY);
+        SaturnUi.drawHighResTexture(
+                context,
+                mod.getIconTexture(),
+                4,
+                4,
+                size,
+                size,
+                color);
 
-                int color = !hovering_settings && (enabled || hovering)
+        context.drawText(
-                                ? SaturnClientConfig.COLOR.value
+                SaturnClientConfig.textRenderer,
-                                : SaturnClientConfig.getWhite(alpha);
+                SaturnUi.text(mod.getName()),
+                20,
+                (21 - SaturnClientConfig.textRenderer.fontHeight) / 2,
+                color,
+                false);
 
-                int size = 12;
+        SaturnUi.drawHighResTexture(
+                context,
+                Textures.SETTINGS,
+                77,
+                11,
+                7,
+                7,
+                hovering_settings
+                        ? SaturnClientConfig.color.value
+                        : SaturnClientConfig.getWhite(alpha));
+    }
 
-                if (enabled) {
+    @Override
-                        SaturnUi.drawHighResTexture(
+    public void click(int mouseX, int mouseY) {
-                                        context,
+        if (settingsHovering(mouseX, mouseY)) {
-                                        Textures.MOD_BG,
+            MinecraftClient.getInstance()
-                                        0,
+                    .setScreen(new ConfigEditor(mod.getConfig()));
-                                        0,
+        } else {
-                                        86,
+            mod.setEnabled(!mod.isEnabled());
-                                        20,
-                                        SaturnClientConfig.COLOR.value);
-                }
-
-                SaturnUi.drawHighResTexture(
-                                context,
-                                Textures.MOD,
-                                0,
-                                0,
-                                86,
-                                20,
-                                color);
-
-                SaturnUi.drawHighResTexture(
-                                context,
-                                mod.getIconTexture(),
-                                4,
-                                4,
-                                size,
-                                size,
-                                color);
-
-                context.drawText(
-                                SaturnClientConfig.textRenderer,
-                                SaturnUi.text(mod.getName()),
-                                20,
-                                (21 - SaturnClientConfig.textRenderer.fontHeight) / 2,
-                                color,
-                                false);
-
-                SaturnUi.drawHighResTexture(
-                                context,
-                                Textures.SETTINGS,
-                                77,
-                                11,
-                                7,
-                                7,
-                                hovering_settings
-                                                ? SaturnClientConfig.COLOR.value
-                                                : SaturnClientConfig.getWhite(alpha));
         }
+    }
 
-        @Override
+    public boolean settingsHovering(int mouseX, int mouseY) {
-        public void click(int mouseX, int mouseY) {
+        int sX = 77;
-                if (settingsHovering(mouseX, mouseY)) {
+        int sY = 11;
-                        MinecraftClient.getInstance()
+        int size = 7;
-                                        .setScreen(new ConfigEditor(mod.getConfig()));
-                } else {
-                        mod.setEnabled(!mod.isEnabled());
-                }
-        }
 
-        public boolean settingsHovering(int mouseX, int mouseY) {
+        return (sX < mouseX &&
-                int sX = 77;
+                sX + size > mouseX &&
-                int sY = 11;
+                sY < mouseY &&
-                int size = 7;
+                sY + size > mouseY);
-
+    }
-                return (sX < mouseX &&
-                                sX + size > mouseX &&
-                                sY < mouseY &&
-                                sY + size > mouseY);
-        }
 }

src/main/java/org/saturnclient/ui/components/SaturnString.java

@@ -88,7 +88,7 @@ public class SaturnString extends SaturnWidget {
                 this.width,
                 this.height,
                 focused
-                        ? SaturnClientConfig.COLOR.value
+                        ? SaturnClientConfig.color.value
                         : SaturnClientConfig.getWhite(this.alpha));
 
         int scrollOffset = getScrollOffset();

src/main/java/org/saturnclient/ui/components/SaturnToggle.java

@@ -25,7 +25,7 @@ public class SaturnToggle extends SaturnWidget {
             int mouseX,
             int mouseY) {
         int color = prop.value
-                ? SaturnClientConfig.COLOR.value
+                ? SaturnClientConfig.color.value
                 : SaturnClientConfig.getWhite(alpha);
         int w = 13;
         int h = 6;

src/main/java/org/saturnclient/ui/widgets/SaturnButton.java

@@ -4,6 +4,7 @@ import com.mojang.blaze3d.systems.RenderSystem;
 import java.util.function.Consumer;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
+import net.minecraft.text.Text;
 
 import org.saturnclient.saturnclient.SaturnClientConfig;
 import org.saturnclient.ui.SaturnUi;
@@ -16,6 +17,7 @@ public class SaturnButton extends SaturnWidget {
     public String text;
     public Consumer<SaturnButton> onPress;
     public boolean background = true;
+    public boolean bold = false;
     private float hoverAlpha = 0.0f;
 
     public SaturnButton(String text, Consumer<SaturnButton> onPress) {
@@ -67,12 +69,12 @@ public class SaturnButton extends SaturnWidget {
         }
 
         if (alpha != 0.0f) {
+            Text t = bold ? SaturnUi.textBold(text) : SaturnUi.text(text);
             context.drawText(
                     minecraftClient.textRenderer,
-                    SaturnUi.text(text),
+                    t,
                     ((this.width -
-                            minecraftClient.textRenderer.getWidth(
+                            minecraftClient.textRenderer.getWidth(t))
-                                    SaturnUi.text(text)))
                             /
                             2),
                     ((this.height - minecraftClient.textRenderer.fontHeight + 1) /
@@ -94,4 +96,9 @@ public class SaturnButton extends SaturnWidget {
         else if (hoverAlpha > 0.9f && hoverAlpha < 1.0f)
             hoverAlpha = 1.0f;
     }
+
+    public SaturnWidget setBold(boolean bold) {
+        this.bold = bold;
+        return this;
+    }
 }

src/main/java/org/saturnclient/ui/widgets/SaturnInputBox.java

@@ -97,7 +97,7 @@ public class SaturnInputBox extends SaturnWidget {
                 this.width,
                 this.height,
                 focused
-                        ? SaturnClientConfig.COLOR.value
+                        ? SaturnClientConfig.color.value
                         : SaturnClientConfig.getWhite(this.alpha));
 
         if (hovering || focused) {
@@ -109,7 +109,7 @@ public class SaturnInputBox extends SaturnWidget {
                     this.width,
                     this.height,
                     hovering
-                            ? SaturnClientConfig.COLOR.value
+                            ? SaturnClientConfig.color.value
                             : SaturnClientConfig.getWhite(this.alpha));
         }
 
@@ -125,7 +125,7 @@ public class SaturnInputBox extends SaturnWidget {
                     9,
                     9,
                     hovering
-                            ? SaturnClientConfig.COLOR.value
+                            ? SaturnClientConfig.color.value
                             : SaturnClientConfig.getWhite(this.alpha));
 
             matrices.scale(0.9f, 0.9f, 1.0f);
@@ -136,7 +136,7 @@ public class SaturnInputBox extends SaturnWidget {
                     14,
                     textRenderer.fontHeight / 2 + 1,
                     hovering
-                            ? SaturnClientConfig.COLOR.value
+                            ? SaturnClientConfig.color.value
                             : SaturnClientConfig.getWhite(this.alpha),
                     false);
         }

src/main/resources/assets/minecraft/font/fonts.json

@@ -3,6 +3,10 @@
     {
       "type": "reference",
       "id": "saturnclient:panton"
+    },
+    {
+      "type": "reference",
+      "id": "saturnclient:panton_bold"
     }
   ]
 }

src/main/resources/assets/saturnclient/font/panton_bold.json

@@ -0,0 +1,12 @@
+{
+  "providers": [
+    {
+      "type": "ttf",
+      "file": "saturnclient:panton_bold.ttf",
+      "shift": [0, 0],
+      "size": 9,
+      "oversample": 5.0,
+      "skip_missing": true
+    }
+  ]
+}