Add block/unblock commands and update investigation state handling

# Conflicts:
#	CommonCore/SQL/src/de/steamwar/sql/CheckedSchematic.java
#	VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java

BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/TickManager15.java

@@ -0,0 +1,140 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.utils;
+
+import de.steamwar.bausystem.region.GlobalRegion;
+import de.steamwar.bausystem.utils.bossbar.BossBarService;
+import de.steamwar.bausystem.utils.tps.TPSFreezeUtils;
+import de.steamwar.bausystem.utils.tps.TPSLimitUtils;
+import de.steamwar.core.TPSWarpUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+public class TickManager15 implements TickManager, Listener {
+
+    private static float currentTPSLimit = 20;
+    private boolean currentlyStepping = false;
+    private float currentLimit;
+    private int stepsTotal;
+    private int stepsLeft;
+
+    @Override
+    public boolean canFreeze() {
+        return TPSFreezeUtils.isCanFreeze();
+    }
+
+    @Override
+    public void setTickRate(float tickRate) {
+        if (currentlyStepping) {
+            currentlyStepping = false;
+            Bukkit.getOnlinePlayers().forEach(player -> {
+                BossBarService.instance.remove(player, GlobalRegion.getInstance(), "TickStep");
+            });
+        }
+        TPSWarpUtils.warp(tickRate);
+        if (currentTPSLimit == 0 && tickRate != 0) {
+            TPSFreezeUtils.unfreeze();
+        }
+        currentTPSLimit = tickRate;
+        if (tickRate == 0) {
+            TPSLimitUtils.unlimit();
+            TPSFreezeUtils.freeze();
+        } else if (tickRate < 20.0) {
+            TPSLimitUtils.limit(tickRate);
+        } else if (tickRate >= 20) {
+            TPSLimitUtils.unlimit();
+        }
+    }
+
+    @Override
+    public boolean isFrozen() {
+        return TPSFreezeUtils.frozen();
+    }
+
+    @Override
+    public void setFreeze(boolean freeze) {
+        if (freeze) {
+            setTickRate(0);
+        }
+    }
+
+    @Override
+    public void stepTicks(int ticks) {
+        currentLimit = 0;
+        setTickRate(20);
+        stepsLeft = ticks;
+        stepsTotal = ticks;
+        currentlyStepping = true;
+    }
+
+    @Override
+    public void sprintTicks(int ticks) {
+        currentLimit = currentTPSLimit;
+        setTickRate(4000);
+        stepsLeft = ticks;
+        stepsTotal = ticks;
+        currentlyStepping = true;
+    }
+
+    @Override
+    public boolean isSprinting() {
+        return currentlyStepping && currentTPSLimit > 20;
+    }
+
+    @Override
+    public boolean isStepping() {
+        return currentlyStepping && currentTPSLimit <= 20;
+    }
+
+    @Override
+    public float getTickRate() {
+        return currentTPSLimit;
+    }
+
+    @Override
+    public void setBlockTpsPacket(boolean block) {
+
+    }
+
+    @Override
+    public long getTotalTicks() {
+        return stepsTotal;
+    }
+
+    @Override
+    public long getDoneTicks() {
+        return stepsTotal - stepsLeft;
+    }
+
+    @Override
+    public long getRemainingTicks() {
+        return stepsLeft;
+    }
+
+    @EventHandler
+    public void onTickEnd(TickEndEvent event) {
+        if (!currentlyStepping) return;
+        stepsLeft--;
+        if (stepsLeft <= 0) {
+            setTickRate(currentLimit);
+        }
+    }
+}

BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/tps/PacketCache.java

@@ -1,23 +1,23 @@
 /*
- *   This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ * Copyright (C) 2020  SteamWar.de-Serverteam
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
  *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.features.tpslimit;
+package de.steamwar.bausystem.utils.tps;
 
 import de.steamwar.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;

BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/tps/TPSFreezeUtils.java

@@ -1,23 +1,23 @@
 /*
- *   This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ * Copyright (C) 2020  SteamWar.de-Serverteam
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
  *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.features.tpslimit;
+package de.steamwar.bausystem.utils.tps;
 
 import de.steamwar.Reflection;
 import lombok.Getter;

BauSystem/BauSystem_15/src/de/steamwar/bausystem/utils/tps/TPSLimitUtils.java

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.bausystem.features.tpslimit;
+package de.steamwar.bausystem.utils.tps;
 
 import de.steamwar.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;

BauSystem/BauSystem_19/src/de/steamwar/bausystem/utils/TickListener19.java

@@ -22,7 +22,6 @@ package de.steamwar.bausystem.utils;
 import com.destroystokyo.paper.event.server.ServerTickEndEvent;
 import com.destroystokyo.paper.event.server.ServerTickStartEvent;
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.features.tpslimit.TPSFreezeUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -37,7 +36,7 @@ public class TickListener19 implements TickListener, Listener {
 
     @EventHandler
     public void onServerTickStart(ServerTickStartEvent event) {
-        if (TPSFreezeUtils.isFrozen()) return;
+        if (TickManager.impl.isFrozen()) return;
         Bukkit.getPluginManager().callEvent(new TickStartEvent());
         tickStartRan = true;
     }

BauSystem/BauSystem_21/src/de/steamwar/bausystem/utils/TickManager21.java

@@ -0,0 +1,150 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.utils;
+
+import com.comphenix.tinyprotocol.TinyProtocol;
+import de.steamwar.Reflection;
+import de.steamwar.bausystem.BauSystem;
+import net.minecraft.network.protocol.game.ClientboundTickingStatePacket;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.ServerTickRateManager;
+import net.minecraft.world.TickRateManager;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+public class TickManager21 implements TickManager {
+    private static final ServerTickRateManager manager = MinecraftServer.getServer().tickRateManager();
+    private static final Reflection.Field<Integer> frozenTicksToRun = Reflection.getField(TickRateManager.class, int.class, 0);
+    private static final Reflection.Field<Long> remainingSprintTicks = Reflection.getField(ServerTickRateManager.class, long.class, 0);
+
+    private boolean blockTpsPacket = true;
+    private int totalSteps;
+
+    public TickManager21() {
+        TinyProtocol.instance.addFilter(ClientboundTickingStatePacket.class, this::blockPacket);
+    }
+
+    private Object blockPacket(Player player, Object packet) {
+        if (blockTpsPacket) {
+            return new ClientboundTickingStatePacket(20, manager.isFrozen());
+        } else {
+            return packet;
+        }
+    }
+
+    @Override
+    public boolean canFreeze() {
+        return true;
+    }
+
+    @Override
+    public void setBlockTpsPacket(boolean block) {
+        blockTpsPacket = block;
+        if (blockTpsPacket) {
+            ClientboundTickingStatePacket packet = new ClientboundTickingStatePacket(20, manager.isFrozen());
+            Bukkit.getOnlinePlayers().forEach(player -> TinyProtocol.instance.sendPacket(player, packet));
+        } else {
+            ClientboundTickingStatePacket packet = new ClientboundTickingStatePacket(manager.tickrate(), manager.isFrozen());
+            Bukkit.getOnlinePlayers().forEach(player -> TinyProtocol.instance.sendPacket(player, packet));
+        }
+    }
+
+    @Override
+    public void setTickRate(float tickRate) {
+        if (isFrozen()) {
+            setFreeze(false);
+        }
+        manager.setTickRate(tickRate);
+    }
+
+    @Override
+    public boolean isFrozen() {
+        return manager.isFrozen();
+    }
+
+    @Override
+    public void setFreeze(boolean freeze) {
+        manager.setFrozen(freeze);
+    }
+
+    @Override
+    public void stepTicks(int ticks) {
+        if (manager.isSprinting()) {
+            manager.stopSprinting();
+        } else if (manager.isSteppingForward()) {
+            manager.stopStepping();
+        }
+        this.totalSteps = ticks;
+        manager.setFrozen(true);
+        manager.stepGameIfPaused(ticks);
+        manager.setFrozen(false);
+        Bukkit.getScheduler().runTaskTimer(BauSystem.getInstance(), (bukkitTask) -> {
+            if (manager.isSteppingForward()) return;
+            manager.setFrozen(true);
+            bukkitTask.cancel();
+        }, 1, 1);
+        manager.tick();
+    }
+
+    @Override
+    public void sprintTicks(int ticks) {
+        if (manager.isSteppingForward()) {
+            manager.stopStepping();
+        } else if (manager.isSprinting()) {
+            manager.stopSprinting();
+        }
+        this.totalSteps = ticks;
+        manager.requestGameToSprint(ticks, true);
+    }
+
+    @Override
+    public boolean isSprinting() {
+        return manager.isSprinting();
+    }
+
+    @Override
+    public boolean isStepping() {
+        return manager.isSteppingForward();
+    }
+
+    @Override
+    public float getTickRate() {
+        return manager.tickrate();
+    }
+
+    @Override
+    public long getRemainingTicks() {
+        if (isSprinting()) {
+            return remainingSprintTicks.get(manager);
+        } else {
+            return frozenTicksToRun.get(manager);
+        }
+    }
+
+    @Override
+    public long getDoneTicks() {
+        return totalSteps - getRemainingTicks();
+    }
+
+    @Override
+    public long getTotalTicks() {
+        return totalSteps;
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java

@@ -19,7 +19,6 @@
 
 package de.steamwar.bausystem;
 
-import de.steamwar.core.WorldEditRendererCUIEditor;
 import de.steamwar.bausystem.config.BauServer;
 import de.steamwar.bausystem.configplayer.Config;
 import de.steamwar.bausystem.configplayer.ConfigConverter;
@@ -29,7 +28,6 @@ import de.steamwar.bausystem.features.script.lua.libs.LuaLib;
 import de.steamwar.bausystem.features.slaves.laufbau.BoundingBoxLoader;
 import de.steamwar.bausystem.features.slaves.panzern.Panzern;
 import de.steamwar.bausystem.features.slaves.panzern.PanzernAlgorithm;
-import de.steamwar.bausystem.features.tpslimit.TPSFreezeUtils;
 import de.steamwar.bausystem.features.tracer.TraceManager;
 import de.steamwar.bausystem.features.tracer.TraceRecorder;
 import de.steamwar.bausystem.features.world.BauScoreboard;
@@ -39,11 +37,13 @@ import de.steamwar.bausystem.region.loader.RegionLoader;
 import de.steamwar.bausystem.region.loader.Updater;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.bausystem.utils.TickListener;
+import de.steamwar.bausystem.utils.TickManager;
 import de.steamwar.bausystem.worlddata.WorldData;
 import de.steamwar.command.AbstractValidator;
 import de.steamwar.command.SWCommand;
 import de.steamwar.command.SWCommandUtils;
 import de.steamwar.core.Core;
+import de.steamwar.core.WorldEditRendererCUIEditor;
 import de.steamwar.linkage.LinkedInstance;
 import de.steamwar.linkage.MaxVersion;
 import de.steamwar.linkage.MinVersion;
@@ -266,7 +266,7 @@ public class BauSystem extends JavaPlugin {
 
             @Override
             public void run() {
-                if (TPSFreezeUtils.isFrozen()) return;
+                if (TickManager.impl.isFrozen()) return;
                 if (counter >= delay) {
                     runnable.run();
                     cancel();
@@ -284,7 +284,7 @@ public class BauSystem extends JavaPlugin {
 
             @Override
             public void run() {
-                if (TPSFreezeUtils.isFrozen()) return;
+                if (TickManager.impl.isFrozen()) return;
                 if (counter >= (first ? delay : period)) {
                     first = false;
                     runnable.run();

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/lua/libs/TpsLib.java

@@ -20,6 +20,7 @@
 package de.steamwar.bausystem.features.script.lua.libs;
 
 import de.steamwar.bausystem.features.tpslimit.TPSSystem;
+import de.steamwar.bausystem.utils.TickManager;
 import de.steamwar.core.TPSWatcher;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
@@ -51,7 +52,7 @@ public class TpsLib implements LuaLib {
         tpsLib.set("fiveMinute", getter(() -> TPSWatcher.getTPS(TPSWatcher.TPSType.FIVE_MINUTES)));
         tpsLib.set("tenMinute", getter(() -> TPSWatcher.getTPS(TPSWatcher.TPSType.TEN_MINUTES)));
         tpsLib.set("current", getter(TPSWatcher::getTPS));
-        tpsLib.set("limit", getter(TPSSystem::getCurrentTPSLimit));
+        tpsLib.set("limit", getter(() -> (double) TickManager.impl.getTickRate()));
         return tpsLib;
     }
 }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCommand.java

@@ -76,7 +76,7 @@ public class SimulatorCommand extends SWCommand {
 
     @Register(value = "start", description = "SIMULATOR_START_HELP")
     public void start(@Validator Player p, @ErrorMessage("SIMULATOR_NOT_EXISTS") Simulator simulator) {
-        SimulatorExecutor.run(simulator, () -> {});
+        SimulatorExecutor.run(p, simulator, null);
     }
 
     @Register(value = "rename", description = "SIMULATOR_RENAME_HELP")

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorCursor.java

@@ -367,7 +367,7 @@ public class SimulatorCursor implements Listener {
             if (simulator == null) {
                 return;
             }
-            SimulatorExecutor.run(simulator, () -> {});
+            SimulatorExecutor.run(event.getPlayer(), simulator, null);
             return;
         }
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/data/Simulator.java

@@ -40,9 +40,11 @@ public final class Simulator {
     private SimulatorStabGenerator stabGenerator = null;
     private Material material = Material.BARREL;
     private final String name;
-    private boolean autoTrace = false;
     private final List<SimulatorGroup> groups = new ArrayList<>();
 
+    private boolean autoTrace = false;
+    private boolean autoTestblock = false;
+
     public void move(int x, int y, int z) {
         groups.forEach(simulatorGroup -> {
             simulatorGroup.move(x, y, z);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorExecutor.java

@@ -31,6 +31,7 @@ import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.MinVersion;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
@@ -46,7 +47,7 @@ public class SimulatorExecutor implements Listener {
     private static Map<Long, Map<Integer, List<SimulatorAction>>> tickStartActions = new HashMap<>();
     private static Map<Long, List<SimulatorAction>> tickEndActions = new HashMap<>();
 
-    public static boolean run(Simulator simulator, Runnable onEnd) {
+    public static boolean run(Player player, Simulator simulator, Runnable onEnd) {
         if (currentlyRunning.contains(simulator)) return false;
         currentlyRunning.add(simulator);
 
@@ -83,10 +84,15 @@ public class SimulatorExecutor implements Listener {
                                     });
                         }
 
-                        onEnd.run();
+                        if (onEnd != null) {
+                            onEnd.run();
+                        }
                     }
                 });
 
+        if (player != null && simulator.isAutoTestblock()) {
+            player.performCommand("tb");
+        }
         if (simulator.isAutoTrace() && onEnd == null) {
             simulator.getGroups()
                     .stream()

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabStep.java

@@ -58,7 +58,7 @@ public abstract class StabStep {
     protected abstract void start();
 
     protected final void runSimulator(Runnable onFinish) {
-        SimulatorExecutor.run(data.simulator, () -> {
+        SimulatorExecutor.run(null, data.simulator, () -> {
             Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
                 if (this instanceof Listener) {
                     HandlerList.unregisterAll((Listener) this);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorSettingsGui.java

@@ -56,10 +56,14 @@ public class SimulatorSettingsGui extends SimulatorBaseGui {
         }));
 
         //AutoTrace
-        inventory.setItem(20, new SWItem(simulator.isAutoTrace() ? Material.CHAIN_COMMAND_BLOCK : Material.COMMAND_BLOCK, "§eAutoTrace§8: " + (simulator.isAutoTrace() ? "§aOn" : "§cOff"), clickType -> {
+        inventory.setItem(19, new SWItem(simulator.isAutoTrace() ? Material.CHAIN_COMMAND_BLOCK : Material.COMMAND_BLOCK, "§eAutoTrace§8: " + (simulator.isAutoTrace() ? "§aOn" : "§cOff"), clickType -> {
             simulator.setAutoTrace(!simulator.isAutoTrace());
             SimulatorWatcher.update(simulator);
         }));
+        inventory.setItem(20, new SWItem(simulator.isAutoTestblock() ? Material.END_STONE : Material.BARRIER, "§eTestblock§8: " + (simulator.isAutoTestblock() ? "§aOn" : "§cOff"), clickType -> {
+            simulator.setAutoTestblock(!simulator.isAutoTestblock());
+            SimulatorWatcher.update(simulator);
+        }));
 
         //Pos X
         inventory.setItem(15, new SWItem(SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimFormatSimulatorLoader.java

@@ -68,6 +68,7 @@ public class SimFormatSimulatorLoader implements SimulatorLoader {
     private void loadSimulator(YAPIONObject simulatorObject, Simulator simulator) {
         simulator.setMaterial(Material.valueOf(simulatorObject.getPlainValue("material")));
         simulator.setAutoTrace(simulatorObject.getPlainValue("autoTrace"));
+        simulator.setAutoTestblock(simulatorObject.getPlainValueOrDefault("autoTestblock", false));
 
         YAPIONArray groups = simulatorObject.getArray("groups");
         groups.streamObject().forEach(groupObject -> {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/storage/SimulatorSaver.java

@@ -39,6 +39,7 @@ public class SimulatorSaver {
         YAPIONObject simulatorObject = new YAPIONObject();
         simulatorObject.add("material", simulator.getMaterial().name());
         simulatorObject.add("autoTrace", simulator.isAutoTrace());
+        simulatorObject.add("autoTestblock", simulator.isAutoTestblock());
 
         YAPIONArray groups = new YAPIONArray();
         simulator.getGroups().forEach(group -> {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tpslimit/TPSCommand.java

@@ -1,20 +1,20 @@
 /*
- *   This file is a part of the SteamWar software.
+ * This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ * Copyright (C) 2020  SteamWar.de-Serverteam
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU Affero General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU Affero General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
  *
- *   You should have received a copy of the GNU Affero General Public License
- *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 package de.steamwar.bausystem.features.tpslimit;

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tpslimit/TPSSystem.java

@@ -27,19 +27,17 @@ import de.steamwar.bausystem.region.GlobalRegion;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.bausystem.utils.TickEndEvent;
+import de.steamwar.bausystem.utils.TickManager;
 import de.steamwar.bausystem.utils.bossbar.BauSystemBossbar;
 import de.steamwar.bausystem.utils.bossbar.BossBarService;
 import de.steamwar.command.AbstractSWCommand;
 import de.steamwar.command.SWCommand;
 import de.steamwar.core.Core;
-import de.steamwar.core.TPSWarpUtils;
 import de.steamwar.core.TPSWatcher;
 import de.steamwar.inventory.SWAnvilInv;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
-import de.steamwar.linkage.MaxVersion;
-import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.boss.BarColor;
@@ -52,91 +50,61 @@ import org.bukkit.inventory.ItemStack;
 import java.util.Arrays;
 
 @Linked
-@MaxVersion(20) // Hotfix for 1.21 tps limit! -> Backport coming later
 public class TPSSystem implements Listener {
 
-    @Getter
-    private static double currentTPSLimit = 20;
-
     public TPSSystem() {
-        if (TPSFreezeUtils.isCanFreeze()) {
+        if (TickManager.impl.canFreeze()) {
             new TPSFreezeCommand();
             new TickFreezeCommand();
             new TickStepCommand();
         }
         new TPSLimitCommand();
         new TickLimitCommand();
-        if (Core.getVersion() >= 15 && Core.getVersion() <= 20) { // If 1.21 support is not directly present
+        if (Core.getVersion() >= 15) {
             new TPSWarpCommand();
             new TickWarpCommand();
-            if (TPSFreezeUtils.isCanFreeze()) {
+            if (TickManager.impl.canFreeze()) {
                 new TickWarpingCommand();
             }
         }
+        if (Core.getVersion() >= 21) {
+            new Tick21Command();
+        }
         new TPSDefaultCommand();
         new TickDefaultCommand();
         new TPSBaseCommand();
         new TickBaseCommand();
-    }
-
-    private void setTPS(double tps) {
-        if (currentlyStepping) {
-            currentlyStepping = false;
-            Bukkit.getOnlinePlayers().forEach(player -> {
-                BossBarService.instance.remove(player, GlobalRegion.getInstance(), "TickStep");
-            });
-        }
-        TPSWarpUtils.warp(tps);
-        if (currentTPSLimit == 0 && tps != 0) {
-            TPSFreezeUtils.unfreeze();
-        }
-        currentTPSLimit = tps;
-        if (tps == 0) {
-            TPSLimitUtils.unlimit();
-            TPSFreezeUtils.freeze();
-        } else if (tps < 20.0) {
-            TPSLimitUtils.limit(tps);
-        } else if (tps >= 20) {
-            TPSLimitUtils.unlimit();
-        }
-
-        Bukkit.getOnlinePlayers().forEach(player -> {
-            if (currentTPSLimit == 0) {
-                SWUtils.sendToActionbar(player, BauSystem.MESSAGE.parse("TPSLIMIT_FROZEN", player));
-            } else {
-                SWUtils.sendToActionbar(player, BauSystem.MESSAGE.parse("TPSLIMIT_SET", player, currentTPSLimit));
-            }
-        });
-    }
-
-    private boolean currentlyStepping = false;
-    private double currentLimit;
-    private int stepsTotal;
-    private int stepsLeft;
-
-    private void setSkip(int steps, double tpsLimitToUse) {
-        currentLimit = tpsLimitToUse == 20 ? 0 : currentTPSLimit;
-        setTPS(tpsLimitToUse);
-        stepsLeft = steps;
-        stepsTotal = steps;
-        currentlyStepping = true;
+        Bukkit.getPluginManager().registerEvents(TickManager.impl, BauSystem.getInstance());
     }
 
     @EventHandler
     public void onTickEnd(TickEndEvent event) {
-        if (!currentlyStepping) return;
-        if (stepsTotal > 1) {
+        bossbar();
+    }
+
+    private void bossbar() {
+        if ((TickManager.impl.isStepping() || TickManager.impl.isSprinting()) && TickManager.impl.getRemainingTicks() > 0) {
             Bukkit.getOnlinePlayers().forEach(player -> {
                 BauSystemBossbar bossbar = BossBarService.instance.get(player, GlobalRegion.getInstance(), "TickStep");
                 bossbar.setColor(BarColor.YELLOW);
-                bossbar.setTitle(BauSystem.MESSAGE.parse("TICK_BOSSBAR", player, (stepsTotal - stepsLeft), stepsTotal));
-                bossbar.setProgress((stepsTotal - stepsLeft) / (double) stepsTotal);
+                bossbar.setTitle(BauSystem.MESSAGE.parse("TICK_BOSSBAR", player, TickManager.impl.getDoneTicks(), TickManager.impl.getTotalTicks()));
+                bossbar.setProgress(TickManager.impl.getDoneTicks() / (double) TickManager.impl.getTotalTicks());
+            });
+        } else {
+            Bukkit.getOnlinePlayers().forEach(player -> {
+                BossBarService.instance.remove(player, GlobalRegion.getInstance(), "TickStep");
             });
         }
-        stepsLeft--;
-        if (stepsLeft <= 0) {
-            setTPS(currentLimit);
-        }
+    }
+
+    public static void sendTickRateChange() {
+        Bukkit.getOnlinePlayers().forEach(player -> {
+            if (TickManager.impl.isFrozen()) {
+                SWUtils.sendToActionbar(player, BauSystem.MESSAGE.parse("TPSLIMIT_FROZEN", player));
+            } else {
+                SWUtils.sendToActionbar(player, BauSystem.MESSAGE.parse("TPSLIMIT_SET", player, TickManager.impl.getTickRate()));
+            }
+        });
     }
 
     private class TPSBaseCommand extends SWCommand {
@@ -157,7 +125,8 @@ public class TPSSystem implements Listener {
 
         @Register(value = "0", description = "TPSLIMIT_FREEZE_HELP")
         public void freeze(@Validator Player player) {
-            setTPS(0);
+            TickManager.impl.setFreeze(true);
+            sendTickRateChange();
         }
     }
 
@@ -169,8 +138,9 @@ public class TPSSystem implements Listener {
         }
 
         @Register(description = "TPSLIMIT_LIMIT_HELP")
-        public void limit(@Validator Player player, @Min(doubleValue = 0.5) @Max(doubleValue = 20.0) double tpsLimit) {
-            setTPS(tpsLimit);
+        public void limit(@Validator Player player, @Min(doubleValue = 0.5) @Max(doubleValue = 20.0) float tpsLimit) {
+            TickManager.impl.setTickRate(tpsLimit);
+            sendTickRateChange();
         }
     }
 
@@ -182,8 +152,9 @@ public class TPSSystem implements Listener {
         }
 
         @Register(description = "TPSLIMIT_WARP_HELP")
-        public void warp(@Validator Player player, @Min(doubleValue = 20.0, inclusive = false) double tpsLimit) {
-            setTPS(tpsLimit);
+        public void warp(@Validator Player player, @Min(doubleValue = 20.0, inclusive = false) float tpsLimit) {
+            TickManager.impl.setTickRate(tpsLimit);
+            sendTickRateChange();
         }
     }
 
@@ -196,12 +167,13 @@ public class TPSSystem implements Listener {
 
         @Register(description = "TPSLIMIT_HELP")
         public void currentLimit(Player player) {
-            BauSystem.MESSAGE.send("TPSLIMIT_CURRENT", player, currentTPSLimit);
+            BauSystem.MESSAGE.send("TPSLIMIT_CURRENT", player, TickManager.impl.getTickRate());
         }
 
         @Register(value = "default", description = "TPSLIMIT_DEFAULT_HELP")
         public void reset(@Validator Player player) {
-            setTPS(20);
+            TickManager.impl.setTickRate(20.0F);
+            sendTickRateChange();
         }
     }
 
@@ -223,12 +195,14 @@ public class TPSSystem implements Listener {
         @Register(value = {"rate", "0"}, description = "TICK_FREEZE_HELP")
         @Register(value = "freeze", description = "TICK_FREEZE_HELP_2")
         public void freeze(@Validator Player player) {
-            setTPS(0);
+            TickManager.impl.setFreeze(true);
+            sendTickRateChange();
         }
 
         @Register(value = "unfreeze", description = "TICK_UNFREEZE_HELP")
         public void unfreeze(@Validator Player player) {
-            setTPS(20);
+            TickManager.impl.setTickRate(20.0F);
+            sendTickRateChange();
         }
     }
 
@@ -241,7 +215,9 @@ public class TPSSystem implements Listener {
 
         @Register(value = "step", description = "TICK_STEPPING_HELP")
         public void step(@Validator Player player, @Min(intValue = 1) @OptionalValue("1") int steps) {
-            setSkip(steps, 20);
+            TickManager.impl.stepTicks(steps);
+            sendTickRateChange();
+            bossbar();
         }
     }
 
@@ -253,8 +229,9 @@ public class TPSSystem implements Listener {
         }
 
         @Register(value = "warp", description = "TICK_WARPING_HELP")
-        public void warp(@Validator Player player, @Min(intValue = 1) @OptionalValue("1") int steps, @Min(doubleValue = 20) @OptionalValue("4000") double tps) {
-            setSkip(steps, tps);
+        public void warp(@Validator Player player, @Min(intValue = 1) @OptionalValue("1") int steps) {
+            TickManager.impl.sprintTicks(steps);
+            sendTickRateChange();
         }
     }
 
@@ -266,8 +243,9 @@ public class TPSSystem implements Listener {
         }
 
         @Register(value = "rate", description = "TICK_LIMIT_HELP")
-        public void limit(@Validator Player player, @Min(doubleValue = 0.5, inclusive = false) @Max(doubleValue = 20.0) double tpsLimit) {
-            setTPS(tpsLimit);
+        public void limit(@Validator Player player, @Min(doubleValue = 0.5, inclusive = false) @Max(doubleValue = 20.0) float tpsLimit) {
+            TickManager.impl.setTickRate(tpsLimit);
+            sendTickRateChange();
         }
     }
 
@@ -279,8 +257,9 @@ public class TPSSystem implements Listener {
         }
 
         @Register(value = "rate", description = "TICK_WARP_HELP")
-        public void warp(@Validator Player player, @Min(doubleValue = 20.0, inclusive = false) double tpsLimit) {
-            setTPS(tpsLimit);
+        public void warp(@Validator Player player, @Min(doubleValue = 20.0, inclusive = false) float tpsLimit) {
+            TickManager.impl.setTickRate(tpsLimit);
+            sendTickRateChange();
         }
     }
 
@@ -293,12 +272,31 @@ public class TPSSystem implements Listener {
 
         @Register(value = "rate", description = "TICK_HELP")
         public void currentLimit(Player player) {
-            BauSystem.MESSAGE.send("TPSLIMIT_CURRENT", player, currentTPSLimit);
+            BauSystem.MESSAGE.send("TPSLIMIT_CURRENT", player, TickManager.impl.getTickRate());
         }
 
         @Register(value = {"rate", "default"}, description = "TICK_DEFAULT_HELP")
         public void reset(@Validator Player player) {
-            setTPS(20);
+            TickManager.impl.setTickRate(20.0F);
+            sendTickRateChange();
+        }
+    }
+
+    @AbstractSWCommand.PartOf(TickBaseCommand.class)
+    private class Tick21Command extends SWCommand {
+
+        private Tick21Command() {
+            super("");
+        }
+
+        @Register(value = "normalclient")
+        public void smooth(@Validator Player player) {
+            TickManager.impl.setBlockTpsPacket(true);
+        }
+
+        @Register(value = "slowclient")
+        public void unsmooth(@Validator Player player) {
+            TickManager.impl.setBlockTpsPacket(false);
         }
     }
 
@@ -320,7 +318,10 @@ public class TPSSystem implements Listener {
 
         @Override
         public String get(Region region, Player p) {
-            if (tpsSystem != null && tpsSystem.currentlyStepping) {
+            boolean isWarping = TickManager.impl.isSprinting();
+            boolean isFrozen = TickManager.impl.isFrozen();
+
+            if (tpsSystem != null && isWarping) {
                 long time = System.currentTimeMillis() % 1000;
                 if (time < 250) {
                     return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_TPS", p) + "§8: §7•••";
@@ -331,7 +332,7 @@ public class TPSSystem implements Listener {
                 } else {
                     return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_TPS", p) + "§8: §7••§e•";
                 }
-            } else if (TPSFreezeUtils.frozen()) {
+            } else if (isFrozen) {
                 return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_TPS", p) + "§8: " + BauSystem.MESSAGE.parse("SCOREBOARD_TPS_FROZEN", p);
             } else {
                 return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_TPS", p) + "§8: " + tpsColor() + TPSWatcher.getTPSUnlimited(TPSWatcher.TPSType.ONE_SECOND) + tpsLimit();
@@ -340,20 +341,20 @@ public class TPSSystem implements Listener {
 
         private String tpsColor() {
             double tps = TPSWatcher.getTPSUnlimited(TPSWatcher.TPSType.ONE_SECOND);
-            if (tps > TPSSystem.getCurrentTPSLimit() * 0.9) {
+            if (tps > TickManager.impl.getTickRate() * 0.9) {
                 return "§a";
             }
-            if (tps > TPSSystem.getCurrentTPSLimit() * 0.5) {
+            if (tps > TickManager.impl.getTickRate() * 0.5) {
                 return "§e";
             }
             return "§c";
         }
 
         private String tpsLimit() {
-            if (TPSSystem.getCurrentTPSLimit() == 20) {
+            if (TickManager.impl.getTickRate() == 20) {
                 return "";
             }
-            return "§8/§7" + TPSSystem.getCurrentTPSLimit();
+            return "§8/§7" + TickManager.impl.getTickRate();
         }
     }
 
@@ -369,7 +370,7 @@ public class TPSSystem implements Listener {
 
         @Override
         public ItemStack getItem(Player player) {
-            return new SWItem(Material.CLOCK, BauSystem.MESSAGE.parse("TPSLIMIT_GUI_ITEM_NAME", player), Arrays.asList(BauSystem.MESSAGE.parse("TPSLIMIT_GUI_ITEM_LORE", player, tpsSystem.currentTPSLimit)), false, clickType -> {
+            return new SWItem(Material.CLOCK, BauSystem.MESSAGE.parse("TPSLIMIT_GUI_ITEM_NAME", player), Arrays.asList(BauSystem.MESSAGE.parse("TPSLIMIT_GUI_ITEM_LORE", player, TickManager.impl.getTickRate())), false, clickType -> {
             }).getItemStack();
         }
 

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TNTPoint.java

@@ -22,19 +22,15 @@ package de.steamwar.bausystem.features.tracer;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
+import de.steamwar.core.Core;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.util.Vector;
 
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
 import java.util.List;
 import java.util.Optional;
 
@@ -106,7 +102,11 @@ public class TNTPoint{
                     List<TNTPoint> history, List<Block> destroyedBlocks) {
         this.tntId = tntId;
         this.explosion = explosion;
-        this.inWater = tnt.isInWater();
+        if (Core.getVersion() > 15) {
+            this.inWater = tnt.isInWater();
+        } else {
+            this.inWater = false;
+        }
         this.afterFirstExplosion = afterFirstExplosion;
         this.ticksSinceStart = ticksSinceStart;
         fuse = tnt.getFuseTicks();

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/ClipboardListener.java

@@ -21,6 +21,7 @@ package de.steamwar.bausystem.features.world;
 
 import de.steamwar.bausystem.Permission;
 import de.steamwar.linkage.Linked;
+import de.steamwar.sql.NodeData;
 import de.steamwar.sql.SchematicData;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SteamwarUser;
@@ -65,7 +66,8 @@ public class ClipboardListener implements Listener {
         }
 
         try {
-            new SchematicData(schematic).saveFromPlayer(e.getPlayer());
+            NodeData.get(schematic).forEach(NodeData::delete);
+            SchematicData.saveFromPlayer(e.getPlayer(), schematic);
         } catch (Exception ex) {
             if (newSchem) {
                 schematic.delete();

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/utils/TickManager.java

@@ -0,0 +1,46 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2025 SteamWar.de-Serverteam
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU Affero General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU Affero General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Affero General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.bausystem.utils;
+
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.core.VersionDependent;
+import org.bukkit.event.Listener;
+
+public interface TickManager extends Listener {
+    TickManager impl = VersionDependent.getVersionImpl(BauSystem.getInstance());
+
+    void setTickRate(float tickRate);
+    float getTickRate();
+
+    boolean canFreeze();
+    void setFreeze(boolean freeze);
+    boolean isFrozen();
+
+    void stepTicks(int ticks);
+    boolean isStepping();
+
+    void sprintTicks(int ticks);
+    boolean isSprinting();
+
+    void setBlockTpsPacket(boolean block);
+    long getRemainingTicks();
+    long getDoneTicks();
+    long getTotalTicks();
+}

CommonCore/SQL/src/de/steamwar/sql/AuditLog.java

@@ -0,0 +1,125 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.sql;
+
+import de.steamwar.sql.internal.Field;
+import de.steamwar.sql.internal.SqlTypeMapper;
+import de.steamwar.sql.internal.Statement;
+import de.steamwar.sql.internal.Table;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NonNull;
+
+import java.sql.Timestamp;
+import java.time.Instant;
+
+@AllArgsConstructor
+public class AuditLog {
+
+    static {
+        SqlTypeMapper.nameEnumMapper(AuditLog.Type.class);
+    }
+
+    public static final String SERVER_NAME_VELOCITY = "Velocity";
+
+    private static final Table<AuditLog> table = new Table<>(AuditLog.class);
+
+    private static final Statement create = table.insertFields(true, "time", "serverName", "serverOwner", "actor", "actionType", "actionText");
+
+    @Getter
+    @Field
+    private final Timestamp time;
+
+    @Getter
+    @Field
+    private final String serverName;
+
+    @Field(nullable = true)
+    private final int serverOwner;
+
+    @Field
+    private final int actor;
+
+    @Getter
+    @Field
+    private final Type actionType;
+
+    @Getter
+    @Field
+    private final String actionText;
+
+    public enum Type {
+        JOIN,
+        LEAVE,
+        COMMAND,
+        SENSITIVE_COMMAND,
+
+        CHAT,
+        GUI_OPEN,
+        GUI_CLOSE,
+        GUI_CLICK,
+    }
+
+    private static void create(String serverName, SteamwarUser serverOwner, SteamwarUser actor, Type actionType, String text) {
+        create.insertGetKey(Timestamp.from(Instant.now()), serverName, serverOwner, actor, actionType, text);
+    }
+
+    public static void createJoin(@NonNull String jointServerName, SteamwarUser serverOwner, @NonNull SteamwarUser joinedPlayer) {
+        create(jointServerName, serverOwner, joinedPlayer, Type.JOIN, "");
+    }
+
+    public static void createLeave(@NonNull String leftServerName, SteamwarUser serverOwner, @NonNull SteamwarUser joinedPlayer) {
+        create(leftServerName, serverOwner, joinedPlayer, Type.LEAVE, "");
+    }
+
+    public static void createCommand(@NonNull String serverName, SteamwarUser serverOwner, SteamwarUser player, @NonNull String command) {
+        if (player == null) return;
+        create(serverName, serverOwner, player, Type.COMMAND, command);
+    }
+
+    public static void createSensitiveCommand(@NonNull String serverName, SteamwarUser serverOwner, SteamwarUser player, @NonNull String command) {
+        if (player == null) return;
+        create(serverName, serverOwner, player, Type.SENSITIVE_COMMAND, command);
+    }
+
+    public static void createChat(@NonNull String serverName, SteamwarUser serverOwner, @NonNull SteamwarUser chatter, @NonNull String chat) {
+        create(serverName, serverOwner, chatter, Type.CHAT, chat);
+    }
+
+    public static void createGuiOpen(@NonNull String serverName, SteamwarUser serverOwner, @NonNull SteamwarUser player, @NonNull String guiName) {
+        create(serverName, serverOwner, player, Type.GUI_OPEN, guiName);
+    }
+
+    public static void createGuiClick(@NonNull String serverName, SteamwarUser serverOwner, @NonNull SteamwarUser player, @NonNull String guiName, @NonNull String clickType, int slot, @NonNull String itemName) {
+        create(serverName, serverOwner, player, Type.GUI_CLICK, "Gui: " + guiName + "\nSlot: " + slot + "\nClickType: " + clickType + "\nItemName: " + itemName);
+    }
+
+    public static void createGuiClose(@NonNull String serverName, SteamwarUser serverOwner, @NonNull SteamwarUser player, @NonNull String guiName) {
+        create(serverName, serverOwner, player, Type.GUI_CLOSE, guiName);
+    }
+
+    public SteamwarUser getServerOwner() {
+        return SteamwarUser.get(serverOwner);
+    }
+
+    public SteamwarUser getActor() {
+        return SteamwarUser.get(actor);
+    }
+}

CommonCore/SQL/src/de/steamwar/sql/NodeData.java

@@ -23,8 +23,13 @@ import de.steamwar.sql.internal.*;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import javax.swing.plaf.nimbus.State;
 import java.io.*;
 import java.sql.PreparedStatement;
+import java.sql.Timestamp;
+import java.time.Instant;
+import java.util.List;
+import java.util.Optional;
 import java.util.zip.GZIPInputStream;
 
 @AllArgsConstructor
@@ -40,26 +45,47 @@ public class NodeData {
 
     private static final Table<NodeData> table = new Table<>(NodeData.class);
 
-    private static final Statement updateDatabase = new Statement("INSERT INTO NodeData(NodeId, NodeFormat, SchemData) VALUES (?, ?, ?) ON DUPLICATE KEY UPDATE NodeFormat = VALUES(NodeFormat), SchemData = VALUES(SchemData)");
-    private static final Statement selSchemData = new Statement("SELECT SchemData FROM NodeData WHERE NodeId = ?");
+    private static final Statement updateDatabase = new Statement("INSERT INTO NodeData(NodeId, NodeFormat, SchemData) VALUES (?, ?, ?)", true);
+    private static final Statement selSchemData = new Statement("SELECT SchemData FROM NodeData WHERE NodeId = ? AND CreatedAt = ?");
+    private static final Statement delete = table.delete(Table.PRIMARY);
 
-    private static final SelectStatement<NodeData> get = table.select(Table.PRIMARY);
+    private static final SelectStatement<NodeData> get = new SelectStatement<>(table, "SELECT NodeId, CreatedAt, NodeFormat FROM NodeData WHERE NodeId = ? ORDER BY CreatedAt ");
+    private static final Statement getRevisions = new Statement("SELECT COUNT(DISTINCT CreatedAt) as CNT FROM NodeData WHERE NodeId = ?");
+    private static final SelectStatement<NodeData> getLatest = new SelectStatement<>(table, "SELECT NodeId, CreatedAt, NodeFormat FROM NodeData WHERE NodeId = ? ORDER BY CreatedAt DESC LIMIT 1");
 
-    public static NodeData get(SchematicNode node) {
-        if(node.isDir())
-            throw new IllegalArgumentException("Node is a directory");
-        return get.select(rs -> {
-            if(rs.next()) {
-                return new NodeData(node.getId(), SchematicFormat.values()[rs.getInt("NodeFormat")]);
+    public static NodeData getLatest(SchematicNode node) {
+        if (node.isDir()) throw new IllegalArgumentException("Node is dir");
+        return Optional.ofNullable(getLatest.select(node)).orElseGet(() -> new NodeData(node.getId(), Timestamp.from(Instant.now()), SchematicFormat.MCEDIT));
+    }
+
+    public static List<NodeData> get(SchematicNode node) {
+        return get.listSelect(node);
+    }
+
+    public static NodeData get(SchematicNode node, int revision) {
+        return get.listSelect(node).get(revision - 1);
+    }
+
+    public static int getRevisions(SchematicNode node) {
+        return getRevisions.select(rs -> {
+            if (rs.next()) {
+                return rs.getInt("CNT");
             } else {
-                return new NodeData(node.getId(), SchematicFormat.MCEDIT);
+                return 0;
             }
         }, node);
     }
 
+    public static void saveFromStream(SchematicNode node, InputStream blob, SchematicFormat format) {
+        updateDatabase.update(node.getId(), format, blob);
+    }
+
     @Field(keys = {Table.PRIMARY})
     private final int nodeId;
 
+    @Field
+    private Timestamp createdAt;
+
     @Field
     private SchematicFormat nodeFormat;
 
@@ -84,15 +110,19 @@ public class NodeData {
                 } catch (IOException e) {
                     throw new SecurityException("SchemData is wrong", e);
                 }
-            }, nodeId);
+            }, nodeId, createdAt);
         } catch (Exception e) {
             throw new IOException(e);
         }
     }
 
+    @Deprecated
     public void saveFromStream(InputStream blob, SchematicFormat newFormat) {
-        updateDatabase.update(nodeId, newFormat, blob);
-        nodeFormat = newFormat;
+        saveFromStream(SchematicNode.getSchematicNode(nodeId), blob, newFormat);
+    }
+
+    public void delete() {
+        delete.update(nodeId, createdAt);
     }
 
     @AllArgsConstructor

CommonCore/SQL/src/de/steamwar/sql/SchematicNode.java

@@ -42,13 +42,13 @@ public class SchematicNode {
         TAB_CACHE.clear();
     }
 
-    private static final String nodeSelector = "SELECT NodeId, NodeOwner, NodeOwner AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode ";
+    private static final String nodeSelector = "SELECT NodeId, NodeOwner, NodeOwner AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, Config FROM SchematicNode ";
 
     private static final Table<SchematicNode> table = new Table<>(SchematicNode.class);
     private static final Statement create = table.insertFields(true, "NodeOwner", "NodeName", "ParentNode", "NodeItem",
             "NodeType");
     private static final Statement update = table.update(Table.PRIMARY, "NodeName", "ParentNode", "NodeItem",
-            "NodeType", "NodeRank", "ReplaceColor", "AllowReplay");
+            "NodeType", "NodeRank", "Config");
     private static final Statement delete = table.delete(Table.PRIMARY);
 
     private static final SelectStatement<SchematicNode> byId = new SelectStatement<>(table,
@@ -66,13 +66,13 @@ public class SchematicNode {
     private static final SelectStatement<SchematicNode> all = new SelectStatement<>(table,
             "WITH RECURSIVE Nodes AS (SELECT NodeId, ParentId as ParentNode FROM NodeMember WHERE UserId = ? UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?), RSN AS ( SELECT NodeId, ParentNode FROM Nodes UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN, RSN WHERE SN.ParentNode = RSN.NodeId ) SELECT SN.*, ? AS EffectiveOwner FROM RSN INNER JOIN SchematicNode SN ON RSN.NodeId = SN.NodeId");
     private static final SelectStatement<SchematicNode> list = new SelectStatement<>(table,
-            "SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, NM.ParentId AS ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode INNER JOIN NodeMember NM on SchematicNode.NodeId = NM.NodeId WHERE NM.ParentId "
+            "SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, NM.ParentId AS ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, Config FROM SchematicNode INNER JOIN NodeMember NM on SchematicNode.NodeId = NM.NodeId WHERE NM.ParentId "
                     + Statement.NULL_SAFE_EQUALS
-                    + "? AND NM.UserId = ? UNION ALL SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode WHERE (? IS NULL AND ParentNode IS NULL AND NodeOwner = ?) OR (? IS NOT NULL AND ParentNode = ?) ORDER BY NodeName");
+                    + "? AND NM.UserId = ? UNION ALL SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, Config FROM SchematicNode WHERE (? IS NULL AND ParentNode IS NULL AND NodeOwner = ?) OR (? IS NOT NULL AND ParentNode = ?) ORDER BY NodeName");
     private static final SelectStatement<SchematicNode> byParentName = new SelectStatement<>(table,
-            "SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, NM.ParentId AS ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode INNER JOIN NodeMember NM on SchematicNode.NodeId = NM.NodeId WHERE NM.ParentId "
+            "SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, NM.ParentId AS ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, Config FROM SchematicNode INNER JOIN NodeMember NM on SchematicNode.NodeId = NM.NodeId WHERE NM.ParentId "
                     + Statement.NULL_SAFE_EQUALS
-                    + "? AND NM.UserId = ? AND SchematicNode.NodeName = ? UNION ALL SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode WHERE ((? IS NULL AND ParentNode IS NULL AND NodeOwner = ?) OR (? IS NOT NULL AND ParentNode = ?)) AND NodeName = ?");
+                    + "? AND NM.UserId = ? AND SchematicNode.NodeName = ? UNION ALL SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, Config FROM SchematicNode WHERE ((? IS NULL AND ParentNode IS NULL AND NodeOwner = ?) OR (? IS NOT NULL AND ParentNode = ?)) AND NodeName = ?");
     private static final SelectStatement<SchematicNode> schematicAccessibleForUser = new SelectStatement<>(table,
             "WITH RECURSIVE Nodes AS (SELECT NodeId, ParentId as ParentNode FROM NodeMember WHERE UserId = ? UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?), RSN AS ( SELECT NodeId, ParentNode FROM Nodes UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN, RSN WHERE SN.ParentNode = RSN.NodeId ) SELECT SN.*, ? AS EffectiveOwner FROM RSN INNER JOIN SchematicNode SN ON RSN.NodeId = SN.NodeId WHERE NodeId = ?");
     private static final SelectStatement<SchematicNode> accessibleByUserTypeInParent = new SelectStatement<>(table,
@@ -81,7 +81,7 @@ public class SchematicNode {
     private static final SelectStatement<SchematicNode> accessibleByUserType = new SelectStatement<>(table,
             "WITH RECURSIVE Nodes AS (SELECT NodeId, ParentId as ParentNode FROM NodeMember WHERE UserId = ? UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?), RSN AS ( SELECT NodeId, ParentNode FROM Nodes UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN, RSN WHERE SN.ParentNode = RSN.NodeId ) SELECT SN.*, ? AS EffectiveOwner FROM RSN INNER JOIN SchematicNode SN ON RSN.NodeId = SN.NodeId WHERE NodeType = ?");
     private static final SelectStatement<SchematicNode> byIdAndUser = new SelectStatement<>(table,
-            "SELECT NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode WHERE NodeId = ?");
+            "SELECT NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, Config FROM SchematicNode WHERE NodeId = ?");
     private static final SelectStatement<SchematicNode> allParentsOfNode = new SelectStatement<>(table,
             "WITH RECURSIVE R AS (SELECT NodeId, ParentNode FROM EffectiveSchematicNode WHERE NodeId = ? AND EffectiveOwner = ? UNION SELECT E.NodeId, E.ParentNode FROM R, EffectiveSchematicNode E WHERE R.ParentNode = E.NodeId AND E.EffectiveOwner = ?) SELECT SN.NodeId, SN.NodeOwner, ? AS EffectiveOwner, SN.NodeName, R.ParentNode, SN.LastUpdate, SN.NodeItem, SN.NodeType, SN.NodeRank, SN.ReplaceColor, SN.AllowReplay FROM R INNER JOIN SchematicNode SN ON SN.NodeId = R.NodeId");
 
@@ -108,10 +108,8 @@ public class SchematicNode {
     private SchematicType nodeType;
     @Field(def = "0")
     private int nodeRank;
-    @Field(def = "1")
-    private boolean replaceColor;
-    @Field(def = "1")
-    private boolean allowReplay;
+    @Field
+    private int config;
 
     private String brCache;
 
@@ -125,8 +123,7 @@ public class SchematicNode {
             String nodeItem,
             SchematicType nodeType,
             int nodeRank,
-            boolean replaceColor,
-            boolean allowReplay) {
+            int config) {
         this.nodeId = nodeId;
         this.nodeOwner = nodeOwner;
         this.effectiveOwner = effectiveOwner;
@@ -136,8 +133,7 @@ public class SchematicNode {
         this.nodeType = nodeType;
         this.lastUpdate = lastUpdate;
         this.nodeRank = nodeRank;
-        this.replaceColor = replaceColor;
-        this.allowReplay = allowReplay;
+        this.config = config;
     }
 
     public static List<SchematicNode> getAll(SteamwarUser user) {
@@ -407,7 +403,7 @@ public class SchematicNode {
     public String getFileEnding() {
         if (isDir())
             throw new SecurityException("Node is Directory");
-        return NodeData.get(this).getNodeFormat().getFileEnding();
+        return NodeData.getLatest(this).getNodeFormat().getFileEnding();
     }
 
     public int getRank() {
@@ -441,24 +437,55 @@ public class SchematicNode {
     }
 
     public boolean replaceColor() {
-        return replaceColor;
+        return getConfig(ConfigFlags.REPLACE_COLOR);
     }
 
     public void setReplaceColor(boolean replaceColor) {
         if (isDir())
             throw new SecurityException("Is Directory");
-        this.replaceColor = replaceColor;
-        updateDB();
+        setConfig(ConfigFlags.REPLACE_COLOR, replaceColor);
     }
 
     public boolean allowReplay() {
-        return allowReplay;
+        return getConfig(ConfigFlags.ALLOW_REPLAY);
     }
 
     public void setAllowReplay(boolean allowReplay) {
         if (isDir())
             throw new SecurityException("Is Directory");
-        this.allowReplay = allowReplay;
+        setConfig(ConfigFlags.ALLOW_REPLAY, allowReplay);
+    }
+
+    public boolean isPrepared() {
+        return getConfig(ConfigFlags.IS_PREPARED);
+    }
+
+    public void setPrepared(boolean prepared) {
+        if (isDir())
+            throw new SecurityException("Is Directory");
+        setConfig(ConfigFlags.IS_PREPARED, prepared);
+    }
+
+    public boolean isInvestigation() {
+        return getConfig(ConfigFlags.INVESTIGATION);
+    }
+
+    public void setInvestigation(boolean investigation) {
+        if (isDir())
+            throw new SecurityException("Is Directory");
+        setConfig(ConfigFlags.INVESTIGATION, investigation);
+    }
+
+    public boolean getConfig(ConfigFlags flag) {
+        return (config & (1 << flag.ordinal())) != 0;
+    }
+
+    public void setConfig(ConfigFlags flag, boolean value) {
+        if (value) {
+            config |= (1 << flag.ordinal());
+        } else {
+            config &= ~(1 << flag.ordinal());
+        }
         updateDB();
     }
 
@@ -486,7 +513,7 @@ public class SchematicNode {
 
     private void updateDB() {
         this.lastUpdate = Timestamp.from(Instant.now());
-        update.update(nodeName, parentNode, nodeItem, nodeType, nodeRank, replaceColor, allowReplay, nodeId);
+        update.update(nodeName, parentNode, nodeItem, nodeType, nodeRank, config, nodeId);
         TAB_CACHE.clear();
     }
 
@@ -608,4 +635,11 @@ public class SchematicNode {
         TAB_CACHE.computeIfAbsent(user.getId(), integer -> new HashMap<>()).putIfAbsent(cacheKey, list);
         return list;
     }
+
+    public static enum ConfigFlags {
+        REPLACE_COLOR,
+        ALLOW_REPLAY,
+        IS_PREPARED,
+        INVESTIGATION,
+    }
 }

CommonCore/SQL/src/de/steamwar/sql/UserPerm.java

@@ -54,13 +54,13 @@ public enum UserPerm {
         emptyPrefix = new Prefix("§7", "");
         p.put(PREFIX_NONE, emptyPrefix);
         p.put(PREFIX_YOUTUBER, new Prefix("§7", "YT"));
-        p.put(PREFIX_GUIDE, new Prefix("§a", "Guide")); // 55FF55
+        p.put(PREFIX_GUIDE, new Prefix("§x§E§5§F§F§8§4", "Guide")); // E5FF84
 
-        p.put(PREFIX_SUPPORTER, new Prefix("§x§3§4§0§0§f§f", "Sup")); // 3400ff
-        p.put(PREFIX_MODERATOR, new Prefix("§x§c§7§5§e§2§2", "Mod")); // C75E22
-        p.put(PREFIX_BUILDER, new Prefix("§2", "Arch")); // 00AA00
-        p.put(PREFIX_DEVELOPER, new Prefix("§3", "Dev")); // 00AAAA
-        p.put(PREFIX_ADMIN, new Prefix("§x§F§2§2§8§2§4", "Admin")); // F22824
+        p.put(PREFIX_SUPPORTER, new Prefix("§x§6§0§9§5§F§F", "Sup")); // 6095FF
+        p.put(PREFIX_MODERATOR, new Prefix("§x§F§F§A§2§5§0", "Mod")); // FFA250
+        p.put(PREFIX_BUILDER, new Prefix("§x§6§0§F§F§6§9", "Arch")); // 60FF69
+        p.put(PREFIX_DEVELOPER, new Prefix("§x§0§B§B§C§B§9", "Dev")); // 0BBCB9
+        p.put(PREFIX_ADMIN, new Prefix("§x§F§F§2§B§2§B", "Admin")); // FF2B2B
         prefixes = Collections.unmodifiableMap(p);
     }
 

FightSystem/FightSystem_14/src/de/steamwar/fightsystem/utils/WorldeditWrapper14.java

@@ -145,6 +145,6 @@ public class WorldeditWrapper14 implements WorldeditWrapper {
             throw new SecurityException(e);
         }
 
-        new SchematicData(schem).saveFromBytes(outputStream.toByteArray(), NodeData.SchematicFormat.SPONGE_V2);
+        SchematicData.saveFromBytes(schem, outputStream.toByteArray(), NodeData.SchematicFormat.SPONGE_V2);
     }
 }

FightSystem/FightSystem_8/src/de/steamwar/fightsystem/utils/WorldeditWrapper8.java

@@ -140,6 +140,6 @@ public class WorldeditWrapper8 implements WorldeditWrapper {
             throw new SecurityException(e);
         }
 
-        new SchematicData(schem).saveFromBytes(outputStream.toByteArray(), NodeData.SchematicFormat.MCEDIT);
+        SchematicData.saveFromBytes(schem, outputStream.toByteArray(), NodeData.SchematicFormat.MCEDIT);
     }
 }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/Config.java

@@ -108,6 +108,7 @@ public class Config {
     public static final boolean PercentEntern;
     public static final boolean PercentBlocksWhitelist;
     public static final Set<Material> PercentBlocks;
+    public static final int TechKoTime;
 
     //default kits
     public static final String MemberDefault;
@@ -209,6 +210,7 @@ public class Config {
         PercentEntern = config.getBoolean("WinConditionParams.PercentEntern", true);
         PercentBlocksWhitelist = config.getBoolean("WinConditionParams.BlocksWhitelist", false);
         PercentBlocks = Collections.unmodifiableSet(config.getStringList("WinConditionParams.Blocks").stream().map(Material::valueOf).collect(Collectors.toSet()));
+        TechKoTime = config.getInt("WinConditionParams.TechKoTime", 90);
 
         EnterStages = Collections.unmodifiableList(config.getIntegerList("EnterStages"));
         AllowMissiles = config.getBoolean("Arena.AllowMissiles", !EnterStages.isEmpty());

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java

@@ -41,6 +41,7 @@ import de.steamwar.fightsystem.states.StateDependentListener;
 import de.steamwar.fightsystem.utils.*;
 import de.steamwar.fightsystem.winconditions.*;
 import de.steamwar.message.Message;
+import de.steamwar.sql.NodeData;
 import de.steamwar.sql.SchematicNode;
 import lombok.Getter;
 import org.bukkit.Bukkit;
@@ -68,6 +69,11 @@ public class FightSystem extends JavaPlugin {
             Core.setInstance(this);
             TinyProtocol.init();
         }
+        if (Config.SpectatePort != 0) {
+            Core.setServerName("Spectate");
+        } else if (Config.ReplayID != 0) {
+            Core.setServerName("Replay");
+        }
 
         message = new Message("de.steamwar.fightsystem.FightSystem", FightSystem.class.getClassLoader());
 
@@ -126,6 +132,7 @@ public class FightSystem extends JavaPlugin {
         new WinconditionPointsAirShip();
         new WinconditionTimeout();
         new WinconditionTimeTechKO();
+        new WinconditionTimedDamageTechKO();
         new EventTeamOffWincondition();
         new WinconditionComparisonTimeout(Winconditions.HEART_RATIO_TIMEOUT, "HeartTimeout", "WIN_MORE_HEALTH", FightTeam::getHeartRatio);
         new WinconditionComparisonTimeout(Winconditions.PERCENT_TIMEOUT, "PercentTimeout", "WIN_LESS_DAMAGE", team -> -Wincondition.getPercentWincondition().getPercent(team));
@@ -173,11 +180,8 @@ public class FightSystem extends JavaPlugin {
             SchematicNode checkSchematicNode = SchematicNode.getSchematicNode(Config.CheckSchemID);
             Fight.getBlueTeam().setSchem(checkSchematicNode);
 
-            if (checkSchematicNode.getName().endsWith("-prepared")) {
-                SchematicNode unpreparedSchematicNode = SchematicNode.getSchematicNode(checkSchematicNode.getOwner(), checkSchematicNode.getName().substring(0, checkSchematicNode.getName().length() - 9), checkSchematicNode.getParent());
-                if (unpreparedSchematicNode != null) {
-                    Fight.getRedTeam().setSchem(unpreparedSchematicNode);
-                }
+            if (checkSchematicNode.isPrepared()) {
+                Fight.getRedTeam().setSchem(checkSchematicNode, NodeData.getRevisions(checkSchematicNode) - 1);
             }
 
             new TechareaCommand();

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.properties

@@ -191,6 +191,7 @@ BAR_POINTS_OF={0}§8/§7{1} §8Points
 BAR_PERCENT={0}§8%
 BAR_CANNONS={0} §8Cannons
 BAR_WATER={0} §8Water
+BAR_SECONDS={0}§8s
 
 
 # Winconditions

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/Fight.java

@@ -19,20 +19,14 @@
 
 package de.steamwar.fightsystem.fight;
 
-import com.comphenix.tinyprotocol.TinyProtocol;
-import com.mojang.authlib.GameProfile;
 import de.steamwar.core.Core;
-import de.steamwar.core.ProtocolWrapper;
 import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.Config;
-import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.record.GlobalRecorder;
 import lombok.Getter;
 import org.bukkit.Bukkit;
-import org.bukkit.GameMode;
 import org.bukkit.Sound;
 import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
 
 import java.util.Collection;
 import java.util.HashSet;

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java

@@ -31,6 +31,7 @@ import de.steamwar.fightsystem.states.StateDependent;
 import de.steamwar.fightsystem.utils.ColorConverter;
 import de.steamwar.fightsystem.utils.Region;
 import de.steamwar.fightsystem.utils.WorldeditWrapper;
+import de.steamwar.fightsystem.winconditions.Winconditions;
 import de.steamwar.sql.SchematicData;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SchematicType;
@@ -51,20 +52,28 @@ public class FightSchematic extends StateDependent {
 
     private final FightTeam team;
     private final Region region;
+
     private final boolean rotate;
+    @Getter
+    private boolean usedRotate;
 
     @Getter
     private Clipboard clipboard = null;
     private int schematic = 0;
 
-    public FightSchematic(FightTeam team, boolean rotate) {
+    public FightSchematic(FightTeam team, boolean usedRotate) {
         super(ArenaMode.All, FightState.PostSchemSetup);
         this.team = team;
         this.region = team.getSchemRegion();
-        this.rotate = rotate;
+        this.rotate = usedRotate;
+        this.usedRotate = usedRotate;
         register();
     }
 
+    public void setChangeRotate(boolean rotate) {
+        this.usedRotate = this.rotate ^ rotate;
+    }
+
     public boolean hasSchematic() {
         return clipboard != null;
     }
@@ -74,9 +83,13 @@ public class FightSchematic extends StateDependent {
     }
 
     public void setSchematic(SchematicNode schem) {
+        setSchematic(schem, -1);
+    }
+
+    public void setSchematic(SchematicNode schem, int revision) {
         schematic = schem.getId();
         try {
-            clipboard = new SchematicData(schem).load();
+            clipboard = new SchematicData(schem, revision).load();
 
             if(schem.replaceColor())
                 replaceTeamColor(clipboard);
@@ -119,10 +132,15 @@ public class FightSchematic extends StateDependent {
         }
 
         if(ArenaMode.AntiReplay.contains(Config.mode)) {
+            boolean changeRotation = false;
+            if (Config.ActiveWinconditions.contains(Winconditions.RANDOM_ROTATE)) {
+                changeRotation = new Random().nextBoolean();
+                usedRotate = rotate ^ changeRotation;
+            }
             if(team.isBlue())
-                GlobalRecorder.getInstance().blueSchem(schematic);
+                GlobalRecorder.getInstance().blueSchem(schematic, changeRotation);
             else
-                GlobalRecorder.getInstance().redSchem(schematic);
+                GlobalRecorder.getInstance().redSchem(schematic, changeRotation);
         }
 
         Bukkit.getScheduler().runTask(FightSystem.getPlugin(), this::paste);
@@ -140,7 +158,6 @@ public class FightSchematic extends StateDependent {
         FreezeWorld freezer = new FreezeWorld();
 
         team.teleportToSpawn();
-
         Vector dims = WorldeditWrapper.impl.getDimensions(clipboard);
         WorldeditWrapper.impl.pasteClipboard(
                 clipboard,
@@ -149,8 +166,8 @@ public class FightSchematic extends StateDependent {
                         Config.PasteAligned && Config.BlueToRedX != 0 ? region.getSizeX()/2.0 - dims.getBlockX() : -dims.getBlockX()/2.0,
                         Config.WaterDepth != 0 ? Config.WaterDepth - WorldeditWrapper.impl.getWaterDepth(clipboard) : 0,
                         Config.PasteAligned && Config.BlueToRedZ != 0 ? region.getSizeZ()/2.0 - dims.getBlockZ() : -dims.getBlockZ()/2.0
-                ).add(new Vector(rotate ? 1 : 0, 0, rotate ? 1 : 0)),
-                new AffineTransform().rotateY(rotate ? 180 : 0)
+                ).add(new Vector(usedRotate ? 1 : 0, 0, usedRotate ? 1 : 0)),
+                new AffineTransform().rotateY(usedRotate ? 180 : 0)
         );
         FightSystem.getHullHider().initialize(team);
         team.getPlayers().forEach(fightPlayer -> fightPlayer.ifAI(ai -> ai.schematic(clipboard)));

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java

@@ -412,7 +412,11 @@ public class FightTeam {
     }
 
     public void setSchem(SchematicNode schematic){
-        this.schematic.setSchematic(schematic);
+        setSchem(schematic, -1);
+    }
+
+    public void setSchem(SchematicNode schematic, int revision){
+        this.schematic.setSchematic(schematic, revision);
         broadcast("SCHEMATIC_CHOSEN", Config.GameName, schematic.getName());
     }
 
@@ -458,6 +462,10 @@ public class FightTeam {
         return schematic.getId();
     }
 
+    public void setSchematicChangeRotate(boolean rotate) {
+        schematic.setChangeRotate(rotate);
+    }
+
     public Clipboard getClipboard() {
         return schematic.getClipboard();
     }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/PrepareSchem.java

@@ -83,13 +83,8 @@ public class PrepareSchem implements Listener {
                     return;
                 }
 
-                if(schemExists(schem))
-                    return;
-
-                SchematicNode old = schem;
-                schem = SchematicNode.createSchematicNode(schem.getOwner(), preparedName(schem), schem.getParent(), Config.SchematicType.checkType().toDB(), schem.getItem());
-                schem.setReplaceColor(old.replaceColor());
-                schem.setAllowReplay(old.allowReplay());
+                schem.setSchemtype(Config.SchematicType.checkType());
+                schem.setPrepared(true);
 
                 try{
                     WorldeditWrapper.impl.saveSchem(schem, region, minY);
@@ -119,20 +114,5 @@ public class PrepareSchem implements Listener {
             FightState.setFightState(FightState.PRE_SCHEM_SETUP);
             FightState.setFightState(FightState.POST_SCHEM_SETUP);
         }
-
-        schemExists(SchematicNode.getSchematicNode(Config.PrepareSchemID));
-    }
-
-    private boolean schemExists(SchematicNode schem) {
-        if(SchematicNode.getSchematicNode(schem.getOwner(), preparedName(schem), schem.getParent()) != null) {
-            FightSystem.getMessage().broadcast("PREPARE_SCHEM_EXISTS");
-            Bukkit.shutdown();
-            return true;
-        }
-        return false;
-    }
-
-    private String preparedName(SchematicNode schem) {
-        return schem.getName() + "-prepared";
     }
 }

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java

@@ -20,7 +20,6 @@
 package de.steamwar.fightsystem.record;
 
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
-import de.steamwar.core.Core;
 import de.steamwar.core.TrickyTrialsWrapper;
 import de.steamwar.core.WorldEditWrapper;
 import de.steamwar.entity.REntity;
@@ -144,6 +143,8 @@ public class PacketProcessor implements Listener {
         packetDecoder[0xb2] = this::teams;
         packetDecoder[0xb3] = () -> pasteEmbeddedSchem(Fight.getBlueTeam());
         packetDecoder[0xb4] = () -> pasteEmbeddedSchem(Fight.getRedTeam());
+        packetDecoder[0xb5] = () -> rotateSchem(Fight.getBlueTeam());
+        packetDecoder[0xb6] = () -> rotateSchem(Fight.getRedTeam());
         packetDecoder[0xc0] = this::scoreboardTitle;
         packetDecoder[0xc1] = this::scoreboardData;
         packetDecoder[0xc2] = this::bossBar;
@@ -529,6 +530,14 @@ public class PacketProcessor implements Listener {
         execSync(() -> team.pasteSchem(schemId, clipboard));
     }
 
+    private void rotateSchem(FightTeam team) throws IOException {
+        boolean changeRotate = source.readBoolean();
+
+        execSync(() -> {
+            team.setSchematicChangeRotate(changeRotate);
+        });
+    }
+
     private void teams() throws IOException {
         int blueId = source.readInt();
         int redId = source.readInt();

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/Recorder.java

@@ -61,9 +61,9 @@ public interface Recorder {
     default void enableTeam(FightTeam team){
         if(FightState.Schem.contains(FightState.getFightState())){
             if(team.isBlue())
-                blueSchem(team.getSchematic());
+                blueSchem(team.getSchematic(), false);
             else
-                redSchem(team.getSchematic());
+                redSchem(team.getSchematic(), false);
         }
 
         if(FightState.AntiSpectate.contains(FightState.getFightState())){
@@ -123,6 +123,8 @@ public interface Recorder {
      * TeamIDPacket (0xb2) + int blueTeamId, redTeamId
      * BlueEmbeddedSchemPacket (0xb3) + int blueSchemId + gzipt NBT blob
      * RedEmbeddedSchemPacket (0xb4) + int redSchemId + gzipt NBT blob
+     * BlueSchemRotatePacket (0xb5) + boolean changeRotate
+     * RedSchemRotatePacket (0xb6) + boolean changeRotate
      *
      * DEPRECATED ScoreboardTitlePacket (0xc0) + String scoreboardTitle
      * DEPRECATED ScoreboardDataPacket (0xc1) + String key + int value
@@ -259,14 +261,20 @@ public interface Recorder {
         write(0xb2, blueTeamId, redTeamId);
     }
 
-    default void blueSchem(int schemId) {
+    default void blueSchem(int schemId, boolean changeRotate) {
+        rotate(0xb5, changeRotate);
         schem(0xb3, 0xb0, schemId);
     }
 
-    default void redSchem(int schemId) {
+    default void redSchem(int schemId, boolean changeRotate) {
+        rotate(0xb6, changeRotate);
         schem(0xb4, 0xb1, schemId);
     }
 
+    default void rotate(int packetId, boolean changeRotate) {
+        write(packetId, changeRotate);
+    }
+
     default void schem(int embedId, int noEmbedId, int schemId){
         if(schemId == 0) {
             write(noEmbedId, schemId);
@@ -275,7 +283,7 @@ public interface Recorder {
 
         ByteArrayOutputStream buffer = new ByteArrayOutputStream();
         try{
-            copy(NodeData.get(SchematicNode.getSchematicNode(schemId)).schemData(), buffer);
+            copy(NodeData.getLatest(SchematicNode.getSchematicNode(schemId)).schemData(), buffer);
         }catch (EOFException e) {
             Bukkit.getLogger().log(Level.INFO, "EOFException ignored");
         } catch (IOException e) {
@@ -339,6 +347,8 @@ public interface Recorder {
             stream.writeShort((Short)o);
         else if(o instanceof Integer)
             stream.writeInt((Integer)o);
+        else if(o instanceof Long)
+            stream.writeLong((Long)o);
         else if(o instanceof Float)
             stream.writeFloat((Float)o);
         else if(o instanceof Double)

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeTechKO.java

@@ -20,6 +20,7 @@
 package de.steamwar.fightsystem.winconditions;
 
 import de.steamwar.core.TrickyTrialsWrapper;
+import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.countdown.Countdown;
 import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightTeam;
@@ -30,7 +31,6 @@ import de.steamwar.fightsystem.states.StateDependentTask;
 import de.steamwar.fightsystem.utils.Message;
 import de.steamwar.fightsystem.utils.SWSound;
 import org.bukkit.Location;
-import org.bukkit.entity.EntityType;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityExplodeEvent;
@@ -41,8 +41,7 @@ import java.util.Map;
 
 public class WinconditionTimeTechKO extends Wincondition implements Listener {
 
-    private static final int TECH_KO_TIME_IN_S = 90;
-    private static final int TECH_KO_HALF_TIME = TECH_KO_TIME_IN_S/2;
+    private static final int TECH_KO_HALF_TIME = Config.TechKoTime/2;
 
     private final Map<Integer, FightTeam> spawnLocations = new HashMap<>();
     private final Map<FightTeam, TechKOCountdown> countdowns = new HashMap<>();

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimedDamageTechKO.java

@@ -0,0 +1,115 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.fightsystem.winconditions;
+
+import de.steamwar.core.TrickyTrialsWrapper;
+import de.steamwar.fightsystem.Config;
+import de.steamwar.fightsystem.countdown.Countdown;
+import de.steamwar.fightsystem.fight.Fight;
+import de.steamwar.fightsystem.fight.FightTeam;
+import de.steamwar.fightsystem.states.FightState;
+import de.steamwar.fightsystem.states.StateDependent;
+import de.steamwar.fightsystem.states.StateDependentListener;
+import de.steamwar.fightsystem.utils.Message;
+import de.steamwar.fightsystem.utils.SWSound;
+import org.bukkit.Location;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityExplodeEvent;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class WinconditionTimedDamageTechKO extends Wincondition implements PrintableWincondition, Listener {
+
+    private final Map<FightTeam, TechKOCountdown> countdowns = new HashMap<>();
+
+    public WinconditionTimedDamageTechKO() {
+        super("TechKO");
+
+        new StateDependentListener(Winconditions.TIMED_DAMAGE_TECH_KO, FightState.Running, this);
+        new StateDependent(Winconditions.TIMED_DAMAGE_TECH_KO, FightState.Running) {
+            @Override
+            public void enable() {
+                Fight.teams().forEach(team -> {
+                    TechKOCountdown countdown = new TechKOCountdown(team, Config.TechKoTime);
+                    countdowns.put(team, countdown);
+                    countdown.enable();
+                });
+            }
+
+            @Override
+            public void disable() {
+                countdowns.values().forEach(Countdown::disable);
+                countdowns.clear();
+            }
+        }.register();
+    }
+
+    @Override
+    public Message getDisplay(FightTeam team) {
+        return new Message("BAR_SECONDS", team.getPrefix() + countdowns.get(team).getTimeLeft());
+    }
+
+    @EventHandler
+    public void onExplode(EntityExplodeEvent e) {
+        if (e.getEntityType() != TrickyTrialsWrapper.impl.getTntEntityType())
+            return;
+
+        Location location = e.getLocation();
+        TechKOCountdown countdown = null;
+        FightTeam fightTeam = null;
+        for (FightTeam team : Fight.teams()) {
+            FightTeam current = Fight.getOpposite(team);
+            if (current.getExtendRegion().inRegion(location)) {
+                fightTeam = current;
+                countdown = countdowns.get(team);
+                break;
+            }
+        }
+        if (fightTeam == null) {
+            return;
+        }
+
+        FightTeam finalFightTeam = fightTeam;
+        TechKOCountdown finalCountdown = countdown;
+        e.blockList().forEach(block -> {
+            if (block.isEmpty()) return;
+            if (finalFightTeam.getExtendRegion().inRegion(block)) {
+                finalCountdown.disable();
+                finalCountdown.enable();
+            }
+        });
+    }
+
+    private class TechKOCountdown extends Countdown {
+        private final FightTeam team;
+
+        public TechKOCountdown(FightTeam team, int countdownTime) {
+            super(countdownTime, new Message("TECHKO_COUNTDOWN", team.getColoredName()), SWSound.BLOCK_NOTE_PLING, false);
+            this.team = team;
+        }
+
+        @Override
+        public void countdownFinished() {
+            win(Fight.getOpposite(team), "WIN_TECHKO", team.getColoredName());
+        }
+    }
+}

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/Winconditions.java

@@ -31,6 +31,7 @@ public enum Winconditions {
     POINTS,
     POINTS_AIRSHIP,
 
+    TIMED_DAMAGE_TECH_KO,
     TIME_TECH_KO,
     WATER_TECH_KO,
     PUMPKIN_TECH_KO,
@@ -41,4 +42,5 @@ public enum Winconditions {
     PERSISTENT_DAMAGE,
     TNT_DISTRIBUTION,
     NO_GRAVITY,
+    RANDOM_ROTATE,
 }

LegacyBauSystem/src/de/steamwar/bausystem/BauSystem.java

@@ -53,6 +53,7 @@ public class BauSystem extends JavaPlugin implements Listener {
 
     @Override
     public void onEnable() {
+        Core.setServerName("Dev");
         plugin = this;
 
         Mapper.init();

LegacyBauSystem/src/de/steamwar/bausystem/world/ClipboardListener.java

@@ -53,7 +53,7 @@ public class ClipboardListener implements Listener {
         }
 
         try {
-            new SchematicData(schematic).saveFromPlayer(e.getPlayer());
+            SchematicData.saveFromPlayer(e.getPlayer(), schematic);
         } catch (Exception ex) {
             if (newSchem) {
                 schematic.delete();

LobbySystem/src/de/steamwar/lobby/LobbySystem.java

@@ -19,6 +19,7 @@
 
 package de.steamwar.lobby;
 
+import de.steamwar.core.Core;
 import de.steamwar.entity.REntityServer;
 import de.steamwar.lobby.command.FlyCommand;
 import de.steamwar.lobby.command.HologramCommand;
@@ -52,6 +53,7 @@ public class LobbySystem extends JavaPlugin {
         message = new Message("de.steamwar.lobby.LobbySystem", getClassLoader());
         entityServer = new REntityServer();
         debugEntityServer = new REntityServer();
+        Core.setServerName("Lobby");
 
         CustomMap.init();
 

SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java

@@ -20,7 +20,6 @@
 package de.steamwar.schematicsystem.autocheck;
 
 import com.sk89q.jnbt.CompoundTag;
-import com.sk89q.jnbt.Tag;
 import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import com.sk89q.worldedit.math.BlockVector3;
@@ -97,7 +96,6 @@ public class AutoChecker15 implements AutoChecker.IAutoChecker {
 
         int counter = 0;
         for(CompoundTag item : items){
-            System.out.println(item.getValue());
             if(!item.containsKey("id")){
                 result.getDefunctNbt().add(pos);
                 continue;
@@ -114,14 +112,6 @@ public class AutoChecker15 implements AutoChecker.IAutoChecker {
             }
             if (item.containsKey("tag")) {
                 result.getForbiddenNbt().computeIfAbsent(pos, blockVector3 -> new HashSet<>()).add(itemType);
-            } else if (item.containsKey("components")) {
-                if (item.getValue().get("components") instanceof CompoundTag) {
-                    CompoundTag components = (CompoundTag) item.getValue().get("components");
-                    if (components.getValue().size() > 1) {
-                        result.getForbiddenNbt().computeIfAbsent(pos, blockVector3 -> new HashSet<>()).add(itemType);
-                    } else if (components.getValue().size() == 1){
-                    }
-                }
             }
         }
         result.getDispenserItems().put(pos, counter);

SchematicSystem/SchematicSystem_Core/src/SchematicSystem.properties

@@ -26,6 +26,7 @@ CLICK_DRAG_ITEM=§7Click or drag item here
 CURRENT=§7Current: {0}
 CONFIRM=§aConfirm
 CANCEL=§cCancel
+BLANK={0}
 
 UTIL_NAME_REQUIRED=§cFolder name required
 UTIL_NAME_TOO_LONG=§cSchematic name too long
@@ -49,6 +50,7 @@ UTIL_LIST_NEXT=Page ({0}/{1}) »»
 UTIL_LIST_NEXT_HOVER=§eNext page
 UTIL_INFO_SCHEM=§7Schematic: §e{0}
 UTIL_INFO_NAME=§7Name: §e{0}
+UTIL_INFO_REVISIONS=§7Revisions: §e{0}
 UTIL_INFO_OWNER=§7Owner: §e{0}
 UTIL_INFO_PARENT=§7Directory: §e{0}
 UTIL_INFO_UPDATED=§7Last update: §e{0}
@@ -70,6 +72,7 @@ UTIL_INFO_ACTION_TYPE_HOVER=§eChange schematic type
 UTIL_INFO_ACTION_ADD_HOVER=§eAdd member
 UTIL_INFO_ACTION_REMOVE_HOVER=§eRemove {0}
 UTIL_INFO_ACTION_MOVE_HOVER=§eMove schematic
+UTIL_INFO_ACTION_REVISIONS_HOVER=§eList revisions
 UTIL_INFO_ACTION_RENAME_HOVER=§eRename schematic
 UTIL_INFO_ACTION_DELETE=(Delete) 
 UTIL_INFO_ACTION_DELETE_HOVER=§eDelete schematic
@@ -79,6 +82,7 @@ UTIL_LOAD_DIR=§cYou cannot load folders
 UTIL_LOAD_DONE=§7Schematic §e{0} loaded
 UTIL_LOAD_NO_DATA=§cNo data could be found in the Schematic
 UTIL_LOAD_ERROR=§cThe schematic could not be loaded
+UTIL_LOAD_ILLEGAL_REVISION=§cThe schematic doesn't have {0} revisions
 UTIL_DOWNLOAD_PUNISHED=§cYou are not allowed to download schematics: §f§l{0}
 UTIL_DOWNLOAD_NOT_OWN=§cYou may download only your own schematics
 UTIL_DOWNLOAD_LINK=Your download link:
@@ -224,6 +228,9 @@ GUI_DELETE_MEMBER_TITLE=Remove {0}
 GUI_DELETE_MEMBER_DONE=Access to Schematic §e{0} §7removed
 GUI_DELETE_MEMBERS_TITLE=Remove members
 GUI_CHANGE_ITEM=Change item
+GUI_LOAD_LATEST=§eLeft §7Click → §eLoad latest
+GUI_LOAD_REVISION=§eRight §7Click → §eList Revisions
+GUI_LOAD_REVISION_TITLE=Select Revision
 
 AUTO_CHECK_RESULT_NOT_LOAD=The schematic could not be loaded
 AUTO_CHECK_RESULT_TOO_WIDE=The schematic is too wide ({0} > {1})
@@ -263,4 +270,8 @@ AUTO_CHECKER_RESULT_RECORD=§7Record: §c[{0}, {1}, {2}]
 AUTO_CHECKER_RESULT_TOO_MANY_DISPENSER_ITEMS=§7Dispenser: §c[{0}, {1}, {2}]§7, §c{3} §7items, Max: §e{4}
 AUTO_CHECKER_RESULT_FORBIDDEN_ITEM_NBT=§7Forbidden Item NBT: [{0}, {1}, {2}] -> §c{3}
 AUTO_CHECKER_RESULT_TELEPORT_HERE=§7Teleport to block
-AUTO_CHECKER_RESULT_AFTER_DEADLINE=§cThe deadline has expired: {0}
+AUTO_CHECKER_RESULT_AFTER_DEADLINE=§cThe deadline has expired: {0}
+
+REVISIONS_TITLE=§7Revisions:
+REVISIONS_REVISION_NUMBER=§7#{0}: §e{1}
+REVISIONS_EMPTY=§cNo Revisions

SchematicSystem/SchematicSystem_Core/src/SchematicSystem_de.properties

@@ -90,6 +90,9 @@ UTIL_SUBMIT_DIRECT=§eDirekt einsenden
 UTIL_SUBMIT_DIRECT_DONE=§aDie Schematic wird zeitnah überprüft
 UTIL_SUBMIT_EXTEND=§eSchematic ausfahren
 UTIL_SUBMIT_EXTEND_DONE=§aDer Vorbereitungsserver wird gestartet
+UTIL_INFO_ACTION_REVISIONS_HOVER=§eVersionen anzeigen
+UTIL_LOAD_ILLEGAL_REVISION=§cDie schematic hat nicht {0} Versionen
+UTIL_INFO_REVISIONS=§7Versionen: §e{0}
 
 COMMAND_INVALID_NODE=§cDie Schematic konnte nicht gefunden werden
 COMMAND_NOT_OWN=§cDas darfst du nur bei deinen eigenen Schematics machen
@@ -204,6 +207,9 @@ GUI_DELETE_MEMBER_TITLE={0} entfernen
 GUI_DELETE_MEMBER_DONE=Zugriff zu Schematic §e{0} §7entfernt
 GUI_DELETE_MEMBERS_TITLE=Mitglieder entfernen
 GUI_CHANGE_ITEM=Item ändern
+GUI_LOAD_LATEST=§eLinks §7Klick → §eLetzte Laden
+GUI_LOAD_REVISION=§eRechts §7Klick → §eVersionen anzeigen
+GUI_LOAD_REVISION_TITLE=Version Laden
 
 AUTO_CHECK_RESULT_NOT_LOAD=Die Schematic konnte nicht geladen werden
 AUTO_CHECK_RESULT_TOO_WIDE=Die Schematic ist zu breit ({0} > {1})
@@ -242,4 +248,7 @@ AUTO_CHECKER_RESULT_RECORD=§7Schallplatte: §c[{0}, {1}, {2}]
 AUTO_CHECKER_RESULT_TOO_MANY_DISPENSER_ITEMS=§7Dispenser: §c[{0}, {1}, {2}]§7, §c{3} §7gegenstände, Max: §e{4}
 AUTO_CHECKER_RESULT_FORBIDDEN_ITEM_NBT=§7Verbotene NBT-Daten: [{0}, {1}, {2}] -> §c{3}
 AUTO_CHECKER_RESULT_TELEPORT_HERE=§7Zum block teleportieren
-AUTO_CHECKER_RESULT_AFTER_DEADLINE=§cDer einsendeschluss ist bereits vorbei: {0}
+AUTO_CHECKER_RESULT_AFTER_DEADLINE=§cDer einsendeschluss ist bereits vorbei: {0}
+
+REVISIONS_TITLE=§7Versionen:
+REVISIONS_EMPTY=§cKeine Versionen

SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/DownloadCommand.java

@@ -43,7 +43,7 @@ public class DownloadCommand extends SWCommand {
         }
 
         try {
-            new SchematicData(copyNode).saveFromPlayer(player);
+            SchematicData.saveFromPlayer(player, copyNode);
         } catch (IOException e) {
             SchematicSystem.MESSAGE.send("DOWNLOAD_ERROR", player);
             if (newSchem) {

SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/GUI.java

@@ -95,9 +95,28 @@ public class GUI {
         SteamwarUser user = getUser(player);
         SWInventory inv = new SWInventory(player, 9 * 2, node.generateBreadcrumbs());
         if(!node.isDir()) {
-            inv.setItem(0, SWItem.getMaterial("WOOD_AXE"), SchematicSystem.MESSAGE.parse("GUI_INFO_LOAD", player), click -> {
-                player.closeInventory();
-                SchematicCommandUtils.loadSchem(player, node);
+            inv.setItem(0, SWItem.getMaterial("WOOD_AXE"), SchematicSystem.MESSAGE.parse("GUI_INFO_LOAD", player), Arrays.asList(
+                    SchematicSystem.MESSAGE.parse("GUI_LOAD_LATEST", player),
+                    SchematicSystem.MESSAGE.parse("GUI_LOAD_REVISION", player)
+            ), false, click -> {
+                if (click.isLeftClick()) {
+                    player.closeInventory();
+                    SchematicCommandUtils.loadSchem(player, node, -1);
+                } else if (click.isRightClick()) {
+                    List<SWListInv.SWListEntry<Integer>> entries = new ArrayList<>();
+                    List<NodeData> datas = NodeData.get(node);
+                    for (int i = 0; i < datas.size(); i++) {
+                        entries.add(new SWListInv.SWListEntry<>(new SWItem(SWItem.getMaterial(node.getItem()), "§e" + SchematicSystem.MESSAGE.parse("BLANK", player, datas.get(i).getCreatedAt())), i));
+                    }
+
+                    SWListInv<Integer> listInv = new SWListInv<>(player, SchematicSystem.MESSAGE.parse("GUI_LOAD_REVISION_TITLE", player, node.generateBreadcrumbs()), entries, (clickType, revision) -> {
+                        if(revision == null) return;
+                        player.closeInventory();
+                        SchematicCommandUtils.loadSchem(player, node, revision);
+                    });
+                    listInv.setCallback(-999, click2 -> player.closeInventory());
+                    listInv.open();
+                }
             });
         }
 
@@ -106,7 +125,7 @@ public class GUI {
         }).setCustomModelData(CMDs.Schematic.BACK));
 
         if(node.getOwner() == user.getId()){
-            if(!node.isDir() && node.getSchemtype().writeable()){
+            if(!node.isDir() && node.getSchemtype().writeable() && !node.isInvestigation()){
                 CheckedSchematic.getLastDeclinedOfNode(node.getId()).stream().findFirst().ifPresent(checkedSchematic ->
                         inv.setItem(1, SWItem.getDye(10), (byte) 10, SchematicSystem.MESSAGE.parse("GUI_INFO_STATUS", player, node.getSchemtype().name()), Collections.singletonList(SchematicSystem.MESSAGE.parse("GUI_INFO_STATUS_LORE", player, checkedSchematic.getDeclineReason().replaceAll("&", "§"))), false, click -> {}));
             }

SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/SchematicCommandUtils.java

@@ -223,6 +223,11 @@ public class SchematicCommandUtils {
         } else {
             SchematicSystem.MESSAGE.sendPrefixless("UTIL_INFO_PARENT", player, node.getParent() == null ? "/" : node.getParentNode().generateBreadcrumbs());
         }
+        player.spigot().sendMessage(
+                new ComponentBuilder(SchematicSystem.MESSAGE.parseToComponent("UTIL_INFO_REVISIONS", false, player, NodeData.getRevisions(node)))
+                        .event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TextComponent[] {SchematicSystem.MESSAGE.parseToComponent("UTIL_INFO_ACTION_REVISIONS_HOVER", false, player)}))
+                        .event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/schem revisions " + node.generateBreadcrumbs()))
+                        .create());
         SchematicSystem.MESSAGE.sendPrefixless("UTIL_INFO_UPDATED", player, node.getLastUpdate());
         if (!node.isDir()) {
             if(node.getOwner() == user.getId()) {
@@ -246,7 +251,9 @@ public class SchematicCommandUtils {
             }
 
             SchematicSystem.MESSAGE.sendPrefixless("UTIL_INFO_FORMAT", player, node.getFileEnding());
-            CheckedSchematic.getLastDeclinedOfNode(node.getId()).stream().findFirst().ifPresent(checkedSchematic -> SchematicSystem.MESSAGE.sendPrefixless("UTIL_INFO_STATUS", player, checkedSchematic.getEndTime(), checkedSchematic.getDeclineReason()));
+            if (!node.isInvestigation()) {
+                CheckedSchematic.getLastDeclinedOfNode(node.getId()).stream().findFirst().ifPresent(checkedSchematic -> SchematicSystem.MESSAGE.sendPrefixless("UTIL_INFO_STATUS", player, checkedSchematic.getEndTime(), checkedSchematic.getDeclineReason()));
+            }
         } else {
             SchematicSystem.MESSAGE.sendPrefixless("UTIL_INFO_TYPE", player, SchematicSystem.MESSAGE.parse("UTIL_INFO_TYPE_DIR", player));
         }
@@ -357,7 +364,7 @@ public class SchematicCommandUtils {
         PUBLIC_TOGGLED.remove(player);
     }
 
-    public static void loadSchem(Player player, SchematicNode node) {
+    public static void loadSchem(Player player, SchematicNode node, int revision) {
         SteamwarUser user = getUser(player);
         if(BauServerInfo.isBauServer() && BauServerInfo.getOwnerId() != user.getId() &&
                 (Punishment.isPunished(user, Punishment.PunishmentType.NoSchemSharing, punishment ->
@@ -372,11 +379,13 @@ public class SchematicCommandUtils {
         }
 
         try {
-            new SchematicData(node).loadToPlayer(player);
+            new SchematicData(node, revision).loadToPlayer(player);
             SchematicSystem.MESSAGE.send("UTIL_LOAD_DONE", player, node.getName());
             Bukkit.getLogger().log(Level.INFO, "{0} has loaded Schematic {1} {2}", new Object[]{player.getName(), node.getId(), node.getName()});
         } catch (NoClipboardException e) {
             SchematicSystem.MESSAGE.send("UTIL_LOAD_NO_DATA", player);
+        } catch (IllegalArgumentException e) {
+            SchematicSystem.MESSAGE.send("UTIL_LOAD_ILLEGAL_REVISION", player, revision);
         } catch (Exception e) {
             SchematicSystem.MESSAGE.send("UTIL_LOAD_ERROR", player);
             Bukkit.getLogger().log(Level.INFO, e.getMessage(), e);
@@ -421,6 +430,8 @@ public class SchematicCommandUtils {
             return;
         }
 
+        node.setPrepared(false);
+
         if (type.writeable()) {
             node.setSchemtype(type);
             SchematicSystem.MESSAGE.send("UTIL_TYPE_DONE", player);
@@ -483,7 +494,7 @@ public class SchematicCommandUtils {
             node.setAllowReplay(!node.allowReplay());
             submitSchemGUI(player, node, type);
         });
-        inv.setItem(1, SWItem.getMaterial(node.replaceColor() ? "PINK_WOOL" : "LIGHT_GRAY_WOOL"), SchematicSystem.MESSAGE.parse(node.allowReplay()?"UTIL_SUBMIT_COLOR_ON":"UTIL_SUBMIT_COLOR_OFF", player), click -> {
+        inv.setItem(1, SWItem.getMaterial(node.replaceColor() ? "PINK_WOOL" : "LIGHT_GRAY_WOOL"), SchematicSystem.MESSAGE.parse(node.replaceColor()?"UTIL_SUBMIT_COLOR_ON":"UTIL_SUBMIT_COLOR_OFF", player), click -> {
             node.setReplaceColor(!node.replaceColor());
             submitSchemGUI(player, node, type);
         });

SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/SavePart.java

@@ -49,11 +49,11 @@ public class SavePart extends SWCommand {
         SchematicSelector selector = new SchematicSelector(player, SchematicSelector.selectSchematicNode(), schematicNode -> {
             if(schematicNode == null || schematicNode.isDir()) {
                 SWAnvilInv anvilInv = new SWAnvilInv(player, SchematicSystem.MESSAGE.parse("COMMAND_ENTER_NAME", player));
-                anvilInv.setCallback(s -> saveSchem(player, schematicNode==null?s:(schematicNode.generateBreadcrumbs() + s), true));
+                anvilInv.setCallback(s -> saveSchem(player, schematicNode==null?s:(schematicNode.generateBreadcrumbs() + s)));
                 anvilInv.setItem(Material.CAULDRON);
                 anvilInv.open();
             } else {
-                saveSchem(player, schematicNode.generateBreadcrumbs(), true);
+                saveSchem(player, schematicNode.generateBreadcrumbs());
             }
         });
         selector.setSingleDirOpen(false);
@@ -62,7 +62,7 @@ public class SavePart extends SWCommand {
 
     @Register("save")
     @Register("s")
-    public void saveSchem(Player player, @AbstractSWCommand.Mapper("stringMapper") String name, @AbstractSWCommand.StaticValue(value = {"", "-f"}, allowISE=true) @AbstractSWCommand.OptionalValue("") boolean overwrite) {
+    public void saveSchem(Player player, @AbstractSWCommand.Mapper("stringMapper") String name) {
         SteamwarUser user = getUser(player);
         if(BauServerInfo.isBauServer() && BauServerInfo.getOwnerId() != user.getId() &&
                 (Punishment.isPunished(user, Punishment.PunishmentType.NoSchemReceiving, punishment ->
@@ -88,9 +88,6 @@ public class SavePart extends SWCommand {
             } else if (!node.getSchemtype().writeable() || node.getOwner() != user.getId()) {
                 SchematicSystem.MESSAGE.send("COMMAND_SAVE_NO_OVERWRITE", player);
                 return;
-            } else if(!overwrite) {
-                SchematicSystem.MESSAGE.send("COMMAND_SAVE_OVERWRITE_CONFIRM", player, SchematicSystem.MESSAGE.parse("COMMAND_SAVE_OVERWRITE_CONFIRM_HOVER", player), new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/schem s " + name + " -f"), node.generateBreadcrumbs());
-                return;
             }
         }
 
@@ -101,7 +98,7 @@ public class SavePart extends SWCommand {
         }
 
         try {
-            new SchematicData(node).saveFromPlayer(player);
+            SchematicData.saveFromPlayer(player, node);
         } catch (NoClipboardException e) {
             SchematicSystem.MESSAGE.send("COMMAND_SAVE_CLIPBOARD_EMPTY", player);
             if (newSchem)

SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/ViewPart.java

@@ -21,13 +21,23 @@ package de.steamwar.schematicsystem.commands.schematiccommand.parts;
 
 import de.steamwar.command.AbstractSWCommand;
 import de.steamwar.command.SWCommand;
+import de.steamwar.schematicsystem.SchematicSystem;
 import de.steamwar.schematicsystem.commands.schematiccommand.GUI;
 import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils;
 import de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommand;
+import de.steamwar.sql.NodeData;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SteamwarUser;
+import net.md_5.bungee.api.chat.ClickEvent;
+import net.md_5.bungee.api.chat.ComponentBuilder;
+import net.md_5.bungee.api.chat.HoverEvent;
+import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
+import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
+import java.util.List;
+
 import static de.steamwar.schematicsystem.commands.schematiccommand.SchematicCommandUtils.*;
 
 @AbstractSWCommand.PartOf(SchematicCommand.class)
@@ -69,6 +79,25 @@ public class ViewPart extends SWCommand {
         printSchemInfo(player, node);
     }
 
+    @Register("revisions")
+    public void revisions(Player player, @Validator("isSchemValidator") SchematicNode node) {
+        List<NodeData> revisions = NodeData.get(node);
+        if(revisions.isEmpty()) {
+            SchematicSystem.MESSAGE.send("REVISIONS_EMPTY", player);
+            return;
+        }
+
+        SchematicSystem.MESSAGE.send("REVISIONS_TITLE", player);
+        for (int j = Math.max(0, revisions.size() - 10); j < revisions.size(); j++) {
+            player.spigot().sendMessage(
+                    new ComponentBuilder(SchematicSystem.MESSAGE.parseToComponent("REVISIONS_REVISION_NUMBER", false, player, j + 1, revisions.get(j).getCreatedAt()))
+                            .event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/schem load " + (node.getOwner() == 0 ? "public " : "") + node.generateBreadcrumbs() + " " + (j + 1)))
+                            .event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TextComponent[]{SchematicSystem.MESSAGE.parseToComponent("UTIL_INFO_ACTION_LOAD_HOVER", false, player)}))
+                            .create()
+            );
+        }
+    }
+
     @Register(value = "page", noTabComplete = true)
     public void pageCommand(Player player, int page) {
         cachedSchemList(player, page);
@@ -76,14 +105,14 @@ public class ViewPart extends SWCommand {
 
     @Register({"l", "public"})
     @Register({"load", "public"})
-    public void loadSchemPublic(Player player,  @Validator("isSchemValidator") @Mapper("publicMapper") SchematicNode node) {
-        loadSchem(player, node);
+    public void loadSchemPublic(Player player,  @Validator("isSchemValidator") @Mapper("publicMapper") SchematicNode node, @OptionalValue("-1") int revision) {
+        loadSchem(player, node, revision);
     }
 
     @Register("l")
     @Register("load")
-    public void loadSchem(Player player, @Validator("isSchemValidator") SchematicNode node) {
-        SchematicCommandUtils.loadSchem(player, node);
+    public void loadSchem(Player player, @Validator("isSchemValidator") SchematicNode node, @OptionalValue("-1") int revision) {
+        SchematicCommandUtils.loadSchem(player, node, revision);
     }
 
     @Register("gui")
@@ -92,7 +121,7 @@ public class ViewPart extends SWCommand {
     }
 
     @Register("download")
-    public void download(Player player, @Validator("isOwnerSchematicValidator") SchematicNode node) {
+    public void download(Player player, @Validator("isSchemValidator") SchematicNode node) {
         SchematicCommandUtils.download(player, node);
     }
 }

SpigotCore/SpigotCore_14/src/de/steamwar/core/WorldEditWrapper14.java

@@ -507,15 +507,6 @@ public class WorldEditWrapper14 implements WorldEditWrapper {
                 BlockVector3 offset = BlockVector3.at(offsetX, offsetY, offsetZ);
                 origin = min.subtract(offset);
                 region = new CuboidRegion(min, min.add(width, height, length).subtract(BlockVector3.ONE));
-            } else if (metadataTag != null && metadataTag.containsKey("WorldEdit")){
-                CompoundTag weMeta = requireTag(metadataTag.getValue(), "WorldEdit", CompoundTag.class);
-                int[] off = requireTag(weMeta.getValue(), "Origin", IntArrayTag.class).getValue();
-                if (off.length != 3) {
-                    throw new IOException("Invalid offset specified in schematic.");
-                }
-
-                origin = BlockVector3.at(off[0], off[1], off[2]);
-                region = new CuboidRegion(min.add(origin), min.add(origin).add(width, height, length).subtract(BlockVector3.ONE));
             } else {
                 origin = min;
                 region = new CuboidRegion(origin, origin.add(width, height, length).subtract(BlockVector3.ONE));

SpigotCore/SpigotCore_Main/src/de/steamwar/command/CaseInsensitiveCommandsListener.java

@@ -19,6 +19,10 @@
 
 package de.steamwar.command;
 
+import de.steamwar.core.Core;
+import de.steamwar.providers.BauServerInfo;
+import de.steamwar.sql.AuditLog;
+import de.steamwar.sql.SteamwarUser;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -31,5 +35,6 @@ public class CaseInsensitiveCommandsListener implements Listener {
         String[] strings = event.getMessage().split(" ");
         strings[0] = strings[0].toLowerCase();
         event.setMessage(String.join(" ", strings));
+        AuditLog.createCommand(Core.getServerName(), BauServerInfo.getOwnerUser(), SteamwarUser.get(event.getPlayer().getUniqueId()), event.getMessage());
     }
 }

SpigotCore/SpigotCore_Main/src/de/steamwar/core/CheckpointUtilsJ9.java

@@ -94,6 +94,7 @@ class CheckpointUtilsJ9 {
     private static final Reflection.Method bind = Reflection.getMethod(TinyProtocol.serverConnection, null, InetAddress.class, int.class);
     private static void freezeInternal(Path path) throws Exception {
         Bukkit.getPluginManager().callEvent(new CRIUSleepEvent());
+
         Bukkit.getWorlds().forEach(FlatteningWrapper.impl::syncSave);
         Statement.closeAll();
 
@@ -119,8 +120,9 @@ class CheckpointUtilsJ9 {
             criu.checkpointJVM();
         } catch (JVMCRIUException e) {
             Path logfile = path.resolve("criu.log");
-            if(logfile.toFile().exists())
+            if(logfile.toFile().exists()) {
                 throw new IllegalStateException("Could not create checkpoint, criu log:\n" + new String(Files.readAllBytes(logfile)), e);
+            }
 
             throw e;
         }

SpigotCore/SpigotCore_Main/src/de/steamwar/core/Core.java

@@ -33,6 +33,8 @@ import de.steamwar.network.handlers.ServerDataHandler;
 import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.internal.Statement;
+import lombok.Getter;
+import lombok.Setter;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.event.Listener;
@@ -52,12 +54,17 @@ public class Core extends JavaPlugin {
 		return Reflection.MAJOR_VERSION;
 	}
 
+	@Getter
+	@Setter
 	private static JavaPlugin instance;
-	public static JavaPlugin getInstance() {
-		return instance;
-	}
-	public static void setInstance(JavaPlugin instance) {
-		Core.instance = instance;
+
+	@Getter
+	private static String serverName = "";
+
+	public static void setServerName(String serverName) {
+		if (serverName.isEmpty()) {
+			Core.serverName = serverName;
+		}
 	}
 
 	private ErrorHandler errorHandler;
@@ -66,6 +73,7 @@ public class Core extends JavaPlugin {
 	@Override
 	public void onLoad() {
 		setInstance(this);
+		serverName = System.getProperty("serverName", "");
 	}
 	
 	@Override

SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/PlayerJoinedEvent.java

@@ -19,6 +19,9 @@
 
 package de.steamwar.core.events;
 
+import de.steamwar.core.Core;
+import de.steamwar.providers.BauServerInfo;
+import de.steamwar.sql.AuditLog;
 import de.steamwar.sql.SteamwarUser;
 import de.steamwar.sql.UserPerm;
 import de.steamwar.sql.internal.Statement;
@@ -44,12 +47,14 @@ public class PlayerJoinedEvent implements Listener{
 			player.setDisplayName(prefix.getColorCode() + player.getName() + "§r");
 
 		event.setJoinMessage("§a§l» §r" + player.getDisplayName());
+		AuditLog.createJoin(Core.getServerName(), BauServerInfo.getOwnerUser(), user);
 	}
 	
-	@EventHandler
+	@EventHandler(priority = EventPriority.LOWEST)
 	private void onQuit(PlayerQuitEvent event) {
 		Player player = event.getPlayer();
 
 		event.setQuitMessage("§c§l« §r" + player.getDisplayName());
+		AuditLog.createLeave(Core.getServerName(), BauServerInfo.getOwnerUser(), SteamwarUser.get(player.getUniqueId()));
 	}
 }

SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntityServer.java

@@ -50,11 +50,11 @@ public class REntityServer implements Listener {
     private static final Class<?> useEntity = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundInteractPacket");
     private static final Reflection.Field<Integer> useEntityTarget = Reflection.getField(useEntity, int.class, 0);
     private static final Class<?> useEntityEnumAction = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundInteractPacket$Action");
-    private static final Class<?> useEntityEnumActionType = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundInteractPacket$ActionType");
     private static final Reflection.Field<?> useEntityAction = Reflection.getField(useEntity, useEntityEnumAction, 0);
     private static final Function<Object, Integer> getEntityAction;
     static {
         if(Core.getVersion() > 15) {
+            Class<?> useEntityEnumActionType = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundInteractPacket$ActionType");
             Reflection.Method useEntityGetAction = Reflection.getTypedMethod(useEntityEnumAction, null, useEntityEnumActionType);
             getEntityAction = value -> ((Enum<?>) useEntityGetAction.invoke(value)).ordinal();
         } else {

SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWInventory.java

@@ -20,7 +20,9 @@
 package de.steamwar.inventory;
 
 import de.steamwar.core.Core;
-import de.steamwar.core.TrickyTrialsWrapper;
+import de.steamwar.providers.BauServerInfo;
+import de.steamwar.sql.AuditLog;
+import de.steamwar.sql.SteamwarUser;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -145,6 +147,7 @@ public class SWInventory implements Listener {
             Bukkit.getPluginManager().registerEvents(this, Core.getInstance());
             open = true;
         }
+        AuditLog.createGuiOpen(Core.getServerName(), BauServerInfo.getOwnerUser(), SteamwarUser.get(player.getUniqueId()), title);
     }
 
     @EventHandler
@@ -156,6 +159,7 @@ public class SWInventory implements Listener {
             e.setCancelled(true);
             Core.getInstance().getLogger().info("[SWINV] " + e.getWhoClicked().getName() + " " + e.getClick().name() + " clicked " + e.getRawSlot() + " on " + (e.getCurrentItem() != null ? e.getCurrentItem().getItemMeta().getDisplayName() : "[EMPTY]") + " in " + e.getView().getTitle());
             callbacks.get(e.getRawSlot()).accept(e);
+            AuditLog.createGuiClick(Core.getServerName(), BauServerInfo.getOwnerUser(), SteamwarUser.get(player.getUniqueId()), e.getView().getTitle(), e.getClick().name(), e.getRawSlot(), (e.getCurrentItem() != null ? e.getCurrentItem().getItemMeta().getDisplayName() : "[EMPTY]"));
         }
     }
 
@@ -167,8 +171,10 @@ public class SWInventory implements Listener {
         InventoryClickEvent.getHandlerList().unregister(this);
         InventoryCloseEvent.getHandlerList().unregister(this);
         Core.getInstance().getLogger().info("[SWINV] " + player.getName() + " closed " + title);
-        if(callbacks.containsKey(-1))
+        if(callbacks.containsKey(-1)) {
             callbacks.get(-1).accept(null);
+        }
         open = false;
+        AuditLog.createGuiClose(Core.getServerName(), BauServerInfo.getOwnerUser(), SteamwarUser.get(player.getUniqueId()), title);
     }
 }

SpigotCore/SpigotCore_Main/src/de/steamwar/providers/BauServerInfo.java

@@ -19,6 +19,7 @@
 
 package de.steamwar.providers;
 
+import de.steamwar.sql.SteamwarUser;
 import org.bukkit.Bukkit;
 
 public class BauServerInfo {
@@ -37,4 +38,9 @@ public class BauServerInfo {
     public static boolean isBauServer() {
         return bauOwner != null;
     }
+
+    public static SteamwarUser getOwnerUser() {
+        if (bauOwner == null) return null;
+        return SteamwarUser.get(bauOwner);
+    }
 }

SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SchematicData.java

@@ -47,11 +47,25 @@ public class SchematicData {
     private final NodeData data;
 
     public SchematicData(SchematicNode node) {
-        this.data = NodeData.get(node);
+        this.data = NodeData.getLatest(node);
         if(node.isDir())
             throw new SecurityException("Node is Directory");
     }
 
+    public SchematicData(SchematicNode node, int revision) {
+        if(node.isDir())
+            throw new SecurityException("Node is Directory");
+
+        if (revision < 1) {
+            this.data = NodeData.getLatest(node);
+        } else {
+            if (NodeData.getRevisions(node) < revision) {
+                throw new IllegalArgumentException("Revision " + revision + " does not exist");
+            }
+            this.data = NodeData.get(node, revision);
+        }
+    }
+
     public Clipboard load() throws IOException, NoClipboardException {
         return WorldEditWrapper.impl.getClipboard(data.schemData(), data.getNodeFormat());
     }
@@ -60,12 +74,12 @@ public class SchematicData {
         WorldEditWrapper.impl.setPlayerClipboard(player, data.schemData(), data.getNodeFormat());
     }
 
-    public void saveFromPlayer(Player player) throws IOException, NoClipboardException {
-        data.saveFromStream(WorldEditWrapper.impl.getPlayerClipboard(player), WorldEditWrapper.impl.getNativeFormat());
+    public static void saveFromPlayer(Player player, SchematicNode node) throws IOException, NoClipboardException {
+        NodeData.saveFromStream(node, WorldEditWrapper.impl.getPlayerClipboard(player), WorldEditWrapper.impl.getNativeFormat());
     }
 
     @Deprecated
-    public void saveFromBytes(byte[] bytes, NodeData.SchematicFormat newFormat) {
-        data.saveFromStream(new ByteArrayInputStream(bytes), newFormat);
+    public static void saveFromBytes(SchematicNode node, byte[] bytes, NodeData.SchematicFormat newFormat) {
+        NodeData.saveFromStream(node, new ByteArrayInputStream(bytes), newFormat);
     }
 }

VelocityCore/Persistent/src/de/steamwar/persistent/Subserver.java

@@ -220,7 +220,7 @@ public class Subserver {
         try {
             if (checkpoint) {
                 start(process.getErrorStream(), line -> line.contains("Restore finished successfully."));
-                Thread.sleep(300); //Wait for port to be reopened
+                Thread.sleep(300);
             } else {
                 start(process.getInputStream(), line -> {
                     if (line.contains("Loading libraries, please wait"))

VelocityCore/src/de/steamwar/messages/BungeeCore.properties

@@ -319,6 +319,7 @@ CHECK_LIST_CHECKING_HOVER=§eTo the reviewer
 CHECK_SCHEMATIC_ALREADY_CHECKING=§cYou are already reviewing a schematic!
 CHECK_SCHEMATIC_OWN=§cYou cannot review your own schematics.
 CHECK_SCHEMATIC_OWN_TEAM=§cYou cannot review your team schematics.
+CHECK_SCHEMATIC_INVESTIGATION_PENDING=§cThis schematic is currently under investigation
 CHECK_SCHEMATIC_PREVIOUS=§7{0} from {1}§8: §e{2}
 CHECK_INVALID_RANK=§cUnknown schematic rank.
 CHECK_ABORT=§aThe test operation was canceled!

VelocityCore/src/de/steamwar/messages/BungeeCore_de.properties

@@ -301,6 +301,7 @@ CHECK_LIST_CHECKING_HOVER=§eZum Prüfer
 CHECK_SCHEMATIC_ALREADY_CHECKING=§cDu prüfst schon eine Schematic!
 CHECK_SCHEMATIC_OWN=§cDu kannst nicht deine eigenen Schematics prüfen.
 CHECK_SCHEMATIC_OWN_TEAM=§cDu kannst nicht Schematics deines Teams prüfen.
+CHECK_SCHEMATIC_INVESTIGATION_PENDING=§cDiese Schematic wird grade untersucht!
 CHECK_SCHEMATIC_PREVIOUS=§7{0} von {1}§8: §e{2}
 CHECK_INVALID_RANK=§cUnbekannter Schematicrang.
 CHECK_ABORT=§aDer Prüfvorgang wurde abgebrochen!

VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java

@@ -276,6 +276,7 @@ public class ServerStarter {
 
                 int port = portrange.freePort();
                 String serverName = serverNameProvider.apply(port);
+                arguments.put("serverName", serverName);
 
                 if(node == null) {
                     node = Node.getNode();

VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java

@@ -99,11 +99,13 @@ public class CheckCommand extends SWCommand {
         for (SchematicNode schematic : schematicList) {
             CheckSession current = currentSchems.get(schematic.getId());
             if (current == null) {
+                boolean isInvestigation = schematic.isInvestigation();
+
                 sender.prefixless("CHECK_LIST_TO_CHECK",
-                        new Message("CHECK_LIST_TO_CHECK_HOVER"),
-                        ClickEvent.runCommand("/check schematic " + schematic.getId()),
+                        isInvestigation ? new Message("PLAIN_STRING", CheckedSchematic.getLastDeclinedOfNode(schematic.getId()).stream().map(CheckedSchematic::getDeclineReason).findFirst().orElse("")) : new Message("CHECK_LIST_TO_CHECK_HOVER"),
+                        isInvestigation ? ClickEvent.suggestCommand("") : ClickEvent.runCommand("/check schematic " + schematic.getId()),
                         getWaitTime(schematic),
-                        schematic.getSchemtype().getKuerzel(), SteamwarUser.get(schematic.getOwner()).getUserName(), schematic.getName());
+                        schematic.getSchemtype().getKuerzel(), SteamwarUser.get(schematic.getOwner()).getUserName(), (isInvestigation ? "§c" : "") + schematic.getName());
             } else {
                 sender.prefixless("CHECK_LIST_CHECKING",
                         new Message("CHECK_LIST_CHECKING_HOVER"),
@@ -130,6 +132,10 @@ public class CheckCommand extends SWCommand {
             return;
         }
 
+        if(schem.isInvestigation() && !sender.user().hasPerm(UserPerm.MODERATION)) {
+            sender.system("CHECK_SCHEMATIC_INVESTIGATION_PENDING");
+        }
+
         int playerTeam = sender.user().hasPerm(UserPerm.MODERATION) ? 0 : sender.user().getTeam();
         if (playerTeam != 0 && SteamwarUser.get(schem.getOwner()).getTeam() == playerTeam) {
             sender.system("CHECK_SCHEMATIC_OWN_TEAM");
@@ -181,6 +187,22 @@ public class CheckCommand extends SWCommand {
         currentCheckers.get(sender.getPlayer().getUniqueId()).decline(String.join(" ", message));
     }
 
+    @Register(value = "block")
+    public void investigate(PlayerChatter sender, String... message) {
+        if(notChecking(sender.getPlayer()))
+            return;
+
+        currentCheckers.get(sender.getPlayer().getUniqueId()).investigate(String.join(" ", message));
+    }
+
+    @Register(value = "unblock")
+    public void uninvestigate(PlayerChatter sender) {
+        if(notChecking(sender.getPlayer()))
+            return;
+
+        currentCheckers.get(sender.getPlayer().getUniqueId()).unblock();
+    }
+
     public static List<SchematicNode> getSchemsToCheck(){
         List<SchematicNode> schematicList = new ArrayList<>();
 
@@ -223,7 +245,7 @@ public class CheckCommand extends SWCommand {
                 currentCheckers.put(checker.user().getUUID(), this);
                 currentSchems.put(schematic.getId(), this);
 
-                for(CheckedSchematic previous : CheckedSchematic.previousChecks(schematic))
+                for(CheckedSchematic previous : CheckedSchematic.getLastDeclinedOfNode(schematic.getId()))
                     checker.prefixless("CHECK_SCHEMATIC_PREVIOUS", previous.getEndTime(), SteamwarUser.get(previous.getValidator()).getUserName(), previous.getDeclineReason());
                 next();
             }).start();
@@ -309,8 +331,14 @@ public class CheckCommand extends SWCommand {
         private void concludeCheckSession(String reason, SchematicType type, BooleanSupplier sendMessageIsOnline) {
             if(SchematicNode.getSchematicNode(schematic.getId()) != null) {
                 CheckedSchematic.create(schematic, checker.user().getId(), startTime, Timestamp.from(Instant.now()), reason, sendMessageIsOnline.getAsBoolean());
-                if(type != null)
+
+                if(type != null) {
+                    schematic.setInvestigation(false);
                     schematic.setSchemtype(type);
+                    if (type == SchematicType.Normal) {
+                        schematic.setPrepared(false);
+                    }
+                }
             }
 
             remove();
@@ -325,5 +353,15 @@ public class CheckCommand extends SWCommand {
             currentCheckers.remove(checker.user().getUUID());
             currentSchems.remove(schematic.getId());
         }
+
+        public void investigate(String reason) {
+            schematic.setInvestigation(true);
+            concludeCheckSession(reason, null, () -> true);
+        }
+
+        public void unblock() {
+            schematic.setInvestigation(false);
+            CheckedSchematic.create(schematic, checker.user().getId(), startTime, Timestamp.from(Instant.now()), "", true);
+        }
     }
 }

VelocityCore/src/de/steamwar/velocitycore/discord/channels/DiscordChannel.java

@@ -85,9 +85,9 @@ public class DiscordChannel extends Chatter.PlayerlessChatter {
     public void send(String message) {
         message = message
                 .replace("&", "")
-                .replace("@everyone", "`@everyone`")
-                .replace("@here", "`@here`")
-                .replaceAll("<[@#]!?\\d+>", "`$0`");
+                .replace("@everyone", "@\u200Beveryone")
+                .replace("@here", "@\u200Bhere")
+                .replaceAll("<([@#])(!?\\d+)>", "<$1\u200B$2>");
 
         if (maxNumberOfWebhooks > 0 && getChannel() instanceof TextChannel && message.contains("»")) {
             String[] strings = message.split("»", 2);

VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordSchemUpload.java

@@ -94,7 +94,7 @@ public class DiscordSchemUpload extends ListenerAdapter {
                     version = NodeData.SchematicFormat.MCEDIT;
                 }
 
-                NodeData.get(node).saveFromStream(new ByteArrayInputStream(bytes), version);
+                NodeData.saveFromStream(node, new ByteArrayInputStream(bytes), version);
                 sender.system("DC_SCHEMUPLOAD_SUCCESS", name);
             } catch (InterruptedException e) {
                 Thread.currentThread().interrupt();

VelocityCore/src/de/steamwar/velocitycore/listeners/ChatListener.java

@@ -27,6 +27,8 @@ import com.velocitypowered.api.event.player.PlayerChatEvent;
 import com.velocitypowered.api.event.player.TabCompleteEvent;
 import com.velocitypowered.api.proxy.ConsoleCommandSource;
 import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.ServerConnection;
+import com.velocitypowered.api.proxy.server.ServerInfo;
 import de.steamwar.messages.Chatter;
 import de.steamwar.messages.ChatterGroup;
 import de.steamwar.messages.Message;
@@ -80,17 +82,32 @@ public class ChatListener extends BasicListener {
         if(VelocityCore.getProxy().getCommandManager().hasCommand(cmd)) {
             CommandSource source = e.getCommandSource();
             String name;
-            if(source instanceof Player player)
+            SteamwarUser user = null;
+            if (source instanceof Player player) {
+                user = SteamwarUser.get(player.getUniqueId());
                 name = player.getUsername();
-            else if(source instanceof ConsoleCommandSource)
+            } else if (source instanceof ConsoleCommandSource) {
+                user = SteamwarUser.get(-1);
                 name = "«CONSOLE»";
-            else
+            } else {
                 name = source.toString();
+            }
 
             if (noLogCommands.contains(cmd)) {
                 return;
             }
 
+            switch (cmd) {
+                case "msg":
+                case "r":
+                case "tc":
+                    AuditLog.createSensitiveCommand(AuditLog.SERVER_NAME_VELOCITY, null, user, "/" + command);
+                    break;
+                default:
+                    AuditLog.createCommand(AuditLog.SERVER_NAME_VELOCITY, null, user, "/" + command);
+                    break;
+            }
+
             cmdLogger.log(Level.INFO, "%s -> executed command /%s".formatted(name, command));
         } else if (e.getCommandSource() instanceof Player player) {
             // System.out.println("spoofChatInput " + e);
@@ -106,8 +123,8 @@ public class ChatListener extends BasicListener {
 
         e.setResult(PlayerChatEvent.ChatResult.denied());
 
+        SteamwarUser user = SteamwarUser.get(player.getUniqueId());
         if (message.contains("jndi:ldap")) {
-            SteamwarUser user = SteamwarUser.get(player.getUniqueId());
             PunishmentCommand.ban(user, Punishment.PERMA_TIME, "Versuchte Exploit-Ausnutzung", SteamwarUser.get(-1), true);
             VelocityCore.getLogger().log(Level.SEVERE,  "%s %s wurde automatisch wegen jndi:ldap gebannt.".formatted(user.getUserName(), user.getId()));
             return;
@@ -117,13 +134,20 @@ public class ChatListener extends BasicListener {
             return;
 
         Subserver subserver = Subserver.getSubserver(player);
+        String serverName = AuditLog.SERVER_NAME_VELOCITY;
         if(Subserver.isArena(subserver) && subserver.getServer() == player.getCurrentServer().orElseThrow().getServerInfo()) {
+            serverName = subserver.getServer().getName();
             localChat(Chatter.of(player), message);
         } else if (message.startsWith("+")) {
+            serverName = player.getCurrentServer()
+                    .map(ServerConnection::getServerInfo)
+                    .map(ServerInfo::getName)
+                    .orElse(serverName);
             localChat(Chatter.of(player), message.substring(1));
         } else {
             sendChat(Chatter.of(player), Chatter.globalChat(), "CHAT_GLOBAL", null, message);
         }
+        AuditLog.createChat(serverName, null, user, message);
     }
 
     private static boolean isMistypedCommand(Player player, String message) {

VelocityCore/src/de/steamwar/velocitycore/listeners/SessionManager.java

@@ -22,6 +22,7 @@ package de.steamwar.velocitycore.listeners;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.connection.DisconnectEvent;
 import com.velocitypowered.api.event.connection.PostLoginEvent;
+import de.steamwar.sql.AuditLog;
 import de.steamwar.velocitycore.VelocityCore;
 import de.steamwar.sql.Session;
 import de.steamwar.sql.SteamwarUser;
@@ -36,10 +37,12 @@ public class SessionManager extends BasicListener {
     @Subscribe
     public void onPostLogin(PostLoginEvent event){
         sessions.put(event.getPlayer(), Timestamp.from(Instant.now()));
+        AuditLog.createJoin(AuditLog.SERVER_NAME_VELOCITY, null, SteamwarUser.get(event.getPlayer().getUniqueId()));
     }
 
     @Subscribe
     public void onDisconnect(DisconnectEvent e){
+        AuditLog.createLeave(AuditLog.SERVER_NAME_VELOCITY, null, SteamwarUser.get(e.getPlayer().getUniqueId()));
         Timestamp timestamp = sessions.remove(e.getPlayer());
         if(timestamp != null) {
             VelocityCore.schedule(() -> Session.insertSession(SteamwarUser.get(e.getPlayer().getUniqueId()).getId(), timestamp)).schedule();

WebsiteBackend/src/de/steamwar/routes/Schematic.kt

@@ -89,7 +89,7 @@ fun Route.configureSchematic() {
                 return@get
             }
 
-            val data = NodeData.get(node) ?: run {
+            val data = NodeData.getLatest(node) ?: run {
                 call.respond(HttpStatusCode.InternalServerError)
                 return@get
             }
@@ -166,8 +166,7 @@ fun Route.configureSchematic() {
                     } catch (_: Exception) {}
                 }
 
-                val data = NodeData(node.id, version)
-                data.saveFromStream(content.inputStream(), version)
+                NodeData.saveFromStream(node, content.inputStream(), version)
 
                 call.respond(ResponseSchematic(node))
             } catch (e: Exception) {