From 45ceaf8b39d65b46f3a5eadaadab27290db28824 Mon Sep 17 00:00:00 2001 From: Klesti Selimaj Date: Thu, 5 Mar 2026 18:56:57 +0100 Subject: [PATCH] renamed ui2 to ui --- .../java/org/saturnclient/modules/HudMod.java | 2 +- .../java/org/saturnclient/modules/Module.java | 4 +-- .../modules/mods/ArmorDisplay.java | 2 +- .../org/saturnclient/modules/mods/Clock.java | 4 +-- .../modules/mods/Coordinates.java | 4 +-- .../saturnclient/modules/mods/Crosshair.java | 4 +-- .../saturnclient/modules/mods/DayCounter.java | 4 +-- .../org/saturnclient/modules/mods/Fps.java | 4 +-- .../modules/mods/HealthDisplay.java | 4 +-- .../saturnclient/modules/mods/Keystrokes.java | 2 +- .../org/saturnclient/modules/mods/Ping.java | 4 +-- .../modules/mods/Speedometer.java | 4 +-- .../modules/mods/StatusEffects.java | 2 +- .../org/saturnclient/modules/mods/Tps.java | 4 +-- .../modules/mods/mixins/RenderMixin.java | 2 +- .../saturnclient/SaturnClient.java | 10 +++--- .../saturnclient/config/Config.java | 2 +- .../saturnclient/event/KeyInputHandler.java | 4 +-- .../saturnclient/menus/HudEditor.java | 4 +-- .../saturnclient/mixin/SetScreenMixin.java | 2 +- .../mixin/SplashOverlayMixin.java | 4 +-- .../org/saturnclient/{ui2 => ui}/Element.java | 4 +-- .../{ui2 => ui}/ElementContext.java | 2 +- .../saturnclient/{ui2 => ui}/RenderScope.java | 6 ++-- .../{ui2 => ui}/SaturnScreen.java | 4 +-- .../org/saturnclient/{ui2 => ui}/Utils.java | 6 ++-- .../{ui2 => ui}/anim/Animation.java | 4 +-- .../saturnclient/{ui2 => ui}/anim/Curve.java | 2 +- .../saturnclient/{ui2 => ui}/anim/Fade.java | 4 +-- .../{ui2 => ui}/anim/FadeOut.java | 4 +-- .../{ui2 => ui}/anim/SlideFade.java | 4 +-- .../saturnclient/{ui2 => ui}/anim/SlideX.java | 4 +-- .../saturnclient/{ui2 => ui}/anim/SlideY.java | 4 +-- .../components/CosmeticPreview.java | 8 ++--- .../components/ElementRenderer.java | 10 +++--- .../{ui2 => ui}/components/SaturnModule.java | 16 +++++----- .../{ui2 => ui}/components/Sidebar.java | 20 ++++++------ .../{ui2 => ui}/components/SkinPreview.java | 8 ++--- .../components/inputs/FloatInput.java | 4 +-- .../components/inputs/HexInput.java | 8 ++--- .../{ui2 => ui}/components/inputs/Input.java | 10 +++--- .../components/inputs/IntInput.java | 4 +-- .../components/inputs/KeybindingSelector.java | 10 +++--- .../{ui2 => ui}/components/inputs/Select.java | 13 ++++---- .../{ui2 => ui}/components/inputs/Toggle.java | 8 ++--- .../elements/AnimationStagger.java | 10 +++--- .../{ui2 => ui}/elements/Button.java | 10 +++--- .../elements/ClickableTexture.java | 8 ++--- .../{ui2 => ui}/elements/ImageTexture.java | 10 +++--- .../{ui2 => ui}/elements/Notification.java | 14 ++++---- .../{ui2 => ui}/elements/Scroll.java | 10 +++--- .../{ui2 => ui}/elements/TabMenu.java | 10 +++--- .../{ui2 => ui}/elements/Text.java | 10 +++--- .../{ui2 => ui}/elements/TextureButton.java | 8 ++--- .../{ui2 => ui}/resources/Fonts.java | 2 +- .../{ui2 => ui}/resources/SvgTexture.java | 2 +- .../{ui2 => ui}/resources/Textures.java | 2 +- .../{ui2 => ui}/screens/ConfigEditor.java | 24 +++++++------- .../{ui2 => ui}/screens/EmoteWheel.java | 18 +++++------ .../{ui2 => ui}/screens/ModMenu.java | 18 +++++------ .../{ui2 => ui}/screens/ShiftMenu.java | 20 ++++++------ .../{ui2 => ui}/screens/TitleMenu.java | 24 +++++++------- .../screens/cosmetics/CloakMenu.java | 24 +++++++------- .../screens/cosmetics/HatMenu.java | 24 +++++++------- .../{ui2 => ui}/screens/store/CloakStore.java | 32 +++++++++---------- .../{ui2 => ui}/screens/store/HatStore.java | 32 +++++++++---------- 66 files changed, 278 insertions(+), 277 deletions(-) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/Element.java (96%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/ElementContext.java (96%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/RenderScope.java (99%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/SaturnScreen.java (98%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/Utils.java (94%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/anim/Animation.java (92%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/anim/Curve.java (94%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/anim/Fade.java (88%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/anim/FadeOut.java (88%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/anim/SlideFade.java (92%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/anim/SlideX.java (91%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/anim/SlideY.java (91%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/components/CosmeticPreview.java (88%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/components/ElementRenderer.java (94%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/components/SaturnModule.java (92%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/components/Sidebar.java (88%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/components/SkinPreview.java (95%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/components/inputs/FloatInput.java (94%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/components/inputs/HexInput.java (97%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/components/inputs/Input.java (94%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/components/inputs/IntInput.java (94%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/components/inputs/KeybindingSelector.java (84%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/components/inputs/Select.java (83%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/components/inputs/Toggle.java (82%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/elements/AnimationStagger.java (89%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/elements/Button.java (82%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/elements/ClickableTexture.java (83%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/elements/ImageTexture.java (81%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/elements/Notification.java (85%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/elements/Scroll.java (95%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/elements/TabMenu.java (89%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/elements/Text.java (68%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/elements/TextureButton.java (87%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/resources/Fonts.java (97%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/resources/SvgTexture.java (98%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/resources/Textures.java (99%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/screens/ConfigEditor.java (86%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/screens/EmoteWheel.java (90%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/screens/ModMenu.java (75%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/screens/ShiftMenu.java (81%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/screens/TitleMenu.java (85%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/screens/cosmetics/CloakMenu.java (79%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/screens/cosmetics/HatMenu.java (79%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/screens/store/CloakStore.java (84%) rename versions/1.21.4/src/main/java/org/saturnclient/{ui2 => ui}/screens/store/HatStore.java (84%) diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/HudMod.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/HudMod.java index fa5b280..b8b09b5 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/HudMod.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/HudMod.java @@ -1,6 +1,6 @@ package org.saturnclient.modules; -import org.saturnclient.ui2.RenderScope; +import org.saturnclient.ui.RenderScope; public interface HudMod { public ModDimensions getDimensions(); 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 6c719d6..b7bba7c 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,9 +1,9 @@ package org.saturnclient.modules; -import org.saturnclient.ui2.resources.Textures; import org.saturnclient.saturnclient.config.manager.ConfigManager; import org.saturnclient.saturnclient.config.manager.Property.NamedProperty; -import org.saturnclient.ui2.RenderScope; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Textures; import net.minecraft.util.Identifier; 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 5778b71..dc5d0d7 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 @@ -6,7 +6,7 @@ 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.ui2.RenderScope; +import org.saturnclient.ui.RenderScope; import net.minecraft.entity.EquipmentSlot; import net.minecraft.item.ItemStack; 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 2492162..0baae70 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 @@ -8,8 +8,8 @@ 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.ui2.RenderScope; -import org.saturnclient.ui2.resources.Fonts; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Fonts; public class Clock extends Module implements HudMod { private static Property enabled = Property.bool(false); 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 7ad5c0b..72eda24 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 @@ -6,8 +6,8 @@ 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.ui2.RenderScope; -import org.saturnclient.ui2.resources.Fonts; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Fonts; import net.minecraft.util.math.Vec3d; 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 5a4ed46..201a1a6 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 @@ -4,8 +4,8 @@ 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.ui2.RenderScope; -import org.saturnclient.ui2.resources.Textures; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Textures; import net.minecraft.client.render.RenderLayer; 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 bbb0b25..0739584 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 @@ -6,8 +6,8 @@ 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.ui2.RenderScope; -import org.saturnclient.ui2.resources.Fonts; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Fonts; public class DayCounter extends Module implements HudMod { private static Property enabled = Property.bool(false); 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 f788e71..ee5d603 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 @@ -6,8 +6,8 @@ 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.ui2.RenderScope; -import org.saturnclient.ui2.resources.Fonts; +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); 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 e831ec2..dd2cc8e 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 @@ -6,8 +6,8 @@ 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.ui2.RenderScope; -import org.saturnclient.ui2.resources.Fonts; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Fonts; import net.minecraft.util.math.Vec3d; 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 f67e755..8cbbcd2 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 @@ -5,7 +5,7 @@ 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.ui2.RenderScope; +import org.saturnclient.ui.RenderScope; import org.saturnclient.modules.ModuleDetails; public class Keystrokes extends Module implements HudMod { 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 06c103d..0c3dffc 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 @@ -5,8 +5,8 @@ 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.ui2.RenderScope; -import org.saturnclient.ui2.resources.Fonts; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Fonts; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayNetworkHandler; 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 ec3663c..d935307 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 @@ -6,8 +6,8 @@ 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.ui2.RenderScope; -import org.saturnclient.ui2.resources.Fonts; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Fonts; import net.minecraft.util.math.Vec3d; import net.minecraft.entity.Entity; 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 3d4a1e0..61778e1 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 @@ -8,7 +8,7 @@ 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.ui2.RenderScope; +import org.saturnclient.ui.RenderScope; import net.minecraft.client.resource.language.I18n; import net.minecraft.client.texture.Sprite; 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 a8eb977..f02835b 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 @@ -5,8 +5,8 @@ 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.ui2.RenderScope; -import org.saturnclient.ui2.resources.Fonts; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Fonts; public class Tps extends Module implements HudMod { private static Property enabled = Property.bool(false); diff --git a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/RenderMixin.java b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/RenderMixin.java index a552698..0641b63 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/RenderMixin.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/RenderMixin.java @@ -6,7 +6,7 @@ import org.saturnclient.modules.ModManager; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.menus.HudEditor; import org.saturnclient.saturnclient.mixin.DrawContextAccessor; -import org.saturnclient.ui2.RenderScope; +import org.saturnclient.ui.RenderScope; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; 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 ba767c9..fa45760 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 @@ -15,11 +15,11 @@ import org.saturnclient.saturnclient.config.Config; import org.saturnclient.saturnclient.config.manager.ConfigManager; import org.saturnclient.saturnclient.event.KeyInputHandler; import org.saturnclient.saturnclient.mixin.DrawContextAccessor; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.SaturnScreen; -import org.saturnclient.ui2.elements.ImageTexture; -import org.saturnclient.ui2.resources.Textures; -import org.saturnclient.ui2.screens.TitleMenu; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.SaturnScreen; +import org.saturnclient.ui.elements.ImageTexture; +import org.saturnclient.ui.resources.Textures; +import org.saturnclient.ui.screens.TitleMenu; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 index 109deea..1f8df23 100644 --- 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 @@ -3,7 +3,7 @@ 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.ui2.resources.Textures; +import org.saturnclient.ui.resources.Textures; import net.minecraft.util.Identifier; 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 2a3e970..cfb71b1 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 @@ -8,8 +8,8 @@ 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.ui2.screens.EmoteWheel; -import org.saturnclient.ui2.screens.ShiftMenu; +import org.saturnclient.ui.screens.EmoteWheel; +import org.saturnclient.ui.screens.ShiftMenu; import dev.kosmx.playerAnim.api.layered.AnimationStack; import dev.kosmx.playerAnim.minecraftApi.PlayerAnimationAccess; 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 5e8e214..5467ac7 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 @@ -11,8 +11,8 @@ import org.saturnclient.modules.ModManager; import org.saturnclient.modules.Module; import org.saturnclient.saturnclient.config.manager.ConfigManager; import org.saturnclient.saturnclient.mixin.DrawContextAccessor; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.SaturnScreen; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.SaturnScreen; import java.util.ArrayList; import java.util.List; 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 e549083..48a6b1e 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,7 +1,7 @@ package org.saturnclient.saturnclient.mixin; import org.saturnclient.saturnclient.config.Config; -import org.saturnclient.ui2.screens.TitleMenu; +import org.saturnclient.ui.screens.TitleMenu; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.ModifyVariable; 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 912fa5c..667c6d0 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 @@ -4,8 +4,8 @@ import java.util.Optional; import java.util.function.Consumer; import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.resources.Textures; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Textures; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/Element.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/Element.java similarity index 96% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/Element.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/Element.java index 49e8a16..1b2f15b 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/Element.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/Element.java @@ -1,6 +1,6 @@ -package org.saturnclient.ui2; +package org.saturnclient.ui; -import org.saturnclient.ui2.anim.Animation; +import org.saturnclient.ui.anim.Animation; public class Element { public int x; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/ElementContext.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/ElementContext.java similarity index 96% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/ElementContext.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/ElementContext.java index def84dd..2077161 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/ElementContext.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/ElementContext.java @@ -1,4 +1,4 @@ -package org.saturnclient.ui2; +package org.saturnclient.ui; public class ElementContext { public int mouseX, mouseY; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/RenderScope.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/RenderScope.java similarity index 99% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/RenderScope.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/RenderScope.java index 1f846e6..94890a8 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/RenderScope.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/RenderScope.java @@ -1,4 +1,4 @@ -package org.saturnclient.ui2; +package org.saturnclient.ui; import java.util.ArrayDeque; import java.util.Deque; @@ -8,13 +8,13 @@ import java.util.function.Function; import org.jetbrains.annotations.Nullable; import org.joml.Matrix4f; -import org.saturnclient.ui2.resources.Fonts; -import org.saturnclient.ui2.resources.SvgTexture; import com.mojang.blaze3d.systems.RenderSystem; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.mixin.DrawContextAccessor; +import org.saturnclient.ui.resources.Fonts; +import org.saturnclient.ui.resources.SvgTexture; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/SaturnScreen.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/SaturnScreen.java similarity index 98% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/SaturnScreen.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/SaturnScreen.java index 29651de..b3bc12c 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/SaturnScreen.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/SaturnScreen.java @@ -1,4 +1,4 @@ -package org.saturnclient.ui2; +package org.saturnclient.ui; import java.time.Duration; import java.time.Instant; @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.List; import org.saturnclient.saturnclient.mixin.DrawContextAccessor; -import org.saturnclient.ui2.components.ElementRenderer; +import org.saturnclient.ui.components.ElementRenderer; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gl.PostEffectProcessor; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/Utils.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/Utils.java similarity index 94% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/Utils.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/Utils.java index 6e3efb2..e85ce9e 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/Utils.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/Utils.java @@ -1,11 +1,11 @@ -package org.saturnclient.ui2; +package org.saturnclient.ui; import java.util.List; import org.lwjgl.glfw.GLFW; import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.ui2.elements.Notification; -import org.saturnclient.ui2.elements.Notification.NotificationKind; +import org.saturnclient.ui.elements.Notification; +import org.saturnclient.ui.elements.Notification.NotificationKind; public class Utils { public static boolean isHovering(int mouseX, int mouseY, int elementWidth, int elementHeight, float elementScale) { diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/Animation.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/Animation.java similarity index 92% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/Animation.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/anim/Animation.java index 142ff78..f1cd3bd 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/Animation.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/Animation.java @@ -1,9 +1,9 @@ -package org.saturnclient.ui2.anim; +package org.saturnclient.ui.anim; import java.util.function.Function; import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.ui2.Element; +import org.saturnclient.ui.Element; public abstract class Animation { public int duration; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/Curve.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/Curve.java similarity index 94% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/Curve.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/anim/Curve.java index ab9b811..e19d503 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/Curve.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/Curve.java @@ -1,4 +1,4 @@ -package org.saturnclient.ui2.anim; +package org.saturnclient.ui.anim; public class Curve { public static double easeOutCubic(double x) { diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/Fade.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/Fade.java similarity index 88% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/Fade.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/anim/Fade.java index 68a0329..8ac7d0d 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/Fade.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/Fade.java @@ -1,7 +1,7 @@ -package org.saturnclient.ui2.anim; +package org.saturnclient.ui.anim; import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.ui2.Element; +import org.saturnclient.ui.Element; public class Fade extends Animation { float targetOpacity; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/FadeOut.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/FadeOut.java similarity index 88% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/FadeOut.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/anim/FadeOut.java index 76f39c9..5afea76 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/FadeOut.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/FadeOut.java @@ -1,7 +1,7 @@ -package org.saturnclient.ui2.anim; +package org.saturnclient.ui.anim; import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.ui2.Element; +import org.saturnclient.ui.Element; public class FadeOut extends Animation { float targetOpacity; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/SlideFade.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/SlideFade.java similarity index 92% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/SlideFade.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/anim/SlideFade.java index e0a24b4..67eb9a9 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/SlideFade.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/SlideFade.java @@ -1,7 +1,7 @@ -package org.saturnclient.ui2.anim; +package org.saturnclient.ui.anim; import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.ui2.Element; +import org.saturnclient.ui.Element; public class SlideFade extends Animation { public Fade fade; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/SlideX.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/SlideX.java similarity index 91% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/SlideX.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/anim/SlideX.java index b759865..d83e412 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/SlideX.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/SlideX.java @@ -1,7 +1,7 @@ -package org.saturnclient.ui2.anim; +package org.saturnclient.ui.anim; import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.ui2.Element; +import org.saturnclient.ui.Element; public class SlideX extends Animation { int offset = 20; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/SlideY.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/SlideY.java similarity index 91% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/SlideY.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/anim/SlideY.java index 5c4ce09..56204e2 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/SlideY.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/anim/SlideY.java @@ -1,7 +1,7 @@ -package org.saturnclient.ui2.anim; +package org.saturnclient.ui.anim; import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.ui2.Element; +import org.saturnclient.ui.Element; public class SlideY extends Animation { int offset = 20; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/components/CosmeticPreview.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/CosmeticPreview.java similarity index 88% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/components/CosmeticPreview.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/components/CosmeticPreview.java index 49ace16..1e24e29 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/components/CosmeticPreview.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/CosmeticPreview.java @@ -1,9 +1,9 @@ -package org.saturnclient.ui2.components; +package org.saturnclient.ui.components; import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; import net.minecraft.client.render.RenderLayer; import net.minecraft.util.Identifier; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/components/ElementRenderer.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/ElementRenderer.java similarity index 94% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/components/ElementRenderer.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/components/ElementRenderer.java index 30842a1..1a4a21c 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/components/ElementRenderer.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/ElementRenderer.java @@ -1,12 +1,12 @@ -package org.saturnclient.ui2.components; +package org.saturnclient.ui.components; import java.util.ArrayList; import java.util.List; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.Utils; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.Utils; public class ElementRenderer { public static void draw(List elements, Element element) { diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/components/SaturnModule.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/SaturnModule.java similarity index 92% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/components/SaturnModule.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/components/SaturnModule.java index 21c8b1c..663340d 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/components/SaturnModule.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/SaturnModule.java @@ -1,15 +1,15 @@ -package org.saturnclient.ui2.components; +package org.saturnclient.ui.components; import org.saturnclient.modules.Module; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.ui2.resources.Fonts; -import org.saturnclient.ui2.resources.Textures; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.Utils; -import org.saturnclient.ui2.screens.ConfigEditor; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.Utils; +import org.saturnclient.ui.resources.Fonts; +import org.saturnclient.ui.resources.Textures; +import org.saturnclient.ui.screens.ConfigEditor; import net.minecraft.client.render.RenderLayer; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/components/Sidebar.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/Sidebar.java similarity index 88% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/components/Sidebar.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/components/Sidebar.java index bbb7ef7..11b4e17 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/components/Sidebar.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/Sidebar.java @@ -1,17 +1,17 @@ -package org.saturnclient.ui2.components; +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.ui2.resources.Textures; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.Utils; -import org.saturnclient.ui2.screens.ConfigEditor; -import org.saturnclient.ui2.screens.ModMenu; -import org.saturnclient.ui2.screens.cosmetics.CloakMenu; -import org.saturnclient.ui2.screens.store.CloakStore; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.Utils; +import org.saturnclient.ui.resources.Textures; +import org.saturnclient.ui.screens.ConfigEditor; +import org.saturnclient.ui.screens.ModMenu; +import org.saturnclient.ui.screens.cosmetics.CloakMenu; +import org.saturnclient.ui.screens.store.CloakStore; import net.minecraft.client.render.RenderLayer; import net.minecraft.util.Identifier; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/components/SkinPreview.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/SkinPreview.java similarity index 95% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/components/SkinPreview.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/components/SkinPreview.java index 88407c0..b6fa76b 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/components/SkinPreview.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/SkinPreview.java @@ -1,12 +1,12 @@ -package org.saturnclient.ui2.components; +package org.saturnclient.ui.components; import org.jetbrains.annotations.Nullable; import org.joml.Quaternionf; import org.joml.Vector3f; import org.saturnclient.saturnclient.SaturnClient; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; import net.minecraft.client.render.DiffuseLighting; import net.minecraft.client.render.entity.EntityRenderDispatcher; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/FloatInput.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/FloatInput.java similarity index 94% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/FloatInput.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/FloatInput.java index d1d3b37..e21e7a7 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/FloatInput.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/FloatInput.java @@ -1,8 +1,8 @@ -package org.saturnclient.ui2.components.inputs; +package org.saturnclient.ui.components.inputs; import org.saturnclient.saturnclient.config.manager.ConfigManager; import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.resources.Fonts; +import org.saturnclient.ui.resources.Fonts; public class FloatInput extends Input { public Property prop; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/HexInput.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/HexInput.java similarity index 97% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/HexInput.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/HexInput.java index 92830a1..8dcc482 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/HexInput.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/HexInput.java @@ -1,11 +1,11 @@ -package org.saturnclient.ui2.components.inputs; +package org.saturnclient.ui.components.inputs; import java.awt.Color; import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; public class HexInput extends Element { public Property prop; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/Input.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Input.java similarity index 94% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/Input.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Input.java index fbd48d9..78b82d4 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/Input.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Input.java @@ -1,12 +1,12 @@ -package org.saturnclient.ui2.components.inputs; +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.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.resources.Fonts; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Fonts; public abstract class Input extends Element { String text = ""; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/IntInput.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/IntInput.java similarity index 94% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/IntInput.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/IntInput.java index af43dc8..4d6fe90 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/IntInput.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/IntInput.java @@ -1,8 +1,8 @@ -package org.saturnclient.ui2.components.inputs; +package org.saturnclient.ui.components.inputs; import org.saturnclient.saturnclient.config.manager.ConfigManager; import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.resources.Fonts; +import org.saturnclient.ui.resources.Fonts; public class IntInput extends Input { public Property prop; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/KeybindingSelector.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/KeybindingSelector.java similarity index 84% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/KeybindingSelector.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/KeybindingSelector.java index e4ebafc..a61df7a 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/KeybindingSelector.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/KeybindingSelector.java @@ -1,12 +1,12 @@ -package org.saturnclient.ui2.components.inputs; +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.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.resources.Fonts; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Fonts; public class KeybindingSelector extends Element { Property prop; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/Select.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Select.java similarity index 83% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/Select.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Select.java index 59c2c65..be0ad3d 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/Select.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Select.java @@ -1,12 +1,13 @@ -package org.saturnclient.ui2.components.inputs; +package org.saturnclient.ui.components.inputs; import org.saturnclient.saturnclient.config.Theme; import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.Utils; -import org.saturnclient.ui2.resources.Fonts; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.Utils; +import org.saturnclient.ui.resources.Fonts; + import net.minecraft.client.render.RenderLayer; public class Select extends Element { diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/Toggle.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Toggle.java similarity index 82% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/Toggle.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Toggle.java index 0ff8705..19db228 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/Toggle.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Toggle.java @@ -1,10 +1,10 @@ -package org.saturnclient.ui2.components.inputs; +package org.saturnclient.ui.components.inputs; import org.saturnclient.saturnclient.config.Theme; import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; public class Toggle extends Element { private Property prop; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/AnimationStagger.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/AnimationStagger.java similarity index 89% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/AnimationStagger.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/elements/AnimationStagger.java index f2b8778..1113468 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/AnimationStagger.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/AnimationStagger.java @@ -1,14 +1,14 @@ -package org.saturnclient.ui2.elements; +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.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.components.ElementRenderer; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.components.ElementRenderer; public class AnimationStagger extends Element { protected List children = new ArrayList<>(); diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/Button.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Button.java similarity index 82% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/Button.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Button.java index 4774f11..3118175 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/Button.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Button.java @@ -1,10 +1,10 @@ -package org.saturnclient.ui2.elements; +package org.saturnclient.ui.elements; import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.resources.Fonts; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Fonts; public class Button extends Element { private String text; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/ClickableTexture.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/ClickableTexture.java similarity index 83% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/ClickableTexture.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/elements/ClickableTexture.java index 877eeea..5ca5643 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/ClickableTexture.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/ClickableTexture.java @@ -1,9 +1,9 @@ -package org.saturnclient.ui2.elements; +package org.saturnclient.ui.elements; import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; import net.minecraft.client.render.RenderLayer; import net.minecraft.util.Identifier; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/ImageTexture.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/ImageTexture.java similarity index 81% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/ImageTexture.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/elements/ImageTexture.java index 037ef31..840a529 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/ImageTexture.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/ImageTexture.java @@ -1,9 +1,9 @@ -package org.saturnclient.ui2.elements; +package org.saturnclient.ui.elements; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.resources.SvgTexture; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.SvgTexture; import net.minecraft.client.MinecraftClient; import net.minecraft.util.Identifier; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/Notification.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Notification.java similarity index 85% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/Notification.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Notification.java index 72fae8d..825c95e 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/Notification.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Notification.java @@ -1,13 +1,13 @@ -package org.saturnclient.ui2.elements; +package org.saturnclient.ui.elements; import org.saturnclient.saturnclient.config.Theme; import org.saturnclient.saturnclient.config.manager.Property; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.anim.SlideX; -import org.saturnclient.ui2.resources.Fonts; -import org.saturnclient.ui2.resources.Textures; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.anim.SlideX; +import org.saturnclient.ui.resources.Fonts; +import org.saturnclient.ui.resources.Textures; public class Notification extends Element { private static Property error = Property.color(0xFFbf212f); diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/Scroll.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Scroll.java similarity index 95% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/Scroll.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Scroll.java index 780e9b8..52cb878 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/Scroll.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Scroll.java @@ -1,14 +1,14 @@ -package org.saturnclient.ui2.elements; +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.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.components.ElementRenderer; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.components.ElementRenderer; public class Scroll extends Element { private static Property scrollBarRadius = Property.integer(10); diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/TabMenu.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/TabMenu.java similarity index 89% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/TabMenu.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/elements/TabMenu.java index b41757b..826280f 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/TabMenu.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/TabMenu.java @@ -1,10 +1,10 @@ -package org.saturnclient.ui2.elements; +package org.saturnclient.ui.elements; import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.Utils; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.Utils; import net.minecraft.util.Identifier; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/Text.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Text.java similarity index 68% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/Text.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Text.java index 285433d..00ab820 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/Text.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Text.java @@ -1,10 +1,10 @@ -package org.saturnclient.ui2.elements; +package org.saturnclient.ui.elements; import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; -import org.saturnclient.ui2.resources.Fonts; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; +import org.saturnclient.ui.resources.Fonts; public class Text extends Element { private String text; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/TextureButton.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/TextureButton.java similarity index 87% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/TextureButton.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/elements/TextureButton.java index ccbf1ba..012ab3d 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/TextureButton.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/elements/TextureButton.java @@ -1,9 +1,9 @@ -package org.saturnclient.ui2.elements; +package org.saturnclient.ui.elements; import org.saturnclient.saturnclient.config.Theme; -import org.saturnclient.ui2.Element; -import org.saturnclient.ui2.ElementContext; -import org.saturnclient.ui2.RenderScope; +import org.saturnclient.ui.Element; +import org.saturnclient.ui.ElementContext; +import org.saturnclient.ui.RenderScope; import net.minecraft.client.render.RenderLayer; import net.minecraft.util.Identifier; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/resources/Fonts.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/resources/Fonts.java similarity index 97% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/resources/Fonts.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/resources/Fonts.java index 5233f45..55c2593 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/resources/Fonts.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/resources/Fonts.java @@ -1,4 +1,4 @@ -package org.saturnclient.ui2.resources; +package org.saturnclient.ui.resources; import org.saturnclient.saturnclient.SaturnClient; import net.minecraft.text.Style; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/resources/SvgTexture.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/resources/SvgTexture.java similarity index 98% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/resources/SvgTexture.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/resources/SvgTexture.java index 6cc79d3..08988f5 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/resources/SvgTexture.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/resources/SvgTexture.java @@ -1,4 +1,4 @@ -package org.saturnclient.ui2.resources; +package org.saturnclient.ui.resources; import java.awt.Graphics2D; import java.awt.RenderingHints; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/resources/Textures.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/resources/Textures.java similarity index 99% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/resources/Textures.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/resources/Textures.java index 35a238c..5b6217d 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/resources/Textures.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/resources/Textures.java @@ -1,4 +1,4 @@ -package org.saturnclient.ui2.resources; +package org.saturnclient.ui.resources; import net.minecraft.util.Identifier; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/ConfigEditor.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ConfigEditor.java similarity index 86% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/ConfigEditor.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ConfigEditor.java index 52d2f55..10d83d3 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/ConfigEditor.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ConfigEditor.java @@ -1,21 +1,21 @@ -package org.saturnclient.ui2.screens; +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.ui2.SaturnScreen; -import org.saturnclient.ui2.components.Sidebar; -import org.saturnclient.ui2.components.inputs.FloatInput; -import org.saturnclient.ui2.components.inputs.HexInput; -import org.saturnclient.ui2.components.inputs.IntInput; -import org.saturnclient.ui2.components.inputs.KeybindingSelector; -import org.saturnclient.ui2.components.inputs.Select; -import org.saturnclient.ui2.components.inputs.Toggle; -import org.saturnclient.ui2.elements.Scroll; -import org.saturnclient.ui2.elements.Text; -import org.saturnclient.ui2.resources.Fonts; +import org.saturnclient.ui.SaturnScreen; +import org.saturnclient.ui.components.Sidebar; +import org.saturnclient.ui.components.inputs.FloatInput; +import org.saturnclient.ui.components.inputs.HexInput; +import org.saturnclient.ui.components.inputs.IntInput; +import org.saturnclient.ui.components.inputs.KeybindingSelector; +import org.saturnclient.ui.components.inputs.Select; +import org.saturnclient.ui.components.inputs.Toggle; +import org.saturnclient.ui.elements.Scroll; +import org.saturnclient.ui.elements.Text; +import org.saturnclient.ui.resources.Fonts; public class ConfigEditor extends SaturnScreen { private ConfigManager config; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/EmoteWheel.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/EmoteWheel.java similarity index 90% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/EmoteWheel.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/screens/EmoteWheel.java index 96fa7f6..c36367d 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/EmoteWheel.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/EmoteWheel.java @@ -1,18 +1,18 @@ -package org.saturnclient.ui2.screens; +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.ui2.SaturnScreen; -import org.saturnclient.ui2.Utils; -import org.saturnclient.ui2.anim.Fade; -import org.saturnclient.ui2.anim.SlideY; -import org.saturnclient.ui2.elements.AnimationStagger; -import org.saturnclient.ui2.elements.ImageTexture; -import org.saturnclient.ui2.elements.TextureButton; -import org.saturnclient.ui2.resources.Textures; +import org.saturnclient.ui.SaturnScreen; +import org.saturnclient.ui.Utils; +import org.saturnclient.ui.anim.Fade; +import org.saturnclient.ui.anim.SlideY; +import org.saturnclient.ui.elements.AnimationStagger; +import org.saturnclient.ui.elements.ImageTexture; +import org.saturnclient.ui.elements.TextureButton; +import org.saturnclient.ui.resources.Textures; import dev.kosmx.playerAnim.api.layered.AnimationStack; import dev.kosmx.playerAnim.minecraftApi.PlayerAnimationAccess; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/ModMenu.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ModMenu.java similarity index 75% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/ModMenu.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ModMenu.java index 44b1aca..a0f6fbe 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/ModMenu.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ModMenu.java @@ -1,16 +1,16 @@ -package org.saturnclient.ui2.screens; +package org.saturnclient.ui.screens; import org.saturnclient.modules.ModManager; import org.saturnclient.modules.Module; import org.saturnclient.saturnclient.config.AnimationConfig; -import org.saturnclient.ui2.SaturnScreen; -import org.saturnclient.ui2.anim.SlideFade; -import org.saturnclient.ui2.components.SaturnModule; -import org.saturnclient.ui2.components.Sidebar; -import org.saturnclient.ui2.elements.AnimationStagger; -import org.saturnclient.ui2.elements.ImageTexture; -import org.saturnclient.ui2.elements.Scroll; -import org.saturnclient.ui2.resources.Textures; +import org.saturnclient.ui.SaturnScreen; +import org.saturnclient.ui.anim.SlideFade; +import org.saturnclient.ui.components.SaturnModule; +import org.saturnclient.ui.components.Sidebar; +import org.saturnclient.ui.elements.AnimationStagger; +import org.saturnclient.ui.elements.ImageTexture; +import org.saturnclient.ui.elements.Scroll; +import org.saturnclient.ui.resources.Textures; public class ModMenu extends SaturnScreen { public ModMenu() { diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/ShiftMenu.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ShiftMenu.java similarity index 81% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/ShiftMenu.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ShiftMenu.java index 185120b..eb02cda 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/ShiftMenu.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ShiftMenu.java @@ -1,18 +1,18 @@ -package org.saturnclient.ui2.screens; +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.saturnclient.menus.HudEditor; -import org.saturnclient.ui2.resources.Textures; -import org.saturnclient.ui2.screens.cosmetics.CloakMenu; -import org.saturnclient.ui2.SaturnScreen; -import org.saturnclient.ui2.elements.AnimationStagger; -import org.saturnclient.ui2.elements.Button; -import org.saturnclient.ui2.elements.ImageTexture; -import org.saturnclient.ui2.elements.TextureButton; -import org.saturnclient.ui2.anim.Fade; -import org.saturnclient.ui2.anim.SlideY; +import org.saturnclient.ui.SaturnScreen; +import org.saturnclient.ui.anim.Fade; +import org.saturnclient.ui.anim.SlideY; +import org.saturnclient.ui.elements.AnimationStagger; +import org.saturnclient.ui.elements.Button; +import org.saturnclient.ui.elements.ImageTexture; +import org.saturnclient.ui.elements.TextureButton; +import org.saturnclient.ui.resources.Textures; +import org.saturnclient.ui.screens.cosmetics.CloakMenu; public class ShiftMenu extends SaturnScreen { public ShiftMenu() { diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/TitleMenu.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/TitleMenu.java similarity index 85% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/TitleMenu.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/screens/TitleMenu.java index aa7101e..dc0927d 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/TitleMenu.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/TitleMenu.java @@ -1,20 +1,20 @@ -package org.saturnclient.ui2.screens; +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.saturnclient.menus.HudEditor; -import org.saturnclient.ui2.resources.Textures; -import org.saturnclient.ui2.screens.cosmetics.CloakMenu; -import org.saturnclient.ui2.SaturnScreen; -import org.saturnclient.ui2.anim.Fade; -import org.saturnclient.ui2.anim.SlideFade; -import org.saturnclient.ui2.anim.SlideY; -import org.saturnclient.ui2.elements.AnimationStagger; -import org.saturnclient.ui2.elements.Button; -import org.saturnclient.ui2.elements.ImageTexture; -import org.saturnclient.ui2.elements.TextureButton; -import org.saturnclient.ui2.resources.Fonts; +import org.saturnclient.ui.SaturnScreen; +import org.saturnclient.ui.anim.Fade; +import org.saturnclient.ui.anim.SlideFade; +import org.saturnclient.ui.anim.SlideY; +import org.saturnclient.ui.elements.AnimationStagger; +import org.saturnclient.ui.elements.Button; +import org.saturnclient.ui.elements.ImageTexture; +import org.saturnclient.ui.elements.TextureButton; +import org.saturnclient.ui.resources.Fonts; +import org.saturnclient.ui.resources.Textures; +import org.saturnclient.ui.screens.cosmetics.CloakMenu; import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen; import net.minecraft.client.gui.screen.option.OptionsScreen; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/cosmetics/CloakMenu.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/cosmetics/CloakMenu.java similarity index 79% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/cosmetics/CloakMenu.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/screens/cosmetics/CloakMenu.java index 724407a..0d936cb 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/cosmetics/CloakMenu.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/cosmetics/CloakMenu.java @@ -1,20 +1,20 @@ -package org.saturnclient.ui2.screens.cosmetics; +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.ui2.resources.Textures; -import org.saturnclient.ui2.SaturnScreen; -import org.saturnclient.ui2.anim.Fade; -import org.saturnclient.ui2.anim.SlideY; -import org.saturnclient.ui2.components.CosmeticPreview; -import org.saturnclient.ui2.components.Sidebar; -import org.saturnclient.ui2.components.SkinPreview; -import org.saturnclient.ui2.elements.AnimationStagger; -import org.saturnclient.ui2.elements.Scroll; -import org.saturnclient.ui2.elements.TabMenu; -import org.saturnclient.ui2.elements.TabMenu.TabMenuComponent; +import org.saturnclient.ui.SaturnScreen; +import org.saturnclient.ui.anim.Fade; +import org.saturnclient.ui.anim.SlideY; +import org.saturnclient.ui.components.CosmeticPreview; +import org.saturnclient.ui.components.Sidebar; +import org.saturnclient.ui.components.SkinPreview; +import org.saturnclient.ui.elements.AnimationStagger; +import org.saturnclient.ui.elements.Scroll; +import org.saturnclient.ui.elements.TabMenu; +import org.saturnclient.ui.elements.TabMenu.TabMenuComponent; +import org.saturnclient.ui.resources.Textures; public class CloakMenu extends SaturnScreen { public CloakMenu() { diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/cosmetics/HatMenu.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/cosmetics/HatMenu.java similarity index 79% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/cosmetics/HatMenu.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/screens/cosmetics/HatMenu.java index f21723a..c90f13b 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/cosmetics/HatMenu.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/cosmetics/HatMenu.java @@ -1,20 +1,20 @@ -package org.saturnclient.ui2.screens.cosmetics; +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.ui2.resources.Textures; -import org.saturnclient.ui2.SaturnScreen; -import org.saturnclient.ui2.anim.Fade; -import org.saturnclient.ui2.anim.SlideY; -import org.saturnclient.ui2.components.CosmeticPreview; -import org.saturnclient.ui2.components.Sidebar; -import org.saturnclient.ui2.components.SkinPreview; -import org.saturnclient.ui2.elements.AnimationStagger; -import org.saturnclient.ui2.elements.Scroll; -import org.saturnclient.ui2.elements.TabMenu; -import org.saturnclient.ui2.elements.TabMenu.TabMenuComponent; +import org.saturnclient.ui.SaturnScreen; +import org.saturnclient.ui.anim.Fade; +import org.saturnclient.ui.anim.SlideY; +import org.saturnclient.ui.components.CosmeticPreview; +import org.saturnclient.ui.components.Sidebar; +import org.saturnclient.ui.components.SkinPreview; +import org.saturnclient.ui.elements.AnimationStagger; +import org.saturnclient.ui.elements.Scroll; +import org.saturnclient.ui.elements.TabMenu; +import org.saturnclient.ui.elements.TabMenu.TabMenuComponent; +import org.saturnclient.ui.resources.Textures; public class HatMenu extends SaturnScreen { public HatMenu() { diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/store/CloakStore.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/store/CloakStore.java similarity index 84% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/store/CloakStore.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/screens/store/CloakStore.java index 2978972..1bc7dcb 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/store/CloakStore.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/store/CloakStore.java @@ -1,4 +1,4 @@ -package org.saturnclient.ui2.screens.store; +package org.saturnclient.ui.screens.store; import org.saturnclient.cosmetics.cloak.Cloaks; import org.saturnclient.saturnclient.SaturnClient; @@ -6,21 +6,21 @@ 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.ui2.SaturnScreen; -import org.saturnclient.ui2.Utils; -import org.saturnclient.ui2.anim.Fade; -import org.saturnclient.ui2.anim.SlideY; -import org.saturnclient.ui2.components.CosmeticPreview; -import org.saturnclient.ui2.components.Sidebar; -import org.saturnclient.ui2.elements.AnimationStagger; -import org.saturnclient.ui2.elements.ImageTexture; -import org.saturnclient.ui2.elements.Notification.NotificationKind; -import org.saturnclient.ui2.elements.Scroll; -import org.saturnclient.ui2.elements.TabMenu; -import org.saturnclient.ui2.elements.TabMenu.TabMenuComponent; -import org.saturnclient.ui2.elements.Text; -import org.saturnclient.ui2.resources.Fonts; -import org.saturnclient.ui2.resources.Textures; +import org.saturnclient.ui.SaturnScreen; +import org.saturnclient.ui.Utils; +import org.saturnclient.ui.anim.Fade; +import org.saturnclient.ui.anim.SlideY; +import org.saturnclient.ui.components.CosmeticPreview; +import org.saturnclient.ui.components.Sidebar; +import org.saturnclient.ui.elements.AnimationStagger; +import org.saturnclient.ui.elements.ImageTexture; +import org.saturnclient.ui.elements.Scroll; +import org.saturnclient.ui.elements.TabMenu; +import org.saturnclient.ui.elements.Text; +import org.saturnclient.ui.elements.Notification.NotificationKind; +import org.saturnclient.ui.elements.TabMenu.TabMenuComponent; +import org.saturnclient.ui.resources.Fonts; +import org.saturnclient.ui.resources.Textures; import com.mojang.blaze3d.systems.RenderSystem; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/store/HatStore.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/store/HatStore.java similarity index 84% rename from versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/store/HatStore.java rename to versions/1.21.4/src/main/java/org/saturnclient/ui/screens/store/HatStore.java index 328f701..9fe39b9 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/store/HatStore.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/store/HatStore.java @@ -1,4 +1,4 @@ -package org.saturnclient.ui2.screens.store; +package org.saturnclient.ui.screens.store; import org.saturnclient.cosmetics.hat.Hats; import org.saturnclient.saturnclient.SaturnClient; @@ -6,21 +6,21 @@ 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.ui2.SaturnScreen; -import org.saturnclient.ui2.Utils; -import org.saturnclient.ui2.anim.Fade; -import org.saturnclient.ui2.anim.SlideY; -import org.saturnclient.ui2.components.CosmeticPreview; -import org.saturnclient.ui2.components.Sidebar; -import org.saturnclient.ui2.elements.AnimationStagger; -import org.saturnclient.ui2.elements.ImageTexture; -import org.saturnclient.ui2.elements.Notification.NotificationKind; -import org.saturnclient.ui2.elements.Scroll; -import org.saturnclient.ui2.elements.TabMenu; -import org.saturnclient.ui2.elements.TabMenu.TabMenuComponent; -import org.saturnclient.ui2.elements.Text; -import org.saturnclient.ui2.resources.Fonts; -import org.saturnclient.ui2.resources.Textures; +import org.saturnclient.ui.SaturnScreen; +import org.saturnclient.ui.Utils; +import org.saturnclient.ui.anim.Fade; +import org.saturnclient.ui.anim.SlideY; +import org.saturnclient.ui.components.CosmeticPreview; +import org.saturnclient.ui.components.Sidebar; +import org.saturnclient.ui.elements.AnimationStagger; +import org.saturnclient.ui.elements.ImageTexture; +import org.saturnclient.ui.elements.Scroll; +import org.saturnclient.ui.elements.TabMenu; +import org.saturnclient.ui.elements.Text; +import org.saturnclient.ui.elements.Notification.NotificationKind; +import org.saturnclient.ui.elements.TabMenu.TabMenuComponent; +import org.saturnclient.ui.resources.Fonts; +import org.saturnclient.ui.resources.Textures; import com.mojang.blaze3d.systems.RenderSystem;