Added Command Syntax Field and improved Autocorrecting fields.

coltonk9043 · Jun 24, 2023 · a690166 · a690166
1 parent de8f1ba
commit a690166
Show file tree

Hide file tree

Showing 30 changed files with 875 additions and 706 deletions.
diff --git a/src/main/java/net/aoba/cmd/Command.java b/src/main/java/net/aoba/cmd/Command.java
@@ -29,12 +29,14 @@
 public abstract class Command {
 	protected final String name;
 	protected final String description;
+	protected final String syntax;
 
 	protected static final MinecraftClient mc = AobaClient.MC;
 
-	public Command(String name, String description) {
+	public Command(String name, String description, String syntax) {
 		this.name = Objects.requireNonNull(name);
 		this.description = Objects.requireNonNull(description);
+		this.syntax = Objects.requireNonNull(syntax);
 	}
 
 	/**
@@ -53,11 +55,19 @@ public String getDescription() {
 		return this.description;
 	}
 
+	/**
+	 * Gets the syntax of the command.
+	 * @return The syntax of the command.
+	 */
+	public String getSyntax() {
+		return this.syntax;
+	}
+
 	/**
 	 * Runs the intended action of the command.
 	 * @param parameters The parameters being passed.
 	 */
-	public abstract void runCommand(String[] parameters);
+	public abstract void runCommand(String[] parameters) throws InvalidSyntaxException;
 
 	/**
 	 * Gets the next Autocorrect suggestions given the last typed parameter.

diff --git a/src/main/java/net/aoba/cmd/CommandException.java b/src/main/java/net/aoba/cmd/CommandException.java
@@ -0,0 +1,12 @@
+package net.aoba.cmd;
+
+public abstract class CommandException extends Exception{
+	private static final long serialVersionUID = 1L;
+	protected Command cmd;
+
+	public CommandException(Command cmd) {
+		this.cmd = cmd;
+	}
+
+	public abstract void PrintToChat();
+}
diff --git a/src/main/java/net/aoba/cmd/CommandManager.java b/src/main/java/net/aoba/cmd/CommandManager.java
@@ -131,9 +131,8 @@ public void command(String[] commandIn) {
 				// Runs the command.
 				command.runCommand(parameterList);
 			}
-		} catch (Exception e) {
-			System.out.println("Error occured whilst running command. Please try again.");
-			e.printStackTrace();
+		} catch (InvalidSyntaxException e) {
+			e.PrintToChat();
 		}
 	}
 

diff --git a/src/main/java/net/aoba/cmd/InvalidSyntaxException.java b/src/main/java/net/aoba/cmd/InvalidSyntaxException.java
@@ -0,0 +1,35 @@
+/*
+* Aoba Hacked Client
+* Copyright (C) 2019-2023 coltonk9043
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/**
+ * A class to represent an exception thrown when a command is typed with invalid syntax.
+ */
+package net.aoba.cmd;
+
+public class InvalidSyntaxException extends CommandException {
+	private static final long serialVersionUID = 1L;
+
+	public InvalidSyntaxException(Command cmd) {
+		super(cmd);
+	}
+
+	@Override
+	public void PrintToChat() {
+		CommandManager.sendChatMessage("Invalid Usage! Usage: .aoba " + cmd.getName() + " " + cmd.getSyntax());
+	}
+}
diff --git a/src/main/java/net/aoba/cmd/commands/CmdAimbot.java b/src/main/java/net/aoba/cmd/commands/CmdAimbot.java
@@ -21,43 +21,47 @@
 import net.aoba.Aoba;
 import net.aoba.cmd.Command;
 import net.aoba.cmd.CommandManager;
+import net.aoba.cmd.InvalidSyntaxException;
 import net.aoba.module.modules.combat.Aimbot;
 
 public class CmdAimbot extends Command {
 
 	public CmdAimbot() {
-		super("aimbot", "Allows the player to see chest locations through ESP");
+		super("aimbot", "Allows the player to see chest locations through ESP", "[toggle/mode] [value]");
 	}
 
 	@Override
-	public void runCommand(String[] parameters) {
+	public void runCommand(String[] parameters) throws InvalidSyntaxException {
+		if (parameters.length != 2)
+			throw new InvalidSyntaxException(this);
+
 		Aimbot module = (Aimbot) Aoba.getInstance().moduleManager.aimbot;
-		if (parameters.length == 2) {
-			switch (parameters[0]) {
-			case "toggle":
-				String state = parameters[1].toLowerCase();
-				if (state.equals("on")) {
-					module.setState(true);
-					CommandManager.sendChatMessage("Aimbot toggled ON");
-				} else if (state.equals("off")) {
-					module.setState(false);
-					CommandManager.sendChatMessage("Aimbot toggled OFF");
-				} else {
-					CommandManager.sendChatMessage("Invalid value. [ON/OFF]");
-				}
-				break;
-			default:
-				CommandManager.sendChatMessage("Invalid Usage! Usage: .aoba aimbot [toggle/mode] [value]");
-				break;
+
+		switch (parameters[0]) {
+		case "toggle":
+			String state = parameters[1].toLowerCase();
+			if (state.equals("on")) {
+				module.setState(true);
+				CommandManager.sendChatMessage("Aimbot toggled ON");
+			} else if (state.equals("off")) {
+				module.setState(false);
+				CommandManager.sendChatMessage("Aimbot toggled OFF");
+			} else {
+				CommandManager.sendChatMessage("Invalid value. [ON/OFF]");
 			}
-		} else {
-			CommandManager.sendChatMessage("Invalid Usage! Usage: .aoba aimbot [toggle/mode] [value]");
+			break;
+		default:
+			throw new InvalidSyntaxException(this);
 		}
 	}
 
 	@Override
 	public String[] getAutocorrect(String previousParameter) {
-		// TODO Auto-generated method stub
-		return null;
+		switch (previousParameter) {
+		case "toggle":
+			return new String[] { "on", "off" };
+		default:
+			return new String[] { "toggle" };
+		}
 	}
 }
diff --git a/src/main/java/net/aoba/cmd/commands/CmdAutoEat.java b/src/main/java/net/aoba/cmd/commands/CmdAutoEat.java
@@ -21,52 +21,58 @@
 import net.aoba.Aoba;
 import net.aoba.cmd.Command;
 import net.aoba.cmd.CommandManager;
+import net.aoba.cmd.InvalidSyntaxException;
 import net.aoba.module.modules.misc.AutoEat;
 
 public class CmdAutoEat extends Command {
 
 	public CmdAutoEat() {
-		super("autoeat", "Automatically eats when the player is hungry.");
+		super("autoeat", "Automatically eats when the player is hungry.", "[toggle/set] [value]");
 	}
 
 	@Override
-	public void runCommand(String[] parameters) {
+	public void runCommand(String[] parameters) throws InvalidSyntaxException {
+		if (parameters.length != 2)
+			throw new InvalidSyntaxException(this);
+
 		AutoEat module = (AutoEat) Aoba.getInstance().moduleManager.autoeat;
-		if (parameters.length == 2) {
-			switch (parameters[0]) {
-			case "toggle":
-				String state = parameters[1].toLowerCase();
-				if (state.equals("on")) {
-					module.setState(true);
-					CommandManager.sendChatMessage("AutoEat toggled ON");
-				} else if (state.equals("off")) {
-					module.setState(false);
-					CommandManager.sendChatMessage("AutoEat toggled OFF");
-				} else {
-					CommandManager.sendChatMessage("Invalid value. [ON/OFF]");
-				}
-				break;
-			case "set":
-				String setting = parameters[1].toLowerCase();
-				if(setting.isEmpty()) {
-					CommandManager.sendChatMessage("Please enter the number of hearts to set to.");
-				}else {
-					module.setHunger((int)Math.min(Double.parseDouble(setting) * 2, 20));
-					CommandManager.sendChatMessage("AutoEat hunger set to " + setting + " hearts.");
-				}
-				break;
-			default:
-				CommandManager.sendChatMessage("Invalid Usage! Usage: .aoba autoeat [toggle/set] [value]");
-				break;
+
+		switch (parameters[0]) {
+		case "toggle":
+			String state = parameters[1].toLowerCase();
+			if (state.equals("on")) {
+				module.setState(true);
+				CommandManager.sendChatMessage("AutoEat toggled ON");
+			} else if (state.equals("off")) {
+				module.setState(false);
+				CommandManager.sendChatMessage("AutoEat toggled OFF");
+			} else {
+				CommandManager.sendChatMessage("Invalid value. [ON/OFF]");
 			}
-		} else {
-			CommandManager.sendChatMessage("Invalid Usage! Usage: .aoba autoeat [toggle/set] [value]");
+			break;
+		case "set":
+			String setting = parameters[1].toLowerCase();
+			if (setting.isEmpty()) {
+				CommandManager.sendChatMessage("Please enter the number of hearts to set to.");
+			} else {
+				module.setHunger((int) Math.min(Double.parseDouble(setting) * 2, 20));
+				CommandManager.sendChatMessage("AutoEat hunger set to " + setting + " hearts.");
+			}
+			break;
+		default:
+			throw new InvalidSyntaxException(this);
 		}
 	}
 
 	@Override
 	public String[] getAutocorrect(String previousParameter) {
-		// TODO Auto-generated method stub
-		return null;
+		switch (previousParameter) {
+		case "toggle":
+			return new String[] { "on", "off" };
+		case "set":
+			return new String[] { "1", "2", "4", "6", "8" };
+		default:
+			return new String[] { "toggle", "set" };
+		}
 	}
 }
diff --git a/src/main/java/net/aoba/cmd/commands/CmdChestESP.java b/src/main/java/net/aoba/cmd/commands/CmdChestESP.java
@@ -21,43 +21,47 @@
 import net.aoba.Aoba;
 import net.aoba.cmd.Command;
 import net.aoba.cmd.CommandManager;
+import net.aoba.cmd.InvalidSyntaxException;
 import net.aoba.module.modules.render.ChestESP;
 
 public class CmdChestESP extends Command {
 
 	public CmdChestESP() {
-		super("chestesp", "Allows the player to see chest locations through ESP");
+		super("chestesp", "Allows the player to see chest locations through ESP", "[toggle] [value]");
 	}
 
 	@Override
-	public void runCommand(String[] parameters) {
+	public void runCommand(String[] parameters) throws InvalidSyntaxException {
+		if (parameters.length != 2)
+			throw new InvalidSyntaxException(this);
+
 		ChestESP module = (ChestESP) Aoba.getInstance().moduleManager.chestesp;
-		if (parameters.length == 2) {
-			switch (parameters[0]) {
-			case "toggle":
-				String state = parameters[1].toLowerCase();
-				if (state.equals("on")) {
-					module.setState(true);
-					CommandManager.sendChatMessage("ChestESP toggled ON");
-				} else if (state.equals("off")) {
-					module.setState(false);
-					CommandManager.sendChatMessage("ChestESP toggled OFF");
-				} else {
-					CommandManager.sendChatMessage("Invalid value. [ON/OFF]");
-				}
-				break;
-			default:
-				CommandManager.sendChatMessage("Invalid Usage! Usage: .aoba chestesp [toggle] [value]");
-				break;
+
+		switch (parameters[0]) {
+		case "toggle":
+			String state = parameters[1].toLowerCase();
+			if (state.equals("on")) {
+				module.setState(true);
+				CommandManager.sendChatMessage("ChestESP toggled ON");
+			} else if (state.equals("off")) {
+				module.setState(false);
+				CommandManager.sendChatMessage("ChestESP toggled OFF");
+			} else {
+				CommandManager.sendChatMessage("Invalid value. [ON/OFF]");
 			}
-		} else {
-			CommandManager.sendChatMessage("Invalid Usage! Usage: .aoba chestesp [toggle] [value]");
+			break;
+		default:
+			throw new InvalidSyntaxException(this);
 		}
 	}
 
 	@Override
 	public String[] getAutocorrect(String previousParameter) {
-		// TODO Auto-generated method stub
-		return null;
+		switch (previousParameter) {
+		case "toggle":
+			return new String[] { "on", "off" };
+		default:
+			return new String[] { "toggle" };
+		}
 	}
 }