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

CloakStore and static loading

Browse Source
This commit is contained in:
selimaj-dev
2026-03-08 11:58:05 +01:00
parent 6b69d12cea
commit 195f4869bf
4 changed files with 51 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/saturnclient/ui/screens/cosmetics/CloakMenu.java
+16 -15
View File
@@ -3,6 +3,7 @@ package org.saturnclient.ui.screens.cosmetics;
import org.saturnclient.client.player.SaturnPlayer;
import org.saturnclient.common.provider.Providers;
import org.saturnclient.config.AnimationConfig;
import org.saturnclient.cosmetics.Cloaks;
import org.saturnclient.ui.SaturnScreen;
import org.saturnclient.ui.anim.Fade;
import org.saturnclient.ui.anim.SlideY;
@@ -35,23 +36,23 @@ public class CloakMenu extends SaturnScreen {
AnimationStagger stagger = new AnimationStagger(AnimationConfig.cosmeticsMenu);
if (player != null) {
// for (String cloak : Cloaks.availableCloaks) {
for (String cloak : Cloaks.availableCloaks) {
// stagger.draw(
// new CosmeticPreview(
// cloak == player.cloak,
// Textures.getCloakPreview(cloak),
// () -> Cloaks.setCloak(cloak))
// .position((50 + g) * col, (111 + g) * row)
// .animation(new SlideY(AnimationConfig.cosmeticsMenu, 14)));
stagger.draw(
new CosmeticPreview(
cloak == player.cloak,
Textures.getCloakPreview(cloak),
() -> Cloaks.setCloak(cloak))
.position((50 + g) * col, (111 + 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);
src/main/java/org/saturnclient/ui/screens/store/CloakStore.java
+32 -31
View File
@@ -6,6 +6,7 @@ import org.saturnclient.client.player.SaturnPlayer;
import org.saturnclient.common.provider.Providers;
import org.saturnclient.config.AnimationConfig;
import org.saturnclient.config.Theme;
import org.saturnclient.cosmetics.Cloaks;
import org.saturnclient.ui.SaturnScreen;
import org.saturnclient.ui.anim.Fade;
import org.saturnclient.ui.anim.SlideY;
@@ -50,43 +51,43 @@ public class CloakStore extends SaturnScreen {
AnimationStagger stagger = new AnimationStagger(AnimationConfig.cosmeticsMenu);
if (player != null) {
// for (String cloak : Cloaks.ALL_CLOAKS) {
// if (!Cloaks.availableCloaks.contains(cloak)) {
for (String cloak : Cloaks.ALL_CLOAKS) {
if (!Cloaks.availableCloaks.contains(cloak)) {
// int x = (50 + gx) * col;
// int y = (111 + gy) * row;
int x = (50 + gx) * col;
int y = (111 + gy) * row;
// stagger.draw(
// new CosmeticPreview(
// cloak == player.cloak,
// Textures.getCloakPreview(cloak),
// () -> handlePurchase(cloak))
// .position(x, y)
// .animation(new SlideY(AnimationConfig.cosmeticsMenu, 16)));
stagger.draw(
new CosmeticPreview(
cloak == player.cloak,
Textures.getCloakPreview(cloak),
() -> handlePurchase(cloak))
.position(x, y)
.animation(new SlideY(AnimationConfig.cosmeticsMenu, 16)));
// String t = "100";
String t = "100";
// stagger.draw(
// new Text(t)
// .position(x + Fonts.centerX(50, t, Theme.FONT.value), y + 113)
// .scale(0.5f)
// .animation(new Fade(400)));
stagger.draw(
new Text(t)
.position(x + Fonts.centerX(50, t, Theme.FONT.value), y + 113)
.scale(0.5f)
.animation(new Fade(400)));
// stagger.draw(
// new ImageTexture(Textures.COINS)
// .dimensions(16, 16)
// .position(x + Fonts.getWidth(t, Theme.FONT.value) - 1, y + 112)
// .scale(0.5f)
// .animation(new Fade(400)));
stagger.draw(
new ImageTexture(Textures.COINS)
.dimensions(16, 16)
.position(x + Fonts.getWidth(t, Theme.FONT.value) - 1, y + 112)
.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);