Location Isolation + Fixed Duplicate Labels Due To Upstream Merge

Author: cev-api

README.md

@@ -71,7 +71,16 @@ My fork still remains different, has different commands and retains the opacity
 
 ![Map1](https://i.imgur.com/w5U6Aux.png) ![Map2](https://i.imgur.com/MXqXY5n.png)
 
+### Location/Feature Isolation
+Ctrl+Click a location icon in SeedMap to isolate it (hide all other icons). Ctrl+Click the same icon again to restore your previous icon set.
+
+You can Ctrl+Click other locations without losing your original selection, as long as you toggle the same icon off again (Ctrl+Click twice) and you don’t add or remove any locations in between.
+
+Special case: Ctrl+Clicking the spawn icon also auto-centers the map on spawn. Your player icon will also remain on, so long as it was enabled to begin with.
+
 ### Icon Text
+This has been implemented in the [upstream](https://github.com/xpple/SeedMapper/commit/ccc9ec0e044465518e96e9b8d7ac458f671af1c5)! However my variant also covers the icons on the map itself.
+
 When hovering over location icons in the SeedMap it will display text telling you what the locations are.
 
 ![Text](https://i.imgur.com/A5gCXgP.png)

src/main/java/dev/xpple/seedmapper/seedmap/FeatureToggleWidget.java

@@ -1,20 +1,23 @@
 package dev.xpple.seedmapper.seedmap;
 
 import dev.xpple.seedmapper.config.Configs;
+import com.mojang.blaze3d.platform.InputConstants;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.components.Tooltip;
 import net.minecraft.network.chat.Component;
 import net.minecraft.util.ARGB;
+import org.lwjgl.glfw.GLFW;
 
 public class FeatureToggleWidget extends Button {
 
     private final MapFeature feature;
+    private static java.util.EnumSet<MapFeature> savedToggles = null;
+    private static MapFeature isolatedFeature = null;
 
     public FeatureToggleWidget(MapFeature feature, int x, int y) {
         super(x, y, feature.getDefaultTexture().width(), feature.getDefaultTexture().height(), Component.literal(feature.getName()), FeatureToggleWidget::onButtonPress, DEFAULT_NARRATION);
         this.feature = feature;
-        this.setTooltip(Tooltip.create(Component.literal(this.feature.getName())));
     }
 
     public Component getTooltip() {
@@ -36,8 +39,46 @@ private static void onButtonPress(Button button) {
         if (!(button instanceof FeatureToggleWidget widget)) {
             return;
         }
+        if (isControlDown()) {
+            if (savedToggles != null && isolatedFeature == widget.feature) {
+                Configs.ToggledFeatures.clear();
+                Configs.ToggledFeatures.addAll(savedToggles);
+                savedToggles = null;
+                isolatedFeature = null;
+                return;
+            }
+            if (savedToggles == null) {
+                savedToggles = java.util.EnumSet.copyOf(Configs.ToggledFeatures);
+            }
+            boolean keepPlayerIcon = Configs.ToggledFeatures.contains(MapFeature.PLAYER_ICON);
+            Configs.ToggledFeatures.clear();
+            Configs.ToggledFeatures.add(widget.feature);
+            if (keepPlayerIcon) {
+                Configs.ToggledFeatures.add(MapFeature.PLAYER_ICON);
+            }
+            isolatedFeature = widget.feature;
+            if (widget.feature == MapFeature.WORLD_SPAWN) {
+                centerOnWorldSpawnIfOpen();
+            }
+            return;
+        }
+        savedToggles = null;
+        isolatedFeature = null;
         if (!Configs.ToggledFeatures.remove(widget.feature)) {
             Configs.ToggledFeatures.add(widget.feature);
         }
     }
+
+    private static boolean isControlDown() {
+        var window = Minecraft.getInstance().getWindow();
+        return InputConstants.isKeyDown(window, GLFW.GLFW_KEY_LEFT_CONTROL)
+            || InputConstants.isKeyDown(window, GLFW.GLFW_KEY_RIGHT_CONTROL);
+    }
+
+    private static void centerOnWorldSpawnIfOpen() {
+        Minecraft minecraft = Minecraft.getInstance();
+        if (minecraft.screen instanceof SeedMapScreen screen) {
+            screen.centerOnWorldSpawn();
+        }
+    }
 }

src/main/java/dev/xpple/seedmapper/seedmap/SeedMapScreen.java

@@ -1316,6 +1316,11 @@ protected void moveCenter(QuartPos2f newCenter) {
         }
     }
 
+    void centerOnWorldSpawn() {
+        BlockPos spawnPoint = spawnDataCache.computeIfAbsent(this.worldIdentifier, _ -> this.calculateSpawnData());
+        this.moveCenter(QuartPos2f.fromQuartPos(QuartPos2.fromBlockPos(spawnPoint)));
+    }
+
     @Override
     public void tick() {
         super.tick();