From 159018d7c11a218a585638c088847adfd698d106 Mon Sep 17 00:00:00 2001 From: Leo dev Date: Wed, 5 Mar 2025 19:19:23 +0100 Subject: [PATCH] full rebrand --- README.MD | 5 +- gradle.properties | 2 +- .../auraclient/auth/AuraPlayer.java | 5 -- .../auraclient/auraclient/menus/MainMenu.java | 43 ------------------ .../saturnclient/SaturnClient.java} | 18 ++++---- .../saturnclient/auth/SaturnApi.java} | 28 ++++++------ .../saturnclient/auth/SaturnPlayer.java | 5 ++ .../saturnclient}/cloaks/Cloaks.java | 42 ++++++++--------- .../saturnclient}/cloaks/GifDecoder.java | 2 +- .../cloaks/utils/AnimatedCloakData.java | 2 +- .../cloaks/utils/IdentifierUtils.java | 2 +- .../cloaks/utils/RandomUtils.java | 2 +- .../saturnclient}/event/KeyInputHandler.java | 22 ++++----- .../saturnclient}/menus/CloakSelector.java | 8 ++-- .../saturnclient/menus/MainMenu.java | 43 ++++++++++++++++++ .../saturnclient}/mixin/CapeRenderer.java | 4 +- .../saturnclient}/mixin/NameTagMixin.java | 10 ++-- .../saturnclient}/mixin/TabListMixin.java | 6 +-- .../saturnclient/widgets/SaturnButton.java} | 10 ++-- .../widgets/SaturnClientTexture.java} | 30 ++++++------ .../{aura_button.png => saturn_button.png} | Bin ...on.png.mcmeta => saturn_button.png.mcmeta} | 0 ...isabled.png => saturn_button_disabled.png} | Bin ...meta => saturn_button_disabled.png.mcmeta} | 0 ...hted.png => saturn_button_highlighted.png} | Bin ...a => saturn_button_highlighted.png.mcmeta} | 0 .../{auraclient => saturnclient}/icon.png | Bin .../textures/cloaks/glitch.gif | Bin .../textures/gui/cloaks/.prev.png | Bin .../textures/gui/cloaks/astelic.prev.png | Bin .../textures/gui/cloaks/glitch.prev.png | Bin src/main/resources/fabric.mod.json | 12 ++--- ...t.mixins.json => saturnclient.mixins.json} | 2 +- 33 files changed, 153 insertions(+), 150 deletions(-) delete mode 100644 src/main/java/org/auraclient/auraclient/auth/AuraPlayer.java delete mode 100644 src/main/java/org/auraclient/auraclient/menus/MainMenu.java rename src/main/java/org/{auraclient/auraclient/AuraClient.java => saturnclient/saturnclient/SaturnClient.java} (55%) rename src/main/java/org/{auraclient/auraclient/auth/AuraApi.java => saturnclient/saturnclient/auth/SaturnApi.java} (79%) create mode 100644 src/main/java/org/saturnclient/saturnclient/auth/SaturnPlayer.java rename src/main/java/org/{auraclient/auraclient => saturnclient/saturnclient}/cloaks/Cloaks.java (76%) rename src/main/java/org/{auraclient/auraclient => saturnclient/saturnclient}/cloaks/GifDecoder.java (99%) rename src/main/java/org/{auraclient/auraclient => saturnclient/saturnclient}/cloaks/utils/AnimatedCloakData.java (94%) rename src/main/java/org/{auraclient/auraclient => saturnclient/saturnclient}/cloaks/utils/IdentifierUtils.java (95%) rename src/main/java/org/{auraclient/auraclient => saturnclient/saturnclient}/cloaks/utils/RandomUtils.java (96%) rename src/main/java/org/{auraclient/auraclient => saturnclient/saturnclient}/event/KeyInputHandler.java (69%) rename src/main/java/org/{auraclient/auraclient => saturnclient/saturnclient}/menus/CloakSelector.java (71%) create mode 100644 src/main/java/org/saturnclient/saturnclient/menus/MainMenu.java rename src/main/java/org/{auraclient/auraclient => saturnclient/saturnclient}/mixin/CapeRenderer.java (94%) rename src/main/java/org/{auraclient/auraclient => saturnclient/saturnclient}/mixin/NameTagMixin.java (89%) rename src/main/java/org/{auraclient/auraclient => saturnclient/saturnclient}/mixin/TabListMixin.java (72%) rename src/main/java/org/{auraclient/auraclient/widgets/AuraButton.java => saturnclient/saturnclient/widgets/SaturnButton.java} (74%) rename src/main/java/org/{auraclient/auraclient/widgets/AuraClientTexture.java => saturnclient/saturnclient/widgets/SaturnClientTexture.java} (65%) rename src/main/resources/assets/minecraft/textures/gui/sprites/widget/{aura_button.png => saturn_button.png} (100%) rename src/main/resources/assets/minecraft/textures/gui/sprites/widget/{aura_button.png.mcmeta => saturn_button.png.mcmeta} (100%) rename src/main/resources/assets/minecraft/textures/gui/sprites/widget/{aura_button_disabled.png => saturn_button_disabled.png} (100%) rename src/main/resources/assets/minecraft/textures/gui/sprites/widget/{aura_button_disabled.png.mcmeta => saturn_button_disabled.png.mcmeta} (100%) rename src/main/resources/assets/minecraft/textures/gui/sprites/widget/{aura_button_highlighted.png => saturn_button_highlighted.png} (100%) rename src/main/resources/assets/minecraft/textures/gui/sprites/widget/{aura_button_highlighted.png.mcmeta => saturn_button_highlighted.png.mcmeta} (100%) rename src/main/resources/assets/{auraclient => saturnclient}/icon.png (100%) rename src/main/resources/assets/{auraclient => saturnclient}/textures/cloaks/glitch.gif (100%) rename src/main/resources/assets/{auraclient => saturnclient}/textures/gui/cloaks/.prev.png (100%) rename src/main/resources/assets/{auraclient => saturnclient}/textures/gui/cloaks/astelic.prev.png (100%) rename src/main/resources/assets/{auraclient => saturnclient}/textures/gui/cloaks/glitch.prev.png (100%) rename src/main/resources/{auraclient.mixins.json => saturnclient.mixins.json} (78%) diff --git a/README.MD b/README.MD index ba64fe5..1cf96e0 100644 --- a/README.MD +++ b/README.MD @@ -1,2 +1,3 @@ -# AuraClient Cloaks -Thanks to `IIpho3nix` for making this mod. \ No newline at end of file +# SaturnClient Cloaks + +Thanks to `IIpho3nix` for making this mod. diff --git a/gradle.properties b/gradle.properties index c678c63..4164ca2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx1G # Mod Properties mod_version = 1.0.0 maven_group = me.iipho3nix - archives_base_name = auraclient + archives_base_name = saturnclient # Dependencies # check this on https://modmuss50.me/fabric.html diff --git a/src/main/java/org/auraclient/auraclient/auth/AuraPlayer.java b/src/main/java/org/auraclient/auraclient/auth/AuraPlayer.java deleted file mode 100644 index fb39882..0000000 --- a/src/main/java/org/auraclient/auraclient/auth/AuraPlayer.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.auraclient.auraclient.auth; - -public class AuraPlayer { - public String cloak = ""; -} diff --git a/src/main/java/org/auraclient/auraclient/menus/MainMenu.java b/src/main/java/org/auraclient/auraclient/menus/MainMenu.java deleted file mode 100644 index e35ee72..0000000 --- a/src/main/java/org/auraclient/auraclient/menus/MainMenu.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.auraclient.auraclient.menus; - -import org.auraclient.auraclient.widgets.AuraButton; -import org.auraclient.auraclient.widgets.AuraClientTexture; - -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.TextWidget; -import net.minecraft.text.Text; -import net.minecraft.util.Identifier; - -public class MainMenu extends Screen { - public MainMenu() { - super(Text.literal("Aura Client")); - } - - @Override - protected void init() { - super.init(); - int auraClientSize = 40; - int auraClientX = (this.width - auraClientSize) / 2; - int auraClientY = ((this.height - 110) - auraClientSize) / 2; - - TextWidget auraClientText = new TextWidget(Text.literal("Saturn Client"), this.textRenderer); - - auraClientText.setX((this.width - auraClientText.getWidth()) / 2); - auraClientText.setY(auraClientY + auraClientSize + 3); - - addDrawable(auraClientText); - - addDrawable(AuraClientTexture.builder(Identifier.of("auraclient", "icon.png")) - .dimensions(auraClientX, auraClientY, auraClientSize, auraClientSize)); - - int buttonWidth = 50; - int buttonHeight = 30; - - addDrawableChild( - new AuraButton(Text.literal("Cloaks"), (_button) -> { - if (client.player != null) { - client.setScreen(new CloakSelector()); - } - }, (this.width - buttonWidth) / 2, (this.height - buttonHeight) / 2, buttonWidth, buttonHeight)); - } -} \ No newline at end of file diff --git a/src/main/java/org/auraclient/auraclient/AuraClient.java b/src/main/java/org/saturnclient/saturnclient/SaturnClient.java similarity index 55% rename from src/main/java/org/auraclient/auraclient/AuraClient.java rename to src/main/java/org/saturnclient/saturnclient/SaturnClient.java index 887ff4a..b50810f 100644 --- a/src/main/java/org/auraclient/auraclient/AuraClient.java +++ b/src/main/java/org/saturnclient/saturnclient/SaturnClient.java @@ -1,18 +1,18 @@ -package org.auraclient.auraclient; +package org.saturnclient.saturnclient; import net.fabricmc.api.ModInitializer; -import org.auraclient.auraclient.cloaks.Cloaks; -import org.auraclient.auraclient.event.KeyInputHandler; -import org.auraclient.auraclient.auth.AuraApi; +import org.saturnclient.saturnclient.cloaks.Cloaks; +import org.saturnclient.saturnclient.event.KeyInputHandler; +import org.saturnclient.saturnclient.auth.SaturnApi; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * Main class for the Aura Client mod. - * Originally created by IIpho3nix and modified for Aura Client by leo. + * Main class for the Saturn Client mod. + * Originally created by IIpho3nix and modified for Saturn Client by leo. */ -public class AuraClient implements ModInitializer { - public static final String MOD_ID = "auraclient"; +public class SaturnClient implements ModInitializer { + public static final String MOD_ID = "saturnclient"; public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); @Override @@ -20,7 +20,7 @@ public class AuraClient implements ModInitializer { LOGGER.info("Initializing " + MOD_ID); // Attempt authentication before initializing other features - if (AuraApi.authenticate()) { + if (SaturnApi.authenticate()) { KeyInputHandler.register(); Cloaks.initialize(); LOGGER.info(MOD_ID + " initialization complete"); diff --git a/src/main/java/org/auraclient/auraclient/auth/AuraApi.java b/src/main/java/org/saturnclient/saturnclient/auth/SaturnApi.java similarity index 79% rename from src/main/java/org/auraclient/auraclient/auth/AuraApi.java rename to src/main/java/org/saturnclient/saturnclient/auth/SaturnApi.java index 33d78d4..4e87350 100644 --- a/src/main/java/org/auraclient/auraclient/auth/AuraApi.java +++ b/src/main/java/org/saturnclient/saturnclient/auth/SaturnApi.java @@ -1,10 +1,10 @@ -package org.auraclient.auraclient.auth; +package org.saturnclient.saturnclient.auth; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import net.minecraft.client.MinecraftClient; -import org.auraclient.auraclient.AuraClient; -import org.auraclient.auraclient.cloaks.Cloaks; +import org.saturnclient.saturnclient.SaturnClient; +import org.saturnclient.saturnclient.cloaks.Cloaks; import java.io.BufferedReader; import java.io.InputStreamReader; @@ -16,19 +16,19 @@ import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; -public class AuraApi { +public class SaturnApi { private static final String URL = "http://localhost:3000"; private static String token = null; - public static Map players = new HashMap<>(); + public static Map players = new HashMap<>(); public static Map playerNames = new HashMap<>(); public static boolean authenticate() { try { MinecraftClient client = MinecraftClient.getInstance(); if (client.getSession() == null) { - AuraClient.LOGGER.error("No active Minecraft session found"); + SaturnClient.LOGGER.error("No active Minecraft session found"); return false; } @@ -60,7 +60,7 @@ public class AuraApi { playerNames.put(name, uuid); if (success) { - AuraClient.LOGGER.info("Successfully authenticated"); + SaturnClient.LOGGER.info("Successfully authenticated"); } // Update available cloaks list @@ -70,20 +70,20 @@ public class AuraApi { String cloak = jsonResponse.get("cloak").getAsString(); if (cloak != null) { - AuraClient.LOGGER.info("Setting cloak to " + cloak + " for " + uuid); + SaturnClient.LOGGER.info("Setting cloak to " + cloak + " for " + uuid); MinecraftClient.getInstance().execute(() -> Cloaks.setCloak(uuid, cloak)); } return success; } catch (Exception e) { - AuraClient.LOGGER.error("Authentication failed", e); + SaturnClient.LOGGER.error("Authentication failed", e); return false; } } public static void setCloak(String cloak) { if (token == null) { - AuraClient.LOGGER.error("No token found"); + SaturnClient.LOGGER.error("No token found"); return; } @@ -109,14 +109,14 @@ public class AuraApi { boolean success = jsonResponse.get("success").getAsBoolean(); if (success) { - AuraClient.LOGGER.info("Successfully set cloak"); + SaturnClient.LOGGER.info("Successfully set cloak"); } else { - AuraClient.LOGGER.error("Failed to set cloak"); - AuraClient.LOGGER.error(jsonResponse.get("error").getAsString()); + SaturnClient.LOGGER.error("Failed to set cloak"); + SaturnClient.LOGGER.error(jsonResponse.get("error").getAsString()); } } catch (Exception e) { - AuraClient.LOGGER.error("Failed to set cloak", e); + SaturnClient.LOGGER.error("Failed to set cloak", e); } } } \ No newline at end of file diff --git a/src/main/java/org/saturnclient/saturnclient/auth/SaturnPlayer.java b/src/main/java/org/saturnclient/saturnclient/auth/SaturnPlayer.java new file mode 100644 index 0000000..f8ae0fc --- /dev/null +++ b/src/main/java/org/saturnclient/saturnclient/auth/SaturnPlayer.java @@ -0,0 +1,5 @@ +package org.saturnclient.saturnclient.auth; + +public class SaturnPlayer { + public String cloak = ""; +} diff --git a/src/main/java/org/auraclient/auraclient/cloaks/Cloaks.java b/src/main/java/org/saturnclient/saturnclient/cloaks/Cloaks.java similarity index 76% rename from src/main/java/org/auraclient/auraclient/cloaks/Cloaks.java rename to src/main/java/org/saturnclient/saturnclient/cloaks/Cloaks.java index 8e2e751..7a3d677 100644 --- a/src/main/java/org/auraclient/auraclient/cloaks/Cloaks.java +++ b/src/main/java/org/saturnclient/saturnclient/cloaks/Cloaks.java @@ -1,11 +1,11 @@ -package org.auraclient.auraclient.cloaks; +package org.saturnclient.saturnclient.cloaks; import net.minecraft.util.Identifier; -import org.auraclient.auraclient.AuraClient; -import org.auraclient.auraclient.auth.AuraApi; -import org.auraclient.auraclient.auth.AuraPlayer; -import org.auraclient.auraclient.cloaks.utils.AnimatedCloakData; -import org.auraclient.auraclient.cloaks.utils.IdentifierUtils; +import org.saturnclient.saturnclient.SaturnClient; +import org.saturnclient.saturnclient.auth.SaturnApi; +import org.saturnclient.saturnclient.auth.SaturnPlayer; +import org.saturnclient.saturnclient.cloaks.utils.AnimatedCloakData; +import org.saturnclient.saturnclient.cloaks.utils.IdentifierUtils; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; @@ -15,13 +15,13 @@ import java.util.*; import java.util.concurrent.ConcurrentHashMap; /** - * Manages the cloak system for Aura Client. + * Manages the cloak system for Saturn Client. * Handles loading and caching of player cloaks. */ public class Cloaks { private static final String[] ANIMATED_CLOAKS = { "glitch" }; - private static final String CLOAKS_RESOURCE_PATH = "assets/auraclient/textures/cloaks/"; + private static final String CLOAKS_RESOURCE_PATH = "assets/saturnclient/textures/cloaks/"; public static final List availableCloaks = new ArrayList<>(); public static Identifier cloakCacheIdentifier = null; public static final Map> animatedCloaks = new ConcurrentHashMap<>(); @@ -41,13 +41,13 @@ public class Cloaks { * @param cloakName Name of the cloak file to load */ public static void setCloak(String uuid, String cloakName) { - AuraApi.setCloak(cloakName); + SaturnApi.setCloak(cloakName); - AuraPlayer player = AuraApi.players.get(uuid); + SaturnPlayer player = SaturnApi.players.get(uuid); if (player == null) { - AuraPlayer newPlayer = new AuraPlayer(); + SaturnPlayer newPlayer = new SaturnPlayer(); newPlayer.cloak = cloakName; - AuraApi.players.put(uuid, newPlayer); + SaturnApi.players.put(uuid, newPlayer); } else { player.cloak = cloakName; } @@ -76,17 +76,17 @@ public class Cloaks { BufferedImage image = ImageIO.read(inputStream); // Add debug logging for static cloak - AuraClient.LOGGER.info("Static cloak dimensions: " + image.getWidth() + "x" + image.getHeight()); + SaturnClient.LOGGER.info("Static cloak dimensions: " + image.getWidth() + "x" + image.getHeight()); String safeFileName = fileName.toLowerCase(Locale.ROOT) .replace(' ', '_') .replaceAll("[^a-z0-9/._-]", ""); - cloakCacheIdentifier = Identifier.of(AuraClient.MOD_ID, "cloaks_" + safeFileName); + cloakCacheIdentifier = Identifier.of(SaturnClient.MOD_ID, "cloaks_" + safeFileName); IdentifierUtils.registerBufferedImageTexture(cloakCacheIdentifier, image); } } catch (IOException e) { - AuraClient.LOGGER.error("Failed to load static cloak from resources: " + fileName, e); + SaturnClient.LOGGER.error("Failed to load static cloak from resources: " + fileName, e); } } @@ -111,7 +111,7 @@ public class Cloaks { int delay = gif.getDelay(i) * 10; String frameId = fileName.replace(".gif", "") + "_frame_" + i; - Identifier frameIdentifier = Identifier.of(AuraClient.MOD_ID, "cloaks_" + frameId); + Identifier frameIdentifier = Identifier.of(SaturnClient.MOD_ID, "cloaks_" + frameId); IdentifierUtils.registerBufferedImageTexture(frameIdentifier, frame); frames.add(new AnimatedCloakData(frameIdentifier, delay)); @@ -120,19 +120,19 @@ public class Cloaks { animatedCloaks.put(uuid, frames); lastFrameTime.put(uuid, System.currentTimeMillis()); - AuraClient.LOGGER.info("Loaded " + frames.size() + " frames for animated cloak: " + fileName); + SaturnClient.LOGGER.info("Loaded " + frames.size() + " frames for animated cloak: " + fileName); } } catch (IOException e) { - AuraClient.LOGGER.error("Failed to load animated cloak from resources: " + fileName, e); + SaturnClient.LOGGER.error("Failed to load animated cloak from resources: " + fileName, e); } } public static Identifier getCurrentCloakTexture(String uuid) { - if (!AuraApi.players.containsKey(uuid)) { + if (!SaturnApi.players.containsKey(uuid)) { return null; } - String cloakName = AuraApi.players.get(uuid).cloak; + String cloakName = SaturnApi.players.get(uuid).cloak; if (cloakName.isEmpty()) { return null; @@ -165,7 +165,7 @@ public class Cloaks { return frames.get(currentFrame).getTextureId(); } else { - return Identifier.of(AuraClient.MOD_ID, "textures/cloaks/" + cloakName + ".png"); + return Identifier.of(SaturnClient.MOD_ID, "textures/cloaks/" + cloakName + ".png"); } } } \ No newline at end of file diff --git a/src/main/java/org/auraclient/auraclient/cloaks/GifDecoder.java b/src/main/java/org/saturnclient/saturnclient/cloaks/GifDecoder.java similarity index 99% rename from src/main/java/org/auraclient/auraclient/cloaks/GifDecoder.java rename to src/main/java/org/saturnclient/saturnclient/cloaks/GifDecoder.java index 2dac769..0bcf25e 100644 --- a/src/main/java/org/auraclient/auraclient/cloaks/GifDecoder.java +++ b/src/main/java/org/saturnclient/saturnclient/cloaks/GifDecoder.java @@ -1,4 +1,4 @@ -package org.auraclient.auraclient.cloaks; +package org.saturnclient.saturnclient.cloaks; import java.awt.*; import java.awt.image.BufferedImage; diff --git a/src/main/java/org/auraclient/auraclient/cloaks/utils/AnimatedCloakData.java b/src/main/java/org/saturnclient/saturnclient/cloaks/utils/AnimatedCloakData.java similarity index 94% rename from src/main/java/org/auraclient/auraclient/cloaks/utils/AnimatedCloakData.java rename to src/main/java/org/saturnclient/saturnclient/cloaks/utils/AnimatedCloakData.java index 004929e..01e490c 100644 --- a/src/main/java/org/auraclient/auraclient/cloaks/utils/AnimatedCloakData.java +++ b/src/main/java/org/saturnclient/saturnclient/cloaks/utils/AnimatedCloakData.java @@ -1,4 +1,4 @@ -package org.auraclient.auraclient.cloaks.utils; +package org.saturnclient.saturnclient.cloaks.utils; import net.minecraft.util.Identifier; diff --git a/src/main/java/org/auraclient/auraclient/cloaks/utils/IdentifierUtils.java b/src/main/java/org/saturnclient/saturnclient/cloaks/utils/IdentifierUtils.java similarity index 95% rename from src/main/java/org/auraclient/auraclient/cloaks/utils/IdentifierUtils.java rename to src/main/java/org/saturnclient/saturnclient/cloaks/utils/IdentifierUtils.java index d722ab4..62a82e1 100644 --- a/src/main/java/org/auraclient/auraclient/cloaks/utils/IdentifierUtils.java +++ b/src/main/java/org/saturnclient/saturnclient/cloaks/utils/IdentifierUtils.java @@ -1,4 +1,4 @@ -package org.auraclient.auraclient.cloaks.utils; +package org.saturnclient.saturnclient.cloaks.utils; import net.minecraft.client.MinecraftClient; import net.minecraft.client.texture.NativeImage; diff --git a/src/main/java/org/auraclient/auraclient/cloaks/utils/RandomUtils.java b/src/main/java/org/saturnclient/saturnclient/cloaks/utils/RandomUtils.java similarity index 96% rename from src/main/java/org/auraclient/auraclient/cloaks/utils/RandomUtils.java rename to src/main/java/org/saturnclient/saturnclient/cloaks/utils/RandomUtils.java index 21eb07b..3ffcfa4 100644 --- a/src/main/java/org/auraclient/auraclient/cloaks/utils/RandomUtils.java +++ b/src/main/java/org/saturnclient/saturnclient/cloaks/utils/RandomUtils.java @@ -1,4 +1,4 @@ -package org.auraclient.auraclient.cloaks.utils; +package org.saturnclient.saturnclient.cloaks.utils; import java.util.Random; diff --git a/src/main/java/org/auraclient/auraclient/event/KeyInputHandler.java b/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java similarity index 69% rename from src/main/java/org/auraclient/auraclient/event/KeyInputHandler.java rename to src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java index 6fcf0ac..ba15c06 100644 --- a/src/main/java/org/auraclient/auraclient/event/KeyInputHandler.java +++ b/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java @@ -1,21 +1,21 @@ -package org.auraclient.auraclient.event; +package org.saturnclient.saturnclient.event; 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.auraclient.auraclient.menus.MainMenu; +import org.saturnclient.saturnclient.menus.MainMenu; import org.lwjgl.glfw.GLFW; /** - * Handles keyboard input events for the Aura Client. + * Handles keyboard input events for the Saturn Client. * Manages keybindings and their associated actions. */ public class KeyInputHandler { - private static final String KEY_CATEGORY = "key.category.auraclient"; - private static final String MAIN_MENU_KEY_ID = "key.auraclient.main_menu"; + private static final String KEY_CATEGORY = "key.category.saturnclient"; + private static final String MAIN_MENU_KEY_ID = "key.saturnclient.main_menu"; private static final int DEFAULT_MENU_KEY = GLFW.GLFW_KEY_RIGHT_SHIFT; - + private static KeyBinding mainMenuKeyBinding; /** @@ -25,11 +25,10 @@ public class KeyInputHandler { public static void register() { // Register the main menu key binding mainMenuKeyBinding = KeyBindingHelper.registerKeyBinding(new KeyBinding( - MAIN_MENU_KEY_ID, - InputUtil.Type.KEYSYM, - DEFAULT_MENU_KEY, - KEY_CATEGORY - )); + MAIN_MENU_KEY_ID, + InputUtil.Type.KEYSYM, + DEFAULT_MENU_KEY, + KEY_CATEGORY)); // Register the event handler for the main menu key ClientTickEvents.END_CLIENT_TICK.register(client -> { @@ -39,4 +38,3 @@ public class KeyInputHandler { }); } } - diff --git a/src/main/java/org/auraclient/auraclient/menus/CloakSelector.java b/src/main/java/org/saturnclient/saturnclient/menus/CloakSelector.java similarity index 71% rename from src/main/java/org/auraclient/auraclient/menus/CloakSelector.java rename to src/main/java/org/saturnclient/saturnclient/menus/CloakSelector.java index 2fa3408..f6e987b 100644 --- a/src/main/java/org/auraclient/auraclient/menus/CloakSelector.java +++ b/src/main/java/org/saturnclient/saturnclient/menus/CloakSelector.java @@ -1,7 +1,7 @@ -package org.auraclient.auraclient.menus; +package org.saturnclient.saturnclient.menus; -import org.auraclient.auraclient.cloaks.Cloaks; -import org.auraclient.auraclient.widgets.AuraButton; +import org.saturnclient.saturnclient.cloaks.Cloaks; +import org.saturnclient.saturnclient.widgets.SaturnButton; import net.minecraft.client.gui.screen.Screen; import net.minecraft.text.Text; @@ -16,7 +16,7 @@ public class CloakSelector extends Screen { int y = ((this.height - (35 * (Cloaks.availableCloaks.size()))) / 2); for (String cloak : Cloaks.availableCloaks) { - addDrawableChild(new AuraButton(Text.literal(cloak), (__) -> { + addDrawableChild(new SaturnButton(Text.literal(cloak), (__) -> { String uuid = client.player.getUuidAsString().replace("-", ""); Cloaks.setCloak(uuid, cloak); }, (this.width - 50) / 2, y, 50, 30)); diff --git a/src/main/java/org/saturnclient/saturnclient/menus/MainMenu.java b/src/main/java/org/saturnclient/saturnclient/menus/MainMenu.java new file mode 100644 index 0000000..f909f66 --- /dev/null +++ b/src/main/java/org/saturnclient/saturnclient/menus/MainMenu.java @@ -0,0 +1,43 @@ +package org.saturnclient.saturnclient.menus; + +import org.saturnclient.saturnclient.widgets.SaturnButton; +import org.saturnclient.saturnclient.widgets.SaturnClientTexture; + +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.widget.TextWidget; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; + +public class MainMenu extends Screen { + public MainMenu() { + super(Text.literal("Saturn Client")); + } + + @Override + protected void init() { + super.init(); + int saturnClientSize = 40; + int saturnClientX = (this.width - saturnClientSize) / 2; + int saturnClientY = ((this.height - 110) - saturnClientSize) / 2; + + TextWidget saturnClientText = new TextWidget(Text.literal("Saturn Client"), this.textRenderer); + + saturnClientText.setX((this.width - saturnClientText.getWidth()) / 2); + saturnClientText.setY(saturnClientY + saturnClientSize + 3); + + addDrawable(saturnClientText); + + addDrawable(SaturnClientTexture.builder(Identifier.of("saturnclient", "icon.png")) + .dimensions(saturnClientX, saturnClientY, saturnClientSize, saturnClientSize)); + + int buttonWidth = 50; + int buttonHeight = 30; + + addDrawableChild( + new SaturnButton(Text.literal("Cloaks"), (_button) -> { + if (client.player != null) { + client.setScreen(new CloakSelector()); + } + }, (this.width - buttonWidth) / 2, (this.height - buttonHeight) / 2, buttonWidth, buttonHeight)); + } +} \ No newline at end of file diff --git a/src/main/java/org/auraclient/auraclient/mixin/CapeRenderer.java b/src/main/java/org/saturnclient/saturnclient/mixin/CapeRenderer.java similarity index 94% rename from src/main/java/org/auraclient/auraclient/mixin/CapeRenderer.java rename to src/main/java/org/saturnclient/saturnclient/mixin/CapeRenderer.java index 49edf4e..1d9ccba 100644 --- a/src/main/java/org/auraclient/auraclient/mixin/CapeRenderer.java +++ b/src/main/java/org/saturnclient/saturnclient/mixin/CapeRenderer.java @@ -1,4 +1,4 @@ -package org.auraclient.auraclient.mixin; +package org.saturnclient.saturnclient.mixin; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -6,7 +6,7 @@ import net.minecraft.client.network.AbstractClientPlayerEntity; import net.minecraft.client.util.SkinTextures; import net.minecraft.util.Identifier; -import org.auraclient.auraclient.cloaks.Cloaks; +import org.saturnclient.saturnclient.cloaks.Cloaks; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/src/main/java/org/auraclient/auraclient/mixin/NameTagMixin.java b/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java similarity index 89% rename from src/main/java/org/auraclient/auraclient/mixin/NameTagMixin.java rename to src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java index 16518ef..5c59b26 100644 --- a/src/main/java/org/auraclient/auraclient/mixin/NameTagMixin.java +++ b/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java @@ -1,4 +1,4 @@ -package org.auraclient.auraclient.mixin; +package org.saturnclient.saturnclient.mixin; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; @@ -13,7 +13,7 @@ import net.minecraft.text.Text; import net.minecraft.util.math.Vec3d; import net.minecraft.client.render.LightmapTextureManager; -import org.auraclient.auraclient.auth.AuraApi; +import org.saturnclient.saturnclient.auth.SaturnApi; import org.joml.Matrix4f; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; @@ -27,7 +27,7 @@ public abstract class NameTagMixin { @Overwrite public void renderLabelIfPresent(S state, Text text_o, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light) { - Text text = isAura(state) ? Text.literal("" + "HexLeo") : text_o; + Text text = isSaturn(state) ? Text.literal("" + "HexLeo") : text_o; Vec3d vec3d = state.nameLabelPos; if (vec3d != null) { @@ -52,10 +52,10 @@ public abstract class NameTagMixin { } } - private boolean isAura(S state) { + private boolean isSaturn(S state) { if (state instanceof PlayerEntityRenderState) { String name = ((PlayerEntityRenderState) state).name; - return AuraApi.playerNames.containsKey(name); + return SaturnApi.playerNames.containsKey(name); } return false; } diff --git a/src/main/java/org/auraclient/auraclient/mixin/TabListMixin.java b/src/main/java/org/saturnclient/saturnclient/mixin/TabListMixin.java similarity index 72% rename from src/main/java/org/auraclient/auraclient/mixin/TabListMixin.java rename to src/main/java/org/saturnclient/saturnclient/mixin/TabListMixin.java index b4fb7a4..5f05781 100644 --- a/src/main/java/org/auraclient/auraclient/mixin/TabListMixin.java +++ b/src/main/java/org/saturnclient/saturnclient/mixin/TabListMixin.java @@ -1,6 +1,6 @@ -package org.auraclient.auraclient.mixin; +package org.saturnclient.saturnclient.mixin; -import org.auraclient.auraclient.auth.AuraApi; +import org.saturnclient.saturnclient.auth.SaturnApi; import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; @@ -17,6 +17,6 @@ public abstract class TabListMixin { @Nullable public Text getDisplayName() { String name = displayName.getString(); - return Text.literal(AuraApi.playerNames.containsKey(name) ? "" + name : name); + return Text.literal(SaturnApi.playerNames.containsKey(name) ? "" + name : name); } } diff --git a/src/main/java/org/auraclient/auraclient/widgets/AuraButton.java b/src/main/java/org/saturnclient/saturnclient/widgets/SaturnButton.java similarity index 74% rename from src/main/java/org/auraclient/auraclient/widgets/AuraButton.java rename to src/main/java/org/saturnclient/saturnclient/widgets/SaturnButton.java index 373549a..267c6d3 100644 --- a/src/main/java/org/auraclient/auraclient/widgets/AuraButton.java +++ b/src/main/java/org/saturnclient/saturnclient/widgets/SaturnButton.java @@ -1,4 +1,4 @@ -package org.auraclient.auraclient.widgets; +package org.saturnclient.saturnclient.widgets; import java.awt.Color; @@ -10,13 +10,13 @@ import net.minecraft.client.gui.widget.TexturedButtonWidget; import net.minecraft.text.Text; import net.minecraft.util.Identifier; -public class AuraButton extends TexturedButtonWidget { +public class SaturnButton extends TexturedButtonWidget { private TextWidget textWidget; private static final ButtonTextures BUTTON_TEXTURES = new ButtonTextures( - Identifier.ofVanilla("widget/aura_button"), Identifier.ofVanilla("widget/aura_button_disabled"), - Identifier.ofVanilla("widget/aura_button_highlighted")); + Identifier.ofVanilla("widget/saturn_button"), Identifier.ofVanilla("widget/saturn_button_disabled"), + Identifier.ofVanilla("widget/saturn_button_highlighted")); - public AuraButton(Text message, PressAction onPress, int x, int y, int width, int height) { + public SaturnButton(Text message, PressAction onPress, int x, int y, int width, int height) { super(x, y, width, height, BUTTON_TEXTURES, onPress); setMessage(message); diff --git a/src/main/java/org/auraclient/auraclient/widgets/AuraClientTexture.java b/src/main/java/org/saturnclient/saturnclient/widgets/SaturnClientTexture.java similarity index 65% rename from src/main/java/org/auraclient/auraclient/widgets/AuraClientTexture.java rename to src/main/java/org/saturnclient/saturnclient/widgets/SaturnClientTexture.java index f10aa5d..13a2e1a 100644 --- a/src/main/java/org/auraclient/auraclient/widgets/AuraClientTexture.java +++ b/src/main/java/org/saturnclient/saturnclient/widgets/SaturnClientTexture.java @@ -1,4 +1,4 @@ -package org.auraclient.auraclient.widgets; +package org.saturnclient.saturnclient.widgets; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.Drawable; @@ -6,12 +6,12 @@ import net.minecraft.client.render.RenderLayer; import net.minecraft.util.Identifier; /** - * Represents a drawable texture in the Aura Client UI. + * Represents a drawable texture in the Saturn Client UI. * Uses the builder pattern for flexible texture creation and configuration. */ -public class AuraClientTexture implements Drawable { +public class SaturnClientTexture implements Drawable { // Predefined textures - public static final Identifier BOX_1_1 = Identifier.of("auraclient", "textures/gui/box_1_1.png"); + public static final Identifier BOX_1_1 = Identifier.of("saturnclient", "textures/gui/box_1_1.png"); private final Identifier sprite; private int x; @@ -21,9 +21,10 @@ public class AuraClientTexture implements Drawable { /** * Creates a new texture with the specified sprite. + * * @param sprite The identifier for the texture sprite */ - private AuraClientTexture(Identifier sprite) { + private SaturnClientTexture(Identifier sprite) { this.sprite = sprite; this.x = 0; this.y = 0; @@ -33,22 +34,24 @@ public class AuraClientTexture implements Drawable { /** * Creates a new builder instance for the texture. + * * @param sprite The identifier for the texture sprite - * @return A new AuraClientTexture instance + * @return A new SaturnClientTexture instance */ - public static AuraClientTexture builder(Identifier sprite) { - return new AuraClientTexture(sprite); + public static SaturnClientTexture builder(Identifier sprite) { + return new SaturnClientTexture(sprite); } /** * Sets the dimensions and position of the texture. - * @param x The x coordinate - * @param y The y coordinate - * @param width The width of the texture + * + * @param x The x coordinate + * @param y The y coordinate + * @param width The width of the texture * @param height The height of the texture * @return This instance for method chaining */ - public AuraClientTexture dimensions(int x, int y, int width, int height) { + public SaturnClientTexture dimensions(int x, int y, int width, int height) { this.x = x; this.y = y; this.width = width; @@ -58,10 +61,11 @@ public class AuraClientTexture implements Drawable { /** * Sets the focused state of the texture. + * * @param focused The focused state * @return This instance for method chaining */ - public AuraClientTexture setFocused(boolean focused) { + public SaturnClientTexture setFocused(boolean focused) { return this; } diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/aura_button.png b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/gui/sprites/widget/aura_button.png rename to src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button.png diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/aura_button.png.mcmeta b/src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button.png.mcmeta similarity index 100% rename from src/main/resources/assets/minecraft/textures/gui/sprites/widget/aura_button.png.mcmeta rename to src/main/resources/assets/minecraft/textures/gui/sprites/widget/saturn_button.png.mcmeta diff --git a/src/main/resources/assets/minecraft/textures/gui/sprites/widget/aura_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/aura_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/aura_button_disabled.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/aura_button_disabled.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/aura_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/aura_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/aura_button_highlighted.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/aura_button_highlighted.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/auraclient/icon.png b/src/main/resources/assets/saturnclient/icon.png similarity index 100% rename from src/main/resources/assets/auraclient/icon.png rename to src/main/resources/assets/saturnclient/icon.png diff --git a/src/main/resources/assets/auraclient/textures/cloaks/glitch.gif b/src/main/resources/assets/saturnclient/textures/cloaks/glitch.gif similarity index 100% rename from src/main/resources/assets/auraclient/textures/cloaks/glitch.gif rename to src/main/resources/assets/saturnclient/textures/cloaks/glitch.gif diff --git a/src/main/resources/assets/auraclient/textures/gui/cloaks/.prev.png b/src/main/resources/assets/saturnclient/textures/gui/cloaks/.prev.png similarity index 100% rename from src/main/resources/assets/auraclient/textures/gui/cloaks/.prev.png rename to src/main/resources/assets/saturnclient/textures/gui/cloaks/.prev.png diff --git a/src/main/resources/assets/auraclient/textures/gui/cloaks/astelic.prev.png b/src/main/resources/assets/saturnclient/textures/gui/cloaks/astelic.prev.png similarity index 100% rename from src/main/resources/assets/auraclient/textures/gui/cloaks/astelic.prev.png rename to src/main/resources/assets/saturnclient/textures/gui/cloaks/astelic.prev.png diff --git a/src/main/resources/assets/auraclient/textures/gui/cloaks/glitch.prev.png b/src/main/resources/assets/saturnclient/textures/gui/cloaks/glitch.prev.png similarity index 100% rename from src/main/resources/assets/auraclient/textures/gui/cloaks/glitch.prev.png rename to src/main/resources/assets/saturnclient/textures/gui/cloaks/glitch.prev.png diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index a2b911e..de2b2ca 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,21 +1,21 @@ { "schemaVersion": 1, - "id": "auraclient", + "id": "saturnclient", "version": "${version}", - "name": "auraclient", + "name": "saturnclient", "description": "A Minecraft client mod", "authors": ["IIpho3nix", "kleo-dev"], "contact": { "website": "https://kleo-dev.netlify.app", - "sources": "https://github.com/kleo-dev/auraclient" + "sources": "https://github.com/kleo-dev/saturnclient" }, "license": "GPL-3.0", - "icon": "assets/auraclient/icon.png", + "icon": "assets/saturnclient/icon.png", "environment": "client", "entrypoints": { - "main": ["org.auraclient.auraclient.AuraClient"] + "main": ["org.saturnclient.saturnclient.SaturnClient"] }, - "mixins": ["auraclient.mixins.json"], + "mixins": ["saturnclient.mixins.json"], "depends": { "fabricloader": ">=${loader_version}", "fabric": "*", diff --git a/src/main/resources/auraclient.mixins.json b/src/main/resources/saturnclient.mixins.json similarity index 78% rename from src/main/resources/auraclient.mixins.json rename to src/main/resources/saturnclient.mixins.json index 63a46f0..770306a 100644 --- a/src/main/resources/auraclient.mixins.json +++ b/src/main/resources/saturnclient.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "org.auraclient.auraclient.mixin", + "package": "org.saturnclient.saturnclient.mixin", "compatibilityLevel": "JAVA_17", "client": ["CapeRenderer", "TabListMixin", "NameTagMixin"], "injectors": {