From e8671640e35b5d5f8f5139c9196813eaa93c7371 Mon Sep 17 00:00:00 2001 From: Klesti Selimaj Date: Thu, 5 Mar 2026 23:45:03 +0100 Subject: [PATCH] Using updated config --- .../config/manager/ConfigManager.java | 18 +- .../saturnclient/config/manager/Property.java | 9 +- .../cosmetics/cloak/CloakFeatureRenderer.java | 2 +- .../saturnclient/modules/ModDimensions.java | 4 +- .../java/org/saturnclient/modules/Module.java | 4 +- .../modules/mods/ArmorDisplay.java | 2 +- .../saturnclient/modules/mods/AutoSprint.java | 22 +- .../org/saturnclient/modules/mods/Clock.java | 35 +- .../modules/mods/Coordinates.java | 20 +- .../saturnclient/modules/mods/Crosshair.java | 12 +- .../saturnclient/modules/mods/DayCounter.java | 16 +- .../org/saturnclient/modules/mods/Fps.java | 14 +- .../saturnclient/modules/mods/Freelook.java | 21 +- .../saturnclient/modules/mods/Fullbright.java | 18 +- .../modules/mods/HealthDisplay.java | 25 +- .../saturnclient/modules/mods/Keystrokes.java | 5 +- .../saturnclient/modules/mods/Nametags.java | 154 ++++----- .../org/saturnclient/modules/mods/NoFog.java | 14 +- .../org/saturnclient/modules/mods/Ping.java | 14 +- .../modules/mods/Speedometer.java | 31 +- .../modules/mods/StatusEffects.java | 51 +-- .../org/saturnclient/modules/mods/Tps.java | 29 +- .../org/saturnclient/modules/mods/Zoom.java | 27 +- .../saturnclient/SaturnClient.java | 4 +- .../saturnclient/client/player/Roles.java | 2 +- .../saturnclient/config/AnimationConfig.java | 55 ---- .../saturnclient/config/Config.java | 37 --- .../saturnclient/config/Theme.java | 91 ------ .../config/manager/ConfigManager.java | 181 ----------- .../saturnclient/config/manager/Property.java | 298 ------------------ .../saturnclient/event/KeyInputHandler.java | 5 +- .../saturnclient/menus/HudEditor.java | 5 +- .../saturnclient/mixin/SetScreenMixin.java | 2 +- .../mixin/SplashOverlayMixin.java | 8 +- .../org/saturnclient/ui/anim/Animation.java | 2 +- .../java/org/saturnclient/ui/anim/Fade.java | 2 +- .../org/saturnclient/ui/anim/FadeOut.java | 2 +- .../org/saturnclient/ui/anim/SlideFade.java | 2 +- .../java/org/saturnclient/ui/anim/SlideX.java | 2 +- .../java/org/saturnclient/ui/anim/SlideY.java | 2 +- .../ui/components/CosmeticPreview.java | 2 +- .../ui/components/SaturnModule.java | 276 ++++++++-------- .../saturnclient/ui/components/Sidebar.java | 4 +- .../ui/components/inputs/FloatInput.java | 4 +- .../ui/components/inputs/HexInput.java | 2 +- .../ui/components/inputs/Input.java | 2 +- .../ui/components/inputs/IntInput.java | 4 +- .../components/inputs/KeybindingSelector.java | 4 +- .../ui/components/inputs/Select.java | 4 +- .../ui/components/inputs/Toggle.java | 4 +- .../ui/elements/AnimationStagger.java | 4 +- .../org/saturnclient/ui/elements/Button.java | 2 +- .../ui/elements/ClickableTexture.java | 2 +- .../ui/elements/Notification.java | 4 +- .../org/saturnclient/ui/elements/Scroll.java | 11 +- .../org/saturnclient/ui/elements/TabMenu.java | 2 +- .../org/saturnclient/ui/elements/Text.java | 2 +- .../ui/elements/TextureButton.java | 2 +- .../saturnclient/ui/screens/ConfigEditor.java | 6 +- .../saturnclient/ui/screens/EmoteWheel.java | 4 +- .../org/saturnclient/ui/screens/ModMenu.java | 2 +- .../saturnclient/ui/screens/ShiftMenu.java | 4 +- .../saturnclient/ui/screens/TitleMenu.java | 4 +- .../ui/screens/cosmetics/CloakMenu.java | 2 +- .../ui/screens/cosmetics/HatMenu.java | 2 +- .../ui/screens/store/CloakStore.java | 4 +- .../ui/screens/store/HatStore.java | 4 +- 67 files changed, 487 insertions(+), 1127 deletions(-) delete mode 100644 versions/1.21.4/src/main/java/org/saturnclient/saturnclient/config/AnimationConfig.java delete mode 100644 versions/1.21.4/src/main/java/org/saturnclient/saturnclient/config/Config.java delete mode 100644 versions/1.21.4/src/main/java/org/saturnclient/saturnclient/config/Theme.java delete mode 100644 versions/1.21.4/src/main/java/org/saturnclient/saturnclient/config/manager/ConfigManager.java delete mode 100644 versions/1.21.4/src/main/java/org/saturnclient/saturnclient/config/manager/Property.java diff --git a/common/src/main/java/org/saturnclient/config/manager/ConfigManager.java b/common/src/main/java/org/saturnclient/config/manager/ConfigManager.java index 284fb03..6e2c829 100644 --- a/common/src/main/java/org/saturnclient/config/manager/ConfigManager.java +++ b/common/src/main/java/org/saturnclient/config/manager/ConfigManager.java @@ -13,6 +13,7 @@ import java.util.Map; public class ConfigManager { private static final ObjectMapper MAPPER = new ObjectMapper(); + private static File configFile; // SINGLE ROOT TREE private static final Map> ROOT = new LinkedHashMap<>(); @@ -23,13 +24,21 @@ public class ConfigManager { private final String[] path; - private File configFile; - /** * Creates a root namespace */ public ConfigManager(File configFile, String namespace) { - this.configFile = configFile; + ConfigManager.configFile = configFile; + this.currentMap = new LinkedHashMap<>(); + this.path = new String[] { namespace }; + + ROOT.put(namespace, Property.namespace(currentMap)); + } + + /** + * Creates a root namespace + */ + public ConfigManager(String namespace) { this.currentMap = new LinkedHashMap<>(); this.path = new String[] { namespace }; @@ -40,7 +49,6 @@ public class ConfigManager { * Creates a sub-namespace inside a parent */ public ConfigManager(ConfigManager parent, String namespace) { - this.configFile = parent.configFile; this.currentMap = new LinkedHashMap<>(); this.path = new String[parent.path.length + 1]; @@ -80,7 +88,7 @@ public class ConfigManager { /** * Save entire config */ - public void save() { + public static void save() { ObjectNode rootJson = MAPPER.createObjectNode(); saveRecursive(rootJson, ROOT); diff --git a/common/src/main/java/org/saturnclient/config/manager/Property.java b/common/src/main/java/org/saturnclient/config/manager/Property.java index 6575d0d..0581d8f 100644 --- a/common/src/main/java/org/saturnclient/config/manager/Property.java +++ b/common/src/main/java/org/saturnclient/config/manager/Property.java @@ -271,15 +271,14 @@ public class Property { // ---------- Keybindings (no SaturnClient) ---------- - public boolean isKeyPressed(long windowHandle, boolean screenOpen) { + public boolean isKeyPressed() { return (Integer) value != -1 && - MinecraftProvider.PROVIDER.isKeyPressed((Integer) value) && !screenOpen; + MinecraftProvider.PROVIDER.isKeyPressed((Integer) value); } - public boolean wasKeyPressed(long windowHandle, boolean screenOpen) { - - boolean pressed = isKeyPressed(windowHandle, screenOpen); + public boolean wasKeyPressed() { + boolean pressed = isKeyPressed(); boolean result = pressed && !wasPressedLastTick; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/cloak/CloakFeatureRenderer.java b/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/cloak/CloakFeatureRenderer.java index a91ff29..8f827d9 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/cloak/CloakFeatureRenderer.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/cloak/CloakFeatureRenderer.java @@ -3,7 +3,7 @@ package org.saturnclient.cosmetics.cloak; import java.util.Arrays; import org.saturnclient.saturnclient.client.player.SaturnPlayer; -import org.saturnclient.saturnclient.config.Config; +import org.saturnclient.config.Config; import net.minecraft.client.render.OverlayTexture; import net.minecraft.client.render.RenderLayer; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/ModDimensions.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/ModDimensions.java index 77f6e6f..472f97a 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/ModDimensions.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/ModDimensions.java @@ -2,8 +2,8 @@ package org.saturnclient.modules; import java.util.Map; -import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.saturnclient.config.manager.Property.NamedProperty; +import org.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.Property.NamedProperty; public class ModDimensions { public Property x = Property.integer(0); diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/Module.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/Module.java index b7bba7c..f015b91 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/Module.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/Module.java @@ -1,7 +1,7 @@ package org.saturnclient.modules; -import org.saturnclient.saturnclient.config.manager.ConfigManager; -import org.saturnclient.saturnclient.config.manager.Property.NamedProperty; +import org.saturnclient.config.manager.ConfigManager; +import org.saturnclient.config.manager.Property.NamedProperty; import org.saturnclient.ui.RenderScope; import org.saturnclient.ui.resources.Textures; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java index dc5d0d7..ac1d311 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java @@ -5,7 +5,7 @@ import org.saturnclient.modules.ModDimensions; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.Property; import org.saturnclient.ui.RenderScope; import net.minecraft.entity.EquipmentSlot; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/AutoSprint.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/AutoSprint.java index 7a413b4..92b37c4 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/AutoSprint.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/AutoSprint.java @@ -5,18 +5,18 @@ import java.util.Objects; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.Property; public class AutoSprint extends Module { private static Property enabled = Property.bool(false); public AutoSprint() { super( - new ModuleDetails("Auto Sprint", "sprint") - .description("Makes the player always sprint") - .tags("Movement") - .version("v0.1.0"), - enabled.named("Enabled")); + new ModuleDetails("Auto Sprint", "sprint") + .description("Makes the player always sprint") + .tags("Movement") + .version("v0.1.0"), + enabled.named("Enabled")); } @Override @@ -24,11 +24,11 @@ public class AutoSprint extends Module { if (SaturnClient.client.player == null || SaturnClient.client.getNetworkHandler() == null) { return; } - if (SaturnClient.client.options.forwardKey.isPressed() - && !SaturnClient.client.options.backKey.isPressed() - && !SaturnClient.client.player.isSneaking() - && !SaturnClient.client.player.horizontalCollision - && !SaturnClient.client.player.isUsingItem()) { + if (SaturnClient.client.options.forwardKey.isPressed() + && !SaturnClient.client.options.backKey.isPressed() + && !SaturnClient.client.player.isSneaking() + && !SaturnClient.client.player.horizontalCollision + && !SaturnClient.client.player.isUsingItem()) { Objects.requireNonNull(SaturnClient.client.player).setSprinting(true); } diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Clock.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Clock.java index 0baae70..7726401 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Clock.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Clock.java @@ -7,7 +7,7 @@ import org.saturnclient.modules.HudMod; import org.saturnclient.modules.ModDimensions; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.Property; import org.saturnclient.ui.RenderScope; import org.saturnclient.ui.resources.Fonts; @@ -19,14 +19,13 @@ public class Clock extends Module implements HudMod { public Clock() { super(new ModuleDetails("Clock", "clock") - .description("Displays the current real-world time") - .version("v0.1.0") - .tags("Utility"), - enabled.named("Enabled"), - format.named("Format"), - seconds.named("Show seconds"), - dimensions.prop() - ); + .description("Displays the current real-world time") + .version("v0.1.0") + .tags("Utility"), + enabled.named("Enabled"), + format.named("Format"), + seconds.named("Show seconds"), + dimensions.prop()); } @Override @@ -45,17 +44,23 @@ public class Clock extends Module implements HudMod { switch (format.value) { case 0: - if (seconds.value) { text = currentTime.format(DateTimeFormatter.ofPattern("HH:mm:ss")); } - else { text = currentTime.format(DateTimeFormatter.ofPattern("HH:mm")); } + if (seconds.value) { + text = currentTime.format(DateTimeFormatter.ofPattern("HH:mm:ss")); + } else { + text = currentTime.format(DateTimeFormatter.ofPattern("HH:mm")); + } break; - case 1: - if (seconds.value) { text = currentTime.format(DateTimeFormatter.ofPattern("hh:mm:ss a")); } - else { text = currentTime.format(DateTimeFormatter.ofPattern("hh:mm a")); } + case 1: + if (seconds.value) { + text = currentTime.format(DateTimeFormatter.ofPattern("hh:mm:ss a")); + } else { + text = currentTime.format(DateTimeFormatter.ofPattern("hh:mm a")); + } break; } scope.drawText(text, - 0, 0, dimensions.font.value, dimensions.fgColor.value); + 0, 0, dimensions.font.value, dimensions.fgColor.value); dimensions.width = Fonts.getWidth(text, dimensions.font.value); dimensions.height = 18 * text.split("\n").length; } diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Coordinates.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Coordinates.java index 72eda24..2f59046 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Coordinates.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Coordinates.java @@ -5,7 +5,7 @@ import org.saturnclient.modules.ModDimensions; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.Property; import org.saturnclient.ui.RenderScope; import org.saturnclient.ui.resources.Fonts; @@ -13,18 +13,18 @@ import net.minecraft.util.math.Vec3d; public class Coordinates extends Module implements HudMod { private static Property enabled = Property.bool(false); - private static Property displayMethod = Property.select(0, "Flat", "Flat annotated", "Newline", "Newline annotated"); + private static Property displayMethod = Property.select(0, "Flat", "Flat annotated", "Newline", + "Newline annotated"); private static ModDimensions dimensions = new ModDimensions(40, 18); public Coordinates() { super(new ModuleDetails("Coordinates", "coords") - .description("Displays your current coordinates") - .version("v0.1.0") - .tags("Utility"), - enabled.named("Enabled"), - displayMethod.named("Display Method"), - dimensions.prop() - ); + .description("Displays your current coordinates") + .version("v0.1.0") + .tags("Utility"), + enabled.named("Enabled"), + displayMethod.named("Display Method"), + dimensions.prop()); } @Override @@ -53,7 +53,7 @@ public class Coordinates extends Module implements HudMod { } String text = String.format(f, x, y, z); scope.drawText(text, - 0, 0, dimensions.font.value, dimensions.fgColor.value); + 0, 0, dimensions.font.value, dimensions.fgColor.value); dimensions.width = Fonts.getWidth(text, dimensions.font.value); dimensions.height = 18 * text.split("\n").length; } diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Crosshair.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Crosshair.java index 201a1a6..2fd4532 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Crosshair.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Crosshair.java @@ -3,7 +3,7 @@ package org.saturnclient.modules.mods; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.Property; import org.saturnclient.ui.RenderScope; import org.saturnclient.ui.resources.Textures; @@ -14,11 +14,11 @@ public class Crosshair extends Module { public Crosshair() { super( - new ModuleDetails("Crosshair", "crosshair") - .description("Changes the crosshair if you're aiming at a entity") - .tags("Visuals", "Utility") - .version("v0.1.0"), - enabled.named("Enabled")); + new ModuleDetails("Crosshair", "crosshair") + .description("Changes the crosshair if you're aiming at a entity") + .tags("Visuals", "Utility") + .version("v0.1.0"), + enabled.named("Enabled")); } @Override diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/DayCounter.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/DayCounter.java index 0739584..bcce9a2 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/DayCounter.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/DayCounter.java @@ -5,7 +5,7 @@ import org.saturnclient.modules.ModDimensions; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.Property; import org.saturnclient.ui.RenderScope; import org.saturnclient.ui.resources.Fonts; @@ -16,12 +16,11 @@ public class DayCounter extends Module implements HudMod { public DayCounter() { super(new ModuleDetails("DayCounter", "day") - .description("Displays the number of days that have passed") - .version("v0.1.0") - .tags("Utility"), - enabled.named("Enabled"), - dimensions.prop() - ); + .description("Displays the number of days that have passed") + .version("v0.1.0") + .tags("Utility"), + enabled.named("Enabled"), + dimensions.prop()); } @Override @@ -38,7 +37,7 @@ public class DayCounter extends Module implements HudMod { public void renderDay(long day, RenderScope scope) { String text = "Day: " + day; scope.drawText(text, - 0, 0, dimensions.font.value, dimensions.fgColor.value); + 0, 0, dimensions.font.value, dimensions.fgColor.value); dimensions.width = Fonts.getWidth(text, dimensions.font.value); dimensions.height = 18 * text.split("\n").length; } @@ -58,4 +57,3 @@ public class DayCounter extends Module implements HudMod { enabled.value = e; } } - diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Fps.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Fps.java index ee5d603..d989b03 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Fps.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Fps.java @@ -5,21 +5,21 @@ import org.saturnclient.modules.ModDimensions; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.Property; import org.saturnclient.ui.RenderScope; import org.saturnclient.ui.resources.Fonts; public class Fps extends Module implements HudMod { private static Property enabled = Property.bool(false); private static ModDimensions dimensions = new ModDimensions(60, Fonts.getHeight()); - + public Fps() { super(new ModuleDetails("FPS Display", "fps") - .description("Displays current FPS") - .version("v0.1.0") - .tags("Utility"), - enabled.named("Enabled"), - dimensions.prop()); + .description("Displays current FPS") + .version("v0.1.0") + .tags("Utility"), + enabled.named("Enabled"), + dimensions.prop()); } @Override diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Freelook.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Freelook.java index e894211..17bae5d 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Freelook.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Freelook.java @@ -4,7 +4,7 @@ import org.lwjgl.glfw.GLFW; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.Property; import net.minecraft.client.option.Perspective; @@ -14,19 +14,18 @@ public class Freelook extends Module { public static Property freelookKey = Property.keybinding(GLFW.GLFW_KEY_H); public static boolean isFreeLooking = false; private static boolean was1stPerson = false; - + public Freelook() { super( - new ModuleDetails("Freelook", "freelook") - .description("Allows you to look around freely without moving your character") - .tags("Movement", "Camera") - .version("0.1.0"), - enabled.named("Enabled"), - toggle.named("Toggle freelook"), - freelookKey.named("Freelook Keybinding") - ); + new ModuleDetails("Freelook", "freelook") + .description("Allows you to look around freely without moving your character") + .tags("Movement", "Camera") + .version("0.1.0"), + enabled.named("Enabled"), + toggle.named("Toggle freelook"), + freelookKey.named("Freelook Keybinding")); } - + @Override public void tick() { if (toggle.value) { diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Fullbright.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Fullbright.java index 7c4a3d3..e067c37 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Fullbright.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Fullbright.java @@ -2,7 +2,7 @@ package org.saturnclient.modules.mods; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.Property; public class Fullbright extends Module { private static Property enabled = Property.bool(false); @@ -10,12 +10,12 @@ public class Fullbright extends Module { public Fullbright() { super( - new ModuleDetails("Fullbright", "fullbright") - .description("Allows you to see in the dark") - .tags("Camera") - .version("v0.1.0"), - enabled.named("Enabled"), - brightness.named("Brightness %")); + new ModuleDetails("Fullbright", "fullbright") + .description("Allows you to see in the dark") + .tags("Camera") + .version("v0.1.0"), + enabled.named("Enabled"), + brightness.named("Brightness %")); } @Override @@ -27,11 +27,11 @@ public class Fullbright extends Module { public void onEnabled(boolean e) { enabled.value = e; } - + public static boolean shouldOverrideBrightness() { return enabled.value; } - + public static float getBrightnessValue() { return brightness.value / 10; } diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/HealthDisplay.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/HealthDisplay.java index dd2cc8e..6bf5383 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/HealthDisplay.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/HealthDisplay.java @@ -5,7 +5,7 @@ import org.saturnclient.modules.ModDimensions; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.Property; import org.saturnclient.ui.RenderScope; import org.saturnclient.ui.resources.Fonts; @@ -22,14 +22,13 @@ public class HealthDisplay extends Module implements HudMod { public HealthDisplay() { super(new ModuleDetails("Health display", "health") - .description("Displays your current health") - .version("v0.1.0") - .tags("Utility"), - enabled.named("Enabled"), - displayMode.named("Display mode"), - decimals.named("Decimals"), - dimensions.prop() - ); + .description("Displays your current health") + .version("v0.1.0") + .tags("Utility"), + enabled.named("Enabled"), + displayMode.named("Display mode"), + decimals.named("Decimals"), + dimensions.prop()); } @Override @@ -51,19 +50,19 @@ public class HealthDisplay extends Module implements HudMod { String text = ""; switch (decimals.value) { - case 0: + case 0: text = String.format("%.0f ", health); break; - case 1: + case 1: text = String.format("%.1f ", health); break; - case 2: + case 2: text = String.format("%.2f ", health); break; } scope.drawText(text, - 0, 0, dimensions.font.value, dimensions.fgColor.value); + 0, 0, dimensions.font.value, dimensions.fgColor.value); dimensions.width = Fonts.getWidth(text, dimensions.font.value); dimensions.height = 18 * text.split("\n").length; } diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Keystrokes.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Keystrokes.java index 8cbbcd2..766afb4 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Keystrokes.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Keystrokes.java @@ -4,7 +4,7 @@ import org.saturnclient.modules.Module; import org.saturnclient.modules.HudMod; import org.saturnclient.modules.ModDimensions; import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.Property; import org.saturnclient.ui.RenderScope; import org.saturnclient.modules.ModuleDetails; @@ -40,8 +40,7 @@ public class Keystrokes extends Module implements HudMod { showSpace.named("Show space"), dimensions.prop(), clickFg.named("Clicked fg"), - clickBg.named("Clicked bg") - ); + clickBg.named("Clicked bg")); dimensions.renderBackground = false; } diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Nametags.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Nametags.java index 5f4948f..ba87168 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Nametags.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Nametags.java @@ -3,7 +3,7 @@ package org.saturnclient.modules.mods; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; import org.saturnclient.modules.mods.utils.HealthRenderState; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.Property; import net.minecraft.client.render.entity.state.LivingEntityRenderState; @@ -20,84 +20,83 @@ public class Nametags extends Module { private static Property unit = Property.select(0, "Health", "Hearts"); private static Property format = Property.select(0, "Value", "Value / Total", "%"); private static Property nameColor = Property.select(15, - "Black", - "Dark Blue", - "Dark Green", - "Dark Aqua", - "Dark Red", - "Dark Purple", - "Gold", - "Gray", - "Dark Gray", - "Blue", - "Green", - "Aqua", - "Red", - "Light Purple", - "Yellow", - "White" - ); + "Black", + "Dark Blue", + "Dark Green", + "Dark Aqua", + "Dark Red", + "Dark Purple", + "Gold", + "Gray", + "Dark Gray", + "Blue", + "Green", + "Aqua", + "Red", + "Light Purple", + "Yellow", + "White"); private static Property healthColor = Property.select(12, - "Black", - "Dark Blue", - "Dark Green", - "Dark Aqua", - "Dark Red", - "Dark Purple", - "Gold", - "Gray", - "Dark Gray", - "Blue", - "Green", - "Aqua", - "Red", - "Light Purple", - "Yellow", - "White" - ); + "Black", + "Dark Blue", + "Dark Green", + "Dark Aqua", + "Dark Red", + "Dark Purple", + "Gold", + "Gray", + "Dark Gray", + "Blue", + "Green", + "Aqua", + "Red", + "Light Purple", + "Yellow", + "White"); private static final String[] COLOR_CODES = { - "§0", "§1", "§2", "§3", "§4", "§5", "§6", "§7", - "§8", "§9", "§a", "§b", "§c", "§d", "§e", "§f" + "§0", "§1", "§2", "§3", "§4", "§5", "§6", "§7", + "§8", "§9", "§a", "§b", "§c", "§d", "§e", "§f" }; public Nametags() { super( - new ModuleDetails("Nametags", "nametags") - .description("Allows you to modify entity nametags") - .tags("Camera", "Utility") - .version("0.1.0"), - enabled.named("Enabled"), - healthDisplay.named("Display health"), - players.named("Players"), - hostile.named("Hostile"), - passive.named("Passive"), - heartEmoji.named("Heart emoji"), - obfuscate.named("Obfuscate enemy names"), - unit.named("Unit"), - format.named("Format"), - nameColor.named("Name color"), - healthColor.named("Health color") - ); + new ModuleDetails("Nametags", "nametags") + .description("Allows you to modify entity nametags") + .tags("Camera", "Utility") + .version("0.1.0"), + enabled.named("Enabled"), + healthDisplay.named("Display health"), + players.named("Players"), + hostile.named("Hostile"), + passive.named("Passive"), + heartEmoji.named("Heart emoji"), + obfuscate.named("Obfuscate enemy names"), + unit.named("Unit"), + format.named("Format"), + nameColor.named("Name color"), + healthColor.named("Health color")); } - + @Override public void tick() { - + } - - public static String getHealthString(LivingEntityRenderState state, HealthRenderState hrs, float health, float maxHealth) { + + public static String getHealthString(LivingEntityRenderState state, HealthRenderState hrs, float health, + float maxHealth) { String ret = ""; - switch (format.value){ + switch (format.value) { case 0: // value ret = String.format("%.1f", health / (unit.value + 1)); break; - + case 1: // value / total - ret = String.format("%.1f", health / (unit.value + 1)) + " / " + String.format("%.1f", maxHealth / (unit.value + 1)); + ret = String.format("%.1f", health / (unit.value + 1)) + " / " + + String.format("%.1f", maxHealth / (unit.value + 1)); break; - + case 2: // % ret = String.format("%.0f%%", (health / maxHealth) * 100); break; @@ -106,20 +105,28 @@ public class Nametags extends Module { } public static String getNametagString(LivingEntityRenderState state) { - if (state.customName == null) return null; - if (!healthDisplay.value) return state.customName.getString(); // name only - if (!(state instanceof HealthRenderState hrs)) return null; - + if (state.customName == null) + return null; + if (!healthDisplay.value) + return state.customName.getString(); // name only + if (!(state instanceof HealthRenderState hrs)) + return null; + float health = hrs.saturn$getHealth(); float maxHealth = hrs.saturn$getMaxHealth(); HealthRenderState.EntityType type = hrs.saturn$getEntityType(); - if (type == HealthRenderState.EntityType.PASSIVE && !passive.value) return null; - if (type == HealthRenderState.EntityType.HOSTILE && !hostile.value) return null; - if (type == HealthRenderState.EntityType.PLAYER && !players.value) return null; - if (type == HealthRenderState.EntityType.OTHER) return null; + if (type == HealthRenderState.EntityType.PASSIVE && !passive.value) + return null; + if (type == HealthRenderState.EntityType.HOSTILE && !hostile.value) + return null; + if (type == HealthRenderState.EntityType.PLAYER && !players.value) + return null; + if (type == HealthRenderState.EntityType.OTHER) + return null; - if (health < 0f || maxHealth < 0f || health > maxHealth) return null; + if (health < 0f || maxHealth < 0f || health > maxHealth) + return null; String hpColor = COLOR_CODES[healthColor.value]; String color = COLOR_CODES[nameColor.value]; @@ -127,12 +134,13 @@ public class Nametags extends Module { String obf = obfuscate.value ? "§k" : ""; String reset = "§r"; - String ret = color + obf + state.customName.getString() + reset + " " + hpColor + getHealthString(state, hrs, health, maxHealth) + heart; - + String ret = color + obf + state.customName.getString() + reset + " " + hpColor + + getHealthString(state, hrs, health, maxHealth) + heart; + return ret; } - public static boolean shouldReplaceName() { + public static boolean shouldReplaceName() { return enabled.value; } diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/NoFog.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/NoFog.java index bd8d17e..3b0ee88 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/NoFog.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/NoFog.java @@ -2,7 +2,7 @@ package org.saturnclient.modules.mods; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.Property; public class NoFog extends Module { private static Property enabled = Property.bool(false); @@ -10,12 +10,12 @@ public class NoFog extends Module { public NoFog() { super( - new ModuleDetails("No Fog", "nofog") - .description("Stops fog from rendering") - .tags("Camera") - .version("v0.1.0"), - enabled.named("Enabled"), - liquids.named("See through liquids")); + new ModuleDetails("No Fog", "nofog") + .description("Stops fog from rendering") + .tags("Camera") + .version("v0.1.0"), + enabled.named("Enabled"), + liquids.named("See through liquids")); } @Override diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Ping.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Ping.java index 0c3dffc..d579635 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Ping.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Ping.java @@ -4,7 +4,7 @@ import org.saturnclient.modules.HudMod; import org.saturnclient.modules.ModDimensions; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.Property; import org.saturnclient.ui.RenderScope; import org.saturnclient.ui.resources.Fonts; @@ -14,14 +14,14 @@ import net.minecraft.client.network.ClientPlayNetworkHandler; public class Ping extends Module implements HudMod { private static Property enabled = Property.bool(false); private static ModDimensions dimensions = new ModDimensions(60, Fonts.getHeight()); - + public Ping() { super(new ModuleDetails("Ping Display", "ping") - .description("Displays ping") - .version("v0.1.0") - .tags("Utility"), - enabled.named("Enabled"), - dimensions.prop()); + .description("Displays ping") + .version("v0.1.0") + .tags("Utility"), + enabled.named("Enabled"), + dimensions.prop()); } @Override diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Speedometer.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Speedometer.java index d935307..ea25316 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Speedometer.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Speedometer.java @@ -5,7 +5,7 @@ import org.saturnclient.modules.ModDimensions; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.Property; import org.saturnclient.ui.RenderScope; import org.saturnclient.ui.resources.Fonts; @@ -24,15 +24,14 @@ public class Speedometer extends Module implements HudMod { public Speedometer() { super(new ModuleDetails("Speedometer", "speed") - .description("Displays your current speed") - .version("v0.1.0") - .tags("Utility"), - enabled.named("Enabled"), - axis.named("Speed type"), - unitText.named("Unit text"), - speedText.named("Show speed text"), - dimensions.prop() - ); + .description("Displays your current speed") + .version("v0.1.0") + .tags("Utility"), + enabled.named("Enabled"), + axis.named("Speed type"), + unitText.named("Unit text"), + speedText.named("Show speed text"), + dimensions.prop()); } @Override @@ -61,7 +60,7 @@ public class Speedometer extends Module implements HudMod { case 1: // x axis speed = (Math.sqrt(Math.pow(velocity.x, 2) + Math.pow(velocity.z, 2))); break; - + case 2: // y axis speed = (Math.abs(y)); break; @@ -73,14 +72,14 @@ public class Speedometer extends Module implements HudMod { String f = String.format("%.2f ", speed); switch (unitText.value) { - case 1: + case 1: f += "Blocks/s"; break; - - case 2: + + case 2: f += "blocks/s"; break; - case 3: + case 3: f += "b/s"; break; } @@ -92,7 +91,7 @@ public class Speedometer extends Module implements HudMod { } scope.drawText(text, - 0, 0, dimensions.font.value, dimensions.fgColor.value); + 0, 0, dimensions.font.value, dimensions.fgColor.value); dimensions.width = Fonts.getWidth(text, dimensions.font.value); dimensions.height = 18 * text.split("\n").length; } diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/StatusEffects.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/StatusEffects.java index 61778e1..3c95d3f 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/StatusEffects.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/StatusEffects.java @@ -7,7 +7,7 @@ import org.saturnclient.modules.ModDimensions; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.Property; import org.saturnclient.ui.RenderScope; import net.minecraft.client.resource.language.I18n; @@ -25,19 +25,21 @@ public class StatusEffects extends Module implements HudMod { private static ModDimensions dimensions = new ModDimensions(60, 0); private final StatusEffectInstance[] dummyEffects = { - new StatusEffectInstance(Registries.STATUS_EFFECT.getEntry(Identifier.ofVanilla("speed")).get(), 12000, 2), - new StatusEffectInstance(Registries.STATUS_EFFECT.getEntry(Identifier.ofVanilla("strength")).get(), 12000, 2), - new StatusEffectInstance(Registries.STATUS_EFFECT.getEntry(Identifier.ofVanilla("fire_resistance")).get(), 12000, 2), + new StatusEffectInstance(Registries.STATUS_EFFECT.getEntry(Identifier.ofVanilla("speed")).get(), 12000, 2), + new StatusEffectInstance(Registries.STATUS_EFFECT.getEntry(Identifier.ofVanilla("strength")).get(), 12000, + 2), + new StatusEffectInstance(Registries.STATUS_EFFECT.getEntry(Identifier.ofVanilla("fire_resistance")).get(), + 12000, 2), }; public StatusEffects() { super(new ModuleDetails("Status effects", "effect") - .description("Displays status effects") - .version("v0.1.0") - .tags("Utility"), - - enabled.named("Enabled"), - dimensions.prop()); + .description("Displays status effects") + .version("v0.1.0") + .tags("Utility"), + + enabled.named("Enabled"), + dimensions.prop()); } private void renderEffects(RenderScope scope, Iterable effects) { @@ -68,25 +70,26 @@ public class StatusEffects extends Module implements HudMod { renderEffects(scope, Arrays.asList(dummyEffects)); } - // This code was from: https://github.com/magicus/statuseffecttimer/blob/master/src/main/java/se/icus/mag/statuseffecttimer/mixin/StatusEffectTimerMixin.java + // This code was from: + // https://github.com/magicus/statuseffecttimer/blob/master/src/main/java/se/icus/mag/statuseffecttimer/mixin/StatusEffectTimerMixin.java private String getDurationAsString(StatusEffectInstance statusEffectInstance) { - if (statusEffectInstance.isInfinite()) { - return I18n.translate("effect.duration.infinite"); - } + if (statusEffectInstance.isInfinite()) { + return I18n.translate("effect.duration.infinite"); + } - int ticks = MathHelper.floor((float) statusEffectInstance.getDuration()); - int totalSeconds = ticks / 20; + int ticks = MathHelper.floor((float) statusEffectInstance.getDuration()); + int totalSeconds = ticks / 20; - if (totalSeconds >= 3600) { - return totalSeconds / 3600 + "h"; - } else if (totalSeconds >= 60) { + if (totalSeconds >= 3600) { + return totalSeconds / 3600 + "h"; + } else if (totalSeconds >= 60) { int minutes = totalSeconds / 60; int seconds = totalSeconds % 60; - return String.format("%d:%02d", minutes, seconds); - } else { - return String.valueOf(totalSeconds) + "s"; - } - } + return String.format("%d:%02d", minutes, seconds); + } else { + return String.valueOf(totalSeconds) + "s"; + } + } @Override public ModDimensions getDimensions() { diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Tps.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Tps.java index f02835b..4f1acb4 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Tps.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Tps.java @@ -4,7 +4,7 @@ import org.saturnclient.modules.HudMod; import org.saturnclient.modules.ModDimensions; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.Property; import org.saturnclient.ui.RenderScope; import org.saturnclient.ui.resources.Fonts; @@ -26,12 +26,11 @@ public class Tps extends Module implements HudMod { public Tps() { super(new ModuleDetails("TPS Display", "tps") - .description("Displays the TPS") - .version("v0.1.0") - .tags("Utility"), - enabled.named("Enabled"), - dimensions.prop() - ); + .description("Displays the TPS") + .version("v0.1.0") + .tags("Utility"), + enabled.named("Enabled"), + dimensions.prop()); } public static void onTimePacket(long worldAge) { @@ -50,7 +49,8 @@ public class Tps extends Module implements HudMod { samplesFilled = Math.min(samplesFilled + 1, SAMPLE_COUNT); double sum = 0; - for (int i = 0; i < samplesFilled; i++) sum += samples[i]; + for (int i = 0; i < samplesFilled; i++) + sum += samples[i]; currentTps = sum / samplesFilled; } } @@ -64,8 +64,9 @@ public class Tps extends Module implements HudMod { lastRealTime = -1; currentTps = 20.0; sampleIndex = 0; - samplesFilled = SAMPLE_COUNT; - for (int i = 0; i < SAMPLE_COUNT; i++) samples[i] = 20.0; + samplesFilled = SAMPLE_COUNT; + for (int i = 0; i < SAMPLE_COUNT; i++) + samples[i] = 20.0; } @Override @@ -88,12 +89,12 @@ public class Tps extends Module implements HudMod { } @Override - public void onEnabled(boolean e) { - enabled.value = e; + public void onEnabled(boolean e) { + enabled.value = e; } @Override - public ModDimensions getDimensions() { - return dimensions; + public ModDimensions getDimensions() { + return dimensions; } } diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Zoom.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Zoom.java index cd9d28a..9777476 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Zoom.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Zoom.java @@ -3,29 +3,28 @@ package org.saturnclient.modules.mods; import org.lwjgl.glfw.GLFW; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.Property; public class Zoom extends Module { private static Property enabled = Property.bool(false); private static Property toggle = Property.bool(false); public static Property zoomKey = Property.keybinding(GLFW.GLFW_KEY_C); public static Property zoomLevel = Property.floatProp(3.0f); - + public static boolean isZooming = false; - + public Zoom() { super( - new ModuleDetails("Zoom", "zoom") - .description("Allows you to zoom in for a closer view") - .tags("Camera", "Utility") - .version("0.1.0"), - enabled.named("Enabled"), - toggle.named("Toggle zoom"), - zoomKey.named("Zoom Keybinding"), - zoomLevel.named("Zoom Level") - ); + new ModuleDetails("Zoom", "zoom") + .description("Allows you to zoom in for a closer view") + .tags("Camera", "Utility") + .version("0.1.0"), + enabled.named("Enabled"), + toggle.named("Toggle zoom"), + zoomKey.named("Zoom Keybinding"), + zoomLevel.named("Zoom Level")); } - + @Override public void tick() { if (toggle.value) { @@ -41,7 +40,7 @@ public class Zoom extends Module { return zoomLevel.value; } - public static boolean shouldZoom() { + public static boolean shouldZoom() { return enabled.value; } diff --git a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java index fa45760..a202098 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java @@ -11,8 +11,8 @@ import org.saturnclient.cosmetics.cloak.Cloaks; import org.saturnclient.cosmetics.hat.Hats; import org.saturnclient.modules.ModManager; import org.saturnclient.saturnclient.client.ServiceClient; -import org.saturnclient.saturnclient.config.Config; -import org.saturnclient.saturnclient.config.manager.ConfigManager; +import org.saturnclient.config.Config; +import org.saturnclient.config.manager.ConfigManager; import org.saturnclient.saturnclient.event.KeyInputHandler; import org.saturnclient.saturnclient.mixin.DrawContextAccessor; import org.saturnclient.ui.RenderScope; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/client/player/Roles.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/client/player/Roles.java index 219174b..869b202 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/client/player/Roles.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/client/player/Roles.java @@ -3,7 +3,7 @@ package org.saturnclient.saturnclient.client.player; import java.util.Map; import java.util.UUID; -import org.saturnclient.saturnclient.config.Config; +import org.saturnclient.config.Config; import net.minecraft.util.Formatting; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/config/AnimationConfig.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/config/AnimationConfig.java deleted file mode 100644 index 0c76f73..0000000 --- a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/config/AnimationConfig.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.saturnclient.saturnclient.config; - -import org.saturnclient.saturnclient.config.manager.ConfigManager; -import org.saturnclient.saturnclient.config.manager.Property; - -public class AnimationConfig { - public static ConfigManager config; - - // Logo - public static final AnimationConfig logo = new AnimationConfig(true, 700, 0); - - // Main menu - public static final AnimationConfig mainMenu = new AnimationConfig(true, 700, 120); - - // Mod menu - public static final AnimationConfig modMenu = new AnimationConfig(true, 700, 20); - - // Shift menu - public static final AnimationConfig shiftMenu = new AnimationConfig(true, 700, 100); - - // Cosmetics menu - public static final AnimationConfig cosmeticsMenu = new AnimationConfig(true, 700, 40); - - // Emote wheel - public static final AnimationConfig emoteWheel = new AnimationConfig(true, 700, 40); - - public static void init(ConfigManager parent) { - config = new ConfigManager(parent, "Animations"); - - logo.init("Logo"); - mainMenu.init("Main Menu"); - modMenu.init("Mod Menu"); - shiftMenu.init("Shift Menu"); - cosmeticsMenu.init("Cosmetics Menu"); - emoteWheel.init("Emote Wheel"); - } - - // Animation properties - public final Property duration; - public final Property stagger; - public final Property curve; - - public AnimationConfig(boolean enabled, int delay, int stagger) { - this.duration = Property.integer(delay); - this.stagger = Property.integer(stagger); - this.curve = Property.select(1, "Ease In Out Cubic", "Ease Out Cubic", "Ease In Out Back"); - } - - public void init(String name) { - // config.property("Enable " + name + " Animations", this.enabled); - config.property(name + " Duration", this.duration); - config.property(name + " Stagger", this.stagger); - config.property(name + " Curve", this.curve); - } -} diff --git a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/config/Config.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/config/Config.java deleted file mode 100644 index 1f8df23..0000000 --- a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/config/Config.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.saturnclient.saturnclient.config; - -import org.lwjgl.glfw.GLFW; -import org.saturnclient.saturnclient.config.manager.ConfigManager; -import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui.resources.Textures; - -import net.minecraft.util.Identifier; - -public class Config { - public static ConfigManager config; - - public static Property realisticLogo = Property.bool(false); - public static Property saturnTitleScreen = Property.bool(true); - public static Property cloakPhysics = Property.bool(true); - public static Property openEmoteWheel = Property.keybinding(GLFW.GLFW_KEY_B); - public static Property stagger = Property.bool(true); - - public static Identifier getLogo() { - return realisticLogo.value ? Textures.REALISTIC_LOGO : Textures.LOGO; - } - - public static void init() { - config = new ConfigManager("Saturn Client"); - config.property("Realistic logo", realisticLogo); - config.property("Saturn client title screen", saturnTitleScreen); - config.property("Open Emote Wheel", openEmoteWheel); - config.property("Cloak Physics", cloakPhysics); - config.property("Stagger Animations", stagger); - - // Initialize a sub namespace for theme - Theme.init(config); - - // Initialize a sub namespace for animations - AnimationConfig.init(config); - } -} diff --git a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/config/Theme.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/config/Theme.java deleted file mode 100644 index 6da4e1a..0000000 --- a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/config/Theme.java +++ /dev/null @@ -1,91 +0,0 @@ -package org.saturnclient.saturnclient.config; - -import org.saturnclient.saturnclient.config.manager.ConfigManager; -import org.saturnclient.saturnclient.config.manager.Property; - -public class Theme { - // Main UI background (slightly warm dark to match Saturn tone) - public static final Property BACKGROUND = Property.color(0xFF12100D); - - // Default text color - public static final Property FOREGROUND = Property.color(0xFFF2E6D2); - - // Widget default background (normal state) - public static final Property PRIMARY = Property.color(0xFF1C1915); - - // Widget text color - public static final Property PRIMARY_FG = Property.color(0xFFEAD9B8); - - // Saturn brand color (hovered / enabled / selected) - public static final Property ACCENT = Property.color(0xFFE2BF7D); - - // Text/icons shown on accent background - public static final Property ACCENT_FG = Property.color(0xFF1A140A); - - // Misc colors - public static final Property SCROLL = Property.color(0xFFE2BF7D); - - // UI metrics - public static final Property BG_RADIUS = Property.integer(12); - public static final Property WIDGET_RADIUS = Property.integer(10); - - // Font - public static final Property FONT = Property.font(2); - - public static void init(ConfigManager parent) { - ConfigManager config = new ConfigManager(parent, "UI Style"); - config.property("Background", BACKGROUND); - config.property("Foreground", FOREGROUND); - config.property("Primary", PRIMARY); - config.property("Primary Foreground", PRIMARY_FG); - config.property("Accent", ACCENT); - config.property("Accent Foreground", ACCENT_FG); - config.property("Scrollbar Color", SCROLL); - - config.property("Background Radius", BG_RADIUS); - config.property("Widget Radius", WIDGET_RADIUS); - - config.property("Font", FONT); - } - - /** - * primary by default, accent if true - */ - public static int getBg(boolean hover) { - return hover ? ACCENT.value : PRIMARY.value; - } - - /** - * (Foreground) primary by default, accent if true - */ - public static int getFg(boolean hover) { - return hover ? ACCENT_FG.value : PRIMARY_FG.value; - } - - /** - * Multiplies existing alpha with 0–255 alpha. - */ - public static int withAlpha(int alpha, int color) { - alpha = Math.max(0, Math.min(255, alpha)); - - int originalAlpha = (color >>> 24) & 0xFF; - - // Merge (multiply) alphas - int merged = (originalAlpha * alpha) / 255; - - return (color & 0x00FFFFFF) | (merged << 24); - } - - /** - * Multiplies existing alpha with 0.0–1.0 alpha. - */ - public static int withAlpha(float alpha, int color) { - alpha = Math.max(0f, Math.min(1f, alpha)); - - int originalAlpha = (color >>> 24) & 0xFF; - - int merged = (int) (originalAlpha * alpha); - - return (color & 0x00FFFFFF) | (merged << 24); - } -} diff --git a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/config/manager/ConfigManager.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/config/manager/ConfigManager.java deleted file mode 100644 index 9bdc10d..0000000 --- a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/config/manager/ConfigManager.java +++ /dev/null @@ -1,181 +0,0 @@ -package org.saturnclient.saturnclient.config.manager; - -import com.google.gson.*; -import org.saturnclient.saturnclient.SaturnClient; - -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.util.LinkedHashMap; -import java.util.Map; - -public class ConfigManager { - - private static final File configFile = new File(SaturnClient.client.runDirectory, "saturn.json"); - - // SINGLE ROOT TREE - private static final Map> ROOT = new LinkedHashMap<>(); - - private static JsonObject cachedJson = null; - - private final Map> currentMap; - - private final String[] path; - - /** - * Creates a root namespace - */ - public ConfigManager(String namespace) { - this.currentMap = new LinkedHashMap<>(); - this.path = new String[] { namespace }; // Path is just ["namespace"] - ROOT.put(namespace, Property.namespace(currentMap)); - } - - /** - * Creates a sub-namespace inside a parent - */ - public ConfigManager(ConfigManager parent, String namespace) { - this.currentMap = new LinkedHashMap<>(); - - // Build new path: parent path + current namespace - this.path = new String[parent.path.length + 1]; - System.arraycopy(parent.path, 0, this.path, 0, parent.path.length); - this.path[this.path.length - 1] = namespace; - - parent.property(namespace, Property.namespace(currentMap)); - } - - /** - * Add a property - */ - public Property property(String name, Property value) { - currentMap.put(name, value); - loadSingleProperty(name, value); - return value; - } - - /** - * Add empty namespace - */ - public ConfigManager sub(String name) { - return new ConfigManager(this, name); - } - - /** - * Load entire config - */ - public static void load() { - SaturnClient.LOGGER.info("Loading config..."); - - JsonObject json = loadAndCache(); - if (json == null) - return; - - loadRecursive(json, ROOT); - } - - /** - * Save entire config - */ - public static void save() { - SaturnClient.LOGGER.info("Saving config..."); - - JsonObject rootJson = new JsonObject(); - saveRecursive(rootJson, ROOT); - - try { - String formatted = new GsonBuilder() - .setPrettyPrinting() - .create() - .toJson(rootJson); - - Files.writeString(configFile.toPath(), formatted); - SaturnClient.LOGGER.info("Config saved successfully."); - } catch (IOException e) { - SaturnClient.LOGGER.error("Error saving config file", e); - } - } - - /** - * Recursive save - */ - private static void saveRecursive(JsonObject json, Map> map) { - map.forEach((name, prop) -> { - if (prop.isNamespace()) { - JsonObject child = new JsonObject(); - saveRecursive(child, prop.getNamespaceMap()); - json.add(name, child); - } else { - json.add(name, prop.toJson()); - } - }); - } - - /** - * Recursive load - */ - private static void loadRecursive(JsonObject json, Map> map) { - map.forEach((name, prop) -> { - JsonElement element = json.get(name); - if (element == null) - return; - - if (prop.isNamespace() && element.isJsonObject()) { - loadRecursive(element.getAsJsonObject(), prop.getNamespaceMap()); - } else { - prop.loadFromJson(element); - } - }); - } - - /** - * Load only a single property immediately after creation, - * traversing the JSON tree based on this manager's path. - */ - private void loadSingleProperty(String name, Property prop) { - JsonObject source = cachedJson != null ? cachedJson : loadAndCache(); - if (source == null) - return; - - // Traverse the tree to the correct namespace - JsonObject currentScope = source; - for (String segment : path) { - JsonElement next = currentScope.get(segment); - if (next != null && next.isJsonObject()) { - currentScope = next.getAsJsonObject(); - } else { - return; // Path doesn't exist in config yet - } - } - - // Now look for the property inside the correctly nested object - JsonElement element = currentScope.get(name); - if (element != null) { - prop.loadFromJson(element); - } - } - - /** - * Reads file and caches json - */ - private static JsonObject loadAndCache() { - try { - if (!configFile.exists()) { - Files.writeString(configFile.toPath(), "{}"); - return new JsonObject(); - } - - String json = Files.readString(configFile.toPath()); - cachedJson = JsonParser.parseString(json).getAsJsonObject(); - return cachedJson; - - } catch (IOException e) { - SaturnClient.LOGGER.error("Error reading config file", e); - return null; - } - } - - public Map> getProperties() { - return currentMap; - } -} \ No newline at end of file diff --git a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/config/manager/Property.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/config/manager/Property.java deleted file mode 100644 index 45ef2b5..0000000 --- a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/config/manager/Property.java +++ /dev/null @@ -1,298 +0,0 @@ -package org.saturnclient.saturnclient.config.manager; - -import java.util.Map; - -import org.lwjgl.glfw.GLFW; -import org.saturnclient.saturnclient.SaturnClient; - -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonPrimitive; - -public class Property { - public static class NamedProperty { - public String name; - public Property prop; - - public NamedProperty(String name, Property value) { - this.name = name; - this.prop = value; - } - } - - public enum PropertyType { - BOOLEAN, - INTEGER, - FLOAT, - STRING, - HEX, - NAMESPACE, - SELECT, - KEYBINDING, - } - - public T value; - public boolean isReset = false; - private T defaultValue; - private String[] availableValues; - private final PropertyType type; - private boolean wasPressedLastTick = false; - - private Property(T value, PropertyType type) { - this.value = value; - this.defaultValue = value; - this.type = type; - } - - // ---------- Factory Methods ---------- - public static Property from(T value) { - if (value instanceof Boolean) - return new Property<>(value, PropertyType.BOOLEAN); - if (value instanceof Integer) - return new Property<>(value, PropertyType.INTEGER); - if (value instanceof Float) - return new Property<>(value, PropertyType.FLOAT); - if (value instanceof String) - return new Property<>(value, PropertyType.STRING); - if (valueIsNamespace(value)) - return new Property<>(value, PropertyType.NAMESPACE); - return null; - } - - public static Property font(int value) { - return select(value, "Default", "Inter", "Inter bold"); - } - - public static Property select(Integer value, String... availableValues) { - Property property = new Property<>(value, PropertyType.SELECT); - property.availableValues = availableValues; - return property; - } - - public static Property>> namespace(Map> value) { - return new Property<>(value, PropertyType.NAMESPACE); - } - - public static Property bool(boolean value) { - return new Property<>(value, PropertyType.BOOLEAN); - } - - public static Property integer(int value) { - return new Property<>(value, PropertyType.INTEGER); - } - - public static Property floatProp(float value) { - return new Property<>(value, PropertyType.FLOAT); - } - - public static Property string(String value) { - return new Property<>(value, PropertyType.STRING); - } - - public static Property color(int value) { - return new Property<>(value, PropertyType.HEX); - } - - public static Property keybinding(int value) { - return new Property<>(value, PropertyType.KEYBINDING); - } - - // ---------- Select Helpers ---------- - public void next() { - if (type == PropertyType.SELECT) { - int i = (Integer) value; - setValue((i < availableValues.length - 1) ? i + 1 : 0); - } - } - - public void prev() { - if (type == PropertyType.SELECT) { - int i = (Integer) value; - setValue((i > 0) ? i - 1 : availableValues.length - 1); - } - } - - public void setSelection(int selection) { - if (type == PropertyType.SELECT && selection >= 0 && selection < availableValues.length) { - setValue(selection); - } - } - - public String getSelection() { - return (type == PropertyType.SELECT) ? availableValues[(Integer) value] : null; - } - - // ---------- Lifecycle ---------- - public void reset() { - value = defaultValue; - isReset = true; - } - - public PropertyType getType() { - return type; - } - - @SuppressWarnings("unchecked") - public Map> getNamespaceValue() { - if (type == PropertyType.NAMESPACE && value instanceof Map) { - return (Map>) value; - } - throw new IllegalStateException("Property is not a namespace"); - } - - // ---------- JSON Serialization ---------- - /* - * BOOLEAN, - * INTEGER, - * FLOAT, - * STRING, - * HEX, - * NAMESPACE, - * SELECT, - * KEYBINDING, - */ - public JsonElement toJson() { - switch (type) { - case BOOLEAN: - return new JsonPrimitive((Boolean) value); - case INTEGER: - return new JsonPrimitive((Integer) value); - case FLOAT: - return new JsonPrimitive((Float) value); - case NAMESPACE: - JsonObject nested = new JsonObject(); - getNamespaceValue().forEach((k, v) -> nested.add(k, v.toJson())); - return nested; - case HEX: - return new JsonPrimitive(String.format("#%08X", (Integer) value)); - case KEYBINDING: - return new JsonPrimitive((Integer) value); - case SELECT: - return new JsonPrimitive((Integer) value); - default: - return new JsonPrimitive(String.valueOf(value)); - } - } - - public void loadFromJson(JsonElement element) { - if (element == null) - return; - - switch (type) { - case BOOLEAN: - if (element.isJsonPrimitive() && element.getAsJsonPrimitive().isBoolean()) - setValue(element.getAsBoolean()); - break; - case INTEGER: - if (element.isJsonPrimitive()) { - JsonPrimitive p = element.getAsJsonPrimitive(); - if (p.isNumber()) - setValue(p.getAsInt()); - else if (p.isString()) - setValue(parseHexToInt(p.getAsString())); - } - break; - case FLOAT: - if (element.isJsonPrimitive() && element.getAsJsonPrimitive().isNumber()) - setValue(element.getAsFloat()); - break; - case STRING: - if (element.isJsonPrimitive() && element.getAsJsonPrimitive().isString()) - setValue(element.getAsString()); - break; - case HEX: - if (element.isJsonPrimitive() && element.getAsJsonPrimitive().isString()) - setValue(parseHexToInt(element.getAsString())); - break; - case NAMESPACE: - if (element.isJsonObject()) { - JsonObject obj = element.getAsJsonObject(); - getNamespaceValue().forEach((k, v) -> v.loadFromJson(obj.get(k))); - } - break; - case SELECT: - if (element.isJsonPrimitive() && element.getAsJsonPrimitive().isNumber()) - setSelection(element.getAsInt()); - break; - case KEYBINDING: - if (element.isJsonPrimitive() && element.getAsJsonPrimitive().isNumber()) - setValue(element.getAsInt()); - break; - } - } - - // ---------- Utility ---------- - @Override - public String toString() { - return String.valueOf(value); - } - - public static boolean valueIsNamespace(Object obj) { - return obj instanceof Map; - } - - @SuppressWarnings("unchecked") - public void setValue(Object value) { - this.value = (T) value; - } - - @SuppressWarnings("unchecked") - public void setValue(Object value, Object defaultValue) { - this.value = (T) value; - this.defaultValue = (T) defaultValue; - } - - public NamedProperty named(String name) { - return new NamedProperty<>(name, this); - } - - // ---------- Keybindings ---------- - public boolean isKeyPressed() { - return (Integer) value != -1 && - GLFW.glfwGetKey(SaturnClient.client.getWindow().getHandle(), (Integer) value) == GLFW.GLFW_PRESS && - SaturnClient.client.currentScreen == null; - } - - public boolean wasKeyPressed() { - boolean pressed = isKeyPressed(); - boolean result = pressed && !wasPressedLastTick; - wasPressedLastTick = pressed; - return result; - } - - // ---------- HEX ---------- - public static int parseHexToInt(String hex) { - hex = hex.replace("#", ""); - if (hex.length() == 6) - hex = "FF" + hex; - if (hex.length() != 8) - throw new IllegalArgumentException("Hex must be 6 or 8 chars long, got \'" + hex + "\'"); - return (int) Long.parseLong(hex, 16); - } - - // Misc - public Property copy() { - return new Property<>(this.value, this.type); - } - - public void load(String name, JsonElement element) { - if (element != null && element.isJsonObject()) { - load(name, element.getAsJsonObject()); - } - } - - public void load(String name, JsonObject element) { - JsonElement value = element.get(name); - if (value != null) - this.loadFromJson(value); - } - - public boolean isNamespace() { - return type == PropertyType.NAMESPACE; - } - - @SuppressWarnings("unchecked") - public Map> getNamespaceMap() { - return isNamespace() ? (Map>) (Object) value : null; - } -} diff --git a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java index cfb71b1..1f58ae2 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java @@ -7,7 +7,7 @@ import net.minecraft.client.util.InputUtil; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.client.ServiceClient; -import org.saturnclient.saturnclient.config.Config; +import org.saturnclient.config.Config; import org.saturnclient.ui.screens.EmoteWheel; import org.saturnclient.ui.screens.ShiftMenu; @@ -39,7 +39,8 @@ public class KeyInputHandler { client.setScreen(new ShiftMenu()); } - if (Config.openEmoteWheel.wasKeyPressed() && client.currentScreen == null && !InputUtil.isKeyPressed(client.getWindow().getHandle(), GLFW.GLFW_KEY_F3)) { + if (Config.openEmoteWheel.wasKeyPressed() && client.currentScreen == null + && !InputUtil.isKeyPressed(client.getWindow().getHandle(), GLFW.GLFW_KEY_F3)) { client.setScreen(new EmoteWheel()); } diff --git a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/menus/HudEditor.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/menus/HudEditor.java index 5467ac7..230f70c 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/menus/HudEditor.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/menus/HudEditor.java @@ -9,7 +9,7 @@ import org.saturnclient.modules.HudMod; import org.saturnclient.modules.ModDimensions; import org.saturnclient.modules.ModManager; import org.saturnclient.modules.Module; -import org.saturnclient.saturnclient.config.manager.ConfigManager; +import org.saturnclient.config.manager.ConfigManager; import org.saturnclient.saturnclient.mixin.DrawContextAccessor; import org.saturnclient.ui.RenderScope; import org.saturnclient.ui.SaturnScreen; @@ -95,7 +95,8 @@ public class HudEditor extends Screen { SaturnScreen.ROTATING_PANORAMA_RENDERER.render(context, this.width, this.height, 1.0F, delta); } - RenderScope scope = new RenderScope(context.getMatrices(), ((DrawContextAccessor) context).getVertexConsumers()); + RenderScope scope = new RenderScope(context.getMatrices(), + ((DrawContextAccessor) context).getVertexConsumers()); for (HudMod mod : hudMods) { ModDimensions dim = mod.getDimensions(); diff --git a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/SetScreenMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/SetScreenMixin.java index 48a6b1e..645e6b3 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/SetScreenMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/SetScreenMixin.java @@ -1,6 +1,6 @@ package org.saturnclient.saturnclient.mixin; -import org.saturnclient.saturnclient.config.Config; +import org.saturnclient.config.Config; import org.saturnclient.ui.screens.TitleMenu; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/SplashOverlayMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/SplashOverlayMixin.java index 667c6d0..d90c969 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/SplashOverlayMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/SplashOverlayMixin.java @@ -3,7 +3,7 @@ package org.saturnclient.saturnclient.mixin; import java.util.Optional; import java.util.function.Consumer; -import org.saturnclient.saturnclient.config.Theme; +import org.saturnclient.config.Theme; import org.saturnclient.ui.RenderScope; import org.saturnclient.ui.resources.Textures; import org.spongepowered.asm.mixin.Mixin; @@ -33,10 +33,12 @@ public abstract class SplashOverlayMixin { @Shadow private long reloadStartTime; - @Shadow @Final + @Shadow + @Final private boolean reloading; - @Shadow @Final + @Shadow + @Final private Consumer> exceptionHandler; @Shadow diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/Animation.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/Animation.java index f1cd3bd..55982ac 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/Animation.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/Animation.java @@ -2,7 +2,7 @@ package org.saturnclient.ui.anim; import java.util.function.Function; -import org.saturnclient.saturnclient.config.AnimationConfig; +import org.saturnclient.config.AnimationConfig; import org.saturnclient.ui.Element; public abstract class Animation { diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/Fade.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/Fade.java index 8ac7d0d..9a5ecef 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/Fade.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/Fade.java @@ -1,6 +1,6 @@ package org.saturnclient.ui.anim; -import org.saturnclient.saturnclient.config.AnimationConfig; +import org.saturnclient.config.AnimationConfig; import org.saturnclient.ui.Element; public class Fade extends Animation { diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/FadeOut.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/FadeOut.java index 5afea76..4172883 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/FadeOut.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/FadeOut.java @@ -1,6 +1,6 @@ package org.saturnclient.ui.anim; -import org.saturnclient.saturnclient.config.AnimationConfig; +import org.saturnclient.config.AnimationConfig; import org.saturnclient.ui.Element; public class FadeOut extends Animation { diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/SlideFade.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/SlideFade.java index 67eb9a9..1318287 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/SlideFade.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/SlideFade.java @@ -1,6 +1,6 @@ package org.saturnclient.ui.anim; -import org.saturnclient.saturnclient.config.AnimationConfig; +import org.saturnclient.config.AnimationConfig; import org.saturnclient.ui.Element; public class SlideFade extends Animation { diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/SlideX.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/SlideX.java index d83e412..82792ba 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/SlideX.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/SlideX.java @@ -1,6 +1,6 @@ package org.saturnclient.ui.anim; -import org.saturnclient.saturnclient.config.AnimationConfig; +import org.saturnclient.config.AnimationConfig; import org.saturnclient.ui.Element; public class SlideX extends Animation { diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/SlideY.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/SlideY.java index 56204e2..0c0aa8a 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/SlideY.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/SlideY.java @@ -1,6 +1,6 @@ package org.saturnclient.ui.anim; -import org.saturnclient.saturnclient.config.AnimationConfig; +import org.saturnclient.config.AnimationConfig; import org.saturnclient.ui.Element; public class SlideY extends Animation { diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/CosmeticPreview.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/CosmeticPreview.java index 1e24e29..bcd07d8 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/CosmeticPreview.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/CosmeticPreview.java @@ -1,6 +1,6 @@ package org.saturnclient.ui.components; -import org.saturnclient.saturnclient.config.Theme; +import org.saturnclient.config.Theme; import org.saturnclient.ui.Element; import org.saturnclient.ui.ElementContext; import org.saturnclient.ui.RenderScope; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/SaturnModule.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/SaturnModule.java index 663340d..12fa57e 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/SaturnModule.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/SaturnModule.java @@ -2,7 +2,7 @@ package org.saturnclient.ui.components; import org.saturnclient.modules.Module; import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.Theme; +import org.saturnclient.config.Theme; import org.saturnclient.ui.Element; import org.saturnclient.ui.ElementContext; import org.saturnclient.ui.RenderScope; @@ -15,151 +15,151 @@ import net.minecraft.client.render.RenderLayer; public class SaturnModule extends Element { - private final Module mod; + private final Module mod; - static int p = 10; // padding - static int s = 14; // settings icon size - static int expand = 5; // settings icon click area + static int p = 10; // padding + static int s = 14; // settings icon size + static int expand = 5; // settings icon click area - public SaturnModule(Module mod) { - this.mod = mod; - this.width = 160; - this.height = 50; - } - - @Override - public void render(RenderScope renderScope, ElementContext ctx) { - boolean hovered = ctx.isHovering(); - boolean enabled = mod.isEnabled(); - - int iconX = width - s - p; - int iconY = height - s - p; - - boolean settingsHover = ctx.isHovering( - getSettingsX(), - getSettingsY(), - getSettingsHitBox(), - getSettingsHitBox()); - - renderScope.setRenderLayer(RenderLayer::getGuiTextured); - - // Resolve theme colors - int bgColor = Theme.PRIMARY.value; - int fgColor = hovered && !settingsHover ? Theme.ACCENT.value : Theme.PRIMARY_FG.value; - - int iconBg = enabled ? Theme.ACCENT.value : Theme.PRIMARY.value; - int iconFg = enabled ? Theme.ACCENT_FG.value : fgColor; - - int settingsColor = settingsHover - ? Theme.ACCENT.value - : Theme.withAlpha(160, fgColor); - - int h = height - (p * 2); - - // Main background - renderScope.drawRoundedRectangle( - 0, 0, - width, height, - Theme.WIDGET_RADIUS.value, - bgColor); - - // Icon background - renderScope.drawRoundedRectangle( - p, p, - h, h, - Theme.WIDGET_RADIUS.value, - iconBg); - - // Icon - renderScope.drawTexture( - mod.getIconTexture(), - p + (p / 2), - p + (p / 2), - 0, 0, - h - p, - h - p, - iconFg); - - // Module name - renderScope.drawText( - 0.6f, - mod.getName(), - p + h + 4, - p + 1, - Theme.FONT.value, - fgColor); - - // Version (right aligned) - String version = mod.getVersion(); - int versionWidth = (int) (Fonts.getWidth(version, Theme.FONT.value) * 0.35f); - - renderScope.drawText( - 0.35f, - version, - width - p - versionWidth, - p + 1, - Theme.FONT.value, - fgColor); - - // Tags - int xt = p + h + 4; - for (String tag : mod.getTags()) { - int tagWidth = (int) (Fonts.getWidth(tag, Theme.FONT.value) * 0.4f); - - renderScope.drawRoundedRectangle( - xt, - p + (h / 2), - tagWidth + 6, - 12, - 5, - Theme.ACCENT.value); - - renderScope.drawText( - 0.4f, - tag, - xt + 2, - p + (h / 2) + 3, - Theme.FONT.value, - Theme.ACCENT_FG.value); - - xt += tagWidth + 9; + public SaturnModule(Module mod) { + this.mod = mod; + this.width = 160; + this.height = 50; } - // Settings icon - renderScope.drawTexture( - Textures.SETTINGS, - iconX, - iconY, - 0, 0, - s, s, - settingsColor); - } + @Override + public void render(RenderScope renderScope, ElementContext ctx) { + boolean hovered = ctx.isHovering(); + boolean enabled = mod.isEnabled(); - @Override - public void click(int mouseX, int mouseY) { - boolean settingsHover = Utils.isHovering( - mouseX - getSettingsX(), - mouseY - getSettingsY(), - getSettingsHitBox(), - getSettingsHitBox(), - 1.0f); + int iconX = width - s - p; + int iconY = height - s - p; - if (settingsHover) { - SaturnClient.client.setScreen(new ConfigEditor(mod.getConfig())); - } else { - mod.setEnabled(!mod.isEnabled()); + boolean settingsHover = ctx.isHovering( + getSettingsX(), + getSettingsY(), + getSettingsHitBox(), + getSettingsHitBox()); + + renderScope.setRenderLayer(RenderLayer::getGuiTextured); + + // Resolve theme colors + int bgColor = Theme.PRIMARY.value; + int fgColor = hovered && !settingsHover ? Theme.ACCENT.value : Theme.PRIMARY_FG.value; + + int iconBg = enabled ? Theme.ACCENT.value : Theme.PRIMARY.value; + int iconFg = enabled ? Theme.ACCENT_FG.value : fgColor; + + int settingsColor = settingsHover + ? Theme.ACCENT.value + : Theme.withAlpha(160, fgColor); + + int h = height - (p * 2); + + // Main background + renderScope.drawRoundedRectangle( + 0, 0, + width, height, + Theme.WIDGET_RADIUS.value, + bgColor); + + // Icon background + renderScope.drawRoundedRectangle( + p, p, + h, h, + Theme.WIDGET_RADIUS.value, + iconBg); + + // Icon + renderScope.drawTexture( + mod.getIconTexture(), + p + (p / 2), + p + (p / 2), + 0, 0, + h - p, + h - p, + iconFg); + + // Module name + renderScope.drawText( + 0.6f, + mod.getName(), + p + h + 4, + p + 1, + Theme.FONT.value, + fgColor); + + // Version (right aligned) + String version = mod.getVersion(); + int versionWidth = (int) (Fonts.getWidth(version, Theme.FONT.value) * 0.35f); + + renderScope.drawText( + 0.35f, + version, + width - p - versionWidth, + p + 1, + Theme.FONT.value, + fgColor); + + // Tags + int xt = p + h + 4; + for (String tag : mod.getTags()) { + int tagWidth = (int) (Fonts.getWidth(tag, Theme.FONT.value) * 0.4f); + + renderScope.drawRoundedRectangle( + xt, + p + (h / 2), + tagWidth + 6, + 12, + 5, + Theme.ACCENT.value); + + renderScope.drawText( + 0.4f, + tag, + xt + 2, + p + (h / 2) + 3, + Theme.FONT.value, + Theme.ACCENT_FG.value); + + xt += tagWidth + 9; + } + + // Settings icon + renderScope.drawTexture( + Textures.SETTINGS, + iconX, + iconY, + 0, 0, + s, s, + settingsColor); } - } - private int getSettingsX() { - return width - s - p - expand; - } + @Override + public void click(int mouseX, int mouseY) { + boolean settingsHover = Utils.isHovering( + mouseX - getSettingsX(), + mouseY - getSettingsY(), + getSettingsHitBox(), + getSettingsHitBox(), + 1.0f); - private int getSettingsY() { - return height - s - p - expand; - } + if (settingsHover) { + SaturnClient.client.setScreen(new ConfigEditor(mod.getConfig())); + } else { + mod.setEnabled(!mod.isEnabled()); + } + } - private int getSettingsHitBox() { - return s + expand * 2; - } + private int getSettingsX() { + return width - s - p - expand; + } + + private int getSettingsY() { + return height - s - p - expand; + } + + private int getSettingsHitBox() { + return s + expand * 2; + } } \ No newline at end of file diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/Sidebar.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/Sidebar.java index 11b4e17..0514e39 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/Sidebar.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/Sidebar.java @@ -1,8 +1,8 @@ package org.saturnclient.ui.components; import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.Config; -import org.saturnclient.saturnclient.config.Theme; +import org.saturnclient.config.Config; +import org.saturnclient.config.Theme; import org.saturnclient.ui.Element; import org.saturnclient.ui.ElementContext; import org.saturnclient.ui.RenderScope; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/FloatInput.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/FloatInput.java index e21e7a7..234d189 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/FloatInput.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/FloatInput.java @@ -1,7 +1,7 @@ package org.saturnclient.ui.components.inputs; -import org.saturnclient.saturnclient.config.manager.ConfigManager; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.ConfigManager; +import org.saturnclient.config.manager.Property; import org.saturnclient.ui.resources.Fonts; public class FloatInput extends Input { diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/HexInput.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/HexInput.java index 8dcc482..e72d1a5 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/HexInput.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/HexInput.java @@ -2,7 +2,7 @@ package org.saturnclient.ui.components.inputs; import java.awt.Color; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.Property; import org.saturnclient.ui.Element; import org.saturnclient.ui.ElementContext; import org.saturnclient.ui.RenderScope; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Input.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Input.java index 78b82d4..25e6ffb 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Input.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Input.java @@ -2,7 +2,7 @@ package org.saturnclient.ui.components.inputs; import org.lwjgl.glfw.GLFW; import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.Theme; +import org.saturnclient.config.Theme; import org.saturnclient.ui.Element; import org.saturnclient.ui.ElementContext; import org.saturnclient.ui.RenderScope; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/IntInput.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/IntInput.java index 4d6fe90..4b8bea9 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/IntInput.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/IntInput.java @@ -1,7 +1,7 @@ package org.saturnclient.ui.components.inputs; -import org.saturnclient.saturnclient.config.manager.ConfigManager; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.manager.ConfigManager; +import org.saturnclient.config.manager.Property; import org.saturnclient.ui.resources.Fonts; public class IntInput extends Input { diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/KeybindingSelector.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/KeybindingSelector.java index a61df7a..c3c099a 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/KeybindingSelector.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/KeybindingSelector.java @@ -1,8 +1,8 @@ package org.saturnclient.ui.components.inputs; import org.lwjgl.glfw.GLFW; -import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.Theme; +import org.saturnclient.config.manager.Property; import org.saturnclient.ui.Element; import org.saturnclient.ui.ElementContext; import org.saturnclient.ui.RenderScope; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Select.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Select.java index be0ad3d..1c95b45 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Select.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Select.java @@ -1,7 +1,7 @@ package org.saturnclient.ui.components.inputs; -import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.Theme; +import org.saturnclient.config.manager.Property; import org.saturnclient.ui.Element; import org.saturnclient.ui.ElementContext; import org.saturnclient.ui.RenderScope; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Toggle.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Toggle.java index 19db228..6c4f3ec 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Toggle.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Toggle.java @@ -1,7 +1,7 @@ package org.saturnclient.ui.components.inputs; -import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.Theme; +import org.saturnclient.config.manager.Property; import org.saturnclient.ui.Element; import org.saturnclient.ui.ElementContext; import org.saturnclient.ui.RenderScope; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/AnimationStagger.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/AnimationStagger.java index 1113468..8050bd2 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/AnimationStagger.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/AnimationStagger.java @@ -3,8 +3,8 @@ package org.saturnclient.ui.elements; import java.util.ArrayList; import java.util.List; -import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.saturnclient.config.Config; +import org.saturnclient.config.AnimationConfig; +import org.saturnclient.config.Config; import org.saturnclient.ui.Element; import org.saturnclient.ui.ElementContext; import org.saturnclient.ui.RenderScope; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Button.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Button.java index 3118175..3c0d5ed 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Button.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Button.java @@ -1,6 +1,6 @@ package org.saturnclient.ui.elements; -import org.saturnclient.saturnclient.config.Theme; +import org.saturnclient.config.Theme; import org.saturnclient.ui.Element; import org.saturnclient.ui.ElementContext; import org.saturnclient.ui.RenderScope; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/ClickableTexture.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/ClickableTexture.java index 5ca5643..581d20b 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/ClickableTexture.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/ClickableTexture.java @@ -1,6 +1,6 @@ package org.saturnclient.ui.elements; -import org.saturnclient.saturnclient.config.Theme; +import org.saturnclient.config.Theme; import org.saturnclient.ui.Element; import org.saturnclient.ui.ElementContext; import org.saturnclient.ui.RenderScope; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Notification.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Notification.java index 825c95e..110ff3c 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Notification.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Notification.java @@ -1,7 +1,7 @@ package org.saturnclient.ui.elements; -import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.Theme; +import org.saturnclient.config.manager.Property; import org.saturnclient.ui.Element; import org.saturnclient.ui.ElementContext; import org.saturnclient.ui.RenderScope; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Scroll.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Scroll.java index 52cb878..47e89a9 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Scroll.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Scroll.java @@ -3,8 +3,8 @@ package org.saturnclient.ui.elements; import java.util.ArrayList; import java.util.List; -import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.Theme; +import org.saturnclient.config.manager.Property; import org.saturnclient.ui.Element; import org.saturnclient.ui.ElementContext; import org.saturnclient.ui.RenderScope; @@ -71,12 +71,12 @@ public class Scroll extends Element { @Override public Element dimensions(int width, int height) { super.dimensions(width, height); - + maxScroll = 0; for (Element element : children) { maxScroll = Math.max(maxScroll, (element.y + element.height + padding) - (height - padding * 2)); } - + return this; } @@ -88,7 +88,8 @@ public class Scroll extends Element { int calculateScrollBarY() { int scrollBarHeight = calculateScrollBarHeight(); - if (maxScroll <= 0) return scrollBarPadding.value; + if (maxScroll <= 0) + return scrollBarPadding.value; int y = (scroll * (height - scrollBarHeight - scrollBarPadding.value * 2)) / maxScroll + scrollBarPadding.value; return Math.min(y, height - scrollBarHeight - scrollBarPadding.value); } diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/TabMenu.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/TabMenu.java index 826280f..e0248c8 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/TabMenu.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/TabMenu.java @@ -1,6 +1,6 @@ package org.saturnclient.ui.elements; -import org.saturnclient.saturnclient.config.Theme; +import org.saturnclient.config.Theme; import org.saturnclient.ui.Element; import org.saturnclient.ui.ElementContext; import org.saturnclient.ui.RenderScope; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Text.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Text.java index 00ab820..7de1737 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Text.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Text.java @@ -1,6 +1,6 @@ package org.saturnclient.ui.elements; -import org.saturnclient.saturnclient.config.Theme; +import org.saturnclient.config.Theme; import org.saturnclient.ui.Element; import org.saturnclient.ui.ElementContext; import org.saturnclient.ui.RenderScope; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/TextureButton.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/TextureButton.java index 012ab3d..22ce701 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/TextureButton.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/TextureButton.java @@ -1,6 +1,6 @@ package org.saturnclient.ui.elements; -import org.saturnclient.saturnclient.config.Theme; +import org.saturnclient.config.Theme; import org.saturnclient.ui.Element; import org.saturnclient.ui.ElementContext; import org.saturnclient.ui.RenderScope; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ConfigEditor.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ConfigEditor.java index 10d83d3..ef89b55 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ConfigEditor.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ConfigEditor.java @@ -2,9 +2,9 @@ package org.saturnclient.ui.screens; import java.util.Map; -import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.saturnclient.config.manager.ConfigManager; -import org.saturnclient.saturnclient.config.manager.Property; +import org.saturnclient.config.Theme; +import org.saturnclient.config.manager.ConfigManager; +import org.saturnclient.config.manager.Property; import org.saturnclient.ui.SaturnScreen; import org.saturnclient.ui.components.Sidebar; import org.saturnclient.ui.components.inputs.FloatInput; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/EmoteWheel.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/EmoteWheel.java index c36367d..a986f74 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/EmoteWheel.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/EmoteWheel.java @@ -3,8 +3,8 @@ package org.saturnclient.ui.screens; import org.saturnclient.cosmetics.Emotes; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.client.ServiceClient; -import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.saturnclient.config.Config; +import org.saturnclient.config.AnimationConfig; +import org.saturnclient.config.Config; import org.saturnclient.ui.SaturnScreen; import org.saturnclient.ui.Utils; import org.saturnclient.ui.anim.Fade; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ModMenu.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ModMenu.java index a0f6fbe..c4308ac 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ModMenu.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ModMenu.java @@ -2,7 +2,7 @@ package org.saturnclient.ui.screens; import org.saturnclient.modules.ModManager; import org.saturnclient.modules.Module; -import org.saturnclient.saturnclient.config.AnimationConfig; +import org.saturnclient.config.AnimationConfig; import org.saturnclient.ui.SaturnScreen; import org.saturnclient.ui.anim.SlideFade; import org.saturnclient.ui.components.SaturnModule; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ShiftMenu.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ShiftMenu.java index eb02cda..ed65453 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ShiftMenu.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ShiftMenu.java @@ -1,8 +1,8 @@ package org.saturnclient.ui.screens; import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.saturnclient.config.Config; +import org.saturnclient.config.AnimationConfig; +import org.saturnclient.config.Config; import org.saturnclient.saturnclient.menus.HudEditor; import org.saturnclient.ui.SaturnScreen; import org.saturnclient.ui.anim.Fade; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/TitleMenu.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/TitleMenu.java index dc0927d..a79d1e2 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/TitleMenu.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/TitleMenu.java @@ -1,8 +1,8 @@ package org.saturnclient.ui.screens; import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.saturnclient.config.Config; +import org.saturnclient.config.AnimationConfig; +import org.saturnclient.config.Config; import org.saturnclient.saturnclient.menus.HudEditor; import org.saturnclient.ui.SaturnScreen; import org.saturnclient.ui.anim.Fade; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/cosmetics/CloakMenu.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/cosmetics/CloakMenu.java index 0d936cb..713c988 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/cosmetics/CloakMenu.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/cosmetics/CloakMenu.java @@ -3,7 +3,7 @@ package org.saturnclient.ui.screens.cosmetics; import org.saturnclient.cosmetics.cloak.Cloaks; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.client.player.SaturnPlayer; -import org.saturnclient.saturnclient.config.AnimationConfig; +import org.saturnclient.config.AnimationConfig; import org.saturnclient.ui.SaturnScreen; import org.saturnclient.ui.anim.Fade; import org.saturnclient.ui.anim.SlideY; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/cosmetics/HatMenu.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/cosmetics/HatMenu.java index c90f13b..1a5f5fe 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/cosmetics/HatMenu.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/cosmetics/HatMenu.java @@ -3,7 +3,7 @@ package org.saturnclient.ui.screens.cosmetics; import org.saturnclient.cosmetics.hat.Hats; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.client.player.SaturnPlayer; -import org.saturnclient.saturnclient.config.AnimationConfig; +import org.saturnclient.config.AnimationConfig; import org.saturnclient.ui.SaturnScreen; import org.saturnclient.ui.anim.Fade; import org.saturnclient.ui.anim.SlideY; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/store/CloakStore.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/store/CloakStore.java index 1bc7dcb..2d520dd 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/store/CloakStore.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/store/CloakStore.java @@ -4,8 +4,8 @@ import org.saturnclient.cosmetics.cloak.Cloaks; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.client.ServiceClient; import org.saturnclient.saturnclient.client.player.SaturnPlayer; -import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.saturnclient.config.Theme; +import org.saturnclient.config.AnimationConfig; +import org.saturnclient.config.Theme; import org.saturnclient.ui.SaturnScreen; import org.saturnclient.ui.Utils; import org.saturnclient.ui.anim.Fade; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/store/HatStore.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/store/HatStore.java index 9fe39b9..e37509e 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/store/HatStore.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/store/HatStore.java @@ -4,8 +4,8 @@ import org.saturnclient.cosmetics.hat.Hats; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.client.ServiceClient; import org.saturnclient.saturnclient.client.player.SaturnPlayer; -import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.saturnclient.config.Theme; +import org.saturnclient.config.AnimationConfig; +import org.saturnclient.config.Theme; import org.saturnclient.ui.SaturnScreen; import org.saturnclient.ui.Utils; import org.saturnclient.ui.anim.Fade;