Added 1.4.2 updates

.gitignore

@@ -2,10 +2,7 @@
 
 .classpath
 .project
-target/
-
-.idea/workspace.xml
-.idea/modules.xml
-
 *.iml
-.idea/misc.xml
+
+target/
+.idea/

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.gorgeousone</groupId>
     <artifactId>tangledmaze</artifactId>
-    <version>1.3.7</version>
+    <version>1.4.1</version>
     <packaging>jar</packaging>
 
     <name>TangledMaze</name>

src/main/java/me/gorgeousone/cmdframework/argument/Argument.java

@@ -22,7 +22,12 @@ public Argument(String name, ArgType type, String... tabList) {
 		this.type = type;
 
 		this.tabList = new ArrayList<>();
-		this.tabList.addAll(Arrays.asList(tabList));
+
+		if(type == ArgType.BOOLEAN) {
+			this.tabList.add("true");
+			this.tabList.add("false");
+		}else
+			this.tabList.addAll(Arrays.asList(tabList));
 	}
 
 	public boolean hasDefault() {

src/main/java/me/gorgeousone/cmdframework/command/ArgCommand.java

@@ -4,6 +4,7 @@
 import me.gorgeousone.cmdframework.argument.ArgValue;
 import me.gorgeousone.cmdframework.argument.Argument;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
@@ -32,7 +33,7 @@ protected void addArg(Argument arg) {
 	}
 
 	@Override
-	protected boolean onCommand(CommandSender sender, String[] stringArgs) {
+	protected void onCommand(CommandSender sender, String[] stringArgs) {
 
 		int argsSize = getArgs().size();
 		int stringArgsLength = stringArgs.length;
@@ -47,21 +48,24 @@ protected boolean onCommand(CommandSender sender, String[] stringArgs) {
 
 		} catch (ArrayIndexOutOfBoundsException ex) {
 			sendUsage(sender);
-			return false;
+			return;
 
 		} catch (IllegalArgumentException ex) {
 			sender.sendMessage(ex.getMessage());
-			return false;
+			return;
 		}
 
 		onCommand(sender, values);
-		return true;
+		return;
 	}
 
-	protected abstract boolean onCommand(CommandSender sender, ArgValue[] arguments);
+	protected abstract void onCommand(CommandSender sender, ArgValue[] arguments);
 
 	@Override
-	public List<String> getTabList(String[] arguments) {
+	public List<String> getTabList(CommandSender sender, String[] arguments) {
+
+		if(isPlayerRequired() && !(sender instanceof Player))
+			return null;
 
 		if (this.arguments.size() < arguments.length)
 			return new LinkedList<>();

src/main/java/me/gorgeousone/cmdframework/command/BasicCommand.java

@@ -47,6 +47,10 @@ public String getPermission() {
 		return permission;
 	}
 
+	public boolean isPlayerRequired() {
+		return isPlayerRequired;
+	}
+
 	public ParentCommand getParent() {
 		return parent;
 	}
@@ -78,9 +82,9 @@ public void execute(CommandSender sender, String[] arguments) {
 		onCommand(sender, arguments);
 	}
 
-	protected abstract boolean onCommand(CommandSender sender, String[] arguments);
+	protected abstract void onCommand(CommandSender sender, String[] arguments);
 
-	public List<String> getTabList(String[] arguments) {
+	public List<String> getTabList(CommandSender sender, String[] arguments) {
 		return new LinkedList<>();
 	}
 

src/main/java/me/gorgeousone/cmdframework/command/ParentCommand.java

@@ -1,6 +1,7 @@
 package me.gorgeousone.cmdframework.command;
 
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -30,45 +31,48 @@ public void addChild(BasicCommand child) {
 	}
 
 	@Override
-	public boolean onCommand(CommandSender sender, String[] arguments) {
+	public void onCommand(CommandSender sender, String[] arguments) {
 
 		if (arguments.length == 0) {
 			sendUsage(sender);
-			return false;
+			return;
 		}
 
 		for (BasicCommand child : getChildren()) {
 
-			if (child.matches(arguments[0]))
-				return child.onCommand(sender, Arrays.copyOfRange(arguments, 1, arguments.length));
+			if (child.matches(arguments[0])) {
+				child.execute(sender, Arrays.copyOfRange(arguments, 1, arguments.length));
+				return;
+			}
 		}
 
 		sendUsage(sender);
-		return false;
 	}
 
 	public List<BasicCommand> getChildren() {
 		return children;
 	}
 
 	@Override
-	public List<String> getTabList(String[] arguments) {
+	public List<String> getTabList(CommandSender sender, String[] arguments) {
 
 		if (arguments.length == 1) {
-
 			List<String> tabList = new LinkedList<>();
 
 			for (BasicCommand child : getChildren()) {
+
+				if(child.isPlayerRequired() && !(sender instanceof Player))
+					continue;
+
 				tabList.add(child.getName());
 			}
-
 			return tabList;
 		}
 
 		for (BasicCommand child : getChildren()) {
 
 			if (child.matches(arguments[0]))
-				return child.getTabList(Arrays.copyOfRange(arguments, 1, arguments.length));
+				return child.getTabList(sender, Arrays.copyOfRange(arguments, 1, arguments.length));
 		}
 
 		return new LinkedList<>();

src/main/java/me/gorgeousone/cmdframework/handlers/CommandCompleter.java

@@ -4,6 +4,7 @@
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
+import org.bukkit.entity.Player;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -24,7 +25,7 @@ public List<String> onTabComplete(CommandSender sender, Command cmd, String labe
 			if (command.matches(cmd.getName())) {
 				List<String> tabList = new LinkedList<>();
 
-				for (String tab : command.getTabList(args)) {
+				for (String tab : command.getTabList(sender, args)) {
 
 					if (tab.startsWith(args[args.length - 1]))
 						tabList.add(tab);

src/main/java/me/gorgeousone/tangledmaze/TangledMain.java

@@ -8,7 +8,6 @@
 import me.gorgeousone.tangledmaze.handlers.BuildHandler;
 import me.gorgeousone.tangledmaze.handlers.ClipToolHandler;
 import me.gorgeousone.tangledmaze.handlers.MazeHandler;
-import me.gorgeousone.tangledmaze.handlers.Renderer;
 import me.gorgeousone.tangledmaze.handlers.ToolHandler;
 import me.gorgeousone.tangledmaze.listeners.BlockUpdateListener;
 import me.gorgeousone.tangledmaze.listeners.PlayerQuitListener;
@@ -17,7 +16,7 @@
 import me.gorgeousone.tangledmaze.rawmessage.Color;
 import me.gorgeousone.tangledmaze.rawmessage.RawMessage;
 import me.gorgeousone.tangledmaze.updatechecks.UpdateCheck;
-import me.gorgeousone.tangledmaze.utils.ConfigUtils;
+import me.gorgeousone.tangledmaze.utils.FileUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
@@ -30,22 +29,17 @@ public class TangledMain extends JavaPlugin {
 	private ClipToolHandler clipHandler;
 	private MazeHandler mazeHandler;
 	private BuildHandler buildHandler;
-	private Renderer renderer;
 
 	@Override
 	public void onEnable() {
 
 		super.onEnable();
 		checkForUpdates();
 
-		renderer = new Renderer(this);
-		buildHandler = new BuildHandler(this, renderer);
-
-		mazeHandler = new MazeHandler(buildHandler, renderer);
-		clipHandler = new ClipToolHandler(renderer);
-		toolHandler = new ToolHandler(clipHandler, mazeHandler, renderer);
-
-		renderer.setMazeHandler(mazeHandler);
+		mazeHandler = new MazeHandler(this);
+		clipHandler = new ClipToolHandler(this, mazeHandler);
+		toolHandler = new ToolHandler(this, clipHandler, mazeHandler);
+		buildHandler = new BuildHandler(this, mazeHandler);
 
 		loadConfig();
 		loadMessages();
@@ -59,7 +53,8 @@ public void onEnable() {
 
 	@Override
 	public void onDisable() {
-		renderer.hideAllClues();
+		mazeHandler.hideAllClues();
+		clipHandler.hideAllClues();
 	}
 
 	public void reloadPlugin() {
@@ -72,9 +67,9 @@ public void reloadPlugin() {
 	private void registerListeners() {
 
 		PluginManager manager = Bukkit.getPluginManager();
-		manager.registerEvents(new PlayerWandInteractionListener(toolHandler, clipHandler, mazeHandler, renderer), this);
-		manager.registerEvents(new PlayerQuitListener(toolHandler, mazeHandler), this);
-		manager.registerEvents(new BlockUpdateListener(this, clipHandler, mazeHandler, renderer), this);
+		manager.registerEvents(new PlayerWandInteractionListener(toolHandler, clipHandler, mazeHandler), this);
+		manager.registerEvents(new PlayerQuitListener(toolHandler, mazeHandler, buildHandler), this);
+		manager.registerEvents(new BlockUpdateListener(this, clipHandler, mazeHandler), this);
 	}
 
 	private void registerCommands() {
@@ -85,13 +80,13 @@ private void registerCommands() {
 		mazeCommand.addChild(new GiveWand(mazeCommand));
 		mazeCommand.addChild(new StartMaze(mazeCommand, clipHandler, mazeHandler));
 		mazeCommand.addChild(new DiscardMaze(mazeCommand, toolHandler, mazeHandler));
-		mazeCommand.addChild(new TeleportCommand(mazeCommand, mazeHandler, renderer));
-		mazeCommand.addChild(new SelectTool(mazeCommand, clipHandler, toolHandler, mazeHandler, renderer));
+		mazeCommand.addChild(new TeleportCommand(mazeCommand, mazeHandler));
+		mazeCommand.addChild(new SelectTool(mazeCommand, clipHandler, toolHandler, mazeHandler));
 		mazeCommand.addChild(new AddToMaze(mazeCommand, clipHandler, mazeHandler));
 		mazeCommand.addChild(new CutFromMaze(mazeCommand, clipHandler, mazeHandler));
-		mazeCommand.addChild(new UndoCommand(mazeCommand, mazeHandler));
+		mazeCommand.addChild(new UndoChange(mazeCommand, mazeHandler));
 		mazeCommand.addChild(new SetDimension(mazeCommand, mazeHandler));
-		mazeCommand.addChild(new BuildCommand(mazeCommand, toolHandler, mazeHandler, buildHandler));
+		mazeCommand.addChild(new BuildMaze(mazeCommand, toolHandler, mazeHandler, buildHandler));
 		mazeCommand.addChild(new UnbuildMaze(mazeCommand, mazeHandler, buildHandler));
 
 		CommandHandler cmdHandler = new CommandHandler(this);
@@ -106,20 +101,19 @@ private void loadConfig() {
 	}
 
 	private void loadMessages() {
-		Messages.loadMessages(ConfigUtils.loadConfig("language", this));
+		Messages.loadMessages(FileUtils.loadConfig("language", this));
 	}
 
 	private void checkForUpdates() {
-		
+
 		int resourceId = 59284;
 		String websiteURL = "https://www.spigotmc.org/resources/tangled-maze-maze-generator-1-13.59284/";
-		
+
 		UpdateCheck.of(this).resourceId(resourceId).handleResponse((versionResponse, newVersion) -> {
-			
+
 			switch (versionResponse) {
-				
+
 				case FOUND_NEW:
-
 					RawMessage updateMsg = new RawMessage();
 					updateMsg.addText("[").color(Color.GREEN).append("TM").color(Color.LIGHT_GREEN).append("] ").color(Color.GREEN);
 					updateMsg.lastText().append("Check out the new version of Tangled Maze: ").color(Color.YELLOW);
@@ -132,16 +126,14 @@ private void checkForUpdates() {
 
 					getServer().getConsoleSender().sendMessage(ChatColor.YELLOW + "Check out the new version v" + newVersion + " of Tangled Maze: " + websiteURL);
 					break;
-				
+
 				case LATEST:
-					getLogger().info("You are running the latest version of TangledMaze :)");
+					getLogger().info("You are running the latest version of Tangled Maze :)");
 					break;
-				
+
 				case UNAVAILABLE:
 					getLogger().info("Unable to check for updates...");
 			}
-		}).
-
-				check();
+		}).check();
 	}
 }