[PlaybackController] Fix continuing recording desyncing

- Breaking playuntil

Author: ScribbleTAS

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

@@ -40,5 +40,4 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
 			sender.sendMessage(new TextComponentString("Stops the next playback one tick before the specified tick and lets you record from there:\n\n/playuntil 10, runs the playback until tick 9 and will record from there. Useful when you can't savestate"));
 		}
 	}
-
 }

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

@@ -2,8 +2,8 @@
 
 import com.minecrafttas.mctcommon.events.EventListenerRegistry.EventBase;
 import com.minecrafttas.tasmod.playback.PlaybackControllerClient;
-import com.minecrafttas.tasmod.playback.PlaybackControllerClient.TASstate;
 import com.minecrafttas.tasmod.playback.PlaybackControllerClient.InputContainer;
+import com.minecrafttas.tasmod.playback.PlaybackControllerClient.TASstate;
 
 public interface EventPlaybackClient {
 
@@ -84,4 +84,18 @@ public interface EventRecordClear extends EventBase {
 		 */
 		public void onRecordingClear();
 	}
+
+	/**
+	 * Fired when an input is deleted
+	 */
+	@FunctionalInterface
+	public interface EventInputDelete extends EventBase {
+
+		/**
+		 * Fired when an input is deleted
+		 * 
+		 * @param The index of the input
+		 */
+		public void onInputDelete(long index);
+	}
 }

src/main/java/com/minecrafttas/tasmod/handlers/InterpolationHandler.java

@@ -33,15 +33,16 @@ public class PlayUntilHandler implements ClientPacketHandler, ServerPacketHandle
 	@Override
 	public void onPlaybackTick(long index, InputContainer container) {
 		/* Playuntil logic */
-		if (playUntil != null && playUntil == index + 1) {
+		if (playUntil != null && playUntil == index) {
 			TASmodClient.tickratechanger.pauseGame(true);
 			PlaybackControllerClient controller = TASmodClient.controller;
 			playUntil = null;
 			controller.setTASState(TASstate.NONE);
+			controller.unpressContainer();
+			controller.setIndex(controller.index() - 1);
 			for (long i = controller.size() - 1; i >= index; i--) {
-				controller.getInputs().remove(i);
+				controller.remove(i);
 			}
-			index--;
 			controller.setTASState(TASstate.RECORDING);
 			return;
 		}

src/main/java/com/minecrafttas/tasmod/handlers/PlayUntilHandler.java

@@ -490,6 +490,7 @@ private void playbackNextTick() {
 
 		/* Stop condition */
 		if (index == inputs.size() || inputs.isEmpty()) {
+			index--;
 			unpressContainer();
 			setTASState(TASstate.NONE);
 		}
@@ -501,7 +502,6 @@ private void playbackNextTick() {
 			this.camera = container.getCameraAngle().clone();
 			EventListenerRegistry.fireEvent(EventPlaybackTick.class, index, container);
 		}
-
 	}
 	// =====================================================================================================
 	// Methods to manipulate inputs
@@ -518,6 +518,11 @@ public long index() {
 		return index;
 	}
 
+	public void remove(long index) {
+		inputs.remove(index);
+		EventListenerRegistry.fireEvent(EventPlaybackClient.EventInputDelete.class, index);
+	}
+
 	public BigArrayList<InputContainer> getInputs() {
 		return inputs;
 	}

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

@@ -28,7 +28,7 @@
  * 
  * @author Scribble
  */
-public class DesyncMonitorFileCommandExtension extends PlaybackFileCommandExtension implements EventPlaybackClient.EventControllerStateChange {
+public class DesyncMonitorFileCommandExtension extends PlaybackFileCommandExtension implements EventPlaybackClient.EventControllerStateChange, EventPlaybackClient.EventInputDelete {
 
 	/**
 	 * List containing {@link MonitorContainer MonitorContainers} in a TASfile 
@@ -365,4 +365,9 @@ public void onClear() {
 		lastPos = "";
 		lastMotion = "";
 	}
+
+	@Override
+	public void onInputDelete(long index) {
+		monitorContainer.remove(index);
+	}
 }