Loading savestate 0 won't change savestate index anymore

Author: Scribble

src/main/java/de/scribble/lp/tasmod/commands/fullplay/CommandFullPlay.java

@@ -27,7 +27,7 @@ public String getUsage(ICommandSender sender) {
 	@Override
 	public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
 		try {
-			TASmod.savestateHandler.loadState(0, false);
+			TASmod.savestateHandler.loadState(0, false, false);
 		} catch (LoadstateException e) {
 			sender.sendMessage(new TextComponentString(TextFormatting.RED+"Failed to load a savestate: "+e.getMessage()));
 			return;

src/main/java/de/scribble/lp/tasmod/commands/fullrecord/FullRecordPacket.java

@@ -1,5 +1,6 @@
 package de.scribble.lp.tasmod.commands.fullrecord;
 
+import de.scribble.lp.tasmod.ClientProxy;
 import de.scribble.lp.tasmod.events.OpenGuiEvents;
 import de.scribble.lp.tasmod.util.TASstate;
 import io.netty.buffer.ByteBuf;
@@ -43,6 +44,7 @@ public IMessage onMessage(FullRecordPacket message, MessageContext ctx) {
 		@SideOnly(Side.CLIENT)
 		private void workaround(Minecraft mc) {
 			OpenGuiEvents.stateWhenOpened = TASstate.RECORDING;
+			ClientProxy.virtual.getContainer().clear();
 			mc.world.sendQuittingDisconnectingPacket();
 			mc.loadWorld((WorldClient) null);
 			mc.displayGuiScreen(new net.minecraft.client.gui.GuiMainMenu());

src/main/java/de/scribble/lp/tasmod/inputcontainer/InputContainer.java

@@ -399,13 +399,17 @@ public Map<Integer, List<Pair<String, String[]>>> getControlBytes() {
 		return controls;
 	}
 
-	public void setIndex(int index) {
-		this.index = index;
-		if (state == TASstate.PLAYBACK) {
-			TickInputContainer tickcontainer = inputs.get(index);
-			this.keyboard = tickcontainer.getKeyboard();
-			this.mouse = tickcontainer.getMouse();
-			this.subticks = tickcontainer.getSubticks();
+	public void setIndex(int index) throws IndexOutOfBoundsException{
+		if(index<=size()) {
+			this.index = index;
+			if (state == TASstate.PLAYBACK) {
+				TickInputContainer tickcontainer = inputs.get(index);
+				this.keyboard = tickcontainer.getKeyboard();
+				this.mouse = tickcontainer.getMouse();
+				this.subticks = tickcontainer.getSubticks();
+			}
+		}else {
+			throw new IndexOutOfBoundsException("Index is bigger than the container");
 		}
 	}
 

src/main/java/de/scribble/lp/tasmod/savestates/server/SavestateHandler.java

@@ -83,6 +83,10 @@ public SavestateHandler(MinecraftServer server) {
 	public void saveState() throws SavestateException, IOException {
 		saveState(-1, true);
 	}
+	
+	public void saveState(int savestateIndex, boolean tickrate0) throws SavestateException, IOException {
+		saveState(savestateIndex, tickrate0, true);
+	}
 
 	/**
 	 * Creates a copy of the world that is currently being played and saves it in
@@ -94,10 +98,11 @@ public void saveState() throws SavestateException, IOException {
 	 *                       index<0 if it should save it in the next index from
 	 *                       the currentindex
 	 * @param tickrate0 When true: Set's the game to tickrate 0 after creating a savestate
+	 * @param changeIndex When true: Changes the index to the savestateIndex
 	 * @throws SavestateException
 	 * @throws IOException
 	 */
-	public void saveState(int savestateIndex, boolean tickrate0) throws SavestateException, IOException {
+	public void saveState(int savestateIndex, boolean tickrate0, boolean changeIndex) throws SavestateException, IOException {
 		if (state == SavestateState.SAVING) {
 			throw new SavestateException("A savestating operation is already being carried out");
 		}
@@ -127,19 +132,19 @@ public void saveState(int savestateIndex, boolean tickrate0) throws SavestateExc
 		refresh();
 
 		// Setting the current index depending on the savestateIndex.
+		int indexToSave=savestateIndex;
 		if (savestateIndex < 0) {
-			setCurrentIndex(currentIndex + 1); // If the savestateIndex <= 0, create a savestate at currentIndex+1
-		} else {
-			setCurrentIndex(savestateIndex);
-		}
+			indexToSave=currentIndex + 1; // If the savestateIndex <= 0, create a savestate at currentIndex+1
+		} 
+		setCurrentIndex(indexToSave, changeIndex);
 
 		// Get the current and target directory for copying
 		String worldname = server.getFolderName();
 		File currentfolder = new File(savestateDirectory, ".." + File.separator + worldname);
-		File targetfolder = getSavestateFile(currentIndex);
+		File targetfolder = getSavestateFile(indexToSave);
 
 		if (targetfolder.exists()) {
-			TASmod.logger.warn("WARNING! Overwriting the savestate with the index {}", currentIndex);
+			TASmod.logger.warn("WARNING! Overwriting the savestate with the index {}", indexToSave);
 			FileUtils.deleteDirectory(targetfolder);
 		}
 
@@ -152,7 +157,7 @@ public void saveState(int savestateIndex, boolean tickrate0) throws SavestateExc
 			 * Send the name of the world to all players. This will make a savestate of the
 			 * recording on the client with that name
 			 */
-			CommonProxy.NETWORK.sendToAll(new InputSavestatesPacket(true, getSavestateName(currentIndex)));
+			CommonProxy.NETWORK.sendToAll(new InputSavestatesPacket(true, getSavestateName(indexToSave)));
 		}
 
 		// Wait for the chunkloader to save the game
@@ -173,7 +178,7 @@ public void saveState(int savestateIndex, boolean tickrate0) throws SavestateExc
 		saveCurrentIndexToFile();
 
 		// Send a notification that the savestate has been loaded
-		server.getPlayerList().sendMessage(new TextComponentString(TextFormatting.GREEN + "Savestate " + currentIndex + " saved"));
+		server.getPlayerList().sendMessage(new TextComponentString(TextFormatting.GREEN + "Savestate " + indexToSave + " saved"));
 
 		// Close the GuiSavestateScreen on the client
 		CommonProxy.NETWORK.sendToAll(new SavestatePacket());
@@ -198,6 +203,18 @@ public void saveState(int savestateIndex, boolean tickrate0) throws SavestateExc
 	public void loadState() throws LoadstateException, IOException {
 		loadState(-1, true);
 	}
+	
+	/**
+	 * 
+	 * @param savestateIndex
+	 * @param tickrate0
+	 * 
+	 * @throws LoadstateException
+	 * @throws IOException
+	 */
+	public void loadState(int savestateIndex, boolean tickrate0) throws LoadstateException, IOException {
+		loadState(savestateIndex, tickrate0, true);
+	}
 
 	/**
 	 * Loads the latest savestate it can find in
@@ -208,10 +225,11 @@ public void loadState() throws LoadstateException, IOException {
 	 * @param savestateIndex The index where the mod will load the savestate.
 	 *                       index<0 if it should load the currentindex
 	 * @param tickrate0 When true: Set's the game to tickrate 0 after creating a savestate
+	 * @param changeIndex When true: Changes the index to the savestateIndex
 	 * @throws LoadstateException
 	 * @throws IOException
 	 */
-	public void loadState(int savestateIndex, boolean tickrate0) throws LoadstateException, IOException {
+	public void loadState(int savestateIndex, boolean tickrate0, boolean changeIndex) throws LoadstateException, IOException {
 		if (state == SavestateState.SAVING) {
 			throw new LoadstateException("A savestating operation is already being carried out");
 		}
@@ -234,16 +252,16 @@ public void loadState(int savestateIndex, boolean tickrate0) throws LoadstateExc
 
 		int indexToLoad = savestateIndex < 0 ? currentIndex : savestateIndex;
 
-		if (!getSavestateFile(indexToLoad).exists()) {
-			throw new LoadstateException("Savestate " + indexToLoad + " doesn't exist");
+		if (getSavestateFile(indexToLoad).exists()) {
+			setCurrentIndex(indexToLoad, changeIndex);
 		} else {
-			setCurrentIndex(indexToLoad);
+			throw new LoadstateException("Savestate " + indexToLoad + " doesn't exist");
 		}
 
 		// Get the current and target directory for copying
 		String worldname = server.getFolderName();
 		File currentfolder = new File(savestateDirectory, ".." + File.separator + worldname);
-		File targetfolder = getSavestateFile(currentIndex);
+		File targetfolder = getSavestateFile(indexToLoad);
 
 		/*
 		 * Prevents loading an InputSavestate when loading index 0 (Index 0 is the
@@ -252,7 +270,7 @@ public void loadState(int savestateIndex, boolean tickrate0) throws LoadstateExc
 		 */
 		if (savestateIndex != 0) {
 			// Load savestate on the client
-			CommonProxy.NETWORK.sendToAll(new InputSavestatesPacket(false, getSavestateName(currentIndex)));
+			CommonProxy.NETWORK.sendToAll(new InputSavestatesPacket(false, getSavestateName(indexToLoad)));
 		}
 
 		// Disabeling level saving for all worlds in case the auto save kicks in during
@@ -293,7 +311,7 @@ public void loadState(int savestateIndex, boolean tickrate0) throws LoadstateExc
 		saveCurrentIndexToFile();
 
 		// Send a notification that the savestate has been loaded
-		server.getPlayerList().sendMessage(new TextComponentString(TextFormatting.GREEN + "Savestate " + currentIndex + " loaded"));
+		server.getPlayerList().sendMessage(new TextComponentString(TextFormatting.GREEN + "Savestate " + indexToLoad + " loaded"));
 
 		WorldServer[] worlds = DimensionManager.getWorlds();
 
@@ -404,7 +422,7 @@ public void deleteSavestate(int index) throws SavestateDeleteException {
 		}
 		refresh();
 		if (!indexList.contains(currentIndex)) {
-			setCurrentIndex(latestIndex);
+			setCurrentIndex(latestIndex, true);
 		}
 		// Send a notification that the savestate has been deleted
 		server.getPlayerList().sendMessage(new TextComponentString(TextFormatting.GREEN + "Savestate " + index + " deleted"));
@@ -496,16 +514,20 @@ public void loadCurrentIndexFromFile() {
 				}
 			}
 		}
-		setCurrentIndex(index);
+		setCurrentIndex(index, true);
 	}
 
-	private void setCurrentIndex(int index) {
-		if (index < 0) {
-			currentIndex = latestIndex;
+	private void setCurrentIndex(int index, boolean changeIndex) {
+		if(changeIndex) {
+			if (index < 0) {
+				currentIndex = latestIndex;
+			} else {
+				currentIndex = index;
+			}
+			TASmod.logger.info("Setting the savestate index to {}", currentIndex);
 		} else {
-			currentIndex = index;
+			TASmod.logger.warn("Keeping the savestate index at {}", currentIndex);
 		}
-		TASmod.logger.info("Setting the savestate index to {}", currentIndex);
 	}
 
 	public int getCurrentIndex() {

src/main/java/de/scribble/lp/tasmod/virtual/VirtualInput.java

@@ -6,7 +6,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import de.scribble.lp.killtherng.repack.org.msgpack.core.annotations.Nullable;
 import de.scribble.lp.tasmod.ClientProxy;
 import de.scribble.lp.tasmod.TASmod;
 import de.scribble.lp.tasmod.events.OpenGuiEvents;
@@ -125,7 +124,7 @@ public VirtualKeyboard getNextKeyboard() {
 	 * Loads the inputs and starts a TAS on initialize
 	 * @param fileToLoad (Nullable) Loads this filename and starts playing back the TAS
 	 */
-	public VirtualInput(@Nullable String fileToLoad) {
+	public VirtualInput(String fileToLoad) {
 		if (fileToLoad != null) {
 			try {
 				loadInputs(fileToLoad);
@@ -447,32 +446,66 @@ public void setContainer(InputContainer container) {
 	 * Loads and preloads the inputs from the new InputContainer to
 	 * {@link #container}
 	 * 
+	 * Saving a savestate is done via {@linkplain de.scribble.lp.tasmod.util.ContainerSerialiser#saveToFileV1(File, InputContainer)} in {@linkplain de.scribble.lp.tasmod.savestates.client.InputSavestatesHandler#savestate(String)}
+	 * 
 	 * @param savestatecontainer The container that should be loaded.
 	 */
-	public void loadSavestate(InputContainer savestatecontainer) {
-
-		if (this.container.isPlayingback()) {
-			preloadInput(this.container, savestatecontainer.size() - 1); // Preloading from the current container and from the second to last index of
-																			// the savestatecontainer. Since this is executed during playback,
-																			// we will only load the position of the savestate container and not replace the
-																			// container itself
-
-			this.container.setIndex(savestatecontainer.size()); // Set the "playback" index of the current container to the latest index of the
-																// savestatecontainer. Meaning this index will be played next
+	public void loadClientSavestate(InputContainer savestatecontainer) {
+
+		if (container.isPlayingback()) {
+			preloadInput(container, savestatecontainer.size() - 1); // Preloading from the current container and
+																			// from the second to last index of
+																			// the savestatecontainer. Since this is
+																			// executed during playback,
+																			// we will only load the position of the
+																			// savestate container and not replace the
+																			// container itself. This is due to the fact
+																			// that the playback would immediately end
+																			// when you replace the container.
+			
+			if (container.size() >= savestatecontainer.size()) { // Check if the current container is bigger than the
+																	// savestated one.
+
+				try {
+					container.setIndex(savestatecontainer.size()); // Set the "playback" index of the current
+																	// container to the latest index of the
+																	// savestatecontainer. Meaning this index will
+																	// be played next
+				} catch (IndexOutOfBoundsException e) {
+					e.printStackTrace();
+				}
+			} else {
+				String start = savestatecontainer.getStartLocation();
+				savestatecontainer.setStartLocation("");
+
+				try {
+					savestatecontainer.setIndex(savestatecontainer.size() - 1);
+				} catch (IndexOutOfBoundsException e) {
+					e.printStackTrace();
+				}
+				savestatecontainer.setTASState(TASstate.PLAYBACK);
+				savestatecontainer.setStartLocation(start);
+				container = savestatecontainer;
+			}
 
-		} else if (this.container.isRecording()) {
-			String start = savestatecontainer.getStartLocation(); // TODO Another start location thing to keep in mind
+		} else if (container.isRecording()) {
+			String start = savestatecontainer.getStartLocation();
 			preloadInput(savestatecontainer, savestatecontainer.size() - 1); // Preload the input of the savestate
 
 			nextKeyboard = new VirtualKeyboard(); // Unpress the nextKeyboard and mouse to get rid of the preloaded inputs in the
 													// next keyboard. Note that these inputs are still loaded in the current
 													// keyboard
 			nextMouse = new VirtualMouse();
 
-			savestatecontainer.setIndex(savestatecontainer.size());
+			try {
+				savestatecontainer.setIndex(savestatecontainer.size());
+			} catch(IndexOutOfBoundsException e) {
+				e.printStackTrace();
+			}
+			
 			savestatecontainer.setTASState(TASstate.RECORDING);
-			savestatecontainer.setStartLocation(start); // TODO Another one
-			this.container = savestatecontainer; // Replace the current container with the savestated container
+			savestatecontainer.setStartLocation(start);
+			container = savestatecontainer; // Replace the current container with the savestated container
 		}
 	}