[FileCommands] Fix crash when tasfile folder doesn't exist

- [FileCommands] Properly create temp folders on initialise
- [PlaybackSerialiser] Switch to paths
- [Tests] Switch to paths, fix some race conditions...

src/main/java/com/minecrafttas/mctcommon/file/AbstractDataFile.java

@@ -55,19 +55,24 @@ protected AbstractDataFile(Path file, String name, String comment) {
 		this.comment = comment;
 		this.properties = new Properties();
 
-		createDirectory(file);
+		try {
+			createDirectory(file.getParent());
+		} catch (IOException e) {
+			MCTCommon.LOGGER.catching(e);
+		}
 	}
 
 	/**
 	 * Creates the directory for the file if it doesn't exist
 	 * @param file The file to create the directory for
 	 */
-	protected void createDirectory(Path file) {
-		try {
-			Files.createDirectories(file.getParent());
-		} catch (IOException e) {
-			MCTCommon.LOGGER.catching(e);
+	public static void createDirectory(Path file) throws IOException {
+		// Test if tasfiles is a file but named "tasfiles". If yes, delete that and replace with a directory
+		if (Files.exists(file) && !Files.isDirectory(file)) {
+			Files.delete(file);
 		}
+
+		Files.createDirectories(file);
 	}
 
 	public void load() {

src/main/java/com/minecrafttas/tasmod/TASmodClient.java

@@ -2,7 +2,6 @@
 
 import static com.minecrafttas.tasmod.TASmod.LOGGER;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -18,6 +17,7 @@
 import com.minecrafttas.mctcommon.events.EventClient.EventOpenGui;
 import com.minecrafttas.mctcommon.events.EventClient.EventPlayerJoinedClientSide;
 import com.minecrafttas.mctcommon.events.EventListenerRegistry;
+import com.minecrafttas.mctcommon.file.AbstractDataFile;
 import com.minecrafttas.mctcommon.networking.Client;
 import com.minecrafttas.mctcommon.networking.PacketHandlerRegistry;
 import com.minecrafttas.mctcommon.networking.Server;
@@ -60,9 +60,9 @@ public class TASmodClient implements ClientModInitializer, EventClientInit, Even
 
 	public static TickSyncClient ticksyncClient;
 
-	public static final String tasdirectory = Minecraft.getMinecraft().mcDataDir.getAbsolutePath() + File.separator + "saves" + File.separator + "tasfiles";
+	public static final Path tasfiledirectory = Minecraft.getMinecraft().mcDataDir.toPath().resolve("saves").resolve("tasfiles");
 
-	public static final String savestatedirectory = Minecraft.getMinecraft().mcDataDir.getAbsolutePath() + File.separator + "saves" + File.separator + "savestates";
+	public static final Path savestatedirectory = Minecraft.getMinecraft().mcDataDir.toPath().resolve("saves").resolve("savestates");
 
 	public static InfoHud hud;
 
@@ -95,17 +95,19 @@ public class TASmodClient implements ClientModInitializer, EventClientInit, Even
 	 */
 	public static PlaybackControllerClient controller = new PlaybackControllerClient();
 
-	public static void createTASDir() {
-		File tasDir = new File(tasdirectory);
-		if (!tasDir.exists()) {
-			tasDir.mkdir();
+	public static void createTASfileDir() {
+		try {
+			AbstractDataFile.createDirectory(tasfiledirectory);
+		} catch (IOException e) {
+			TASmod.LOGGER.catching(e);
 		}
 	}
 
 	public static void createSavestatesDir() {
-		File savestateDir = new File(savestatedirectory);
-		if (!savestateDir.exists()) {
-			savestateDir.mkdir();
+		try {
+			AbstractDataFile.createDirectory(savestatedirectory);
+		} catch (IOException e) {
+			TASmod.LOGGER.catching(e);
 		}
 	}
 
@@ -181,13 +183,13 @@ private void registerEventListeners() {
 
 	@Override
 	public void onClientInit(Minecraft mc) {
+		createTASfileDir();
+		createSavestatesDir();
+
 		registerKeybindings(mc);
 		registerPlaybackMetadata(mc);
 		registerSerialiserFlavors(mc);
 		registerFileCommands();
-
-		createTASDir();
-		createSavestatesDir();
 	}
 
 	boolean waszero;

src/main/java/com/minecrafttas/tasmod/commands/CommandFolder.java

@@ -3,8 +3,8 @@
 import static com.minecrafttas.tasmod.TASmod.LOGGER;
 
 import java.awt.Desktop;
-import java.io.File;
 import java.io.IOException;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -30,13 +30,13 @@ public String getName() {
 	@Override
 	public String getUsage(ICommandSender sender) {
 		return "/folder <type>";
-	}	
+	}
 
 	@Override
 	public int getRequiredPermissionLevel() {
 		return 0;
 	}
-	
+
 	@Override
 	public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
 		if (args.length == 1) {
@@ -66,26 +66,24 @@ public List<String> getTabCompletions(MinecraftServer server, ICommandSender sen
 	}
 
 	public static void openTASFolder() {
-		File file = new File(TASmodClient.tasdirectory);
+		Path file = TASmodClient.tasfiledirectory;
 		try {
-			if (!file.exists())
-				file.mkdir();
-			Desktop.getDesktop().open(file);
+			TASmodClient.createTASfileDir();
+			Desktop.getDesktop().open(file.toFile());
 		} catch (IOException e) {
-			LOGGER.error("Something went wrong while opening ", file.getPath());
-			e.printStackTrace();
+			LOGGER.error("Something went wrong while opening ", file);
+			LOGGER.catching(e);
 		}
 	}
 
 	public static void openSavestates() {
-		File file = new File(TASmodClient.savestatedirectory);
+		Path file = TASmodClient.savestatedirectory;
 		try {
-			if (!file.exists())
-				file.mkdir();
-			Desktop.getDesktop().open(file);
+			TASmodClient.createSavestatesDir();
+			Desktop.getDesktop().open(file.toFile());
 		} catch (IOException e) {
-			LOGGER.error("Something went wrong while opening ", file.getPath());
-			e.printStackTrace();
+			LOGGER.error("Something went wrong while opening ", file);
+			LOGGER.catching(e);
 		}
 	}
 }

src/main/java/com/minecrafttas/tasmod/playback/PlaybackControllerClient.java

@@ -14,9 +14,12 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.nio.ByteBuffer;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.logging.log4j.Logger;
 import org.lwjgl.opengl.Display;
 
 import com.dselent.bigarraylist.BigArrayList;
@@ -28,6 +31,7 @@
 import com.minecrafttas.mctcommon.networking.exception.WrongSideException;
 import com.minecrafttas.mctcommon.networking.interfaces.ClientPacketHandler;
 import com.minecrafttas.mctcommon.networking.interfaces.PacketID;
+import com.minecrafttas.tasmod.TASmod;
 import com.minecrafttas.tasmod.TASmodClient;
 import com.minecrafttas.tasmod.events.EventClient.EventClientTickPost;
 import com.minecrafttas.tasmod.events.EventPlaybackClient;
@@ -80,6 +84,8 @@
  */
 public class PlaybackControllerClient implements ClientPacketHandler, EventClientInit, EventVirtualInput.EventVirtualKeyboardTick, EventVirtualInput.EventVirtualMouseTick, EventVirtualInput.EventVirtualCameraAngleTick, EventClientTickPost {
 
+	private Logger logger = TASmod.LOGGER;
+
 	/**
 	 * The current state of the controller.
 	 */
@@ -101,19 +107,32 @@ public class PlaybackControllerClient implements ClientPacketHandler, EventClien
 
 	private VirtualCameraAngle camera = new VirtualCameraAngle();
 
-	public final File directory = new File(Minecraft.getMinecraft().mcDataDir.getAbsolutePath() + File.separator + "saves" + File.separator + "tasfiles");
+	/**
+	 * The directory where to store the tasfiles
+	 */
+	public final Path tasFileDirectory;
+	/**
+	 * The file ending of the TASfiles
+	 */
+	public final Path fileEnding = Paths.get(".mctas");
 
 	/**
 	 * The place where all inputs get stored
 	 */
-	private BigArrayList<TickContainer> inputs = new BigArrayList<TickContainer>(directory + File.separator + "temp");
+	private BigArrayList<TickContainer> inputs;
 
 //	private long startSeed = TASmod.ktrngHandler.getGlobalSeedClient(); // TODO Replace with Metadata extension
 
 	// =====================================================================================================
 
 	private Integer playUntil = null; // TODO Replace with event
 
+	public PlaybackControllerClient() {
+		tasFileDirectory = TASmodClient.tasfiledirectory;
+
+		inputs = new BigArrayList<TickContainer>(tasFileDirectory.resolve("temp").toAbsolutePath().toString());
+	}
+
 	/**
 	 * Sets the current {@link TASstate}
 	 * 
@@ -127,7 +146,7 @@ public void setTASState(TASstate stateIn) {
 		try {
 			TASmodClient.client.send(new TASmodBufferBuilder(PLAYBACK_STATE).writeTASState(stateIn));
 		} catch (Exception e) {
-			e.printStackTrace();
+			logger.catching(e);
 		}
 	}
 
@@ -478,7 +497,7 @@ public void setInputs(BigArrayList<TickContainer> inputs, long index) {
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
-		this.inputs = new BigArrayList<TickContainer>(directory + File.separator + "temp");
+		this.inputs = new BigArrayList<TickContainer>(tasFileDirectory + File.separator + "temp");
 		SerialiserFlavorBase.addAll(this.inputs, inputs);
 		setIndex(index);
 	}
@@ -522,7 +541,7 @@ public void clear() {
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
-		inputs = new BigArrayList<TickContainer>(directory + File.separator + "temp");
+		inputs = new BigArrayList<TickContainer>(tasFileDirectory + File.separator + "temp");
 		index = 0;
 	}
 
@@ -778,7 +797,7 @@ public void onClientPacket(PacketID id, ByteBuffer buf, String username) throws
 				flavor = TASmodBufferBuilder.readString(buf);
 
 				try {
-					PlaybackSerialiser.saveToFile(new File(directory, name + ".mctas"), this, flavor);
+					PlaybackSerialiser.saveToFile(tasFileDirectory.resolve(name + fileEnding), this, flavor);
 				} catch (PlaybackSaveException e) {
 					if (mc.world != null)
 						mc.ingameGUI.getChatGUI().printChatMessage(new TextComponentString(TextFormatting.RED + e.getMessage()));
@@ -804,7 +823,7 @@ public void onClientPacket(PacketID id, ByteBuffer buf, String username) throws
 				flavor = TASmodBufferBuilder.readString(buf);
 
 				try {
-					TASmodClient.controller.setInputs(PlaybackSerialiser.loadFromFile(new File(directory, name + ".mctas"), flavor));
+					TASmodClient.controller.setInputs(PlaybackSerialiser.loadFromFile(tasFileDirectory.resolve(name + fileEnding), flavor));
 				} catch (PlaybackLoadException e) {
 					if (mc.world != null) {
 						TextComponentString textComponent = new TextComponentString(e.getMessage());

src/main/java/com/minecrafttas/tasmod/playback/filecommands/PlaybackFileCommand.java

@@ -1,12 +1,20 @@
 package com.minecrafttas.tasmod.playback.filecommands;
 
+import java.io.IOException;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.logging.log4j.Logger;
+
+import com.dselent.bigarraylist.BigArrayList;
+import com.minecrafttas.mctcommon.file.AbstractDataFile;
 import com.minecrafttas.mctcommon.registry.Registerable;
+import com.minecrafttas.tasmod.TASmod;
+import com.minecrafttas.tasmod.TASmodClient;
 import com.minecrafttas.tasmod.playback.PlaybackControllerClient.TickContainer;
 
 public class PlaybackFileCommand {
@@ -30,7 +38,7 @@ public PlaybackFileCommand(String name, String... args) {
 	public String getName() {
 		return name;
 	}
-	
+
 	public String[] getArgs() {
 		return args;
 	}
@@ -49,7 +57,33 @@ public String toString() {
 		return String.format("$%s(%s);", name, String.join(", ", args));
 	}
 
-	public static abstract class PlaybackFileCommandExtension implements Registerable{
+	public static abstract class PlaybackFileCommandExtension implements Registerable {
+
+		protected Logger logger = TASmod.LOGGER;
+		protected final Path tempDir;
+
+		public PlaybackFileCommandExtension() {
+			this(null);
+		}
+
+		/**
+		 * <p>Creates a FileCommandExtension and creates a temp folder with<br>
+		 * the specified name for the {@link BigArrayList} files in the correct location
+		 * 
+		 * @param tempFolderName The name of the temp folder
+		 */
+		public PlaybackFileCommandExtension(String tempFolderName) {
+			if (tempFolderName == null) {
+				tempDir = null;
+				return;
+			}
+			this.tempDir = TASmodClient.tasfiledirectory.resolve("temp").resolve(tempFolderName);
+			try {
+				AbstractDataFile.createDirectory(tempDir);
+			} catch (IOException e) {
+				logger.catching(e);
+			}
+		}
 
 		protected boolean enabled = false;
 
@@ -95,7 +129,7 @@ public void setEnabled(boolean enabled) {
 				onDisable();
 			this.enabled = enabled;
 		}
-		
+
 		@Override
 		public String toString() {
 			return getExtensionName();
@@ -200,8 +234,8 @@ public boolean equals(Object o) {
 			return super.equals(o);
 		}
 	}
-	
+
 	public static class PlaybackFileCommandLine extends ArrayList<PlaybackFileCommand> {
-		
+
 	}
 }