aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlex <8379108+Alex33856@users.noreply.github.com>2025-07-03 09:11:23 -0400
committerGitHub <noreply@github.com>2025-07-03 21:11:23 +0800
commitb2fd451ec4feff31f525b9738ea85149bcadfd2e (patch)
tree6e5719be142a831248362c1a67e1e80988e5f473 /src
parentae859dd2ac89a1cb1912c7aefc3187218f4d3112 (diff)
downloadSkyblocker-b2fd451ec4feff31f525b9738ea85149bcadfd2e.tar.gz
Skyblocker-b2fd451ec4feff31f525b9738ea85149bcadfd2e.tar.bz2
Skyblocker-b2fd451ec4feff31f525b9738ea85149bcadfd2e.zip
Show Input Calculator on Bazaar flip input sign (#1457)
* Show Input Calculator on Bazaar flip input sign * Use constants for strings
Diffstat (limited to 'src')
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/SignEditScreenMixin.java18
1 files changed, 15 insertions, 3 deletions
diff --git a/src/main/java/de/hysky/skyblocker/mixins/SignEditScreenMixin.java b/src/main/java/de/hysky/skyblocker/mixins/SignEditScreenMixin.java
index c68d8f3e..33a51c7d 100644
--- a/src/main/java/de/hysky/skyblocker/mixins/SignEditScreenMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixins/SignEditScreenMixin.java
@@ -39,7 +39,7 @@ public abstract class SignEditScreenMixin extends Screen {
private void skyblocker$render(CallbackInfo ci, @Local(argsOnly = true) DrawContext context) {
if (Utils.isOnSkyblock()) {
var config = SkyblockerConfigManager.get();
- if (messages[1].equals("^^^^^^") && config.general.speedPresets.enableSpeedPresets) {
+ if (isSpeedInputSign() && config.general.speedPresets.enableSpeedPresets) {
var presets = SpeedPresets.getInstance();
if (presets.hasPreset(messages[0])) {
context.drawCenteredTextWithShadow(this.textRenderer, Text.literal(String.format("%s ยป %d", messages[0], presets.getPreset(messages[0]))).formatted(Formatting.GREEN),
@@ -65,7 +65,7 @@ public abstract class SignEditScreenMixin extends Screen {
var config = SkyblockerConfigManager.get();
if (Utils.isOnSkyblock()) {
//if the sign is being used to enter the speed cap, retrieve the value from speed presets.
- if (messages[1].equals("^^^^^^") && config.general.speedPresets.enableSpeedPresets) {
+ if (isSpeedInputSign() && config.general.speedPresets.enableSpeedPresets) {
var presets = SpeedPresets.getInstance();
if (presets.hasPreset(messages[0])) {
messages[0] = String.valueOf(presets.getPreset(messages[0]));
@@ -84,7 +84,19 @@ public abstract class SignEditScreenMixin extends Screen {
}
@Unique
+ private static final String SPEED_INPUT_MARKER = "^^^^^^";
+ @Unique
+ private static final String INPUT_SIGN_MARKER = "^^^^^^^^^^^^^^^";
+ @Unique
+ private static final String BAZAAR_FLIP_MARKER = "^^Flipping^^";
+
+ @Unique
+ private boolean isSpeedInputSign() {
+ return messages[1].equals(SPEED_INPUT_MARKER);
+ }
+
+ @Unique
private boolean isInputSign() {
- return messages[1].equals("^^^^^^^^^^^^^^^");
+ return messages[1].equals(INPUT_SIGN_MARKER) || messages[1].equals(BAZAAR_FLIP_MARKER);
}
}