From 7eb705d80206a286152f21404462ff33f5bb371c Mon Sep 17 00:00:00 2001 From: Klesti Selimaj Date: Sun, 8 Mar 2026 01:22:56 +0100 Subject: [PATCH] Some changes --- .../common/ref/game/ItemStackRef.java | 3 +++ .../interfaces/ArmorDisplayInterface.java | 6 ------ .../modules/mods/ArmorDisplay.java | 20 +++++++++---------- .../saturnclient/ui/screens/ShiftMenu.java | 6 +++--- .../saturnclient/ui/screens/TitleMenu.java | 14 ++++++------- .../ui/screens/store/CloakStore.java | 2 +- .../ui/screens/store/HatStore.java | 2 +- 7 files changed, 25 insertions(+), 28 deletions(-) diff --git a/src/main/java/org/saturnclient/common/ref/game/ItemStackRef.java b/src/main/java/org/saturnclient/common/ref/game/ItemStackRef.java index 4edfcd7..d20e38f 100644 --- a/src/main/java/org/saturnclient/common/ref/game/ItemStackRef.java +++ b/src/main/java/org/saturnclient/common/ref/game/ItemStackRef.java @@ -1,4 +1,7 @@ package org.saturnclient.common.ref.game; public interface ItemStackRef { + public boolean isEmpty(); + public int getMaxDamage(); + public int getDamage(); } diff --git a/src/main/java/org/saturnclient/modules/interfaces/ArmorDisplayInterface.java b/src/main/java/org/saturnclient/modules/interfaces/ArmorDisplayInterface.java index b929aaa..c3de75b 100644 --- a/src/main/java/org/saturnclient/modules/interfaces/ArmorDisplayInterface.java +++ b/src/main/java/org/saturnclient/modules/interfaces/ArmorDisplayInterface.java @@ -23,10 +23,4 @@ public interface ArmorDisplayInterface { ItemStackRef getDummyLeggings(); ItemStackRef getDummyBoots(); - - boolean isEmpty(ItemStackRef stack); - - int getMaxDamage(ItemStackRef stack); - - int getDamage(ItemStackRef stack); } \ No newline at end of file diff --git a/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java b/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java index 5e170bc..21d9ca4 100644 --- a/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java +++ b/src/main/java/org/saturnclient/modules/mods/ArmorDisplay.java @@ -38,33 +38,33 @@ public class ArmorDisplay extends Module implements HudMod { int row = 0; - if (useMainHand.value && !minecraft.isEmpty(mainHand)) { + if (useMainHand.value && !mainHand.isEmpty()) { scope.drawItem(mainHand, 0, 15 * row); - renderHealth(scope, row, minecraft.getMaxDamage(mainHand), minecraft.getDamage(mainHand)); + renderHealth(scope, row, mainHand.getMaxDamage(), mainHand.getDamage()); row++; } - if (!minecraft.isEmpty(helmet)) { + if (!helmet.isEmpty()) { scope.drawItem(helmet, 0, 15 * row); - renderHealth(scope, row, minecraft.getMaxDamage(helmet), minecraft.getDamage(helmet)); + renderHealth(scope, row, helmet.getMaxDamage(), helmet.getDamage()); row++; } - if (!minecraft.isEmpty(chestplate)) { + if (!chestplate.isEmpty()) { scope.drawItem(chestplate, 0, 15 * row); - renderHealth(scope, row, minecraft.getMaxDamage(chestplate), minecraft.getDamage(chestplate)); + renderHealth(scope, row, chestplate.getMaxDamage(), chestplate.getDamage()); row++; } - if (!minecraft.isEmpty(leggings)) { + if (!leggings.isEmpty()) { scope.drawItem(leggings, 0, 15 * row); - renderHealth(scope, row, minecraft.getMaxDamage(leggings), minecraft.getDamage(leggings)); + renderHealth(scope, row, leggings.getMaxDamage(), leggings.getDamage()); row++; } - if (!minecraft.isEmpty(boots)) { + if (!boots.isEmpty()) { scope.drawItem(boots, 0, 15 * row); - renderHealth(scope, row, minecraft.getMaxDamage(boots), minecraft.getDamage(boots)); + renderHealth(scope, row, boots.getMaxDamage(), boots.getDamage()); row++; } } diff --git a/src/main/java/org/saturnclient/ui/screens/ShiftMenu.java b/src/main/java/org/saturnclient/ui/screens/ShiftMenu.java index c21ccda..617bf3f 100644 --- a/src/main/java/org/saturnclient/ui/screens/ShiftMenu.java +++ b/src/main/java/org/saturnclient/ui/screens/ShiftMenu.java @@ -41,17 +41,17 @@ public class ShiftMenu extends SaturnScreen { AnimationStagger stagger = new AnimationStagger(AnimationConfig.shiftMenu.stagger.value); stagger.draw(new TextureButton(Textures.HUD_ICON, () -> { - Providers.saturn.setScreen(new HudEditor()); + Providers.saturn.getClient().setScreen(new HudEditor()); }).dimensions(btnHeight, btnHeight).position(0, 0) .animation(new Fade(AnimationConfig.shiftMenu))); stagger.draw(new Button("Settings", () -> { - Providers.saturn.setScreen(new ModMenu()); + Providers.saturn.getClient().setScreen(new ModMenu()); }).dimensions(btnWidth, btnHeight).position(btnHeight + spacing, 0) .animation(new Fade(AnimationConfig.shiftMenu))); stagger.draw(new TextureButton(Textures.COSMETICS, () -> { - Providers.saturn.setScreen(new CloakMenu()); + Providers.saturn.getClient().setScreen(new CloakMenu()); }).dimensions(btnHeight, btnHeight).position(btnWidth + btnHeight + (spacing * 2), 0) .animation(new Fade(AnimationConfig.shiftMenu))); diff --git a/src/main/java/org/saturnclient/ui/screens/TitleMenu.java b/src/main/java/org/saturnclient/ui/screens/TitleMenu.java index 8d1334b..d60855d 100644 --- a/src/main/java/org/saturnclient/ui/screens/TitleMenu.java +++ b/src/main/java/org/saturnclient/ui/screens/TitleMenu.java @@ -1,7 +1,7 @@ package org.saturnclient.ui.screens; import org.saturnclient.common.provider.Providers; -import org.saturnclient.common.provider.SaturnProvider.MinecraftScreen; +import org.saturnclient.common.ref.game.MinecraftClientRef.MinecraftScreen; import org.saturnclient.config.AnimationConfig; import org.saturnclient.config.Config; import org.saturnclient.ui.SaturnScreen; @@ -33,17 +33,17 @@ public class TitleMenu extends SaturnScreen { AnimationStagger mainButtonStagger = new AnimationStagger(AnimationConfig.mainMenu); mainButtonStagger.draw(new Button("SINGLEPLAYER", () -> { - Providers.saturn.setScreen(MinecraftScreen.SelectWorld); + Providers.saturn.getClient().setScreen(MinecraftScreen.SelectWorld); }).scale(0.69f).dimensions(420, 52).position(0, 0) .animation(new SlideFade(AnimationConfig.mainMenu, -10))); mainButtonStagger.draw(new Button("MULTIPLAYER", () -> { - Providers.saturn.setScreen(MinecraftScreen.Multiplayer); + Providers.saturn.getClient().setScreen(MinecraftScreen.Multiplayer); }).scale(0.69f).dimensions(420, 52).position(0, 40) .animation(new SlideFade(AnimationConfig.mainMenu, -10))); mainButtonStagger.draw(new Button("OPTIONS", () -> { - Providers.saturn.setScreen(MinecraftScreen.Options); + Providers.saturn.getClient().setScreen(MinecraftScreen.Options); }).scale(0.69f).dimensions(206, 52).position(0, 80) .animation(new SlideFade(AnimationConfig.mainMenu, -10))); @@ -59,16 +59,16 @@ public class TitleMenu extends SaturnScreen { AnimationStagger saturnStagger = new AnimationStagger(AnimationConfig.mainMenu.stagger.value); saturnStagger.draw(new TextureButton(Textures.HUD_ICON, () -> { - Providers.saturn.setScreen(new HudEditor()); + Providers.saturn.getClient().setScreen(new HudEditor()); }).dimensions(s, s).position(0, 0).animation(new SlideFade(AnimationConfig.mainMenu, s + 8))); saturnStagger.draw(new TextureButton(Textures.SETTINGS, () -> { - Providers.saturn.setScreen(new ModMenu()); + Providers.saturn.getClient().setScreen(new ModMenu()); }).dimensions(s, s).position(s + 2, 0) .animation(new SlideFade(AnimationConfig.mainMenu, s + 8))); saturnStagger.draw(new TextureButton(Textures.CLOAK, () -> { - Providers.saturn.setScreen(new CloakMenu()); + Providers.saturn.getClient().setScreen(new CloakMenu()); }).dimensions(s, s).position((s + 2) * 2, 0) .animation(new SlideFade(AnimationConfig.mainMenu, s + 8))); diff --git a/src/main/java/org/saturnclient/ui/screens/store/CloakStore.java b/src/main/java/org/saturnclient/ui/screens/store/CloakStore.java index 1dc651e..5b60a43 100644 --- a/src/main/java/org/saturnclient/ui/screens/store/CloakStore.java +++ b/src/main/java/org/saturnclient/ui/screens/store/CloakStore.java @@ -104,7 +104,7 @@ public class CloakStore extends SaturnScreen { new TabMenuComponent(Textures.CLOAK, () -> { }), new TabMenuComponent(Textures.HAT, () -> { - Providers.saturn.setScreen(new HatStore()); + Providers.saturn.getClient().setScreen(new HatStore()); })) .centerOffset(width, height, 0, -195)); } diff --git a/src/main/java/org/saturnclient/ui/screens/store/HatStore.java b/src/main/java/org/saturnclient/ui/screens/store/HatStore.java index abd90eb..6656ee8 100644 --- a/src/main/java/org/saturnclient/ui/screens/store/HatStore.java +++ b/src/main/java/org/saturnclient/ui/screens/store/HatStore.java @@ -103,7 +103,7 @@ public class HatStore extends SaturnScreen { draw(new TabMenu(1, new TabMenuComponent(Textures.CLOAK, () -> { - Providers.saturn.setScreen(new CloakStore()); + Providers.saturn.getClient().setScreen(new CloakStore()); }), new TabMenuComponent(Textures.HAT, () -> { }))