Removed minecraft package bc it's unnecessary

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;
 

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<UUID, SaturnPlayer> PLAYERS = new HashMap<>();

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.bindings.SaturnIdentifier;
-import org.saturnclient.common.minecraft.render.IWindow;
+import org.saturnclient.common.render.IWindow;
 
 public interface IMinecraftClient {
 

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;

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;

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;

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;
 

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.MinecraftBinding;
-import org.saturnclient.common.minecraft.MinecraftProvider;
+import org.saturnclient.common.MinecraftProvider;
 
 public class SaturnIdentifier extends MinecraftBinding {
     public SaturnIdentifier(String namespace, String path) {

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) {

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;
 

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) {

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) {

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);

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();

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.MinecraftProvider;
-import org.saturnclient.common.minecraft.bindings.SaturnIdentifier;
+import org.saturnclient.common.bindings.SaturnIdentifier;
 import org.saturnclient.config.manager.ConfigManager;
 import org.saturnclient.config.manager.Key;
 import org.saturnclient.config.manager.Property;

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<T> {
 
     public static class NamedProperty<T> {

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;

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 {
 

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 SaturnSprite getIcon() {
-        public int getDurationSeconds() { return durationSeconds; }
+            return icon;
-        public boolean isInfinite() { return infinite; }
+        }
-        public boolean shouldShowIcon() { return showIcon; }
+
-        public String getInfiniteText() { return infiniteText; }
+        public int getDurationSeconds() {
+            return durationSeconds;
+        }
+
+        public boolean isInfinite() {
+            return infinite;
+        }
+
+        public boolean shouldShowIcon() {
+            return showIcon;
+        }
+
+        public String getInfiniteText() {
+            return infiniteText;
+        }
     }
 }

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;
 

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.bindings.SaturnIdentifier;
-import org.saturnclient.common.minecraft.bindings.SaturnItemStack;
+import org.saturnclient.common.bindings.SaturnItemStack;
-import org.saturnclient.common.minecraft.bindings.SaturnSprite;
+import org.saturnclient.common.bindings.SaturnSprite;
-import org.saturnclient.common.minecraft.render.IMatrixStack;
+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 */
+        /* 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,
+                        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,
+        public void drawTexture(SaturnIdentifier sprite, int x, int y, float u, float v, int width, int height,
-            int regionWith,
+                        int regionWith,
-            int regionHeight, int textureWidth, int textureHeight);
+                        int regionHeight, int textureWidth, int textureHeight);
 
-    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 regionWidth,
+                        int regionWidth,
-            int regionHeight, int textureWidth, int textureHeight, int color);
+                        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);
 }

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;

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;

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.MinecraftProvider;
-import org.saturnclient.common.minecraft.bindings.SaturnIdentifier;
+import org.saturnclient.common.bindings.SaturnIdentifier;
 import org.saturnclient.config.Config;
 import org.saturnclient.config.Theme;
 import org.saturnclient.ui.Element;

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;

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;

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.IMinecraftClient;
-import org.saturnclient.common.minecraft.MinecraftProvider;
+import org.saturnclient.common.MinecraftProvider;
-import org.saturnclient.common.minecraft.bindings.SaturnIdentifier;
+import org.saturnclient.common.bindings.SaturnIdentifier;
 import org.saturnclient.ui.Element;
 import org.saturnclient.ui.ElementContext;
 import org.saturnclient.ui.RenderScope;

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;

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;

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.MinecraftProvider;
-import org.saturnclient.common.minecraft.bindings.SaturnIdentifier;
+import org.saturnclient.common.bindings.SaturnIdentifier;
 
 public class Fonts {
     public static final SaturnIdentifier INTER = SaturnIdentifier.of("saturnclient", "inter");

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.IMinecraftClient;
-import org.saturnclient.common.minecraft.MinecraftProvider;
+import org.saturnclient.common.MinecraftProvider;
-import org.saturnclient.common.minecraft.bindings.SaturnIdentifier;
+import org.saturnclient.common.bindings.SaturnIdentifier;
 
 public class SvgTexture {
 

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",
+        public static final SaturnIdentifier CROSSHAIR_RANGE = new SaturnIdentifier("saturnclient",
-            "textures/gui/hud/crosshair_range.png");
+                        "textures/gui/hud/crosshair_range.png");
-    public static final SaturnIdentifier COSMETICS = new SaturnIdentifier("saturnclient",
+        public static final SaturnIdentifier COSMETICS = new SaturnIdentifier("saturnclient",
-            "textures/gui/components/cosmetics.png");
+                        "textures/gui/components/cosmetics.png");
-    public static final SaturnIdentifier HUD_ICON = new SaturnIdentifier("saturnclient",
+        public static final SaturnIdentifier HUD_ICON = new SaturnIdentifier("saturnclient",
-            "textures/gui/components/hud.png");
+                        "textures/gui/components/hud.png");
-    public static final SaturnIdentifier SEARCH = new SaturnIdentifier("saturnclient",
+        public static final SaturnIdentifier SEARCH = new SaturnIdentifier("saturnclient",
-            "textures/gui/components/search.png");
+                        "textures/gui/components/search.png");
-    public static final SaturnIdentifier CLOSE = new SaturnIdentifier("saturnclient",
+        public static final SaturnIdentifier CLOSE = new SaturnIdentifier("saturnclient",
-            "textures/gui/components/close.png");
+                        "textures/gui/components/close.png");
-    public static final SaturnIdentifier MODS_TAB = new SaturnIdentifier("saturnclient",
+        public static final SaturnIdentifier MODS_TAB = new SaturnIdentifier("saturnclient",
-            "textures/gui/components/mods_tab.png");
+                        "textures/gui/components/mods_tab.png");
-    public static final SaturnIdentifier SETTINGS = new SaturnIdentifier("saturnclient",
+        public static final SaturnIdentifier SETTINGS = new SaturnIdentifier("saturnclient",
-            "textures/gui/components/settings.png");
+                        "textures/gui/components/settings.png");
-    public static final SaturnIdentifier CLOAK = new SaturnIdentifier("saturnclient",
+        public static final SaturnIdentifier CLOAK = new SaturnIdentifier("saturnclient",
-            "textures/gui/components/cloak.png");
+                        "textures/gui/components/cloak.png");
-    public static final SaturnIdentifier HAT = new SaturnIdentifier("saturnclient", "textures/gui/components/hat.png");
+        public static final SaturnIdentifier HAT = new SaturnIdentifier("saturnclient",
-    public static final SaturnIdentifier RESET = new SaturnIdentifier("saturnclient",
+                        "textures/gui/components/hat.png");
-            "textures/gui/components/reset.png");
+        public static final SaturnIdentifier RESET = new SaturnIdentifier("saturnclient",
-    public static final SaturnIdentifier TOGGLE_INDICATOR = new SaturnIdentifier("saturnclient",
+                        "textures/gui/components/reset.png");
-            "textures/gui/components/toggle_indicator.png");
+        public static final SaturnIdentifier TOGGLE_INDICATOR = new SaturnIdentifier("saturnclient",
-    public static final SaturnIdentifier LEFT = new SaturnIdentifier("saturnclient",
+                        "textures/gui/components/toggle_indicator.png");
-            "textures/gui/components/left.png");
+        public static final SaturnIdentifier LEFT = new SaturnIdentifier("saturnclient",
-    public static final SaturnIdentifier RIGHT = new SaturnIdentifier("saturnclient",
+                        "textures/gui/components/left.png");
-            "textures/gui/components/right.png");
+        public static final SaturnIdentifier RIGHT = new SaturnIdentifier("saturnclient",
-    public static final SaturnIdentifier STORE = new SaturnIdentifier("saturnclient",
+                        "textures/gui/components/right.png");
-            "textures/gui/components/store.png");
+        public static final SaturnIdentifier STORE = new SaturnIdentifier("saturnclient",
-    public static final SaturnIdentifier COINS = new SaturnIdentifier("saturnclient",
+                        "textures/gui/components/store.png");
-            "textures/gui/components/coins.png");
+        public static final SaturnIdentifier COINS = new SaturnIdentifier("saturnclient",
-    public static final SaturnIdentifier SHIRT = new SaturnIdentifier("saturnclient",
+                        "textures/gui/components/coins.png");
-            "textures/gui/components/shirt.png");
+        public static final SaturnIdentifier SHIRT = new SaturnIdentifier("saturnclient",
-    public static final SaturnIdentifier CIRCLE_X = new SaturnIdentifier("saturnclient",
+                        "textures/gui/components/shirt.png");
-            "textures/gui/components/circle_x.png");
+        public static final SaturnIdentifier CIRCLE_X = new SaturnIdentifier("saturnclient",
-    public static final SaturnIdentifier INFO = new SaturnIdentifier("saturnclient",
+                        "textures/gui/components/circle_x.png");
-            "textures/gui/components/info.png");
+        public static final SaturnIdentifier INFO = new SaturnIdentifier("saturnclient",
-    public static final SaturnIdentifier CHECK = new SaturnIdentifier("saturnclient",
+                        "textures/gui/components/info.png");
-            "textures/gui/components/check.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 LOGO = new SaturnIdentifier("saturnclient", "textures/logo/logo.png");
-    public static final SaturnIdentifier REALISTIC_LOGO = new SaturnIdentifier("saturnclient",
+        public static final SaturnIdentifier REALISTIC_LOGO = new SaturnIdentifier("saturnclient",
-            "textures/logo/realistic.png");
+                        "textures/logo/realistic.png");
-    public static final SaturnIdentifier LOGO_TEXT = new SaturnIdentifier("saturnclient", "textures/logo/text.png");
+        public static final SaturnIdentifier LOGO_TEXT = new SaturnIdentifier("saturnclient", "textures/logo/text.png");
-    public static final SaturnIdentifier LOGO_TEXT_BIG = new SaturnIdentifier("saturnclient",
+        public static final SaturnIdentifier LOGO_TEXT_BIG = new SaturnIdentifier("saturnclient",
-            "textures/logo/text_big.png");
+                        "textures/logo/text_big.png");
-    public static final SaturnIdentifier SPLASH = new SaturnIdentifier("saturnclient", "textures/gui/splash.png");
+        public static final SaturnIdentifier SPLASH = new SaturnIdentifier("saturnclient", "textures/gui/splash.png");
 
-    // Widgets
+        // Widgets
-    public static final SaturnIdentifier BUTTON_BORDER = new SaturnIdentifier("saturnclient", "button_border");
+        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 = new SaturnIdentifier("saturnclient", "button");
-    public static final SaturnIdentifier BUTTON_OP = new SaturnIdentifier("saturnclient", "button_op");
+        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 SETTINGS_BG = new SaturnIdentifier("saturnclient", "settings_bg");
-    public static final SaturnIdentifier RECT = new SaturnIdentifier("saturnclient", "rect");
+        public static final SaturnIdentifier RECT = new SaturnIdentifier("saturnclient", "rect");
-    public static final SaturnIdentifier RECT_BORDER = new SaturnIdentifier("saturnclient", "rect_border");
+        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 = new SaturnIdentifier("saturnclient",
-    public static final SaturnIdentifier MOD_BG = new SaturnIdentifier("saturnclient",
+                        "textures/gui/components/mod.png");
-            "textures/gui/components/mod_bg.png");
+        public static final SaturnIdentifier MOD_BG = new SaturnIdentifier("saturnclient",
+                        "textures/gui/components/mod_bg.png");
 
-    public static SaturnIdentifier getCloakPreview(String cloak) {
+        public static SaturnIdentifier getCloakPreview(String cloak) {
-        return new SaturnIdentifier("saturnclient",
+                return new SaturnIdentifier("saturnclient",
-                "textures/gui/cloak/" + (cloak.isEmpty() ? "none" : cloak) + ".png");
+                                "textures/gui/cloak/" + (cloak.isEmpty() ? "none" : cloak) + ".png");
-    }
+        }
 
-    public static SaturnIdentifier getHatPreview(String hat) {
+        public static SaturnIdentifier getHatPreview(String hat) {
-        return new SaturnIdentifier("saturnclient", "textures/gui/hat/" + (hat.isEmpty() ? "none" : hat) + ".png");
+                return new SaturnIdentifier("saturnclient",
-    }
+                                "textures/gui/hat/" + (hat.isEmpty() ? "none" : hat) + ".png");
+        }
 
-    public static SaturnIdentifier getEmotePreview(String emote) {
+        public static SaturnIdentifier getEmotePreview(String emote) {
-        return new SaturnIdentifier("saturnclient", "textures/gui/emote/" + (emote == null ? "none" : emote) + ".png");
+                return new SaturnIdentifier("saturnclient",
-    }
+                                "textures/gui/emote/" + (emote == null ? "none" : emote) + ".png");
+        }
 
-    public static SaturnIdentifier getModIcon(String modId) {
+        public static SaturnIdentifier getModIcon(String modId) {
-        return new SaturnIdentifier("saturnclient", "textures/gui/mod/" + modId + ".svg");
+                return new SaturnIdentifier("saturnclient", "textures/gui/mod/" + modId + ".svg");
-    }
+        }
 
 }

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;

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;

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;

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.MinecraftProvider;
-import org.saturnclient.common.minecraft.MinecraftProvider.MinecraftScreen;
+import org.saturnclient.common.MinecraftProvider.MinecraftScreen;
 import org.saturnclient.config.AnimationConfig;
 import org.saturnclient.config.Config;
 import org.saturnclient.ui.SaturnScreen;

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.MinecraftProvider;
-import org.saturnclient.common.minecraft.MinecraftProvider;
 import org.saturnclient.config.AnimationConfig;
 import org.saturnclient.ui.SaturnScreen;
 import org.saturnclient.ui.anim.Fade;

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;

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;

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;