[PlaybackController] Fix restartandplay not working

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

@@ -157,6 +157,7 @@ public void onServerInit(MinecraftServer server) {
 		savestateHandlerServer = new SavestateHandlerServer(server, LOGGER);
 		PacketHandlerRegistry.register(savestateHandlerServer);
 		PacketHandlerRegistry.register(savestateHandlerServer.getPlayerHandler());
+		EventListenerRegistry.register(savestateHandlerServer.getSavestateTemporaryHandler());
 
 		if (!server.isDedicatedServer()) {
 			TASmod.tickratechanger.ticksPerSecond = 0F;
@@ -187,6 +188,8 @@ public void onServerStop(MinecraftServer mcserver) {
 		if (savestateHandlerServer != null) {
 			PacketHandlerRegistry.unregister(savestateHandlerServer); // Unregistering the savestatehandler, as a new instance is registered in onServerStart()
 			PacketHandlerRegistry.unregister(savestateHandlerServer.getPlayerHandler());
+			PacketHandlerRegistry.unregister(savestateHandlerServer);
+			EventListenerRegistry.unregister(savestateHandlerServer.getSavestateTemporaryHandler());
 
 			savestateHandlerServer = null;
 		}

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

@@ -1,19 +1,11 @@
 package com.minecrafttas.tasmod.commands;
 
 import com.minecrafttas.tasmod.TASmod;
-import com.minecrafttas.tasmod.networking.TASmodBufferBuilder;
-import com.minecrafttas.tasmod.playback.PlaybackControllerClient.TASstate;
-import com.minecrafttas.tasmod.registries.TASmodPackets;
-import com.minecrafttas.tasmod.savestates.SavestateHandlerServer.SavestateCallback;
-import com.minecrafttas.tasmod.savestates.SavestateHandlerServer.SavestateFlags;
-import com.minecrafttas.tasmod.savestates.exceptions.LoadstateException;
 
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.text.TextComponentString;
-import net.minecraft.util.text.TextFormatting;
 
 public class CommandFullPlay extends CommandBase {
 
@@ -29,33 +21,6 @@ public String getUsage(ICommandSender sender) {
 
 	@Override
 	public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
-
-		SavestateCallback cb = (paths) -> {
-			try {
-				TASmod.server.sendToAll(new TASmodBufferBuilder(TASmodPackets.SAVESTATE_CLEAR_SCREEN));
-			} catch (Exception e) {
-				TASmod.LOGGER.catching(e);
-			}
-		};
-
-		try {
-			TASmod.savestateHandlerServer.loadState(0, cb, SavestateFlags.BLOCK_CHANGE_INDEX, SavestateFlags.BLOCK_PAUSE_TICKRATE);
-		} catch (LoadstateException e) {
-			sender.sendMessage(new TextComponentString(TextFormatting.RED + "Failed to load a savestate: " + e.getMessage()));
-			return;
-		} catch (Exception e) {
-			sender.sendMessage(new TextComponentString(TextFormatting.RED + "Failed to load a savestate: " + e.getCause().toString()));
-			e.printStackTrace();
-			return;
-		} finally {
-			TASmod.savestateHandlerServer.resetState();
-		}
-		TASmod.playbackControllerServer.setServerState(TASstate.PLAYBACK);
-		try {
-			TASmod.server.sendToAll(new TASmodBufferBuilder(TASmodPackets.PLAYBACK_FULLPLAY));
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+		TASmod.playbackControllerServer.fullPlay();
 	}
-
 }

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

@@ -1,19 +1,11 @@
 package com.minecrafttas.tasmod.commands;
 
 import com.minecrafttas.tasmod.TASmod;
-import com.minecrafttas.tasmod.networking.TASmodBufferBuilder;
-import com.minecrafttas.tasmod.playback.PlaybackControllerClient.TASstate;
-import com.minecrafttas.tasmod.registries.TASmodPackets;
-import com.minecrafttas.tasmod.savestates.SavestateHandlerServer.SavestateCallback;
-import com.minecrafttas.tasmod.savestates.SavestateHandlerServer.SavestateFlags;
-import com.minecrafttas.tasmod.savestates.exceptions.SavestateException;
 
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.text.TextComponentString;
-import net.minecraft.util.text.TextFormatting;
 
 public class CommandFullRecord extends CommandBase {
 
@@ -29,28 +21,6 @@ public String getUsage(ICommandSender sender) {
 
 	@Override
 	public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
-
-		SavestateCallback cb = (paths) -> {
-			try {
-				TASmod.server.sendToAll(new TASmodBufferBuilder(TASmodPackets.SAVESTATE_CLEAR_SCREEN));
-			} catch (Exception e) {
-				TASmod.LOGGER.catching(e);
-			}
-		};
-
-		try {
-			TASmod.savestateHandlerServer.saveState(0, cb, SavestateFlags.BLOCK_PAUSE_TICKRATE);
-		} catch (SavestateException e) {
-			sender.sendMessage(new TextComponentString(TextFormatting.RED + "Failed to create a savestate: " + e.getMessage()));
-			return;
-		} finally {
-			TASmod.savestateHandlerServer.resetState();
-		}
-		TASmod.playbackControllerServer.setServerState(TASstate.RECORDING);
-		try {
-			TASmod.server.sendToAll(new TASmodBufferBuilder(TASmodPackets.PLAYBACK_FULLRECORD));
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+		TASmod.playbackControllerServer.fullRecord();
 	}
 }

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

@@ -42,11 +42,10 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
 			return;
 		}
 		if (args.length <= 1) {
-			boolean loadTempSavestate = true;
-			if (args.length == 1 && "nosave".equals(args[0])) {
-				loadTempSavestate = false;
-			}
-			TASmod.playbackControllerServer.togglePlayback(loadTempSavestate);
+			boolean noSave = args.length == 1 && "nosave".equals(args[0]);
+			TASmod.savestateHandlerServer.getSavestateTemporaryHandler().setNoSave(noSave);
+
+			TASmod.playbackControllerServer.togglePlayback();
 		} else if (args.length > 2) {
 			sender.sendMessage(new TextComponentString(TextFormatting.RED + "Too many arguments. " + getUsage(sender)));
 		}

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

@@ -42,11 +42,9 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
 			return;
 		}
 		if (args.length <= 1) {
-			boolean saveTempSavestate = true;
-			if (args.length == 1 && "nosave".equals(args[0])) {
-				saveTempSavestate = false;
-			}
-			TASmod.playbackControllerServer.toggleRecording(saveTempSavestate);
+			boolean noSave = args.length == 1 && "nosave".equals(args[0]);
+			TASmod.savestateHandlerServer.getSavestateTemporaryHandler().setNoSave(noSave);
+			TASmod.playbackControllerServer.toggleRecording();
 		} else if (args.length > 1) {
 			sender.sendMessage(new TextComponentString(TextFormatting.RED + "Too many arguments. " + getUsage(sender)));
 		}

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

@@ -6,11 +6,6 @@
 import java.util.List;
 
 import com.minecrafttas.tasmod.TASmod;
-import com.minecrafttas.tasmod.networking.TASmodBufferBuilder;
-import com.minecrafttas.tasmod.playback.PlaybackControllerClient.TASstate;
-import com.minecrafttas.tasmod.registries.TASmodPackets;
-import com.minecrafttas.tasmod.savestates.SavestateHandlerServer.SavestateFlags;
-import com.minecrafttas.tasmod.savestates.exceptions.LoadstateException;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.command.CommandBase;
@@ -39,31 +34,7 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
 			if (args.length < 1) {
 				sender.sendMessage(new TextComponentString(TextFormatting.RED + "Please add a filename, " + getUsage(sender)));
 			} else {
-				String name = "";
-				String spacer = " ";
-				for (int i = 0; i < args.length; i++) {
-					if (i == args.length - 1) {
-						spacer = "";
-					}
-					name = name.concat(args[i] + spacer);
-				}
-				try {
-					TASmod.savestateHandlerServer.loadState(0, null, SavestateFlags.BLOCK_PAUSE_TICKRATE);
-				} catch (LoadstateException e) {
-					TASmod.LOGGER.catching(e);
-					if (e.getMessage() != null) {
-						sender.sendMessage(new TextComponentString(TextFormatting.RED + "Could not load the initial savestate: " + e.getMessage()));
-					}
-					TASmod.savestateHandlerServer.resetState();
-					TASmod.tickratechanger.pauseGame(false);
-					return;
-				}
-				TASmod.playbackControllerServer.setServerState(TASstate.PLAYBACK);
-				try {
-					TASmod.server.sendToAll(new TASmodBufferBuilder(TASmodPackets.PLAYBACK_RESTARTANDPLAY).writeString(args[0]));
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
+				TASmod.playbackControllerServer.restartAndPlay(String.join(" ", args));
 			}
 		} else {
 			sender.sendMessage(new TextComponentString(TextFormatting.RED + "You have no permission to use this command"));

src/main/java/com/minecrafttas/tasmod/events/EventPlaybackServer.java

@@ -0,0 +1,33 @@
+package com.minecrafttas.tasmod.events;
+
+import com.minecrafttas.mctcommon.events.EventListenerRegistry.EventBase;
+import com.minecrafttas.tasmod.playback.PlaybackControllerClient.TASstate;
+import com.minecrafttas.tasmod.playback.PlaybackControllerServer;
+
+public interface EventPlaybackServer {
+
+	/**
+	 * Fired when {@link PlaybackControllerServer#setTASStateServer(TASstate)} is called
+	 */
+	@FunctionalInterface
+	public interface EventControllerStateChange extends EventBase {
+		/**
+		 * Fired when {@link PlaybackControllerServer#setTASStateServer(TASstate)} is called
+		 * @param newstate The new state that the playback controller is about to be set
+		 * @param oldstate The current state that is about to be replaced by newstate
+		 */
+		public void onControllerStateChange(TASstate newstate, TASstate oldstate);
+	}
+
+	/**
+	 * Fired when a recording is cleared in {@link PlaybackControllerServer#clearInputs()}
+	 */
+	@FunctionalInterface
+	public interface EventRecordClear extends EventBase {
+
+		/**
+		 * Fired when a recording is cleared in {@link PlaybackControllerServer#clearInputs()}
+		 */
+		public void onRecordingClear();
+	}
+}

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

@@ -9,6 +9,7 @@
 import static com.minecrafttas.tasmod.registries.TASmodPackets.PLAYBACK_SAVE;
 import static com.minecrafttas.tasmod.registries.TASmodPackets.PLAYBACK_STATE;
 
+import java.io.IOException;
 import java.io.Serializable;
 import java.nio.ByteBuffer;
 import java.nio.file.Path;
@@ -1014,15 +1015,15 @@ public void onClientPacket(PacketID id, ByteBuffer buf, String username) throws
 				break;
 
 			case PLAYBACK_RESTARTANDPLAY:
-				final String finalname = ByteBufferBuilder.readString(buf);
+				String tasFilename = ByteBufferBuilder.readString(buf);
 
 				try {
 					Thread.sleep(100L);
 				} catch (InterruptedException e) {
 					e.printStackTrace();
 				}
 				Minecraft.getMinecraft().addScheduledTask(() -> {
-					TASmodClient.config.set(TASmodConfig.FileToOpen, finalname);
+					TASmodClient.config.set(TASmodConfig.FileToOpen, tasFilename);
 					System.exit(0);
 				});
 				break;
@@ -1077,5 +1078,13 @@ public void onClientInit(Minecraft mc) {
 		} else {
 			TASmodClient.config.reset(TASmodConfig.FileToOpen);
 		}
+
+		try {
+			TASmodClient.controller.setInputs(PlaybackSerialiser.loadFromFile(tasFileDirectory.resolve(fileOnStart + fileEnding)));
+		} catch (PlaybackLoadException | IOException e) {
+			logger.catching(e);
+		}
+
+		setTASState(TASstate.PLAYBACK);
 	}
 }