Animation fix
This commit is contained in:
@@ -13,7 +13,7 @@ public class AnimationConfig {
|
||||
public static final Property<Integer> logoDuration = Property.integer(700);
|
||||
|
||||
// Main menu
|
||||
public static final AnimationConfig mainMenu = new AnimationConfig(true, 1000, 120);
|
||||
public static final AnimationConfig mainMenu = new AnimationConfig(true, 600, 120);
|
||||
|
||||
// Mod menu
|
||||
public static final AnimationConfig modMenu = new AnimationConfig(true, 600, 40);
|
||||
@@ -22,7 +22,8 @@ public class AnimationConfig {
|
||||
public static final AnimationConfig shiftMenu = new AnimationConfig(true, 300, 50);
|
||||
|
||||
public static void init(ConfigManager parent) {
|
||||
ConfigManager config = new ConfigManager(parent, "Animations");
|
||||
config = new ConfigManager(parent, "Animations");
|
||||
|
||||
config.property("Animation Curve", animationCurve);
|
||||
config.property("Logo Duration", logoDuration);
|
||||
|
||||
@@ -44,7 +45,7 @@ public class AnimationConfig {
|
||||
|
||||
public void init(String name) {
|
||||
// config.property("Enable " + name + " Animations", this.enabled);
|
||||
config.property(name + " Duration", this.stagger);
|
||||
config.property(name + " Duration", this.duration);
|
||||
config.property(name + " Stagger", this.stagger);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package org.saturnclient.ui2.screens;
|
||||
|
||||
import org.saturnclient.saturnclient.SaturnClient;
|
||||
import org.saturnclient.saturnclient.client.ServiceClient;
|
||||
import org.saturnclient.saturnclient.config.AnimationConfig;
|
||||
import org.saturnclient.saturnclient.config.Config;
|
||||
import org.saturnclient.saturnclient.cosmetics.Emotes;
|
||||
import org.saturnclient.ui2.SaturnScreen;
|
||||
@@ -30,9 +31,9 @@ public class EmoteWheel extends SaturnScreen {
|
||||
int col = 0;
|
||||
|
||||
draw(new ImageTexture(Textures.LOGO_TEXT).dimensions(98, 10).centerOffset(width, height, 0, -105)
|
||||
.animation(new Fade(700)));
|
||||
.animation(new Fade(AnimationConfig.logoDuration.value)));
|
||||
draw(new ImageTexture(Config.getLogo()).dimensions(98, 98).centerOffset(width, height, 0, -149)
|
||||
.animation(new SlideY(700, -20)));
|
||||
.animation(new SlideY(AnimationConfig.logoDuration.value, -20)));
|
||||
|
||||
draw(new TextureButton(Textures.LEFT, () -> {
|
||||
if (page > 1) {
|
||||
|
||||
Reference in New Issue
Block a user