Option to share fairy grottos (#1072)

* Option to share fairy grottos * Update CrystalsLocationsManager
SkyblockerMod · Dec 13, 2024 · e0559a5 · e0559a5
1 parent 911030d
commit e0559a5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 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
@@ -197,7 +197,14 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
                                         newValue -> config.mining.crystalsWaypoints.wishingCompassSolver = newValue)
                                 .controller(ConfigUtils::createBooleanController)
                                 .build())
-
+						.option(Option.<Boolean>createBuilder()
+								.name(Text.translatable("skyblocker.config.mining.crystalsWaypoints.shareFairyGrotto"))
+								.description(OptionDescription.of(Text.translatable("skyblocker.config.mining.crystalsWaypoints.shareFairyGrotto.@Tooltip")))
+								.binding(defaults.mining.crystalsWaypoints.shareFairyGrotto,
+										() -> config.mining.crystalsWaypoints.shareFairyGrotto,
+										newValue -> config.mining.crystalsWaypoints.shareFairyGrotto = newValue)
+								.controller(ConfigUtils::createBooleanController)
+								.build())
                         .build())
 
                 //commission waypoints

diff --git a/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/MiningConfig.java
@@ -111,6 +111,9 @@ public static class CrystalsWaypoints {
 
         @SerialEntry
         public boolean wishingCompassSolver = true;
+
+		@SerialEntry
+		public boolean shareFairyGrotto = true;
     }
 
     public static class CommissionWaypoints {

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsLocationsManager.java
@@ -34,7 +34,6 @@
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3d;
 import org.slf4j.Logger;
 
 import java.util.*;
@@ -68,7 +67,7 @@ public class CrystalsLocationsManager {
 
     protected static Map<String, MiningLocationLabel> activeWaypoints = new HashMap<>();
     protected static List<String> verifiedWaypoints = new ArrayList<>();
-    private static List<MiningLocationLabel.CrystalHollowsLocationsCategory> waypointsSent2Socket = new ArrayList<>();
+    private static final List<MiningLocationLabel.CrystalHollowsLocationsCategory> waypointsSent2Socket = new ArrayList<>();
 
     @Init
     public static void init() {
@@ -325,6 +324,7 @@ public static int removeWaypoint(String place) {
 
     public static void addCustomWaypointFromSocket(MiningLocationLabel.CrystalHollowsLocationsCategory category, BlockPos pos) {
         if (activeWaypoints.containsKey(category.getName())) return;
+        if (category == MiningLocationLabel.CrystalHollowsLocationsCategory.FAIRY_GROTTO && !SkyblockerConfigManager.get().mining.crystalsWaypoints.shareFairyGrotto) return;
 
         removeUnknownNear(pos);
         MiningLocationLabel waypoint = new MiningLocationLabel(category, pos);
@@ -396,9 +396,10 @@ private static void update() {
     }
 
     private static void trySendWaypoint2Socket(MiningLocationLabel.CrystalHollowsLocationsCategory category) {
-        if (!waypointsSent2Socket.contains(category)) {
-            WsMessageHandler.sendMessage(Service.CRYSTAL_WAYPOINTS, new CrystalsWaypointMessage(category, CLIENT.player.getBlockPos()));
-            waypointsSent2Socket.add(category);
-        }
+        if (waypointsSent2Socket.contains(category)) return;
+        if (category == MiningLocationLabel.CrystalHollowsLocationsCategory.FAIRY_GROTTO && !SkyblockerConfigManager.get().mining.crystalsWaypoints.shareFairyGrotto) return;
+
+        WsMessageHandler.sendMessage(Service.CRYSTAL_WAYPOINTS, new CrystalsWaypointMessage(category, CLIENT.player.getBlockPos()));
+        waypointsSent2Socket.add(category);
     }
 }
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -578,6 +578,8 @@
   "skyblocker.config.mining.crystalsWaypoints.shareFail": "Can only share waypoints you have found.",
   "skyblocker.config.mining.crystalsWaypoints.removeSuccess": "Removed waypoint for ",
   "skyblocker.config.mining.crystalsWaypoints.removeFail": "Can only remove waypoints you have found.",
+  "skyblocker.config.mining.crystalsWaypoints.shareFairyGrotto": "Share Fairy Grotto",
+  "skyblocker.config.mining.crystalsWaypoints.shareFairyGrotto.@Tooltip": "Share Fairy Grotto locations to the web socket.",
   "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver": "Wishing Compass Solver",
   "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.@Tooltip": "Calculates and adds a waypoint at the location indicated by wishing compasses.",
   "skyblocker.config.mining.crystalsWaypoints.wishingCompassSolver.enableTabMessage": "Enable crystals in the /tab to allow the compass to identify discovered items",