[PlayUntil] Refactor playuntil

ScribbleTAS · ScribbleTAS · commit 631dbe0d4521 · 2025-04-11T23:34:00.000+02:00
diff --git a/src/main/java/com/minecrafttas/tasmod/TASmod.java b/src/main/java/com/minecrafttas/tasmod/TASmod.java
@@ -25,6 +25,7 @@
 import com.minecrafttas.tasmod.commands.CommandSavestate;
 import com.minecrafttas.tasmod.commands.CommandTickrate;
 import com.minecrafttas.tasmod.commands.TabCompletionUtils;
+import com.minecrafttas.tasmod.handlers.PlayUntilHandler;
 import com.minecrafttas.tasmod.playback.PlaybackControllerServer;
 import com.minecrafttas.tasmod.playback.metadata.builtin.StartpositionMetadataExtension;
 import com.minecrafttas.tasmod.registries.TASmodPackets;
@@ -78,6 +79,8 @@ public class TASmod implements ModInitializer, EventServerInit, EventServerStop
 
 	public static final CommandFileCommand commandFileCommand = new CommandFileCommand();
 
+	public static final PlayUntilHandler playUntil = new PlayUntilHandler();
+
 	@Override
 	public void onInitialize() {
 
@@ -117,6 +120,8 @@ public void onInitialize() {
 		SavestateMotionStorage motionStorage = new SavestateMotionStorage();
 		PacketHandlerRegistry.register(motionStorage);
 		EventListenerRegistry.register(motionStorage);
+		PacketHandlerRegistry.register(playUntil);
+		EventListenerRegistry.register(playUntil);
 	}
 
 	@Override
diff --git a/src/main/java/com/minecrafttas/tasmod/commands/CommandPlayUntil.java b/src/main/java/com/minecrafttas/tasmod/commands/CommandPlayUntil.java
@@ -10,7 +10,7 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.text.TextComponentString;
 
-public class CommandPlayUntil extends CommandBase{
+public class CommandPlayUntil extends CommandBase {
 
 	@Override
 	public String getName() {
@@ -24,7 +24,7 @@ public String getUsage(ICommandSender sender) {
 
 	@Override
 	public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
-		if(args.length==1) {
+		if (args.length == 1) {
 			int i = 0;
 			try {
 				i = Integer.parseInt(args[0]);
@@ -36,8 +36,7 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
-		}
-		else {
+		} else {
 			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"));
 		}
 	}
diff --git a/src/main/java/com/minecrafttas/tasmod/handlers/PlayUntilHandler.java b/src/main/java/com/minecrafttas/tasmod/handlers/PlayUntilHandler.java
@@ -0,0 +1,85 @@
+package com.minecrafttas.tasmod.handlers;
+
+import java.nio.ByteBuffer;
+
+import com.minecrafttas.mctcommon.networking.ByteBufferBuilder;
+import com.minecrafttas.mctcommon.networking.Client.Side;
+import com.minecrafttas.mctcommon.networking.exception.PacketNotImplementedException;
+import com.minecrafttas.mctcommon.networking.exception.WrongSideException;
+import com.minecrafttas.mctcommon.networking.interfaces.ClientPacketHandler;
+import com.minecrafttas.mctcommon.networking.interfaces.PacketID;
+import com.minecrafttas.mctcommon.networking.interfaces.ServerPacketHandler;
+import com.minecrafttas.tasmod.TASmod;
+import com.minecrafttas.tasmod.TASmodClient;
+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;
+
+/**
+ * Feature for starting a recording after playing back a certain number of ticks
+ * 
+ * @author Scribble
+ */
+public class PlayUntilHandler implements ClientPacketHandler, ServerPacketHandler, EventPlaybackClient.EventPlaybackTick {
+
+	/**
+	 * If not null, play until a certain point
+	 */
+	private Integer playUntil = null;
+
+	@Override
+	public void onPlaybackTick(long index, InputContainer container) {
+		/* Playuntil logic */
+		if (playUntil != null && playUntil == index + 1) {
+			TASmodClient.tickratechanger.pauseGame(true);
+			PlaybackControllerClient controller = TASmodClient.controller;
+			playUntil = null;
+			controller.setTASState(TASstate.NONE);
+			for (long i = controller.size() - 1; i >= index; i--) {
+				controller.getInputs().remove(i);
+			}
+			index--;
+			controller.setTASState(TASstate.RECORDING);
+			return;
+		}
+	}
+
+	public void setPlayUntil(int until) {
+		this.playUntil = until;
+	}
+
+	@Override
+	public PacketID[] getAcceptedPacketIDs() {
+		return new TASmodPackets[] { TASmodPackets.PLAYBACK_PLAYUNTIL };
+	}
+
+	@Override
+	public void onClientPacket(PacketID id, ByteBuffer buf, String username) throws PacketNotImplementedException, WrongSideException, Exception {
+		TASmodPackets packet = (TASmodPackets) id;
+
+		switch (packet) {
+			case PLAYBACK_PLAYUNTIL:
+				int until = ByteBufferBuilder.readInt(buf);
+				setPlayUntil(until);
+				break;
+			default:
+				throw new PacketNotImplementedException(packet, this.getClass(), Side.SERVER);
+		}
+	}
+
+	@Override
+	public void onServerPacket(PacketID id, ByteBuffer buf, String username) throws PacketNotImplementedException, WrongSideException, Exception {
+		TASmodPackets packet = (TASmodPackets) id;
+
+		switch (packet) {
+			case PLAYBACK_PLAYUNTIL:
+				TASmod.server.sendToAll(new TASmodBufferBuilder(buf));
+				break;
+			default:
+				throw new PacketNotImplementedException(packet, this.getClass(), Side.SERVER);
+		}
+	}
+}
diff --git a/src/main/java/com/minecrafttas/tasmod/playback/PlaybackControllerClient.java b/src/main/java/com/minecrafttas/tasmod/playback/PlaybackControllerClient.java
@@ -5,7 +5,6 @@
 import static com.minecrafttas.tasmod.registries.TASmodPackets.PLAYBACK_FULLPLAY;
 import static com.minecrafttas.tasmod.registries.TASmodPackets.PLAYBACK_FULLRECORD;
 import static com.minecrafttas.tasmod.registries.TASmodPackets.PLAYBACK_LOAD;
-import static com.minecrafttas.tasmod.registries.TASmodPackets.PLAYBACK_PLAYUNTIL;
 import static com.minecrafttas.tasmod.registries.TASmodPackets.PLAYBACK_RESTARTANDPLAY;
 import static com.minecrafttas.tasmod.registries.TASmodPackets.PLAYBACK_SAVE;
 import static com.minecrafttas.tasmod.registries.TASmodPackets.PLAYBACK_STATE;
@@ -142,8 +141,6 @@ public class PlaybackControllerClient implements
 
 	// =====================================================================================================
 
-	private Integer playUntil = null; // TODO Replace with event
-
 	public PlaybackControllerClient() {
 		tasFileDirectory = TASmodClient.tasfiledirectory;
 
@@ -491,19 +488,6 @@ private void playbackNextTick() {
 
 		index++; // Increase the index and load the next inputs
 
-		/* Playuntil logic */
-		if (playUntil != null && playUntil == index) {
-			TASmodClient.tickratechanger.pauseGame(true);
-			playUntil = null;
-			setTASState(TASstate.NONE);
-			for (long i = inputs.size() - 1; i >= index; i--) {
-				inputs.remove(i);
-			}
-			index--;
-			setTASState(TASstate.RECORDING);
-			return;
-		}
-
 		/* Stop condition */
 		if (index == inputs.size() || inputs.isEmpty()) {
 			unpressContainer();
@@ -624,12 +608,6 @@ public void unpressContainer() {
 
 	// ==============================================================
 
-	public void setPlayUntil(int until) {
-		this.playUntil = until;
-	}
-
-	// ==============================================================
-
 	/**
 	 * Storage class which stores the keyboard, mouse, subticks and comments of a given tick.
 	 * 
@@ -837,7 +815,6 @@ public PacketID[] getAcceptedPacketIDs() {
 				PLAYBACK_FULLPLAY,
 				PLAYBACK_FULLRECORD,
 				PLAYBACK_RESTARTANDPLAY,
-				PLAYBACK_PLAYUNTIL,
 				PLAYBACK_CLEAR_INPUTS,
 				PLAYBACK_STATE
 
@@ -949,11 +926,6 @@ public void onClientPacket(PacketID id, ByteBuffer buf, String username) throws
 				});
 				break;
 
-			case PLAYBACK_PLAYUNTIL:
-				int until = ByteBufferBuilder.readInt(buf);
-				TASmodClient.controller.setPlayUntil(until);
-				break;
-
 			case PLAYBACK_CLEAR_INPUTS:
 				TASmodClient.controller.clear();
 				break;
diff --git a/src/main/java/com/minecrafttas/tasmod/playback/PlaybackControllerServer.java b/src/main/java/com/minecrafttas/tasmod/playback/PlaybackControllerServer.java
@@ -5,7 +5,6 @@
 import static com.minecrafttas.tasmod.registries.TASmodPackets.PLAYBACK_FULLPLAY;
 import static com.minecrafttas.tasmod.registries.TASmodPackets.PLAYBACK_FULLRECORD;
 import static com.minecrafttas.tasmod.registries.TASmodPackets.PLAYBACK_LOAD;
-import static com.minecrafttas.tasmod.registries.TASmodPackets.PLAYBACK_PLAYUNTIL;
 import static com.minecrafttas.tasmod.registries.TASmodPackets.PLAYBACK_RESTARTANDPLAY;
 import static com.minecrafttas.tasmod.registries.TASmodPackets.PLAYBACK_SAVE;
 import static com.minecrafttas.tasmod.registries.TASmodPackets.PLAYBACK_STATE;
@@ -36,17 +35,18 @@ public class PlaybackControllerServer implements ServerPacketHandler {
 
 	@Override
 	public PacketID[] getAcceptedPacketIDs() {
+		//@formatter:off
 		return new TASmodPackets[] 
 				{ 
 				PLAYBACK_STATE,
 				PLAYBACK_CLEAR_INPUTS,
 				PLAYBACK_FULLPLAY,
 				PLAYBACK_FULLRECORD,
 				PLAYBACK_RESTARTANDPLAY,
-				PLAYBACK_PLAYUNTIL,
 				PLAYBACK_SAVE,
 				PLAYBACK_LOAD
 				};
+		//@formatter:on
 	}
 
 	@Override
@@ -67,12 +67,11 @@ public void onServerPacket(PacketID id, ByteBuffer buf, String username) throws
 			case PLAYBACK_FULLPLAY:
 			case PLAYBACK_FULLRECORD:
 			case PLAYBACK_RESTARTANDPLAY:
-			case PLAYBACK_PLAYUNTIL:
 			case PLAYBACK_SAVE:
 			case PLAYBACK_LOAD:
 				TASmod.server.sendToAll(new TASmodBufferBuilder(buf));
 				break;
-				
+
 			default:
 				throw new PacketNotImplementedException(packet, this.getClass(), Side.SERVER);
 		}
