b2-test-2

Author: HausemasterIssue

build.gradle

@@ -11,7 +11,7 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 
 
-version = "b1"
+version = "b2"
 group = "dev.hause" // https://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "squeakerbot"
 

src/main/java/dev/hause/squeakerbot/SqueakerBot.java

@@ -16,9 +16,9 @@ public class SqueakerBot
 {
     public static final String MODID = "squeakerbot";
     public static final String NAME = "SqueakerBot";
-    public static final String VERSION = "b1";
+    public static final String VERSION = "b2";
     public static CommandManager cm = new CommandManager();
-    public static Logger LOGGER = LogManager.getLogger(SqueakerBot.class);
+    public static Logger LOGGER = LogManager.getLogger("SqueakerBot");
 
     @EventHandler
     public void preInit(FMLPreInitializationEvent event)

src/main/java/dev/hause/squeakerbot/command/Command.java

@@ -1,18 +1,30 @@
 package dev.hause.squeakerbot.command;
 
+import java.lang.annotation.*;
 import net.minecraft.client.Minecraft;
 
 public class Command {
-	
-	String command;
-	String[] aliases;
+
 	public Minecraft mc = Minecraft.getMinecraft();
 
-	public Command(String command, String[] aliases) {
-		this.command = command;
-		this.aliases = aliases;
+	String command = getRegister().name();
+	String[] aliases = getRegister().aliases();
+	
+	@Retention(RetentionPolicy.RUNTIME)
+	@Target(ElementType.TYPE)
+	public @interface Register {
+		
+		String name();
+		
+		String[] aliases();
+
 	}
 
+	private Register getRegister() {
+		return getClass().getAnnotation(Register.class);
+	}
+	
+	
 	public void onRun() {
 
 	}

src/main/java/dev/hause/squeakerbot/command/CommandManager.java

@@ -13,6 +13,8 @@ public void registerCommands() {
 		commands.add(new AskGod());
 		commands.add(new TallyHall());
 		commands.add(new Toggle());
+		commands.add(new About());
+		commands.add(new Geolocate());
 	}
 
 }

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

@@ -0,0 +1,15 @@
+package dev.hause.squeakerbot.command.commands;
+
+import dev.hause.squeakerbot.SqueakerBot;
+import dev.hause.squeakerbot.command.Command;
+import dev.hause.squeakerbot.util.ChatUtil;
+
+@Command.Register(name = "About", aliases = {"About", "Credits"})
+public class About extends Command {
+	
+	@Override
+	public void onRun() {
+		ChatUtil.sendChatMessage("SqueakerBot " + SqueakerBot.VERSION + " by HausemasterIssue. GitHub: https://github.com/HausemasterIssue/SqueakerBot.");
+	}
+
+}

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

@@ -4,6 +4,7 @@
 import dev.hause.squeakerbot.command.Command;
 import dev.hause.squeakerbot.util.ChatUtil;
 
+@Command.Register(name = "AskGod", aliases = {"AskGod", "Ask", "God"})
 public class AskGod extends Command {
 
 	private static String[] replies = {"It is certain.", "My sources say no.", "Absolutley.",
@@ -13,10 +14,6 @@ public class AskGod extends Command {
 			"For sure.", "No."};
 
 
-	public AskGod() {
-		super("AskGod", new String[] {"AskGod", "Ask"});
-	}
-	
 	@Override
 	public void onRun() {
 		Random random = new Random();

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

@@ -4,14 +4,11 @@
 import dev.hause.squeakerbot.command.Command;
 import dev.hause.squeakerbot.util.ChatUtil;
 
+@Command.Register(name = "CoinFlip", aliases = {"Coin", "Flip", "Tails", "Heads"})
 public class CoinFlip extends Command {
 
 	private static String[] outcomes = {"The coin flip results in Heads!", "The coin flip results in Tails!"};
 
-	public CoinFlip() {
-		super("CoinFlip", new String[] {"CoinFlip", "Coin", "Flip"});
-	}
-	
 	@Override
 	public void onRun() {
 		Random random = new Random();

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

@@ -0,0 +1,20 @@
+package dev.hause.squeakerbot.command.commands;
+
+import java.util.Random;
+import dev.hause.squeakerbot.command.Command;
+import dev.hause.squeakerbot.listener.ChatListener;
+import dev.hause.squeakerbot.util.ChatUtil;
+import dev.hause.squeakerbot.util.QueryUtil;
+
+@Command.Register(name = "Geolocate", aliases = {"Find", "Locate"})
+public class Geolocate extends Command {
+	
+	private static QueryUtil queryUtil = new QueryUtil();
+	
+	@Override
+	public void onRun() {
+		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());
+	}
+
+}

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

@@ -3,15 +3,12 @@
 import dev.hause.squeakerbot.command.Command;
 import dev.hause.squeakerbot.util.ChatUtil;
 
+@Command.Register(name = "Help", aliases = {"Commands"})
 public class Help extends Command {
 
-	public Help() {
-		super("Help", new String[] {"Help", "Commands"});
-	}
-	
 	@Override
 	public void onRun() {
-		ChatUtil.sendChatMessage("> [SqueakerBot] Commands (4): Help, CoinFlip, AskGod, TallyHall");
+		ChatUtil.sendChatMessage("> [SqueakerBot] Commands (4): Help, CoinFlip, AskGod, TallyHall, About, Geolocate");
 	}
 
 }

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

@@ -4,12 +4,9 @@
 import dev.hause.squeakerbot.command.Command;
 import dev.hause.squeakerbot.util.ChatUtil;
 
+@Command.Register(name = "TallyHall", aliases = {"Based", "Music", "Songs", "TheHall", "Hall", "Tally"})
 public class TallyHall extends Command {
 
-	public TallyHall() {
-		super("TallyHall", new String[] {"Based", "Music", "Songs", "TheHall", "Hall", "Tally"});
-	}
-	
 	private static String[] links = {"https://www.youtube.com/watch?v=ipYafcHd0jA", "https://www.youtube.com/watch?v=I8sUC-dsW8A",
 			"https://www.youtube.com/watch?v=A-ZUo62N7Kc", "https://www.youtube.com/watch?v=-krA-ubCQqg", "https://www.youtube.com/watch?v=TIt4i8AmryQ",
 			"https://www.youtube.com/watch?v=HnwemKW9H3s", "https://www.youtube.com/watch?v=xLirITfSCVY", "https://www.youtube.com/watch?v=Q-4IXcKkK1U",