[Savestates] Add temporary savestates to /record and /play

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

@@ -1,8 +1,6 @@
 package com.minecrafttas.tasmod.commands;
 
 import com.minecrafttas.tasmod.TASmod;
-import com.minecrafttas.tasmod.networking.TASmodBufferBuilder;
-import com.minecrafttas.tasmod.registries.TASmodPackets;
 
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
@@ -25,11 +23,7 @@ public String getUsage(ICommandSender sender) {
 	@Override
 	public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
 		if (sender instanceof EntityPlayer) {
-			try {
-				TASmod.server.sendToAll(new TASmodBufferBuilder(TASmodPackets.PLAYBACK_CLEAR_INPUTS));
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
+			TASmod.playbackControllerServer.clearInputs();
 		}
 	}
 

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

@@ -23,7 +23,7 @@ public String getName() {
 
 	@Override
 	public String getUsage(ICommandSender sender) {
-		return "/play";
+		return "/play [nosave]";
 	}
 
 	@Override
@@ -41,16 +41,23 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
 		if (!(sender instanceof EntityPlayer)) {
 			return;
 		}
-		if (args.length < 1) {
-			TASmod.playbackControllerServer.togglePlayback();
-		} else if (args.length > 1) {
+		if (args.length <= 1) {
+			boolean loadTempSavestate = true;
+			if (args.length == 1 && "nosave".equals(args[0])) {
+				loadTempSavestate = false;
+			}
+			TASmod.playbackControllerServer.togglePlayback(loadTempSavestate);
+		} else if (args.length > 2) {
 			sender.sendMessage(new TextComponentString(TextFormatting.RED + "Too many arguments. " + getUsage(sender)));
 		}
 
 	}
 
 	@Override
 	public List<String> getTabCompletions(MinecraftServer server, ICommandSender sender, String[] args, BlockPos targetPos) {
+		if (args.length == 1) {
+			return getListOfStringsMatchingLastWord(args, "nosave");
+		}
 		return super.getTabCompletions(server, sender, args, targetPos);
 	}
 }

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

@@ -10,6 +10,7 @@
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.TextComponentString;
 import net.minecraft.util.text.TextFormatting;
 
@@ -22,7 +23,7 @@ public String getName() {
 
 	@Override
 	public String getUsage(ICommandSender sender) {
-		return "/record";
+		return "/record [nosave]";
 	}
 
 	@Override
@@ -40,14 +41,23 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
 		if (!(sender instanceof EntityPlayer)) {
 			return;
 		}
-		if (args.length < 1) {
-			TASmod.playbackControllerServer.toggleRecording();
-//			TASmod.tickSchedulerServer.add(() ->{
-//				TASmod.ktrngHandler.broadcastStartSeed();
-//			});
+		if (args.length <= 1) {
+			boolean saveTempSavestate = true;
+			if (args.length == 1 && "nosave".equals(args[0])) {
+				saveTempSavestate = false;
+			}
+			TASmod.playbackControllerServer.toggleRecording(saveTempSavestate);
 		} else if (args.length > 1) {
 			sender.sendMessage(new TextComponentString(TextFormatting.RED + "Too many arguments. " + getUsage(sender)));
 		}
 
 	}
+
+	@Override
+	public List<String> getTabCompletions(MinecraftServer server, ICommandSender sender, String[] args, BlockPos targetPos) {
+		if (args.length == 1) {
+			return getListOfStringsMatchingLastWord(args, "nosave");
+		}
+		return super.getTabCompletions(server, sender, args, targetPos);
+	}
 }

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

@@ -33,6 +33,8 @@ public class PlaybackControllerServer implements ServerPacketHandler {
 
 	private TASstate state;
 
+	private boolean createState = true;
+
 	@Override
 	public PacketID[] getAcceptedPacketIDs() {
 		//@formatter:off
@@ -62,7 +64,7 @@ public void onServerPacket(PacketID id, ByteBuffer buf, String username) throws
 				break;
 
 			case PLAYBACK_CLEAR_INPUTS:
-				TASmod.server.sendToAll(new TASmodBufferBuilder(PLAYBACK_CLEAR_INPUTS));
+				clearInputs();
 				break;
 			case PLAYBACK_FULLPLAY:
 			case PLAYBACK_FULLRECORD:
@@ -98,14 +100,42 @@ public void setServerState(TASstate stateIn) {
 		}
 	}
 
-	public void toggleRecording() {
+	public void toggleRecording(boolean saveSavestate) {
+		if (state == TASstate.NONE && createState && saveSavestate) {
+			createState = false;
+			TASmod.savestateHandlerServer.saveStateTemp((paths) -> {
+				try {
+					TASmod.server.sendToAll(new TASmodBufferBuilder(TASmodPackets.SAVESTATE_CLEAR_SCREEN));
+				} catch (Exception e) {
+					TASmod.LOGGER.catching(e);
+				}
+			});
+		}
 		setState(state == TASstate.RECORDING ? TASstate.NONE : TASstate.RECORDING);
 	}
 
-	public void togglePlayback() {
+	public void togglePlayback(boolean loadSavestate) {
+		if (state == TASstate.NONE && loadSavestate) {
+			TASmod.savestateHandlerServer.loadStateTemp((paths) -> {
+				try {
+					TASmod.server.sendToAll(new TASmodBufferBuilder(TASmodPackets.SAVESTATE_CLEAR_SCREEN));
+				} catch (Exception e) {
+					TASmod.LOGGER.catching(e);
+				}
+			});
+		}
 		setState(state == TASstate.PLAYBACK ? TASstate.NONE : TASstate.PLAYBACK);
 	}
 
+	public void clearInputs() {
+		createState = true;
+		try {
+			TASmod.server.sendToAll(new TASmodBufferBuilder(PLAYBACK_CLEAR_INPUTS));
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
 	public TASstate getState() {
 		return state;
 	}

src/main/java/com/minecrafttas/tasmod/savestates/SavestateHandlerServer.java

@@ -11,6 +11,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.logging.log4j.Logger;
 
 import com.minecrafttas.mctcommon.events.EventListenerRegistry;
@@ -135,23 +136,40 @@ public void saveState(int index, String name, SavestateCallback cb, SavestateFla
 
 		logger.trace("Create new savestate index via indexer");
 		SavestatePaths paths = indexer.createSavestate(index, name, !SavestateFlags.BLOCK_CHANGE_INDEX.isBlocked(flags));
+
+		if (paths.getSavestate().index == 0) {
+			if (!ArrayUtils.contains(flags, SavestateFlags.BLOCK_CLIENT_SAVESTATE))
+				flags = ArrayUtils.add(flags, SavestateFlags.BLOCK_CLIENT_SAVESTATE);
+		}
+
+		savestateInner(paths, cb, flags);
+	}
+
+	public void saveStateTemp(SavestateCallback cb) {
+		SavestatePaths paths = indexer.createTempSavestate();
+		SavestateFlags[] flags = new SavestateFlags[] { SavestateFlags.BLOCK_CLIENT_SAVESTATE, SavestateFlags.BLOCK_PAUSE_TICKRATE };
+		savestateInner(paths, cb, flags);
+		paths.getSavestate().save();
+	}
+
+	private void savestateInner(SavestatePaths paths, SavestateCallback cb, SavestateFlags... flags) {
 		Path sourceFolder = paths.getSourceFolder();
 		Path targetFolder = paths.getTargetFolder();
-		int indexToSave = paths.getSavestate().index;
+		Integer indexToSave = paths.getSavestate().index;
 		logger.debug("Source: {}, Target: {}", sourceFolder, targetFolder);
-
 		EventListenerRegistry.fireEvent(EventSavestate.EventServerSavestate.class, server, paths);
 
 		if (Files.exists(targetFolder)) {
-			logger.warn(LoggerMarkers.Savestate, "WARNING! Overwriting the savestate with the index {}", indexToSave);
+			if (indexToSave != null)
+				logger.warn(LoggerMarkers.Savestate, "WARNING! Overwriting the savestate with the index {}", indexToSave);
 			deleteFolder(targetFolder);
 		}
 
 		/*
 		 * Prevents creating an InputSavestate when saving at index 0 (Index 0 is the
 		 * savestate when starting a recording)
 		 */
-		if (index != 0) {
+		if (!SavestateFlags.BLOCK_CLIENT_SAVESTATE.isBlocked(flags)) {
 			/*
 			 * Send the name of the world to all players. This will make a savestate of the
 			 * recording on the client with that name
@@ -235,10 +253,27 @@ public void loadState(int index, String name, SavestateCallback cb, SavestateFla
 		SavestatePaths paths = indexer.loadSavestate(index, !SavestateFlags.BLOCK_CHANGE_INDEX.isBlocked(flags));
 		logger.debug(LoggerMarkers.Savestate, "Source: {}, Target: {}", paths.getSourceFolder(), paths.getTargetFolder());
 
+		if (paths.getSavestate().index == 0) {
+			if (!ArrayUtils.contains(flags, SavestateFlags.BLOCK_CLIENT_SAVESTATE))
+				flags = ArrayUtils.add(flags, SavestateFlags.BLOCK_CLIENT_SAVESTATE);
+		}
+
+		loadStateInner(paths, cb, flags);
+	}
+
+	public void loadStateTemp(SavestateCallback cb) {
+		SavestatePaths paths = indexer.loadTempSavestate();
+		if (paths == null)
+			return;
+		SavestateFlags[] flags = new SavestateFlags[] { SavestateFlags.BLOCK_CLIENT_SAVESTATE, SavestateFlags.BLOCK_PAUSE_TICKRATE };
+		loadStateInner(paths, cb, flags);
+		paths.getSavestate().save();
+	}
+
+	private void loadStateInner(SavestatePaths paths, SavestateCallback cb, SavestateFlags... flags) {
 		String worldname = server.getFolderName();
 		Path sourcefolder = paths.getSourceFolder();
 		Path targetfolder = paths.getTargetFolder();
-		int indexToLoad = paths.getSavestate().index;
 
 		EventListenerRegistry.fireEvent(EventSavestate.EventServerLoadstate.class, server, paths);
 
@@ -247,7 +282,7 @@ public void loadState(int index, String name, SavestateCallback cb, SavestateFla
 		 * savestate when starting a recording. Not doing this will load an empty
 		 * InputSavestate)
 		 */
-		if (indexToLoad != 0) {
+		if (!SavestateFlags.BLOCK_CLIENT_SAVESTATE.isBlocked(flags)) {
 			try {
 				// loadstate inputs client
 				TASmod.server.sendToAll(new TASmodBufferBuilder(TASmodPackets.SAVESTATE_LOAD).writeString(paths.getSavestate().folder.toString()));
@@ -576,6 +611,10 @@ public static enum SavestateFlags {
 		 * Stops updating the current index when savestating/loadstating
 		 */
 		BLOCK_CHANGE_INDEX,
+		/**
+		 * Stops the creation/loading of a client savestate
+		 */
+		BLOCK_CLIENT_SAVESTATE,
 		/**
 		 * Stops setting the tickrate to 0 after a savestate/loadstate
 		 */
@@ -614,6 +653,10 @@ public void rename(int index, String name) throws SavestateException {
 		rename(index, name, null);
 	}
 
+	public void renameCurrent(String name) throws SavestateException {
+		indexer.renameCurrent(name);
+	}
+
 	public void rename(int index, String name, SavestateCallback cb) throws SavestateException {
 		SavestatePaths paths = indexer.renameSavestate(index, name);
 		if (cb != null) {

src/main/java/com/minecrafttas/tasmod/savestates/SavestateIndexer.java

@@ -20,6 +20,7 @@
 import java.util.stream.Stream;
 
 import org.apache.logging.log4j.Logger;
+import org.jetbrains.annotations.Nullable;
 
 import com.minecrafttas.mctcommon.file.AbstractDataFile;
 import com.minecrafttas.tasmod.TASmod;
@@ -239,6 +240,11 @@ public SavestatePaths renameSavestate(int index, String name) throws SavestateEx
 		return SavestatePaths.of(savestateToRename, null, null);
 	}
 
+	public void renameCurrent(String name) {
+		currentSavestate.name = name;
+		currentSavestate.save();
+	}
+
 	/**
 	 * Deletes a savestate
 	 * @param index The index to delete
@@ -379,7 +385,8 @@ public void run() {
 						Throwable error = new SavestateException("Savestate.json data file not found in " + savestateBaseDirectory.relativize(savestateDat));
 						savestate = new FailedSavestate(path, backupIndex, null, null, error);
 					}
-					savestateList.put(savestate.getIndex(), savestate.clone());
+					if (savestate.index != null) // Temporary savestates have no index and are not listed in the savestatelist
+						savestateList.put(savestate.getIndex(), savestate.clone());
 				});
 				sortSavestateList();
 				try {
@@ -473,14 +480,17 @@ public Savestate getCurrentSavestate() {
 	 */
 	public class Savestate extends AbstractDataFile {
 
+		@Nullable
 		protected Integer index;
+		@Nullable
 		protected String name;
+		@Nullable
 		protected Date date;
 		protected Path folder;
 		protected Logger logger = TASmod.LOGGER;
 
 		private Savestate(Path datFile, Path folder) {
-			this(datFile, -1, null, null, folder);
+			this(datFile, null, null, null, folder);
 		}
 
 		private Savestate(Path file, Integer index, String name, Date date, Path folder) {
@@ -742,4 +752,19 @@ public int getNextIndex(int index) {
 		}
 		return index;
 	}
+
+	public SavestatePaths createTempSavestate() {
+		Path sourceDirectory = savesDir.resolve(worldname);
+		Path targetDirectory = currentSavestateDir.resolve(worldname + "-SavestateTemp");
+		Savestate tempSavestate = new Savestate(targetDirectory.resolve(savestateFilePath), null, "Temporary Savestate!", new Date(), targetDirectory);
+		return SavestatePaths.of(tempSavestate, sourceDirectory, targetDirectory);
+	}
+
+	public SavestatePaths loadTempSavestate() {
+		Path sourceDirectory = currentSavestateDir.resolve(worldname + "-SavestateTemp");
+		if (!Files.exists(sourceDirectory))
+			return null;
+		Path targetDirectory = savesDir.resolve(worldname);
+		return SavestatePaths.of(currentSavestate.clone(), sourceDirectory, targetDirectory);
+	}
 }

src/main/java/com/minecrafttas/tasmod/savestates/handlers/SavestateGuiHandlerServer.java

@@ -34,6 +34,7 @@ public void onServerPacket(PacketID id, ByteBuffer buf, String username) throws
 				String name = TASmodBufferBuilder.readString(buf);
 				TASmod.gameLoopSchedulerServer.add(() -> {
 					TASmod.savestateHandlerServer.rename(index, name);
+					TASmod.savestateHandlerServer.renameCurrent(name);
 				});
 				TASmod.server.sendToAll(new TASmodBufferBuilder(SAVESTATE_CLEAR_SCREEN));