saturnclientmc/saturnclient
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Moved hats and emotes to common

Browse Source
This commit is contained in:
selimaj-dev
2026-03-07 18:19:18 +01:00
parent 4ddd650102
commit b59c2ba705
6 changed files with 55 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
versions/1.21.4/src/main/java/org/saturnclient/cosmetics/Emotes.java → common/src/main/java/org/saturnclient/cosmetics/Emotes.java
View File
versions/1.21.4/src/main/java/org/saturnclient/cosmetics/hat/Hats.java → common/src/main/java/org/saturnclient/cosmetics/Hats.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.saturnclient.cosmetics.hat; package org.saturnclient.cosmetics;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
versions/1.21.4/src/main/java/org/saturnclient/ui/screens/EmoteWheel.java → common/src/main/java/org/saturnclient/ui/screens/EmoteWheel.java
+3 -25
View File
@@ -1,8 +1,8 @@
package org.saturnclient.ui.screens; package org.saturnclient.ui.screens;
import org.saturnclient.cosmetics.Emotes; import org.saturnclient.cosmetics.Emotes;
import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.client.ServiceClient; import org.saturnclient.client.ServiceClient;
import org.saturnclient.common.minecraft.bindings.SaturnClientBindings;
import org.saturnclient.config.AnimationConfig; import org.saturnclient.config.AnimationConfig;
import org.saturnclient.config.Config; import org.saturnclient.config.Config;
import org.saturnclient.ui.SaturnScreen; 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.elements.TextureButton;
import org.saturnclient.ui.resources.Textures; 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 { public class EmoteWheel extends SaturnScreen {
int page = 1; int page = 1;
@@ -87,26 +82,9 @@ public class EmoteWheel extends SaturnScreen {
emoteStagger.draw( emoteStagger.draw(
new TextureButton(Textures.getEmotePreview(emote), () -> { 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(); provider.close();
}) })
.dimensions(70, 70) .dimensions(70, 70)
common/src/main/java/org/saturnclient/ui/screens/cosmetics/HatMenu.java
+17 -18
View File
@@ -1,9 +1,9 @@
package org.saturnclient.ui.screens.cosmetics; package org.saturnclient.ui.screens.cosmetics;
import org.saturnclient.client.player.SaturnPlayer; import org.saturnclient.client.player.SaturnPlayer;
// import org.saturnclient.cosmetics.hat.Hats;
import org.saturnclient.common.minecraft.MinecraftProvider; import org.saturnclient.common.minecraft.MinecraftProvider;
import org.saturnclient.config.AnimationConfig; import org.saturnclient.config.AnimationConfig;
import org.saturnclient.cosmetics.Hats;
import org.saturnclient.ui.SaturnScreen; import org.saturnclient.ui.SaturnScreen;
import org.saturnclient.ui.anim.Fade; import org.saturnclient.ui.anim.Fade;
import org.saturnclient.ui.anim.SlideY; import org.saturnclient.ui.anim.SlideY;
@@ -36,24 +36,23 @@ public class HatMenu extends SaturnScreen {
AnimationStagger stagger = new AnimationStagger(AnimationConfig.cosmeticsMenu); AnimationStagger stagger = new AnimationStagger(AnimationConfig.cosmeticsMenu);
if (player != null) { 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( if (col == 5) {
// new CosmeticPreview( col = 0;
// hat == player.hat, row++;
// Textures.getHatPreview(hat), } else {
// () -> Hats.setHat(hat)) col++;
// .dimensions(50, 50) }
// .position((50 + g) * col, (50 + g) * row) }
// .animation(new SlideY(AnimationConfig.cosmeticsMenu, 14)));
// if (col == 5) {
// col = 0;
// row++;
// } else {
// col++;
// }
// }
} }
scroll.draw(stagger); scroll.draw(stagger);
common/src/main/java/org/saturnclient/ui/screens/store/HatStore.java
+33 -33
View File
@@ -1,11 +1,11 @@
package org.saturnclient.ui.screens.store; package org.saturnclient.ui.screens.store;
// import org.saturnclient.cosmetics.hat.Hats;
import org.saturnclient.client.ServiceClient; import org.saturnclient.client.ServiceClient;
import org.saturnclient.client.player.SaturnPlayer; import org.saturnclient.client.player.SaturnPlayer;
import org.saturnclient.common.minecraft.MinecraftProvider; import org.saturnclient.common.minecraft.MinecraftProvider;
import org.saturnclient.config.AnimationConfig; import org.saturnclient.config.AnimationConfig;
import org.saturnclient.config.Theme; import org.saturnclient.config.Theme;
import org.saturnclient.cosmetics.Hats;
import org.saturnclient.ui.SaturnScreen; import org.saturnclient.ui.SaturnScreen;
import org.saturnclient.ui.anim.Fade; import org.saturnclient.ui.anim.Fade;
import org.saturnclient.ui.anim.SlideY; import org.saturnclient.ui.anim.SlideY;
@@ -50,44 +50,44 @@ public class HatStore extends SaturnScreen {
AnimationStagger stagger = new AnimationStagger(AnimationConfig.cosmeticsMenu); AnimationStagger stagger = new AnimationStagger(AnimationConfig.cosmeticsMenu);
if (player != null) { if (player != null) {
// for (String hat : Hats.ALL_HATS) { for (String hat : Hats.ALL_HATS) {
// if (!Hats.availableHats.contains(hat)) { if (!Hats.availableHats.contains(hat)) {
// int x = (50 + gx) * col; int x = (50 + gx) * col;
// int y = (50 + gy) * row; int y = (50 + gy) * row;
// stagger.draw( stagger.draw(
// new CosmeticPreview( new CosmeticPreview(
// hat == player.hat, hat == player.hat,
// Textures.getHatPreview(hat), Textures.getHatPreview(hat),
// () -> handlePurchase(hat)) () -> handlePurchase(hat))
// .dimensions(50, 50) .dimensions(50, 50)
// .position(x, y) .position(x, y)
// .animation(new SlideY(AnimationConfig.cosmeticsMenu, 16))); .animation(new SlideY(AnimationConfig.cosmeticsMenu, 16)));
// String t = "50"; String t = "50";
// stagger.draw( stagger.draw(
// new Text(t) new Text(t)
// .position(x + Fonts.centerX(50, t, Theme.FONT.value), y + 53) .position(x + Fonts.centerX(50, t, Theme.FONT.value), y + 53)
// .scale(0.5f) .scale(0.5f)
// .animation(new Fade(400))); .animation(new Fade(400)));
// stagger.draw( stagger.draw(
// new ImageTexture(Textures.COINS) new ImageTexture(Textures.COINS)
// .dimensions(16, 16) .dimensions(16, 16)
// .position(x + Fonts.getWidth(t, Theme.FONT.value) + 4, y + 52) .position(x + Fonts.getWidth(t, Theme.FONT.value) + 4, y + 52)
// .scale(0.5f) .scale(0.5f)
// .animation(new Fade(400))); .animation(new Fade(400)));
// if (col == 8) { if (col == 8) {
// col = 0; col = 0;
// row++; row++;
// } else { } else {
// col++; col++;
// } }
// } }
// } }
} }
scroll.draw(stagger); scroll.draw(stagger);
versions/1.21.4/src/main/java/org/saturnclient/saturnclient/SaturnClient.java
+1 -1
View File
@@ -7,8 +7,8 @@ import net.minecraft.client.MinecraftClient;
import org.saturnclient.client.ServiceClient; import org.saturnclient.client.ServiceClient;
import org.saturnclient.cosmetics.Emotes; import org.saturnclient.cosmetics.Emotes;
import org.saturnclient.cosmetics.Hats;
import org.saturnclient.cosmetics.cloak.Cloaks; import org.saturnclient.cosmetics.cloak.Cloaks;
import org.saturnclient.cosmetics.hat.Hats;
import org.saturnclient.common.minecraft.bindings.SaturnClientBindings; import org.saturnclient.common.minecraft.bindings.SaturnClientBindings;
import org.saturnclient.impl.FabricModuleProvider; import org.saturnclient.impl.FabricModuleProvider;
import org.saturnclient.impl.SaturnClientProvider; import org.saturnclient.impl.SaturnClientProvider;