aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de
diff options
context:
space:
mode:
authorolim <bobq4582@gmail.com>2024-04-08 22:39:34 +0100
committerolim <bobq4582@gmail.com>2024-04-08 22:39:34 +0100
commitcdf2b3f8a1cdb665df7b3da1ecf6c328630faf5d (patch)
tree62e7d1cc44688354f71a4f91450921e5396a5b69 /src/main/java/de
parentcec065a79d10319aaf0b6c3e96b4d76001f3e93b (diff)
downloadSkyblocker-cdf2b3f8a1cdb665df7b3da1ecf6c328630faf5d.tar.gz
Skyblocker-cdf2b3f8a1cdb665df7b3da1ecf6c328630faf5d.tar.bz2
Skyblocker-cdf2b3f8a1cdb665df7b3da1ecf6c328630faf5d.zip
add option to change text color after 20 seconds
add option to change the text to green after 20 seconds (use full for some larva fishing)
Diffstat (limited to 'src/main/java/de')
-rw-r--r--src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java3
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java7
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/FishingHelper.java12
3 files changed, 21 insertions, 1 deletions
diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
index 3e292ba4..ed74ea4f 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
@@ -354,6 +354,9 @@ public class SkyblockerConfig {
public boolean enableFishingTimer = true;
@SerialEntry
+ public boolean changeTimerColor = true;
+
+ @SerialEntry
public float fishingTimerScale = 1f;
}
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
index b1e02ee3..52a9cd15 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
@@ -233,6 +233,13 @@ public class GeneralCategory {
newValue -> config.general.fishing.enableFishingTimer = newValue)
.controller(ConfigUtils::createBooleanController)
.build())
+ .option(Option.<Boolean>createBuilder()
+ .name(Text.translatable("text.autoconfig.skyblocker.option.general.fishing.changeTimerColor"))
+ .binding(defaults.general.fishing.changeTimerColor,
+ () -> config.general.fishing.changeTimerColor,
+ newValue -> config.general.fishing.changeTimerColor = newValue)
+ .controller(ConfigUtils::createBooleanController)
+ .build())
.option(Option.<Float>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.general.fishing.fishingTimerScale"))
.binding(defaults.general.fishing.fishingTimerScale,
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/FishingHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/FishingHelper.java
index fb368e30..121921b3 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/FishingHelper.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/FishingHelper.java
@@ -20,6 +20,8 @@ import net.minecraft.util.TypedActionResult;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3d;
+import java.awt.*;
+
public class FishingHelper {
private static final Title title = new Title("skyblocker.fishing.reelNow", Formatting.GREEN);
private static long startTime;
@@ -83,7 +85,15 @@ public class FishingHelper {
float time = Math.round((System.currentTimeMillis()-startTime) / 100f) / 10f; //leave 1dp in seconds
float scale = SkyblockerConfigManager.get().general.fishing.fishingTimerScale;
Vec3d pos = player.fishHook.getPos().add(0,0.4 + scale / 10,0);
- RenderHelper.renderText(context, Text.of(String.valueOf(time)), pos, scale, true);
+
+ Text text;
+ if (time >= 20 && SkyblockerConfigManager.get().general.fishing.changeTimerColor) {
+ text = Text.literal(String.valueOf(time)).withColor(Color.GREEN.getRGB());
+ } else {
+ text = Text.literal(String.valueOf(time));
+ }
+
+ RenderHelper.renderText(context, text, pos, scale, true);
}
}