b2-test-3

Author: HausemasterIssue

src/main/java/dev/hause/squeakerbot/command/commands/AskGod.java

@@ -17,7 +17,7 @@ public class AskGod extends Command {
 	@Override
 	public void onRun() {
 		Random random = new Random();
-		ChatUtil.sendChatMessage("> [SqueakerBot] " + (replies[random.nextInt(14)]));
+		ChatUtil.sendChatMessage((replies[random.nextInt(14)]));
 	}
 
 }

src/main/java/dev/hause/squeakerbot/command/commands/CoinFlip.java

@@ -12,7 +12,7 @@ public class CoinFlip extends Command {
 	@Override
 	public void onRun() {
 		Random random = new Random();
-		ChatUtil.sendChatMessage("> [SqueakerBot] " + outcomes[random.nextInt(2)]);
+		ChatUtil.sendChatMessage(outcomes[random.nextInt(2)]);
 	}
 
 

src/main/java/dev/hause/squeakerbot/command/commands/Geolocate.java

@@ -13,8 +13,13 @@ public class Geolocate extends Command {
 
 	@Override
 	public void onRun() {
+		String name = queryUtil.getQuery(ChatListener.parsedCommand);
 		Random random = new Random();
-		ChatUtil.sendChatMessage(queryUtil.getQuery(ChatListener.parsedCommand) + "'s exact coordinates are " + "X: " + 1 + (20 - 1) * + random.nextDouble() + " Y: " + + 1 + (20 - 1) * + random.nextDouble());
+		if(name.equalsIgnoreCase("You didn't enter a person to geolocate!") ) {
+			ChatUtil.sendChatMessage(name);
+			return;
+		}
+		ChatUtil.sendChatMessage(name + "'s exact coordinates are " + "X: " + 1 + (20 - 1) * + random.nextDouble() + " Y: " + + 1 + (20 - 1) * + random.nextDouble());
 	}
 
 }

src/main/java/dev/hause/squeakerbot/command/commands/Help.java

@@ -8,7 +8,7 @@ public class Help extends Command {
 
 	@Override
 	public void onRun() {
-		ChatUtil.sendChatMessage("> [SqueakerBot] Commands (4): Help, CoinFlip, AskGod, TallyHall, About, Geolocate");
+		ChatUtil.sendChatMessage("Commands (6): Help, CoinFlip, AskGod, TallyHall, About, Geolocate");
 	}
 
 }

src/main/java/dev/hause/squeakerbot/command/commands/TallyHall.java

@@ -23,7 +23,7 @@ public class TallyHall extends Command {
 	@Override
 	public void onRun() {
 		Random random = new Random();
-		ChatUtil.sendChatMessage("> [SqueakerBot] " + (applause[random.nextInt(18)]) + (links[random.nextInt(18)]));
+		ChatUtil.sendChatMessage((applause[random.nextInt(18)]) + (links[random.nextInt(18)]));
 	}
 
 }

src/main/java/dev/hause/squeakerbot/listener/ChatListener.java

@@ -4,23 +4,15 @@
 import java.util.Timer;
 import java.util.TimerTask;
 import org.apache.commons.lang3.StringUtils;
-
-import dev.hause.squeakerbot.SqueakerBot;
 import dev.hause.squeakerbot.command.Command;
 import dev.hause.squeakerbot.command.CommandManager;
-import dev.hause.squeakerbot.util.QueryUtil;
-import net.minecraft.client.Minecraft;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.client.event.ClientChatReceivedEvent;
-import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
 public class ChatListener {
 
-	Minecraft mc = Minecraft.getMinecraft();
 	public static boolean isToggled = false;
 	public static String parsedCommand;
-	private static QueryUtil queryUtil = new QueryUtil();
 
 	@SubscribeEvent
 	public void onChat(ClientChatReceivedEvent event) {

src/main/java/dev/hause/squeakerbot/util/ChatUtil.java

@@ -8,7 +8,7 @@ public class ChatUtil {
 	static Minecraft mc = Minecraft.getMinecraft();
 
 	public static void sendChatMessage(String message) {
-		mc.player.connection.sendPacket(new CPacketChatMessage(message));
+		mc.player.connection.sendPacket(new CPacketChatMessage("> [SqueakerBot] " + message));
 	}
 
 }

src/main/java/dev/hause/squeakerbot/util/QueryUtil.java

@@ -7,18 +7,20 @@
 public class QueryUtil {
 
 	public String getQuery(String message) {
-		int splitIndex = 0;
 		String[] query = null;
  		for(Command c : CommandManager.commands) {
 			if(StringUtils.containsIgnoreCase(message, c.getCommand())) {
 				query = message.split("(?<=" + c.getCommand().toLowerCase() + ")");
 				System.out.println(query[0]);
-				if(query.length <= 1) {
-					return null;
-				}
 			}
 		}
-		return query[1];
+ 		
+ 		if(query.length == 2) {
+ 			return query[1];
+ 		}
+ 		return "You didn't enter a person to geolocate!";
+ 		
+		
 	}
 
 }