1.8.2v1.8.3v1.8.2

Merge pull request #30 from bowser0000/development

1 files changed, 58 insertions, 37 deletions

diff --git a/src/main/java/me/Danker/commands/MoveCommand.java b/src/main/java/me/Danker/commands/MoveCommand.java
index 8b68e7e..76babad 100644
--- a/src/main/java/me/Danker/commands/MoveCommand.java
+++ b/src/main/java/me/Danker/commands/MoveCommand.java
@@ -2,6 +2,7 @@ package me.Danker.commands;
 
 import java.util.List;
 
+import me.Danker.TheMod;
 import me.Danker.handlers.ConfigHandler;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
@@ -9,7 +10,6 @@ import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.EnumChatFormatting;
 
 public class MoveCommand extends CommandBase {
 
@@ -18,6 +18,8 @@ public class MoveCommand extends CommandBase {
 	public static int[] dungeonTimerXY = {0, 0};
 	public static int[] skill50XY = {0, 0};
 	public static int[] lividHpXY = {0, 0};
+	public static int[] cakeTimerXY = {0, 0};
+	public static int[] skillTrackerXY = {0, 0};
 	
 	@Override
 	public String getCommandName() {
@@ -26,7 +28,7 @@ public class MoveCommand extends CommandBase {
 
 	@Override
 	public String getCommandUsage(ICommandSender arg0) {
-		return "/" + getCommandName() + " <coords/display/dungeontimer/skill50/lividhp> <x> <y>";
+		return "/" + getCommandName() + " <coords/display/dungeontimer/skill50/lividhp/caketimer/skilltracker> <x> <y>";
 	}
 	
 	@Override
@@ -37,7 +39,7 @@ public class MoveCommand extends CommandBase {
 	@Override
 	public List<String> addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) {
 		if (args.length == 1) {
-			return getListOfStringsMatchingLastWord(args, "coords", "display", "dungeontimer", "skill50", "lividhp");
+			return getListOfStringsMatchingLastWord(args, "coords", "display", "dungeontimer", "skill50", "lividhp", "caketimer", "skilltracker");
 		}
 		return null;
 	}
@@ -45,45 +47,64 @@ public class MoveCommand extends CommandBase {
 	@Override
 	public void processCommand(ICommandSender arg0, String[] arg1) throws CommandException {
 		final EntityPlayer player = (EntityPlayer)arg0;
-		final ConfigHandler cf = new ConfigHandler();
 		
 		if (arg1.length < 2) {
-			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: " + getCommandUsage(arg0)));
+			player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "Usage: " + getCommandUsage(arg0)));
 			return;
 		}
 		
-		if (arg1[0].equalsIgnoreCase("coords")) {
-			coordsXY[0] = Integer.parseInt(arg1[1]);
-			coordsXY[1] = Integer.parseInt(arg1[2]);
-			cf.writeIntConfig("locations", "coordsX", coordsXY[0]);
-			cf.writeIntConfig("locations", "coordsY", coordsXY[1]);
-			player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Coords have been moved to " + EnumChatFormatting.DARK_GREEN + arg1[1] + ", " + arg1[2]));
-		} else if (arg1[0].equalsIgnoreCase("display")) {
-			displayXY[0] = Integer.parseInt(arg1[1]);
-			displayXY[1] = Integer.parseInt(arg1[2]);
-			cf.writeIntConfig("locations", "displayX", displayXY[0]);
-			cf.writeIntConfig("locations", "displayY", displayXY[1]);
-			player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Tracker display has been moved to " + EnumChatFormatting.DARK_GREEN + arg1[1] + ", " + arg1[2]));
-		} else if (arg1[0].equalsIgnoreCase("dungeontimer")) {
-			dungeonTimerXY[0] = Integer.parseInt(arg1[1]);
-			dungeonTimerXY[1] = Integer.parseInt(arg1[2]);
-			cf.writeIntConfig("locations", "dungeonTimerX", dungeonTimerXY[0]);
-			cf.writeIntConfig("locations", "dungeonTimerY", dungeonTimerXY[1]);
-			player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Dungeon timer has been moved to " + EnumChatFormatting.DARK_GREEN + arg1[1] + ", " + arg1[2]));
-		} else if (arg1[0].equalsIgnoreCase("skill50")) {
-			skill50XY[0] = Integer.parseInt(arg1[1]);
-			skill50XY[1] = Integer.parseInt(arg1[2]);
-			cf.writeIntConfig("locations", "skill50X", skill50XY[0]);
-			cf.writeIntConfig("locations", "skill50Y", skill50XY[1]);
-			player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Skill 50 display has been moved to " + EnumChatFormatting.DARK_GREEN + arg1[1] + ", " + arg1[2]));
-		} else if (arg1[0].equalsIgnoreCase("lividhp")) { 
-			lividHpXY[0] = Integer.parseInt(arg1[1]);
-			lividHpXY[1] = Integer.parseInt(arg1[2]);
-			cf.writeIntConfig("locations", "lividHpX", lividHpXY[0]);
-			cf.writeIntConfig("locations", "lividHpY", lividHpXY[1]);
-			player.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Livid HP has been moved to " + EnumChatFormatting.DARK_GREEN + arg1[1] + ", " + arg1[2]));
-		} else {
-			player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: " + getCommandUsage(arg0)));
+		switch (arg1[0].toLowerCase()) {
+			case "coords":
+				coordsXY[0] = Integer.parseInt(arg1[1]);
+				coordsXY[1] = Integer.parseInt(arg1[2]);
+				ConfigHandler.writeIntConfig("locations", "coordsX", coordsXY[0]);
+				ConfigHandler.writeIntConfig("locations", "coordsY", coordsXY[1]);
+				player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Coords have been moved to " + TheMod.SECONDARY_COLOUR + arg1[1] + ", " + arg1[2]));
+				break;
+			case "display":
+				displayXY[0] = Integer.parseInt(arg1[1]);
+				displayXY[1] = Integer.parseInt(arg1[2]);
+				ConfigHandler.writeIntConfig("locations", "displayX", displayXY[0]);
+				ConfigHandler.writeIntConfig("locations", "displayY", displayXY[1]);
+				player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Tracker display has been moved to " + TheMod.SECONDARY_COLOUR + arg1[1] + ", " + arg1[2]));
+				break;
+			case "dungeontimer":
+				dungeonTimerXY[0] = Integer.parseInt(arg1[1]);
+				dungeonTimerXY[1] = Integer.parseInt(arg1[2]);
+				ConfigHandler.writeIntConfig("locations", "dungeonTimerX", dungeonTimerXY[0]);
+				ConfigHandler.writeIntConfig("locations", "dungeonTimerY", dungeonTimerXY[1]);
+				player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Dungeon timer has been moved to " + TheMod.SECONDARY_COLOUR + arg1[1] + ", " + arg1[2]));
+				break;
+			case "skill50":
+				skill50XY[0] = Integer.parseInt(arg1[1]);
+				skill50XY[1] = Integer.parseInt(arg1[2]);
+				ConfigHandler.writeIntConfig("locations", "skill50X", skill50XY[0]);
+				ConfigHandler.writeIntConfig("locations", "skill50Y", skill50XY[1]);
+				player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Skill 50 display has been moved to " + TheMod.SECONDARY_COLOUR + arg1[1] + ", " + arg1[2]));
+				break;
+			case "lividhp":
+				lividHpXY[0] = Integer.parseInt(arg1[1]);
+				lividHpXY[1] = Integer.parseInt(arg1[2]);
+				ConfigHandler.writeIntConfig("locations", "lividHpX", lividHpXY[0]);
+				ConfigHandler.writeIntConfig("locations", "lividHpY", lividHpXY[1]);
+				player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Livid HP has been moved to " + TheMod.SECONDARY_COLOUR + arg1[1] + ", " + arg1[2]));
+				break;
+			case "caketimer":
+				cakeTimerXY[0] = Integer.parseInt(arg1[1]);
+				cakeTimerXY[1] = Integer.parseInt(arg1[2]);
+				ConfigHandler.writeIntConfig("locations", "cakeTimerX", cakeTimerXY[0]);
+				ConfigHandler.writeIntConfig("locations", "cakeTimerY", cakeTimerXY[1]);
+				player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Cake timer has been moved to " + TheMod.SECONDARY_COLOUR + arg1[1] + ", " + arg1[2]));
+				break;
+			case "skilltracker":
+				skillTrackerXY[0] = Integer.parseInt(arg1[1]);
+				skillTrackerXY[1] = Integer.parseInt(arg1[2]);
+				ConfigHandler.writeIntConfig("locations", "skillTrackerX", skillTrackerXY[0]);
+				ConfigHandler.writeIntConfig("locations", "skillTrackerY", skillTrackerXY[1]);
+				player.addChatMessage(new ChatComponentText(TheMod.MAIN_COLOUR + "Skill tracker has been moved to " + TheMod.SECONDARY_COLOUR + arg1[1] + ", " + arg1[2]));
+				break;
+			default:
+				player.addChatMessage(new ChatComponentText(TheMod.ERROR_COLOUR + "Usage: " + getCommandUsage(arg0)));
 		}
 	}