[PlayUntil] Moved to new event

Author: ScribbleTAS

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

@@ -65,10 +65,10 @@ public interface EventRecordTick extends EventBase {
 	public interface EventPlaybackTick extends EventBase {
 
 		/**
-		 * Fired when a tick is being recorded
+		 * Fired when a tick is played back
 		 * 
-		 * @param index     The index of the tick that is being recorded
-		 * @param container The {@link InputContainer} that is being recorded
+		 * @param index     The index of the tick that is played back
+		 * @param container The {@link InputContainer} that is played back
 		 */
 		public void onPlaybackTick(long index, InputContainer container);
 	}
@@ -98,4 +98,19 @@ public interface EventInputDelete extends EventBase {
 		 */
 		public void onInputDelete(long index);
 	}
+
+	/**
+	 * Fired when a tick is being played back before reading the inputs
+	 */
+	@FunctionalInterface
+	public interface EventPlaybackTickPre extends EventBase {
+
+		/**
+		 * Fired when a tick is being played back before reading the inputs
+		 * 
+		 * @param index     The index of the tick that is played back
+		 * @param container The {@link InputContainer} that is played back
+		 */
+		public void onPlaybackTickPre(long index);
+	}
 }

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

@@ -14,7 +14,6 @@
 import com.minecrafttas.tasmod.events.EventPlaybackClient;
 import com.minecrafttas.tasmod.networking.TASmodBufferBuilder;
 import com.minecrafttas.tasmod.playback.PlaybackControllerClient;
-import com.minecrafttas.tasmod.playback.PlaybackControllerClient.InputContainer;
 import com.minecrafttas.tasmod.playback.PlaybackControllerClient.TASstate;
 import com.minecrafttas.tasmod.registries.TASmodPackets;
 
@@ -23,20 +22,19 @@
  * 
  * @author Scribble
  */
-public class PlayUntilHandler implements ClientPacketHandler, ServerPacketHandler, EventPlaybackClient.EventPlaybackTick {
+public class PlayUntilHandler implements ClientPacketHandler, ServerPacketHandler, EventPlaybackClient.EventPlaybackTickPre {
 
 	/**
 	 * If not null, play until a certain point
 	 */
 	private Integer playUntil = null;
 
 	@Override
-	public void onPlaybackTick(long index, InputContainer container) {
+	public void onPlaybackTickPre(long index) {
 		/* Playuntil logic */
 		if (playUntil != null && playUntil == index) {
 			TASmodClient.tickratechanger.pauseGame(true);
 			PlaybackControllerClient controller = TASmodClient.controller;
-			controller.setDontClearOnStop(true);
 			controller.setTASState(TASstate.NONE);
 			controller.setIndex(controller.index() - 1);
 			for (long i = controller.size() - 1; i >= index; i--) {

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

@@ -42,6 +42,7 @@
 import com.minecrafttas.tasmod.events.EventPlaybackClient.EventControllerStateChange;
 import com.minecrafttas.tasmod.events.EventPlaybackClient.EventPlaybackJoinedWorld;
 import com.minecrafttas.tasmod.events.EventPlaybackClient.EventPlaybackTick;
+import com.minecrafttas.tasmod.events.EventPlaybackClient.EventPlaybackTickPre;
 import com.minecrafttas.tasmod.events.EventPlaybackClient.EventRecordTick;
 import com.minecrafttas.tasmod.events.EventVirtualInput;
 import com.minecrafttas.tasmod.networking.TASmodBufferBuilder;
@@ -141,12 +142,6 @@ public class PlaybackControllerClient implements
 	 */
 	private BigArrayList<InputContainer> inputs;
 
-	/**
-	 * If true, doesn't clear the virtual inputs<br>
-	 * when stopping a recording or playback
-	 */
-	private boolean dontZwonkel = false;
-
 //	private long startSeed = TASmod.ktrngHandler.getGlobalSeedClient(); // TODO Replace with Metadata extension
 
 	// =====================================================================================================
@@ -293,12 +288,7 @@ private void startRecording() {
 
 	private void stopRecording() {
 		LOGGER.debug(LoggerMarkers.Playback, "Stopping a recording");
-
-		if (dontZwonkel)
-			dontZwonkel = false;
-		else {
-			TASmodClient.virtual.clear();
-		}
+		TASmodClient.virtual.clear();
 	}
 
 	private void startPlayback() {
@@ -311,11 +301,7 @@ private void startPlayback() {
 	private void stopPlayback() {
 		LOGGER.debug(LoggerMarkers.Playback, "Stopping a playback");
 		Minecraft.getMinecraft().gameSettings.chatLinks = true;
-		if (dontZwonkel)
-			dontZwonkel = false;
-		else {
-			TASmodClient.virtual.clear();
-		}
+		TASmodClient.virtual.clear();
 	}
 
 	/**
@@ -507,6 +493,8 @@ private void playbackNextTick() {
 
 		index++; // Increase the index and load the next inputs
 
+		EventListenerRegistry.fireEvent(EventPlaybackTickPre.class, index);
+
 		/* Stop condition */
 		if (index == inputs.size() || inputs.isEmpty()) {
 			index--;
@@ -631,13 +619,6 @@ public void unpressContainer() {
 		mouse.clear();
 	}
 
-	/**
-	 * @param dontClear {@link #dontZwonkel}
-	 */
-	public void setDontClearOnStop(boolean dontClear) {
-		this.dontZwonkel = dontClear;
-	}
-
 	// ==============================================================
 
 	/**

src/main/java/com/minecrafttas/tasmod/virtual/VirtualCameraAngle.java

@@ -216,7 +216,7 @@ public String toString() {
 	}
 
 	public String toString2() {
-		return String.format("%s;%s", pitch, yaw);
+		return String.format("%s;%s", yaw, pitch);
 	}
 
 	/**

src/test/java/tasmod/virtual/VirtualCameraAngleTest.java

@@ -118,26 +118,26 @@ void testGetStates() {
 		test.updateFromEvent(1f, 1f);
 		test.updateFromEvent(1f, 1f);
 		test.updateFromEvent(1f, 1f);
-		
+
 		List<VirtualCameraAngle> actual = new ArrayList<>();
-		
+
 		// Test get states on a subtick, should result in an empty array
 		VirtualCameraAngle test2 = new VirtualCameraAngle(0f, 0f);
-		
+
 		test2.getStates(actual);
-		
+
 		assertTrue(actual.isEmpty());
-		
+
 		actual.clear();
-		
+
 		test.getStates(actual);
-		
+
 		List<VirtualCameraAngle> expected = new ArrayList<>();
-		
+
 		expected.add(new VirtualCameraAngle(1f, 1f));
 		expected.add(new VirtualCameraAngle(2f, 2f));
 		expected.add(new VirtualCameraAngle(3f, 3f));
-		
+
 		assertIterableEquals(expected, actual);
 	}
 
@@ -149,26 +149,26 @@ void testCopyFrom() {
 		VirtualCameraAngle expected = new VirtualCameraAngle(0f, 0f, true);
 		expected.updateFromEvent(1f, 2f);
 		expected.updateFromEvent(3f, 4f);
-		
+
 		VirtualCameraAngle actual = new VirtualCameraAngle(0f, 0f, true);
-		
+
 		actual.moveFrom(expected);
-		
+
 		// Test pitch and yaw
 		assertEquals(expected.getPitch(), actual.getPitch());
 		assertEquals(expected.getYaw(), actual.getYaw());
-		
+
 		// Test subticks
 		List<VirtualCameraAngle> expected2 = new ArrayList<>();
 		expected2.add(new VirtualCameraAngle(1f, 2f));
 		expected2.add(new VirtualCameraAngle(4f, 6f));
-		
+
 		assertIterableEquals(expected2, actual.getAll());
 		// Test expected subticks being cleared
-		
+
 		assertTrue(expected.getSubticks().isEmpty());
 	}
-	
+
 	/**
 	 * Test clearing the camera angle
 	 */
@@ -179,9 +179,9 @@ void testClear() {
 		actual.updateFromEvent(1f, 1f);
 		actual.updateFromEvent(1f, 1f);
 		actual.updateFromEvent(1f, 1f);
-		
+
 		actual.clear();
-		
+
 		assertNull(actual.getPitch());
 		assertNull(actual.getYaw());
 		assertTrue(actual.getSubticks().isEmpty());
@@ -197,7 +197,7 @@ void testToString() {
 
 		VirtualCameraAngle actual = new VirtualCameraAngle(x, y);
 
-		assertEquals("1.0;2.0", actual.toString());
+		assertEquals("2.0;1.0", actual.toString());
 	}
 
 	/**
@@ -210,7 +210,7 @@ void testToStringSubticks() {
 		actual.updateFromEvent(3f, 4f);
 		actual.updateFromEvent(5f, 6f);
 
-		assertEquals("1.0;2.0\n4.0;6.0\n9.0;12.0", actual.toString());
+		assertEquals("2.0;1.0\n6.0;4.0\n12.0;9.0", actual.toString());
 	}
 
 	/**
@@ -228,7 +228,7 @@ void testShallowClone() {
 		assertEquals(1f, actual.getPitch());
 		assertEquals(2f, actual.getYaw());
 	}
-	
+
 	// DeepCloning
 
 	/**