aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/de/hysky/skyblocker')
-rw-r--r--src/main/java/de/hysky/skyblocker/mixins/SignEditScreenMixin.java7
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/SignCalculator.java2
2 files changed, 6 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 3c1667f0..867edb7d 100644
--- a/src/main/java/de/hysky/skyblocker/mixins/SignEditScreenMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixins/SignEditScreenMixin.java
@@ -1,8 +1,11 @@
package de.hysky.skyblocker.mixin;
+import de.hysky.skyblocker.config.SkyblockerConfigManager;
import de.hysky.skyblocker.skyblock.SignCalculator;
+import de.hysky.skyblocker.utils.Utils;
import net.minecraft.block.entity.SignBlockEntity;
+import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.ingame.AbstractSignEditScreen;
import org.spongepowered.asm.mixin.Final;
@@ -23,7 +26,7 @@ public abstract class SignEditScreenMixin{
@Inject(method = "render", at = @At("HEAD"))
private void skyblocker$render(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
//if the sign is being used to enter number send it to the sign calculator
- if (Objects.equals(messages[1], "^^^^^^^^^^^^^^^")) {
+ if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().general.enableSignCalculator && Objects.equals(messages[1], "^^^^^^^^^^^^^^^")) {
SignCalculator.renderSign(context, messages);
}
}
@@ -31,7 +34,7 @@ public abstract class SignEditScreenMixin{
@Inject(method = "finishEditing", at = @At("HEAD"))
private void skyblocker$finishEditing(CallbackInfo ci) {
//if the sign is being used to enter number get number from calculator for if maths has been done
- if (Objects.equals(messages[1], "^^^^^^^^^^^^^^^")) {
+ if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().general.enableSignCalculator && Objects.equals(messages[1], "^^^^^^^^^^^^^^^")) {
boolean isPrice = messages[2].contains("price");
String value = SignCalculator.getNewValue(isPrice);
if (value.length() >= 15) {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/SignCalculator.java b/src/main/java/de/hysky/skyblocker/skyblock/SignCalculator.java
index cbff07c9..be393b49 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/SignCalculator.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/SignCalculator.java
@@ -56,7 +56,7 @@ public class SignCalculator {
private static void render(DrawContext context) {
Text text;
if (output == null) {
- text = Text.literal("Invalid Equation").formatted(Formatting.RED);
+ text = Text.translatable("text.autoconfig.skyblocker.option.general.enableSignCalculator.invalidEquation").formatted(Formatting.RED);
}
else {
text = Text.literal(input +" = " + FORMATTER.format(output)).formatted(Formatting.GREEN);