Abstract away the Baritone tab, the settings are now provided by the …

…current path manager
MeteorDevelopment · Oct 21, 2023 · 6f7a2f2 · 6f7a2f2
1 parent 9ac7936
commit 6f7a2f2
Show file tree

Hide file tree

Showing 9 changed files with 193 additions and 154 deletions.
diff --git a/src/main/java/meteordevelopment/meteorclient/gui/tabs/Tabs.java b/src/main/java/meteordevelopment/meteorclient/gui/tabs/Tabs.java
@@ -26,8 +26,8 @@ public static void init() {
         add(new MacrosTab());
         add(new ProfilesTab());
 
-        if (BaritoneUtils.IS_AVAILABLE) {
-            add(new BaritoneTab());
+        if (PathManagers.get().getSettings().get().sizeGroups() > 0) {
+            add(new PathManagerTab());
         }
     }
 

diff --git a/src/main/java/meteordevelopment/meteorclient/gui/tabs/builtin/PathManagerTab.java b/src/main/java/meteordevelopment/meteorclient/gui/tabs/builtin/PathManagerTab.java
@@ -0,0 +1,59 @@
+/*
+ * This file is part of the Meteor Client distribution (https://github.com/MeteorDevelopment/meteor-client).
+ * Copyright (c) Meteor Development.
+ */
+
+package meteordevelopment.meteorclient.gui.tabs.builtin;
+
+import baritone.api.BaritoneAPI;
+import baritone.api.utils.SettingsUtil;
+import meteordevelopment.meteorclient.gui.GuiTheme;
+import meteordevelopment.meteorclient.gui.tabs.Tab;
+import meteordevelopment.meteorclient.gui.tabs.TabScreen;
+import meteordevelopment.meteorclient.gui.tabs.WindowTabScreen;
+import meteordevelopment.meteorclient.gui.widgets.input.WTextBox;
+import meteordevelopment.meteorclient.pathing.PathManagers;
+import net.minecraft.client.gui.screen.Screen;
+
+public class PathManagerTab extends Tab {
+    public PathManagerTab() {
+        super(PathManagers.get().getName());
+    }
+
+    @Override
+    public TabScreen createScreen(GuiTheme theme) {
+        return new PathManagerScreen(theme, this);
+    }
+
+    @Override
+    public boolean isScreen(Screen screen) {
+        return screen instanceof PathManagerScreen;
+    }
+
+    private static class PathManagerScreen extends WindowTabScreen {
+        public PathManagerScreen(GuiTheme theme, Tab tab) {
+            super(theme, tab);
+
+            PathManagers.get().getSettings().get().onActivated();
+        }
+
+        @Override
+        public void initWidgets() {
+            WTextBox filter = add(theme.textBox("")).minWidth(400).expandX().widget();
+            filter.setFocused(true);
+            filter.action = () -> {
+                clear();
+
+                add(filter);
+                add(theme.settings(PathManagers.get().getSettings().get(), filter.get().trim())).expandX();
+            };
+
+            add(theme.settings(PathManagers.get().getSettings().get(), filter.get().trim())).expandX();
+        }
+
+        @Override
+        protected void onClosed() {
+            SettingsUtil.save(BaritoneAPI.getSettings());
+        }
+    }
+}
diff --git a/src/main/java/meteordevelopment/meteorclient/pathing/BaritonePathManager.java b/src/main/java/meteordevelopment/meteorclient/pathing/BaritonePathManager.java
@@ -33,7 +33,7 @@
 
 public class BaritonePathManager implements IPathManager {
     private final VarHandle rotationField;
-    private final Settings settings;
+    private final BaritoneSettings settings;
 
     private GoalDirection directionGoal;
     private boolean pathingPaused;
@@ -60,12 +60,17 @@ public BaritonePathManager() {
         this.rotationField = rotationField;
 
         // Create settings
-        settings = new Settings();
+        settings = new BaritoneSettings();
 
         // Baritone pathing control
         BaritoneAPI.getProvider().getPrimaryBaritone().getPathingControlManager().registerProcess(new BaritoneProcess());
     }
 
+    @Override
+    public String getName() {
+        return "Baritone";
+    }
+
     @Override
     public boolean isPathing() {
         return BaritoneAPI.getProvider().getPrimaryBaritone().getPathingBehavior().isPathing();
@@ -141,48 +146,6 @@ private void onTick(TickEvent.Pre event) {
         directionGoal.tick();
     }
 
-    private static class Settings implements ISettings {
-        @Override
-        public boolean getWalkOnWater() {
-            return BaritoneAPI.getSettings().assumeWalkOnWater.value;
-        }
-
-        @Override
-        public void setWalkOnWater(boolean value) {
-            BaritoneAPI.getSettings().assumeWalkOnWater.value = value;
-        }
-
-        @Override
-        public boolean getWalkOnLava() {
-            return BaritoneAPI.getSettings().assumeWalkOnLava.value;
-        }
-
-        @Override
-        public void setWalkOnLava(boolean value) {
-            BaritoneAPI.getSettings().assumeWalkOnLava.value = value;
-        }
-
-        @Override
-        public boolean getStep() {
-            return BaritoneAPI.getSettings().assumeStep.value;
-        }
-
-        @Override
-        public void setStep(boolean value) {
-            BaritoneAPI.getSettings().assumeStep.value = value;
-        }
-
-        @Override
-        public boolean getNoFall() {
-            return BaritoneAPI.getSettings().maxFallHeightNoWater.value > BaritoneAPI.getSettings().maxFallHeightNoWater.defaultValue;
-        }
-
-        @Override
-        public void setNoFall(boolean value) {
-            BaritoneAPI.getSettings().maxFallHeightNoWater.value = value ? 159159 : BaritoneAPI.getSettings().maxFallHeightNoWater.defaultValue;
-        }
-    }
-
     private static class GoalDirection implements Goal {
         private static final double SQRT_2 = Math.sqrt(2);