One scene for each player, add LoopSceneManager

Replaced direct player and scene management with a new `LoopSceneManager` class to centralize logic and improve maintainability. Updated related methods and removed redundant code for managing recordings and scenes. Enhanced clarity and flexibility in handling player-specific scenes.

Author: VLTNOgithub

src/main/java/com/vltno/timeloop/LoopSceneManager.java

@@ -0,0 +1,63 @@
+package com.vltno.timeloop;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+
+public class LoopSceneManager {
+    private TimeLoopConfig config;
+    private String sceneName;
+    private List<String> recordingPlayers;
+
+    // Constructor to initialize recordingPlayers
+    public LoopSceneManager(TimeLoopConfig _config) {
+        this.config = _config;
+        this.sceneName = config.sceneName;
+        this.recordingPlayers = new ArrayList<>();
+    }
+
+    // Method to add a player to the recordingPlayers list
+    public void addPlayer(String playerName) {
+        if (playerName != null && !playerName.isEmpty()) {
+            recordingPlayers.add(playerName.toLowerCase());
+        } else {
+            System.out.println("Invalid player name. Player not added.");
+        }
+    }
+
+    // Method to remove a specific player from the recordingPlayers list
+    public void removePlayer(String playerName) {
+        if (playerName != null && !playerName.isEmpty()) {
+            boolean removed = recordingPlayers.remove(playerName);
+            if (removed) {
+                System.out.println("Player '" + playerName + "' removed successfully.");
+            } else {
+                System.out.println("Player '" + playerName + "' not found in the list.");
+            }
+        } else {
+            System.out.println("Invalid player name. Player not removed.");
+        }
+    }
+
+    // Method to generate playerSceneName for a given player
+    public String getPlayerSceneName(String playerName) {
+        return (sceneName + "_" + playerName).toLowerCase();
+    }
+
+    // Method to get all playerSceneNames for recordingPlayers
+    public List<String> getAllPlayerSceneNames() {
+        List<String> playerSceneNames = new ArrayList<>();
+        for (String player : recordingPlayers) {
+            playerSceneNames.add(getPlayerSceneName(player));
+        }
+        return playerSceneNames;
+    }
+
+    public void forEachPlayerSceneName(Consumer<String> action) {
+        getAllPlayerSceneNames().forEach(action);
+    }
+    
+    public void forEachRecordingPlayer(Consumer<String> action) {
+        recordingPlayers.forEach(action);
+    }
+}

src/main/java/com/vltno/timeloop/TimeLoop.java

@@ -46,7 +46,6 @@ public class TimeLoop implements ModInitializer {
 	public String sceneName;
 	private int tickCounter = 0; // Tracks elapsed ticks
 	public int ticksLeft;
-	private List<String> recordingPlayers; // Add this field
 
 	public boolean showLoopInfo;
 	public boolean displayTimeInTicks;
@@ -55,6 +54,9 @@ public class TimeLoop implements ModInitializer {
 
 	// The configuration object loaded from disk
 	public TimeLoopConfig config;
+	
+	// The loop scene manager object
+	private LoopSceneManager loopSceneManager;
 
 	// Get the world folder path for config/recording loading
 	private Path worldFolder;
@@ -63,7 +65,7 @@ public class TimeLoop implements ModInitializer {
 	@Override
 	public void onInitialize() {
 		LOOP_LOGGER.info("Initializing TimeLoop mod");
-		recordingPlayers = new ArrayList<>(); // Initialize the list
+		loopSceneManager = new LoopSceneManager(config);
 
 		// Register the custom ArgumentType
 		ArgumentTypeRegistry.registerArgumentType(Identifier.of("timeloop",""), LoopTypesArgumentType.class, ConstantArgumentSerializer.of(LoopTypesArgumentType::new));
@@ -119,15 +121,6 @@ public void onInitialize() {
 			executeCommand("mocap settings recording entity_tracking_distance 1");
 
 			updateEntitiesToTrack(trackItems);
-			
-			executeCommand(String.format("mocap scenes add %s", sceneName));
-			if (config.isLooping) {
-				LOOP_LOGGER.info("Loop was active in config, automatically restarting loop.");
-				// Reset the in-memory flag so that startLoop() does not return early.
-				isLooping = false;
-				executeCommand(String.format("mocap playback start .%s", sceneName));
-				startLoop();
-			}
 		});
 
 		ServerLifecycleEvents.SERVER_STOPPING.register(server -> {
@@ -141,11 +134,14 @@ public void onInitialize() {
 			ServerPlayerEntity player = handler.getPlayer();
 			String playerName = player.getName().getString();
 
+			loopSceneManager.addPlayer(playerName);
+			loopBossBar.addPlayer(player);
+			
+			executeCommand(String.format("mocap scenes add %s", loopSceneManager.getPlayerSceneName(playerName)));
+			
 			if (config.firstStart) {
 				config.firstStart = false;
 				config.save();
-
-				executeCommand(String.format("mocap scenes add %s", sceneName)); // Stupid patch because for some reason the first time fails, but when i add this, IT DOESNT FAIL. idk. if its fixed, remove this.
 
 				LOOP_LOGGER.info("First start detected, sending message to ops.");
 
@@ -154,8 +150,6 @@ public void onInitialize() {
 				}
 			}
 
-			recordingPlayers.add(playerName); // Add to recording list
-			loopBossBar.addPlayer(player);
 			if (isLooping) {
 				LOOP_LOGGER.info("Starting recording for newly joined player: {}", playerName);
 				executeCommand(String.format("mocap recording start %s", playerName));
@@ -165,16 +159,11 @@ public void onInitialize() {
 		ServerPlayConnectionEvents.DISCONNECT.register((handler, server) -> {
 			ServerPlayerEntity player = handler.getPlayer();
 			String playerName = player.getName().getString();
-			recordingPlayers.remove(playerName); // Remove from recording list
+			
+			loopSceneManager.removePlayer(playerName);
 			loopBossBar.removePlayer(player);
 			if (isLooping) {
-				LOOP_LOGGER.info("Saving recording for Disconnected player: {}", playerName);
-				String recordingName = playerName + "_" + System.currentTimeMillis();
-				executeCommand(String.format("mocap recording stop -+mc.%s.1", playerName));
-				executeCommand(String.format("mocap recording save %s -+mc.%s.1", recordingName.toLowerCase(), playerName));
-				if (recordingFileExists(recordingName)) {
-					executeCommand(String.format("mocap scenes add_to %s %s", sceneName, recordingName.toLowerCase()));
-				}
+				saveRecordings();
 			}
 		});
 
@@ -193,11 +182,6 @@ public void onInitialize() {
 						config.startTimeOfDay = 0;}
 
 					long time = (serverWorld.getTimeOfDay() > 24000 ? serverWorld.getTimeOfDay() % 24000 : serverWorld.getTimeOfDay());
-//
-//					long timeLeft = (timeFixed > timeSetting) ? Math.abs(timeFixed - (2 * timeSetting)) : Math.abs(timeFixed - timeSetting);
-//					LOOP_LOGGER.info("Time Fixed: " + timeFixed);
-//					LOOP_LOGGER.info("Time Setting: " + timeSetting);
-//					LOOP_LOGGER.info("Time Left: " + timeLeft);
 
 					long timeLeft = (time > timeSetting) ? Math.abs(serverWorld.getTimeOfDay() - (2 * timeSetting)) : Math.abs(time - timeSetting);
 
@@ -251,7 +235,11 @@ private void runLoopIteration() {
 		startRecordings();
 		if (trackTimeOfDay) { serverWorld.setTimeOfDay(startTimeOfDay); }
 		executeCommand("mocap playback stop_all including_others");
-		executeCommand(String.format("mocap playback start .%s", sceneName));
+		
+		loopSceneManager.forEachPlayerSceneName(playerSceneName -> {
+			executeCommand(String.format("mocap playback start .%s", loopSceneManager.getPlayerSceneName(playerSceneName)));
+		});
+		
 		loopIteration++;
 		config.loopIteration = loopIteration;
 		config.save();
@@ -263,26 +251,28 @@ private void runLoopIteration() {
 	 */
 	private void startRecordings() {
 		// Start recording for every player
-		for (String playerName : recordingPlayers) {
+		loopSceneManager.forEachRecordingPlayer(playerName -> {
 			executeCommand(String.format("mocap recording start %s", playerName));
-		}
+		});
 	}
 
 	/**
 	 * Saves the recordings.
 	 */
 	public void saveRecordings() {
 		// Stop and save recordings for each player
-		for (String playerName : recordingPlayers) {
+		loopSceneManager.forEachRecordingPlayer(playerName -> {
 			String recordingName = playerName + "_" + System.currentTimeMillis();
 
+			String playerSceneName = loopSceneManager.getPlayerSceneName(playerName);
+
 			LOOP_LOGGER.info("Processing recording for player: {}", playerName);
 			executeCommand(String.format("mocap recording stop -+mc.%s.1", playerName));
 			executeCommand(String.format("mocap recording save %s -+mc.%s.1", recordingName.toLowerCase(), playerName));
 			if (recordingFileExists(recordingName)) {
-				executeCommand(String.format("mocap scenes add_to %s %s", sceneName, recordingName.toLowerCase()));
+				executeCommand(String.format("mocap scenes add_to %s %s", playerSceneName, recordingName.toLowerCase()));
 			}
-		}
+		});
 	}
 
 	/**
@@ -353,39 +343,40 @@ private boolean recordingFileExists(String recordingName) {
 	 *
 	 */
 	private void removeOldSceneEntries() {
-		if (isLooping) {
-			if (maxLoops > 1) {
-				Path sceneDir = worldFolder.resolve("mocap_files").resolve("scenes");
-				Path sceneFile = sceneDir.resolve(sceneName+".mcmocap_scene");
+		if (isLooping && maxLoops > 1) {
+			Path sceneDir = worldFolder.resolve("mocap_files").resolve("scenes");
 
-				// Check if the scene file exists
+			List<Path> sceneFiles = new ArrayList<>();
+			loopSceneManager.forEachRecordingPlayer(playerSceneName -> {
+				if (playerSceneName != null && !playerSceneName.isBlank()) {
+					sceneFiles.add(sceneDir.resolve(playerSceneName + ".mcmocap_scene"));
+				} else {
+					LOOP_LOGGER.warn("Invalid playerSceneName encountered: {}", playerSceneName);
+				}
+			});
+
+			if (sceneFiles.isEmpty()) {
+				LOOP_LOGGER.warn("No scene files found to process.");
+			}
+
+			for (Path sceneFile : sceneFiles) {
 				if (sceneFile.toFile().exists()) {
 					try {
-						// Load the scene data from the file
 						String jsonContent = new String(Files.readAllBytes(sceneFile));
-
-						// Parse the content
 						JsonObject jsonObject = JsonParser.parseString(jsonContent).getAsJsonObject();
 						JsonArray subScenes = jsonObject.getAsJsonArray("subscenes");
 
-						// Check if we have more scenes than maxLoops
 						if (subScenes.size() > maxLoops) {
-							// Calculate the number of scenes to remove
 							int entriesToRemove = subScenes.size() - maxLoops;
-							// Remove the excess entries (removing from the start of the array)
 							for (int i = 0; i < entriesToRemove; i++) {
-								subScenes.remove(0); // Remove the first (oldest) entry
+								subScenes.remove(0); // Remove the oldest
 							}
-
-							// Update the JSON object with the modified subScenes array
 							jsonObject.add("subScenes", subScenes);
-
-							// Write the updated JSON back to the file
 							Files.write(sceneFile, jsonObject.toString().getBytes());
-							LOOP_LOGGER.info("Removed old scene entries to maintain maxLoops: {}", maxLoops);
+							LOOP_LOGGER.info("Removed old scene entries for file: {}", sceneFile);
 						}
 					} catch (IOException e) {
-						LOOP_LOGGER.error("Failed to read or write scene file: {}", sceneFile, e);
+						LOOP_LOGGER.error("Failed to process scene file: {}", sceneFile, e);
 					}
 				} else {
 					LOOP_LOGGER.error("Scene file does not exist: {}", sceneFile);

src/main/java/com/vltno/timeloop/TimeLoopConfig.java

@@ -11,11 +11,12 @@
 
 public class TimeLoopConfig {
     // These values will be loaded/saved from/to the JSON config file.bossbar set minecraft:loop_info
+    public String sceneName = "loop_scene";
     public boolean firstStart = true;
     public int loopIteration = 1;
     public boolean isLooping = false;
     public int loopLengthTicks = 6000; // Default: 6000 ticks (i.e. 5 minutes)
-    public int maxLoops = 0; //No limit by default
+    public int maxLoops = 0; // No limit by default
     public long timeSetting = 13000;
     public long startTimeOfDay = 0;
     public boolean trackTimeOfDay = true;