diff --git a/src/main/java/org/saturnclient/saturnclient/client/ServiceClient.java b/src/main/java/org/saturnclient/saturnclient/client/ServiceClient.java index 74b2cf3..82ba54b 100644 --- a/src/main/java/org/saturnclient/saturnclient/client/ServiceClient.java +++ b/src/main/java/org/saturnclient/saturnclient/client/ServiceClient.java @@ -104,4 +104,12 @@ public class ServiceClient { SaturnClient.LOGGER.error("Failed to buy hat (service): ", e); } } + + public static void emote(String emote) { + try { + session.request(ServiceMethods.Emote, emote).get(); + } catch (Exception e) { + SaturnClient.LOGGER.error("Failed to emote (service): ", e); + } + } } diff --git a/src/main/java/org/saturnclient/saturnclient/client/ServiceMethods.java b/src/main/java/org/saturnclient/saturnclient/client/ServiceMethods.java index fb10ae9..7eb9dea 100644 --- a/src/main/java/org/saturnclient/saturnclient/client/ServiceMethods.java +++ b/src/main/java/org/saturnclient/saturnclient/client/ServiceMethods.java @@ -20,4 +20,8 @@ public class ServiceMethods { String.class, String.class, String.class); public static final Method BuyHat = new Method<>("buy_hat", String.class, String.class, String.class); + + // Emote + public static final Method Emote = new Method<>("emote", + String.class, String.class, String.class); } \ No newline at end of file diff --git a/src/main/java/org/saturnclient/ui2/screens/EmoteWheel.java b/src/main/java/org/saturnclient/ui2/screens/EmoteWheel.java index 73ba8d4..6e4ad52 100644 --- a/src/main/java/org/saturnclient/ui2/screens/EmoteWheel.java +++ b/src/main/java/org/saturnclient/ui2/screens/EmoteWheel.java @@ -2,8 +2,7 @@ package org.saturnclient.ui2.screens; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClientConfig; -import org.saturnclient.saturnclient.auth.Auth; -// import org.saturnclient.saturnclient.auth.Auth; +import org.saturnclient.saturnclient.client.ServiceClient; import org.saturnclient.saturnclient.cosmetics.Emotes; import org.saturnclient.ui2.SaturnScreen; import org.saturnclient.ui2.Utils; @@ -71,7 +70,7 @@ public class EmoteWheel extends SaturnScreen { animationStack.addAnimLayer(1000, PlayerAnimationRegistry.getAnimation(Identifier.of("saturnclient", emote)).playAnimation()); - Auth.emote(emote); + ServiceClient.emote(emote); close(); }).dimensions(70, 70).centerOffset(width, height, -80 + (col * 80), -35 + (row * 80)) .animation(new Fade(700)));