From ac25dea08ac1767a99bf4924db3677377ddc6cff Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 29 Aug 2024 11:32:34 +0200
Subject: [PATCH] Fix PR stuff

---
 .../BauSystem_Main/src/BauSystem.properties   |  2 +-
 .../src/BauSystem_de.properties               |  2 +-
 .../features/simulator/SimulatorCommand.java  | 39 +++++++++----------
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/BauSystem.properties b/BauSystem/BauSystem_Main/src/BauSystem.properties
index 7cafc797..c9116dce 100644
--- a/BauSystem/BauSystem_Main/src/BauSystem.properties
+++ b/BauSystem/BauSystem_Main/src/BauSystem.properties
@@ -308,7 +308,7 @@ SIMULATOR_POSITION_Z=§7z-Position
 SIMULATOR_BACK=§eBack
 SIMULATOR_GUI_TOTAL_TNT=§7Total TNT§8: §e{0}
 SIMULATOR_DELETED=§cSimulator deleted
-SIMULATOR_RENAMED=§cSimulator renamed
+SIMULATOR_RENAMED=§cSimulator renamed from {0} to {1}
 ## GUI
 SIMULATOR_POSITION_EDIT=§eEdit position
 SIMULATOR_POSITION_ADD=§eSet position
diff --git a/BauSystem/BauSystem_Main/src/BauSystem_de.properties b/BauSystem/BauSystem_Main/src/BauSystem_de.properties
index 77b31259..04588bc9 100644
--- a/BauSystem/BauSystem_Main/src/BauSystem_de.properties
+++ b/BauSystem/BauSystem_Main/src/BauSystem_de.properties
@@ -291,7 +291,7 @@ SIMULATOR_POSITION_Z=§7z-Position
 SIMULATOR_BACK=§eZurück
 SIMULATOR_GUI_TOTAL_TNT=§7Gesamt TNT§8: §e{0}
 SIMULATOR_DELETED=§cSimulator gelöscht
-SIMULATOR_RENAMED=§cSimulator umbenannt
+SIMULATOR_RENAMED=§cSimulator von {0} zu {1} umbenannt
 ## GUI
 SIMULATOR_POSITION_EDIT=§ePosition bearbeiten
 SIMULATOR_POSITION_ADD=§ePosition setzen
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCommand.java
index 199e8952..de0c4b74 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCommand.java
@@ -20,7 +20,6 @@
 package de.steamwar.bausystem.features.simulator;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.execute.SimulatorExecutor;
@@ -63,15 +62,7 @@ public class SimulatorCommand extends SWCommand {
     }
 
     @Register(value = "copy", description = "SIMULATOR_COPY_HELP")
-    public void copy(@Validator Player p, @ErrorMessage("SIMULATOR_NOT_EXISTS") Simulator simulator, String name) {
-        if (SimulatorStorage.getSimulator(name) != null) {
-            BauSystem.MESSAGE.send("SIMULATOR_NAME_ALREADY_EXISTS", p);
-            return;
-        }
-        if (!name.matches("[a-zA-Z_0-9-]+")) {
-            BauSystem.MESSAGE.send("SIMULATOR_NAME_INVALID", p);
-            return;
-        }
+    public void copy(@Validator Player p, @ErrorMessage("SIMULATOR_NOT_EXISTS") Simulator simulator, @Validator("simulatorName") String name) {
         if (!SimulatorStorage.copy(simulator, name)) {
             BauSystem.MESSAGE.send("SIMULATOR_ERROR_COPY", p);
         }
@@ -89,18 +80,11 @@ public class SimulatorCommand extends SWCommand {
     }
 
     @Register(value = "rename", description = "SIMULATOR_RENAME_HELP")
-    public void rename(@Validator Player p, @ErrorMessage("SIMULATOR_NOT_EXISTS") Simulator simulator, String name) {
-        if (SimulatorStorage.getSimulator(name) != null) {
-            BauSystem.MESSAGE.send("SIMULATOR_NAME_ALREADY_EXISTS", p);
-            return;
-        }
-        if (!name.matches("[a-zA-Z_0-9-]+")) {
-            BauSystem.MESSAGE.send("SIMULATOR_NAME_INVALID", p);
-            return;
-        }
+    public void rename(@Validator Player p, @ErrorMessage("SIMULATOR_NOT_EXISTS") Simulator simulator, @Validator("simulatorName") String name) {
+        String oldName = simulator.getName();
         if (SimulatorStorage.copy(simulator, name)) {
             SimulatorStorage.delete(simulator);
-            BauSystem.MESSAGE.send("SIMULATOR_RENAMED", p);
+            BauSystem.MESSAGE.send("SIMULATOR_RENAMED", p, oldName, name);
         } else {
             BauSystem.MESSAGE.send("SIMULATOR_ERROR_COPY", p);
         }
@@ -120,4 +104,19 @@ public class SimulatorCommand extends SWCommand {
             }
         };
     }
+
+    @Validator(value = "simulatorName", local = true)
+    public TypeValidator<String> simulatorName() {
+        return (commandSender, name, messageSender) -> {
+            if (SimulatorStorage.getSimulator(name) != null) {
+                messageSender.send("SIMULATOR_NAME_ALREADY_EXISTS");
+                return false;
+            }
+            if (!name.matches("[a-zA-Z_0-9-]+")) {
+                messageSender.send("SIMULATOR_NAME_INVALID");
+                return false;
+            }
+            return true;
+        };
+    }
 }