Make SavestateHandler not static anymore

-Added a way to map savestate folders to an index, although that is not fully implemented
-Added a current index that stores the number of which savestate to load/create next
-Added serialization for that currentIndex in .minecraft/saves/<worldfolder>/tasmod/savestate.data (Maybe with more information to store in the future?)
-Fixed a crash when opening the SavestateSavingScreen

Author: Scribble

src/main/java/de/scribble/lp/tasmod/TASmod.java

@@ -15,6 +15,7 @@
 import de.scribble.lp.tasmod.commands.recording.CommandRecord;
 import de.scribble.lp.tasmod.commands.savetas.CommandSaveTAS;
 import de.scribble.lp.tasmod.commands.tutorial.CommandPlaybacktutorial;
+import de.scribble.lp.tasmod.savestates.server.SavestateHandler;
 import de.scribble.lp.tasmod.savestates.server.SavestateTrackerFile;
 import de.scribble.lp.tasmod.tickratechanger.CommandTickrate;
 import de.scribble.lp.tasmod.util.ModIncompatibleException;
@@ -53,6 +54,8 @@ public class TASmod {
 	public static final Logger logger = LogManager.getLogger("TASMod");
 
 	public static ContainerStateServer containerStateServer;
+	
+	public static SavestateHandler savestateHandler;
 
 	@EventHandler
 	public void preInit(FMLPreInitializationEvent ev) throws Exception {
@@ -107,6 +110,8 @@ public void serverStart(FMLServerStartingEvent ev) {
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
+		
+		savestateHandler=new SavestateHandler(ev.getServer());
 	}
 
 	public static TASmod getInstance() {

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

@@ -7,7 +7,12 @@
 
 public class GuiSavestateSavingScreen extends GuiScreen{
 
-
+	@Override
+	public void initGui() {
+		this.mc=Minecraft.getMinecraft();
+		super.initGui();
+	}
+	
 	@Override
 	public void drawScreen(int mouseX, int mouseY, float partialTicks) {
 		this.drawDefaultBackground();

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

@@ -1,5 +1,6 @@
 package de.scribble.lp.tasmod.savestates.server;
 
+import de.scribble.lp.tasmod.TASmod;
 import de.scribble.lp.tasmod.savestates.server.chunkloading.SavestatesChunkControl;
 import de.scribble.lp.tasmod.savestates.server.exceptions.LoadstateException;
 import net.minecraft.client.Minecraft;
@@ -22,7 +23,7 @@ public IMessage onMessage(LoadstatePacket message, MessageContext ctx) {
 					return;
 				}
 				try {
-					SavestateHandler.loadState();
+					TASmod.savestateHandler.loadState();
 				} catch (LoadstateException e) {
 					player.sendMessage(new TextComponentString(TextFormatting.RED+"Failed to load a savestate: "+e.getMessage()));
 

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

@@ -3,6 +3,12 @@
 import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
 
 import org.apache.commons.io.FileUtils;
 
@@ -16,10 +22,12 @@
 import de.scribble.lp.tasmod.savestates.server.motion.ClientMotionServer;
 import de.scribble.lp.tasmod.savestates.server.playerloading.SavestatePlayerLoading;
 import de.scribble.lp.tasmod.tickratechanger.TickrateChangerServer;
+import de.scribble.lp.tasmod.util.FileThread;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.management.PlayerList;
 import net.minecraft.util.text.TextComponentString;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.WorldServer;
@@ -37,11 +45,18 @@
  *
  */
 public class SavestateHandler {
-	private static MinecraftServer server=TASmod.getServerInstance();
-	private static File savestateDirectory;
+	private MinecraftServer server;
+	private File savestateDirectory;
 
 	public static SavestateState state=SavestateState.NONE;
 
+	public SavestateHandler(MinecraftServer server) {
+		this.server=server;
+		createSavestateDirectory();
+		refreshSavestateMap();
+		loadCurrentIndex();
+	}
+	
 	/**
 	 * Creates a copy of the currently played world and saves it in .minecraft/saves/savestates/worldname <br>
 	 * Called in {@link SavestatePacketHandler}<br>
@@ -51,7 +66,7 @@ public class SavestateHandler {
 	 * @throws SavestateException
 	 * @throws IOException
 	 */
-	public static void saveState(int savestateIndex) throws SavestateException, IOException {
+	public void saveState(int savestateIndex) throws SavestateException, IOException {
 		if(state==SavestateState.SAVING) {
 			throw new SavestateException("A savestating operation is already being carried out");
 		}
@@ -64,6 +79,9 @@ public static void saveState(int savestateIndex) throws SavestateException, IOEx
 		//Create a directory just in case
 		createSavestateDirectory();
 
+		increaseCurrentIndex();
+		saveCurrentIndex();
+		
 		//Enable tickrate 0
 		TickrateChangerServer.changeServerTickrate(0);
 		TickrateChangerServer.changeClientTickrate(0);
@@ -109,20 +127,6 @@ public static void saveState(int savestateIndex) throws SavestateException, IOEx
 		state=SavestateState.NONE;
 	}
 
-	private static String nextSaveName(String worldname, int index) {
-		File[] listofFiles=savestateDirectory.listFiles(new FileFilter() {
-
-			@Override
-			public boolean accept(File pathname) {
-				return pathname.getName().startsWith(worldname);
-			}
-			
-		});
-		if(index<0) {
-		}
-		return "";
-	}
-	
 	/**
 	 * Searches through the savestate folder to look for the next possible savestate foldername <br>
 	 * Savestate equivalent to {@link SavestateHandler#getLatestSavestateLocation(String)}
@@ -131,7 +135,7 @@ public boolean accept(File pathname) {
 	 * @throws SavestateException if the found savestates count is greater or equal than 300
 	 */
 	@Deprecated
-	private static File getNextSaveFolderLocation(String worldname) throws SavestateException {
+	private File getNextSaveFolderLocation(String worldname) throws SavestateException {
 		int i = 1;
 		int limit=300;
 		File targetsavefolder=null;
@@ -156,7 +160,7 @@ private static File getNextSaveFolderLocation(String worldname) throws Savestate
 	 * @return The correct name of the next savestate
 	 */
 	@Deprecated
-	private static String nameWhenSaving(String worldname) {
+	private String nameWhenSaving(String worldname) {
 		int i = 1;
 		int limit=300;
 		File targetsavefolder=null;
@@ -183,7 +187,7 @@ private static String nameWhenSaving(String worldname) {
 	 * @throws LoadstateException
 	 * @throws IOException
 	 */
-	public static void loadState() throws LoadstateException, IOException {
+	public void loadState() throws LoadstateException, IOException {
 		if(state==SavestateState.SAVING) {
 			throw new LoadstateException("A savestating operation is already being carried out");
 		}
@@ -269,7 +273,7 @@ public static void loadState() throws LoadstateException, IOException {
 	 * @return targetsavefolder
 	 * @throws LoadstateException if there is no savestate or more than 300 savestates
 	 */
-	private static File getLatestSavestateLocation(String worldname) throws LoadstateException {
+	private File getLatestSavestateLocation(String worldname) throws LoadstateException {
 		int i=1;
 		int limit=300;
 
@@ -297,13 +301,13 @@ private static File getLatestSavestateLocation(String worldname) throws Loadstat
 	 * @param worldname the name of the world currently on the server
 	 * @return The correct name of the next loadstate
 	 */
-	private static String nameWhenLoading(String worldname) throws LoadstateException {
+	private String nameWhenLoading(String worldname) throws LoadstateException {
 		int i=1;
 		int limit=300;
 		String name="";
 		File targetsavefolder=null;
 		while(i<=300) {
-			targetsavefolder = new File(savestateDirectory,worldname+"-Savestate"+Integer.toString(i));
+			targetsavefolder = new File(savestateDirectory, worldname+"-Savestate"+Integer.toString(i));
 			if (!targetsavefolder.exists()) {
 				if(i-1==0) {
 					throw new LoadstateException("Couldn't find any savestates");
@@ -323,7 +327,7 @@ private static String nameWhenLoading(String worldname) throws LoadstateExceptio
 	/**
 	 * Creates the savestate directory in case the user deletes it between savestates
 	 */
-	private static void createSavestateDirectory() {
+	private void createSavestateDirectory() {
 		if(!server.isDedicatedServer()) {
 			savestateDirectory=new File(server.getDataDirectory()+File.separator+"saves"+File.separator+"savestates"+File.separator);
 		}else {
@@ -334,17 +338,106 @@ private static void createSavestateDirectory() {
 		}
 	}
 
+	private Map<Integer, File> savestateMap=new HashMap<Integer, File>();
+	
+	private int nextFreeIndex=0;
+	
+	private int currentIndex;
+	
+	public void refreshSavestateMap() {
+		savestateMap.clear();
+		File[] files=savestateDirectory.listFiles(new FileFilter() {
+			
+			@Override
+			public boolean accept(File pathname) {
+				return pathname.getName().startsWith(server.getFolderName()+"-Savestate");
+			}
+		});
+		int index=0;
+		for(File file:files) {
+			try {
+				index=Integer.parseInt(file.getName().substring(file.getName().length()-1));
+			} catch (NumberFormatException e) {
+				TASmod.logger.warn(String.format("Could not process the savestate %s", e.getMessage()));
+			}
+			savestateMap.put(index, file);
+		}
+		nextFreeIndex=index+1;
+	}
+	
+	public void saveCurrentIndex() {
+		File tasmodDir=new File(savestateDirectory, "../"+server.getFolderName()+"/tasmod/");
+		if(!tasmodDir.exists()) {
+			tasmodDir.mkdir();
+		}
+		File savestateDat=new File(tasmodDir, "savestate.data");
+		List<String> lines=new ArrayList<String>();
+		lines.add("currentIndex="+currentIndex);
+		try {
+			FileUtils.writeLines(savestateDat, lines);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	public void loadCurrentIndex() {
+		int index = -1;
+		List<String> lines = new ArrayList<String>();
+		File tasmodDir = new File(savestateDirectory, "../" + server.getFolderName() + "/tasmod/");
+		if (!tasmodDir.exists()) {
+			tasmodDir.mkdir();
+		}
+		File savestateDat = new File(tasmodDir, "savestate.data");
+		try {
+			lines = FileUtils.readLines(savestateDat, StandardCharsets.UTF_8);
+		} catch (IOException e) {
+			TASmod.logger.warn("No savestate.data file found in current world folder, ignoring it");
+		}
+		if (!lines.isEmpty()) {
+			for (String line : lines) {
+				if (line.startsWith("currentIndex=")) {
+					try {
+						index = Integer.parseInt(line.split("=")[1]);
+					} catch (NumberFormatException e) {
+						e.printStackTrace();
+					}
+				}
+			}
+		}
+		setCurrentIndex(index);;
+	}
+
+	private void setCurrentIndex(int index) {
+		if(index<0) {
+			currentIndex=nextFreeIndex-1;
+		}else {
+			currentIndex=index;
+		}
+		TASmod.logger.info("Setting the savestate index to {}", currentIndex);
+	}
+	
+	public void increaseCurrentIndex() {
+		setCurrentIndex(currentIndex+1);
+	}
+	
+	private String getSavestateNameWithIndex(int index) {
+		return server.getFolderName()+File.separator+"Savestate"+index;
+	}
+	
 	/**
 	 * Event, that gets executed after a loadstate operation was carried out, get's called on the server side
 	 */
 	public static void playerLoadSavestateEventServer() {
-		EntityPlayerMP player=server.getPlayerList().getPlayers().get(0);
-		NBTTagCompound nbttagcompound = server.getPlayerList().getPlayerNBT(player);
+		PlayerList playerList=TASmod.getServerInstance().getPlayerList();
+		EntityPlayerMP player=playerList.getPlayers().get(0);
+		NBTTagCompound nbttagcompound = playerList.getPlayerNBT(player);
+		//TODO Make this multiplayer compatible ffs
 		SavestatePlayerLoading.reattachEntityToPlayer(nbttagcompound, player.getServerWorld(), player);
 	}
 
 	@SideOnly(Side.CLIENT)
 	public static void playerLoadSavestateEventClient() {
 		SavestatesChunkControl.addPlayerToChunk(Minecraft.getMinecraft().player);
 	}
+	
 }

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

@@ -1,5 +1,6 @@
 package de.scribble.lp.tasmod.savestates.server;
 
+import de.scribble.lp.tasmod.TASmod;
 import de.scribble.lp.tasmod.savestates.server.exceptions.SavestateException;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.util.text.TextComponentString;
@@ -30,7 +31,7 @@ public IMessage onMessage(SavestatePacket message, MessageContext ctx) {
 					return;
 				}
 				try {
-					SavestateHandler.saveState(-1);
+					TASmod.savestateHandler.saveState(-1);
 				} catch (SavestateException e) {
 					player.sendMessage(new TextComponentString(TextFormatting.RED+"Failed to create a savestate: "+ e.getMessage()));