Refactored managers, and optimized AutoFarm + ChestESP

src/main/java/net/aoba/AobaClient.java

@@ -26,18 +26,18 @@
 
 import com.mojang.logging.LogUtils;
 
-import net.aoba.altmanager.AltManager;
+import net.aoba.managers.altmanager.AltManager;
 import net.aoba.api.IAddon;
 import net.aoba.cmd.CommandManager;
 import net.aoba.cmd.GlobalChat;
-import net.aoba.combatmanager.CombatManager;
+import net.aoba.managers.CombatManager;
 import net.aoba.event.EventManager;
 import net.aoba.gui.GuiManager;
 import net.aoba.gui.font.FontManager;
-import net.aoba.macros.MacroManager;
+import net.aoba.managers.macros.MacroManager;
 import net.aoba.mixin.interfaces.IMinecraftClient;
 import net.aoba.module.ModuleManager;
-import net.aoba.proxymanager.ProxyManager;
+import net.aoba.managers.proxymanager.ProxyManager;
 import net.aoba.settings.SettingManager;
 import net.aoba.settings.friends.FriendsList;
 import net.aoba.utils.discord.RPCManager;

src/main/java/net/aoba/gui/navigation/windows/GoToWindow.java

@@ -21,11 +21,11 @@
 import net.aoba.gui.components.StringComponent;
 import net.aoba.gui.components.TextBoxComponent;
 import net.aoba.gui.navigation.Window;
-import net.aoba.pathfinding.AbstractPathManager;
-import net.aoba.pathfinding.FlyPathManager;
-import net.aoba.pathfinding.PathNode;
-import net.aoba.pathfinding.TeleportPathManager;
-import net.aoba.pathfinding.WalkingPathManager;
+import net.aoba.managers.pathfinding.AbstractPathManager;
+import net.aoba.managers.pathfinding.FlyPathManager;
+import net.aoba.managers.pathfinding.PathNode;
+import net.aoba.managers.pathfinding.TeleportPathManager;
+import net.aoba.managers.pathfinding.WalkingPathManager;
 import net.aoba.settings.SettingManager;
 import net.aoba.settings.types.BooleanSetting;
 import net.aoba.settings.types.EnumSetting;

src/main/java/net/aoba/gui/navigation/windows/MacroWindow.java

@@ -16,7 +16,7 @@
 import net.aoba.gui.components.StringComponent;
 import net.aoba.gui.components.TextBoxComponent;
 import net.aoba.gui.navigation.Window;
-import net.aoba.macros.Macro;
+import net.aoba.managers.macros.Macro;
 
 public class MacroWindow extends Window {
 	private ButtonComponent startButton;

src/main/java/net/aoba/gui/screens/alts/AddAltScreen.java

@@ -19,14 +19,12 @@
 package net.aoba.gui.screens.alts;
 
 import net.aoba.Aoba;
-import net.aoba.altmanager.Alt;
+import net.aoba.managers.altmanager.Alt;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.CheckboxWidget;
 import net.minecraft.client.gui.widget.TextFieldWidget;
-import net.minecraft.text.OrderedText;
-import net.minecraft.text.Style;
 import net.minecraft.text.Text;
 
 public class AddAltScreen extends Screen {

src/main/java/net/aoba/gui/screens/alts/AltScreen.java

@@ -21,7 +21,7 @@
 import java.util.List;
 
 import net.aoba.Aoba;
-import net.aoba.altmanager.Alt;
+import net.aoba.managers.altmanager.Alt;
 import net.aoba.utils.render.TextureBank;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.CubeMapRenderer;

src/main/java/net/aoba/gui/screens/alts/AltSelectionList.java

@@ -28,7 +28,7 @@
 import com.mojang.authlib.GameProfile;
 import com.mojang.blaze3d.systems.RenderSystem;
 
-import net.aoba.altmanager.Alt;
+import net.aoba.managers.altmanager.Alt;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;

src/main/java/net/aoba/gui/screens/alts/DirectLoginAltScreen.java

@@ -19,7 +19,7 @@
 package net.aoba.gui.screens.alts;
 
 import net.aoba.Aoba;
-import net.aoba.altmanager.Alt;
+import net.aoba.managers.altmanager.Alt;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;

src/main/java/net/aoba/gui/screens/alts/EditAltScreen.java

@@ -19,14 +19,12 @@
 package net.aoba.gui.screens.alts;
 
 import net.aoba.Aoba;
-import net.aoba.altmanager.Alt;
+import net.aoba.managers.altmanager.Alt;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.CheckboxWidget;
 import net.minecraft.client.gui.widget.TextFieldWidget;
-import net.minecraft.text.OrderedText;
-import net.minecraft.text.Style;
 import net.minecraft.text.Text;
 
 public class EditAltScreen extends Screen {

src/main/java/net/aoba/gui/screens/proxy/AddProxyScreen.java

@@ -1,7 +1,7 @@
 package net.aoba.gui.screens.proxy;
 
 import net.aoba.Aoba;
-import net.aoba.proxymanager.Socks5Proxy;
+import net.aoba.managers.proxymanager.Socks5Proxy;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;

src/main/java/net/aoba/gui/screens/proxy/EditProxyScreen.java

@@ -18,8 +18,7 @@
 
 package net.aoba.gui.screens.proxy;
 
-import net.aoba.Aoba;
-import net.aoba.proxymanager.Socks5Proxy;
+import net.aoba.managers.proxymanager.Socks5Proxy;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;

src/main/java/net/aoba/gui/screens/proxy/ProxyScreen.java

@@ -1,7 +1,7 @@
 package net.aoba.gui.screens.proxy;
 
 import net.aoba.Aoba;
-import net.aoba.proxymanager.Socks5Proxy;
+import net.aoba.managers.proxymanager.Socks5Proxy;
 import net.aoba.utils.render.TextureBank;
 import net.minecraft.client.gui.CubeMapRenderer;
 import net.minecraft.client.gui.DrawContext;

src/main/java/net/aoba/gui/screens/proxy/ProxySelectionList.java

@@ -3,7 +3,7 @@
 import net.aoba.utils.render.Render2D;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.aoba.proxymanager.Socks5Proxy;
+import net.aoba.managers.proxymanager.Socks5Proxy;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;

src/main/java/net/aoba/combatmanager/CombatManager.java → src/main/java/net/aoba/managers/CombatManager.java

@@ -1,4 +1,4 @@
-package net.aoba.combatmanager;
+package net.aoba.managers;
 
 import net.aoba.Aoba;
 import net.aoba.event.events.ReceivePacketEvent;

src/main/java/net/aoba/altmanager/Alt.java → src/main/java/net/aoba/managers/altmanager/Alt.java

@@ -19,10 +19,10 @@
 /**
  * A class to represent an Alt Account and all of it's information.
  */
-package net.aoba.altmanager;
+package net.aoba.managers.altmanager;
 
-import net.aoba.altmanager.login.AuthToken;
-import net.aoba.altmanager.login.MicrosoftAuth;
+import net.aoba.managers.altmanager.login.AuthToken;
+import net.aoba.managers.altmanager.login.MicrosoftAuth;
 
 public class Alt {
 	private String email;

src/main/java/net/aoba/altmanager/AltManager.java → src/main/java/net/aoba/managers/altmanager/AltManager.java

@@ -19,7 +19,7 @@
 /**
  * A class to represent a system to manage Alt accounts.
  */
-package net.aoba.altmanager;
+package net.aoba.managers.altmanager;
 
 import java.io.File;
 import java.io.FileReader;
@@ -40,7 +40,7 @@
 import com.mojang.logging.LogUtils;
 
 import net.aoba.AobaClient;
-import net.aoba.altmanager.login.MicrosoftAuth;
+import net.aoba.managers.altmanager.login.MicrosoftAuth;
 import net.aoba.mixin.interfaces.IMinecraftClient;
 import net.aoba.utils.system.HWIDUtil;
 import net.minecraft.client.MinecraftClient;

src/main/java/net/aoba/altmanager/XboxLiveToken.java → src/main/java/net/aoba/managers/altmanager/XboxLiveToken.java

@@ -19,7 +19,7 @@
 /**
  * A class to represent an Xbox Live Token.
  */
-package net.aoba.altmanager;
+package net.aoba.managers.altmanager;
 
 public class XboxLiveToken {
 	private final String token;

src/main/java/net/aoba/altmanager/login/AuthToken.java → src/main/java/net/aoba/managers/altmanager/login/AuthToken.java

@@ -1,4 +1,4 @@
-package net.aoba.altmanager.login;
+package net.aoba.managers.altmanager.login;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;

src/main/java/net/aoba/altmanager/login/Claim.java → src/main/java/net/aoba/managers/altmanager/login/Claim.java

@@ -1,4 +1,4 @@
-package net.aoba.altmanager.login;
+package net.aoba.managers.altmanager.login;
 
 public class Claim {
 	public final String uhs;

src/main/java/net/aoba/altmanager/login/DisplayClaims.java → src/main/java/net/aoba/managers/altmanager/login/DisplayClaims.java

@@ -1,4 +1,4 @@
-package net.aoba.altmanager.login;
+package net.aoba.managers.altmanager.login;
 
 public class DisplayClaims {
 	public final Claim[] xui;

src/main/java/net/aoba/altmanager/login/EntitlementToken.java → src/main/java/net/aoba/managers/altmanager/login/EntitlementToken.java

@@ -1,4 +1,4 @@
-package net.aoba.altmanager.login;
+package net.aoba.managers.altmanager.login;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;

src/main/java/net/aoba/altmanager/login/MCAuthToken.java → src/main/java/net/aoba/managers/altmanager/login/MCAuthToken.java

@@ -1,4 +1,4 @@
-package net.aoba.altmanager.login;
+package net.aoba.managers.altmanager.login;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;

src/main/java/net/aoba/altmanager/login/MicrosoftAuth.java → src/main/java/net/aoba/managers/altmanager/login/MicrosoftAuth.java

@@ -1,4 +1,4 @@
-package net.aoba.altmanager.login;
+package net.aoba.managers.altmanager.login;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -16,7 +16,7 @@
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
 
-import net.aoba.altmanager.Alt;
+import net.aoba.managers.altmanager.Alt;
 import net.aoba.mixin.interfaces.IMinecraftClient;
 import net.aoba.utils.http.HttpUtils;
 import net.minecraft.client.MinecraftClient;

src/main/java/net/aoba/altmanager/login/ProfileToken.java → src/main/java/net/aoba/managers/altmanager/login/ProfileToken.java

@@ -1,4 +1,4 @@
-package net.aoba.altmanager.login;
+package net.aoba.managers.altmanager.login;
 
 import com.google.gson.JsonObject;
 

src/main/java/net/aoba/altmanager/login/XSTSToken.java → src/main/java/net/aoba/managers/altmanager/login/XSTSToken.java

@@ -1,4 +1,4 @@
-package net.aoba.altmanager.login;
+package net.aoba.managers.altmanager.login;
 
 import java.util.Map;
 

src/main/java/net/aoba/macros/Macro.java → src/main/java/net/aoba/managers/macros/Macro.java

@@ -1,4 +1,4 @@
-package net.aoba.macros;
+package net.aoba.managers.macros;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -9,11 +9,11 @@
 import java.io.IOException;
 import java.util.LinkedList;
 
-import net.aoba.macros.actions.KeyClickMacroEvent;
-import net.aoba.macros.actions.MacroEvent;
-import net.aoba.macros.actions.MouseClickMacroEvent;
-import net.aoba.macros.actions.MouseMoveMacroEvent;
-import net.aoba.macros.actions.MouseScrollMacroEvent;
+import net.aoba.managers.macros.actions.KeyClickMacroEvent;
+import net.aoba.managers.macros.actions.MacroEvent;
+import net.aoba.managers.macros.actions.MouseClickMacroEvent;
+import net.aoba.managers.macros.actions.MouseMoveMacroEvent;
+import net.aoba.managers.macros.actions.MouseScrollMacroEvent;
 import net.minecraft.client.MinecraftClient;
 
 public class Macro {

src/main/java/net/aoba/macros/MacroManager.java → src/main/java/net/aoba/managers/macros/MacroManager.java

@@ -1,4 +1,4 @@
-package net.aoba.macros;
+package net.aoba.managers.macros;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/net/aoba/macros/MacroPlayer.java → src/main/java/net/aoba/managers/macros/MacroPlayer.java

@@ -1,11 +1,11 @@
-package net.aoba.macros;
+package net.aoba.managers.macros;
 
 import java.util.LinkedList;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 import net.aoba.Aoba;
-import net.aoba.macros.actions.MacroEvent;
+import net.aoba.managers.macros.actions.MacroEvent;
 
 public class MacroPlayer {
 

src/main/java/net/aoba/macros/MacroRecorder.java → src/main/java/net/aoba/managers/macros/MacroRecorder.java

@@ -1,4 +1,4 @@
-package net.aoba.macros;
+package net.aoba.managers.macros;
 
 import java.util.LinkedList;
 
@@ -13,11 +13,11 @@
 import net.aoba.event.listeners.MouseClickListener;
 import net.aoba.event.listeners.MouseMoveListener;
 import net.aoba.event.listeners.MouseScrollListener;
-import net.aoba.macros.actions.KeyClickMacroEvent;
-import net.aoba.macros.actions.MacroEvent;
-import net.aoba.macros.actions.MouseClickMacroEvent;
-import net.aoba.macros.actions.MouseMoveMacroEvent;
-import net.aoba.macros.actions.MouseScrollMacroEvent;
+import net.aoba.managers.macros.actions.KeyClickMacroEvent;
+import net.aoba.managers.macros.actions.MacroEvent;
+import net.aoba.managers.macros.actions.MouseClickMacroEvent;
+import net.aoba.managers.macros.actions.MouseMoveMacroEvent;
+import net.aoba.managers.macros.actions.MouseScrollMacroEvent;
 
 public class MacroRecorder
 		implements MouseClickListener, MouseMoveListener, MouseScrollListener, KeyDownListener, KeyUpListener {

src/main/java/net/aoba/macros/actions/KeyClickMacroEvent.java → src/main/java/net/aoba/managers/macros/actions/KeyClickMacroEvent.java

@@ -1,4 +1,4 @@
-package net.aoba.macros.actions;
+package net.aoba.managers.macros.actions;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;

src/main/java/net/aoba/macros/actions/MacroEvent.java → src/main/java/net/aoba/managers/macros/actions/MacroEvent.java

@@ -1,4 +1,4 @@
-package net.aoba.macros.actions;
+package net.aoba.managers.macros.actions;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;

src/main/java/net/aoba/macros/actions/MouseClickMacroEvent.java → src/main/java/net/aoba/managers/macros/actions/MouseClickMacroEvent.java

@@ -1,4 +1,4 @@
-package net.aoba.macros.actions;
+package net.aoba.managers.macros.actions;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;

src/main/java/net/aoba/macros/actions/MouseMoveMacroEvent.java → src/main/java/net/aoba/managers/macros/actions/MouseMoveMacroEvent.java

@@ -1,4 +1,4 @@
-package net.aoba.macros.actions;
+package net.aoba.managers.macros.actions;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;

src/main/java/net/aoba/macros/actions/MouseScrollMacroEvent.java → src/main/java/net/aoba/managers/macros/actions/MouseScrollMacroEvent.java

@@ -1,9 +1,7 @@
-package net.aoba.macros.actions;
+package net.aoba.managers.macros.actions;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 
 import net.aoba.mixin.interfaces.IMouse;

src/main/java/net/aoba/pathfinding/AbstractPathManager.java → src/main/java/net/aoba/managers/pathfinding/AbstractPathManager.java

@@ -1,4 +1,4 @@
-package net.aoba.pathfinding;
+package net.aoba.managers.pathfinding;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/net/aoba/pathfinding/FlyPathManager.java → src/main/java/net/aoba/managers/pathfinding/FlyPathManager.java

@@ -1,4 +1,4 @@
-package net.aoba.pathfinding;
+package net.aoba.managers.pathfinding;
 
 import java.util.ArrayList;
 import java.util.Comparator;

src/main/java/net/aoba/pathfinding/PathNode.java → src/main/java/net/aoba/managers/pathfinding/PathNode.java

@@ -1,4 +1,4 @@
-package net.aoba.pathfinding;
+package net.aoba.managers.pathfinding;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.fluid.FluidState;

src/main/java/net/aoba/pathfinding/TeleportPathManager.java → src/main/java/net/aoba/managers/pathfinding/TeleportPathManager.java

@@ -1,4 +1,4 @@
-package net.aoba.pathfinding;
+package net.aoba.managers.pathfinding;
 
 import java.util.ArrayList;
 import java.util.Comparator;

src/main/java/net/aoba/pathfinding/WalkingPathManager.java → src/main/java/net/aoba/managers/pathfinding/WalkingPathManager.java

@@ -1,4 +1,4 @@
-package net.aoba.pathfinding;
+package net.aoba.managers.pathfinding;
 
 import java.util.ArrayList;
 import java.util.Comparator;

src/main/java/net/aoba/proxymanager/ProxyManager.java → src/main/java/net/aoba/managers/proxymanager/ProxyManager.java

@@ -1,4 +1,4 @@
-package net.aoba.proxymanager;
+package net.aoba.managers.proxymanager;
 
 import java.io.File;
 import java.io.FileReader;

src/main/java/net/aoba/proxymanager/Socks5Proxy.java → src/main/java/net/aoba/managers/proxymanager/Socks5Proxy.java

@@ -1,4 +1,4 @@
-package net.aoba.proxymanager;
+package net.aoba.managers.proxymanager;
 
 public class Socks5Proxy {
     private String ip;