Fix maxLoops bug and removed check for recording file

Refactored TimeLoop.init()

Fixed startTimeOfDay

Add client side check for sleeping so the event doesn't trigger twice

Bump version to 1.7.9

Author: VLTNOgithub

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

@@ -4,16 +4,21 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import net.minecraft.ChatFormatting;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.Style;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.storage.LevelResource;
 import net.minecraft.world.phys.Vec3;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -60,11 +65,7 @@ public class TimeLoop {
 	// Get the world folder path for config/recording loading
 	public static Path worldFolder;
 
-	public static boolean isDedicatedServer;
-
-	public static void init(boolean isDedicatedServer) {
-		TimeLoop.isDedicatedServer = isDedicatedServer;
-
+	public static void init() {
 		loopBossBar = new LoopBossBar();
 
 		LOOP_LOGGER.info("Initializing TimeLoop mod (Common)");
@@ -102,8 +103,13 @@ public static void executeCommand(String command) {
 	 * Runs the next iteration of the loop.
 	 */
 	public static void runLoopIteration() {
-        if (loopIteration + 1 >= maxLoops) {
+        if (!isLooping) {
+            LOOP_LOGGER.warn("Tried to iterate but not looping!");
+            return;
+        }
+        if (loopIteration + 1 >= maxLoops && maxLoops != 0) {
             stopLoop();
+            return;
         }
 		LOOP_LOGGER.info("Starting iteration {} of loop", loopIteration);
 		saveRecordings();
@@ -152,7 +158,6 @@ public static void runLoopIteration() {
                     player.teleportTo(spawnPosition.getX(), spawnPosition.getY(), spawnPosition.getZ());
                 }
 			}
-			
 			String playerSceneName = loopSceneManager.getPlayerSceneName(playerName);
 			TimeLoop.executeCommand(String.format("mocap playback start .%s %s skin_from_player %s", playerSceneName, playerNickname, playerSkin));
 		});
@@ -186,7 +191,8 @@ public static void startLoop() {
 
 			playerData.setStartPosition(server.getPlayerList().getPlayerByName(playerName).position());
 		});
-		
+
+        startTimeOfDay = serverLevel.getDayTime();
 		isLooping = true;
 		config.isLooping = true;
 		tickCounter = 0;
@@ -220,9 +226,7 @@ public static void saveRecordings() {
 			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", playerSceneName, recordingName.toLowerCase()));
-			}
+            executeCommand(String.format("mocap scenes add_to %s %s", playerSceneName, recordingName.toLowerCase()));
 		});
 	}
 
@@ -244,25 +248,6 @@ public static void stopLoop() {
 		}
 	}
 
-	/**
-	 * Checks if a recording file with the specified name exists in the predefined recordings directory.
-	 * The method returns a boolean indicating the existence of the file.
-	 *
-	 * @param recordingName The name of the recording file to check, without the file extension.
-	 * @return true if the recording file exists, false otherwise.
-	 */
-	private static boolean recordingFileExists(String recordingName) {
-		// Build the complete path for the recording directory using the absolute world path
-		Path recordingDir = worldFolder.resolve("mocap_files").resolve("recordings");
-		Path recordingFile = recordingDir.resolve(recordingName.toLowerCase() + ".mcmocap_rec");
-
-		boolean exists = recordingFile.toFile().exists();
-		if (!exists) {
-			LOOP_LOGGER.error("Expected recording file does not exist: {}", recordingFile.toAbsolutePath());
-		}
-		return exists;
-	}
-
 	public static void modifyPlayerAttributes(String targetPlayerName, String newPlayerNickname, String newSkin) {
 		String playerSceneName = loopSceneManager.getPlayerSceneName(targetPlayerName);
 		executeCommand(String.format("mocap scenes modify .%s %s player_skin skin_from_player %s", playerSceneName, newPlayerNickname, newSkin));

common/src/main/java/com/vltno/timeloop/events/EntitySleepEvent.java

@@ -7,6 +7,7 @@
 
 public class EntitySleepEvent {
     public static void onStopSleeping(LivingEntity entity) {
+        if (entity.level().isClientSide()) { return; }
         if ((entity.getType() == EntityType.PLAYER) && (TimeLoop.loopType == LoopTypes.SLEEP) ) {
             TimeLoop.LOOP_LOGGER.info("Player slept, looping.");
             TimeLoop.runLoopIteration();

common/src/main/java/com/vltno/timeloop/events/LifecycleEvent.java

@@ -67,7 +67,7 @@ public static void onServerStopping()
             TimeLoop.stopLoop();
             TimeLoop.config.isLooping = true;
 
-            if(TimeLoop.worldFolder != null) {
+            if (TimeLoop.worldFolder != null) {
                 TimeLoop.config.save();
             }
         } else {

common/src/main/java/com/vltno/timeloop/events/PlayerEvent.java

@@ -6,7 +6,9 @@
 
 public class PlayerEvent {
     public static void afterRespawn() {
-        if (TimeLoop.loopType != LoopTypes.DEATH) { return; }
-        TimeLoop.runLoopIteration();
+        if (TimeLoop.loopType == LoopTypes.DEATH) {
+            TimeLoop.LOOP_LOGGER.info("RESPAWNED!!!!");
+            TimeLoop.runLoopIteration();
+        }
     }
 }

fabric/src/main/java/com/vltno/timeloop/fabric/TimeLoopFabric.java

@@ -2,28 +2,25 @@
 
 import com.vltno.timeloop.*;
 import com.vltno.timeloop.fabric.events.*;
-import net.fabricmc.api.EnvType;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.entity.event.v1.EntitySleepEvents;
 import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
-import net.fabricmc.loader.api.FabricLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 
 public class TimeLoopFabric implements ModInitializer {
     public static final Logger LOOP_LOGGER = LoggerFactory.getLogger("TimeLoop");
-    public static final boolean isDedicatedServer = FabricLoader.getInstance().getEnvironmentType() == EnvType.SERVER;
 
     @Override
     public void onInitialize() {
         LOOP_LOGGER.info("Initializing TimeLoop mod (Fabric)");
 
-        TimeLoop.init(isDedicatedServer);
+        TimeLoop.init();
 
         CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> {
             // Only register commands on the logical server
@@ -32,7 +29,10 @@ public void onInitialize() {
             }
         });
 
-        EntitySleepEvents.STOP_SLEEPING.register(EntitySleepFabricEvent::onStopSleeping);
+        EntitySleepEvents.STOP_SLEEPING.register((entity, blockPos) -> {
+            if (entity.level().isClientSide()) { return; }
+            EntitySleepFabricEvent.onStopSleeping(entity, blockPos);
+        });
 
         ServerLifecycleEvents.SERVER_STARTED.register(LifecycleFabricEvent::onServerStart);
 

fabric/src/main/java/com/vltno/timeloop/fabric/events/EntitySleepFabricEvent.java

@@ -6,6 +6,7 @@
 
 public class EntitySleepFabricEvent {
     public static void onStopSleeping(LivingEntity entity, BlockPos sleepingPos) {
+        if (entity.level().isClientSide()) { return; }
         EntitySleepEvent.onStopSleeping(entity);
     }
 }

fabric/src/main/resources/fabric.mod.json

@@ -17,7 +17,7 @@
 		"main": [
 			"com.vltno.timeloop.fabric.TimeLoopFabric"
 		]
-	},
+    },
 	"depends": {
 		"minecraft": "${minecraft_version}",
 		"fabricloader": ">=${fabric_loader_version}",

gradle.properties

@@ -1,6 +1,6 @@
 # Mod Properties
 mod_id=timeloop
-mod_version=1.7.8
+mod_version=1.7.9
 mod_name=Time Loop
 mod_description=A set of commands that 'loops' time by using the Motion Capture Mod. Motion Capture mod by mt1006. Inspired by Tombino. Original datapack by Penguin Mafia.
 mod_author_1=Luigi

neoforge/src/main/java/com/vltno/timeloop/neoforge/TimeLoopNeoForge.java

@@ -25,13 +25,11 @@
 public class TimeLoopNeoForge {
 
     public static final Logger LOOP_LOGGER = LoggerFactory.getLogger("TimeLoop");
-    
-    public static final boolean isLogicalServer = !FMLEnvironment.dist.isClient();
 
     public TimeLoopNeoForge(IEventBus modEventBus) {
         LOOP_LOGGER.info("Initializing TimeLoop mod (NeoForge)");
 
-        TimeLoop.init(isLogicalServer);
+        TimeLoop.init();
 
         // Register gameplay event listeners to the NeoForge EVENT bus
         NeoForge.EVENT_BUS.register(this);
@@ -52,9 +50,9 @@ public void onEndServerTick(ServerTickEvent.Post event) {
         TickNeoForgeEvent.onEndServerTick(event.getServer());
     }
 
-    // Player Wake Up handler (approximation for Stop Sleeping)
     @SubscribeEvent
     public void onPlayerWakeUp(PlayerWakeUpEvent event) {
+        if (event.getEntity().level().isClientSide()) { return; }
         EntitySleepNeoForgeEvent.onStopSleeping(event.getEntity());
     }