Add rewind types and /loop settings setRewindType

 - Added new command that teleports the player on each iteration
 - Also removed pdf (again)

Author: VLTNOgithub

README.md

@@ -16,15 +16,17 @@ Simply use commands to configure the loop.
 
 **/loop**
  - `start` - Start the loop.
+ - `skip` - Skip the loop and advance to the next iteration.
  - `stop` - Stop the loop.
  - `reset` - Reset the loop and go back to the first recording. **This doesn't delete the recordings as of yet but it's being worked on.**
  - `status` - Shows the status of the loop in chat.
  - **settings**
    - `maxLoops [0]` - Sets the maximum amount of loops. 0 is infinite.
    - `setLength [6000]` - Set the duration / length of the loop in ticks (6000 ticks is 5 mins).
    - `setTimeOfDay [13000]` - Sets the time of day to loop at (same as minecraft so 13000 is night).
-   - `loopType [TICK]` - Sets the type of loop.
+   - `setLoopType [TICK]` - Sets the type of loop.
    - `modifyPlayer [target_player] [nickname] [skin]` - Changes a looped player's nickname and skin.
+   - `setRewindType [NONE]` - Sets the rewind type.
    - **toggles**
      - `trackTimeOfDay [true]` - Toggles tracking the time of day during loops.
      - `trackItems [false]` - Toggles tracking items during loops.
@@ -33,12 +35,17 @@ Simply use commands to configure the loop.
      - `trackChat [false]` - Toggles tracking chat during loops.
      - `hurtLoopedPlayers [false]` - Toggles being able to hit looped players.
 
-# LoopType Options
+# Loop Types
  - `TICK` (Loops every `setLength` ticks)
  - `TIME_OF_DAY` (Loops when the time reaches `setTimeOfDay`)
  - `SLEEP` (Loops when you sleep)
  - `DEATH` (Loops when you die)
 
+# Rewind Types
+ - `NONE` (Doesn't rewind)
+ - `START_POSITION` (Rewinds players to their position at the start of the loop)
+ - `JOIN_POSITION` (Rewinds players to their position when they joined)
+
 # Known Issues
  - Dying stops the player from looping
  - You can see spectators' held item and worn armour

build.gradle

@@ -60,10 +60,6 @@ subprojects {
         inputs.properties replaceProperties
     }
 
-    jar {
-        exclude "assets/time-loop/icon.psd"
-    }
-
     if (project.name == "fabric") {
         tasks.named("jar") {
             finalizedBy rootProject.tasks.named("openBuildDirFabric")

common/build.gradle

@@ -24,3 +24,7 @@ loom {
     mixin.useLegacyMixinAp = false
     officialMojangMappings()
 }
+
+jar {
+    exclude "icon.psd"
+}

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

@@ -1,5 +1,7 @@
 package com.vltno.timeloop;
 
+import net.minecraft.world.phys.Vec3;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -10,8 +12,6 @@ public class LoopSceneManager {
     private TimeLoopConfig config;
     private String scenePrefix;
     private Map<String, PlayerData> recordingPlayers;
-    
-    
 
     // Constructor to initialize recordingPlayers map
     public LoopSceneManager(TimeLoopConfig config) {
@@ -23,18 +23,46 @@ public LoopSceneManager(TimeLoopConfig config) {
     // Method to add a player to the recordingPlayers map
     public void addPlayer(List<String> args) {
         String playerName = args.get(0);
-        List<String> nickname = args.size() > 1 ? args.subList(1, args.size()) : null;
-        List<String> skin = args.size() > 2 ? args.subList(2, args.size()) : null;
 
-        if (playerName != null && !playerName.isEmpty()) {
-            String tempNickname = (nickname == null || nickname.isEmpty()) ? playerName : nickname.getFirst();
-            String tempSkin = (skin == null || skin.isEmpty()) ? playerName : skin.getFirst();
-            
-            // Use player name as the key and store a PlayerData object
-            recordingPlayers.put(playerName, new PlayerData(playerName, tempNickname, tempSkin));
-        } else {
-            System.out.println("Invalid player data. Player not added.");
+        String nickname = args.size() > 1 ? args.get(1) : null;
+        String skin = args.size() > 2 ? args.get(2) : null;
+        String rewindPosition = args.size() > 3 ? args.get(3) : null;
+        
+        if (playerName == null || playerName.isEmpty()) {
+            TimeLoop.LOOP_LOGGER.error("Player name is null or empty. Skipping player addition.");
+            return;
         }
+
+        String tempNickname = (nickname == null || nickname.isEmpty()) ? playerName : nickname;
+        String tempSkin = (skin == null || skin.isEmpty()) ? playerName : skin;
+        
+        Vec3 tempRewindPosition = Vec3.ZERO;
+        
+        if (rewindPosition != null && !rewindPosition.isEmpty()) {
+            try {
+                String processedString = rewindPosition.trim();
+                
+                if ((processedString.startsWith("(") && processedString.endsWith(")")) ||
+                        (processedString.startsWith("[") && processedString.endsWith("]"))) {
+                    processedString = processedString.substring(1, processedString.length() - 1).trim();
+                }
+                
+                String[] positionParts = processedString.split("\\s*,\\s*");
+                
+                if (positionParts.length == 3) {
+                    double x = Double.parseDouble(positionParts[0]);
+                    double y = Double.parseDouble(positionParts[1]);
+                    double z = Double.parseDouble(positionParts[2]);
+                    tempRewindPosition = new Vec3(x, y, z);
+                }
+            } catch (NumberFormatException e) {
+                TimeLoop.LOOP_LOGGER.error("Invalid rewind position format. Skipping rewind position.");
+            }
+        }
+        
+        PlayerData playerData = new PlayerData(playerName, tempNickname, tempSkin, tempRewindPosition);
+        
+        recordingPlayers.put(playerName, playerData);
     }
 
 
@@ -43,12 +71,12 @@ public void removePlayer(String playerName) {
         if (playerName != null && !playerName.isEmpty()) {
             PlayerData removed = recordingPlayers.remove(playerName);
             if (removed != null) {
-                System.out.println("Player '" + playerName + "' removed successfully.");
+                TimeLoop.LOOP_LOGGER.info("Player '" + playerName + "' removed successfully.");
             } else {
-                System.out.println("Player '" + playerName + "' not found in the list.");
+                TimeLoop.LOOP_LOGGER.info("Player '" + playerName + "' not found in the list.");
             }
         } else {
-            System.out.println("Invalid player name. Player not removed.");
+            TimeLoop.LOOP_LOGGER.info("Invalid player name. Player not removed.");
         }
     }
 

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

@@ -1,14 +1,20 @@
 package com.vltno.timeloop;
 
+import net.minecraft.world.phys.Vec3;
+
 public class PlayerData {
     private String name;
     private String nickname;
     private String skin;
-
-    public PlayerData(String name, String nickname, String skin) {
+    private Vec3 startPosition;
+    private Vec3 joinPosition;
+    
+    public PlayerData(String name, String nickname, String skin, Vec3 joinPosition) {
         this.name = name;
         this.nickname = nickname;
         this.skin = skin;
+        this.startPosition = null;
+        this.joinPosition = joinPosition;
     }
 
     // Getters and setters for player attributes
@@ -32,12 +38,30 @@ public void setSkin(String skin) {
         this.skin = skin;
     }
 
+    public Vec3 getStartPosition() {
+        return startPosition;
+    }
+
+    public void setStartPosition(Vec3 newStartPosition) {
+        this.startPosition = newStartPosition;
+    }
+
+    public Vec3 getJoinPosition() {
+        return joinPosition;
+    }
+    
+    public void setJoinPosition(Vec3 newJoinPosition) {
+        this.joinPosition = newJoinPosition;
+    }
+
     @Override
     public String toString() {
         return "PlayerData{" +
                 "name='" + name + '\'' +
                 ", nickname='" + nickname + '\'' +
                 ", skin='" + skin + '\'' +
+                ", join-position='" + joinPosition + '\'' +
+                ", start-position='" + startPosition + '\'' +
                 '}';
     }
 }

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

@@ -0,0 +1,15 @@
+package com.vltno.timeloop;
+
+import net.minecraft.util.StringRepresentable;
+import org.jetbrains.annotations.NotNull;
+
+public enum RewindTypes implements StringRepresentable {
+    NONE,
+    START_POSITION,
+    JOIN_POSITION;
+
+    @Override
+    public @NotNull String getSerializedName() {
+        return name();
+    }
+}

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

@@ -8,6 +8,8 @@
 import net.minecraft.commands.Commands;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.phys.Vec3;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,6 +43,7 @@ public class TimeLoop {
 	public static LoopTypes loopType;
 	public static boolean trackChat;
 	public static boolean hurtLoopedPlayers;
+	public static RewindTypes rewindType;
 
 	// The configuration object loaded from disk
 	public static TimeLoopConfig config;
@@ -104,7 +107,29 @@ public static void runLoopIteration() {
 			String playerName = playerData.getName();
 			String playerNickname = playerData.getNickname();
 			String playerSkin = playerData.getSkin();
-
+			Vec3 startPosition = playerData.getStartPosition();
+			Vec3 joinPosition = playerData.getJoinPosition();
+			
+			Player player = server.getPlayerList().getPlayerByName(playerName);
+			
+			switch (rewindType) {
+				case START_POSITION -> {
+					if (startPosition == null) {
+						LOOP_LOGGER.error("Player {} has no start position yet. Defaulting to join position.", playerName);
+						player.teleportTo(joinPosition.x, joinPosition.y, joinPosition.z);
+						return;
+					}
+					player.teleportTo(startPosition.x, startPosition.y, startPosition.z);
+				}
+				case JOIN_POSITION -> {
+					if (joinPosition == null) {
+						LOOP_LOGGER.error("Player {} has no join position yet. (somehow??)", playerName);
+						return;
+					}
+					player.teleportTo(joinPosition.x, joinPosition.y, joinPosition.z);
+				}
+			}
+			
 			String playerSceneName = loopSceneManager.getPlayerSceneName(playerName);
 			TimeLoop.executeCommand(String.format("mocap playback start .%s %s skin_from_player %s", playerSceneName, playerNickname, playerSkin));
 		});
@@ -126,7 +151,11 @@ public static void startLoop() {
 		if (showLoopInfo) {
 			loopBossBar.visible(loopType.equals(LoopTypes.TICKS) || loopType.equals(LoopTypes.TIME_OF_DAY));
 		}
-
+		
+		loopSceneManager.forEachRecordingPlayer(playerData -> {
+			playerData.setStartPosition(server.getPlayerList().getPlayerByName(playerData.getName()).position());
+		});
+		
 		isLooping = true;
 		config.isLooping = true;
 		tickCounter = 0;

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

@@ -12,10 +12,9 @@
 import java.util.Map;
 
 public class TimeLoopConfig {
-    // These values will be loaded/saved from/to the JSON config file.bossbar set minecraft:loop_info
     public String scenePrefix = "loop_scene";
     public boolean firstStart = true;
-    public int loopIteration = 1;
+    public int loopIteration = 0;
     public boolean isLooping = false;
     public int loopLengthTicks = 6000; // Default: 6000 ticks (i.e. 5 minutes)
     public int maxLoops = 0; // No limit by default
@@ -30,6 +29,7 @@ public class TimeLoopConfig {
     public LoopTypes loopType = LoopTypes.TICKS;
     public boolean trackChat = false;
     public boolean hurtLoopedPlayers = false;
+    public RewindTypes rewindType = RewindTypes.NONE;
 
     public Map<String, PlayerData> recordingPlayers = new HashMap<>();
 
@@ -41,7 +41,7 @@ public class TimeLoopConfig {
      * If the file does not exist, a default config is created and saved.
      *
      * @param configDir the config directory (usually obtained from FabricLoader)
-     * @return an instance of LoopConfig
+     * @return an instance of TimeLoopConfig
      */
     public static TimeLoopConfig load(Path configDir) {
         configPath = configDir.resolve("timeloop.json");

common/src/main/java/com/vltno/timeloop/commands/BaseCommands.java

@@ -5,6 +5,7 @@
 import com.vltno.timeloop.LoopCommands;
 import com.vltno.timeloop.LoopTypes;
 import com.vltno.timeloop.TimeLoop;
+import com.vltno.timeloop.TimeLoopConfig;
 import net.minecraft.commands.Commands;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.network.chat.Component;
@@ -110,24 +111,26 @@ private static int reset(CommandContext<CommandSourceStack> context) {
         CommandSourceStack source = context.getSource();
         TimeLoop.stopLoop();
 
-        // Reset logic remains the same internally
-        TimeLoop.startTimeOfDay = 0;
-        TimeLoop.config.startTimeOfDay = 0;
+        // Reset logic
+        TimeLoopConfig baseConfig = new TimeLoopConfig();
+        
+        TimeLoop.startTimeOfDay = baseConfig.startTimeOfDay;
+        TimeLoop.config.startTimeOfDay = baseConfig.startTimeOfDay;
 
-        TimeLoop.timeSetting = 13000;
-        TimeLoop.config.timeSetting = 13000;
+        TimeLoop.timeSetting = baseConfig.timeSetting;
+        TimeLoop.config.timeSetting = baseConfig.timeSetting;
 
         TimeLoop.ticksLeft = TimeLoop.loopLengthTicks;
         TimeLoop.config.ticksLeft = TimeLoop.config.loopLengthTicks;
 
-        TimeLoop.trackItems = false;
-        TimeLoop.config.trackItems = false;
+        TimeLoop.trackItems = baseConfig.trackItems;
+        TimeLoop.config.trackItems = baseConfig.trackItems;
 
-        TimeLoop.loopType = LoopTypes.TICKS;
-        TimeLoop.config.loopType = LoopTypes.TICKS;
+        TimeLoop.loopType = baseConfig.loopType;
+        TimeLoop.config.loopType = baseConfig.loopType;
 
-        TimeLoop.displayTimeInTicks = false;
-        TimeLoop.config.displayTimeInTicks = false;
+        TimeLoop.displayTimeInTicks = baseConfig.displayTimeInTicks;
+        TimeLoop.config.displayTimeInTicks = baseConfig.displayTimeInTicks;
 
         TimeLoop.executeCommand("mocap playback stop_all");
         TimeLoop.loopSceneManager.forEachPlayerSceneName(playerSceneName -> {