Fixed Options Menu

Author: cev-api

README.md

@@ -1,4 +1,4 @@
-# Seedmapper 2.22.x (MC26.1.1) - Modified by CevAPI
+# Seedmapper 2.22.x (MC26.1.2) - Modified by CevAPI
 
 Original Repo: https://github.com/xpple/SeedMapper/
 
@@ -12,6 +12,13 @@ Original instructions apply.
 
 ## Improvements
 
+### Options Menu
+
+You are now able to easily access almost all functionality of SeedMapper via its options menu. There are also new keybinds you can assign and change from within.
+
+![Options](https://i.imgur.com/2skv4Zu.png)
+![Keybinds](https://i.imgur.com/1QG9bho.png)
+
 ### Zoom
 Zoom further out on the SeedMap. Limited to approx 100,000 which is insane already. 
 

src/main/java/dev/xpple/seedmapper/SeedMapperKeybinds.java

@@ -39,6 +39,7 @@ private SeedMapperKeybinds() {}
     private static KeyMapping TOGGLE_PLAYER_ICON;
     private static KeyMapping TOGGLE_DATAPACK_STRUCTURES;
     private static List<KeyMapping> ALL = List.of();
+    private static boolean openOptionsAfterMapOpens;
 
     private static KeyMapping register(String translationKey, int defaultKey) {
         return KeyMappingHelper.registerKeyMapping(new KeyMapping(translationKey, defaultKey, CATEGORY));
@@ -102,6 +103,7 @@ public static void handleClientTick(Minecraft minecraft) {
         while (TOGGLE_OPTIONS.consumeClick()) {
             if (!SeedMapScreen.toggleOptionsFromKeybind(minecraft)) {
                 runCommand(minecraft, "sm:seedmap");
+                openOptionsAfterMapOpens = true;
             }
         }
         while (OPEN_LOOT_VIEWER.consumeClick()) {
@@ -151,6 +153,11 @@ public static void handleClientTick(Minecraft minecraft) {
             Configs.save();
             SeedMapMinimapManager.refreshIfOpen();
         }
+
+        if (openOptionsAfterMapOpens && minecraft.screen instanceof SeedMapScreen) {
+            openOptionsAfterMapOpens = false;
+            SeedMapScreen.toggleOptionsFromKeybind(minecraft);
+        }
     }
 
     private static void runCommand(Minecraft minecraft, String command) {

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

@@ -4835,7 +4835,7 @@ private final class KeybindsScreen extends Screen {
         private @Nullable net.minecraft.client.KeyMapping editingKeybind;
 
         private KeybindsScreen(Screen previous) {
-            super(Component.literal("Minimap Controls"));
+            super(Component.literal("Keybinds"));
             this.previous = previous;
         }
 
@@ -5097,12 +5097,6 @@ protected void init() {
             this.addRenderableWidget(Button.builder(Component.literal("Run Terrain ESP"), button -> SeedMapScreen.this.runTerrainEspHighlight(true))
                 .bounds(left, y, halfWidth, rowHeight)
                 .build());
-            this.addRenderableWidget(Button.builder(Component.literal("Clear ESP"), button -> {
-                RenderManager.clear();
-                SeedMapScreen.this.pushOptionsInfo("Cleared ESP highlights.");
-            }).bounds(left + halfWidth + gap, y, halfWidth, rowHeight).build());
-            y += rowHeight + gap;
-
             this.addRenderableWidget(Button.builder(this.espChunksLabel(), button ->
                 this.minecraft.setScreen(new TextPromptScreen(this, Component.literal("ESP Chunks"), Integer.toString(SeedMapScreen.this.espChunkRange), "0 - 20", 3, value -> {
                     try {
@@ -5116,20 +5110,20 @@ protected void init() {
                         return Component.literal("Enter a value between 0 and 20.");
                     }
                 })))
-                .bounds(left, y, halfWidth, rowHeight)
+                .bounds(left + halfWidth + gap, y, halfWidth, rowHeight)
                 .build());
-            this.addRenderableWidget(Button.builder(this.espFillLabel(), button -> {
-                boolean enabled = !SeedMapScreen.this.selectedEspStyle().FillEnabled;
-                SeedMapScreen.this.updateSelectedEspStyle(style -> style.FillEnabled = enabled);
-                button.setMessage(this.espFillLabel());
-            }).bounds(left + halfWidth + gap, y, halfWidth, rowHeight).build());
             y += rowHeight + gap;
 
             this.addRenderableWidget(Button.builder(this.espProfileLabel(), button ->
                 this.minecraft.setScreen(new EspSettingsScreen(this)))
-                .bounds(left, y, panelWidth, rowHeight)
+                .bounds(left, y, halfWidth, rowHeight)
                 .build());
+            this.addRenderableWidget(Button.builder(Component.literal("Clear ESP"), button -> {
+                RenderManager.clear();
+                SeedMapScreen.this.pushOptionsInfo("Cleared ESP highlights.");
+            }).bounds(left + halfWidth + gap, y, halfWidth, rowHeight).build());
             y += rowHeight + gap;
+
             y += sectionGapLarge;
 
             this.addRenderableWidget(Button.builder(this.datapackUrlLabel(), button ->
@@ -5149,13 +5143,13 @@ protected void init() {
             this.addRenderableWidget(Button.builder(Component.literal("Import Datapack"), button -> SeedMapScreen.this.importDatapackFromOptions(true))
                 .bounds(left + halfWidth + gap, y, halfWidth, rowHeight)
                 .build());
-            y += rowHeight + sectionGapLarge;
+            y += rowHeight + gap;
 
             this.addRenderableWidget(Button.builder(Component.literal("Datapack Settings"), button ->
                 this.minecraft.setScreen(new DatapackSettingsScreen(this)))
                 .bounds(left, y, panelWidth, rowHeight)
                 .build());
-            y += rowHeight + gap;
+            y += rowHeight + sectionGapLarge;
 
             this.addRenderableWidget(Button.builder(Component.literal("Keybinds"), button ->
                 this.minecraft.setScreen(new KeybindsScreen(this)))