Add Daedalus axe as farming tool + others (#1084)

* Add Daedalus Axe as a farming tool * Deduplicate waypoint translation strings * Fix plural
SkyblockerMod · Dec 21, 2024 · f39f045 · f39f045
1 parent 5b5220b
commit f39f045
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 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
@@ -357,8 +357,8 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
                                 .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
@@ -192,7 +192,7 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
                                 .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
@@ -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
@@ -74,7 +74,7 @@ public void updateContent(List<Text> lines) {
 
 		} 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();

diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -213,8 +213,6 @@
   "skyblocker.config.dungeons.secretWaypoints.enableWitherWaypoints": "Enable Wither Essence Waypoints",
   "skyblocker.config.dungeons.secretWaypoints.showSecretText": "Show Secret Text",
   "skyblocker.config.dungeons.secretWaypoints.waypointType": "Waypoint Type",
-  "skyblocker.config.dungeons.secretWaypoints.waypointType.@Tooltip": "Waypoint: Displays a highlight and a beacon beam.\n\nOutlined Waypoint: Displays both a waypoint and an outline.\n\nHighlight: Only displays a highlight.\n\nOutlined Highlight: Displays both a highlight and an outline.\n\nOutline: Only displays an outline.",
-  "skyblocker.config.dungeons.secretWaypoints.waypointType.generalNote": "\n\n\nThis option does not apply to all waypoints. Some waypoints such as secret waypoints have their own waypoint type option.",
 
   "skyblocker.config.dungeons.starredMobBoundingBoxes": "Starred Mob Bounding Boxes",
   "skyblocker.config.dungeons.starredMobBoundingBoxes.@Tooltip": "Draws the bounding boxes of starred mobs.",
@@ -374,7 +372,6 @@
   "skyblocker.config.helpers.chocolateFactory.straySound": "Stray Rabbit Sound",
   "skyblocker.config.helpers.chocolateFactory.straySound.@Tooltip": "Repeatedly plays a ding while a stray rabbit is present. If it is golden, the sound will be more frequent and different.",
   "skyblocker.config.helpers.chocolateFactory.waypointType": "Egg Waypoint Type",
-  "skyblocker.config.helpers.chocolateFactory.waypointType.@Tooltip": "Waypoint: Displays a highlight and a beacon beam.\n\nOutlined Waypoint: Displays both a waypoint and an outline.\n\nHighlight: Only displays a highlight.\n\nOutlined Highlight: Displays both a highlight and an outline.\n\nOutline: Only displays an outline.",
 
   "skyblocker.config.helpers.enableNewYearCakesHelper": "Enable New Year Cakes Helper",
   "skyblocker.config.helpers.enableNewYearCakesHelper.@Tooltip": "Highlights the missing new year cakes green and the cakes you have already red.\n\nRequires you to open your cake bag at least once to work.",