diff --git a/common/src/main/java/org/saturnclient/ui/SaturnScreen.java b/common/src/main/java/org/saturnclient/ui/SaturnScreen.java index 5043cdf..a3cb4bf 100644 --- a/common/src/main/java/org/saturnclient/ui/SaturnScreen.java +++ b/common/src/main/java/org/saturnclient/ui/SaturnScreen.java @@ -23,8 +23,8 @@ public abstract class SaturnScreen { // Provider public ScreenProvider provider; - public SaturnScreen() { - provider.close(); + public SaturnScreen(String title) { + this.title = title; } protected void init() { @@ -107,4 +107,8 @@ public abstract class SaturnScreen { return false; } + + public boolean shouldPause() { + return true; + } } 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 315df8c..a4c1828 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 @@ -22,7 +22,7 @@ import org.saturnclient.saturnclient.mixin.DrawContextAccessor; import org.saturnclient.ui.ElementRenderer; import org.saturnclient.ui.RenderScope; import org.saturnclient.ui.RenderScopeImpl; -import org.saturnclient.ui.SaturnScreenFabric; +import org.saturnclient.ui.SaturnScreen; import org.saturnclient.ui.components.ElementRendererImpl; import org.saturnclient.ui.elements.ImageTexture; import org.saturnclient.ui.resources.Textures; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/menus/HudEditor.java b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/menus/HudEditor.java index 986d39c..ff5a836 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/menus/HudEditor.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/saturnclient/menus/HudEditor.java @@ -13,7 +13,7 @@ import org.saturnclient.config.manager.ConfigManager; import org.saturnclient.saturnclient.mixin.DrawContextAccessor; import org.saturnclient.ui.RenderScope; import org.saturnclient.ui.RenderScopeImpl; -import org.saturnclient.ui.SaturnScreenFabric; +import org.saturnclient.ui.SaturnScreen; import java.util.ArrayList; import java.util.List; diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ConfigEditor.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ConfigEditor.java index c3129a9..4701989 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ConfigEditor.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ConfigEditor.java @@ -5,7 +5,7 @@ import java.util.Map; import org.saturnclient.config.Theme; import org.saturnclient.config.manager.ConfigManager; import org.saturnclient.config.manager.Property; -import org.saturnclient.ui.SaturnScreenFabric; +import org.saturnclient.ui.SaturnScreen; import org.saturnclient.ui.components.Sidebar; import org.saturnclient.ui.components.inputs.FloatInput; import org.saturnclient.ui.components.inputs.HexInput; @@ -17,7 +17,7 @@ import org.saturnclient.ui.elements.Scroll; import org.saturnclient.ui.elements.Text; import org.saturnclient.ui.resources.Fonts; -public class ConfigEditor extends SaturnScreenFabric { +public class ConfigEditor extends SaturnScreen { private ConfigManager config; public ConfigEditor(ConfigManager config) { @@ -39,7 +39,7 @@ public class ConfigEditor extends SaturnScreenFabric { draw(scroll.dimensions(scrollWidth, 350).center(width, height)); - draw(new Sidebar(1, this::close).centerOffset(width, height, -(scrollWidth / 2 + 20), 0)); + draw(new Sidebar(1, this.provider::close).centerOffset(width, height, -(scrollWidth / 2 + 20), 0)); } @SuppressWarnings("unchecked") diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/EmoteWheel.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/EmoteWheel.java index 8f30398..380527a 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/EmoteWheel.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/EmoteWheel.java @@ -5,7 +5,7 @@ import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.client.ServiceClient; import org.saturnclient.config.AnimationConfig; import org.saturnclient.config.Config; -import org.saturnclient.ui.SaturnScreenFabric; +import org.saturnclient.ui.SaturnScreen; import org.saturnclient.ui.Utils; import org.saturnclient.ui.anim.Fade; import org.saturnclient.ui.anim.SlideY; @@ -19,7 +19,7 @@ import dev.kosmx.playerAnim.minecraftApi.PlayerAnimationAccess; import dev.kosmx.playerAnim.minecraftApi.PlayerAnimationRegistry; import net.minecraft.util.Identifier; -public class EmoteWheel extends SaturnScreenFabric { +public class EmoteWheel extends SaturnScreen { int page = 1; public EmoteWheel() { @@ -107,7 +107,7 @@ public class EmoteWheel extends SaturnScreenFabric { .playAnimation()); ServiceClient.emote(emote); - close(); + provider.close(); }) .dimensions(70, 70) .centerOffset(width, height, diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ModMenu.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ModMenu.java index 7635ea6..2c7e38c 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ModMenu.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ModMenu.java @@ -3,7 +3,7 @@ package org.saturnclient.ui.screens; import org.saturnclient.modules.ModManager; import org.saturnclient.modules.Module; import org.saturnclient.config.AnimationConfig; -import org.saturnclient.ui.SaturnScreenFabric; +import org.saturnclient.ui.SaturnScreen; import org.saturnclient.ui.anim.SlideFade; import org.saturnclient.ui.components.SaturnModule; import org.saturnclient.ui.components.Sidebar; @@ -12,7 +12,7 @@ import org.saturnclient.ui.elements.ImageTexture; import org.saturnclient.ui.elements.Scroll; import org.saturnclient.ui.resources.Textures; -public class ModMenu extends SaturnScreenFabric { +public class ModMenu extends SaturnScreen { public ModMenu() { super("Mod Menu"); } @@ -49,7 +49,7 @@ public class ModMenu extends SaturnScreenFabric { draw(scroll.dimensions(scrollWidth, 350).center(width, height)); - draw(new Sidebar(0, this::close).centerOffset(width, height, -(scrollWidth / 2 + 20), 0)); + draw(new Sidebar(0, this.provider::close).centerOffset(width, height, -(scrollWidth / 2 + 20), 0)); draw(new ImageTexture(Textures.LOGO_TEXT_BIG).dimensions(180, 18).position(width - 180 - 20, height - 18 - 20)); } diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ShiftMenu.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ShiftMenu.java index ce56ff1..ed65453 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ShiftMenu.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/ShiftMenu.java @@ -4,7 +4,7 @@ import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.config.AnimationConfig; import org.saturnclient.config.Config; import org.saturnclient.saturnclient.menus.HudEditor; -import org.saturnclient.ui.SaturnScreenFabric; +import org.saturnclient.ui.SaturnScreen; import org.saturnclient.ui.anim.Fade; import org.saturnclient.ui.anim.SlideY; import org.saturnclient.ui.elements.AnimationStagger; @@ -14,7 +14,7 @@ import org.saturnclient.ui.elements.TextureButton; import org.saturnclient.ui.resources.Textures; import org.saturnclient.ui.screens.cosmetics.CloakMenu; -public class ShiftMenu extends SaturnScreenFabric { +public class ShiftMenu extends SaturnScreen { public ShiftMenu() { super("Shift Menu"); } diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/TitleMenu.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/TitleMenu.java index e504c8e..a79d1e2 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/TitleMenu.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/TitleMenu.java @@ -4,7 +4,7 @@ import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.config.AnimationConfig; import org.saturnclient.config.Config; import org.saturnclient.saturnclient.menus.HudEditor; -import org.saturnclient.ui.SaturnScreenFabric; +import org.saturnclient.ui.SaturnScreen; import org.saturnclient.ui.anim.Fade; import org.saturnclient.ui.anim.SlideFade; import org.saturnclient.ui.anim.SlideY; @@ -20,7 +20,7 @@ import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen; import net.minecraft.client.gui.screen.option.OptionsScreen; import net.minecraft.client.gui.screen.world.SelectWorldScreen; -public class TitleMenu extends SaturnScreenFabric { +public class TitleMenu extends SaturnScreen { public TitleMenu() { super("Title Menu"); } diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/cosmetics/CloakMenu.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/cosmetics/CloakMenu.java index 9a152dd..55901a0 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/cosmetics/CloakMenu.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/cosmetics/CloakMenu.java @@ -4,7 +4,7 @@ import org.saturnclient.cosmetics.cloak.Cloaks; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.client.player.SaturnPlayer; import org.saturnclient.config.AnimationConfig; -import org.saturnclient.ui.SaturnScreenFabric; +import org.saturnclient.ui.SaturnScreen; import org.saturnclient.ui.anim.Fade; import org.saturnclient.ui.anim.SlideY; import org.saturnclient.ui.components.CosmeticPreview; @@ -16,7 +16,7 @@ import org.saturnclient.ui.elements.TabMenu; import org.saturnclient.ui.elements.TabMenu.TabMenuComponent; import org.saturnclient.ui.resources.Textures; -public class CloakMenu extends SaturnScreenFabric { +public class CloakMenu extends SaturnScreen { public CloakMenu() { super("Cloaks Menu"); } @@ -68,7 +68,7 @@ public class CloakMenu extends SaturnScreenFabric { .position(scroll.x + (scrollWidth - 220), scroll.y + 40) .animation(new Fade(500))); - draw(new Sidebar(2, this::close) + draw(new Sidebar(2, this.provider::close) .centerOffset(width, height, -(scrollWidth / 2 + 20), 0) .animation(new Fade(400))); diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/cosmetics/HatMenu.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/cosmetics/HatMenu.java index e232db1..c1e9922 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/cosmetics/HatMenu.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/cosmetics/HatMenu.java @@ -4,7 +4,7 @@ import org.saturnclient.cosmetics.hat.Hats; import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.client.player.SaturnPlayer; import org.saturnclient.config.AnimationConfig; -import org.saturnclient.ui.SaturnScreenFabric; +import org.saturnclient.ui.SaturnScreen; import org.saturnclient.ui.anim.Fade; import org.saturnclient.ui.anim.SlideY; import org.saturnclient.ui.components.CosmeticPreview; @@ -16,7 +16,7 @@ import org.saturnclient.ui.elements.TabMenu; import org.saturnclient.ui.elements.TabMenu.TabMenuComponent; import org.saturnclient.ui.resources.Textures; -public class HatMenu extends SaturnScreenFabric { +public class HatMenu extends SaturnScreen { public HatMenu() { super("Hats Menu"); } @@ -69,7 +69,7 @@ public class HatMenu extends SaturnScreenFabric { .position(scroll.x + (scrollWidth - 220), scroll.y + 40) .animation(new Fade(500))); - draw(new Sidebar(2, this::close) + draw(new Sidebar(2, this.provider::close) .centerOffset(width, height, -(scrollWidth / 2 + 20), 0) .animation(new Fade(400))); diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/store/CloakStore.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/store/CloakStore.java index 832d3a8..58a8ebf 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/store/CloakStore.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/store/CloakStore.java @@ -6,7 +6,7 @@ import org.saturnclient.saturnclient.client.ServiceClient; import org.saturnclient.saturnclient.client.player.SaturnPlayer; import org.saturnclient.config.AnimationConfig; import org.saturnclient.config.Theme; -import org.saturnclient.ui.SaturnScreenFabric; +import org.saturnclient.ui.SaturnScreen; import org.saturnclient.ui.Utils; import org.saturnclient.ui.anim.Fade; import org.saturnclient.ui.anim.SlideY; @@ -24,7 +24,7 @@ import org.saturnclient.ui.resources.Textures; import com.mojang.blaze3d.systems.RenderSystem; -public class CloakStore extends SaturnScreenFabric { +public class CloakStore extends SaturnScreen { private long lastPurchaseTime = 0; public CloakStore() { @@ -99,7 +99,7 @@ public class CloakStore extends SaturnScreenFabric { .dimensions(scrollWidth, 350) .centerOffset(width, height, 15, 0)); - draw(new Sidebar(5, this::close) + draw(new Sidebar(5, this.provider::close) .centerOffset(width, height, -((scrollWidth - 30) / 2 + 20), 0) .animation(new Fade(400))); @@ -130,15 +130,15 @@ public class CloakStore extends SaturnScreenFabric { RenderSystem.recordRenderCall(() -> { SaturnClient.client.setScreen(new CloakStore(now)); // Utils.notify(NotificationKind.Success, - // "Purchase complete", - // "Congrats, enjoy your new cloak!"); + // "Purchase complete", + // "Congrats, enjoy your new cloak!"); }); }).start(); } else { // Utils.notify(NotificationKind.Error, - // "Timeout error", - // "Please wait 3 seconds"); + // "Timeout error", + // "Please wait 3 seconds"); } } } diff --git a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/store/HatStore.java b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/store/HatStore.java index 00fabe4..38a6a88 100644 --- a/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/store/HatStore.java +++ b/versions/1.21.4/src/main/java/org/saturnclient/ui/screens/store/HatStore.java @@ -6,7 +6,7 @@ import org.saturnclient.saturnclient.client.ServiceClient; import org.saturnclient.saturnclient.client.player.SaturnPlayer; import org.saturnclient.config.AnimationConfig; import org.saturnclient.config.Theme; -import org.saturnclient.ui.SaturnScreenFabric; +import org.saturnclient.ui.SaturnScreen; import org.saturnclient.ui.Utils; import org.saturnclient.ui.anim.Fade; import org.saturnclient.ui.anim.SlideY; @@ -24,7 +24,7 @@ import org.saturnclient.ui.resources.Textures; import com.mojang.blaze3d.systems.RenderSystem; -public class HatStore extends SaturnScreenFabric { +public class HatStore extends SaturnScreen { private long lastPurchaseTime = 0; public HatStore() { @@ -100,7 +100,7 @@ public class HatStore extends SaturnScreenFabric { .dimensions(scrollWidth, 350) .centerOffset(width, height, 15, 0)); - draw(new Sidebar(5, this::close) + draw(new Sidebar(5, this.provider::close) .centerOffset(width, height, -((scrollWidth - 30) / 2 + 20), 0) .animation(new Fade(400))); @@ -131,15 +131,15 @@ public class HatStore extends SaturnScreenFabric { RenderSystem.recordRenderCall(() -> { SaturnClient.client.setScreen(new HatStore(now)); // Utils.notify(NotificationKind.Success, - // "Purchase complete", - // "Congrats, enjoy your new hat!"); + // "Purchase complete", + // "Congrats, enjoy your new hat!"); }); }).start(); } else { // Utils.notify(NotificationKind.Error, - // "Timeout error", - // "Please wait 3 seconds"); + // "Timeout error", + // "Please wait 3 seconds"); } } }