saturnclientmc/saturnclient
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 5 Wiki Activity

renamed ui2 to ui

Browse Source
This commit is contained in:
selimaj-dev
2026-03-05 18:56:57 +01:00
parent dc17e9aa44
commit 45ceaf8b39
66 changed files with 278 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
versions/1.21.4/src/main/java/org/saturnclient/modules/HudMod.java
+1 -1
View File
@@ -1,6 +1,6 @@
package org.saturnclient.modules; package org.saturnclient.modules;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
public interface HudMod { public interface HudMod {
public ModDimensions getDimensions(); public ModDimensions getDimensions();
versions/1.21.4/src/main/java/org/saturnclient/modules/Module.java
+2 -2
View File
@@ -1,9 +1,9 @@
package org.saturnclient.modules; package org.saturnclient.modules;
import org.saturnclient.ui2.resources.Textures;
import org.saturnclient.saturnclient.config.manager.ConfigManager; import org.saturnclient.saturnclient.config.manager.ConfigManager;
import org.saturnclient.saturnclient.config.manager.Property.NamedProperty; 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; import net.minecraft.util.Identifier;
versions/1.21.4/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java
+1 -1
View File
@@ -6,7 +6,7 @@ import org.saturnclient.modules.Module;
import org.saturnclient.modules.ModuleDetails; import org.saturnclient.modules.ModuleDetails;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.config.manager.Property; 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.entity.EquipmentSlot;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Clock.java
+2 -2
View File
@@ -8,8 +8,8 @@ import org.saturnclient.modules.ModDimensions;
import org.saturnclient.modules.Module; import org.saturnclient.modules.Module;
import org.saturnclient.modules.ModuleDetails; import org.saturnclient.modules.ModuleDetails;
import org.saturnclient.saturnclient.config.manager.Property; import org.saturnclient.saturnclient.config.manager.Property;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import org.saturnclient.ui2.resources.Fonts; import org.saturnclient.ui.resources.Fonts;
public class Clock extends Module implements HudMod { public class Clock extends Module implements HudMod {
private static Property<Boolean> enabled = Property.bool(false); private static Property<Boolean> enabled = Property.bool(false);
versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Coordinates.java
+2 -2
View File
@@ -6,8 +6,8 @@ import org.saturnclient.modules.Module;
import org.saturnclient.modules.ModuleDetails; import org.saturnclient.modules.ModuleDetails;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.config.manager.Property; import org.saturnclient.saturnclient.config.manager.Property;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import org.saturnclient.ui2.resources.Fonts; import org.saturnclient.ui.resources.Fonts;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Crosshair.java
+2 -2
View File
@@ -4,8 +4,8 @@ import org.saturnclient.modules.Module;
import org.saturnclient.modules.ModuleDetails; import org.saturnclient.modules.ModuleDetails;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.config.manager.Property; import org.saturnclient.saturnclient.config.manager.Property;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import org.saturnclient.ui2.resources.Textures; import org.saturnclient.ui.resources.Textures;
import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayer;
versions/1.21.4/src/main/java/org/saturnclient/modules/mods/DayCounter.java
+2 -2
View File
@@ -6,8 +6,8 @@ import org.saturnclient.modules.Module;
import org.saturnclient.modules.ModuleDetails; import org.saturnclient.modules.ModuleDetails;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.config.manager.Property; import org.saturnclient.saturnclient.config.manager.Property;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import org.saturnclient.ui2.resources.Fonts; import org.saturnclient.ui.resources.Fonts;
public class DayCounter extends Module implements HudMod { public class DayCounter extends Module implements HudMod {
private static Property<Boolean> enabled = Property.bool(false); private static Property<Boolean> enabled = Property.bool(false);
versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Fps.java
+2 -2
View File
@@ -6,8 +6,8 @@ import org.saturnclient.modules.Module;
import org.saturnclient.modules.ModuleDetails; import org.saturnclient.modules.ModuleDetails;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.config.manager.Property; import org.saturnclient.saturnclient.config.manager.Property;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import org.saturnclient.ui2.resources.Fonts; import org.saturnclient.ui.resources.Fonts;
public class Fps extends Module implements HudMod { public class Fps extends Module implements HudMod {
private static Property<Boolean> enabled = Property.bool(false); private static Property<Boolean> enabled = Property.bool(false);
versions/1.21.4/src/main/java/org/saturnclient/modules/mods/HealthDisplay.java
+2 -2
View File
@@ -6,8 +6,8 @@ import org.saturnclient.modules.Module;
import org.saturnclient.modules.ModuleDetails; import org.saturnclient.modules.ModuleDetails;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.config.manager.Property; import org.saturnclient.saturnclient.config.manager.Property;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import org.saturnclient.ui2.resources.Fonts; import org.saturnclient.ui.resources.Fonts;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Keystrokes.java
+1 -1
View File
@@ -5,7 +5,7 @@ import org.saturnclient.modules.HudMod;
import org.saturnclient.modules.ModDimensions; import org.saturnclient.modules.ModDimensions;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.config.manager.Property; import org.saturnclient.saturnclient.config.manager.Property;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import org.saturnclient.modules.ModuleDetails; import org.saturnclient.modules.ModuleDetails;
public class Keystrokes extends Module implements HudMod { public class Keystrokes extends Module implements HudMod {
versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Ping.java
+2 -2
View File
@@ -5,8 +5,8 @@ import org.saturnclient.modules.ModDimensions;
import org.saturnclient.modules.Module; import org.saturnclient.modules.Module;
import org.saturnclient.modules.ModuleDetails; import org.saturnclient.modules.ModuleDetails;
import org.saturnclient.saturnclient.config.manager.Property; import org.saturnclient.saturnclient.config.manager.Property;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import org.saturnclient.ui2.resources.Fonts; import org.saturnclient.ui.resources.Fonts;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.client.network.ClientPlayNetworkHandler;
versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Speedometer.java
+2 -2
View File
@@ -6,8 +6,8 @@ import org.saturnclient.modules.Module;
import org.saturnclient.modules.ModuleDetails; import org.saturnclient.modules.ModuleDetails;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.config.manager.Property; import org.saturnclient.saturnclient.config.manager.Property;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import org.saturnclient.ui2.resources.Fonts; import org.saturnclient.ui.resources.Fonts;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
versions/1.21.4/src/main/java/org/saturnclient/modules/mods/StatusEffects.java
+1 -1
View File
@@ -8,7 +8,7 @@ import org.saturnclient.modules.Module;
import org.saturnclient.modules.ModuleDetails; import org.saturnclient.modules.ModuleDetails;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.config.manager.Property; 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.resource.language.I18n;
import net.minecraft.client.texture.Sprite; import net.minecraft.client.texture.Sprite;
versions/1.21.4/src/main/java/org/saturnclient/modules/mods/Tps.java
+2 -2
View File
@@ -5,8 +5,8 @@ import org.saturnclient.modules.ModDimensions;
import org.saturnclient.modules.Module; import org.saturnclient.modules.Module;
import org.saturnclient.modules.ModuleDetails; import org.saturnclient.modules.ModuleDetails;
import org.saturnclient.saturnclient.config.manager.Property; import org.saturnclient.saturnclient.config.manager.Property;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import org.saturnclient.ui2.resources.Fonts; import org.saturnclient.ui.resources.Fonts;
public class Tps extends Module implements HudMod { public class Tps extends Module implements HudMod {
private static Property<Boolean> enabled = Property.bool(false); private static Property<Boolean> enabled = Property.bool(false);
versions/1.21.4/src/main/java/org/saturnclient/modules/mods/mixins/RenderMixin.java
+1 -1
View File
@@ -6,7 +6,7 @@ import org.saturnclient.modules.ModManager;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.menus.HudEditor; import org.saturnclient.saturnclient.menus.HudEditor;
import org.saturnclient.saturnclient.mixin.DrawContextAccessor; 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.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java
+5 -5
View File
@@ -15,11 +15,11 @@ import org.saturnclient.saturnclient.config.Config;
import org.saturnclient.saturnclient.config.manager.ConfigManager; import org.saturnclient.saturnclient.config.manager.ConfigManager;
import org.saturnclient.saturnclient.event.KeyInputHandler; import org.saturnclient.saturnclient.event.KeyInputHandler;
import org.saturnclient.saturnclient.mixin.DrawContextAccessor; import org.saturnclient.saturnclient.mixin.DrawContextAccessor;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import org.saturnclient.ui2.SaturnScreen; import org.saturnclient.ui.SaturnScreen;
import org.saturnclient.ui2.elements.ImageTexture; import org.saturnclient.ui.elements.ImageTexture;
import org.saturnclient.ui2.resources.Textures; import org.saturnclient.ui.resources.Textures;
import org.saturnclient.ui2.screens.TitleMenu; import org.saturnclient.ui.screens.TitleMenu;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
versions/1.21.4/src/main/java/org/saturnclient/saturnclient/config/Config.java
+1 -1
View File
@@ -3,7 +3,7 @@ package org.saturnclient.saturnclient.config;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import org.saturnclient.saturnclient.config.manager.ConfigManager; import org.saturnclient.saturnclient.config.manager.ConfigManager;
import org.saturnclient.saturnclient.config.manager.Property; import org.saturnclient.saturnclient.config.manager.Property;
import org.saturnclient.ui2.resources.Textures; import org.saturnclient.ui.resources.Textures;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
versions/1.21.4/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java
+2 -2
View File
@@ -8,8 +8,8 @@ import net.minecraft.client.util.InputUtil;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.client.ServiceClient; import org.saturnclient.saturnclient.client.ServiceClient;
import org.saturnclient.saturnclient.config.Config; import org.saturnclient.saturnclient.config.Config;
import org.saturnclient.ui2.screens.EmoteWheel; import org.saturnclient.ui.screens.EmoteWheel;
import org.saturnclient.ui2.screens.ShiftMenu; import org.saturnclient.ui.screens.ShiftMenu;
import dev.kosmx.playerAnim.api.layered.AnimationStack; import dev.kosmx.playerAnim.api.layered.AnimationStack;
import dev.kosmx.playerAnim.minecraftApi.PlayerAnimationAccess; import dev.kosmx.playerAnim.minecraftApi.PlayerAnimationAccess;
versions/1.21.4/src/main/java/org/saturnclient/saturnclient/menus/HudEditor.java
+2 -2
View File
@@ -11,8 +11,8 @@ import org.saturnclient.modules.ModManager;
import org.saturnclient.modules.Module; import org.saturnclient.modules.Module;
import org.saturnclient.saturnclient.config.manager.ConfigManager; import org.saturnclient.saturnclient.config.manager.ConfigManager;
import org.saturnclient.saturnclient.mixin.DrawContextAccessor; import org.saturnclient.saturnclient.mixin.DrawContextAccessor;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import org.saturnclient.ui2.SaturnScreen; import org.saturnclient.ui.SaturnScreen;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/SetScreenMixin.java
+1 -1
View File
@@ -1,7 +1,7 @@
package org.saturnclient.saturnclient.mixin; package org.saturnclient.saturnclient.mixin;
import org.saturnclient.saturnclient.config.Config; 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.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.ModifyVariable; import org.spongepowered.asm.mixin.injection.ModifyVariable;
versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/SplashOverlayMixin.java
+2 -2
View File
@@ -4,8 +4,8 @@ import java.util.Optional;
import java.util.function.Consumer; import java.util.function.Consumer;
import org.saturnclient.saturnclient.config.Theme; import org.saturnclient.saturnclient.config.Theme;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import org.saturnclient.ui2.resources.Textures; import org.saturnclient.ui.resources.Textures;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
versions/1.21.4/src/main/java/org/saturnclient/ui2/Element.java → versions/1.21.4/src/main/java/org/saturnclient/ui/Element.java
+2 -2
View File
@@ -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 class Element {
public int x; public int x;
versions/1.21.4/src/main/java/org/saturnclient/ui2/ElementContext.java → versions/1.21.4/src/main/java/org/saturnclient/ui/ElementContext.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.saturnclient.ui2; package org.saturnclient.ui;
public class ElementContext { public class ElementContext {
public int mouseX, mouseY; public int mouseX, mouseY;
versions/1.21.4/src/main/java/org/saturnclient/ui2/RenderScope.java → versions/1.21.4/src/main/java/org/saturnclient/ui/RenderScope.java
+3 -3
View File
@@ -1,4 +1,4 @@
package org.saturnclient.ui2; package org.saturnclient.ui;
import java.util.ArrayDeque; import java.util.ArrayDeque;
import java.util.Deque; import java.util.Deque;
@@ -8,13 +8,13 @@ import java.util.function.Function;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.joml.Matrix4f; import org.joml.Matrix4f;
import org.saturnclient.ui2.resources.Fonts;
import org.saturnclient.ui2.resources.SvgTexture;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.mixin.DrawContextAccessor; 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.MinecraftClient;
import net.minecraft.client.font.TextRenderer; import net.minecraft.client.font.TextRenderer;
versions/1.21.4/src/main/java/org/saturnclient/ui2/SaturnScreen.java → versions/1.21.4/src/main/java/org/saturnclient/ui/SaturnScreen.java
+2 -2
View File
@@ -1,4 +1,4 @@
package org.saturnclient.ui2; package org.saturnclient.ui;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
@@ -6,7 +6,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.saturnclient.saturnclient.mixin.DrawContextAccessor; 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.MinecraftClient;
import net.minecraft.client.gl.PostEffectProcessor; import net.minecraft.client.gl.PostEffectProcessor;
versions/1.21.4/src/main/java/org/saturnclient/ui2/Utils.java → versions/1.21.4/src/main/java/org/saturnclient/ui/Utils.java
+3 -3
View File
@@ -1,11 +1,11 @@
package org.saturnclient.ui2; package org.saturnclient.ui;
import java.util.List; import java.util.List;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.ui2.elements.Notification; import org.saturnclient.ui.elements.Notification;
import org.saturnclient.ui2.elements.Notification.NotificationKind; import org.saturnclient.ui.elements.Notification.NotificationKind;
public class Utils { public class Utils {
public static boolean isHovering(int mouseX, int mouseY, int elementWidth, int elementHeight, float elementScale) { public static boolean isHovering(int mouseX, int mouseY, int elementWidth, int elementHeight, float elementScale) {
versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/Animation.java → versions/1.21.4/src/main/java/org/saturnclient/ui/anim/Animation.java
+2 -2
View File
@@ -1,9 +1,9 @@
package org.saturnclient.ui2.anim; package org.saturnclient.ui.anim;
import java.util.function.Function; import java.util.function.Function;
import org.saturnclient.saturnclient.config.AnimationConfig; import org.saturnclient.saturnclient.config.AnimationConfig;
import org.saturnclient.ui2.Element; import org.saturnclient.ui.Element;
public abstract class Animation { public abstract class Animation {
public int duration; public int duration;
versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/Curve.java → versions/1.21.4/src/main/java/org/saturnclient/ui/anim/Curve.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.saturnclient.ui2.anim; package org.saturnclient.ui.anim;
public class Curve { public class Curve {
public static double easeOutCubic(double x) { public static double easeOutCubic(double x) {
versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/Fade.java → versions/1.21.4/src/main/java/org/saturnclient/ui/anim/Fade.java
+2 -2
View File
@@ -1,7 +1,7 @@
package org.saturnclient.ui2.anim; package org.saturnclient.ui.anim;
import org.saturnclient.saturnclient.config.AnimationConfig; import org.saturnclient.saturnclient.config.AnimationConfig;
import org.saturnclient.ui2.Element; import org.saturnclient.ui.Element;
public class Fade extends Animation { public class Fade extends Animation {
float targetOpacity; float targetOpacity;
versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/FadeOut.java → versions/1.21.4/src/main/java/org/saturnclient/ui/anim/FadeOut.java
+2 -2
View File
@@ -1,7 +1,7 @@
package org.saturnclient.ui2.anim; package org.saturnclient.ui.anim;
import org.saturnclient.saturnclient.config.AnimationConfig; import org.saturnclient.saturnclient.config.AnimationConfig;
import org.saturnclient.ui2.Element; import org.saturnclient.ui.Element;
public class FadeOut extends Animation { public class FadeOut extends Animation {
float targetOpacity; float targetOpacity;
versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/SlideFade.java → versions/1.21.4/src/main/java/org/saturnclient/ui/anim/SlideFade.java
+2 -2
View File
@@ -1,7 +1,7 @@
package org.saturnclient.ui2.anim; package org.saturnclient.ui.anim;
import org.saturnclient.saturnclient.config.AnimationConfig; import org.saturnclient.saturnclient.config.AnimationConfig;
import org.saturnclient.ui2.Element; import org.saturnclient.ui.Element;
public class SlideFade extends Animation { public class SlideFade extends Animation {
public Fade fade; public Fade fade;
versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/SlideX.java → versions/1.21.4/src/main/java/org/saturnclient/ui/anim/SlideX.java
+2 -2
View File
@@ -1,7 +1,7 @@
package org.saturnclient.ui2.anim; package org.saturnclient.ui.anim;
import org.saturnclient.saturnclient.config.AnimationConfig; import org.saturnclient.saturnclient.config.AnimationConfig;
import org.saturnclient.ui2.Element; import org.saturnclient.ui.Element;
public class SlideX extends Animation { public class SlideX extends Animation {
int offset = 20; int offset = 20;
versions/1.21.4/src/main/java/org/saturnclient/ui2/anim/SlideY.java → versions/1.21.4/src/main/java/org/saturnclient/ui/anim/SlideY.java
+2 -2
View File
@@ -1,7 +1,7 @@
package org.saturnclient.ui2.anim; package org.saturnclient.ui.anim;
import org.saturnclient.saturnclient.config.AnimationConfig; import org.saturnclient.saturnclient.config.AnimationConfig;
import org.saturnclient.ui2.Element; import org.saturnclient.ui.Element;
public class SlideY extends Animation { public class SlideY extends Animation {
int offset = 20; int offset = 20;
versions/1.21.4/src/main/java/org/saturnclient/ui2/components/CosmeticPreview.java → versions/1.21.4/src/main/java/org/saturnclient/ui/components/CosmeticPreview.java
+4 -4
View File
@@ -1,9 +1,9 @@
package org.saturnclient.ui2.components; package org.saturnclient.ui.components;
import org.saturnclient.saturnclient.config.Theme; import org.saturnclient.saturnclient.config.Theme;
import org.saturnclient.ui2.Element; import org.saturnclient.ui.Element;
import org.saturnclient.ui2.ElementContext; import org.saturnclient.ui.ElementContext;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayer;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
versions/1.21.4/src/main/java/org/saturnclient/ui2/components/ElementRenderer.java → versions/1.21.4/src/main/java/org/saturnclient/ui/components/ElementRenderer.java
+5 -5
View File
@@ -1,12 +1,12 @@
package org.saturnclient.ui2.components; package org.saturnclient.ui.components;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.saturnclient.ui2.Element; import org.saturnclient.ui.Element;
import org.saturnclient.ui2.ElementContext; import org.saturnclient.ui.ElementContext;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import org.saturnclient.ui2.Utils; import org.saturnclient.ui.Utils;
public class ElementRenderer { public class ElementRenderer {
public static void draw(List<Element> elements, Element element) { public static void draw(List<Element> elements, Element element) {
versions/1.21.4/src/main/java/org/saturnclient/ui2/components/SaturnModule.java → versions/1.21.4/src/main/java/org/saturnclient/ui/components/SaturnModule.java
+8 -8
View File
@@ -1,15 +1,15 @@
package org.saturnclient.ui2.components; package org.saturnclient.ui.components;
import org.saturnclient.modules.Module; import org.saturnclient.modules.Module;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.config.Theme; import org.saturnclient.saturnclient.config.Theme;
import org.saturnclient.ui2.resources.Fonts; import org.saturnclient.ui.Element;
import org.saturnclient.ui2.resources.Textures; import org.saturnclient.ui.ElementContext;
import org.saturnclient.ui2.Element; import org.saturnclient.ui.RenderScope;
import org.saturnclient.ui2.ElementContext; import org.saturnclient.ui.Utils;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.resources.Fonts;
import org.saturnclient.ui2.Utils; import org.saturnclient.ui.resources.Textures;
import org.saturnclient.ui2.screens.ConfigEditor; import org.saturnclient.ui.screens.ConfigEditor;
import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayer;
versions/1.21.4/src/main/java/org/saturnclient/ui2/components/Sidebar.java → versions/1.21.4/src/main/java/org/saturnclient/ui/components/Sidebar.java
+10 -10
View File
@@ -1,17 +1,17 @@
package org.saturnclient.ui2.components; package org.saturnclient.ui.components;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.config.Config; import org.saturnclient.saturnclient.config.Config;
import org.saturnclient.saturnclient.config.Theme; import org.saturnclient.saturnclient.config.Theme;
import org.saturnclient.ui2.resources.Textures; import org.saturnclient.ui.Element;
import org.saturnclient.ui2.Element; import org.saturnclient.ui.ElementContext;
import org.saturnclient.ui2.ElementContext; import org.saturnclient.ui.RenderScope;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.Utils;
import org.saturnclient.ui2.Utils; import org.saturnclient.ui.resources.Textures;
import org.saturnclient.ui2.screens.ConfigEditor; import org.saturnclient.ui.screens.ConfigEditor;
import org.saturnclient.ui2.screens.ModMenu; import org.saturnclient.ui.screens.ModMenu;
import org.saturnclient.ui2.screens.cosmetics.CloakMenu; import org.saturnclient.ui.screens.cosmetics.CloakMenu;
import org.saturnclient.ui2.screens.store.CloakStore; import org.saturnclient.ui.screens.store.CloakStore;
import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayer;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
versions/1.21.4/src/main/java/org/saturnclient/ui2/components/SkinPreview.java → versions/1.21.4/src/main/java/org/saturnclient/ui/components/SkinPreview.java
+4 -4
View File
@@ -1,12 +1,12 @@
package org.saturnclient.ui2.components; package org.saturnclient.ui.components;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.joml.Quaternionf; import org.joml.Quaternionf;
import org.joml.Vector3f; import org.joml.Vector3f;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.ui2.Element; import org.saturnclient.ui.Element;
import org.saturnclient.ui2.ElementContext; import org.saturnclient.ui.ElementContext;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import net.minecraft.client.render.DiffuseLighting; import net.minecraft.client.render.DiffuseLighting;
import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.client.render.entity.EntityRenderDispatcher;
versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/FloatInput.java → versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/FloatInput.java
+2 -2
View File
@@ -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.ConfigManager;
import org.saturnclient.saturnclient.config.manager.Property; 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 class FloatInput extends Input {
public Property<Float> prop; public Property<Float> prop;
versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/HexInput.java → versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/HexInput.java
+4 -4
View File
@@ -1,11 +1,11 @@
package org.saturnclient.ui2.components.inputs; package org.saturnclient.ui.components.inputs;
import java.awt.Color; import java.awt.Color;
import org.saturnclient.saturnclient.config.manager.Property; import org.saturnclient.saturnclient.config.manager.Property;
import org.saturnclient.ui2.Element; import org.saturnclient.ui.Element;
import org.saturnclient.ui2.ElementContext; import org.saturnclient.ui.ElementContext;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
public class HexInput extends Element { public class HexInput extends Element {
public Property<Integer> prop; public Property<Integer> prop;
versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/Input.java → versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Input.java
+5 -5
View File
@@ -1,12 +1,12 @@
package org.saturnclient.ui2.components.inputs; package org.saturnclient.ui.components.inputs;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.config.Theme; import org.saturnclient.saturnclient.config.Theme;
import org.saturnclient.ui2.Element; import org.saturnclient.ui.Element;
import org.saturnclient.ui2.ElementContext; import org.saturnclient.ui.ElementContext;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import org.saturnclient.ui2.resources.Fonts; import org.saturnclient.ui.resources.Fonts;
public abstract class Input extends Element { public abstract class Input extends Element {
String text = ""; String text = "";
versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/IntInput.java → versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/IntInput.java
+2 -2
View File
@@ -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.ConfigManager;
import org.saturnclient.saturnclient.config.manager.Property; 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 class IntInput extends Input {
public Property<Integer> prop; public Property<Integer> prop;
versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/KeybindingSelector.java → versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/KeybindingSelector.java
+5 -5
View File
@@ -1,12 +1,12 @@
package org.saturnclient.ui2.components.inputs; package org.saturnclient.ui.components.inputs;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import org.saturnclient.saturnclient.config.Theme; import org.saturnclient.saturnclient.config.Theme;
import org.saturnclient.saturnclient.config.manager.Property; import org.saturnclient.saturnclient.config.manager.Property;
import org.saturnclient.ui2.Element; import org.saturnclient.ui.Element;
import org.saturnclient.ui2.ElementContext; import org.saturnclient.ui.ElementContext;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import org.saturnclient.ui2.resources.Fonts; import org.saturnclient.ui.resources.Fonts;
public class KeybindingSelector extends Element { public class KeybindingSelector extends Element {
Property<Integer> prop; Property<Integer> prop;
versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/Select.java → versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Select.java
+7 -6
View File
@@ -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.Theme;
import org.saturnclient.saturnclient.config.manager.Property; import org.saturnclient.saturnclient.config.manager.Property;
import org.saturnclient.ui2.Element; import org.saturnclient.ui.Element;
import org.saturnclient.ui2.ElementContext; import org.saturnclient.ui.ElementContext;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import org.saturnclient.ui2.Utils; import org.saturnclient.ui.Utils;
import org.saturnclient.ui2.resources.Fonts; import org.saturnclient.ui.resources.Fonts;
import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayer;
public class Select extends Element { public class Select extends Element {
versions/1.21.4/src/main/java/org/saturnclient/ui2/components/inputs/Toggle.java → versions/1.21.4/src/main/java/org/saturnclient/ui/components/inputs/Toggle.java
+4 -4
View File
@@ -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.Theme;
import org.saturnclient.saturnclient.config.manager.Property; import org.saturnclient.saturnclient.config.manager.Property;
import org.saturnclient.ui2.Element; import org.saturnclient.ui.Element;
import org.saturnclient.ui2.ElementContext; import org.saturnclient.ui.ElementContext;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
public class Toggle extends Element { public class Toggle extends Element {
private Property<Boolean> prop; private Property<Boolean> prop;
versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/AnimationStagger.java → versions/1.21.4/src/main/java/org/saturnclient/ui/elements/AnimationStagger.java
+5 -5
View File
@@ -1,14 +1,14 @@
package org.saturnclient.ui2.elements; package org.saturnclient.ui.elements;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.saturnclient.saturnclient.config.AnimationConfig; import org.saturnclient.saturnclient.config.AnimationConfig;
import org.saturnclient.saturnclient.config.Config; import org.saturnclient.saturnclient.config.Config;
import org.saturnclient.ui2.Element; import org.saturnclient.ui.Element;
import org.saturnclient.ui2.ElementContext; import org.saturnclient.ui.ElementContext;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import org.saturnclient.ui2.components.ElementRenderer; import org.saturnclient.ui.components.ElementRenderer;
public class AnimationStagger extends Element { public class AnimationStagger extends Element {
protected List<Element> children = new ArrayList<>(); protected List<Element> children = new ArrayList<>();
versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/Button.java → versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Button.java
+5 -5
View File
@@ -1,10 +1,10 @@
package org.saturnclient.ui2.elements; package org.saturnclient.ui.elements;
import org.saturnclient.saturnclient.config.Theme; import org.saturnclient.saturnclient.config.Theme;
import org.saturnclient.ui2.Element; import org.saturnclient.ui.Element;
import org.saturnclient.ui2.ElementContext; import org.saturnclient.ui.ElementContext;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import org.saturnclient.ui2.resources.Fonts; import org.saturnclient.ui.resources.Fonts;
public class Button extends Element { public class Button extends Element {
private String text; private String text;
versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/ClickableTexture.java → versions/1.21.4/src/main/java/org/saturnclient/ui/elements/ClickableTexture.java
+4 -4
View File
@@ -1,9 +1,9 @@
package org.saturnclient.ui2.elements; package org.saturnclient.ui.elements;
import org.saturnclient.saturnclient.config.Theme; import org.saturnclient.saturnclient.config.Theme;
import org.saturnclient.ui2.Element; import org.saturnclient.ui.Element;
import org.saturnclient.ui2.ElementContext; import org.saturnclient.ui.ElementContext;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayer;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/ImageTexture.java → versions/1.21.4/src/main/java/org/saturnclient/ui/elements/ImageTexture.java
+5 -5
View File
@@ -1,9 +1,9 @@
package org.saturnclient.ui2.elements; package org.saturnclient.ui.elements;
import org.saturnclient.ui2.Element; import org.saturnclient.ui.Element;
import org.saturnclient.ui2.ElementContext; import org.saturnclient.ui.ElementContext;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import org.saturnclient.ui2.resources.SvgTexture; import org.saturnclient.ui.resources.SvgTexture;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/Notification.java → versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Notification.java
+7 -7
View File
@@ -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.Theme;
import org.saturnclient.saturnclient.config.manager.Property; import org.saturnclient.saturnclient.config.manager.Property;
import org.saturnclient.ui2.Element; import org.saturnclient.ui.Element;
import org.saturnclient.ui2.ElementContext; import org.saturnclient.ui.ElementContext;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import org.saturnclient.ui2.anim.SlideX; import org.saturnclient.ui.anim.SlideX;
import org.saturnclient.ui2.resources.Fonts; import org.saturnclient.ui.resources.Fonts;
import org.saturnclient.ui2.resources.Textures; import org.saturnclient.ui.resources.Textures;
public class Notification extends Element { public class Notification extends Element {
private static Property<Integer> error = Property.color(0xFFbf212f); private static Property<Integer> error = Property.color(0xFFbf212f);
versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/Scroll.java → versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Scroll.java
+5 -5
View File
@@ -1,14 +1,14 @@
package org.saturnclient.ui2.elements; package org.saturnclient.ui.elements;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.saturnclient.saturnclient.config.Theme; import org.saturnclient.saturnclient.config.Theme;
import org.saturnclient.saturnclient.config.manager.Property; import org.saturnclient.saturnclient.config.manager.Property;
import org.saturnclient.ui2.Element; import org.saturnclient.ui.Element;
import org.saturnclient.ui2.ElementContext; import org.saturnclient.ui.ElementContext;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import org.saturnclient.ui2.components.ElementRenderer; import org.saturnclient.ui.components.ElementRenderer;
public class Scroll extends Element { public class Scroll extends Element {
private static Property<Integer> scrollBarRadius = Property.integer(10); private static Property<Integer> scrollBarRadius = Property.integer(10);
versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/TabMenu.java → versions/1.21.4/src/main/java/org/saturnclient/ui/elements/TabMenu.java
+5 -5
View File
@@ -1,10 +1,10 @@
package org.saturnclient.ui2.elements; package org.saturnclient.ui.elements;
import org.saturnclient.saturnclient.config.Theme; import org.saturnclient.saturnclient.config.Theme;
import org.saturnclient.ui2.Element; import org.saturnclient.ui.Element;
import org.saturnclient.ui2.ElementContext; import org.saturnclient.ui.ElementContext;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import org.saturnclient.ui2.Utils; import org.saturnclient.ui.Utils;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/Text.java → versions/1.21.4/src/main/java/org/saturnclient/ui/elements/Text.java
+5 -5
View File
@@ -1,10 +1,10 @@
package org.saturnclient.ui2.elements; package org.saturnclient.ui.elements;
import org.saturnclient.saturnclient.config.Theme; import org.saturnclient.saturnclient.config.Theme;
import org.saturnclient.ui2.Element; import org.saturnclient.ui.Element;
import org.saturnclient.ui2.ElementContext; import org.saturnclient.ui.ElementContext;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import org.saturnclient.ui2.resources.Fonts; import org.saturnclient.ui.resources.Fonts;
public class Text extends Element { public class Text extends Element {
private String text; private String text;
versions/1.21.4/src/main/java/org/saturnclient/ui2/elements/TextureButton.java → versions/1.21.4/src/main/java/org/saturnclient/ui/elements/TextureButton.java
+4 -4
View File
@@ -1,9 +1,9 @@
package org.saturnclient.ui2.elements; package org.saturnclient.ui.elements;
import org.saturnclient.saturnclient.config.Theme; import org.saturnclient.saturnclient.config.Theme;
import org.saturnclient.ui2.Element; import org.saturnclient.ui.Element;
import org.saturnclient.ui2.ElementContext; import org.saturnclient.ui.ElementContext;
import org.saturnclient.ui2.RenderScope; import org.saturnclient.ui.RenderScope;
import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayer;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
versions/1.21.4/src/main/java/org/saturnclient/ui2/resources/Fonts.java → versions/1.21.4/src/main/java/org/saturnclient/ui/resources/Fonts.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.saturnclient.ui2.resources; package org.saturnclient.ui.resources;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import net.minecraft.text.Style; import net.minecraft.text.Style;
versions/1.21.4/src/main/java/org/saturnclient/ui2/resources/SvgTexture.java → versions/1.21.4/src/main/java/org/saturnclient/ui/resources/SvgTexture.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.saturnclient.ui2.resources; package org.saturnclient.ui.resources;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.RenderingHints; import java.awt.RenderingHints;
versions/1.21.4/src/main/java/org/saturnclient/ui2/resources/Textures.java → versions/1.21.4/src/main/java/org/saturnclient/ui/resources/Textures.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.saturnclient.ui2.resources; package org.saturnclient.ui.resources;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/ConfigEditor.java → versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ConfigEditor.java
+12 -12
View File
@@ -1,21 +1,21 @@
package org.saturnclient.ui2.screens; package org.saturnclient.ui.screens;
import java.util.Map; import java.util.Map;
import org.saturnclient.saturnclient.config.Theme; import org.saturnclient.saturnclient.config.Theme;
import org.saturnclient.saturnclient.config.manager.ConfigManager; import org.saturnclient.saturnclient.config.manager.ConfigManager;
import org.saturnclient.saturnclient.config.manager.Property; import org.saturnclient.saturnclient.config.manager.Property;
import org.saturnclient.ui2.SaturnScreen; import org.saturnclient.ui.SaturnScreen;
import org.saturnclient.ui2.components.Sidebar; import org.saturnclient.ui.components.Sidebar;
import org.saturnclient.ui2.components.inputs.FloatInput; import org.saturnclient.ui.components.inputs.FloatInput;
import org.saturnclient.ui2.components.inputs.HexInput; import org.saturnclient.ui.components.inputs.HexInput;
import org.saturnclient.ui2.components.inputs.IntInput; import org.saturnclient.ui.components.inputs.IntInput;
import org.saturnclient.ui2.components.inputs.KeybindingSelector; import org.saturnclient.ui.components.inputs.KeybindingSelector;
import org.saturnclient.ui2.components.inputs.Select; import org.saturnclient.ui.components.inputs.Select;
import org.saturnclient.ui2.components.inputs.Toggle; import org.saturnclient.ui.components.inputs.Toggle;
import org.saturnclient.ui2.elements.Scroll; import org.saturnclient.ui.elements.Scroll;
import org.saturnclient.ui2.elements.Text; import org.saturnclient.ui.elements.Text;
import org.saturnclient.ui2.resources.Fonts; import org.saturnclient.ui.resources.Fonts;
public class ConfigEditor extends SaturnScreen { public class ConfigEditor extends SaturnScreen {
private ConfigManager config; private ConfigManager config;
versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/EmoteWheel.java → versions/1.21.4/src/main/java/org/saturnclient/ui/screens/EmoteWheel.java
+9 -9
View File
@@ -1,18 +1,18 @@
package org.saturnclient.ui2.screens; package org.saturnclient.ui.screens;
import org.saturnclient.cosmetics.Emotes; import org.saturnclient.cosmetics.Emotes;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.client.ServiceClient; import org.saturnclient.saturnclient.client.ServiceClient;
import org.saturnclient.saturnclient.config.AnimationConfig; import org.saturnclient.saturnclient.config.AnimationConfig;
import org.saturnclient.saturnclient.config.Config; import org.saturnclient.saturnclient.config.Config;
import org.saturnclient.ui2.SaturnScreen; import org.saturnclient.ui.SaturnScreen;
import org.saturnclient.ui2.Utils; import org.saturnclient.ui.Utils;
import org.saturnclient.ui2.anim.Fade; import org.saturnclient.ui.anim.Fade;
import org.saturnclient.ui2.anim.SlideY; import org.saturnclient.ui.anim.SlideY;
import org.saturnclient.ui2.elements.AnimationStagger; import org.saturnclient.ui.elements.AnimationStagger;
import org.saturnclient.ui2.elements.ImageTexture; import org.saturnclient.ui.elements.ImageTexture;
import org.saturnclient.ui2.elements.TextureButton; import org.saturnclient.ui.elements.TextureButton;
import org.saturnclient.ui2.resources.Textures; import org.saturnclient.ui.resources.Textures;
import dev.kosmx.playerAnim.api.layered.AnimationStack; import dev.kosmx.playerAnim.api.layered.AnimationStack;
import dev.kosmx.playerAnim.minecraftApi.PlayerAnimationAccess; import dev.kosmx.playerAnim.minecraftApi.PlayerAnimationAccess;
versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/ModMenu.java → versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ModMenu.java
+9 -9
View File
@@ -1,16 +1,16 @@
package org.saturnclient.ui2.screens; package org.saturnclient.ui.screens;
import org.saturnclient.modules.ModManager; import org.saturnclient.modules.ModManager;
import org.saturnclient.modules.Module; import org.saturnclient.modules.Module;
import org.saturnclient.saturnclient.config.AnimationConfig; import org.saturnclient.saturnclient.config.AnimationConfig;
import org.saturnclient.ui2.SaturnScreen; import org.saturnclient.ui.SaturnScreen;
import org.saturnclient.ui2.anim.SlideFade; import org.saturnclient.ui.anim.SlideFade;
import org.saturnclient.ui2.components.SaturnModule; import org.saturnclient.ui.components.SaturnModule;
import org.saturnclient.ui2.components.Sidebar; import org.saturnclient.ui.components.Sidebar;
import org.saturnclient.ui2.elements.AnimationStagger; import org.saturnclient.ui.elements.AnimationStagger;
import org.saturnclient.ui2.elements.ImageTexture; import org.saturnclient.ui.elements.ImageTexture;
import org.saturnclient.ui2.elements.Scroll; import org.saturnclient.ui.elements.Scroll;
import org.saturnclient.ui2.resources.Textures; import org.saturnclient.ui.resources.Textures;
public class ModMenu extends SaturnScreen { public class ModMenu extends SaturnScreen {
public ModMenu() { public ModMenu() {
versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/ShiftMenu.java → versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ShiftMenu.java
+10 -10
View File
@@ -1,18 +1,18 @@
package org.saturnclient.ui2.screens; package org.saturnclient.ui.screens;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.config.AnimationConfig; import org.saturnclient.saturnclient.config.AnimationConfig;
import org.saturnclient.saturnclient.config.Config; import org.saturnclient.saturnclient.config.Config;
import org.saturnclient.saturnclient.menus.HudEditor; import org.saturnclient.saturnclient.menus.HudEditor;
import org.saturnclient.ui2.resources.Textures; import org.saturnclient.ui.SaturnScreen;
import org.saturnclient.ui2.screens.cosmetics.CloakMenu; import org.saturnclient.ui.anim.Fade;
import org.saturnclient.ui2.SaturnScreen; import org.saturnclient.ui.anim.SlideY;
import org.saturnclient.ui2.elements.AnimationStagger; import org.saturnclient.ui.elements.AnimationStagger;
import org.saturnclient.ui2.elements.Button; import org.saturnclient.ui.elements.Button;
import org.saturnclient.ui2.elements.ImageTexture; import org.saturnclient.ui.elements.ImageTexture;
import org.saturnclient.ui2.elements.TextureButton; import org.saturnclient.ui.elements.TextureButton;
import org.saturnclient.ui2.anim.Fade; import org.saturnclient.ui.resources.Textures;
import org.saturnclient.ui2.anim.SlideY; import org.saturnclient.ui.screens.cosmetics.CloakMenu;
public class ShiftMenu extends SaturnScreen { public class ShiftMenu extends SaturnScreen {
public ShiftMenu() { public ShiftMenu() {
versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/TitleMenu.java → versions/1.21.4/src/main/java/org/saturnclient/ui/screens/TitleMenu.java
+12 -12
View File
@@ -1,20 +1,20 @@
package org.saturnclient.ui2.screens; package org.saturnclient.ui.screens;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.config.AnimationConfig; import org.saturnclient.saturnclient.config.AnimationConfig;
import org.saturnclient.saturnclient.config.Config; import org.saturnclient.saturnclient.config.Config;
import org.saturnclient.saturnclient.menus.HudEditor; import org.saturnclient.saturnclient.menus.HudEditor;
import org.saturnclient.ui2.resources.Textures; import org.saturnclient.ui.SaturnScreen;
import org.saturnclient.ui2.screens.cosmetics.CloakMenu; import org.saturnclient.ui.anim.Fade;
import org.saturnclient.ui2.SaturnScreen; import org.saturnclient.ui.anim.SlideFade;
import org.saturnclient.ui2.anim.Fade; import org.saturnclient.ui.anim.SlideY;
import org.saturnclient.ui2.anim.SlideFade; import org.saturnclient.ui.elements.AnimationStagger;
import org.saturnclient.ui2.anim.SlideY; import org.saturnclient.ui.elements.Button;
import org.saturnclient.ui2.elements.AnimationStagger; import org.saturnclient.ui.elements.ImageTexture;
import org.saturnclient.ui2.elements.Button; import org.saturnclient.ui.elements.TextureButton;
import org.saturnclient.ui2.elements.ImageTexture; import org.saturnclient.ui.resources.Fonts;
import org.saturnclient.ui2.elements.TextureButton; import org.saturnclient.ui.resources.Textures;
import org.saturnclient.ui2.resources.Fonts; import org.saturnclient.ui.screens.cosmetics.CloakMenu;
import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen; import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
import net.minecraft.client.gui.screen.option.OptionsScreen; import net.minecraft.client.gui.screen.option.OptionsScreen;
versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/cosmetics/CloakMenu.java → versions/1.21.4/src/main/java/org/saturnclient/ui/screens/cosmetics/CloakMenu.java
+12 -12
View File
@@ -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.cosmetics.cloak.Cloaks;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.client.player.SaturnPlayer; import org.saturnclient.saturnclient.client.player.SaturnPlayer;
import org.saturnclient.saturnclient.config.AnimationConfig; import org.saturnclient.saturnclient.config.AnimationConfig;
import org.saturnclient.ui2.resources.Textures; import org.saturnclient.ui.SaturnScreen;
import org.saturnclient.ui2.SaturnScreen; import org.saturnclient.ui.anim.Fade;
import org.saturnclient.ui2.anim.Fade; import org.saturnclient.ui.anim.SlideY;
import org.saturnclient.ui2.anim.SlideY; import org.saturnclient.ui.components.CosmeticPreview;
import org.saturnclient.ui2.components.CosmeticPreview; import org.saturnclient.ui.components.Sidebar;
import org.saturnclient.ui2.components.Sidebar; import org.saturnclient.ui.components.SkinPreview;
import org.saturnclient.ui2.components.SkinPreview; import org.saturnclient.ui.elements.AnimationStagger;
import org.saturnclient.ui2.elements.AnimationStagger; import org.saturnclient.ui.elements.Scroll;
import org.saturnclient.ui2.elements.Scroll; import org.saturnclient.ui.elements.TabMenu;
import org.saturnclient.ui2.elements.TabMenu; import org.saturnclient.ui.elements.TabMenu.TabMenuComponent;
import org.saturnclient.ui2.elements.TabMenu.TabMenuComponent; import org.saturnclient.ui.resources.Textures;
public class CloakMenu extends SaturnScreen { public class CloakMenu extends SaturnScreen {
public CloakMenu() { public CloakMenu() {
versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/cosmetics/HatMenu.java → versions/1.21.4/src/main/java/org/saturnclient/ui/screens/cosmetics/HatMenu.java
+12 -12
View File
@@ -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.cosmetics.hat.Hats;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.client.player.SaturnPlayer; import org.saturnclient.saturnclient.client.player.SaturnPlayer;
import org.saturnclient.saturnclient.config.AnimationConfig; import org.saturnclient.saturnclient.config.AnimationConfig;
import org.saturnclient.ui2.resources.Textures; import org.saturnclient.ui.SaturnScreen;
import org.saturnclient.ui2.SaturnScreen; import org.saturnclient.ui.anim.Fade;
import org.saturnclient.ui2.anim.Fade; import org.saturnclient.ui.anim.SlideY;
import org.saturnclient.ui2.anim.SlideY; import org.saturnclient.ui.components.CosmeticPreview;
import org.saturnclient.ui2.components.CosmeticPreview; import org.saturnclient.ui.components.Sidebar;
import org.saturnclient.ui2.components.Sidebar; import org.saturnclient.ui.components.SkinPreview;
import org.saturnclient.ui2.components.SkinPreview; import org.saturnclient.ui.elements.AnimationStagger;
import org.saturnclient.ui2.elements.AnimationStagger; import org.saturnclient.ui.elements.Scroll;
import org.saturnclient.ui2.elements.Scroll; import org.saturnclient.ui.elements.TabMenu;
import org.saturnclient.ui2.elements.TabMenu; import org.saturnclient.ui.elements.TabMenu.TabMenuComponent;
import org.saturnclient.ui2.elements.TabMenu.TabMenuComponent; import org.saturnclient.ui.resources.Textures;
public class HatMenu extends SaturnScreen { public class HatMenu extends SaturnScreen {
public HatMenu() { public HatMenu() {
versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/store/CloakStore.java → versions/1.21.4/src/main/java/org/saturnclient/ui/screens/store/CloakStore.java
+16 -16
View File
@@ -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.cosmetics.cloak.Cloaks;
import org.saturnclient.saturnclient.SaturnClient; 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.client.player.SaturnPlayer;
import org.saturnclient.saturnclient.config.AnimationConfig; import org.saturnclient.saturnclient.config.AnimationConfig;
import org.saturnclient.saturnclient.config.Theme; import org.saturnclient.saturnclient.config.Theme;
import org.saturnclient.ui2.SaturnScreen; import org.saturnclient.ui.SaturnScreen;
import org.saturnclient.ui2.Utils; import org.saturnclient.ui.Utils;
import org.saturnclient.ui2.anim.Fade; import org.saturnclient.ui.anim.Fade;
import org.saturnclient.ui2.anim.SlideY; import org.saturnclient.ui.anim.SlideY;
import org.saturnclient.ui2.components.CosmeticPreview; import org.saturnclient.ui.components.CosmeticPreview;
import org.saturnclient.ui2.components.Sidebar; import org.saturnclient.ui.components.Sidebar;
import org.saturnclient.ui2.elements.AnimationStagger; import org.saturnclient.ui.elements.AnimationStagger;
import org.saturnclient.ui2.elements.ImageTexture; import org.saturnclient.ui.elements.ImageTexture;
import org.saturnclient.ui2.elements.Notification.NotificationKind; import org.saturnclient.ui.elements.Scroll;
import org.saturnclient.ui2.elements.Scroll; import org.saturnclient.ui.elements.TabMenu;
import org.saturnclient.ui2.elements.TabMenu; import org.saturnclient.ui.elements.Text;
import org.saturnclient.ui2.elements.TabMenu.TabMenuComponent; import org.saturnclient.ui.elements.Notification.NotificationKind;
import org.saturnclient.ui2.elements.Text; import org.saturnclient.ui.elements.TabMenu.TabMenuComponent;
import org.saturnclient.ui2.resources.Fonts; import org.saturnclient.ui.resources.Fonts;
import org.saturnclient.ui2.resources.Textures; import org.saturnclient.ui.resources.Textures;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;
versions/1.21.4/src/main/java/org/saturnclient/ui2/screens/store/HatStore.java → versions/1.21.4/src/main/java/org/saturnclient/ui/screens/store/HatStore.java
+16 -16
View File
@@ -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.cosmetics.hat.Hats;
import org.saturnclient.saturnclient.SaturnClient; 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.client.player.SaturnPlayer;
import org.saturnclient.saturnclient.config.AnimationConfig; import org.saturnclient.saturnclient.config.AnimationConfig;
import org.saturnclient.saturnclient.config.Theme; import org.saturnclient.saturnclient.config.Theme;
import org.saturnclient.ui2.SaturnScreen; import org.saturnclient.ui.SaturnScreen;
import org.saturnclient.ui2.Utils; import org.saturnclient.ui.Utils;
import org.saturnclient.ui2.anim.Fade; import org.saturnclient.ui.anim.Fade;
import org.saturnclient.ui2.anim.SlideY; import org.saturnclient.ui.anim.SlideY;
import org.saturnclient.ui2.components.CosmeticPreview; import org.saturnclient.ui.components.CosmeticPreview;
import org.saturnclient.ui2.components.Sidebar; import org.saturnclient.ui.components.Sidebar;
import org.saturnclient.ui2.elements.AnimationStagger; import org.saturnclient.ui.elements.AnimationStagger;
import org.saturnclient.ui2.elements.ImageTexture; import org.saturnclient.ui.elements.ImageTexture;
import org.saturnclient.ui2.elements.Notification.NotificationKind; import org.saturnclient.ui.elements.Scroll;
import org.saturnclient.ui2.elements.Scroll; import org.saturnclient.ui.elements.TabMenu;
import org.saturnclient.ui2.elements.TabMenu; import org.saturnclient.ui.elements.Text;
import org.saturnclient.ui2.elements.TabMenu.TabMenuComponent; import org.saturnclient.ui.elements.Notification.NotificationKind;
import org.saturnclient.ui2.elements.Text; import org.saturnclient.ui.elements.TabMenu.TabMenuComponent;
import org.saturnclient.ui2.resources.Fonts; import org.saturnclient.ui.resources.Fonts;
import org.saturnclient.ui2.resources.Textures; import org.saturnclient.ui.resources.Textures;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;