aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/de')
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/HelperCategory.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java6
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/ElectionWidget.java2
4 files changed, 9 insertions, 5 deletions
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
index 10673e48..aaf09710 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
@@ -357,8 +357,8 @@ public class DungeonsCategory {
.build())
.option(Option.<Type>createBuilder()
.name(Text.translatable("skyblocker.config.dungeons.secretWaypoints.waypointType"))
- .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.secretWaypoints.waypointType.@Tooltip"),
- Text.translatable("skyblocker.config.dungeons.secretWaypoints.waypointType.generalNote")))
+ .description(OptionDescription.of(Text.translatable("skyblocker.config.uiAndVisuals.waypoints.waypointType.@Tooltip"),
+ Text.translatable("skyblocker.config.uiAndVisuals.waypoints.waypointType.generalNote")))
.binding(defaults.dungeons.secretWaypoints.waypointType,
() -> config.dungeons.secretWaypoints.waypointType,
newValue -> config.dungeons.secretWaypoints.waypointType = newValue)
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/HelperCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/HelperCategory.java
index eee4b525..80d96483 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/HelperCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/HelperCategory.java
@@ -192,7 +192,7 @@ public class HelperCategory {
.build())
.option(Option.<Waypoint.Type>createBuilder()
.name(Text.translatable("skyblocker.config.helpers.chocolateFactory.waypointType"))
- .description(OptionDescription.of(Text.translatable("skyblocker.config.helpers.chocolateFactory.waypointType.@Tooltip")))
+ .description(OptionDescription.of(Text.translatable("skyblocker.config.uiAndVisuals.waypoints.waypointType.@Tooltip")))
.binding(defaults.helpers.chocolateFactory.waypointType,
() -> config.helpers.chocolateFactory.waypointType,
newValue -> config.helpers.chocolateFactory.waypointType = newValue)
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java
index 777a7671..868bf4cf 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java
@@ -49,7 +49,11 @@ public class FarmingHudWidget extends ComponentBasedWidget {
Map.entry("PUMPKIN_DICER", "PUMPKIN"),
Map.entry("PUMPKIN_DICER_2", "PUMPKIN"),
Map.entry("PUMPKIN_DICER_3", "PUMPKIN"),
- Map.entry("COCO_CHOPPER", "INK_SACK:3")
+ Map.entry("COCO_CHOPPER", "INK_SACK:3"),
+
+ //Tools popularly used for farming that weren't intended to be
+ Map.entry("DAEDALUS_AXE", "RED_MUSHROOM"),
+ Map.entry("STARRED_DAEDALUS_AXE", "RED_MUSHROOM")
);
private static FarmingHudWidget instance = null;
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/ElectionWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/ElectionWidget.java
index 9f08b601..0a6f8ce1 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/ElectionWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/ElectionWidget.java
@@ -74,7 +74,7 @@ public class ElectionWidget extends TabHudWidget {
} else {
// election is going on
- this.addSimpleIcoText(Ico.CLOCK, "End in: ", Formatting.GOLD, lines.getFirst().getString().trim());
+ this.addSimpleIcoText(Ico.CLOCK, "Ends in: ", Formatting.GOLD, lines.getFirst().getString().trim());
for (int i = 1; i < lines.size(); i++) {
String string = lines.get(i).getString();