Merge pull request #2 from VLTNOgithub/beta

Beta yayayayayayayyaayyay

Author: VLTNOgithub

gradle.properties

@@ -9,7 +9,7 @@ yarn_mappings=1.21.1+build.3
 loader_version=0.16.10
 
 # Mod Properties
-mod_version=1.7.1
+mod_version=1.7.2-beta
 maven_group=com.vltno.timeloop
 archives_base_name=time-loop
 

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

@@ -3,6 +3,7 @@
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.BoolArgumentType;
 import com.mojang.brigadier.arguments.IntegerArgumentType;
+import com.mojang.brigadier.arguments.StringArgumentType;
 import net.minecraft.command.CommandRegistryAccess;
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.command.ServerCommandSource;
@@ -137,6 +138,20 @@ public void register(CommandDispatcher<ServerCommandSource> dispatcher, CommandR
                                             LOGGER.info("Time of day set to {}", newTime);
                                             return 1;
                                         })))
+                        
+                        .then(CommandManager.literal("modifyPlayer")
+                                .requires(source -> source.hasPermissionLevel(2))
+                                .then(CommandManager.argument("targetPlayer", StringArgumentType.string())
+                                .then(CommandManager.argument("newName", StringArgumentType.string())
+                                .then(CommandManager.argument("newSkin", StringArgumentType.string())
+                                        .executes(context -> {
+                                            String targetPlayer = StringArgumentType.getString(context, "targetPlayer");
+                                            String newName = StringArgumentType.getString(context, "newName");
+                                            String newSkin = StringArgumentType.getString(context, "newSkin");
+                                            
+                                            mod.modifyPlayerAttributes(targetPlayer, newName, newSkin);
+                                            return 1;
+                                        })))))
 
                         // TOGGLES
                         .then(CommandManager.literal("toggles")
@@ -240,8 +255,11 @@ public void register(CommandDispatcher<ServerCommandSource> dispatcher, CommandR
                             mod.config.displayTimeInTicks = false;
 
                             mod.executeCommand("mocap playback stop_all");
-                            mod.executeCommand(String.format("mocap scenes remove %s", mod.sceneName));
-                            mod.executeCommand(String.format("mocap scenes add %s", mod.sceneName));
+                            mod.loopSceneManager.forEachPlayerSceneName(playerSceneName -> {
+                                mod.executeCommand(String.format("mocap scenes remove %s", playerSceneName));
+                                mod.executeCommand(String.format("mocap scenes add %s", playerSceneName));
+                            });
+
                             mod.loopIteration = 0;
                             mod.config.loopIteration = 0;
                             mod.config.save();

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

@@ -0,0 +1,87 @@
+package com.vltno.timeloop;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+
+public class LoopSceneManager {
+    private TimeLoopConfig config;
+    private String scenePrefix;
+    private Map<String, PlayerData> recordingPlayers;
+    
+    
+
+    // Constructor to initialize recordingPlayers map
+    public LoopSceneManager(TimeLoopConfig config) {
+        this.config = config;
+        this.scenePrefix = config.scenePrefix;
+        this.recordingPlayers = new HashMap<>();
+    }
+
+    // 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.");
+        }
+    }
+
+
+    // Method to remove a specific player from the recordingPlayers map
+    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.");
+            } 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 (playerName.startsWith(scenePrefix)) ? playerName : (scenePrefix + "_" + playerName).toLowerCase();
+    }
+
+    // Method to get all playerSceneNames for recordingPlayers
+    public List<String> getAllPlayerSceneNames() {
+        List<String> playerSceneNames = new ArrayList<>();
+        for (PlayerData player : recordingPlayers.values()) {
+            playerSceneNames.add(getPlayerSceneName(player.getName()));
+        }
+        return playerSceneNames;
+    }
+
+    public void forEachPlayerSceneName(Consumer<String> action) {
+        getAllPlayerSceneNames().forEach(action);
+    }
+
+    // Method to perform an action for each recording player
+    public void forEachRecordingPlayer(Consumer<PlayerData> action) {
+        recordingPlayers.values().forEach(action);
+    }
+    
+    // Method to set recording players with a new map
+    public void setRecordingPlayers(Map<String, PlayerData> recordingPlayers) {
+        this.recordingPlayers = recordingPlayers;
+    }
+
+    public void saveRecordingPlayers() {
+        config.recordingPlayers = new HashMap<>(recordingPlayers);
+    }
+}

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

@@ -0,0 +1,43 @@
+package com.vltno.timeloop;
+
+public class PlayerData {
+    private String name;
+    private String nickname;
+    private String skin;
+
+    public PlayerData(String name, String nickname, String skin) {
+        this.name = name;
+        this.nickname = nickname;
+        this.skin = skin;
+    }
+
+    // Getters and setters for player attributes
+    public String getName() {
+        return name;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public String getSkin() {
+        return skin;
+    }
+
+    public void setSkin(String skin) {
+        this.skin = skin;
+    }
+
+    @Override
+    public String toString() {
+        return "PlayerData{" +
+                "name='" + name + '\'' +
+                ", nickname='" + nickname + '\'' +
+                ", skin='" + skin + '\'' +
+                '}';
+    }
+}