diff options
Diffstat (limited to 'src/main')
5 files changed, 15 insertions, 13 deletions
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/MiningCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/MiningCategory.java index 9828474b..796a6105 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/MiningCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/MiningCategory.java @@ -185,9 +185,9 @@ public class MiningCategory { .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver")) .description(OptionDescription.of(Text.translatable("skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.@Tooltip"))) - .binding(defaults.mining.crystalsWaypoints.WishingCompassSolver, - () -> config.mining.crystalsWaypoints.WishingCompassSolver, - newValue -> config.mining.crystalsWaypoints.WishingCompassSolver = newValue) + .binding(defaults.mining.crystalsWaypoints.wishingCompassSolver, + () -> config.mining.crystalsWaypoints.wishingCompassSolver, + newValue -> config.mining.crystalsWaypoints.wishingCompassSolver = newValue) .controller(ConfigUtils::createBooleanController) .build()) diff --git a/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java index 7c74af80..1347f158 100644 --- a/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java @@ -100,7 +100,7 @@ public class MiningConfig { public boolean findInChat = true; @SerialEntry - public boolean WishingCompassSolver = true; + public boolean wishingCompassSolver = true; } public static class CommissionWaypoints { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java index dae5885a..30bf6b03 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java @@ -54,8 +54,8 @@ public class CrystalsHud { * Renders the map to the players UI. renders the background image ({@link CrystalsHud#MAP_TEXTURE}) of the map then if enabled special locations on the map. then finally the player to the map. * * @param context DrawContext to draw map to - * @param hudX Top left X coordinate of the map - * @param hudY Top left Y coordinate of the map + * @param hudX Top left X coordinate of the map + * @param hudY Top left Y coordinate of the map */ private static void render(DrawContext context, int hudX, int hudY) { float scale = SkyblockerConfigManager.get().mining.crystalsHud.mapScaling; @@ -72,7 +72,7 @@ public class CrystalsHud { //if enabled add waypoint locations to map if (SkyblockerConfigManager.get().mining.crystalsHud.showLocations) { - Map<String,MiningLocationLabel> ActiveWaypoints = CrystalsLocationsManager.activeWaypoints; + Map<String, MiningLocationLabel> ActiveWaypoints = CrystalsLocationsManager.activeWaypoints; for (MiningLocationLabel waypoint : ActiveWaypoints.values()) { int waypointColor = waypoint.category().getColor(); @@ -92,7 +92,6 @@ public class CrystalsHud { if (CLIENT.player == null || CLIENT.getNetworkHandler() == null) { return; } - //get player location double playerX = CLIENT.player.getX(); double playerZ = CLIENT.player.getZ(); @@ -144,7 +143,6 @@ public class CrystalsHud { /** * Works out if the crystals map should be rendered and sets {@link CrystalsHud#visible} accordingly. - * */ public static void update() { if (CLIENT.player == null || CLIENT.getNetworkHandler() == null || !SkyblockerConfigManager.get().mining.crystalsHud.enabled) { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java index 4364d8bc..ddf1fbd4 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java @@ -72,10 +72,11 @@ public class CrystalsLocationsManager { } private static void extractLocationFromMessage(Text message, Boolean overlay) { - String text = Formatting.strip(message.getString()); - if (!SkyblockerConfigManager.get().mining.crystalsWaypoints.findInChat || !Utils.isInCrystalHollows() || overlay || text == null) { + + if (!SkyblockerConfigManager.get().mining.crystalsWaypoints.findInChat || !Utils.isInCrystalHollows() || overlay) { return; } + String text = Formatting.strip(message.getString()); try { //make sure that it is only reading user messages and not from skyblocker if (text.contains(":") && !text.startsWith(Constants.PREFIX.get().getString())) { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/WishingCompassSolver.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/WishingCompassSolver.java index 84cd4803..7e7386f0 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/WishingCompassSolver.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/WishingCompassSolver.java @@ -98,6 +98,9 @@ public class WishingCompassSolver { * @param b overlay */ private static void failMessageListener(Text text, boolean b) { + if (!Utils.isInCrystalHollows()){ + return; + } if (Formatting.strip(text.getString()).equals("The Wishing Compass can't seem to locate anything!")) { currentState = SolverStates.NOT_STARTED; } @@ -303,7 +306,7 @@ public class WishingCompassSolver { } ItemStack stack = CLIENT.player.getStackInHand(hand); //make sure the user is in the crystal hollows and holding the wishing compass - if (!Utils.isInCrystalHollows() || !SkyblockerConfigManager.get().mining.crystalsWaypoints.WishingCompassSolver || !Objects.equals(stack.getSkyblockId(), "WISHING_COMPASS")) { + if (!Utils.isInCrystalHollows() || !SkyblockerConfigManager.get().mining.crystalsWaypoints.wishingCompassSolver || !Objects.equals(stack.getSkyblockId(), "WISHING_COMPASS")) { return ActionResult.PASS; } if (useCompass()) { @@ -319,7 +322,7 @@ public class WishingCompassSolver { } ItemStack stack = CLIENT.player.getStackInHand(hand); //make sure the user is in the crystal hollows and holding the wishing compass - if (!Utils.isInCrystalHollows() || !SkyblockerConfigManager.get().mining.crystalsWaypoints.WishingCompassSolver || !Objects.equals(stack.getSkyblockId(), "WISHING_COMPASS")) { + if (!Utils.isInCrystalHollows() || !SkyblockerConfigManager.get().mining.crystalsWaypoints.wishingCompassSolver || !Objects.equals(stack.getSkyblockId(), "WISHING_COMPASS")) { return TypedActionResult.pass(stack); } if (useCompass()) { |