diff --git a/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/Emotes.java b/common/src/main/java/org/saturnclient/cosmetics/Emotes.java similarity index 100% rename from versions/1.21.4/src/main/java/org/saturnclient/cosmetics/Emotes.java rename to common/src/main/java/org/saturnclient/cosmetics/Emotes.java diff --git a/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/hat/Hats.java b/common/src/main/java/org/saturnclient/cosmetics/Hats.java similarity index 95% rename from versions/1.21.4/src/main/java/org/saturnclient/cosmetics/hat/Hats.java rename to common/src/main/java/org/saturnclient/cosmetics/Hats.java index 7dd9474..37a8f74 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/cosmetics/hat/Hats.java +++ b/common/src/main/java/org/saturnclient/cosmetics/Hats.java @@ -1,4 +1,4 @@ -package org.saturnclient.cosmetics.hat; +package org.saturnclient.cosmetics; import java.util.ArrayList; import java.util.List; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/EmoteWheel.java b/common/src/main/java/org/saturnclient/ui/screens/EmoteWheel.java similarity index 74% rename from versions/1.21.4/src/main/java/org/saturnclient/ui/screens/EmoteWheel.java rename to common/src/main/java/org/saturnclient/ui/screens/EmoteWheel.java index ecaedfe..1e10a31 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/EmoteWheel.java +++ b/common/src/main/java/org/saturnclient/ui/screens/EmoteWheel.java @@ -1,8 +1,8 @@ package org.saturnclient.ui.screens; import org.saturnclient.cosmetics.Emotes; -import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.client.ServiceClient; +import org.saturnclient.common.minecraft.bindings.SaturnClientBindings; import org.saturnclient.config.AnimationConfig; import org.saturnclient.config.Config; import org.saturnclient.ui.SaturnScreen; @@ -14,11 +14,6 @@ import org.saturnclient.ui.elements.ImageTexture; import org.saturnclient.ui.elements.TextureButton; import org.saturnclient.ui.resources.Textures; -import dev.kosmx.playerAnim.api.layered.AnimationStack; -import dev.kosmx.playerAnim.minecraftApi.PlayerAnimationAccess; -import dev.kosmx.playerAnim.minecraftApi.PlayerAnimationRegistry; -import net.minecraft.util.Identifier; - public class EmoteWheel extends SaturnScreen { int page = 1; @@ -87,26 +82,9 @@ public class EmoteWheel extends SaturnScreen { emoteStagger.draw( new TextureButton(Textures.getEmotePreview(emote), () -> { + if (emote != null) + SaturnClientBindings.emotes().setEmote(ServiceClient.uuid, emote); - if (emote == null) - return; - - AnimationStack animationStack = PlayerAnimationAccess.getPlayerAnimLayer( - SaturnClient.client.player); - - if (animationStack.isActive() - && animationStack.getPriority() == 1000) { - animationStack.removeLayer(1000); - } - - animationStack.addAnimLayer( - 1000, - PlayerAnimationRegistry - .getAnimation( - Identifier.of("saturnclient", emote)) - .playAnimation()); - - ServiceClient.emote(emote); provider.close(); }) .dimensions(70, 70) diff --git a/common/src/main/java/org/saturnclient/ui/screens/cosmetics/HatMenu.java b/common/src/main/java/org/saturnclient/ui/screens/cosmetics/HatMenu.java index 427ea7a..ac24d38 100644 --- a/common/src/main/java/org/saturnclient/ui/screens/cosmetics/HatMenu.java +++ b/common/src/main/java/org/saturnclient/ui/screens/cosmetics/HatMenu.java @@ -1,9 +1,9 @@ package org.saturnclient.ui.screens.cosmetics; import org.saturnclient.client.player.SaturnPlayer; -// import org.saturnclient.cosmetics.hat.Hats; import org.saturnclient.common.minecraft.MinecraftProvider; import org.saturnclient.config.AnimationConfig; +import org.saturnclient.cosmetics.Hats; import org.saturnclient.ui.SaturnScreen; import org.saturnclient.ui.anim.Fade; import org.saturnclient.ui.anim.SlideY; @@ -36,24 +36,23 @@ public class HatMenu extends SaturnScreen { AnimationStagger stagger = new AnimationStagger(AnimationConfig.cosmeticsMenu); if (player != null) { - // for (String hat : Hats.availableHats) { + for (String hat : Hats.availableHats) { + stagger.draw( + new CosmeticPreview( + hat == player.hat, + Textures.getHatPreview(hat), + () -> Hats.setHat(hat)) + .dimensions(50, 50) + .position((50 + g) * col, (50 + g) * row) + .animation(new SlideY(AnimationConfig.cosmeticsMenu, 14))); - // stagger.draw( - // new CosmeticPreview( - // hat == player.hat, - // Textures.getHatPreview(hat), - // () -> Hats.setHat(hat)) - // .dimensions(50, 50) - // .position((50 + g) * col, (50 + g) * row) - // .animation(new SlideY(AnimationConfig.cosmeticsMenu, 14))); - - // if (col == 5) { - // col = 0; - // row++; - // } else { - // col++; - // } - // } + if (col == 5) { + col = 0; + row++; + } else { + col++; + } + } } scroll.draw(stagger); diff --git a/common/src/main/java/org/saturnclient/ui/screens/store/HatStore.java b/common/src/main/java/org/saturnclient/ui/screens/store/HatStore.java index 1031c3a..f0fd11b 100644 --- a/common/src/main/java/org/saturnclient/ui/screens/store/HatStore.java +++ b/common/src/main/java/org/saturnclient/ui/screens/store/HatStore.java @@ -1,11 +1,11 @@ package org.saturnclient.ui.screens.store; -// import org.saturnclient.cosmetics.hat.Hats; 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; +import org.saturnclient.cosmetics.Hats; import org.saturnclient.ui.SaturnScreen; import org.saturnclient.ui.anim.Fade; import org.saturnclient.ui.anim.SlideY; @@ -50,44 +50,44 @@ public class HatStore extends SaturnScreen { AnimationStagger stagger = new AnimationStagger(AnimationConfig.cosmeticsMenu); if (player != null) { - // for (String hat : Hats.ALL_HATS) { - // if (!Hats.availableHats.contains(hat)) { + for (String hat : Hats.ALL_HATS) { + if (!Hats.availableHats.contains(hat)) { - // int x = (50 + gx) * col; - // int y = (50 + gy) * row; + int x = (50 + gx) * col; + int y = (50 + gy) * row; - // stagger.draw( - // new CosmeticPreview( - // hat == player.hat, - // Textures.getHatPreview(hat), - // () -> handlePurchase(hat)) - // .dimensions(50, 50) - // .position(x, y) - // .animation(new SlideY(AnimationConfig.cosmeticsMenu, 16))); + stagger.draw( + new CosmeticPreview( + hat == player.hat, + Textures.getHatPreview(hat), + () -> handlePurchase(hat)) + .dimensions(50, 50) + .position(x, y) + .animation(new SlideY(AnimationConfig.cosmeticsMenu, 16))); - // String t = "50"; + String t = "50"; - // stagger.draw( - // new Text(t) - // .position(x + Fonts.centerX(50, t, Theme.FONT.value), y + 53) - // .scale(0.5f) - // .animation(new Fade(400))); + stagger.draw( + new Text(t) + .position(x + Fonts.centerX(50, t, Theme.FONT.value), y + 53) + .scale(0.5f) + .animation(new Fade(400))); - // stagger.draw( - // new ImageTexture(Textures.COINS) - // .dimensions(16, 16) - // .position(x + Fonts.getWidth(t, Theme.FONT.value) + 4, y + 52) - // .scale(0.5f) - // .animation(new Fade(400))); + stagger.draw( + new ImageTexture(Textures.COINS) + .dimensions(16, 16) + .position(x + Fonts.getWidth(t, Theme.FONT.value) + 4, y + 52) + .scale(0.5f) + .animation(new Fade(400))); - // if (col == 8) { - // col = 0; - // row++; - // } else { - // col++; - // } - // } - // } + if (col == 8) { + col = 0; + row++; + } else { + col++; + } + } + } } scroll.draw(stagger); diff --git a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java index 5ec6abc..7796565 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java @@ -7,8 +7,8 @@ import net.minecraft.client.MinecraftClient; import org.saturnclient.client.ServiceClient; import org.saturnclient.cosmetics.Emotes; +import org.saturnclient.cosmetics.Hats; 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;