[Serialiser] Add ParkourCalculator Flavor

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

@@ -36,6 +36,7 @@
 import com.minecrafttas.tasmod.playback.metadata.builtin.StartpositionMetadataExtension;
 import com.minecrafttas.tasmod.playback.tasfile.flavor.builtin.AlphaFlavor;
 import com.minecrafttas.tasmod.playback.tasfile.flavor.builtin.Beta1Flavor;
+import com.minecrafttas.tasmod.playback.tasfile.flavor.builtin.ParkourCalculatorFlavor;
 import com.minecrafttas.tasmod.registries.TASmodAPIRegistry;
 import com.minecrafttas.tasmod.registries.TASmodKeybinds;
 import com.minecrafttas.tasmod.registries.TASmodPackets;
@@ -330,10 +331,12 @@ private void registerPlaybackMetadata(Minecraft mc) {
 
 	public static Beta1Flavor betaFlavor = new Beta1Flavor();
 	public static AlphaFlavor alphaFlavor = new AlphaFlavor();
+	public static ParkourCalculatorFlavor parkourFlavor = new ParkourCalculatorFlavor();
 
 	private void registerSerialiserFlavors(Minecraft mc) {
 		TASmodAPIRegistry.SERIALISER_FLAVOR.register(betaFlavor);
 		TASmodAPIRegistry.SERIALISER_FLAVOR.register(alphaFlavor);
+		TASmodAPIRegistry.SERIALISER_FLAVOR.register(parkourFlavor);
 	}
 
 	public static DesyncMonitorFileCommandExtension desyncMonitorFileCommandExtension;

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

@@ -20,6 +20,7 @@
 import java.util.Queue;
 import java.util.concurrent.LinkedBlockingQueue;
 
+import org.apache.commons.io.FilenameUtils;
 import org.apache.logging.log4j.Logger;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.Display;
@@ -276,7 +277,6 @@ public String setTASStateClient(TASstate stateIn, boolean verbose) {
 					return verbose ? TextFormatting.GREEN + "Pausing a playback" : "";
 				case NONE:
 					stopPlayback(true);
-					state = TASstate.NONE;
 					return verbose ? TextFormatting.GREEN + "Stopping the playback" : "";
 			}
 		} else if (state == TASstate.PAUSED) {
@@ -321,6 +321,9 @@ private void stopRecording() {
 
 	private void startPlayback() {
 		logger.debug(LoggerMarkers.Playback, "Starting playback");
+		if (inputs.isEmpty())
+			return;
+
 		state = TASstate.PLAYBACK;
 
 		InputContainer initialContainer = inputs.get(0);
@@ -936,18 +939,18 @@ public PacketID[] getAcceptedPacketIDs() {
 	@Override
 	public void onClientPacket(PacketID id, ByteBuffer buf, String username) throws PacketNotImplementedException, WrongSideException, Exception {
 		TASmodPackets packet = (TASmodPackets) id;
-		String name = null;
+		String filename = null;
 		String flavor = null;
 		Minecraft mc = Minecraft.getMinecraft();
 
 		switch (packet) {
 
 			case PLAYBACK_SAVE:
-				name = TASmodBufferBuilder.readString(buf);
+				filename = TASmodBufferBuilder.readString(buf);
 				flavor = TASmodBufferBuilder.readString(buf);
 
 				try {
-					PlaybackSerialiser.saveToFile(tasFileDirectory.resolve(name + fileEnding), this, flavor);
+					PlaybackSerialiser.saveToFile(tasFileDirectory.resolve(filename), this, flavor);
 				} catch (PlaybackSaveException e) {
 					if (mc.world != null)
 						mc.ingameGUI.getChatGUI().printChatMessage(new TextComponentString(TextFormatting.RED + e.getMessage()));
@@ -961,19 +964,23 @@ public void onClientPacket(PacketID id, ByteBuffer buf, String username) throws
 				}
 
 				if (mc.world != null) {
-					TextComponentString confirm = new TextComponentString(TextFormatting.GREEN + "Saved inputs to " + name + ".mctas" + TextFormatting.RESET + " [" + TextFormatting.YELLOW + "Open folder" + TextFormatting.RESET + "]");
+					TextComponentString confirm = new TextComponentString(TextFormatting.GREEN + "Saved inputs to " + filename + TextFormatting.RESET + " [" + TextFormatting.YELLOW + "Open folder" + TextFormatting.RESET + "]");
 					confirm.getStyle().setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/folder tasfiles"));
 					mc.ingameGUI.getChatGUI().printChatMessage(confirm);
 				} else
-					logger.debug(LoggerMarkers.Playback, "Saved inputs to " + name + ".mctas");
+					logger.debug(LoggerMarkers.Playback, "Saved inputs to " + filename);
 				break;
 
 			case PLAYBACK_LOAD:
-				name = TASmodBufferBuilder.readString(buf);
+				filename = TASmodBufferBuilder.readString(buf);
 				flavor = TASmodBufferBuilder.readString(buf);
+				String name = FilenameUtils.getBaseName(filename);
+				String extension = FilenameUtils.getExtension(filename);
+				if (extension.isEmpty())
+					extension += fileEnding;
 
 				try {
-					TASmodClient.controller.setInputs(PlaybackSerialiser.loadFromFile(tasFileDirectory.resolve(name + fileEnding), flavor));
+					TASmodClient.controller.setInputs(PlaybackSerialiser.loadFromFile(tasFileDirectory.resolve(String.format("%s.%s", name, extension)), flavor));
 				} catch (PlaybackLoadException e) {
 					if (mc.world != null) {
 						TextComponentString textComponent = new TextComponentString(e.getMessage());
@@ -989,9 +996,9 @@ public void onClientPacket(PacketID id, ByteBuffer buf, String username) throws
 				}
 
 				if (mc.world != null)
-					mc.ingameGUI.getChatGUI().printChatMessage(new TextComponentString(TextFormatting.GREEN + "Loaded inputs from " + name + ".mctas"));
+					mc.ingameGUI.getChatGUI().printChatMessage(new TextComponentString(TextFormatting.GREEN + "Loaded inputs from " + filename));
 				else
-					logger.debug(LoggerMarkers.Playback, "Loaded inputs from " + name + ".mctas");
+					logger.debug(LoggerMarkers.Playback, "Loaded inputs from " + filename + ".mctas");
 				break;
 
 			case PLAYBACK_FULLPLAY:

src/main/java/com/minecrafttas/tasmod/playback/filecommands/builtin/DesyncMonitorFileCommandExtension.java

@@ -99,6 +99,8 @@ public void onDisable() {
 	@Override
 	public SortedFileCommandContainer onSerialiseEndlineComment(long currentTick, InputContainer inputContainer) {
 		SortedFileCommandContainer out = new SortedFileCommandContainer();
+		if (monitorContainer.size() <= currentTick)
+			return out;
 		MonitorContainer monitoredValues = monitorContainer.get(currentTick);
 		PlaybackFileCommand command = new PlaybackFileCommand("desyncMonitor", monitoredValues.toStringArray());
 

src/main/java/com/minecrafttas/tasmod/playback/tasfile/PlaybackSerialiser.java

@@ -9,6 +9,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.io.FilenameUtils;
+
 import com.dselent.bigarraylist.BigArrayList;
 import com.minecrafttas.tasmod.playback.PlaybackControllerClient;
 import com.minecrafttas.tasmod.playback.PlaybackControllerClient.InputContainer;
@@ -95,6 +97,10 @@ public static void saveToFile(Path path, BigArrayList<InputContainer> container,
 			flavorName = defaultFlavor;
 		}
 
+		SerialiserFlavorBase flavor = TASmodAPIRegistry.SERIALISER_FLAVOR.getFlavor(flavorName);
+
+		path = addDefaultExtension(path, flavor);
+
 		FileThread writerThread;
 		try {
 			writerThread = new FileThread(path, false);
@@ -103,17 +109,17 @@ public static void saveToFile(Path path, BigArrayList<InputContainer> container,
 		}
 		writerThread.start();
 
-		SerialiserFlavorBase flavor = TASmodAPIRegistry.SERIALISER_FLAVOR.getFlavor(flavorName);
-
 		if (flavor == null) {
 			throw new PlaybackSaveException("Flavor %s doesn't exist", flavorName);
 		}
 
 		defaultFlavor = flavorName;
 
-		List<String> header = flavor.serialiseHeader();
-		for (String line : header) {
-			writerThread.addLine(line);
+		if (flavor.hasHeader()) {
+			List<String> header = flavor.serialiseHeader();
+			for (String line : header) {
+				writerThread.addLine(line);
+			}
 		}
 
 		BigArrayList<String> tickLines = flavor.serialise(container, stopIndex);
@@ -124,6 +130,16 @@ public static void saveToFile(Path path, BigArrayList<InputContainer> container,
 		writerThread.close();
 	}
 
+	private static Path addDefaultExtension(Path path, SerialiserFlavorBase flavor) {
+		String extension = FilenameUtils.getExtension(path.getFileName().toString());
+		if (extension.isEmpty()) {
+			extension = flavor.getFileExtension();
+			String name = FilenameUtils.getBaseName(path.getFileName().toString());
+			path = path.resolveSibling(name + extension);
+		}
+		return path;
+	}
+
 	/**
 	 * Loads a BigArrayList of {@link InputContainer InputContainers} from a file.<br>
 	 * Tries to determine the {@link SerialiserFlavorBase flavor} by reading the header of the TASfile
@@ -247,11 +263,15 @@ public static BigArrayList<InputContainer> loadFromFile(Path file, SerialiserFla
 		reader.close();
 
 		// Deserialise Header
-		List<String> headerLines = flavor.extractHeader(lines);
-		flavor.deserialiseHeader(headerLines);
+		int startPos = 0;
+		if (flavor.hasHeader()) {
+			List<String> headerLines = flavor.extractHeader(lines);
+			flavor.deserialiseHeader(headerLines);
+			startPos = headerLines.size();
+		}
 
 		// Deserialise main data
-		BigArrayList<InputContainer> deserialisedContainers = flavor.deserialise(lines, headerLines.size());
+		BigArrayList<InputContainer> deserialisedContainers = flavor.deserialise(lines, startPos);
 
 		return deserialisedContainers;
 	}

src/main/java/com/minecrafttas/tasmod/playback/tasfile/flavor/SerialiserFlavorBase.java

@@ -2067,6 +2067,17 @@ public Integer getCurrentSubtick() {
 		return currentSubtick;
 	}
 
+	/**
+	 * @return The file extension this file is usually associated with. Is used if no file ending is present
+	 */
+	public String getFileExtension() {
+		return ".mctas";
+	}
+
+	public boolean hasHeader() {
+		return true;
+	}
+
 	@Override
 	public String toString() {
 		return getExtensionName();