Client stuff

common/src/main/java/org/saturnclient/client/ServiceClient.java

@@ -0,0 +1,198 @@
+package org.saturnclient.client;
+
+import java.util.UUID;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import org.saturnclient.client.player.SaturnPlayer;
+import org.saturnclient.common.minecraft.bindings.SaturnClientBindings;
+
+import dev.selimaj.session.Session;
+
+public class ServiceClient {
+    private static Session session;
+    public static UUID uuid;
+
+    public static final List<String> availableCloaks = new ArrayList<>();
+    public static final List<String> availableHats = new ArrayList<>();
+
+    public static boolean connectTimeout() {
+        try {
+            session = Session.connect("wss://saturn-server.selimaj.dev", 10, TimeUnit.SECONDS);
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    public static boolean authenticate() {
+        SaturnClientBindings.platform().onClientStopping(() -> {
+            if (session != null) {
+                try {
+                    session.close();
+                } catch (Exception e) {
+                    SaturnClientBindings.platform().logError("Unable to close Saturn session", e);
+                }
+            }
+        });
+
+        try {
+            String accessToken = SaturnClientBindings.platform().getAccessToken();
+            uuid = SaturnClientBindings.platform().getUuid();
+            String username = SaturnClientBindings.platform().getUsername();
+
+            if (accessToken == null || uuid == null || username == null) {
+                SaturnClientBindings.platform().logError("No active Minecraft session found");
+                return false;
+            }
+
+            SaturnClientBindings.platform().logInfo("Authenticating with UUID: " + uuid);
+
+            if (!connectTimeout()) {
+                SaturnClientBindings.platform().logError("Unable to authenticate: Session Server Timeout");
+                return false;
+            }
+
+            ServiceMethods.Types.Player response = session.request(ServiceMethods.Authenticate, accessToken)
+                    .get();
+
+            for (String availableCloak : response.cloaks()) {
+                availableCloaks.add(availableCloak);
+            }
+
+            for (String availableHat : response.hats()) {
+                availableHats.add(availableHat);
+            }
+
+            eventHandlers();
+
+            SaturnPlayer.set(new SaturnPlayer(uuid, username, response.cloak(), response.hat()));
+
+            return true;
+        } catch (Exception e) {
+            SaturnClientBindings.platform().logError("Authentication failed", e);
+            return false;
+        }
+    }
+
+    public static void setCloak(String itemId) {
+        try {
+            session.request(ServiceMethods.SetCloak, itemId).whenComplete((msg, throwable) -> {
+                if (throwable != null) {
+                    throwable.printStackTrace();
+                } else {
+                    try {
+                        session.request(ServiceMethods.SendPlayer,
+                                new ServiceMethods.Types.SendPlayerRequest(SaturnPlayer.getExternalUUIDAsString()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            });
+        } catch (Exception e) {
+            SaturnClientBindings.platform().logError("Failed to set cloak (service): ", e);
+        }
+    }
+
+    public static void setHat(String itemId) {
+        try {
+            session.request(ServiceMethods.SetHat, itemId).whenComplete((msg, throwable) -> {
+                if (throwable != null) {
+                    throwable.printStackTrace();
+                } else {
+                    try {
+                        session.request(ServiceMethods.SendPlayer,
+                                new ServiceMethods.Types.SendPlayerRequest(SaturnPlayer.getExternalUUIDAsString()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            });
+        } catch (Exception e) {
+            SaturnClientBindings.platform().logError("Failed to set hat (service): ", e);
+        }
+    }
+
+    public static void buyCloak(String itemId) {
+        try {
+            session.request(ServiceMethods.BuyCloak, itemId).whenComplete((msg, throwable) -> {
+                if (throwable != null) {
+                    throwable.printStackTrace();
+                } else {
+                    availableCloaks.add(itemId);
+                }
+            });
+        } catch (Exception e) {
+            SaturnClientBindings.platform().logError("Failed to buy cloak (service): ", e);
+        }
+    }
+
+    public static void buyHat(String itemId) {
+        try {
+            session.request(ServiceMethods.BuyHat, itemId).whenComplete((msg, throwable) -> {
+                if (throwable != null) {
+                    throwable.printStackTrace();
+                } else {
+                    availableHats.add(itemId);
+                }
+            });
+        } catch (Exception e) {
+            SaturnClientBindings.platform().logError("Failed to buy hat (service): ", e);
+        }
+    }
+
+    public static void emote(String emote) {
+        try {
+            session.request(ServiceMethods.Emote,
+                    new ServiceMethods.Types.EmoteRequest(emote, SaturnPlayer.getExternalUUIDAsString()))
+                    .whenComplete((msg, throwable) -> {
+                        if (throwable != null) {
+                            throwable.printStackTrace();
+                        }
+                    });
+        } catch (Exception e) {
+            SaturnClientBindings.platform().logError("Failed to emote (service): ", e);
+        }
+    }
+
+    public static void eventHandlers() {
+        session.onNotification(ServiceMethods.EmoteEvent, (data) -> {
+            if (data == null) {
+                return;
+            }
+            UUID from;
+            try {
+                from = UUID.fromString(data.from());
+            } catch (Exception e) {
+                return;
+            }
+
+            if (data.emote() != null && !data.emote().isEmpty()) {
+                SaturnClientBindings.emotes().setEmote(from, data.emote());
+            } else {
+                SaturnClientBindings.emotes().setEmote(from, null);
+            }
+        });
+
+        session.onNotification(ServiceMethods.Player, (player) -> {
+            System.out.println(player);
+            SaturnPlayer.set(player.toSaturnPlayer());
+        });
+    }
+
+    public static void player(UUID uuid, String name) {
+        try {
+            session.request(ServiceMethods.GetPlayer, uuid.toString())
+                    .whenComplete((user, throwable) -> {
+                        if (throwable != null) {
+                            throwable.printStackTrace();
+                        } else if (user != null) {
+                            SaturnPlayer.set(user.toSaturnPlayer(uuid, name));
+                        }
+                    });
+        } catch (Exception e) {
+            SaturnClientBindings.platform().logError("Failed to get player", e);
+        }
+    }
+}

common/src/main/java/org/saturnclient/client/ServiceMethods.java

@@ -0,0 +1,113 @@
+package org.saturnclient.client;
+
+import java.util.UUID;
+
+import org.saturnclient.client.ServiceMethods.Types.SendPlayerRequest;
+import org.saturnclient.client.player.SaturnPlayer;
+
+import dev.selimaj.session.types.Method;
+
+public class ServiceMethods {
+
+    // =========================
+    // Types (Rust structs)
+    // =========================
+    public static class Types {
+
+        public record EmoteRequest(String emote, String[] targets) {
+        }
+
+        public record EmoteEvent(String emote, String from) {
+        }
+
+        public record Player(
+                String cloak,
+                String hat,
+                String[] cloaks,
+                String[] hats) {
+            public SaturnPlayer toSaturnPlayer(UUID uuid, String name) {
+                return new SaturnPlayer(uuid, name, cloak, hat);
+            }
+        }
+
+        public record PlayerStream(Player player, String name, String uuid) {
+            public SaturnPlayer toSaturnPlayer() {
+                return new SaturnPlayer(UUID.fromString(uuid), name, this.player.cloak, this.player.hat);
+            }
+        }
+
+        public record SendPlayerRequest(String[] targets) {
+        }
+    }
+
+    // =========================
+    // AUTH
+    // =========================
+    public static final Method<String, Types.Player, String> Authenticate = new Method<>("auth",
+            String.class,
+            Types.Player.class,
+            String.class);
+
+    // =========================
+    // EQUIP
+    // =========================
+    public static final Method<String, String, String> SetCloak = new Method<>("set_cloak",
+            String.class,
+            String.class,
+            String.class);
+
+    public static final Method<String, String, String> SetHat = new Method<>("set_hat",
+            String.class,
+            String.class,
+            String.class);
+
+    // =========================
+    // BUY
+    // =========================
+    public static final Method<String, String, String> BuyCloak = new Method<>("buy_cloak",
+            String.class,
+            String.class,
+            String.class);
+
+    public static final Method<String, String, String> BuyHat = new Method<>("buy_hat",
+            String.class,
+            String.class,
+            String.class);
+
+    // =========================
+    // EMOTE
+    // =========================
+    public static final Method<Types.EmoteRequest, Void, String> Emote = new Method<>("emote",
+            Types.EmoteRequest.class,
+            Void.class,
+            String.class);
+
+    public static final Method<Types.EmoteEvent, Void, Void> EmoteEvent = new Method<>("emote_event",
+            Types.EmoteEvent.class,
+            Void.class,
+            Void.class);
+
+    // =========================
+    // GET PLAYER
+    // =========================
+    public static final Method<String, Types.Player, String> GetPlayer = new Method<>("get_player",
+            String.class,
+            Types.Player.class,
+            String.class);
+
+    // =========================
+    // PLAYER (Server Notification)
+    // =========================
+    public static final Method<Types.PlayerStream, Void, Void> Player = new Method<>("player",
+            Types.PlayerStream.class,
+            Void.class,
+            Void.class);
+
+    // =========================
+    // SEND PLAYER
+    // =========================
+    public static final Method<SendPlayerRequest, Void, String> SendPlayer = new Method<>("send_player",
+            SendPlayerRequest.class,
+            Void.class,
+            String.class);
+}

common/src/main/java/org/saturnclient/client/player/Roles.java

@@ -0,0 +1,59 @@
+package org.saturnclient.client.player;
+
+import java.util.Map;
+import java.util.UUID;
+
+import org.saturnclient.config.Config;
+
+public class Roles {
+    static enum Role {
+        OWNER,
+        ADMIN,
+        PARTNER,
+        CONTRIBUTOR
+    }
+
+    private static final Map<UUID, Role> ROLES = Map.of(
+            UUID.fromString("d362a042-28bd-49e1-a807-ae74dbe8aba9"),
+            Role.OWNER,
+            UUID.fromString("d8dc7023-179b-4460-bcf6-493fbf1289a6"),
+            Role.CONTRIBUTOR);
+
+    /*
+     * Gets the icon color of a specific individual, here are the different colors
+     * 
+     * - Owner: Dark Red
+     * - Admin: Red
+     * - Partners: Gold
+     * - Contributor: Aqua
+     * - Other/player: White
+     */
+    public static int getIconColor(UUID uuid) {
+        Role role = ROLES.get(uuid);
+
+        if (role == null) {
+            return 0xFFFFFF;
+        }
+
+        switch (role) {
+            case OWNER:
+                return 0xAA0000;
+
+            case ADMIN:
+                return 0xFF5555;
+
+            case PARTNER:
+                return 0xFFAA00;
+
+            case CONTRIBUTOR:
+                return 0x55FFFF;
+
+            default:
+                return 0xFFFFFF;
+        }
+    }
+
+    public static String getSaturnIndicator() {
+        return Config.realisticLogo.value ? "\uE003" : "\uE002";
+    }
+}

common/src/main/java/org/saturnclient/client/player/SaturnPlayer.java

@@ -0,0 +1,55 @@
+package org.saturnclient.client.player;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import org.saturnclient.common.minecraft.bindings.SaturnClientBindings;
+
+public class SaturnPlayer {
+    private static Map<UUID, SaturnPlayer> PLAYERS = new HashMap<>();
+    private static Map<String, UUID> PLAYER_NAMES = new HashMap<>();
+
+    public String cloak = "";
+    public String hat = "";
+    public final UUID uuid;
+    public final String name;
+
+    public SaturnPlayer(UUID uuid, String name, String cloak, String hat) {
+        this.cloak = cloak;
+        this.hat = hat;
+        this.uuid = uuid;
+        this.name = name;
+    }
+
+    public static SaturnPlayer get() {
+        UUID self = SaturnClientBindings.platform().getUuid();
+        if (self == null) {
+            return null;
+        }
+        return PLAYERS.get(self);
+    }
+
+    public static SaturnPlayer get(UUID uuid) {
+        return PLAYERS.get(uuid);
+    }
+
+    public static SaturnPlayer get(String name) {
+        UUID uuid = PLAYER_NAMES.get(name);
+        if (uuid == null)
+            return null;
+        return PLAYERS.get(uuid);
+    }
+
+    public static void set(SaturnPlayer player) {
+        PLAYER_NAMES.put(player.name, player.uuid);
+        PLAYERS.put(player.uuid, player);
+    }
+
+    public static String[] getExternalUUIDAsString() {
+        UUID self = SaturnClientBindings.platform().getUuid();
+        return PLAYERS.keySet().stream().filter(id -> self == null || !id.equals(self)).map(UUID::toString)
+                .toArray(String[]::new);
+    }
+
+}

common/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnClientBindings.java

@@ -0,0 +1,31 @@
+package org.saturnclient.common.minecraft.bindings;
+
+public final class SaturnClientBindings {
+    private static SaturnPlatformBindings platform;
+    private static SaturnEmoteBindings emotes;
+
+    private SaturnClientBindings() {
+    }
+
+    public static void setPlatform(SaturnPlatformBindings bindings) {
+        platform = bindings;
+    }
+
+    public static SaturnPlatformBindings platform() {
+        if (platform == null) {
+            throw new IllegalStateException("SaturnPlatformBindings not initialized");
+        }
+        return platform;
+    }
+
+    public static void setEmotes(SaturnEmoteBindings bindings) {
+        emotes = bindings;
+    }
+
+    public static SaturnEmoteBindings emotes() {
+        if (emotes == null) {
+            throw new IllegalStateException("SaturnEmoteBindings not initialized");
+        }
+        return emotes;
+    }
+}

common/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnEmoteBindings.java

@@ -0,0 +1,7 @@
+package org.saturnclient.common.minecraft.bindings;
+
+import java.util.UUID;
+
+public interface SaturnEmoteBindings {
+    void setEmote(UUID fromPlayerUuid, String emoteIdOrNull);
+}

common/src/main/java/org/saturnclient/common/minecraft/bindings/SaturnPlatformBindings.java

@@ -0,0 +1,19 @@
+package org.saturnclient.common.minecraft.bindings;
+
+import java.util.UUID;
+
+public interface SaturnPlatformBindings {
+    String getAccessToken();
+
+    UUID getUuid();
+
+    String getUsername();
+
+    void onClientStopping(Runnable handler);
+
+    void logInfo(String message);
+
+    void logError(String message);
+
+    void logError(String message, Throwable throwable);
+}

versions/1.21.4/src/main/java/org/saturnclient/cosmetics/cloak/Cloaks.java

@@ -2,8 +2,8 @@ package org.saturnclient.cosmetics.cloak;
 
 import net.minecraft.util.Identifier;
 
-import org.saturnclient.saturnclient.client.ServiceClient;
-import org.saturnclient.saturnclient.client.player.SaturnPlayer;
+import org.saturnclient.client.ServiceClient;
+import org.saturnclient.client.player.SaturnPlayer;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;

versions/1.21.4/src/main/java/org/saturnclient/cosmetics/hat/Hats.java

@@ -4,8 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
-import org.saturnclient.saturnclient.client.ServiceClient;
-import org.saturnclient.saturnclient.client.player.SaturnPlayer;
+import org.saturnclient.client.ServiceClient;
+import org.saturnclient.client.player.SaturnPlayer;
 
 public class Hats {
     public static final String[] ALL_HATS = { "horns_black", "horns_white", "halo", "halo_black" };

versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java

@@ -5,16 +5,19 @@ import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.minecraft.client.MinecraftClient;
 
+import org.saturnclient.client.ServiceClient;
 import org.saturnclient.cosmetics.Emotes;
 import org.saturnclient.cosmetics.cloak.Cloaks;
 import org.saturnclient.cosmetics.hat.Hats;
+import org.saturnclient.common.minecraft.bindings.SaturnClientBindings;
 import org.saturnclient.impl.FabricModuleProvider;
 import org.saturnclient.impl.SaturnClientProvider;
 import org.saturnclient.modules.ModManager;
-import org.saturnclient.saturnclient.client.ServiceClient;
 import org.saturnclient.common.minecraft.MinecraftProvider;
 import org.saturnclient.config.Config;
 import org.saturnclient.config.manager.ConfigManager;
+import org.saturnclient.saturnclient.bindings.SaturnEmoteBindingsImpl;
+import org.saturnclient.saturnclient.bindings.SaturnPlatformBindingsImpl;
 import org.saturnclient.saturnclient.event.KeyInputHandler;
 import org.saturnclient.ui.ElementRenderer;
 import org.saturnclient.ui.SaturnScreenFabric;
@@ -47,6 +50,9 @@ public class SaturnClient implements ModInitializer {
             SaturnScreenFabric.preload(client);
         });
 
+        SaturnClientBindings.setPlatform(new SaturnPlatformBindingsImpl());
+        SaturnClientBindings.setEmotes(new SaturnEmoteBindingsImpl());
+
         ClientLifecycleEvents.CLIENT_STOPPING.register(_o -> ConfigManager.save());
 
         ClientTickEvents.END_CLIENT_TICK.register(client -> {

versions/1.21.4/src/main/java/org/saturnclient/saturnclient/bindings/SaturnEmoteBindingsImpl.java

@@ -0,0 +1,44 @@
+package org.saturnclient.saturnclient.bindings;
+
+import java.util.UUID;
+
+import org.saturnclient.common.minecraft.bindings.SaturnEmoteBindings;
+import org.saturnclient.saturnclient.SaturnClient;
+
+import dev.kosmx.playerAnim.api.layered.AnimationStack;
+import dev.kosmx.playerAnim.minecraftApi.PlayerAnimationAccess;
+import dev.kosmx.playerAnim.minecraftApi.PlayerAnimationRegistry;
+import net.minecraft.client.network.AbstractClientPlayerEntity;
+import net.minecraft.util.Identifier;
+
+public class SaturnEmoteBindingsImpl implements SaturnEmoteBindings {
+
+    @Override
+    public void setEmote(UUID fromPlayerUuid, String emoteIdOrNull) {
+        if (SaturnClient.client == null || SaturnClient.client.world == null) {
+            return;
+        }
+
+        for (AbstractClientPlayerEntity player : SaturnClient.client.world.getPlayers()) {
+            if (!player.getUuid().equals(fromPlayerUuid)) {
+                continue;
+            }
+
+            AnimationStack animationStack = PlayerAnimationAccess.getPlayerAnimLayer(player);
+
+            if (emoteIdOrNull != null && !emoteIdOrNull.isEmpty()) {
+                if (animationStack.isActive() && animationStack.getPriority() == 1000) {
+                    animationStack.removeLayer(1000);
+                }
+                animationStack.addAnimLayer(1000,
+                        PlayerAnimationRegistry
+                                .getAnimation(Identifier.of("saturnclient", emoteIdOrNull))
+                                .playAnimation());
+            } else {
+                animationStack.removeLayer(1000);
+            }
+
+            break;
+        }
+    }
+}

versions/1.21.4/src/main/java/org/saturnclient/saturnclient/bindings/SaturnPlatformBindingsImpl.java

@@ -0,0 +1,59 @@
+package org.saturnclient.saturnclient.bindings;
+
+import java.util.UUID;
+
+import org.saturnclient.common.minecraft.bindings.SaturnPlatformBindings;
+import org.saturnclient.saturnclient.SaturnClient;
+
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
+import net.minecraft.client.MinecraftClient;
+
+public class SaturnPlatformBindingsImpl implements SaturnPlatformBindings {
+
+    @Override
+    public String getAccessToken() {
+        var session = MinecraftClient.getInstance().getSession();
+        if (session == null) {
+            return null;
+        }
+        return session.getAccessToken();
+    }
+
+    @Override
+    public UUID getUuid() {
+        var session = MinecraftClient.getInstance().getSession();
+        if (session == null) {
+            return null;
+        }
+        return session.getUuidOrNull();
+    }
+
+    @Override
+    public String getUsername() {
+        var session = MinecraftClient.getInstance().getSession();
+        if (session == null) {
+            return null;
+        }
+        return session.getUsername();
+    }
+
+    @Override
+    public void onClientStopping(Runnable handler) {
+        ClientLifecycleEvents.CLIENT_STOPPING.register(_o -> handler.run());
+    }
+
+    @Override
+    public void logInfo(String message) {
+        SaturnClient.LOGGER.info(message);
+    }
+
+    @Override
+    public void logError(String message) {
+        SaturnClient.LOGGER.error(message);
+    }
+
+    @Override
+    public void logError(String message, Throwable throwable) {
+        SaturnClient.LOGGER.error(message, throwable);
+    }
+}

versions/1.21.4/src/main/java/org/saturnclient/saturnclient/client/player/PlayerTracker.java

@@ -3,7 +3,7 @@ package org.saturnclient.saturnclient.client.player;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.saturnclient.client.ServiceClient;
+import org.saturnclient.client.ServiceClient;
 
 import net.minecraft.client.network.PlayerListEntry;
 import net.minecraft.client.MinecraftClient;

versions/1.21.4/src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java

@@ -5,10 +5,10 @@ import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.InputUtil;
 
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.saturnclient.client.ServiceClient;
 import org.saturnclient.common.minecraft.MinecraftProvider;
 import org.saturnclient.config.Config;
+import org.saturnclient.client.ServiceClient;
+import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.ui.screens.EmoteWheel;
 import org.saturnclient.ui.screens.ShiftMenu;
 

versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java

@@ -14,8 +14,8 @@ import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.math.Vec3d;
 
-import org.saturnclient.saturnclient.client.player.Roles;
-import org.saturnclient.saturnclient.client.player.SaturnPlayer;
+import org.saturnclient.client.player.Roles;
+import org.saturnclient.client.player.SaturnPlayer;
 
 import java.util.UUID;
 

versions/1.21.4/src/main/java/org/saturnclient/saturnclient/mixin/TabListMixin.java

@@ -7,8 +7,8 @@ import net.minecraft.util.Formatting;
 import java.util.UUID;
 
 import org.jetbrains.annotations.Nullable;
-import org.saturnclient.saturnclient.client.player.Roles;
-import org.saturnclient.saturnclient.client.player.SaturnPlayer;
+import org.saturnclient.client.player.Roles;
+import org.saturnclient.client.player.SaturnPlayer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;

versions/1.21.4/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.saturnclient.SaturnClient;
-import org.saturnclient.saturnclient.client.ServiceClient;
+import org.saturnclient.client.ServiceClient;
 import org.saturnclient.config.AnimationConfig;
 import org.saturnclient.config.Config;
 import org.saturnclient.ui.SaturnScreen;

versions/1.21.4/src/main/java/org/saturnclient/ui/screens/cosmetics/CloakMenu.java

@@ -1,7 +1,8 @@
 package org.saturnclient.ui.screens.cosmetics;
 
+import org.saturnclient.client.ServiceClient;
+import org.saturnclient.client.player.SaturnPlayer;
 import org.saturnclient.cosmetics.cloak.Cloaks;
-import org.saturnclient.saturnclient.client.player.SaturnPlayer;
 import org.saturnclient.common.minecraft.MinecraftProvider;
 import org.saturnclient.config.AnimationConfig;
 import org.saturnclient.ui.SaturnScreen;

versions/1.21.4/src/main/java/org/saturnclient/ui/screens/cosmetics/HatMenu.java

@@ -1,7 +1,8 @@
 package org.saturnclient.ui.screens.cosmetics;
 
+import org.saturnclient.client.ServiceClient;
+import org.saturnclient.client.player.SaturnPlayer;
 import org.saturnclient.cosmetics.hat.Hats;
-import org.saturnclient.saturnclient.client.player.SaturnPlayer;
 import org.saturnclient.common.minecraft.MinecraftProvider;
 import org.saturnclient.config.AnimationConfig;
 import org.saturnclient.ui.SaturnScreen;

versions/1.21.4/src/main/java/org/saturnclient/ui/screens/store/CloakStore.java

@@ -1,8 +1,8 @@
 package org.saturnclient.ui.screens.store;
 
 import org.saturnclient.cosmetics.cloak.Cloaks;
-import org.saturnclient.saturnclient.client.ServiceClient;
-import org.saturnclient.saturnclient.client.player.SaturnPlayer;
+import org.saturnclient.client.ServiceClient;
+import org.saturnclient.client.player.SaturnPlayer;
 import org.saturnclient.common.minecraft.MinecraftProvider;
 import org.saturnclient.config.AnimationConfig;
 import org.saturnclient.config.Theme;

versions/1.21.4/src/main/java/org/saturnclient/ui/screens/store/HatStore.java

@@ -1,8 +1,8 @@
 package org.saturnclient.ui.screens.store;
 
 import org.saturnclient.cosmetics.hat.Hats;
-import org.saturnclient.saturnclient.client.ServiceClient;
-import org.saturnclient.saturnclient.client.player.SaturnPlayer;
+import org.saturnclient.client.ServiceClient;
+import org.saturnclient.client.player.SaturnPlayer;
 import org.saturnclient.common.minecraft.MinecraftProvider;
 import org.saturnclient.config.AnimationConfig;
 import org.saturnclient.config.Theme;