[Savestates] Split savestate/loadstate methods and add "inner" methods

Author: ScribbleTAS

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,11 +136,20 @@ 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);
+	}
+
+	private void savestateInner(SavestatePaths paths, SavestateCallback cb, SavestateFlags... flags) {
 		Path sourceFolder = paths.getSourceFolder();
 		Path targetFolder = paths.getTargetFolder();
 		int indexToSave = paths.getSavestate().index;
 		logger.debug("Source: {}, Target: {}", sourceFolder, targetFolder);
-
 		EventListenerRegistry.fireEvent(EventSavestate.EventServerSavestate.class, server, paths);
 
 		if (Files.exists(targetFolder)) {
@@ -151,7 +161,7 @@ public void saveState(int index, String name, SavestateCallback cb, SavestateFla
 		 * 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 +245,18 @@ 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);
+	}
+
+	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 +265,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 +594,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
 		 */

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;
@@ -473,8 +474,11 @@ 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;