From c74f20230d6e841646c277a8d70d3df4dfd72fe3 Mon Sep 17 00:00:00 2001 From: Klesti Selimaj Date: Sat, 7 Mar 2026 23:02:20 +0100 Subject: [PATCH] Removed minecraft package bc it's unnecessary --- .../saturnclient/client/ServiceClient.java | 2 +- .../client/player/SaturnPlayer.java | 2 +- .../{minecraft => }/IMinecraftClient.java | 6 +- .../{minecraft => }/MinecraftBinding.java | 2 +- .../{minecraft => }/MinecraftProvider.java | 4 +- .../bindings/SaturnClientBindings.java | 2 +- .../bindings/SaturnEmoteBindings.java | 2 +- .../bindings/SaturnIdentifier.java | 6 +- .../bindings/SaturnItemStack.java | 4 +- .../bindings/SaturnPlatformBindings.java | 2 +- .../bindings/SaturnQuaternionf.java | 4 +- .../bindings/SaturnSprite.java | 4 +- .../{minecraft => }/render/IMatrixStack.java | 4 +- .../{minecraft => }/render/IWindow.java | 2 +- .../java/org/saturnclient/config/Config.java | 4 +- .../saturnclient/config/manager/Property.java | 3 +- .../java/org/saturnclient/modules/Module.java | 2 +- .../interfaces/ArmorDisplayInterface.java | 2 +- .../interfaces/StatusEffectsInterface.java | 26 +++- .../modules/mods/ArmorDisplay.java | 2 +- .../java/org/saturnclient/ui/RenderScope.java | 73 ++++----- .../ui/components/CosmeticPreview.java | 2 +- .../ui/components/SaturnModule.java | 2 +- .../saturnclient/ui/components/Sidebar.java | 4 +- .../components/inputs/KeybindingSelector.java | 2 +- .../ui/elements/ClickableTexture.java | 2 +- .../ui/elements/ImageTexture.java | 6 +- .../org/saturnclient/ui/elements/TabMenu.java | 2 +- .../ui/elements/TextureButton.java | 2 +- .../org/saturnclient/ui/resources/Fonts.java | 4 +- .../saturnclient/ui/resources/SvgTexture.java | 6 +- .../saturnclient/ui/resources/Textures.java | 140 +++++++++--------- .../saturnclient/ui/screens/EmoteWheel.java | 2 +- .../saturnclient/ui/screens/HudEditor.java | 2 +- .../saturnclient/ui/screens/ShiftMenu.java | 2 +- .../saturnclient/ui/screens/TitleMenu.java | 4 +- .../ui/screens/cosmetics/CloakMenu.java | 3 +- .../ui/screens/cosmetics/HatMenu.java | 2 +- .../ui/screens/store/CloakStore.java | 2 +- .../ui/screens/store/HatStore.java | 2 +- 40 files changed, 184 insertions(+), 165 deletions(-) rename src/main/java/org/saturnclient/common/{minecraft => }/IMinecraftClient.java (57%) rename src/main/java/org/saturnclient/common/{minecraft => }/MinecraftBinding.java (88%) rename src/main/java/org/saturnclient/common/{minecraft => }/MinecraftProvider.java (87%) rename src/main/java/org/saturnclient/common/{minecraft => }/bindings/SaturnClientBindings.java (93%) rename src/main/java/org/saturnclient/common/{minecraft => }/bindings/SaturnEmoteBindings.java (71%) rename src/main/java/org/saturnclient/common/{minecraft => }/bindings/SaturnIdentifier.java (81%) rename src/main/java/org/saturnclient/common/{minecraft => }/bindings/SaturnItemStack.java (54%) rename src/main/java/org/saturnclient/common/{minecraft => }/bindings/SaturnPlatformBindings.java (86%) rename src/main/java/org/saturnclient/common/{minecraft => }/bindings/SaturnQuaternionf.java (53%) rename src/main/java/org/saturnclient/common/{minecraft => }/bindings/SaturnSprite.java (53%) rename src/main/java/org/saturnclient/common/{minecraft => }/render/IMatrixStack.java (80%) rename src/main/java/org/saturnclient/common/{minecraft => }/render/IWindow.java (76%) diff --git a/src/main/java/org/saturnclient/client/ServiceClient.java b/src/main/java/org/saturnclient/client/ServiceClient.java index c5a7cf4..ffbe86d 100644 --- a/src/main/java/org/saturnclient/client/ServiceClient.java +++ b/src/main/java/org/saturnclient/client/ServiceClient.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; import org.saturnclient.client.player.SaturnPlayer; -import org.saturnclient.common.minecraft.bindings.SaturnClientBindings; +import org.saturnclient.common.bindings.SaturnClientBindings; import dev.selimaj.session.Session; diff --git a/src/main/java/org/saturnclient/client/player/SaturnPlayer.java b/src/main/java/org/saturnclient/client/player/SaturnPlayer.java index dce3337..7707eae 100644 --- a/src/main/java/org/saturnclient/client/player/SaturnPlayer.java +++ b/src/main/java/org/saturnclient/client/player/SaturnPlayer.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; -import org.saturnclient.common.minecraft.bindings.SaturnClientBindings; +import org.saturnclient.common.bindings.SaturnClientBindings; public class SaturnPlayer { private static Map PLAYERS = new HashMap<>(); diff --git a/src/main/java/org/saturnclient/common/minecraft/IMinecraftClient.java b/src/main/java/org/saturnclient/common/IMinecraftClient.java similarity index 57% rename from src/main/java/org/saturnclient/common/minecraft/IMinecraftClient.java rename to src/main/java/org/saturnclient/common/IMinecraftClient.java index c429de9..ed7373d 100644 --- a/src/main/java/org/saturnclient/common/minecraft/IMinecraftClient.java +++ b/src/main/java/org/saturnclient/common/IMinecraftClient.java @@ -1,10 +1,10 @@ -package org.saturnclient.common.minecraft; +package org.saturnclient.common; import java.io.File; import java.io.InputStream; -import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; -import org.saturnclient.common.minecraft.render.IWindow; +import org.saturnclient.common.bindings.SaturnIdentifier; +import org.saturnclient.common.render.IWindow; public interface IMinecraftClient { diff --git a/src/main/java/org/saturnclient/common/minecraft/MinecraftBinding.java b/src/main/java/org/saturnclient/common/MinecraftBinding.java similarity index 88% rename from src/main/java/org/saturnclient/common/minecraft/MinecraftBinding.java rename to src/main/java/org/saturnclient/common/MinecraftBinding.java index 7f96808..61f3eb2 100644 --- a/src/main/java/org/saturnclient/common/minecraft/MinecraftBinding.java +++ b/src/main/java/org/saturnclient/common/MinecraftBinding.java @@ -1,4 +1,4 @@ -package org.saturnclient.common.minecraft; +package org.saturnclient.common; public class MinecraftBinding { public Object inner; diff --git a/src/main/java/org/saturnclient/common/minecraft/MinecraftProvider.java b/src/main/java/org/saturnclient/common/MinecraftProvider.java similarity index 87% rename from src/main/java/org/saturnclient/common/minecraft/MinecraftProvider.java rename to src/main/java/org/saturnclient/common/MinecraftProvider.java index 8d65972..4fed5e2 100644 --- a/src/main/java/org/saturnclient/common/minecraft/MinecraftProvider.java +++ b/src/main/java/org/saturnclient/common/MinecraftProvider.java @@ -1,6 +1,6 @@ -package org.saturnclient.common.minecraft; +package org.saturnclient.common; -import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; +import org.saturnclient.common.bindings.SaturnIdentifier; import org.saturnclient.ui.SaturnScreen; import java.awt.image.BufferedImage; diff --git a/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnClientBindings.java b/src/main/java/org/saturnclient/common/bindings/SaturnClientBindings.java similarity index 93% rename from src/main/java/org/saturnclient/common/minecraft/bindings/SaturnClientBindings.java rename to src/main/java/org/saturnclient/common/bindings/SaturnClientBindings.java index cbec7a5..21decf5 100644 --- a/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnClientBindings.java +++ b/src/main/java/org/saturnclient/common/bindings/SaturnClientBindings.java @@ -1,4 +1,4 @@ -package org.saturnclient.common.minecraft.bindings; +package org.saturnclient.common.bindings; public final class SaturnClientBindings { private static SaturnPlatformBindings platform; diff --git a/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnEmoteBindings.java b/src/main/java/org/saturnclient/common/bindings/SaturnEmoteBindings.java similarity index 71% rename from src/main/java/org/saturnclient/common/minecraft/bindings/SaturnEmoteBindings.java rename to src/main/java/org/saturnclient/common/bindings/SaturnEmoteBindings.java index e987f70..a28f656 100644 --- a/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnEmoteBindings.java +++ b/src/main/java/org/saturnclient/common/bindings/SaturnEmoteBindings.java @@ -1,4 +1,4 @@ -package org.saturnclient.common.minecraft.bindings; +package org.saturnclient.common.bindings; import java.util.UUID; diff --git a/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnIdentifier.java b/src/main/java/org/saturnclient/common/bindings/SaturnIdentifier.java similarity index 81% rename from src/main/java/org/saturnclient/common/minecraft/bindings/SaturnIdentifier.java rename to src/main/java/org/saturnclient/common/bindings/SaturnIdentifier.java index efcc765..07fc69c 100644 --- a/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnIdentifier.java +++ b/src/main/java/org/saturnclient/common/bindings/SaturnIdentifier.java @@ -1,7 +1,7 @@ -package org.saturnclient.common.minecraft.bindings; +package org.saturnclient.common.bindings; -import org.saturnclient.common.minecraft.MinecraftBinding; -import org.saturnclient.common.minecraft.MinecraftProvider; +import org.saturnclient.common.MinecraftBinding; +import org.saturnclient.common.MinecraftProvider; public class SaturnIdentifier extends MinecraftBinding { public SaturnIdentifier(String namespace, String path) { diff --git a/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnItemStack.java b/src/main/java/org/saturnclient/common/bindings/SaturnItemStack.java similarity index 54% rename from src/main/java/org/saturnclient/common/minecraft/bindings/SaturnItemStack.java rename to src/main/java/org/saturnclient/common/bindings/SaturnItemStack.java index 664cc97..5c6993d 100644 --- a/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnItemStack.java +++ b/src/main/java/org/saturnclient/common/bindings/SaturnItemStack.java @@ -1,6 +1,6 @@ -package org.saturnclient.common.minecraft.bindings; +package org.saturnclient.common.bindings; -import org.saturnclient.common.minecraft.MinecraftBinding; +import org.saturnclient.common.MinecraftBinding; public class SaturnItemStack extends MinecraftBinding { public SaturnItemStack(Object binding) { diff --git a/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnPlatformBindings.java b/src/main/java/org/saturnclient/common/bindings/SaturnPlatformBindings.java similarity index 86% rename from src/main/java/org/saturnclient/common/minecraft/bindings/SaturnPlatformBindings.java rename to src/main/java/org/saturnclient/common/bindings/SaturnPlatformBindings.java index 46ba569..89cc826 100644 --- a/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnPlatformBindings.java +++ b/src/main/java/org/saturnclient/common/bindings/SaturnPlatformBindings.java @@ -1,4 +1,4 @@ -package org.saturnclient.common.minecraft.bindings; +package org.saturnclient.common.bindings; import java.util.UUID; diff --git a/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnQuaternionf.java b/src/main/java/org/saturnclient/common/bindings/SaturnQuaternionf.java similarity index 53% rename from src/main/java/org/saturnclient/common/minecraft/bindings/SaturnQuaternionf.java rename to src/main/java/org/saturnclient/common/bindings/SaturnQuaternionf.java index deba303..c156361 100644 --- a/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnQuaternionf.java +++ b/src/main/java/org/saturnclient/common/bindings/SaturnQuaternionf.java @@ -1,6 +1,6 @@ -package org.saturnclient.common.minecraft.bindings; +package org.saturnclient.common.bindings; -import org.saturnclient.common.minecraft.MinecraftBinding; +import org.saturnclient.common.MinecraftBinding; public class SaturnQuaternionf extends MinecraftBinding { public SaturnQuaternionf(Object o) { diff --git a/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnSprite.java b/src/main/java/org/saturnclient/common/bindings/SaturnSprite.java similarity index 53% rename from src/main/java/org/saturnclient/common/minecraft/bindings/SaturnSprite.java rename to src/main/java/org/saturnclient/common/bindings/SaturnSprite.java index 0db35df..e3260fe 100644 --- a/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnSprite.java +++ b/src/main/java/org/saturnclient/common/bindings/SaturnSprite.java @@ -1,6 +1,6 @@ -package org.saturnclient.common.minecraft.bindings; +package org.saturnclient.common.bindings; -import org.saturnclient.common.minecraft.MinecraftBinding; +import org.saturnclient.common.MinecraftBinding; public class SaturnSprite extends MinecraftBinding { public SaturnSprite(Object binding) { diff --git a/src/main/java/org/saturnclient/common/minecraft/render/IMatrixStack.java b/src/main/java/org/saturnclient/common/render/IMatrixStack.java similarity index 80% rename from src/main/java/org/saturnclient/common/minecraft/render/IMatrixStack.java rename to src/main/java/org/saturnclient/common/render/IMatrixStack.java index a588891..00a8beb 100644 --- a/src/main/java/org/saturnclient/common/minecraft/render/IMatrixStack.java +++ b/src/main/java/org/saturnclient/common/render/IMatrixStack.java @@ -1,6 +1,6 @@ -package org.saturnclient.common.minecraft.render; +package org.saturnclient.common.render; -import org.saturnclient.common.minecraft.bindings.SaturnQuaternionf; +import org.saturnclient.common.bindings.SaturnQuaternionf; public interface IMatrixStack { public void translate(double x, double y, double z); diff --git a/src/main/java/org/saturnclient/common/minecraft/render/IWindow.java b/src/main/java/org/saturnclient/common/render/IWindow.java similarity index 76% rename from src/main/java/org/saturnclient/common/minecraft/render/IWindow.java rename to src/main/java/org/saturnclient/common/render/IWindow.java index c90b456..f52c558 100644 --- a/src/main/java/org/saturnclient/common/minecraft/render/IWindow.java +++ b/src/main/java/org/saturnclient/common/render/IWindow.java @@ -1,4 +1,4 @@ -package org.saturnclient.common.minecraft.render; +package org.saturnclient.common.render; public interface IWindow { public int getWidth(); diff --git a/src/main/java/org/saturnclient/config/Config.java b/src/main/java/org/saturnclient/config/Config.java index d30852a..707f937 100644 --- a/src/main/java/org/saturnclient/config/Config.java +++ b/src/main/java/org/saturnclient/config/Config.java @@ -2,8 +2,8 @@ package org.saturnclient.config; import java.io.File; -import org.saturnclient.common.minecraft.MinecraftProvider; -import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; +import org.saturnclient.common.MinecraftProvider; +import org.saturnclient.common.bindings.SaturnIdentifier; import org.saturnclient.config.manager.ConfigManager; import org.saturnclient.config.manager.Key; import org.saturnclient.config.manager.Property; diff --git a/src/main/java/org/saturnclient/config/manager/Property.java b/src/main/java/org/saturnclient/config/manager/Property.java index 0581d8f..a8777b0 100644 --- a/src/main/java/org/saturnclient/config/manager/Property.java +++ b/src/main/java/org/saturnclient/config/manager/Property.java @@ -3,10 +3,11 @@ package org.saturnclient.config.manager; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.saturnclient.common.minecraft.MinecraftProvider; import java.util.Map; +import org.saturnclient.common.MinecraftProvider; + public class Property { public static class NamedProperty { diff --git a/src/main/java/org/saturnclient/modules/Module.java b/src/main/java/org/saturnclient/modules/Module.java index c40da1a..73217f5 100644 --- a/src/main/java/org/saturnclient/modules/Module.java +++ b/src/main/java/org/saturnclient/modules/Module.java @@ -1,6 +1,6 @@ package org.saturnclient.modules; -import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; +import org.saturnclient.common.bindings.SaturnIdentifier; import org.saturnclient.config.manager.ConfigManager; import org.saturnclient.config.manager.Property.NamedProperty; import org.saturnclient.ui.RenderScope; diff --git a/src/main/java/org/saturnclient/modules/interfaces/ArmorDisplayInterface.java b/src/main/java/org/saturnclient/modules/interfaces/ArmorDisplayInterface.java index 1c9124e..0e4a1ec 100644 --- a/src/main/java/org/saturnclient/modules/interfaces/ArmorDisplayInterface.java +++ b/src/main/java/org/saturnclient/modules/interfaces/ArmorDisplayInterface.java @@ -1,6 +1,6 @@ package org.saturnclient.modules.interfaces; -import org.saturnclient.common.minecraft.bindings.SaturnItemStack; +import org.saturnclient.common.bindings.SaturnItemStack; public interface ArmorDisplayInterface { diff --git a/src/main/java/org/saturnclient/modules/interfaces/StatusEffectsInterface.java b/src/main/java/org/saturnclient/modules/interfaces/StatusEffectsInterface.java index 0ff0f54..5f15010 100644 --- a/src/main/java/org/saturnclient/modules/interfaces/StatusEffectsInterface.java +++ b/src/main/java/org/saturnclient/modules/interfaces/StatusEffectsInterface.java @@ -1,7 +1,7 @@ package org.saturnclient.modules.interfaces; import java.util.List; -import org.saturnclient.common.minecraft.bindings.SaturnSprite; +import org.saturnclient.common.bindings.SaturnSprite; public interface StatusEffectsInterface { @@ -27,10 +27,24 @@ public interface StatusEffectsInterface { this.infiniteText = infiniteText; } - public SaturnSprite getIcon() { return icon; } - public int getDurationSeconds() { return durationSeconds; } - public boolean isInfinite() { return infinite; } - public boolean shouldShowIcon() { return showIcon; } - public String getInfiniteText() { return infiniteText; } + public SaturnSprite getIcon() { + return icon; + } + + public int getDurationSeconds() { + return durationSeconds; + } + + public boolean isInfinite() { + return infinite; + } + + public boolean shouldShowIcon() { + return showIcon; + } + + public String getInfiniteText() { + return infiniteText; + } } } \ No newline at end of file diff --git a/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java b/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java index 69cad5e..820c967 100644 --- a/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java +++ b/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java @@ -5,7 +5,7 @@ import org.saturnclient.modules.ModDimensions; import org.saturnclient.modules.Module; import org.saturnclient.modules.ModuleDetails; import org.saturnclient.modules.interfaces.ArmorDisplayInterface; -import org.saturnclient.common.minecraft.bindings.SaturnItemStack; +import org.saturnclient.common.bindings.SaturnItemStack; import org.saturnclient.config.manager.Property; import org.saturnclient.ui.RenderScope; diff --git a/src/main/java/org/saturnclient/ui/RenderScope.java b/src/main/java/org/saturnclient/ui/RenderScope.java index 3467e58..69e78b8 100644 --- a/src/main/java/org/saturnclient/ui/RenderScope.java +++ b/src/main/java/org/saturnclient/ui/RenderScope.java @@ -1,67 +1,68 @@ package org.saturnclient.ui; -import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; -import org.saturnclient.common.minecraft.bindings.SaturnItemStack; -import org.saturnclient.common.minecraft.bindings.SaturnSprite; -import org.saturnclient.common.minecraft.render.IMatrixStack; +import org.saturnclient.common.bindings.SaturnIdentifier; +import org.saturnclient.common.bindings.SaturnItemStack; +import org.saturnclient.common.bindings.SaturnSprite; +import org.saturnclient.common.render.IMatrixStack; public interface RenderScope { - public IMatrixStack getMatrixStack(); + public IMatrixStack getMatrixStack(); - public void setOpacity(float alpha); + public void setOpacity(float alpha); - public int getColor(int color); + public int getColor(int color); - public void drawRect(int x, int y, int width, int height, int color); + public void drawRect(int x, int y, int width, int height, int color); - public void drawText(String text, int x, int y, int font, int color); + public void drawText(String text, int x, int y, int font, int color); - public void drawText(float scale, String text, int x, int y, int font, int color); + public void drawText(float scale, String text, int x, int y, int font, int color); - public void drawRoundedRectangle(int x, int y, int width, int height, int radius, int color); + public void drawRoundedRectangle(int x, int y, int width, int height, int radius, int color); - public int getScaledWindowWidth(); + public int getScaledWindowWidth(); - public int getScaledWindowHeight(); + public int getScaledWindowHeight(); - /* Saturn common sprites */ - public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height, int color); + /* Saturn common sprites */ + public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height, + int color); - public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height); + public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height); - public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height, - int regionWith, - int regionHeight, int textureWidth, int textureHeight); + public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height, + int regionWith, + int regionHeight, int textureWidth, int textureHeight); - public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height, - int regionWidth, - int regionHeight, int textureWidth, int textureHeight, int color); + public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height, + int regionWidth, + int regionHeight, int textureWidth, int textureHeight, int color); - public void enableScissor(int x1, int y1, int x2, int y2); + public void enableScissor(int x1, int y1, int x2, int y2); - public void disableScissor(); + public void disableScissor(); - public boolean scissorContains(int x, int y); + public boolean scissorContains(int x, int y); - public void draw(); + public void draw(); - public void drawItem(SaturnItemStack item, int x, int y); + public void drawItem(SaturnItemStack item, int x, int y); - public void drawItem(SaturnItemStack stack, int x, int y, int seed); + public void drawItem(SaturnItemStack stack, int x, int y, int seed); - public void drawItem(SaturnItemStack stack, int x, int y, int seed, int z); + public void drawItem(SaturnItemStack stack, int x, int y, int seed, int z); - public void drawItemWithoutEntity(SaturnItemStack stack, int x, int y); + public void drawItemWithoutEntity(SaturnItemStack stack, int x, int y); - public void drawItemWithoutEntity(SaturnItemStack stack, int x, int y, int seed); + public void drawItemWithoutEntity(SaturnItemStack stack, int x, int y, int seed); - public void drawSpriteStretched(SaturnSprite sprite, int x, int y, int width, int height); + public void drawSpriteStretched(SaturnSprite sprite, int x, int y, int width, int height); - public void drawSpriteStretched(SaturnSprite sprite, int x, int y, int width, int height, int color); + public void drawSpriteStretched(SaturnSprite sprite, int x, int y, int width, int height, int color); - public void fill(int x1, int y1, int x2, int y2, int color); + public void fill(int x1, int y1, int x2, int y2, int color); - public void fill(int x1, int y1, int x2, int y2, int z, int color); + public void fill(int x1, int y1, int x2, int y2, int z, int color); - public void drawBorder(int x, int y, int width, int height, int color); + public void drawBorder(int x, int y, int width, int height, int color); } diff --git a/src/main/java/org/saturnclient/ui/components/CosmeticPreview.java b/src/main/java/org/saturnclient/ui/components/CosmeticPreview.java index 2ae9d49..f3b4e54 100644 --- a/src/main/java/org/saturnclient/ui/components/CosmeticPreview.java +++ b/src/main/java/org/saturnclient/ui/components/CosmeticPreview.java @@ -1,6 +1,6 @@ package org.saturnclient.ui.components; -import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; +import org.saturnclient.common.bindings.SaturnIdentifier; import org.saturnclient.config.Theme; import org.saturnclient.ui.Element; import org.saturnclient.ui.ElementContext; diff --git a/src/main/java/org/saturnclient/ui/components/SaturnModule.java b/src/main/java/org/saturnclient/ui/components/SaturnModule.java index 4ce7864..5ce5b1c 100644 --- a/src/main/java/org/saturnclient/ui/components/SaturnModule.java +++ b/src/main/java/org/saturnclient/ui/components/SaturnModule.java @@ -1,7 +1,7 @@ package org.saturnclient.ui.components; import org.saturnclient.modules.Module; -import org.saturnclient.common.minecraft.MinecraftProvider; +import org.saturnclient.common.MinecraftProvider; import org.saturnclient.config.Theme; import org.saturnclient.ui.Element; import org.saturnclient.ui.ElementContext; diff --git a/src/main/java/org/saturnclient/ui/components/Sidebar.java b/src/main/java/org/saturnclient/ui/components/Sidebar.java index 9a781ce..700c249 100644 --- a/src/main/java/org/saturnclient/ui/components/Sidebar.java +++ b/src/main/java/org/saturnclient/ui/components/Sidebar.java @@ -1,7 +1,7 @@ package org.saturnclient.ui.components; -import org.saturnclient.common.minecraft.MinecraftProvider; -import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; +import org.saturnclient.common.MinecraftProvider; +import org.saturnclient.common.bindings.SaturnIdentifier; import org.saturnclient.config.Config; import org.saturnclient.config.Theme; import org.saturnclient.ui.Element; diff --git a/src/main/java/org/saturnclient/ui/components/inputs/KeybindingSelector.java b/src/main/java/org/saturnclient/ui/components/inputs/KeybindingSelector.java index f3e9910..59ece34 100644 --- a/src/main/java/org/saturnclient/ui/components/inputs/KeybindingSelector.java +++ b/src/main/java/org/saturnclient/ui/components/inputs/KeybindingSelector.java @@ -1,6 +1,6 @@ package org.saturnclient.ui.components.inputs; -import org.saturnclient.common.minecraft.MinecraftProvider; +import org.saturnclient.common.MinecraftProvider; import org.saturnclient.config.Theme; import org.saturnclient.config.manager.Key; import org.saturnclient.config.manager.Property; diff --git a/src/main/java/org/saturnclient/ui/elements/ClickableTexture.java b/src/main/java/org/saturnclient/ui/elements/ClickableTexture.java index 1347b6d..08ee149 100644 --- a/src/main/java/org/saturnclient/ui/elements/ClickableTexture.java +++ b/src/main/java/org/saturnclient/ui/elements/ClickableTexture.java @@ -1,6 +1,6 @@ package org.saturnclient.ui.elements; -import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; +import org.saturnclient.common.bindings.SaturnIdentifier; import org.saturnclient.config.Theme; import org.saturnclient.ui.Element; import org.saturnclient.ui.ElementContext; diff --git a/src/main/java/org/saturnclient/ui/elements/ImageTexture.java b/src/main/java/org/saturnclient/ui/elements/ImageTexture.java index f10447f..a2af187 100644 --- a/src/main/java/org/saturnclient/ui/elements/ImageTexture.java +++ b/src/main/java/org/saturnclient/ui/elements/ImageTexture.java @@ -1,8 +1,8 @@ package org.saturnclient.ui.elements; -import org.saturnclient.common.minecraft.IMinecraftClient; -import org.saturnclient.common.minecraft.MinecraftProvider; -import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; +import org.saturnclient.common.IMinecraftClient; +import org.saturnclient.common.MinecraftProvider; +import org.saturnclient.common.bindings.SaturnIdentifier; import org.saturnclient.ui.Element; import org.saturnclient.ui.ElementContext; import org.saturnclient.ui.RenderScope; diff --git a/src/main/java/org/saturnclient/ui/elements/TabMenu.java b/src/main/java/org/saturnclient/ui/elements/TabMenu.java index b87040a..52b2b5b 100644 --- a/src/main/java/org/saturnclient/ui/elements/TabMenu.java +++ b/src/main/java/org/saturnclient/ui/elements/TabMenu.java @@ -1,6 +1,6 @@ package org.saturnclient.ui.elements; -import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; +import org.saturnclient.common.bindings.SaturnIdentifier; import org.saturnclient.config.Theme; import org.saturnclient.ui.Element; import org.saturnclient.ui.ElementContext; diff --git a/src/main/java/org/saturnclient/ui/elements/TextureButton.java b/src/main/java/org/saturnclient/ui/elements/TextureButton.java index 51ee39f..f83c425 100644 --- a/src/main/java/org/saturnclient/ui/elements/TextureButton.java +++ b/src/main/java/org/saturnclient/ui/elements/TextureButton.java @@ -1,6 +1,6 @@ package org.saturnclient.ui.elements; -import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; +import org.saturnclient.common.bindings.SaturnIdentifier; import org.saturnclient.config.Theme; import org.saturnclient.ui.Element; import org.saturnclient.ui.ElementContext; diff --git a/src/main/java/org/saturnclient/ui/resources/Fonts.java b/src/main/java/org/saturnclient/ui/resources/Fonts.java index 3e935b6..851c966 100644 --- a/src/main/java/org/saturnclient/ui/resources/Fonts.java +++ b/src/main/java/org/saturnclient/ui/resources/Fonts.java @@ -1,7 +1,7 @@ package org.saturnclient.ui.resources; -import org.saturnclient.common.minecraft.MinecraftProvider; -import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; +import org.saturnclient.common.MinecraftProvider; +import org.saturnclient.common.bindings.SaturnIdentifier; public class Fonts { public static final SaturnIdentifier INTER = SaturnIdentifier.of("saturnclient", "inter"); diff --git a/src/main/java/org/saturnclient/ui/resources/SvgTexture.java b/src/main/java/org/saturnclient/ui/resources/SvgTexture.java index c4f4ea6..be8a614 100644 --- a/src/main/java/org/saturnclient/ui/resources/SvgTexture.java +++ b/src/main/java/org/saturnclient/ui/resources/SvgTexture.java @@ -10,9 +10,9 @@ import java.util.List; import com.kitfox.svg.SVGDiagram; import com.kitfox.svg.SVGUniverse; -import org.saturnclient.common.minecraft.IMinecraftClient; -import org.saturnclient.common.minecraft.MinecraftProvider; -import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; +import org.saturnclient.common.IMinecraftClient; +import org.saturnclient.common.MinecraftProvider; +import org.saturnclient.common.bindings.SaturnIdentifier; public class SvgTexture { diff --git a/src/main/java/org/saturnclient/ui/resources/Textures.java b/src/main/java/org/saturnclient/ui/resources/Textures.java index 9a8ea74..46d1f6b 100644 --- a/src/main/java/org/saturnclient/ui/resources/Textures.java +++ b/src/main/java/org/saturnclient/ui/resources/Textures.java @@ -1,80 +1,84 @@ package org.saturnclient.ui.resources; -import org.saturnclient.common.minecraft.bindings.SaturnIdentifier; +import org.saturnclient.common.bindings.SaturnIdentifier; public class Textures { - public static final SaturnIdentifier CROSSHAIR_RANGE = new SaturnIdentifier("saturnclient", - "textures/gui/hud/crosshair_range.png"); - public static final SaturnIdentifier COSMETICS = new SaturnIdentifier("saturnclient", - "textures/gui/components/cosmetics.png"); - public static final SaturnIdentifier HUD_ICON = new SaturnIdentifier("saturnclient", - "textures/gui/components/hud.png"); - public static final SaturnIdentifier SEARCH = new SaturnIdentifier("saturnclient", - "textures/gui/components/search.png"); - public static final SaturnIdentifier CLOSE = new SaturnIdentifier("saturnclient", - "textures/gui/components/close.png"); - public static final SaturnIdentifier MODS_TAB = new SaturnIdentifier("saturnclient", - "textures/gui/components/mods_tab.png"); - public static final SaturnIdentifier SETTINGS = new SaturnIdentifier("saturnclient", - "textures/gui/components/settings.png"); - public static final SaturnIdentifier CLOAK = new SaturnIdentifier("saturnclient", - "textures/gui/components/cloak.png"); - public static final SaturnIdentifier HAT = new SaturnIdentifier("saturnclient", "textures/gui/components/hat.png"); - public static final SaturnIdentifier RESET = new SaturnIdentifier("saturnclient", - "textures/gui/components/reset.png"); - public static final SaturnIdentifier TOGGLE_INDICATOR = new SaturnIdentifier("saturnclient", - "textures/gui/components/toggle_indicator.png"); - public static final SaturnIdentifier LEFT = new SaturnIdentifier("saturnclient", - "textures/gui/components/left.png"); - public static final SaturnIdentifier RIGHT = new SaturnIdentifier("saturnclient", - "textures/gui/components/right.png"); - public static final SaturnIdentifier STORE = new SaturnIdentifier("saturnclient", - "textures/gui/components/store.png"); - public static final SaturnIdentifier COINS = new SaturnIdentifier("saturnclient", - "textures/gui/components/coins.png"); - public static final SaturnIdentifier SHIRT = new SaturnIdentifier("saturnclient", - "textures/gui/components/shirt.png"); - public static final SaturnIdentifier CIRCLE_X = new SaturnIdentifier("saturnclient", - "textures/gui/components/circle_x.png"); - public static final SaturnIdentifier INFO = new SaturnIdentifier("saturnclient", - "textures/gui/components/info.png"); - public static final SaturnIdentifier CHECK = new SaturnIdentifier("saturnclient", - "textures/gui/components/check.png"); + public static final SaturnIdentifier CROSSHAIR_RANGE = new SaturnIdentifier("saturnclient", + "textures/gui/hud/crosshair_range.png"); + public static final SaturnIdentifier COSMETICS = new SaturnIdentifier("saturnclient", + "textures/gui/components/cosmetics.png"); + public static final SaturnIdentifier HUD_ICON = new SaturnIdentifier("saturnclient", + "textures/gui/components/hud.png"); + public static final SaturnIdentifier SEARCH = new SaturnIdentifier("saturnclient", + "textures/gui/components/search.png"); + public static final SaturnIdentifier CLOSE = new SaturnIdentifier("saturnclient", + "textures/gui/components/close.png"); + public static final SaturnIdentifier MODS_TAB = new SaturnIdentifier("saturnclient", + "textures/gui/components/mods_tab.png"); + public static final SaturnIdentifier SETTINGS = new SaturnIdentifier("saturnclient", + "textures/gui/components/settings.png"); + public static final SaturnIdentifier CLOAK = new SaturnIdentifier("saturnclient", + "textures/gui/components/cloak.png"); + public static final SaturnIdentifier HAT = new SaturnIdentifier("saturnclient", + "textures/gui/components/hat.png"); + public static final SaturnIdentifier RESET = new SaturnIdentifier("saturnclient", + "textures/gui/components/reset.png"); + public static final SaturnIdentifier TOGGLE_INDICATOR = new SaturnIdentifier("saturnclient", + "textures/gui/components/toggle_indicator.png"); + public static final SaturnIdentifier LEFT = new SaturnIdentifier("saturnclient", + "textures/gui/components/left.png"); + public static final SaturnIdentifier RIGHT = new SaturnIdentifier("saturnclient", + "textures/gui/components/right.png"); + public static final SaturnIdentifier STORE = new SaturnIdentifier("saturnclient", + "textures/gui/components/store.png"); + public static final SaturnIdentifier COINS = new SaturnIdentifier("saturnclient", + "textures/gui/components/coins.png"); + public static final SaturnIdentifier SHIRT = new SaturnIdentifier("saturnclient", + "textures/gui/components/shirt.png"); + public static final SaturnIdentifier CIRCLE_X = new SaturnIdentifier("saturnclient", + "textures/gui/components/circle_x.png"); + public static final SaturnIdentifier INFO = new SaturnIdentifier("saturnclient", + "textures/gui/components/info.png"); + public static final SaturnIdentifier CHECK = new SaturnIdentifier("saturnclient", + "textures/gui/components/check.png"); - public static final SaturnIdentifier LOGO = new SaturnIdentifier("saturnclient", "textures/logo/logo.png"); - public static final SaturnIdentifier REALISTIC_LOGO = new SaturnIdentifier("saturnclient", - "textures/logo/realistic.png"); - public static final SaturnIdentifier LOGO_TEXT = new SaturnIdentifier("saturnclient", "textures/logo/text.png"); - public static final SaturnIdentifier LOGO_TEXT_BIG = new SaturnIdentifier("saturnclient", - "textures/logo/text_big.png"); - public static final SaturnIdentifier SPLASH = new SaturnIdentifier("saturnclient", "textures/gui/splash.png"); + public static final SaturnIdentifier LOGO = new SaturnIdentifier("saturnclient", "textures/logo/logo.png"); + public static final SaturnIdentifier REALISTIC_LOGO = new SaturnIdentifier("saturnclient", + "textures/logo/realistic.png"); + public static final SaturnIdentifier LOGO_TEXT = new SaturnIdentifier("saturnclient", "textures/logo/text.png"); + public static final SaturnIdentifier LOGO_TEXT_BIG = new SaturnIdentifier("saturnclient", + "textures/logo/text_big.png"); + public static final SaturnIdentifier SPLASH = new SaturnIdentifier("saturnclient", "textures/gui/splash.png"); - // Widgets - public static final SaturnIdentifier BUTTON_BORDER = new SaturnIdentifier("saturnclient", "button_border"); - public static final SaturnIdentifier BUTTON = new SaturnIdentifier("saturnclient", "button"); - public static final SaturnIdentifier BUTTON_OP = new SaturnIdentifier("saturnclient", "button_op"); - public static final SaturnIdentifier SETTINGS_BG = new SaturnIdentifier("saturnclient", "settings_bg"); - public static final SaturnIdentifier RECT = new SaturnIdentifier("saturnclient", "rect"); - public static final SaturnIdentifier RECT_BORDER = new SaturnIdentifier("saturnclient", "rect_border"); - public static final SaturnIdentifier MOD = new SaturnIdentifier("saturnclient", "textures/gui/components/mod.png"); - public static final SaturnIdentifier MOD_BG = new SaturnIdentifier("saturnclient", - "textures/gui/components/mod_bg.png"); + // Widgets + public static final SaturnIdentifier BUTTON_BORDER = new SaturnIdentifier("saturnclient", "button_border"); + public static final SaturnIdentifier BUTTON = new SaturnIdentifier("saturnclient", "button"); + public static final SaturnIdentifier BUTTON_OP = new SaturnIdentifier("saturnclient", "button_op"); + public static final SaturnIdentifier SETTINGS_BG = new SaturnIdentifier("saturnclient", "settings_bg"); + public static final SaturnIdentifier RECT = new SaturnIdentifier("saturnclient", "rect"); + public static final SaturnIdentifier RECT_BORDER = new SaturnIdentifier("saturnclient", "rect_border"); + public static final SaturnIdentifier MOD = new SaturnIdentifier("saturnclient", + "textures/gui/components/mod.png"); + public static final SaturnIdentifier MOD_BG = new SaturnIdentifier("saturnclient", + "textures/gui/components/mod_bg.png"); - public static SaturnIdentifier getCloakPreview(String cloak) { - return new SaturnIdentifier("saturnclient", - "textures/gui/cloak/" + (cloak.isEmpty() ? "none" : cloak) + ".png"); - } + public static SaturnIdentifier getCloakPreview(String cloak) { + return new SaturnIdentifier("saturnclient", + "textures/gui/cloak/" + (cloak.isEmpty() ? "none" : cloak) + ".png"); + } - public static SaturnIdentifier getHatPreview(String hat) { - return new SaturnIdentifier("saturnclient", "textures/gui/hat/" + (hat.isEmpty() ? "none" : hat) + ".png"); - } + public static SaturnIdentifier getHatPreview(String hat) { + return new SaturnIdentifier("saturnclient", + "textures/gui/hat/" + (hat.isEmpty() ? "none" : hat) + ".png"); + } - public static SaturnIdentifier getEmotePreview(String emote) { - return new SaturnIdentifier("saturnclient", "textures/gui/emote/" + (emote == null ? "none" : emote) + ".png"); - } + public static SaturnIdentifier getEmotePreview(String emote) { + return new SaturnIdentifier("saturnclient", + "textures/gui/emote/" + (emote == null ? "none" : emote) + ".png"); + } - public static SaturnIdentifier getModIcon(String modId) { - return new SaturnIdentifier("saturnclient", "textures/gui/mod/" + modId + ".svg"); - } + public static SaturnIdentifier getModIcon(String modId) { + return new SaturnIdentifier("saturnclient", "textures/gui/mod/" + modId + ".svg"); + } } diff --git a/src/main/java/org/saturnclient/ui/screens/EmoteWheel.java b/src/main/java/org/saturnclient/ui/screens/EmoteWheel.java index 1e10a31..261f5b6 100644 --- a/src/main/java/org/saturnclient/ui/screens/EmoteWheel.java +++ b/src/main/java/org/saturnclient/ui/screens/EmoteWheel.java @@ -2,7 +2,7 @@ package org.saturnclient.ui.screens; import org.saturnclient.cosmetics.Emotes; import org.saturnclient.client.ServiceClient; -import org.saturnclient.common.minecraft.bindings.SaturnClientBindings; +import org.saturnclient.common.bindings.SaturnClientBindings; import org.saturnclient.config.AnimationConfig; import org.saturnclient.config.Config; import org.saturnclient.ui.SaturnScreen; diff --git a/src/main/java/org/saturnclient/ui/screens/HudEditor.java b/src/main/java/org/saturnclient/ui/screens/HudEditor.java index 178d068..902ed3d 100644 --- a/src/main/java/org/saturnclient/ui/screens/HudEditor.java +++ b/src/main/java/org/saturnclient/ui/screens/HudEditor.java @@ -4,7 +4,7 @@ import org.saturnclient.modules.HudMod; import org.saturnclient.modules.ModDimensions; import org.saturnclient.modules.ModManager; import org.saturnclient.modules.Module; -import org.saturnclient.common.minecraft.render.IMatrixStack; +import org.saturnclient.common.render.IMatrixStack; import org.saturnclient.config.manager.ConfigManager; import org.saturnclient.ui.RenderScope; import org.saturnclient.ui.SaturnScreen; diff --git a/src/main/java/org/saturnclient/ui/screens/ShiftMenu.java b/src/main/java/org/saturnclient/ui/screens/ShiftMenu.java index fc2c062..b6650c7 100644 --- a/src/main/java/org/saturnclient/ui/screens/ShiftMenu.java +++ b/src/main/java/org/saturnclient/ui/screens/ShiftMenu.java @@ -1,6 +1,6 @@ package org.saturnclient.ui.screens; -import org.saturnclient.common.minecraft.MinecraftProvider; +import org.saturnclient.common.MinecraftProvider; import org.saturnclient.config.AnimationConfig; import org.saturnclient.config.Config; import org.saturnclient.ui.SaturnScreen; diff --git a/src/main/java/org/saturnclient/ui/screens/TitleMenu.java b/src/main/java/org/saturnclient/ui/screens/TitleMenu.java index 1da39b5..8bdff88 100644 --- a/src/main/java/org/saturnclient/ui/screens/TitleMenu.java +++ b/src/main/java/org/saturnclient/ui/screens/TitleMenu.java @@ -1,7 +1,7 @@ package org.saturnclient.ui.screens; -import org.saturnclient.common.minecraft.MinecraftProvider; -import org.saturnclient.common.minecraft.MinecraftProvider.MinecraftScreen; +import org.saturnclient.common.MinecraftProvider; +import org.saturnclient.common.MinecraftProvider.MinecraftScreen; import org.saturnclient.config.AnimationConfig; import org.saturnclient.config.Config; import org.saturnclient.ui.SaturnScreen; diff --git a/src/main/java/org/saturnclient/ui/screens/cosmetics/CloakMenu.java b/src/main/java/org/saturnclient/ui/screens/cosmetics/CloakMenu.java index 73338b8..aff97b7 100644 --- a/src/main/java/org/saturnclient/ui/screens/cosmetics/CloakMenu.java +++ b/src/main/java/org/saturnclient/ui/screens/cosmetics/CloakMenu.java @@ -1,8 +1,7 @@ package org.saturnclient.ui.screens.cosmetics; import org.saturnclient.client.player.SaturnPlayer; -// import org.saturnclient.cosmetics.cloak.Cloaks; -import org.saturnclient.common.minecraft.MinecraftProvider; +import org.saturnclient.common.MinecraftProvider; import org.saturnclient.config.AnimationConfig; import org.saturnclient.ui.SaturnScreen; import org.saturnclient.ui.anim.Fade; diff --git a/src/main/java/org/saturnclient/ui/screens/cosmetics/HatMenu.java b/src/main/java/org/saturnclient/ui/screens/cosmetics/HatMenu.java index ac24d38..3cf684d 100644 --- a/src/main/java/org/saturnclient/ui/screens/cosmetics/HatMenu.java +++ b/src/main/java/org/saturnclient/ui/screens/cosmetics/HatMenu.java @@ -1,7 +1,7 @@ package org.saturnclient.ui.screens.cosmetics; import org.saturnclient.client.player.SaturnPlayer; -import org.saturnclient.common.minecraft.MinecraftProvider; +import org.saturnclient.common.MinecraftProvider; import org.saturnclient.config.AnimationConfig; import org.saturnclient.cosmetics.Hats; import org.saturnclient.ui.SaturnScreen; diff --git a/src/main/java/org/saturnclient/ui/screens/store/CloakStore.java b/src/main/java/org/saturnclient/ui/screens/store/CloakStore.java index eef8406..238f02a 100644 --- a/src/main/java/org/saturnclient/ui/screens/store/CloakStore.java +++ b/src/main/java/org/saturnclient/ui/screens/store/CloakStore.java @@ -3,7 +3,7 @@ package org.saturnclient.ui.screens.store; // import org.saturnclient.cosmetics.cloak.Cloaks; import org.saturnclient.client.ServiceClient; import org.saturnclient.client.player.SaturnPlayer; -import org.saturnclient.common.minecraft.MinecraftProvider; +import org.saturnclient.common.MinecraftProvider; import org.saturnclient.config.AnimationConfig; import org.saturnclient.config.Theme; import org.saturnclient.ui.SaturnScreen; diff --git a/src/main/java/org/saturnclient/ui/screens/store/HatStore.java b/src/main/java/org/saturnclient/ui/screens/store/HatStore.java index f0fd11b..5b29bca 100644 --- a/src/main/java/org/saturnclient/ui/screens/store/HatStore.java +++ b/src/main/java/org/saturnclient/ui/screens/store/HatStore.java @@ -2,7 +2,7 @@ package org.saturnclient.ui.screens.store; import org.saturnclient.client.ServiceClient; import org.saturnclient.client.player.SaturnPlayer; -import org.saturnclient.common.minecraft.MinecraftProvider; +import org.saturnclient.common.MinecraftProvider; import org.saturnclient.config.AnimationConfig; import org.saturnclient.config.Theme; import org.saturnclient.cosmetics.Hats;