Autocomplete OTF Commands

Author: cev-api

src/main/java/net/wurstclient/command/CmdProcessor.java

@@ -16,6 +16,7 @@
 import net.wurstclient.events.ChatOutputListener;
 import net.wurstclient.hack.Hack;
 import net.wurstclient.hacks.TooManyHaxHack;
+import net.wurstclient.other_feature.OtherFeature;
 import net.wurstclient.util.ChatUtils;
 
 public final class CmdProcessor implements ChatOutputListener
@@ -48,6 +49,9 @@ public void process(String input)
 		if(runHackShortcut(input))
 			return;
 
+		if(runOtherFeatureShortcut(input))
+			return;
+		
 		try
 		{
 			Command cmd = parseCmd(input);
@@ -151,6 +155,24 @@ private boolean runHackShortcut(String input)
 		return true;
 	}
 
+	private boolean runOtherFeatureShortcut(String input)
+	{
+		String[] args = input.trim().split("\\s+");
+		if(args.length != 1 || args[0].isEmpty())
+			return false;
+		
+		// If a real command shares this name, let the command parser handle it.
+		if(cmds.getCmdByName(args[0]) != null)
+			return false;
+		
+		OtherFeature otf = WurstClient.INSTANCE.getOtfs().getOtfByName(args[0]);
+		if(otf == null)
+			return false;
+		
+		otf.doPrimaryAction();
+		return true;
+	}
+	
 	private void setHackEnabled(Hack hack, boolean enabled)
 	{
 		TooManyHaxHack tooManyHax =

src/main/java/net/wurstclient/mixin/CommandSuggestionsMixin.java

@@ -27,6 +27,7 @@
 import net.wurstclient.command.Command;
 import net.wurstclient.hack.Hack;
 import net.wurstclient.hacks.AutoCompleteHack;
+import net.wurstclient.other_feature.OtherFeature;
 
 @Mixin(CommandSuggestions.class)
 public abstract class CommandSuggestionsMixin
@@ -79,6 +80,8 @@ private void onRefresh(CallbackInfo ci)
 		Collection<Command> commands =
 			WurstClient.INSTANCE.getCmds().getAllCmds();
 		Collection<Hack> hacks = WurstClient.INSTANCE.getHax().getAllHax();
+		Collection<OtherFeature> otfs =
+			WurstClient.INSTANCE.getOtfs().getAllOtfs();
 		SuggestionsBuilder builder = new SuggestionsBuilder(draftMessage, 0);
 		LinkedHashSet<String> candidates = new LinkedHashSet<>();
 		String inlineSuggestion = "";
@@ -103,6 +106,14 @@ private void onRefresh(CallbackInfo ci)
 			candidates.add(prefix + hack.getName());
 		}
 
+		for(OtherFeature otf : otfs)
+		{
+			if(otf == null || otf.getName() == null)
+				continue;
+			
+			candidates.add(prefix + otf.getName());
+		}
+		
 		for(String candidate : candidates)
 		{
 			if(!candidate.toLowerCase(Locale.ROOT).startsWith(lowerDraft))