Add new Schematic reader

Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/89
Reviewed-by: YoyoNow <jwsteam@nidido.de>

.gitignore

@@ -11,5 +11,9 @@ steamwar.properties
 .idea
 *.iml
 
+# VSCode
+bin/
+.vscode
+
 # Other
 lib

BauSystem/BauSystem_15/build.gradle.kts

@@ -27,8 +27,8 @@ java {
 }
 
 dependencies {
-    compileOnly(project(":BauSystem:BauSystem_Main"))
+    compileOnly(project(":BauSystem:BauSystem_Main", "default"))
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
 
     compileOnly(libs.nms15)
     compileOnly(libs.worldedit15)

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

@@ -19,27 +19,21 @@
 
 package de.steamwar.bausystem.utils;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
 import de.steamwar.bausystem.features.util.NoClipCommand;
 import net.minecraft.server.v1_15_R1.*;
-import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
 import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.TNTPrimed;
 import org.bukkit.inventory.ItemStack;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.function.LongSupplier;
 
 public class NMSWrapper15 implements NMSWrapper {
 
-    private static final Reflection.FieldAccessor<EnumGamemode> playerGameMode = Reflection.getField(PlayerInteractManager.class, EnumGamemode.class, 0);
+    private static final Reflection.Field<EnumGamemode> playerGameMode = Reflection.getField(PlayerInteractManager.class, EnumGamemode.class, 0);
 
     @Override
     @SuppressWarnings("deprecation")
@@ -63,7 +57,7 @@ public class NMSWrapper15 implements NMSWrapper {
         player.updateInventory();
     }
 
-    private static final Reflection.FieldAccessor<Integer> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, int.class, 0);
+    private static final Reflection.Field<Integer> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, int.class, 0);
 
     @Override
     public void setGameStateChangeReason(Object packet) {
@@ -120,12 +114,12 @@ public class NMSWrapper15 implements NMSWrapper {
         return invalid;
     }
 
-    private final Class<?> explosionPacket = Reflection.getClass("{nms.network.protocol.game}.PacketPlayOutExplosion");
+    private final Class<?> explosionPacket = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundExplodePacket");
-    private final Reflection.FieldAccessor<Double> a = Reflection.getField(explosionPacket, double.class, 0);
+    private final Reflection.Field<Double> a = Reflection.getField(explosionPacket, double.class, 0);
-    private final Reflection.FieldAccessor<Double> b = Reflection.getField(explosionPacket, double.class, 1);
+    private final Reflection.Field<Double> b = Reflection.getField(explosionPacket, double.class, 1);
-    private final Reflection.FieldAccessor<Double> c = Reflection.getField(explosionPacket, double.class, 2);
+    private final Reflection.Field<Double> c = Reflection.getField(explosionPacket, double.class, 2);
-    private final Reflection.FieldAccessor<Float> d = Reflection.getField(explosionPacket, float.class, 0);
+    private final Reflection.Field<Float> d = Reflection.getField(explosionPacket, float.class, 0);
-    private final Reflection.FieldAccessor<List> e = Reflection.getField(explosionPacket, List.class, 0);
+    private final Reflection.Field<List> e = Reflection.getField(explosionPacket, List.class, 0);
 
     @Override
     public Object resetExplosionKnockback(Object packet) {

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

@@ -19,12 +19,9 @@
 
 package de.steamwar.bausystem.utils;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
-import de.steamwar.bausystem.utils.PlayerMovementWrapper;
 import net.minecraft.server.v1_15_R1.EntityPlayer;
 import net.minecraft.server.v1_15_R1.PacketPlayInFlying;
-import net.minecraft.server.v1_15_R1.PacketPlayOutEntity;
-import net.minecraft.server.v1_15_R1.PacketPlayOutEntityTeleport;
 import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
@@ -46,14 +43,9 @@ public class PlayerMovementWrapper15 implements PlayerMovementWrapper {
         PacketPlayInFlying packetPlayInFlying = ((PacketPlayInFlying) object);
         Object packet = Reflection.newInstance(teleportPacket);
         teleportEntity.set(packet, player.getEntityId());
-        teleportPosition.set(packet, packetPlayInFlying.a(0.0), packetPlayInFlying.b(0.0), packetPlayInFlying.c(0.0));
+        teleportPosition.set(packet, packetPlayInFlying.a(0.0), packetPlayInFlying.b(0.0), packetPlayInFlying.c(0.0),
-        if (Float.isNaN(packetPlayInFlying.a(Float.NaN))) {
+                Float.isNaN(packetPlayInFlying.a(Float.NaN)) ? player.getLocation().getYaw() : packetPlayInFlying.a(0.0F),
-            teleportYaw.set(packet, rotToByte(player.getLocation().getYaw()));
+                Float.isNaN(packetPlayInFlying.b(Float.NaN)) ? player.getLocation().getPitch() : packetPlayInFlying.b(0.0F));
-            teleportPitch.set(packet, rotToByte(player.getLocation().getPitch()));
-        } else {
-            teleportYaw.set(packet, rotToByte(packetPlayInFlying.a(0.0F)));
-            teleportPitch.set(packet, rotToByte(packetPlayInFlying.b(0.0F)));
-        }
         return packet;
     }
 }

BauSystem/BauSystem_18/build.gradle.kts

@@ -27,8 +27,8 @@ java {
 }
 
 dependencies {
-    compileOnly(project(":BauSystem:BauSystem_Main"))
+    compileOnly(project(":BauSystem:BauSystem_Main", "default"))
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
 
     compileOnly(libs.spigotapi)
     compileOnly(libs.nms18)

BauSystem/BauSystem_18/src/de/steamwar/bausystem/utils/NMSWrapper18.java

@@ -19,36 +19,26 @@
 
 package de.steamwar.bausystem.utils;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
-import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.bausystem.features.util.NoClipCommand;
-import net.minecraft.SystemUtils;
 import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
-import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.*;
 import net.minecraft.server.level.PlayerInteractManager;
 import net.minecraft.world.level.EnumGamemode;
-import net.minecraft.world.phys.Vec3D;
-import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_18_R2.entity.CraftEntity;
 import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.TNTPrimed;
 import org.bukkit.inventory.ItemStack;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.function.LongSupplier;
 
 public class NMSWrapper18 implements NMSWrapper {
 
-    private static final Reflection.FieldAccessor<EnumGamemode> playerGameMode = Reflection.getField(PlayerInteractManager.class, EnumGamemode.class, 0);
+    private static final Reflection.Field<EnumGamemode> playerGameMode = Reflection.getField(PlayerInteractManager.class, EnumGamemode.class, 0);
 
     @Override
     @SuppressWarnings("deprecation")
@@ -73,7 +63,7 @@ public class NMSWrapper18 implements NMSWrapper {
         player.updateInventory();
     }
 
-    private static final Reflection.FieldAccessor<PacketPlayOutGameStateChange.a> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, PacketPlayOutGameStateChange.a.class, 12);
+    private static final Reflection.Field<PacketPlayOutGameStateChange.a> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, PacketPlayOutGameStateChange.a.class, 12);
 
     @Override
     public void setGameStateChangeReason(Object packet) {
@@ -130,12 +120,12 @@ public class NMSWrapper18 implements NMSWrapper {
         return invalid;
     }
 
-    private final Class<?> explosionPacket = Reflection.getClass("{nms.network.protocol.game}.PacketPlayOutExplosion");
+    private final Class<?> explosionPacket = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundExplodePacket");
-    private final Reflection.FieldAccessor<Double> a = Reflection.getField(explosionPacket, double.class, 0);
+    private final Reflection.Field<Double> a = Reflection.getField(explosionPacket, double.class, 0);
-    private final Reflection.FieldAccessor<Double> b = Reflection.getField(explosionPacket, double.class, 1);
+    private final Reflection.Field<Double> b = Reflection.getField(explosionPacket, double.class, 1);
-    private final Reflection.FieldAccessor<Double> c = Reflection.getField(explosionPacket, double.class, 2);
+    private final Reflection.Field<Double> c = Reflection.getField(explosionPacket, double.class, 2);
-    private final Reflection.FieldAccessor<Float> d = Reflection.getField(explosionPacket, float.class, 0);
+    private final Reflection.Field<Float> d = Reflection.getField(explosionPacket, float.class, 0);
-    private final Reflection.FieldAccessor<List> e = Reflection.getField(explosionPacket, List.class, 0);
+    private final Reflection.Field<List> e = Reflection.getField(explosionPacket, List.class, 0);
 
     @Override
     public Object resetExplosionKnockback(Object packet) {

BauSystem/BauSystem_18/src/de/steamwar/bausystem/utils/PlayerMovementWrapper18.java

@@ -19,8 +19,7 @@
 
 package de.steamwar.bausystem.utils;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
-import de.steamwar.bausystem.utils.PlayerMovementWrapper;
 import net.minecraft.network.protocol.game.PacketPlayInFlying;
 import net.minecraft.server.level.EntityPlayer;
 import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
@@ -44,14 +43,9 @@ public class PlayerMovementWrapper18 implements PlayerMovementWrapper {
         PacketPlayInFlying packetPlayInFlying = ((PacketPlayInFlying) object);
         Object packet = Reflection.newInstance(teleportPacket);
         teleportEntity.set(packet, player.getEntityId());
-        teleportPosition.set(packet, packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c);
+        teleportPosition.set(packet, packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c,
-        if (packetPlayInFlying.h) {
+                packetPlayInFlying.h ? player.getLocation().getYaw() : packetPlayInFlying.d,
-            teleportYaw.set(packet, rotToByte(player.getLocation().getYaw()));
+                packetPlayInFlying.h ? player.getLocation().getPitch() : packetPlayInFlying.e);
-            teleportPitch.set(packet, rotToByte(player.getLocation().getPitch()));
-        } else {
-            teleportYaw.set(packet, rotToByte(packetPlayInFlying.d));
-            teleportPitch.set(packet, rotToByte(packetPlayInFlying.e));
-        }
         return packet;
     }
 }

BauSystem/BauSystem_19/build.gradle.kts

@@ -27,8 +27,8 @@ java {
 }
 
 dependencies {
-    compileOnly(project(":BauSystem:BauSystem_Main"))
+    compileOnly(project(":BauSystem:BauSystem_Main", "default"))
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
 
     compileOnly(libs.spigotapi)
     compileOnly(libs.paperapi)

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

@@ -19,37 +19,26 @@
 
 package de.steamwar.bausystem.utils;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
-import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.bausystem.features.util.NoClipCommand;
-import net.minecraft.SystemUtils;
 import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
-import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.*;
-import net.minecraft.network.syncher.DataWatcher;
 import net.minecraft.server.level.PlayerInteractManager;
 import net.minecraft.world.level.EnumGamemode;
-import net.minecraft.world.phys.Vec3D;
-import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity;
 import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.TNTPrimed;
 import org.bukkit.inventory.ItemStack;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.function.LongSupplier;
 
 public class NMSWrapper19 implements NMSWrapper {
 
-    private static final Reflection.FieldAccessor<EnumGamemode> playerGameMode = Reflection.getField(PlayerInteractManager.class, EnumGamemode.class, 0);
+    private static final Reflection.Field<EnumGamemode> playerGameMode = Reflection.getField(PlayerInteractManager.class, EnumGamemode.class, 0);
 
     @Override
     @SuppressWarnings("deprecation")
@@ -73,7 +62,7 @@ public class NMSWrapper19 implements NMSWrapper {
         player.updateInventory();
     }
 
-    private static final Reflection.FieldAccessor<PacketPlayOutGameStateChange.a> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, PacketPlayOutGameStateChange.a.class, 12);
+    private static final Reflection.Field<PacketPlayOutGameStateChange.a> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, PacketPlayOutGameStateChange.a.class, 12);
 
     @Override
     public void setGameStateChangeReason(Object packet) {
@@ -130,12 +119,12 @@ public class NMSWrapper19 implements NMSWrapper {
         return invalid;
     }
 
-    private final Class<?> explosionPacket = Reflection.getClass("{nms.network.protocol.game}.PacketPlayOutExplosion");
+    private final Class<?> explosionPacket = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundExplodePacket");
-    private final Reflection.FieldAccessor<Double> a = Reflection.getField(explosionPacket, double.class, 0);
+    private final Reflection.Field<Double> a = Reflection.getField(explosionPacket, double.class, 0);
-    private final Reflection.FieldAccessor<Double> b = Reflection.getField(explosionPacket, double.class, 1);
+    private final Reflection.Field<Double> b = Reflection.getField(explosionPacket, double.class, 1);
-    private final Reflection.FieldAccessor<Double> c = Reflection.getField(explosionPacket, double.class, 2);
+    private final Reflection.Field<Double> c = Reflection.getField(explosionPacket, double.class, 2);
-    private final Reflection.FieldAccessor<Float> d = Reflection.getField(explosionPacket, float.class, 0);
+    private final Reflection.Field<Float> d = Reflection.getField(explosionPacket, float.class, 0);
-    private final Reflection.FieldAccessor<List> e = Reflection.getField(explosionPacket, List.class, 0);
+    private final Reflection.Field<List> e = Reflection.getField(explosionPacket, List.class, 0);
 
     @Override
     public Object resetExplosionKnockback(Object packet) {

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

@@ -19,17 +19,12 @@
 
 package de.steamwar.bausystem.utils;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
 import net.minecraft.network.protocol.game.PacketPlayInFlying;
 import net.minecraft.server.level.EntityPlayer;
-import org.bukkit.Location;
 import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
 public class PlayerMovementWrapper19 implements PlayerMovementWrapper {
 
     @Override
@@ -48,14 +43,9 @@ public class PlayerMovementWrapper19 implements PlayerMovementWrapper {
         PacketPlayInFlying packetPlayInFlying = ((PacketPlayInFlying) object);
         Object packet = Reflection.newInstance(teleportPacket);
         teleportEntity.set(packet, player.getEntityId());
-        teleportPosition.set(packet, packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c);
+        teleportPosition.set(packet, packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c,
-        if (packetPlayInFlying.h) {
+                packetPlayInFlying.h ? player.getLocation().getYaw() : packetPlayInFlying.d,
-            teleportYaw.set(packet, rotToByte(player.getLocation().getYaw()));
+                packetPlayInFlying.h ? player.getLocation().getPitch() : packetPlayInFlying.e);
-            teleportPitch.set(packet, rotToByte(player.getLocation().getPitch()));
-        } else {
-            teleportYaw.set(packet, rotToByte(packetPlayInFlying.d));
-            teleportPitch.set(packet, rotToByte(packetPlayInFlying.e));
-        }
         return packet;
     }
 }

BauSystem/BauSystem_20/build.gradle.kts

@@ -27,8 +27,8 @@ java {
 }
 
 dependencies {
-    compileOnly(project(":BauSystem:BauSystem_Main"))
+    compileOnly(project(":BauSystem:BauSystem_Main", "default"))
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
 
     compileOnly(libs.spigotapi)
 

BauSystem/BauSystem_20/src/de/steamwar/bausystem/utils/NMSWrapper20.java

@@ -19,7 +19,7 @@
 
 package de.steamwar.bausystem.utils;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
 import de.steamwar.bausystem.features.util.NoClipCommand;
 import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTTagCompound;
@@ -40,7 +40,7 @@ import java.util.List;
 
 public class NMSWrapper20 implements NMSWrapper {
 
-    private static final Reflection.FieldAccessor<EnumGamemode> playerGameMode = Reflection.getField(PlayerInteractManager.class, EnumGamemode.class, 0);
+    private static final Reflection.Field<EnumGamemode> playerGameMode = Reflection.getField(PlayerInteractManager.class, EnumGamemode.class, 0);
 
     @Override
     @SuppressWarnings("deprecation")
@@ -64,7 +64,7 @@ public class NMSWrapper20 implements NMSWrapper {
         player.updateInventory();
     }
 
-    private static final Reflection.FieldAccessor<PacketPlayOutGameStateChange.a> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, PacketPlayOutGameStateChange.a.class, 12);
+    private static final Reflection.Field<PacketPlayOutGameStateChange.a> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, PacketPlayOutGameStateChange.a.class, 12);
 
     @Override
     public void setGameStateChangeReason(Object packet) {
@@ -121,12 +121,12 @@ public class NMSWrapper20 implements NMSWrapper {
         return invalid;
     }
 
-    private final Class<?> explosionPacket = Reflection.getClass("{nms.network.protocol.game}.PacketPlayOutExplosion");
+    private final Class<?> explosionPacket = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundExplodePacket");
-    private final Reflection.FieldAccessor<Double> a = Reflection.getField(explosionPacket, double.class, 0);
+    private final Reflection.Field<Double> a = Reflection.getField(explosionPacket, double.class, 0);
-    private final Reflection.FieldAccessor<Double> b = Reflection.getField(explosionPacket, double.class, 1);
+    private final Reflection.Field<Double> b = Reflection.getField(explosionPacket, double.class, 1);
-    private final Reflection.FieldAccessor<Double> c = Reflection.getField(explosionPacket, double.class, 2);
+    private final Reflection.Field<Double> c = Reflection.getField(explosionPacket, double.class, 2);
-    private final Reflection.FieldAccessor<Float> d = Reflection.getField(explosionPacket, float.class, 0);
+    private final Reflection.Field<Float> d = Reflection.getField(explosionPacket, float.class, 0);
-    private final Reflection.FieldAccessor<List> e = Reflection.getField(explosionPacket, List.class, 0);
+    private final Reflection.Field<List> e = Reflection.getField(explosionPacket, List.class, 0);
 
     @Override
     public Object resetExplosionKnockback(Object packet) {

BauSystem/BauSystem_20/src/de/steamwar/bausystem/utils/PlayerMovementWrapper20.java

@@ -19,18 +19,12 @@
 
 package de.steamwar.bausystem.utils;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
 import net.minecraft.network.protocol.game.PacketPlayInFlying;
-import net.minecraft.network.protocol.game.PacketPlayOutEntityTeleport;
 import net.minecraft.server.level.EntityPlayer;
-import org.bukkit.Location;
 import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
 public class PlayerMovementWrapper20 implements PlayerMovementWrapper {
 
     @Override
@@ -49,14 +43,9 @@ public class PlayerMovementWrapper20 implements PlayerMovementWrapper {
         PacketPlayInFlying packetPlayInFlying = ((PacketPlayInFlying) object);
         Object packet = Reflection.newInstance(teleportPacket);
         teleportEntity.set(packet, player.getEntityId());
-        teleportPosition.set(packet, packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c);
+        teleportPosition.set(packet, packetPlayInFlying.a, packetPlayInFlying.b, packetPlayInFlying.c,
-        if (packetPlayInFlying.h) {
+                packetPlayInFlying.h ? player.getLocation().getYaw() : packetPlayInFlying.d,
-            teleportYaw.set(packet, rotToByte(player.getLocation().getYaw()));
+                packetPlayInFlying.h ? player.getLocation().getPitch() : packetPlayInFlying.e);
-            teleportPitch.set(packet, rotToByte(player.getLocation().getPitch()));
-        } else {
-            teleportYaw.set(packet, rotToByte(packetPlayInFlying.d));
-            teleportPitch.set(packet, rotToByte(packetPlayInFlying.e));
-        }
         return packet;
     }
 }

BauSystem/BauSystem_21/build.gradle.kts

@@ -0,0 +1,17 @@
+plugins {
+    steamwar.java
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
+
+dependencies {
+    compileOnly(project(":BauSystem:BauSystem_Main", "default"))
+    compileOnly(project(":SpigotCore", "default"))
+
+    compileOnly(libs.paperapi21)
+
+    compileOnly(libs.nms21)
+}

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

@@ -0,0 +1,141 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024 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.Reflection;
+import de.steamwar.bausystem.features.util.NoClipCommand;
+import net.minecraft.core.component.DataComponents;
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.network.protocol.game.PacketPlayInSetCreativeSlot;
+import net.minecraft.network.protocol.game.PacketPlayOutExplosion;
+import net.minecraft.network.protocol.game.PacketPlayOutGameStateChange;
+import net.minecraft.server.level.EntityPlayer;
+import net.minecraft.server.level.PlayerInteractManager;
+import net.minecraft.world.entity.player.EntityHuman;
+import net.minecraft.world.entity.player.PlayerAbilities;
+import net.minecraft.world.item.component.CustomData;
+import net.minecraft.world.level.EnumGamemode;
+import org.bukkit.GameMode;
+import org.bukkit.Material;
+import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_21_R2.inventory.CraftItemStack;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.Optional;
+
+public class NMSWrapper21 implements NMSWrapper {
+
+    private static final Reflection.Field<PlayerInteractManager> playerInteractManager = Reflection.getField(EntityPlayer.class, null, PlayerInteractManager.class);
+
+    @Override
+    public void setInternalGameMode(Player player, GameMode gameMode) {
+        playerInteractManager.get(((CraftPlayer) player).getHandle()).a(EnumGamemode.a(gameMode.getValue()));
+    }
+
+    @Override
+    public void setSlotToItemStack(Player player, Object o) {
+        PacketPlayInSetCreativeSlot packetPlayInSetCreativeSlot = (PacketPlayInSetCreativeSlot) o;
+        int index = packetPlayInSetCreativeSlot.b();
+        if (index >= 36 && index <= 44) {
+            index -= 36;
+        } else if (index > 44) {
+            index -= 5;
+        } else if (index <= 8) {
+            index = index - 8 + 36;
+        }
+        player.getInventory().setItem(index, CraftItemStack.asBukkitCopy(packetPlayInSetCreativeSlot.e()));
+        if (index < 9) player.getInventory().setHeldItemSlot(index);
+        player.updateInventory();
+    }
+
+    private static final Reflection.Field<PacketPlayOutGameStateChange.a> gameStateChangeReason = Reflection.getField(NoClipCommand.gameStateChange, PacketPlayOutGameStateChange.a.class, 12);
+
+    @Override
+    public void setGameStateChangeReason(Object packet) {
+        gameStateChangeReason.set(packet, PacketPlayOutGameStateChange.d);
+    }
+
+    private static final Reflection.Field<PlayerAbilities> playerAbilities = Reflection.getField(EntityHuman.class, null, PlayerAbilities.class);
+
+    @Override
+    public void setPlayerBuildAbilities(Player player) {
+        PlayerAbilities abilities = playerAbilities.get(((CraftPlayer) player).getHandle());
+        abilities.d = true;
+        abilities.e = true;
+    }
+
+    @Override
+    public Material pathMaterial() {
+        return Material.DIRT_PATH;
+    }
+
+    private static final int threshold = 2048;
+
+    @Override
+    public boolean checkItemStack(ItemStack item) {
+        net.minecraft.world.item.ItemStack nmsItem = CraftItemStack.asNMSCopy(item);
+        NBTTagCompound tag = nmsItem.a(DataComponents.b, CustomData.a).c();
+        if (tag.e("BlockEntityTag")) {
+            NBTTagCompound blockTag = tag.p("BlockEntityTag");
+            if (blockTag.e("Items")) {
+                return drillDown(blockTag.c("Items", 10), 0, 0) > threshold;
+            }
+        }
+
+        return false;
+    }
+
+    private int drillDown(NBTTagList items, int layer, int start) {
+        if (layer > 2) return start + threshold;
+        int invalid = start;
+        for (NBTBase nbtBase : items) {
+            if (!(nbtBase instanceof NBTTagCompound slot))
+                continue;
+            if (slot.e("tag")) {
+                invalid += slot.f("Count");
+                NBTTagCompound iTag = slot.p("tag");
+                if (iTag.e("BlockEntityTag")) {
+                    NBTTagCompound blockTag = iTag.p("BlockEntityTag");
+                    if (blockTag.e("Items")) {
+                        invalid = drillDown(blockTag.c("Items", 10), layer + 1, invalid);
+                    }
+                }
+            }
+            if (invalid > threshold)
+                break;
+        }
+        return invalid;
+    }
+
+    @Override
+    public Object resetExplosionKnockback(Object packet) {
+        PacketPlayOutExplosion explosion = (PacketPlayOutExplosion) packet;
+
+        return new PacketPlayOutExplosion(
+                explosion.b(),
+                Optional.empty(),
+                explosion.f(),
+                explosion.g()
+        );
+    }
+}

BauSystem/BauSystem_Main/build.gradle.kts

@@ -33,14 +33,12 @@ java {
 dependencies {
     compileOnly(libs.classindex)
     annotationProcessor(libs.classindex)
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
 
     compileOnly(libs.spigotapi)
     compileOnly(libs.axiom)
     compileOnly(libs.authlib)
-    compileOnly(libs.viaapi)
 
-    compileOnly(libs.nms20)
     compileOnly(libs.fawe18)
 
     implementation(libs.luaj)

BauSystem/BauSystem_Main/src/BauSystem.properties

@@ -271,6 +271,7 @@ SIMULATOR_CHANGE_HELP=§8/§esimulator change §8-§7 Change your simulator wand
 SIMULATOR_DELETE_HELP=§8/§esimulator delete §8[§7name§8] §8-§7 Deletes the simulator
 SIMULATOR_START_HELP=§8/§esimulator start §8[§7name§8] §8-§7 Starts the simulator
 SIMULATOR_COPY_HELP=§8/§esimulator copy §8[§7to-copy§8] §8[§7name§8] §8-§7 Copy the simulator
+SIMULATOR_RENAME_HELP=§8/§esimulator rename §8[§7to-rename§8] §8[§7name§8] §8-§7 Rename the simulator
 SIMULATOR_GUI_ITEM_NAME=§eTNT Simulator
 SIMULATOR_NO_SIM_IN_HAND=§cNo simulator item selected
 SIMULATOR_GUI_SELECT_SIM=Simulator selection
@@ -307,6 +308,7 @@ SIMULATOR_POSITION_Z=§7z-Position
 SIMULATOR_BACK=§eBack
 SIMULATOR_GUI_TOTAL_TNT=§7Total TNT§8: §e{0}
 SIMULATOR_DELETED=§cSimulator deleted
+SIMULATOR_RENAMED=§cSimulator renamed from {0} to {1}
 ## GUI
 SIMULATOR_POSITION_EDIT=§eEdit position
 SIMULATOR_POSITION_ADD=§eSet position
@@ -1012,5 +1014,3 @@ COLORREPLACE_HELP=§8//§ecolorreplace §8[§7color§8] §8[§7color§8] §8- §
 TYPEREPLACE_HELP=§8//§etypereplace §8[§7type§8] §8[§7type§8] §8- §7Replace all blocks of one type with another
 # Schematic
 SCHEMATIC_GUI_ITEM=§eSchematics
-#VersionAnnouncer
-SERVER_VERSION=§7This server runs on Minecraft version §e{0}

BauSystem/BauSystem_Main/src/BauSystem_de.properties

@@ -254,6 +254,7 @@ SIMULATOR_CHANGE_HELP=§8/§esimulator change §8-§7 Wechsel zu einem anderen S
 SIMULATOR_DELETE_HELP=§8/§esimulator delete §8[§7name§8] §8-§7 Löscht den Simulator
 SIMULATOR_START_HELP=§8/§esimulator start §8[§7name§8] §8-§7 Startet die Simulation
 SIMULATOR_COPY_HELP=§8/§esimulator copy §8[§7to-copy§8] §8[§7name§8] §8-§7 Kopiert einen Simulator
+SIMULATOR_RENAME_HELP=§8/§esimulator rename §8[§7to-rename§8] §8[§7name§8] §8-§7 Benennt einen Simulator um
 SIMULATOR_GUI_ITEM_NAME=§eTNT Simulator
 SIMULATOR_NO_SIM_IN_HAND=§cKein Simulator Item gewählt
 SIMULATOR_GUI_SELECT_SIM=Simulator wählen
@@ -290,6 +291,7 @@ SIMULATOR_POSITION_Z=§7z-Position
 SIMULATOR_BACK=§eZurück
 SIMULATOR_GUI_TOTAL_TNT=§7Gesamt TNT§8: §e{0}
 SIMULATOR_DELETED=§cSimulator gelöscht
+SIMULATOR_RENAMED=§cSimulator von {0} zu {1} umbenannt
 ## GUI
 SIMULATOR_POSITION_EDIT=§ePosition bearbeiten
 SIMULATOR_POSITION_ADD=§ePosition setzen
@@ -953,5 +955,3 @@ COLORREPLACE_HELP=§8//§ecolorreplace §8[§7color§8] §8[§7color§8] §8- §
 TYPEREPLACE_HELP=§8//§etyreplace §8[§7type§8] §8[§7type§8] §8- §7Ersetzt einen Blockgruppe mit einer anderen
 # Schematics
 SCHEMATIC_GUI_ITEM=§eSchematics
-#VersionAnnouncer
-SERVER_VERSION=§7Dieser Server läuft auf Minecraft-Version §e{0}

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

@@ -25,9 +25,12 @@ import de.steamwar.bausystem.configplayer.ConfigConverter;
 import de.steamwar.bausystem.features.gui.BauGUI;
 import de.steamwar.bausystem.features.script.lua.SteamWarLuaPlugin;
 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;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
 import de.steamwar.bausystem.region.loader.PrototypeLoader;
@@ -70,7 +73,7 @@ import java.util.function.Consumer;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
-public class BauSystem extends JavaPlugin implements Listener {
+public class BauSystem extends JavaPlugin {
 
     // This should be treated as final!
     public static Message MESSAGE;
@@ -182,6 +185,9 @@ public class BauSystem extends JavaPlugin implements Listener {
             if (any instanceof ConfigConverter) {
                 Config.addConfigConverter((ConfigConverter) any);
             }
+            if (any instanceof BoundingBoxLoader) {
+                ((BoundingBoxLoader) any).load();
+            }
         });
 
         instances.forEach((clazz, o) -> {
@@ -197,6 +203,9 @@ public class BauSystem extends JavaPlugin implements Listener {
         });
 
         TickListener.impl.init();
+
+        TraceManager.instance.init();
+        TraceRecorder.instance.init();
     }
 
     @Override

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/gui/editor/BauGuiEditor.java

@@ -22,6 +22,7 @@ package de.steamwar.bausystem.features.gui.editor;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.gui.BauGUI;
 import de.steamwar.bausystem.linkage.specific.BauGuiItem;
+import de.steamwar.core.TrickyTrialsWrapper;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
 import de.steamwar.linkage.Linked;
@@ -72,7 +73,7 @@ public class BauGuiEditor implements Listener {
 
         inv.setItem(mapping.getSize() + 5, new SWItem(Material.BARRIER, BauSystem.MESSAGE.parse("GUI_EDITOR_ITEM_TRASH", p), Arrays.asList(BauSystem.MESSAGE.parse("GUI_EDITOR_ITEM_TRASH_LORE", p)), false, clickType -> {
         }).getItemStack());
-        inv.setItem(mapping.getSize() + 6, new SWItem(Material.SCUTE, BauSystem.MESSAGE.parse("GUI_EDITOR_ITEM_MORE", p)).getItemStack());
+        inv.setItem(mapping.getSize() + 6, new SWItem(TrickyTrialsWrapper.impl.getTurtleScute(), BauSystem.MESSAGE.parse("GUI_EDITOR_ITEM_MORE", p)).getItemStack());
         inv.setItem(mapping.getSize() + 8, new SWItem(Material.ARROW, BauSystem.MESSAGE.parse("GUI_EDITOR_ITEM_CLOSE", p)).getItemStack());
 
         p.openInventory(inv);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loader/Loader.java

@@ -93,6 +93,7 @@ public class Loader implements Listener {
                 element.execute(delay -> waitTime = delay);
                 if (waitTime > 0) {
                     if (element instanceof LoaderTNT) currentElement--;
+                    waitTime--;
                     return;
                 }
             }

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/LoadtimerListener.java

@@ -20,6 +20,7 @@
 package de.steamwar.bausystem.features.loadtimer;
 
 import de.steamwar.bausystem.region.Region;
+import de.steamwar.core.TrickyTrialsWrapper;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Material;
 import org.bukkit.entity.EntityType;
@@ -57,7 +58,7 @@ public class LoadtimerListener implements Listener {
 
     @EventHandler
     public void onEntitySpawn(EntitySpawnEvent event) {
-        if (!getTimers().isEmpty() && event.getEntityType() == EntityType.PRIMED_TNT) {
+        if (!getTimers().isEmpty() && event.getEntityType() == TrickyTrialsWrapper.impl.getTntEntityType()) {
             Region r = Region.getRegion(event.getLocation());
             if (hasTimer(r)) {
                 getTimer(r).onTntSpawn();
@@ -67,7 +68,7 @@ public class LoadtimerListener implements Listener {
 
     @EventHandler
     public void onEntityExplode(EntityExplodeEvent event) {
-        if (!getTimers().isEmpty() && event.getEntityType() == EntityType.PRIMED_TNT) {
+        if (!getTimers().isEmpty() && event.getEntityType() == TrickyTrialsWrapper.impl.getTntEntityType()) {
             Region r = Region.getRegion(event.getLocation());
             if (hasTimer(r)) {
                 getTimer(r).onTntExplode(event);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/observer/ObserverTracer.java

@@ -19,7 +19,7 @@
 
 package de.steamwar.bausystem.features.observer;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
 import de.steamwar.bausystem.region.Point;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -170,7 +170,7 @@ public class ObserverTracer {
         }
     }
 
-    private static final Class<?> craftPoweredRail = Reflection.getClass("{obc}.block.impl.CraftPoweredRail");
+    private static final Class<?> craftPoweredRail = Reflection.getClass("org.bukkit.craftbukkit.block.impl.CraftPoweredRail");
     private boolean checkAllowed(Block block, BlockData blockData) {
         if (checkMaterial(block)) return true;
         if (block.getType() == Material.BELL) {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/FreezeListener.java

@@ -6,6 +6,7 @@ import de.steamwar.bausystem.region.flags.Flag;
 import de.steamwar.bausystem.region.flags.flagvalues.FreezeMode;
 import de.steamwar.bausystem.utils.ScoreboardElement;
 import de.steamwar.core.Core;
+import de.steamwar.core.TrickyTrialsWrapper;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
@@ -31,7 +32,7 @@ public class FreezeListener implements Listener, ScoreboardElement {
             return;
         }
         e.setCancelled(true);
-        if (e.getEntityType() == EntityType.PRIMED_TNT) {
+        if (e.getEntityType() == TrickyTrialsWrapper.impl.getTntEntityType()) {
             Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
                 e.getLocation().getBlock().setType(Material.TNT, false);
             }, 1L);

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/region/ResetCommand.java

@@ -20,7 +20,6 @@
 package de.steamwar.bausystem.features.region;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.config.BauServer;
 import de.steamwar.bausystem.region.GlobalRegion;
 import de.steamwar.bausystem.region.Region;
@@ -31,7 +30,6 @@ import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
 import de.steamwar.bausystem.utils.PasteBuilder;
 import de.steamwar.command.SWCommand;
-import de.steamwar.command.TypeValidator;
 import de.steamwar.linkage.Linked;
 import de.steamwar.linkage.LinkedInstance;
 import de.steamwar.sql.Punishment;
@@ -40,7 +38,6 @@ import de.steamwar.sql.SteamwarUser;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
-import java.io.IOException;
 import java.util.logging.Level;
 
 @Linked
@@ -61,7 +58,7 @@ public class ResetCommand extends SWCommand {
             PasteBuilder pasteBuilder = new PasteBuilder(new PasteBuilder.FileProvider(region.getResetFile(RegionType.NORMAL)))
                     .color(region.getPlain(Flag.COLOR, ColorMode.class).getColor());
             region.reset(pasteBuilder, RegionType.NORMAL, RegionExtensionType.NORMAL);
-            for (Flag value : Flag.values()) {
+            for (Flag value : Flag.getResetFlags()) {
                 region.set(value, value.getDefaultValue());
             }
             RegionUtils.message(region, "REGION_RESET_RESETED");

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/script/event/EventListener.java

@@ -24,14 +24,13 @@ import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.features.script.ScriptRunner;
 import de.steamwar.bausystem.features.script.lua.SteamWarGlobalLuaPlugin;
 import de.steamwar.bausystem.features.script.lua.libs.StorageLib;
-import de.steamwar.bausystem.features.tpslimit.TPSUtils;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
+import de.steamwar.core.TrickyTrialsWrapper;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -71,10 +70,11 @@ public class EventListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerQuit(PlayerQuitEvent event) {
-        StorageLib.removePlayer(event.getPlayer());
+        if(Permission.BUILD.hasPermission(event.getPlayer())) {
-        if(!Permission.BUILD.hasPermission(event.getPlayer())) return;
             ScriptRunner.callEvent(event.getPlayer(), SteamWarGlobalLuaPlugin.EventType.SelfLeave, LuaValue.NIL, event);
         }
+        StorageLib.removePlayer(event.getPlayer());
+    }
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerSwapHandItems(PlayerSwapHandItemsEvent event) {
@@ -146,7 +146,7 @@ public class EventListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onEntitySpawn(EntitySpawnEvent event) {
-        if (event.getEntityType() != EntityType.PRIMED_TNT) {
+        if (event.getEntityType() != TrickyTrialsWrapper.impl.getTntEntityType()) {
             return;
         }
         Region tntRegion = Region.getRegion(event.getLocation());
@@ -161,7 +161,7 @@ public class EventListener implements Listener {
 
     @EventHandler(priority = EventPriority.LOWEST)
     public void onEntityExplode(EntityExplodeEvent event) {
-        if (event.getEntityType() != EntityType.PRIMED_TNT) {
+        if (event.getEntityType() != TrickyTrialsWrapper.impl.getTntEntityType()) {
             return;
         }
         Region tntRegion = Region.getRegion(event.getLocation());

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

@@ -20,7 +20,6 @@
 package de.steamwar.bausystem.features.simulator;
 
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.Permission;
 import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.bausystem.features.simulator.execute.SimulatorExecutor;
@@ -63,15 +62,7 @@ public class SimulatorCommand extends SWCommand {
     }
 
     @Register(value = "copy", description = "SIMULATOR_COPY_HELP")
-    public void copy(@Validator Player p, @ErrorMessage("SIMULATOR_NOT_EXISTS") Simulator simulator, String name) {
+    public void copy(@Validator Player p, @ErrorMessage("SIMULATOR_NOT_EXISTS") Simulator simulator, @Validator("simulatorName") String name) {
-        if (SimulatorStorage.getSimulator(name) != null) {
-            BauSystem.MESSAGE.send("SIMULATOR_NAME_ALREADY_EXISTS", p);
-            return;
-        }
-        if (!name.matches("[a-zA-Z_0-9-]+")) {
-            BauSystem.MESSAGE.send("SIMULATOR_NAME_INVALID", p);
-            return;
-        }
         if (!SimulatorStorage.copy(simulator, name)) {
             BauSystem.MESSAGE.send("SIMULATOR_ERROR_COPY", p);
         }
@@ -88,6 +79,17 @@ public class SimulatorCommand extends SWCommand {
         SimulatorExecutor.run(simulator);
     }
 
+    @Register(value = "rename", description = "SIMULATOR_RENAME_HELP")
+    public void rename(@Validator Player p, @ErrorMessage("SIMULATOR_NOT_EXISTS") Simulator simulator, @Validator("simulatorName") String name) {
+        String oldName = simulator.getName();
+        if (SimulatorStorage.copy(simulator, name)) {
+            SimulatorStorage.delete(simulator);
+            BauSystem.MESSAGE.send("SIMULATOR_RENAMED", p, oldName, name);
+        } else {
+            BauSystem.MESSAGE.send("SIMULATOR_ERROR_COPY", p);
+        }
+    }
+
     @ClassMapper(value = Simulator.class, local = true)
     public TypeMapper<Simulator> allSimulators() {
         return new TypeMapper<>() {
@@ -102,4 +104,19 @@ public class SimulatorCommand extends SWCommand {
             }
         };
     }
+
+    @Validator(value = "simulatorName", local = true)
+    public TypeValidator<String> simulatorName() {
+        return (commandSender, name, messageSender) -> {
+            if (SimulatorStorage.getSimulator(name) != null) {
+                messageSender.send("SIMULATOR_NAME_ALREADY_EXISTS");
+                return false;
+            }
+            if (!name.matches("[a-zA-Z_0-9-]+")) {
+                messageSender.send("SIMULATOR_NAME_INVALID");
+                return false;
+            }
+            return true;
+        };
+    }
 }

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

@@ -19,7 +19,7 @@
 
 package de.steamwar.bausystem.features.simulator;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
@@ -72,9 +72,9 @@ import java.util.stream.Collectors;
 public class SimulatorCursor implements Listener {
 
     private final World WORLD = Bukkit.getWorlds().get(0);
-    private Class<?> position = Reflection.getClass("{nms.network.protocol.game}.PacketPlayInFlying$PacketPlayInPosition");
+    private Class<?> position = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$Pos");
-    private Class<?> look = Reflection.getClass("{nms.network.protocol.game}.PacketPlayInFlying$PacketPlayInLook");
+    private Class<?> look = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$Rot");
-    private Class<?> positionLook = Reflection.getClass("{nms.network.protocol.game}.PacketPlayInFlying$PacketPlayInPositionLook");
+    private Class<?> positionLook = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$PosRot");
 
     private Map<Player, CursorType> cursorType = Collections.synchronizedMap(new HashMap<>());
     private Map<Player, REntityServer> cursors = Collections.synchronizedMap(new HashMap<>());

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

@@ -44,6 +44,7 @@ import org.bukkit.inventory.meta.ItemMeta;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Linked
 @MinVersion(19)
@@ -130,7 +131,7 @@ public class SimulatorStorage implements Enable {
     }
 
     public static void openSimulatorSelector(Player player) {
-        SimulatorPageGui<Simulator> simulatorPageGui = new SimulatorPageGui<Simulator>(player, null, 6 * 9, new ArrayList<>(simulatorMap.values())) {
+        SimulatorPageGui<Simulator> simulatorPageGui = new SimulatorPageGui<Simulator>(player, null, 6 * 9, simulatorMap.values().stream().sorted(Comparator.comparing(Simulator::getName)).collect(Collectors.toList())) {
             @Override
             public String baseTitle() {
                 return "Simulators";

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

@@ -22,6 +22,7 @@ package de.steamwar.bausystem.features.simulator.gui.base;
 import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
 import de.steamwar.bausystem.features.simulator.data.Simulator;
 import de.steamwar.core.Core;
+import de.steamwar.core.TrickyTrialsWrapper;
 import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
 import org.bukkit.Bukkit;
@@ -69,7 +70,7 @@ public abstract class SimulatorBaseGui {
             return;
         }
 
-        player.getOpenInventory().close();
+        player.closeInventory();
 
         inventory = new SWInventory(player, () -> {
             inv = Bukkit.createInventory(null, size, title());

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/slaves/laufbau/states/ProcessingTracesState.java

@@ -24,6 +24,7 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.slaves.laufbau.BlockBoundingBox;
 import de.steamwar.bausystem.features.slaves.laufbau.Cuboid;
 import de.steamwar.bausystem.features.tracer.TNTPoint;
+import de.steamwar.bausystem.features.tracer.Trace;
 import de.steamwar.bausystem.features.tracer.TraceManager;
 import de.steamwar.bausystem.region.Point;
 import de.steamwar.bausystem.utils.FlatteningWrapper;
@@ -34,7 +35,6 @@ import org.bukkit.util.Vector;
 
 import java.util.*;
 import java.util.function.BiPredicate;
-import java.util.stream.Collectors;
 
 public class ProcessingTracesState implements LaufbauState {
 
@@ -45,8 +45,9 @@ public class ProcessingTracesState implements LaufbauState {
     private final List<BlockBoundingBox> elements;
     private final int factor;
 
-    private final List<TNTPoint> TNTPoints;
+    private final List<Trace> Traces;
-    private final int totalTntRecords;
+    private final List<TNTPoint> TNTPoints = new ArrayList<>();
+    private final int totalTraces;
 
     private final Set<Point> affectedBlocks = new HashSet<>();
     private final Map<Point, Set<Cuboid>> cuboidsPerChunk = new HashMap<>();
@@ -58,18 +59,13 @@ public class ProcessingTracesState implements LaufbauState {
         this.elements = elements;
         this.factor = factor;
 
-        // TODO: Optimize only retrieving traces inside of the affected regions!
+        Traces = new ArrayList<>(TraceManager.instance.getAll());
-        TNTPoints = TraceManager.instance.getAll()
+        totalTraces = Traces.size();
-                .stream()
-                .flatMap(trace -> trace.getHistories().stream())
-                .flatMap(Collection::stream)
-                .collect(Collectors.toList());
-        totalTntRecords = TNTPoints.size();
     }
 
     @Override
     public String actionBarMessage(Player p) {
-        return BauSystem.MESSAGE.parse("LAUFBAU_SIMPLE_PROGRESS", p, BauSystem.MESSAGE.parse("LAUFBAU_STATE_PROCESSING_TRACES", p), totalTntRecords - TNTPoints.size(), totalTntRecords, eta(p, start, totalTntRecords - TNTPoints.size(), totalTntRecords));
+        return BauSystem.MESSAGE.parse("LAUFBAU_SIMPLE_PROGRESS", p, BauSystem.MESSAGE.parse("LAUFBAU_STATE_PROCESSING_TRACES", p), totalTraces - Traces.size(), totalTraces, eta(p, start, totalTraces - Traces.size(), totalTraces));
     }
 
     private boolean inRegion(Vector location, int expansion) {
@@ -78,11 +74,17 @@ public class ProcessingTracesState implements LaufbauState {
 
     @Override
     public boolean hasNext() {
-        return !TNTPoints.isEmpty();
+        return !Traces.isEmpty() || !TNTPoints.isEmpty();
     }
 
     @Override
     public void next() {
+        if (TNTPoints.isEmpty()) {
+            Trace trace = Traces.remove(0);
+            trace.getHistories().stream().flatMap(Collection::stream).forEach(TNTPoints::add);
+            return;
+        }
+
         TNTPoint current = TNTPoints.remove(0);
         if (FlatteningWrapper.impl.inWater(world, current.getLocation().toVector())) return;
         if (!(inRegion(current.getLocation().toVector(), 1) || (current.getPrevious().isPresent() && inRegion(current.getPrevious().get().getLocation().toVector(), 1))))

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/smartplace/SmartPlaceListener.java

@@ -19,7 +19,7 @@
 
 package de.steamwar.bausystem.features.smartplace;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
@@ -81,7 +81,7 @@ public class SmartPlaceListener implements Listener {
         IGNORED.remove(Material.BARRIER);
     }
 
-    private static final Class<?> useItem = Reflection.getClass("{nms.network.protocol.game}.PacketPlayInUseItem");
+    private static final Class<?> useItem = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundUseItemOnPacket");
 
     private static final Set<Player> SMART_PLACING = new HashSet<>();
     private static final Set<Player> WAS_EXECUTED = new HashSet<>();

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/team/boundary/BoundaryViewer.java

@@ -23,6 +23,8 @@ import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.region.Point;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.bausystem.region.utils.RegionType;
+import de.steamwar.core.TrickyParticleWrapper;
+import de.steamwar.core.TrickyTrialsWrapper;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
 import org.bukkit.Particle;
@@ -56,7 +58,7 @@ public class BoundaryViewer implements Listener {
     }
 
     private void showRegion(Region region, Player player) {
-        drawCuboid(player, Particle.VILLAGER_HAPPY, region.getMinPoint(), region.getMaxPoint());
+        drawCuboid(player, TrickyParticleWrapper.impl.getVillagerHappy(), region.getMinPoint(), region.getMaxPoint());
         if (region.hasType(RegionType.TESTBLOCK)) {
             drawCuboid(player, Particle.END_ROD, region.getMinPointTestblockExtension(), region.getMaxPointTestblockExtension());
         }

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

@@ -19,7 +19,7 @@
 
 package de.steamwar.bausystem.features.tpslimit;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.core.BountifulWrapper;
 import de.steamwar.core.ChatWrapper;
@@ -45,18 +45,18 @@ class PacketCache {
     private static Set<Entity> entities = new HashSet<>();
     private static BukkitTask task = null;
 
-    private static Class<?> vec3dClass = Reflection.getClass("{nms.world.phys}.Vec3D");
+    private static Class<?> vec3dClass = Reflection.getClass("net.minecraft.world.phys.Vec3");
-    private static Reflection.FieldAccessor<Object> zeroVec3d = (Reflection.FieldAccessor<Object>) Reflection.getField(vec3dClass, vec3dClass, 0);
+    private static Reflection.Field<Object> zeroVec3d = (Reflection.Field<Object>) Reflection.getField(vec3dClass, vec3dClass, 0);
     private static Object ZERO_VEC3D = zeroVec3d.get(null);
-    private static Class<?> velocityPacketClass = Reflection.getClass("{nms.network.protocol.game}.PacketPlayOutEntityVelocity");
+    private static Class<?> velocityPacketClass = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket");
-    private static Reflection.ConstructorInvoker velocityPacketConstructor = Reflection.getConstructor(velocityPacketClass, int.class, vec3dClass);
+    private static Reflection.Constructor velocityPacketConstructor = Reflection.getConstructor(velocityPacketClass, int.class, vec3dClass);
 
-    private static Class<?> teleportPacketClass = Reflection.getClass("{nms.network.protocol.game}.PacketPlayOutEntityTeleport");
+    private static Class<?> teleportPacketClass = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket");
-    private static Class<?> entityClass = Reflection.getClass("{nms.world.entity}.Entity");
+    private static Class<?> entityClass = Reflection.getClass("net.minecraft.world.entity.Entity");
-    private static Reflection.ConstructorInvoker teleportPacketConstructor = Reflection.getConstructor(teleportPacketClass, entityClass);
+    private static Reflection.Constructor teleportPacketConstructor = Reflection.getConstructor(teleportPacketClass, entityClass);
 
-    private static Class<?> craftEntityClass = Reflection.getClass("{obc}.entity.CraftEntity");
+    private static Class<?> craftEntityClass = Reflection.getClass("org.bukkit.craftbukkit.entity.CraftEntity");
-    private static Reflection.MethodInvoker getHandle = Reflection.getMethod(craftEntityClass, "getHandle");
+    private static Reflection.Method getHandle = Reflection.getMethod(craftEntityClass, "getHandle");
 
     private static Object noGravityDataWatcher = BountifulWrapper.impl.getDataWatcherObject(5, Boolean.class);
     private static Object fuseDataWatcher = BountifulWrapper.impl.getDataWatcherObject(8, Integer.class);

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

@@ -19,7 +19,7 @@
 
 package de.steamwar.bausystem.features.tpslimit;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
 import lombok.Getter;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Bukkit;
@@ -28,11 +28,11 @@ import org.bukkit.World;
 @UtilityClass
 public class TPSFreezeUtils {
 
-    private static Reflection.FieldAccessor<Boolean> fieldAccessor;
+    private static Reflection.Field<Boolean> fieldAccessor;
     @Getter
     private static final boolean canFreeze;
 
-    private static final Reflection.MethodInvoker getWorldHandle = Reflection.getTypedMethod(Reflection.getClass("{obc}.CraftWorld"), "getHandle", null);
+    private static final Reflection.Method getWorldHandle = Reflection.getTypedMethod(Reflection.getClass("org.bukkit.craftbukkit.CraftWorld"), "getHandle", null);
 
     @Getter
     private static boolean frozen = false;
@@ -40,9 +40,9 @@ public class TPSFreezeUtils {
     private static final World world = Bukkit.getWorlds().get(0);
 
     static {
-        Reflection.FieldAccessor<Boolean> fieldAccessor;
+        Reflection.Field<Boolean> fieldAccessor;
         try {
-            fieldAccessor = Reflection.getField(Reflection.getClass("{nms.server.level}.WorldServer"), "freezed", boolean.class);
+            fieldAccessor = Reflection.getField(Reflection.getClass("net.minecraft.server.level.ServerLevel"), "freezed", boolean.class);
         } catch (IllegalArgumentException e) {
             fieldAccessor = null;
         }

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

@@ -19,15 +19,12 @@
 
 package de.steamwar.bausystem.features.tpslimit;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;
-import de.steamwar.bausystem.SWUtils;
 import de.steamwar.bausystem.utils.PlayerMovementWrapper;
 import de.steamwar.core.Core;
-import de.steamwar.core.TPSWatcher;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Bukkit;
-import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitTask;
 
@@ -104,8 +101,8 @@ public class TPSLimitUtils {
     }
      */
 
-    private static final Class<?> position = Reflection.getClass("{nms.network.protocol.game}.PacketPlayInFlying$PacketPlayInPosition");
+    private static final Class<?> position = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$Pos");
-    private static final Class<?> positionLook = Reflection.getClass("{nms.network.protocol.game}.PacketPlayInFlying$PacketPlayInPositionLook");
+    private static final Class<?> positionLook = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$PosRot");
     static {
         BiFunction<Player, Object, Object> positionSetter = (player, o) -> {
             if (tpsLimiter != null) {

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

@@ -22,6 +22,8 @@ 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 lombok.AccessLevel;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -39,8 +41,9 @@ import java.util.Optional;
 /**
  * Recording of a tnt at a specific tick
  */
+@AllArgsConstructor(access = AccessLevel.PACKAGE)
 @Getter
-public class TNTPoint implements Externalizable {
+public class TNTPoint{
     /**
      * Unique number to identify records being of the same tnt
      */
@@ -97,12 +100,9 @@ public class TNTPoint implements Externalizable {
     private List<TNTPoint> history;
 
     /**
-     * Constructor for deserialization only !! Do not Call !!
+     * Constructor for object creation in trace recording
      */
-    public TNTPoint() {
+    protected TNTPoint(int tntId, TNTPrimed tnt, boolean explosion, boolean afterFirstExplosion, long ticksSinceStart,
-    }
-
-    public TNTPoint(int tntId, TNTPrimed tnt, boolean explosion, boolean afterFirstExplosion, long ticksSinceStart,
                     List<TNTPoint> history, List<Block> destroyedBlocks) {
         this.tntId = tntId;
         this.explosion = explosion;
@@ -161,44 +161,6 @@ public class TNTPoint implements Externalizable {
         this.history = history;
     }
 
-    @Override
-    public void writeExternal(ObjectOutput objectOutput) throws IOException {
-        objectOutput.writeInt(tntId);
-        objectOutput.writeBoolean(explosion);
-        objectOutput.writeBoolean(inWater);
-        objectOutput.writeBoolean(afterFirstExplosion);
-        objectOutput.writeBoolean(destroyedBuildArea);
-        objectOutput.writeBoolean(destroyedTestBlock);
-        objectOutput.writeLong(ticksSinceStart);
-        objectOutput.writeInt(fuse);
-        objectOutput.writeDouble(location.getX());
-        objectOutput.writeDouble(location.getY());
-        objectOutput.writeDouble(location.getZ());
-        objectOutput.writeDouble(velocity.getX());
-        objectOutput.writeDouble(velocity.getY());
-        objectOutput.writeDouble(velocity.getZ());
-    }
-
-    @Override
-    public void readExternal(ObjectInput objectInput) throws IOException {
-        tntId = objectInput.readInt();
-        explosion = objectInput.readBoolean();
-        inWater = objectInput.readBoolean();
-        afterFirstExplosion = objectInput.readBoolean();
-        destroyedBuildArea = objectInput.readBoolean();
-        destroyedTestBlock = objectInput.readBoolean();
-        ticksSinceStart = objectInput.readLong();
-        fuse = objectInput.readInt();
-        double locX = objectInput.readDouble();
-        double locY = objectInput.readDouble();
-        double locZ = objectInput.readDouble();
-        location = new Location(Bukkit.getWorlds().get(0), locX, locY, locZ);
-        double velX = objectInput.readDouble();
-        double velY = objectInput.readDouble();
-        double velZ = objectInput.readDouble();
-        velocity = new Vector(velX, velY, velZ);
-    }
-
     @Override
     public String toString() {
         return "TNTPoint{" +

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

@@ -26,20 +26,16 @@ import de.steamwar.bausystem.features.tracer.rendering.ViewFlag;
 import de.steamwar.bausystem.region.Region;
 import de.steamwar.entity.REntity;
 import de.steamwar.entity.REntityServer;
-import lombok.Cleanup;
 import lombok.Getter;
+import lombok.Setter;
 import lombok.SneakyThrows;
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
-import java.io.*;
+import java.io.File;
 import java.lang.ref.SoftReference;
 import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import java.util.zip.GZIPInputStream;
 
 public class Trace {
     /**
@@ -77,6 +73,10 @@ public class Trace {
      */
     private SoftReference<List<TNTPoint>> records;
 
+    @Setter
+    @Getter
+    private int recordsCount;
+
     /**
      * A map of all REntityServers rendering this trace
      */
@@ -91,46 +91,25 @@ public class Trace {
     @SneakyThrows
     public Trace(Region region, List<TNTPoint> recordList) {
         this.uuid = UUID.randomUUID();
-        recordsSaveFile = new File(TraceManager.tracesFolder, uuid + ".records");
         this.region = region;
         this.date = new Date();
         records = new SoftReference<>(recordList);
-        metadataSaveFile = new File(TraceManager.tracesFolder, uuid + ".meta");
+        recordsSaveFile = new File(TraceRepository.tracesFolder, uuid + ".records");
-
+        metadataSaveFile = new File(TraceRepository.tracesFolder, uuid + ".meta");
-        @Cleanup
-        ObjectOutputStream outputStream = new ObjectOutputStream(new FileOutputStream(metadataSaveFile));
-        outputStream.writeUTF(uuid.toString());
-        outputStream.writeUTF(region.getName());
-        outputStream.writeObject(date);
     }
 
     /**
-     * Constructor for serialising a trace from the file system
+     * Constructor for deserialising a trace from the file system
-     *
-     * @param metadataSaveFile the file for this traces metadata
      */
     @SneakyThrows
-    public Trace(File metadataSaveFile) {
+    protected Trace(UUID uuid, Region region, Date date, File metadataFile, File recordsFile, int recordsCount) {
-        String uuid = null;
+        this.metadataSaveFile = metadataFile;
-        Region region = null;
+        recordsSaveFile = recordsFile;
-        Date date = null;
+        this.uuid = uuid;
-
-        this.metadataSaveFile = metadataSaveFile;
-
-        try {
-            @Cleanup
-            ObjectInputStream inputStream = new ObjectInputStream(new FileInputStream(metadataSaveFile));
-            uuid = inputStream.readUTF();
-            region = Region.getREGION_MAP().get(inputStream.readUTF());
-            date = (Date) inputStream.readObject();
-            inputStream.close();
-        } finally {
-            this.uuid = UUID.fromString(uuid);
         this.region = region;
         this.date = date;
-            recordsSaveFile = new File(TraceManager.tracesFolder, uuid + ".records");
         this.records = new SoftReference<>(null);
-        }
+        this.recordsCount = recordsCount;
     }
 
     /**
@@ -173,7 +152,8 @@ public class Trace {
             entityServer = new REntityServer();
             entityServer.addPlayer(player);
             entityServer.setCallback((p, rEntity, entityAction) -> {
-                if (entityAction != REntityServer.EntityAction.INTERACT) return;
+                if (entityAction != REntityServer.EntityAction.INTERACT)
+                    return;
                 if (rEntity instanceof TraceEntity) {
                     ((TraceEntity) rEntity).printIntoChat(p);
                 }
@@ -195,7 +175,8 @@ public class Trace {
             REntityServer newEntityServer = new REntityServer();
             newEntityServer.addPlayer(k);
             newEntityServer.setCallback((p, rEntity, entityAction) -> {
-                if (entityAction != REntityServer.EntityAction.INTERACT) return;
+                if (entityAction != REntityServer.EntityAction.INTERACT)
+                    return;
                 if (rEntity instanceof TraceEntity) {
                     ((TraceEntity) rEntity).printIntoChat(p);
                 }
@@ -234,7 +215,8 @@ public class Trace {
         List<TraceEntity> entities = new LinkedList<>();
 
         for (List<TNTPoint> bundle : bundles) {
-            entities.add(new TraceEntity(entityServer, bundle.get(0).getLocation(), bundle.get(0).isExplosion(), bundle, this));
+            entities.add(new TraceEntity(entityServer, bundle.get(0).getLocation(), bundle.get(0).isExplosion(), bundle,
+                    this));
         }
 
         // Apply modifiers
@@ -312,38 +294,7 @@ public class Trace {
      * Loads the records of this trace from storage to memory
      */
     private void loadRecords() {
-        List<TNTPoint> records = new ArrayList<>();
+        records = new SoftReference<>(TraceRepository.readTraceRecords(this));
-        long readBytes = 0;
-        try {
-            FileInputStream fileInputStream = new FileInputStream(recordsSaveFile);
-
-            @Cleanup
-            ObjectInputStream inputStream = new ObjectInputStream(new GZIPInputStream(fileInputStream));
-            long fileLenght = recordsSaveFile.length();
-            while (fileInputStream.getChannel().position() < fileLenght) {
-                records.add((TNTPoint) inputStream.readObject());
-                readBytes = fileInputStream.getChannel().position();
-            }
-        } catch (EOFException e) {
-            Logger logger = Bukkit.getLogger();
-            logger.log(Level.WARNING, "EOF in trace read detected in " + uuid);
-            logger.log(Level.WARNING, "Read " + readBytes + "/" + recordsSaveFile.length() + " Bytes");
-            logger.log(Level.WARNING, "Read so far: " + records);
-
-            e.printStackTrace();
-        } catch (IOException | ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        Map<Integer, List<TNTPoint>> histories = new HashMap<>();
-        for (TNTPoint record : records) {
-            int tntId = record.getTntId();
-            List<TNTPoint> history = histories.computeIfAbsent(tntId, id -> new ArrayList<>());
-            history.add(record);
-            record.setHistory(history);
-        }
-
-        this.records = new SoftReference<>(records);
     }
 
     public synchronized List<TNTPoint> getRecords() {
@@ -360,6 +311,7 @@ public class Trace {
                 ", region=" + region +
                 ", creationTime=" + date +
                 ", recordsSaveFile=" + recordsSaveFile.getName() +
+                ", recordCount=" + recordsCount +
                 ", records=" + getRecords() +
                 '}';
     }

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

@@ -30,11 +30,14 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.server.PluginEnableEvent;
 
 import java.io.File;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static de.steamwar.bausystem.features.tracer.TraceRepository.tracesFolder;
+
 @Linked
 public class TraceManager implements Listener {
 
@@ -44,9 +47,9 @@ public class TraceManager implements Listener {
         instance = this;
     }
 
-    public static File tracesFolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "traces");
 
-    public TraceManager() {
+
+    public void init() {
         if (!tracesFolder.exists())
             tracesFolder.mkdir();
 
@@ -58,7 +61,15 @@ public class TraceManager implements Listener {
             if (traceFile.getName().contains(".records"))
                 continue;
 
-            add(new Trace(traceFile));
+            if (TraceRepository.getVersion(traceFile) == TraceRepository.SERIALISATION_VERSION) {
+                add(TraceRepository.readTrace(traceFile));
+            } else {
+                String uuid = traceFile.getName().replace(".meta", "");
+
+                new File(tracesFolder, uuid + ".records").deleteOnExit();
+                new File(tracesFolder, uuid + ".meta").deleteOnExit();
+            }
+
         }
     }
 
@@ -131,17 +142,18 @@ public class TraceManager implements Listener {
      *
      * @param trace the trace to be removed
      */
-    public boolean remove(Trace trace) {
+    public void remove(Trace trace) {
         Map<Integer, Trace> traces = tracesByRegion.getOrDefault(trace.getRegion(), Collections.emptyMap());
         Integer traceId = traces.entrySet().stream()
                 .filter(entry -> entry.getValue() == trace)
                 .map(Map.Entry::getKey)
                 .findFirst()
                 .orElse(null);
-        if (traceId == null) return false;
+        if (traceId == null) throw new RuntimeException("Trace not found while trying to remove see (c978eb98-b0b2-4009-91d8-acfa34e2831a)");
         traces.remove(traceId);
         trace.hide();
-        return true;
+        trace.getMetadataSaveFile().delete();
+        trace.getRecordsSaveFile().delete();
     }
 
     /**

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

@@ -31,6 +31,7 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.entity.EntitySpawnEvent;
+import org.bukkit.event.server.PluginEnableEvent;
 
 import java.util.*;
 import java.util.logging.Level;
@@ -70,7 +71,7 @@ public class TraceRecorder implements Listener {
      */
     private final Set<Region> autoTraceRegions = new HashSet<>();
 
-    public TraceRecorder() {
+    public void init() {
         BauSystem.runTaskTimer(BauSystem.getInstance(), () -> {
             record();
             checkForAutoTraceFinish();
@@ -170,8 +171,7 @@ public class TraceRecorder implements Listener {
         if (history.size() == 0) {
             try {
                 historyMap.put(tntPrimed, history);
-            }
+            } catch (NullPointerException e) {
-            catch (NullPointerException e) {
                 Logger logger = Bukkit.getLogger();
                 //TODO remove when no longer neccecary
                 logger.log(Level.WARNING, "Nullpointer thrown by historyMap");

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

@@ -24,28 +24,22 @@ import de.steamwar.bausystem.region.Region;
 import lombok.Getter;
 import lombok.SneakyThrows;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.zip.GZIPOutputStream;
 
 public class TraceRecordingWrapper {
 
+    @Getter
+    private final Trace trace;
+
     @Getter
     private final long startTick;
     private final List<TNTPoint> recordsToAdd;
     private final List<TNTPoint> recordList;
-    private final ObjectOutputStream recordsOutputStream;
     private int nextOpenRecordId = 0;
     @Getter
     private boolean explosionRecorded = false;
 
-    @Getter
-    private final Trace trace;
-
     @SneakyThrows
     public TraceRecordingWrapper(Region region) {
         startTick = TPSUtils.currentRealTick.get();
@@ -53,8 +47,6 @@ public class TraceRecordingWrapper {
         recordList = new ArrayList<>();
 
         trace = new Trace(region, recordList);
-        File recordsSaveFile = new File(TraceManager.tracesFolder, trace.getUuid() + ".records");
-        recordsOutputStream = new ObjectOutputStream(new GZIPOutputStream(new FileOutputStream(recordsSaveFile)));
     }
 
     public int getNextOpenRecordIdAndIncrement() {
@@ -72,23 +64,14 @@ public class TraceRecordingWrapper {
     public void commitRecorded() {
         TraceManager.instance.showPartial(trace, recordsToAdd);
 
-        recordsToAdd.forEach(record -> {
-            try {
-                recordsOutputStream.writeObject(record);
-                recordsOutputStream.flush();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        });
-
         recordList.addAll(recordsToAdd);
+        trace.setRecordsCount(recordList.size());
         recordsToAdd.clear();
     }
 
     @SneakyThrows
     protected void finalizeRecording() {
-        recordsOutputStream.flush();
+        TraceRepository.writeTrace(trace, recordList);
-        recordsOutputStream.close();
         TraceManager.instance.add(trace);
     }
 }

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

@@ -0,0 +1,136 @@
+package de.steamwar.bausystem.features.tracer;
+
+import de.steamwar.bausystem.region.Region;
+import lombok.Cleanup;
+import lombok.SneakyThrows;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.util.Vector;
+
+import java.io.*;
+import java.util.*;
+
+public class TraceRepository {
+
+    /**
+     * Increment this when changing serialisation format
+     */
+    public static final int SERIALISATION_VERSION = 1;
+    public static File tracesFolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "traces");
+
+    @SneakyThrows
+    protected static int getVersion(File metadataFile) {
+        @Cleanup
+        ObjectInputStream reader = new ObjectInputStream(new FileInputStream(metadataFile));
+        reader.readUTF();
+        reader.readUTF();
+        reader.readObject();
+        try {
+            int version = reader.readInt();
+            return version;
+        } catch (EOFException e) {
+            return 0;
+        }
+    }
+
+    @SneakyThrows
+    public static Trace readTrace(File metadataFile) {
+        @Cleanup
+        ObjectInputStream reader = new ObjectInputStream(new FileInputStream(metadataFile));
+        UUID uuid = UUID.fromString(reader.readUTF());
+        Region region = Region.getREGION_MAP().get(reader.readUTF());
+        Date date = (Date) reader.readObject();
+        File recordsFile = new File(tracesFolder,uuid + ".records");
+        int serialisationVersion = reader.readInt();
+        int recordsCount = reader.readInt();
+
+        return new Trace(uuid, region, date, metadataFile, recordsFile, recordsCount);
+    }
+
+    @SneakyThrows
+    protected static void writeTrace(Trace trace, List<TNTPoint> records) {
+        ObjectOutputStream outputStream = new ObjectOutputStream(new FileOutputStream(trace.getMetadataSaveFile()));
+        outputStream.writeUTF(trace.getUuid().toString());
+        outputStream.writeUTF(trace.getRegion().getName());
+        outputStream.writeObject(trace.getDate());
+        outputStream.writeInt(SERIALISATION_VERSION);
+        outputStream.writeInt(records.size());
+        outputStream.flush();
+        outputStream.close();
+
+
+        writeTraceRecords(trace.getRecordsSaveFile(), records);
+    }
+
+    @SneakyThrows
+    protected static void writeTraceRecords(File recordsFile, List<TNTPoint> records) {
+        DataOutputStream outputStream = new DataOutputStream(new FileOutputStream(recordsFile));
+        for (TNTPoint record : records) {
+            outputStream.writeInt(record.getTntId());
+            outputStream.writeBoolean(record.isExplosion());
+            outputStream.writeBoolean(record.isInWater());
+            outputStream.writeBoolean(record.isAfterFirstExplosion());
+            outputStream.writeBoolean(record.isDestroyedBuildArea());
+            outputStream.writeBoolean(record.isDestroyedTestBlock());
+            outputStream.writeLong(record.getTicksSinceStart());
+            outputStream.writeInt(record.getFuse());
+            Location location = record.getLocation();
+            outputStream.writeDouble(location.getX());
+            outputStream.writeDouble(location.getY());
+            outputStream.writeDouble(location.getZ());
+            Vector velocity = record.getVelocity();
+            outputStream.writeDouble(velocity.getX());
+            outputStream.writeDouble(velocity.getY());
+            outputStream.writeDouble(velocity.getZ());
+        }
+        outputStream.flush();
+        outputStream.close();
+    }
+
+    @SneakyThrows
+    protected static TNTPoint readTraceRecord(DataInputStream objectInput) {
+
+        int tntId = objectInput.readInt();
+        boolean explosion = objectInput.readBoolean();
+        boolean inWater = objectInput.readBoolean();
+        boolean afterFirstExplosion = objectInput.readBoolean();
+        boolean destroyedBuildArea = objectInput.readBoolean();
+        boolean destroyedTestBlock = objectInput.readBoolean();
+        long ticksSinceStart = objectInput.readLong();
+        int fuse = objectInput.readInt();
+
+        double locX = objectInput.readDouble();
+        double locY = objectInput.readDouble();
+        double locZ = objectInput.readDouble();
+        Location location = new Location(Bukkit.getWorlds().get(0), locX, locY, locZ);
+
+        double velX = objectInput.readDouble();
+        double velY = objectInput.readDouble();
+        double velZ = objectInput.readDouble();
+        Vector velocity = new Vector(velX, velY, velZ);
+
+        return new TNTPoint(tntId, explosion, inWater, afterFirstExplosion, destroyedBuildArea, destroyedTestBlock, ticksSinceStart, fuse, location, velocity, Collections.emptyList());
+    }
+
+    @SneakyThrows
+    protected static List<TNTPoint> readTraceRecords(Trace trace) {
+        File recordsFile = trace.getRecordsSaveFile();
+        @Cleanup
+        DataInputStream inputStream = new DataInputStream(new FileInputStream(recordsFile));
+
+        List<TNTPoint> records = new ArrayList<>();
+        for (int i = 0; i < trace.getRecordsCount(); i++) {
+            records.add(readTraceRecord(inputStream));
+        }
+
+        Map<Integer, List<TNTPoint>> histories = new HashMap<>();
+        for (TNTPoint record : records) {
+            int tntId = record.getTntId();
+            List<TNTPoint> history = histories.computeIfAbsent(tntId, id -> new ArrayList<>());
+            history.add(record);
+            record.setHistory(history);
+        }
+
+        return records;
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/NoClipCommand.java

@@ -19,7 +19,7 @@
 
 package de.steamwar.bausystem.features.util;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;
 import com.mojang.authlib.GameProfile;
 import de.steamwar.bausystem.BauSystem;
@@ -49,15 +49,15 @@ import java.util.function.BiFunction;
 @Linked
 public class NoClipCommand extends SWCommand implements Listener {
 
-    public static final Class<?> gameStateChange = Reflection.getClass("{nms.network.protocol.game}.PacketPlayOutGameStateChange");
+    public static final Class<?> gameStateChange = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundGameEventPacket");
-    private static final Reflection.FieldAccessor<Float> floatFieldAccessor = Reflection.getField(gameStateChange, float.class, 0);
+    private static final Reflection.Field<Float> floatFieldAccessor = Reflection.getField(gameStateChange, float.class, 0);
 
-    private static final Class<?> position = Reflection.getClass("{nms.network.protocol.game}.PacketPlayInFlying$PacketPlayInPosition");
+    private static final Class<?> position = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$Pos");
-    private static final Class<?> positionLook = Reflection.getClass("{nms.network.protocol.game}.PacketPlayInFlying$PacketPlayInPositionLook");
+    private static final Class<?> positionLook = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$PosRot");
-    private static final Class<?> useItem = Reflection.getClass("{nms.network.protocol.game}.PacketPlayInUseItem");
+    private static final Class<?> useItem = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundUseItemOnPacket");
-    private static final Class<?> blockDig = Reflection.getClass("{nms.network.protocol.game}.PacketPlayInBlockDig");
+    private static final Class<?> blockDig = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundPlayerActionPacket");
-    private static final Class<?> windowClick = Reflection.getClass("{nms.network.protocol.game}.PacketPlayInWindowClick");
+    private static final Class<?> windowClick = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundContainerClickPacket");
-    private static final Class<?> setSlotStack = Reflection.getClass("{nms.network.protocol.game}.PacketPlayInSetCreativeSlot");
+    private static final Class<?> setSlotStack = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundSetCreativeModeSlotPacket");
 
     @Getter
     private static final List<Player> NOCLIPS = new ArrayList<>();

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SpeedCommand.java

@@ -39,12 +39,12 @@ public class SpeedCommand extends SWCommand {
 
     @Register
     public void speedCommand(Player p, float speed) {
-        speed = speed / 10F;
+        if (speed < -10F) {
-        if (speed < -1F) {
             BauSystem.MESSAGE.send("SPEED_TOO_SMALL", p, speed);
-        } else if (speed > 1F) {
+        } else if (speed > 10F) {
             BauSystem.MESSAGE.send("SPEED_TOO_HIGH", p, speed);
         } else {
+            speed = speed / 10F;
             p.setFlySpeed(speed);
             p.setWalkSpeed(Math.min(speed + 0.1F, 1F));
             BauSystem.MESSAGE.send("SPEED_CURRENT", p, (p.getFlySpeed() * 10F));

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/items/NightVisionBauGuiItem.java

@@ -47,7 +47,6 @@ public class NightVisionBauGuiItem extends BauGuiItem {
             PotionMeta meta = (PotionMeta) itemStack.getItemMeta();
             meta.setColor(PotionEffectType.NIGHT_VISION.getColor());
             meta.setDisplayName(BauSystem.MESSAGE.parse("NIGHT_VISION_ITEM_ON", player));
-            meta.addItemFlags(ItemFlag.HIDE_POTION_EFFECTS);
             meta.setCustomModelData(1);
             itemStack.setItemMeta(meta);
             return itemStack;

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

@@ -20,6 +20,7 @@
 package de.steamwar.bausystem.features.world;
 
 import de.steamwar.bausystem.BauSystem;
+import de.steamwar.core.CRIUWakeupEvent;
 import de.steamwar.core.CheckpointUtils;
 import de.steamwar.linkage.Linked;
 import org.bukkit.Bukkit;
@@ -69,4 +70,9 @@ public class AFKStopperListener implements Listener {
         if(Bukkit.getOnlinePlayers().isEmpty() || (Bukkit.getOnlinePlayers().size() == 1 && Bukkit.getOnlinePlayers().contains(event.getPlayer())))
             CheckpointUtils.freeze();
     }
+
+    @EventHandler
+    public void onCRIUWakeup(CRIUWakeupEvent event) {
+        lastMovementTime = System.currentTimeMillis();
+    }
 }

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

@@ -21,6 +21,7 @@ package de.steamwar.bausystem.features.world;
 
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.config.BauServer;
+import de.steamwar.core.CRIUWakeupEvent;
 import de.steamwar.linkage.Linked;
 import de.steamwar.sql.BauweltMember;
 import de.steamwar.sql.SteamwarUser;
@@ -32,7 +33,6 @@ import org.bukkit.event.player.PlayerJoinEvent;
 @Linked
 public class AntiBauAddMemberFix implements Listener {
 
-
     @EventHandler(priority = EventPriority.LOW)
     public void onPlayerJoin(PlayerJoinEvent event) {
         if (BauSystem.DEV_SERVER) return;
@@ -44,4 +44,9 @@ public class AntiBauAddMemberFix implements Listener {
             throw new SecurityException("The player " + event.getPlayer().getName() + " joined on the server of " + SteamwarUser.get(BauServer.getInstance().getOwnerID()).getUserName() + " without being added!");
         }
     }
+
+    @EventHandler
+    public void onCRIUWakeup(CRIUWakeupEvent event) {
+        BauweltMember.clear();
+    }
 }

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

@@ -19,7 +19,7 @@
 
 package de.steamwar.bausystem.features.world;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.linkage.Linked;
@@ -32,7 +32,7 @@ public class AntiCursorReCentering implements Enable {
 
     @Override
     public void enable() {
-        Class<?> closeWindow = Reflection.getClass("{nms.network.protocol.game}.PacketPlayOutCloseWindow");
+        Class<?> closeWindow = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundContainerClosePacket");
         TinyProtocol.instance.addFilter(closeWindow, (player, object) -> {
             if (player.getOpenInventory().getTopInventory().getType() == InventoryType.CRAFTING) {
                 return object;

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

@@ -56,7 +56,7 @@ public class BauScoreboard implements Listener {
     public void handlePlayerJoin(PlayerJoinEvent event) {
         Player player = event.getPlayer();
 
-        SWScoreboard.createScoreboard(player, new ScoreboardCallback() {
+        SWScoreboard.impl.createScoreboard(player, new ScoreboardCallback() {
             @Override
             public HashMap<String, Integer> getData() {
                 Region region = Region.getRegion(player.getLocation());

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

@@ -19,7 +19,7 @@
 
 package de.steamwar.bausystem.features.world;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.bausystem.utils.NMSWrapper;
 import de.steamwar.linkage.Linked;
@@ -29,7 +29,7 @@ import org.bukkit.GameMode;
 public class NoCreativeKnockback {
 
     public NoCreativeKnockback() {
-        TinyProtocol.instance.addFilter(Reflection.getClass("{nms.network.protocol.game}.PacketPlayOutExplosion"), (player, o) -> {
+        TinyProtocol.instance.addFilter(Reflection.getClass("net.minecraft.network.protocol.game.ClientboundExplodePacket"), (player, o) -> {
             if (player.getGameMode() != GameMode.CREATIVE) return o;
             return NMSWrapper.impl.resetExplosionKnockback(o);
         });

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

@@ -19,7 +19,7 @@
 
 package de.steamwar.bausystem.features.world;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
@@ -48,21 +48,21 @@ import org.bukkit.util.Vector;
 @MinVersion(20)
 public class SignEditFrom20 implements Listener {
 
-    private static final Class<?> blockPosition = Reflection.getClass("{nms.core}.BlockPosition");
+    private static final Class<?> blockPosition = Reflection.getClass("net.minecraft.core.BlockPos");
-    private static final Class<?> craftBlock = Reflection.getClass("{obc}.block.CraftBlock");
+    private static final Class<?> craftBlock = Reflection.getClass("org.bukkit.craftbukkit.block.CraftBlock");
-    private static final Class<?> craftWorld = Reflection.getClass("{obc}.CraftWorld");
+    private static final Class<?> craftWorld = Reflection.getClass("org.bukkit.craftbukkit.CraftWorld");
-    private static final Class<?> generatorAccess = Reflection.getClass("{nms.world.level}.GeneratorAccess");
+    private static final Class<?> generatorAccess = Reflection.getClass("net.minecraft.world.level.LevelAccessor");
-    private static final Reflection.MethodInvoker getPosition = Reflection.getTypedMethod(craftBlock, "getPosition", blockPosition);
+    private static final Reflection.Method getPosition = Reflection.getTypedMethod(craftBlock, "getPosition", blockPosition);
-    private static final Reflection.MethodInvoker getWorldHandle = Reflection.getTypedMethod(craftWorld, "getHandle", null);
+    private static final Reflection.Method getWorldHandle = Reflection.getTypedMethod(craftWorld, "getHandle", null);
-    private static final Reflection.MethodInvoker at = Reflection.getTypedMethod(craftBlock, "at", craftBlock, generatorAccess, blockPosition);
+    private static final Reflection.Method at = Reflection.getTypedMethod(craftBlock, "at", craftBlock, generatorAccess, blockPosition);
 
-    private static final Class<?> openSign = Reflection.getClass("{nms.network.protocol.game}.PacketPlayOutOpenSignEditor");
+    private static final Class<?> openSign = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundOpenSignEditorPacket");
-    private static final Reflection.FieldAccessor<?> blockPositionFieldAccessor = Reflection.getField(openSign, blockPosition, 0);
+    private static final Reflection.Field<?> blockPositionFieldAccessor = Reflection.getField(openSign, blockPosition, 0);
-    private static final Reflection.FieldAccessor<?> sideFieldAccessor = Reflection.getField(openSign, boolean.class, 0);
+    private static final Reflection.Field<?> sideFieldAccessor = Reflection.getField(openSign, boolean.class, 0);
 
-    private static final Class<?> updateSign = Reflection.getClass("{nms.network.protocol.game}.PacketPlayInUpdateSign");
+    private static final Class<?> updateSign = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundSignUpdatePacket");
-    private static final Reflection.FieldAccessor<?> getBlockPositionFieldAccessor = Reflection.getField(updateSign, blockPosition, 0);
+    private static final Reflection.Field<?> getBlockPositionFieldAccessor = Reflection.getField(updateSign, blockPosition, 0);
-    private static final Reflection.FieldAccessor<String[]> stringFieldAccessor = Reflection.getField(updateSign, String[].class, 0);
+    private static final Reflection.Field<String[]> stringFieldAccessor = Reflection.getField(updateSign, String[].class, 0);
 
     @EventHandler
     public void editSign(PlayerInteractEvent event) {

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

@@ -19,7 +19,7 @@
 
 package de.steamwar.bausystem.features.world;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.Permission;
@@ -40,20 +40,20 @@ import org.bukkit.event.player.PlayerInteractEvent;
 @MaxVersion(19)
 public class SignEditUntil19 implements Listener {
 
-    private static final Class<?> blockPosition = Reflection.getClass("{nms.core}.BlockPosition");
+    private static final Class<?> blockPosition = Reflection.getClass("net.minecraft.core.BlockPos");
-    private static final Class<?> craftBlock = Reflection.getClass("{obc}.block.CraftBlock");
+    private static final Class<?> craftBlock = Reflection.getClass("org.bukkit.craftbukkit.block.CraftBlock");
-    private static final Class<?> craftWorld = Reflection.getClass("{obc}.CraftWorld");
+    private static final Class<?> craftWorld = Reflection.getClass("org.bukkit.craftbukkit.CraftWorld");
-    private static final Class<?> generatorAccess = Reflection.getClass("{nms.world.level}.GeneratorAccess");
+    private static final Class<?> generatorAccess = Reflection.getClass("net.minecraft.world.level.LevelAccessor");
-    private static final Reflection.MethodInvoker getPosition = Reflection.getTypedMethod(craftBlock, "getPosition", blockPosition);
+    private static final Reflection.Method getPosition = Reflection.getTypedMethod(craftBlock, "getPosition", blockPosition);
-    private static final Reflection.MethodInvoker getWorldHandle = Reflection.getTypedMethod(craftWorld, "getHandle", null);
+    private static final Reflection.Method getWorldHandle = Reflection.getTypedMethod(craftWorld, "getHandle", null);
-    private static final Reflection.MethodInvoker at = Reflection.getTypedMethod(craftBlock, "at", craftBlock, generatorAccess, blockPosition);
+    private static final Reflection.Method at = Reflection.getTypedMethod(craftBlock, "at", craftBlock, generatorAccess, blockPosition);
 
-    private static final Class<?> openSign = Reflection.getClass("{nms.network.protocol.game}.PacketPlayOutOpenSignEditor");
+    private static final Class<?> openSign = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundOpenSignEditorPacket");
-    private static final Reflection.FieldAccessor<?> blockPositionFieldAccessor = Reflection.getField(openSign, blockPosition, 0);
+    private static final Reflection.Field<?> blockPositionFieldAccessor = Reflection.getField(openSign, blockPosition, 0);
 
-    private static final Class<?> updateSign = Reflection.getClass("{nms.network.protocol.game}.PacketPlayInUpdateSign");
+    private static final Class<?> updateSign = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundSignUpdatePacket");
-    private static final Reflection.FieldAccessor<?> getBlockPositionFieldAccessor = Reflection.getField(updateSign, blockPosition, 0);
+    private static final Reflection.Field<?> getBlockPositionFieldAccessor = Reflection.getField(updateSign, blockPosition, 0);
-    private static final Reflection.FieldAccessor<String[]> stringFieldAccessor = Reflection.getField(updateSign, String[].class, 0);
+    private static final Reflection.Field<String[]> stringFieldAccessor = Reflection.getField(updateSign, String[].class, 0);
 
     @EventHandler
     public void editSign(PlayerInteractEvent event) {

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

@@ -0,0 +1,92 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  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.features.world;
+
+import com.sk89q.worldedit.regions.RegionSelector;
+import de.steamwar.bausystem.BauSystem;
+import de.steamwar.bausystem.shared.Pair;
+import de.steamwar.bausystem.utils.WorldEditUtils;
+import de.steamwar.linkage.Linked;
+import de.steamwar.linkage.MinVersion;
+import de.steamwar.sql.SteamwarUser;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.checkerframework.checker.units.qual.min;
+
+import java.io.*;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.stream.Collectors;
+
+@Linked
+@MinVersion(18)
+public class WorldEditSelectionSaver implements Listener {
+
+    private File WORLD_EDIT_SELECTIONS = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "world_edit_selections");
+
+    {
+       WORLD_EDIT_SELECTIONS.mkdir();
+    }
+
+    @EventHandler
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        SteamwarUser steamwarUser = SteamwarUser.get(event.getPlayer().getUniqueId());
+        File file = new File(WORLD_EDIT_SELECTIONS, Integer.toString(steamwarUser.getId()));
+        if (!file.exists()) return;
+        try {
+            BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(new FileInputStream(file)));
+            Class<? extends RegionSelector> clazz = (Class<? extends RegionSelector>) Class.forName(bufferedReader.readLine());
+            List<Location> locations = bufferedReader.lines()
+                    .map(s -> s.split(" "))
+                    .map(strings -> strings.length != 3 ? null : new Location(event.getPlayer().getWorld(), Integer.parseInt(strings[0]), Integer.parseInt(strings[1]), Integer.parseInt(strings[2])))
+                    .collect(Collectors.toList());
+            WorldEditUtils.setVertices(event.getPlayer(), clazz, locations);
+        } catch (IOException | ClassNotFoundException e) {
+            BauSystem.getInstance().getLogger().log(Level.SEVERE, e.getMessage(), e);
+            file.delete();
+        }
+    }
+
+    @EventHandler
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        SteamwarUser steamwarUser = SteamwarUser.get(event.getPlayer().getUniqueId());
+        Pair<Class<? extends RegionSelector>, List<Location>> data = WorldEditUtils.getVertices(event.getPlayer());
+        File file = new File(WORLD_EDIT_SELECTIONS, Integer.toString(steamwarUser.getId()));
+        try {
+            BufferedWriter bufferedWriter = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file)));
+            bufferedWriter.write(data.getKey().getTypeName());
+            for (Location location : data.getValue()) {
+                if (location == null) {
+                    bufferedWriter.write("\n");
+                } else {
+                    bufferedWriter.write("\n" + location.getBlockX() + " " + location.getBlockY() + " " + location.getBlockZ());
+                }
+            }
+            bufferedWriter.close();
+        } catch (IOException e) {
+            BauSystem.getInstance().getLogger().log(Level.SEVERE, e.getMessage(), e);
+            file.delete();
+        }
+    }
+}

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/xray/XrayCommand.java

@@ -19,7 +19,7 @@
 
 package de.steamwar.bausystem.features.xray;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
 import com.comphenix.tinyprotocol.TinyProtocol;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.bausystem.features.techhider.TechHiderCommand;
@@ -108,8 +108,8 @@ public class XrayCommand extends SWCommand implements Listener, ScoreboardElemen
         });
     }
 
-    private static final Class<?> position = Reflection.getClass("{nms.network.protocol.game}.PacketPlayInFlying$PacketPlayInPosition");
+    private static final Class<?> position = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$Pos");
-    private static final Class<?> positionLook = Reflection.getClass("{nms.network.protocol.game}.PacketPlayInFlying$PacketPlayInPositionLook");
+    private static final Class<?> positionLook = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$PosRot");
 
     {
         BiFunction<Player, Object, Object> positionSetter = (player, o) -> {

BauSystem/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java

@@ -21,41 +21,40 @@ package de.steamwar.bausystem.region.flags;
 
 import de.steamwar.bausystem.region.flags.flagvalues.*;
 import de.steamwar.bausystem.shared.EnumDisplay;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 import java.util.EnumSet;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 @Getter
+@AllArgsConstructor
 public enum Flag implements EnumDisplay {
 
-	COLOR("FLAG_COLOR", ColorMode.class, ColorMode.YELLOW),
+	COLOR("FLAG_COLOR", ColorMode.class, ColorMode.YELLOW, false),
-	TNT("FLAG_TNT", TNTMode.class, TNTMode.ONLY_TB),
+	TNT("FLAG_TNT", TNTMode.class, TNTMode.ONLY_TB, true),
-	FIRE("FLAG_FIRE", FireMode.class, FireMode.ALLOW),
+	FIRE("FLAG_FIRE", FireMode.class, FireMode.ALLOW, true),
-	FREEZE("FLAG_FREEZE", FreezeMode.class, FreezeMode.INACTIVE),
+	FREEZE("FLAG_FREEZE", FreezeMode.class, FreezeMode.INACTIVE, true),
-	PROTECT("FLAG_PROTECT", ProtectMode.class, ProtectMode.ACTIVE),
+	PROTECT("FLAG_PROTECT", ProtectMode.class, ProtectMode.ACTIVE, true),
-	ITEMS("FLAG_ITEMS", ItemMode.class, ItemMode.INACTIVE),
+	ITEMS("FLAG_ITEMS", ItemMode.class, ItemMode.INACTIVE, true),
-	NO_GRAVITY("FLAG_NO_GRAVITY", NoGravityMode.class, NoGravityMode.INACTIVE),
+	NO_GRAVITY("FLAG_NO_GRAVITY", NoGravityMode.class, NoGravityMode.INACTIVE, true),
 	;
 
 	@Getter
 	private static final Set<Flag> flags;
+	@Getter
+	private static final Set<Flag> resetFlags;
 
 	static {
 		flags = EnumSet.allOf(Flag.class);
+		resetFlags = flags.stream().filter(flag -> flag.reset).collect(Collectors.toUnmodifiableSet());
 	}
 
 	private final String chatValue;
 	private final Class<? extends Value<?>> valueType;
 	private final Flag.Value<?> defaultValue;
-	private final Value<?>[] values;
+	private final boolean reset;
-
-	<T extends Enum<T> & Value<T>> Flag(String chatValue, final Class<? extends Value<T>> valueType, final Flag.Value<T> defaultValue) {
-		this.chatValue = chatValue;
-		this.valueType = valueType;
-		this.defaultValue = defaultValue;
-		this.values = defaultValue.getValues();
-	}
 
 	public Value<?> getFlagValueOf(final String name) {
 		return this.defaultValue.getValueOf(name);

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

@@ -24,6 +24,7 @@ import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import com.sk89q.worldedit.function.pattern.WaterloggedRemover;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.world.block.BaseBlock;
+import com.sk89q.worldedit.world.block.BlockType;
 import com.sk89q.worldedit.world.block.BlockTypes;
 import de.steamwar.bausystem.region.Color;
 import de.steamwar.bausystem.region.Point;
@@ -34,9 +35,7 @@ import lombok.NonNull;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.List;
-import java.util.Objects;
 import java.util.function.BiConsumer;
 import java.util.function.BiPredicate;
 
@@ -106,51 +105,28 @@ public class PasteBuilder {
     public PasteBuilder color(Color color) {
         if (color == Color.PINK) return this;
 
-        BaseBlock WOOL = Objects.requireNonNull(BlockTypes.PINK_WOOL).getDefaultState().toBaseBlock();
+        Map<String, BaseBlock> blockCache = new HashMap<>();
-        BaseBlock CLAY = Objects.requireNonNull(BlockTypes.PINK_TERRACOTTA).getDefaultState().toBaseBlock();
-        BaseBlock GLAZED = Objects.requireNonNull(BlockTypes.PINK_GLAZED_TERRACOTTA).getDefaultState().toBaseBlock();
-        BaseBlock GLASS = Objects.requireNonNull(BlockTypes.PINK_STAINED_GLASS).getDefaultState().toBaseBlock();
-        BaseBlock GLASS_PANE = Objects.requireNonNull(BlockTypes.PINK_STAINED_GLASS_PANE).getDefaultState().toBaseBlock();
-        BaseBlock CONCRETE = Objects.requireNonNull(BlockTypes.PINK_CONCRETE).getDefaultState().toBaseBlock();
-        BaseBlock CONCRETE_POWDER = Objects.requireNonNull(BlockTypes.PINK_CONCRETE_POWDER).getDefaultState().toBaseBlock();
-        BaseBlock CARPET = Objects.requireNonNull(BlockTypes.PINK_CARPET).getDefaultState().toBaseBlock();
-
-        BaseBlock wool = Objects.requireNonNull(BlockTypes.get(color.name().toLowerCase() + "_wool")).getDefaultState().toBaseBlock();
-        BaseBlock clay = Objects.requireNonNull(BlockTypes.get(color.name().toLowerCase() + "_terracotta")).getDefaultState().toBaseBlock();
-        BaseBlock glazed = Objects.requireNonNull(BlockTypes.get(color.name().toLowerCase() + "_glazed_terracotta")).getDefaultState().toBaseBlock();
-        BaseBlock glass = Objects.requireNonNull(BlockTypes.get(color.name().toLowerCase() + "_stained_glass")).getDefaultState().toBaseBlock();
-        BaseBlock glassPane = Objects.requireNonNull(BlockTypes.get(color.name().toLowerCase() + "_stained_glass_pane")).getDefaultState().toBaseBlock();
-        BaseBlock carpet = Objects.requireNonNull(BlockTypes.get(color.name().toLowerCase() + "_carpet")).getDefaultState().toBaseBlock();
-        BaseBlock concrete = Objects.requireNonNull(BlockTypes.get(color.name().toLowerCase() + "_concrete")).getDefaultState().toBaseBlock();
-        BaseBlock concretePowder = Objects.requireNonNull(BlockTypes.get(color.name().toLowerCase() + "_concrete_powder")).getDefaultState().toBaseBlock();
-
         return map((clipboard, blockVector3) -> {
             BaseBlock block = clipboard.getFullBlock(blockVector3);
-            if (block.equals(WOOL)) {
+            if (block.getBlockType().getId().startsWith("minecraft:pink_")) {
-                clipboard.setBlock(blockVector3, wool);
+                BaseBlock baseBlock = blockCache.computeIfAbsent(block.getBlockType().getId(), s -> {
-            } else if (block.equals(CLAY)) {
+                    String replaced = s.replace("minecraft:pink_", "minecraft:" + color.name().toLowerCase() + "_");
-                clipboard.setBlock(blockVector3, clay);
+                    BlockType blockType = BlockTypes.get(replaced);
-            } else if (block.equals(GLAZED)) {
+                    if (blockType == null) return null;
-                clipboard.setBlock(blockVector3, glazed);
+                    return blockType.getDefaultState().toBaseBlock();
-            } else if (block.equals(GLASS)) {
+                });
-                clipboard.setBlock(blockVector3, glass);
+                if (baseBlock == null) return;
-            } else if (block.equals(GLASS_PANE)) {
+                clipboard.setBlock(blockVector3, baseBlock);
-                clipboard.setBlock(blockVector3, glassPane);
-            } else if (block.equals(CARPET)) {
-                clipboard.setBlock(blockVector3, carpet);
-            } else if (block.equals(CONCRETE)) {
-                clipboard.setBlock(blockVector3, concrete);
-            } else if (block.equals(CONCRETE_POWDER)) {
-                clipboard.setBlock(blockVector3, concretePowder);
             }
         });
     }
 
+    /**
+     * Can only be used before {@link #color(Color)}.
+     */
     public PasteBuilder onlyColors(boolean onlyColors) {
         if (!onlyColors) return this;
-        return only((baseBlock, s) -> {
+        return only((baseBlock, s) -> s.startsWith("minecraft:pink_"));
-            return s.endsWith("_wool") || s.endsWith("_terracotta") || s.endsWith("_glazed_terracotta") || s.endsWith("_stained_glass") || s.endsWith("_stained_glass_pane") || s.endsWith("_carpet") || s.endsWith("_concrete") || s.endsWith("_concrete_powder");
-        });
     }
 
     public PasteBuilder removeTNT(boolean removeTNT) {

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

@@ -19,7 +19,7 @@
 
 package de.steamwar.bausystem.utils;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.experimental.UtilityClass;
@@ -81,12 +81,12 @@ public class PlaceItemUtils {
                 .collect(Collectors.toSet());
     }
 
-    private static final Class<?> blockPosition = Reflection.getClass("{nms.core}.BlockPosition");
+    private static final Class<?> blockPosition = Reflection.getClass("net.minecraft.core.BlockPos");
-    private static final Reflection.ConstructorInvoker blockPositionConstructor = Reflection.getConstructor(blockPosition, int.class, int.class, int.class);
+    private static final Reflection.Constructor blockPositionConstructor = Reflection.getConstructor(blockPosition, int.class, int.class, int.class);
-    private static final Class<?> craftBlock = Reflection.getClass("{obc}.block.CraftBlockState");
+    private static final Class<?> craftBlock = Reflection.getClass("org.bukkit.craftbukkit.block.CraftBlockState");
-    private static final Class<?> craftWorld = Reflection.getClass("{obc}.CraftWorld");
+    private static final Class<?> craftWorld = Reflection.getClass("org.bukkit.craftbukkit.CraftWorld");
-    private static final Reflection.FieldAccessor<?> positionAccessor = Reflection.getField(craftBlock, blockPosition, 0);
+    private static final Reflection.Field<?> positionAccessor = Reflection.getField(craftBlock, blockPosition, 0);
-    private static final Reflection.FieldAccessor<?> worldAccessor = Reflection.getField(craftBlock, craftWorld, 0);
+    private static final Reflection.Field<?> worldAccessor = Reflection.getField(craftBlock, craftWorld, 0);
 
     /**
      * Attempt to place an {@link ItemStack} the {@link Player} is holding against a {@link Block} inside the World.

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

@@ -19,26 +19,20 @@
 
 package de.steamwar.bausystem.utils;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
 import de.steamwar.bausystem.BauSystem;
 import de.steamwar.core.BountifulWrapper;
-import de.steamwar.core.Core;
 import de.steamwar.core.VersionDependent;
+import de.steamwar.entity.REntity;
 import org.bukkit.entity.Player;
 
 public interface PlayerMovementWrapper {
-    Class<?> teleportPacket = Reflection.getClass("{nms.network.protocol.game}.PacketPlayOutEntityTeleport");
+    Class<?> teleportPacket = REntity.teleportPacket;
-    Reflection.FieldAccessor<Integer> teleportEntity = Reflection.getField(teleportPacket, Integer.TYPE, 0);
+    Reflection.Field<Integer> teleportEntity = REntity.teleportEntity;
-    BountifulWrapper.PositionSetter teleportPosition = BountifulWrapper.impl.getPositionSetter(teleportPacket, Core.getVersion() == 8 ? 1 : 0);
+    BountifulWrapper.PositionSetter teleportPosition = REntity.teleportPosition;
-    Reflection.FieldAccessor<Byte> teleportYaw = Reflection.getField(teleportPacket, Byte.TYPE, 0);
-    Reflection.FieldAccessor<Byte> teleportPitch = Reflection.getField(teleportPacket, Byte.TYPE, 1);
 
     PlayerMovementWrapper impl = VersionDependent.getVersionImpl(BauSystem.getInstance());
 
     void setPosition(Player player, Object object);
     Object convertToOut(Player player, Object object);
-
-    default byte rotToByte(float rot) {
-        return (byte)((int)(rot * 256.0F / 360.0F));
-    }
 }

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

@@ -1,49 +0,0 @@
-/*
- *     This file is a part of the SteamWar software.
- *
- *     Copyright (C) 2024  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.viaversion.viaversion.api.Via;
-import com.viaversion.viaversion.api.ViaAPI;
-import de.steamwar.bausystem.BauSystem;
-import de.steamwar.linkage.Linked;
-import net.md_5.bungee.api.ChatMessageType;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerJoinEvent;
-
-@Linked
-public class VersionAnnouncer implements Listener {
-
-    private final String versionString = Bukkit.getBukkitVersion().split("-", 2)[0];
-
-    @SuppressWarnings("unchecked")
-    private final ViaAPI<Player> via = Via.getAPI();
-
-    @EventHandler
-    public void onJoin(PlayerJoinEvent event) {
-        Player player = event.getPlayer();
-        if(via.getServerVersion().supportedVersions().contains(via.getPlayerVersion(player)))
-            return;
-
-        BauSystem.MESSAGE.sendPrefixless("SERVER_VERSION", player, ChatMessageType.ACTION_BAR, versionString);
-    }
-}

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

@@ -19,17 +19,21 @@
 
 package de.steamwar.bausystem.utils;
 
+import de.steamwar.Reflection;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.IncompleteRegionException;
+import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.extension.factory.PatternFactory;
+import com.sk89q.worldedit.extension.platform.permission.ActorSelectorLimits;
 import com.sk89q.worldedit.function.mask.Mask;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.internal.registry.InputParser;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.regions.RegionSelector;
+import com.sk89q.worldedit.regions.selector.limit.SelectorLimits;
 import de.steamwar.bausystem.shared.Pair;
 import lombok.SneakyThrows;
 import lombok.experimental.UtilityClass;
@@ -37,6 +41,9 @@ import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 @UtilityClass
 public class WorldEditUtils {
 
@@ -77,6 +84,40 @@ public class WorldEditUtils {
         return WorldEdit.getInstance().getPatternFactory();
     }
 
+    public Pair<Class<? extends RegionSelector>, List<Location>> getVertices(Player player) {
+        RegionSelector regionSelector = WorldEdit.getInstance()
+                .getSessionManager()
+                .get(BukkitAdapter.adapt(player))
+                .getRegionSelector(BukkitAdapter.adapt(player.getWorld()));
+        return new Pair<>(regionSelector.getClass(), regionSelector.getVertices()
+                .stream()
+                .map(blockVector3 -> blockVector3 == null ? null : adapt(player.getWorld(), blockVector3))
+                .collect(Collectors.toList()));
+    }
+
+    public void setVertices(Player player, Class<? extends RegionSelector> clazz, List<Location> vertices) {
+        LocalSession localSession = WorldEdit.getInstance()
+                .getSessionManager()
+                .get(BukkitAdapter.adapt(player));
+
+        Reflection.Constructor constructorInvoker = Reflection.getConstructor(clazz, com.sk89q.worldedit.world.World.class);
+        RegionSelector regionSelector = (RegionSelector) constructorInvoker.invoke(BukkitAdapter.adapt(player.getWorld()));
+        localSession.setRegionSelector(BukkitAdapter.adapt(player.getWorld()), regionSelector);
+
+        if (vertices.isEmpty()) return;
+
+        SelectorLimits selectorLimits = ActorSelectorLimits.forActor(BukkitAdapter.adapt(player));
+        for (int i = 0; i < vertices.size(); i++) {
+            Location location = vertices.get(i);
+            if (location == null) continue;
+            if (i == 0) {
+                regionSelector.selectPrimary(BukkitAdapter.adapt(location).toBlockPoint(), selectorLimits);
+            } else {
+                regionSelector.selectSecondary(BukkitAdapter.adapt(location).toBlockPoint(), selectorLimits);
+            }
+        }
+    }
+
     public Pair<Location, Location> getSelection(Player player) {
         RegionSelector regionSelector = WorldEdit.getInstance()
                 .getSessionManager()

BauSystem/BauSystem_Main/src/plugin.yml

@@ -2,8 +2,6 @@ name: BauSystem
 authors: [ Lixfel, YoyoNow, Chaoscaot, Zeanon, D4rkr34lm ]
 version: "2.0"
 depend: [ WorldEdit, SpigotCore ]
-softdepend:
-  - ViaVersion
 load: POSTWORLD
 main: de.steamwar.bausystem.BauSystem
 api-version: "1.13"

BauSystem/build.gradle.kts

@@ -32,4 +32,5 @@ dependencies {
     implementation(project(":BauSystem:BauSystem_18"))
     implementation(project(":BauSystem:BauSystem_19"))
     implementation(project(":BauSystem:BauSystem_20"))
+    implementation(project(":BauSystem:BauSystem_21"))
 }

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

@@ -21,6 +21,7 @@ package de.steamwar.sql;
 
 import de.steamwar.sql.internal.Field;
 import de.steamwar.sql.internal.SelectStatement;
+import de.steamwar.sql.internal.Statement;
 import de.steamwar.sql.internal.Table;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -42,6 +43,11 @@ public class Event {
     private static final SelectStatement<Event> byId = table.select(Table.PRIMARY);
     private static final SelectStatement<Event> byName = table.select("eventName");
     private static final SelectStatement<Event> byComing = new SelectStatement<>(table, "SELECT * FROM Event WHERE Start > now()");
+    private static final SelectStatement<Event> all = new SelectStatement<>(table, "SELECT * FROM Event");
+
+    private static final Statement create = table.insertFields(true, "eventName", "deadline", "start", "end", "maximumTeamMembers", "publicSchemsOnly");
+    private static final Statement update = table.update(Table.PRIMARY, "eventName", "deadline", "start", "end", "schemType", "maximumTeamMembers", "publicSchemsOnly");
+    private static final Statement delete = table.delete(Table.PRIMARY);
 
     private static Event current = null;
 
@@ -53,6 +59,14 @@ public class Event {
         return current;
     }
 
+    public static List<Event> getAll(){
+        return all.listSelect();
+    }
+
+    public static Event create(String eventName, Timestamp start, Timestamp end){
+        return get(create.insertGetKey(eventName, start, start, end, 5, false, false));
+    }
+
     public static Event get(int eventID){
         return byId.select(eventID);
     }
@@ -87,16 +101,10 @@ public class Event {
     private final SchematicType schemType;
     @Field
     private final boolean publicSchemsOnly;
-    @Deprecated
-    @Field
-    private final boolean spectateSystem;
 
     public boolean publicSchemsOnly() {
         return publicSchemsOnly;
     }
-    public boolean spectateSystem(){
-        return spectateSystem;
-    }
 
     public SchematicType getSchematicType() {
         return schemType;
@@ -106,4 +114,12 @@ public class Event {
         Instant now = Instant.now();
         return now.isAfter(start.toInstant()) && now.isBefore(end.toInstant());
     }
+
+    public void update(String eventName, Timestamp deadline, Timestamp start, Timestamp end, SchematicType schemType, int maximumTeamMembers, boolean publicSchemsOnly) {
+        update.update(eventName, deadline, start, end, schemType, maximumTeamMembers, publicSchemsOnly, eventID);
+    }
+
+    public void delete() {
+        delete.update(eventID);
+    }
 }

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

@@ -25,6 +25,7 @@ import de.steamwar.sql.internal.Statement;
 import de.steamwar.sql.internal.Table;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.Setter;
 
 import java.sql.Timestamp;
 import java.util.*;
@@ -42,6 +43,11 @@ public class EventFight implements Comparable<EventFight> {
     private static final Statement setResult = table.update(Table.PRIMARY, "Ergebnis");
     private static final Statement setFight = table.update(Table.PRIMARY, "Fight");
 
+    private static final Statement create = table.insertFields(true, "eventID", "startTime", "spielmodus", "map", "teamBlue", "teamRed", "spectatePort");
+    private static final Statement update = table.update(Table.PRIMARY, "startTime", "spielModus", "map", "teamBlue", "teamRed", "spectatePort");
+    private static final Statement delete = table.delete(Table.PRIMARY);
+
+    @Getter
     private static final Queue<EventFight> fights = new PriorityQueue<>();
 
     public static EventFight get(int fightID) {
@@ -57,8 +63,8 @@ public class EventFight implements Comparable<EventFight> {
         return event.listSelect(eventID);
     }
 
-    public static Queue<EventFight> getFights() {
+    public static EventFight create(int event, Timestamp from, String spielmodus, String map, int blueTeam, int redTeam, Integer spectatePort) {
-        return fights;
+        return get(create.insertGetKey(event, from, spielmodus, map, blueTeam, redTeam, spectatePort));
     }
 
     @Getter
@@ -68,27 +74,29 @@ public class EventFight implements Comparable<EventFight> {
     @Field(keys = {Table.PRIMARY}, autoincrement = true)
     private final int fightID;
     @Getter
+    @Setter
     @Field
     private Timestamp startTime;
     @Getter
+    @Setter
     @Field
-    private final String spielmodus;
+    private String spielmodus;
     @Getter
+    @Setter
     @Field
-    private final String map;
+    private String map;
     @Getter
+    @Setter
     @Field
-    private final int teamBlue;
+    private int teamBlue;
     @Getter
+    @Setter
     @Field
-    private final int teamRed;
+    private int teamRed;
     @Getter
-    @Field
+    @Setter
-    @Deprecated
+    @Field(nullable = true)
-    private final int kampfleiter;
+    private Integer spectatePort;
-    @Getter
-    @Field
-    private final int spectatePort;
     @Getter
     @Field(def = "0")
     private int ergebnis;
@@ -133,4 +141,18 @@ public class EventFight implements Comparable<EventFight> {
     public int compareTo(EventFight o) {
         return startTime.compareTo(o.startTime);
     }
+
+    public void update(Timestamp startTime, String spielmodus, String map, int teamBlue, int teamRed, Integer spectatePort) {
+        update.update(startTime, spielmodus, map, teamBlue, teamRed, spectatePort, fightID);
+        this.startTime = startTime;
+        this.spielmodus = spielmodus;
+        this.map = map;
+        this.teamBlue = teamBlue;
+        this.teamRed = teamRed;
+        this.spectatePort = spectatePort;
+    }
+
+    public void delete() {
+        delete.update(fightID);
+    }
 }

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

@@ -28,12 +28,15 @@ import java.sql.PreparedStatement;
 import java.util.zip.GZIPInputStream;
 
 @AllArgsConstructor
+@Getter
 public class NodeData {
 
     static {
         new SqlTypeMapper<>(PipedInputStream.class, "BLOB", (rs, identifier) -> { throw new SecurityException("PipedInputStream is write only datatype"); }, PreparedStatement::setBinaryStream);
         new SqlTypeMapper<>(ByteArrayInputStream.class, "BLOB", (rs, identifier) -> { throw new SecurityException("ByteArrayInputStream is write only datatype"); }, PreparedStatement::setBinaryStream);
         new SqlTypeMapper<>(BufferedInputStream.class, "BLOB", (rs, identifier) -> { throw new SecurityException("BufferedInputStream is write only datatype"); }, PreparedStatement::setBinaryStream);
+
+        SqlTypeMapper.ordinalEnumMapper(SchematicFormat.class);
     }
 
     private static final Table<NodeData> table = new Table<>(NodeData.class);
@@ -48,19 +51,18 @@ public class NodeData {
             throw new IllegalArgumentException("Node is a directory");
         return get.select(rs -> {
             if(rs.next()) {
-                return new NodeData(node.getId(), rs.getBoolean("NodeFormat"));
+                return new NodeData(node.getId(), SchematicFormat.values()[rs.getInt("NodeFormat")]);
             } else {
-                return new NodeData(node.getId(), false);
+                return new NodeData(node.getId(), SchematicFormat.MCEDIT);
             }
         }, node);
     }
 
-    @Getter
     @Field(keys = {Table.PRIMARY})
     private final int nodeId;
 
     @Field
-    private boolean nodeFormat;
+    private SchematicFormat nodeFormat;
 
     public InputStream schemData() throws IOException {
         try {
@@ -81,12 +83,18 @@ public class NodeData {
         }
     }
 
-    public void saveFromStream(InputStream blob, boolean newFormat) {
+    public void saveFromStream(InputStream blob, SchematicFormat newFormat) {
         updateDatabase.update(nodeId, newFormat, blob);
         nodeFormat = newFormat;
     }
 
-    public boolean getNodeFormat() {
+    @AllArgsConstructor
-        return nodeFormat;
+    @Getter
+    public enum SchematicFormat {
+        MCEDIT(".schematic"),
+        SPONGE_V2(".schem"),
+        SPONGE_V3(".schem");
+
+        private final String fileEnding;
     }
 }

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

@@ -20,9 +20,11 @@
 package de.steamwar.sql;
 
 import de.steamwar.sql.internal.Field;
+import de.steamwar.sql.internal.SelectStatement;
 import de.steamwar.sql.internal.Statement;
 import de.steamwar.sql.internal.Table;
 import lombok.AllArgsConstructor;
+import lombok.Getter;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -38,11 +40,21 @@ public class NodeDownload {
     private static final Table<NodeDownload> table = new Table<>(NodeDownload.class);
     private static final Statement insert = table.insertFields("NodeId", "Link");
 
+    private static final SelectStatement<NodeDownload> select = table.selectFields("link");
+
+    private static final Statement delete = table.delete(Table.PRIMARY);
+
+    public static NodeDownload get(String link) {
+        return select.select(link);
+    }
+
+    @Getter
     @Field(keys = {Table.PRIMARY})
     private final int nodeId;
     @Field
     private final String link;
     @Field(def = "CURRENT_TIMESTAMP")
+    @Getter
     private final Timestamp timestamp;
 
     public static String getLink(SchematicNode schem){
@@ -60,10 +72,15 @@ public class NodeDownload {
         insert.update(schem.getId(), hash);
         return LINK_BASE + hash;
     }
+
     public static String base16encode(byte[] byteArray) {
         StringBuilder hexBuffer = new StringBuilder(byteArray.length * 2);
         for (byte b : byteArray)
             hexBuffer.append(HEX[(b >>> 4) & 0xF]).append(HEX[b & 0xF]);
         return hexBuffer.toString();
     }
+
+    public void delete() {
+        delete.update(nodeId);
+    }
 }

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

@@ -72,6 +72,10 @@ public class NodeMember {
         return new NodeMember(node, member, null);
     }
 
+    public static NodeMember getNodeMember(int node, SteamwarUser member) {
+        return getNodeMember(node, member.getId());
+    }
+
     public static NodeMember getNodeMember(int node, int member) {
         return getNodeMember.select(node, member);
     }

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

@@ -121,11 +121,11 @@ public class Punishment {
     public enum PunishmentType {
         Ban(false, "BAN_TEAM", "BAN_PERMA", "BAN_UNTIL", "UNBAN_ERROR", "UNBAN"),
         Mute( false, "MUTE_TEAM", "MUTE_PERMA", "MUTE_UNTIL", "UNMUTE_ERROR", "UNMUTE"),
-        NoSchemReceiving(false, "NOSCHEMRECEIVING_TEAM", "NOSCHEMRECEIVING_PERMA", "NOSCHEMRECEIVING_UNTIL", "UNNOSCHEMRECEIVING_ERROR", "UNNOSCHEMRECEIVING"),
+        NoSchemReceiving(true, "NOSCHEMRECEIVING_TEAM", "NOSCHEMRECEIVING_PERMA", "NOSCHEMRECEIVING_UNTIL", "UNNOSCHEMRECEIVING_ERROR", "UNNOSCHEMRECEIVING"),
-        NoSchemSharing(false, "NOSCHEMSHARING_TEAM", "NOSCHEMSHARING_PERMA", "NOSCHEMSHARING_UNTIL", "UNNOSCHEMSHARING_ERROR", "UNNOSCHEMSHARING"),
+        NoSchemSharing(true, "NOSCHEMSHARING_TEAM", "NOSCHEMSHARING_PERMA", "NOSCHEMSHARING_UNTIL", "UNNOSCHEMSHARING_ERROR", "UNNOSCHEMSHARING"),
-        NoSchemSubmitting(true, "NOSCHEMSUBMITTING_TEAM", "NOSCHEMSUBMITTING_PERMA", "NOSCHEMSUBMITTING_UNTIL", "UNNOSCHEMSUBMITTING_ERROR", "UNNOSCHEMSUBMITTING"),
+        NoSchemSubmitting(false, "NOSCHEMSUBMITTING_TEAM", "NOSCHEMSUBMITTING_PERMA", "NOSCHEMSUBMITTING_UNTIL", "UNNOSCHEMSUBMITTING_ERROR", "UNNOSCHEMSUBMITTING"),
         NoDevServer(true, "NODEVSERVER_TEAM", "NODEVSERVER_PERMA", "NODEVSERVER_UNTIL", "UNNODEVSERVER_ERROR", "UNNODEVSERVER"),
-        NoFightServer(false, "NOFIGHTSERVER_TEAM", "NOFIGHTSERVER_PERMA", "NOFIGHTSERVER_UNTIL", "UNNOFIGHTSERVER_ERROR", "UNNOFIGHTSERVER"),
+        NoFightServer(true, "NOFIGHTSERVER_TEAM", "NOFIGHTSERVER_PERMA", "NOFIGHTSERVER_UNTIL", "UNNOFIGHTSERVER_ERROR", "UNNOFIGHTSERVER"),
         NoTeamServer(true, "NOTEAMSERVER_TEAM", "NOTEAMSERVER_PERMA", "NOTEAMSERVER_UNTIL", "UNNOTEAMSERVER_ERROR", "UNNOTEAMSERVER"),
         Note(false, "NOTE_TEAM", null, null, null, null, true);
 

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

@@ -21,6 +21,7 @@ package de.steamwar.sql;
 
 import de.steamwar.sql.internal.Field;
 import de.steamwar.sql.internal.SelectStatement;
+import de.steamwar.sql.internal.Statement;
 import de.steamwar.sql.internal.Table;
 import lombok.AllArgsConstructor;
 
@@ -33,6 +34,17 @@ public class Referee {
     private static final Table<Referee> table = new Table<>(Referee.class);
     private static final SelectStatement<Referee> byEvent = table.selectFields("eventID");
 
+    private static final Statement insert = table.insertAll();
+    private static final Statement delete = table.delete("eventReferee");
+
+    public static void add(int eventID, int userID) {
+        insert.update(eventID, userID);
+    }
+
+    public static void remove(int eventID, int userID) {
+        delete.update(eventID, userID);
+    }
+
     public static Set<Integer> get(int eventID) {
         return byEvent.listSelect(eventID).stream().map(referee -> referee.userID).collect(Collectors.toSet());
     }

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

@@ -375,11 +375,10 @@ public class SchematicNode {
         return nodeType == null;
     }
 
-    @Deprecated
+    public String getFileEnding() {
-    public boolean getSchemFormat() {
         if(isDir())
             throw new SecurityException("Node is Directory");
-        return NodeData.get(this).getNodeFormat();
+        return NodeData.get(this).getNodeFormat().getFileEnding();
     }
 
     public int getRank() {
@@ -443,7 +442,7 @@ public class SchematicNode {
         return SchemElo.getElo(this, season);
     }
 
-    public boolean accessibleByUser(int user) {
+    public boolean accessibleByUser(SteamwarUser user) {
         return NodeMember.getNodeMember(nodeId, user) != null;
     }
 
@@ -506,6 +505,19 @@ public class SchematicNode {
         return builder.toString();
     }
 
+    public List<Map.Entry<String, Integer>> generateBreadcrumbsMap(SteamwarUser user) {
+        List<Map.Entry<String, Integer>> map = new ArrayList<>();
+        Optional<SchematicNode> currentNode = Optional.of(this);
+        if(currentNode.map(SchematicNode::isDir).orElse(false)) {
+            map.add(new AbstractMap.SimpleEntry<>(getName(), getId()));
+        }
+        while (currentNode.isPresent()) {
+            currentNode = currentNode.flatMap(schematicNode -> Optional.ofNullable(NodeMember.getNodeMember(schematicNode.getId(), effectiveOwner)).map(NodeMember::getParent).orElse(schematicNode.getOptionalParent())).map(SchematicNode::getSchematicNode);
+            currentNode.ifPresent(node -> map.add(0, new AbstractMap.SimpleEntry<>(node.getName(), node.getId())));
+        }
+        return map;
+    }
+
     private static final List<String> FORBIDDEN_NAMES = Collections.unmodifiableList(Arrays.asList("public"));
     public static boolean invalidSchemName(String[] layers) {
         for (String layer : layers) {

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

@@ -62,6 +62,7 @@ public class SteamwarUser {
 	private static final SelectStatement<SteamwarUser> byDiscord = table.selectFields("DiscordId");
 	private static final SelectStatement<SteamwarUser> byTeam = table.selectFields("Team");
 	private static final SelectStatement<SteamwarUser> getUsersWithPerm = new SelectStatement<>(table, "SELECT S.* FROM UserData S JOIN UserPerm P ON S.id = P.User WHERE P.Perm = ?");
+	private static final SelectStatement<SteamwarUser> getAll = new SelectStatement<SteamwarUser>(table, "SELECT * FROM UserData");
 
 	private static final Statement updateName = table.update(Table.PRIMARY, "UserName");
     private static final Statement updatePassword = table.update(Table.PRIMARY, "Password");
@@ -72,6 +73,7 @@ public class SteamwarUser {
 
 	private static final Statement getPlaytime = new Statement("SELECT SUM(UNIX_TIMESTAMP(EndTime) - UNIX_TIMESTAMP(StartTime)) as Playtime FROM Session WHERE UserID = ?");
 	private static final Statement getFirstjoin = new Statement("SELECT MIN(StartTime) AS FirstJoin FROM Session WHERE UserID = ?");
+	private static final Statement getLastonline = new Statement("SELECT MAX(EndTime) AS LastOnline FROM Session WHERE UserID = ?");
 
 	private static final Map<Integer, SteamwarUser> usersById = new HashMap<>();
 	private static final Map<UUID, SteamwarUser> usersByUUID = new HashMap<>();
@@ -275,6 +277,14 @@ public class SteamwarUser {
 		}, id);
 	}
 
+	public Timestamp getLastOnline() {
+		return getLastonline.select(rs -> {
+			if (rs.next())
+				return rs.getTimestamp("LastOnline");
+			return null;
+		}, id);
+	}
+
 	public void punish(Punishment.PunishmentType punishment, Timestamp time, String banReason, int from, boolean perma) {
 		initPunishments();
 		punishments.remove(punishment);
@@ -370,4 +380,8 @@ public class SteamwarUser {
 		permissions = UserPerm.getPerms(id);
 		prefix = permissions.stream().filter(UserPerm.prefixes::containsKey).findAny().map(UserPerm.prefixes::get).orElse(UserPerm.emptyPrefix);
 	}
+
+    public static List<SteamwarUser> getAll() {
+        return getAll.listSelect();
+    }
 }

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

@@ -19,10 +19,7 @@
 
 package de.steamwar.sql;
 
-import de.steamwar.sql.internal.Field;
+import de.steamwar.sql.internal.*;
-import de.steamwar.sql.internal.SelectStatement;
-import de.steamwar.sql.internal.SqlTypeMapper;
-import de.steamwar.sql.internal.Table;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -68,11 +65,21 @@ public enum UserPerm {
 
     private static final Table<UserPermTable> table = new Table<>(UserPermTable.class, "UserPerm");
     private static final SelectStatement<UserPermTable> getPerms = table.selectFields("user");
+    private static final Statement addPerm = table.insertAll();
+    private static final Statement removePerm = table.delete(Table.PRIMARY);
 
     public static Set<UserPerm> getPerms(int user) {
         return getPerms.listSelect(user).stream().map(up -> up.perm).collect(Collectors.toSet());
     }
 
+    public static void addPerm(SteamwarUser user, UserPerm perm) {
+        addPerm.update(user, perm);
+    }
+
+    public static void removePerm(SteamwarUser user, UserPerm perm) {
+        removePerm.update(user, perm);
+    }
+
     @Getter
     @AllArgsConstructor
     public static class Prefix {

CommonCore/SQL/src/de/steamwar/sql/internal/Table.java

@@ -83,7 +83,11 @@ public class Table<T> {
     }
 
     public Statement insertAll() {
-        return insertFields(false, Arrays.stream(fields).map(f -> f.identifier).toArray(String[]::new));
+        return insertAll(false);
+    }
+
+    public Statement insertAll(boolean returnGeneratedKeys) {
+        return insertFields(returnGeneratedKeys, Arrays.stream(fields).map(f -> f.identifier).toArray(String[]::new));
     }
 
     public Statement insertFields(String... fields) {

FightSystem/FightSystem_10/build.gradle.kts

@@ -22,8 +22,8 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
-    compileOnly(project(":FightSystem:FightSystem_Core"))
+    compileOnly(project(":FightSystem:FightSystem_Core", "default"))
 
     compileOnly(libs.nms10)
 }

FightSystem/FightSystem_12/build.gradle.kts

@@ -22,9 +22,9 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
-    compileOnly(project(":FightSystem:FightSystem_Core"))
+    compileOnly(project(":FightSystem:FightSystem_Core", "default"))
-    compileOnly(project(":FightSystem:FightSystem_8"))
+    compileOnly(project(":FightSystem:FightSystem_8", "default"))
 
     compileOnly(libs.nms12)
     compileOnly(libs.worldedit12)

FightSystem/FightSystem_14/build.gradle.kts

@@ -22,10 +22,10 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
-    compileOnly(project(":FightSystem:FightSystem_Core"))
+    compileOnly(project(":FightSystem:FightSystem_Core", "default"))
-    compileOnly(project(":FightSystem:FightSystem_8"))
+    compileOnly(project(":FightSystem:FightSystem_8", "default"))
-    compileOnly(project(":FightSystem:FightSystem_9"))
+    compileOnly(project(":FightSystem:FightSystem_9", "default"))
 
     compileOnly(libs.nms14)
     compileOnly(libs.worldedit15)

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

@@ -19,45 +19,46 @@
 
 package de.steamwar.fightsystem.utils;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
 import de.steamwar.core.Core;
 import de.steamwar.fightsystem.Config;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Block;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
 import java.util.Map;
 
 public class BlockIdWrapper14 implements BlockIdWrapper {
 
-    private static final Class<?> chunkProviderServer = Reflection.getClass("{nms.server.level}.ChunkProviderServer");
+    private static final Class<?> chunkProviderServer = Reflection.getClass("net.minecraft.server.level.ServerChunkCache");
-    private static final Reflection.MethodInvoker getChunkProvider = Reflection.getTypedMethod(worldServer, null, chunkProviderServer);
+    private static final Reflection.Method getChunkProvider = Reflection.getTypedMethod(worldServer, null, chunkProviderServer);
-    private static final Class<?> playerChunkMap = Reflection.getClass("{nms.server.level}.PlayerChunkMap");
+    private static final Class<?> playerChunkMap = Reflection.getClass("net.minecraft.server.level.ChunkMap");
-    private static final Reflection.FieldAccessor<?> getPlayerChunkMap = Reflection.getField(chunkProviderServer, playerChunkMap,  0);
+    private static final Reflection.Field<?> getPlayerChunkMap = Reflection.getField(chunkProviderServer, playerChunkMap,  0);
-    private static final Reflection.FieldAccessor<? extends Map> entityTrackers = Core.getVersion() > 15 ? Reflection.getField(playerChunkMap, Int2ObjectMap.class,  0) : Reflection.getField(playerChunkMap, org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.ints.Int2ObjectMap.class, 0);
+    private static final Reflection.Field<? extends Map> entityTrackers = Core.getVersion() > 15 ? Reflection.getField(playerChunkMap, Int2ObjectMap.class,  0) : Reflection.getField(playerChunkMap, org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.ints.Int2ObjectMap.class, 0);
-    private static final Class<?> block = Reflection.getClass("{nms.world.level.block}.Block");
+    private static final Class<?> block = Reflection.getClass("net.minecraft.world.level.block.Block");
-    private static final Class<?> iBlockData = Reflection.getClass("{nms.world.level.block.state}.IBlockData");
+    private static final Class<?> iBlockData = Reflection.getClass("net.minecraft.world.level.block.state.BlockState");
-    private static final Class<?> blockPosition = Reflection.getClass("{nms.core}.BlockPosition");
+    private static final Class<?> blockPosition = Reflection.getClass("net.minecraft.core.BlockPos");
 
     private final Map trackers;
     public BlockIdWrapper14() {
         trackers = entityTrackers.get(getPlayerChunkMap.get(getChunkProvider.invoke(getWorldHandle.invoke(Config.world))));
     }
 
-    private static final Reflection.MethodInvoker getCombinedId = Reflection.getTypedMethod(block, null, int.class, iBlockData);
+    private static final Reflection.Method getCombinedId = Reflection.getTypedMethod(block, null, int.class, iBlockData);
-    private static final Reflection.MethodInvoker getNMS = Reflection.getTypedMethod(Reflection.getClass("{obc}.block.CraftBlock"), "getNMS", iBlockData);
+    private static final Reflection.Method getNMS = Reflection.getTypedMethod(Reflection.getClass("org.bukkit.craftbukkit.block.CraftBlock"), "getNMS", iBlockData);
     @Override
     public int blockToId(Block block) {
         return (int) getCombinedId.invoke(null, getNMS.invoke(block));
     }
 
-    private static final Reflection.MethodInvoker getByCombinedId = Reflection.getTypedMethod(block, null, iBlockData, int.class);
+    private static final Reflection.Method getByCombinedId = Reflection.getTypedMethod(block, null, iBlockData, int.class);
-    private static final Reflection.ConstructorInvoker newBlockPosition = Reflection.getConstructor(blockPosition, int.class, int.class, int.class);
+    private static final Reflection.Constructor newBlockPosition = Reflection.getConstructor(blockPosition, int.class, int.class, int.class);
-    private static final Reflection.MethodInvoker getTypeAndData = Reflection.getMethod(worldServer, null, blockPosition, iBlockData, int.class);
+    private static final Reflection.Method getTypeAndData = Reflection.getMethod(worldServer, null, blockPosition, iBlockData, int.class);
-    private static final Reflection.MethodInvoker removeTileEntity = Reflection.getMethod(worldServer, Core.getVersion() > 15 ? "m" : "removeTileEntity", blockPosition);
+    private static final Reflection.Method removeTileEntity = Reflection.getMethod(worldServer, Core.getVersion() > 15 ? "m" : "removeTileEntity", blockPosition);
-    private static final Reflection.MethodInvoker flagDirty = Reflection.getMethod(chunkProviderServer, null, blockPosition);
+    private static final Reflection.Method flagDirty = Reflection.getMethod(chunkProviderServer, null, blockPosition);
     @Override
     public void setBlock(World world, int x, int y, int z, int blockState) {
         Object blockData = getByCombinedId.invoke(null, blockState);
@@ -69,25 +70,25 @@ public class BlockIdWrapper14 implements BlockIdWrapper {
         flagDirty.invoke(getChunkProvider.invoke(nworld), pos);
     }
 
-    private static final Class<?> entityTracker = Reflection.getClass("{nms.server.level}.PlayerChunkMap$EntityTracker");
+    private static final Class<?> entityTracker = Reflection.getClass("net.minecraft.server.level.ChunkMap$TrackedEntity");
-    private static final Reflection.MethodInvoker updatePlayer = Reflection.getMethod(entityTracker, Core.getVersion() > 15 ? "b" : "updatePlayer", entityPlayer);
+    private static final Reflection.Method updatePlayer = Reflection.getMethod(entityTracker, Core.getVersion() > 15 ? "b" : "updatePlayer", entityPlayer);
     @Override
-    public void trackEntity(Player player, int entity) {
+    public void trackEntity(Player player, Entity entity) {
-        Object tracker = trackers.get(entity);
+        Object tracker = trackers.get(entity.getEntityId());
         if(tracker != null)
             updatePlayer.invoke(tracker, getPlayer.invoke(player));
     }
 
-    private static final Reflection.MethodInvoker clearPlayer = Reflection.getMethod(entityTracker, Core.getVersion() > 15 ? "a" : "clear", entityPlayer);
+    private static final Reflection.Method clearPlayer = Reflection.getMethod(entityTracker, Core.getVersion() > 15 ? "a" : "clear", entityPlayer);
     @Override
-    public void untrackEntity(Player player, int entity) {
+    public void untrackEntity(Player player, Entity entity) {
-        Object tracker = trackers.get(entity);
+        Object tracker = trackers.get(entity.getEntityId());
         if(tracker != null)
             clearPlayer.invoke(tracker, getPlayer.invoke(player));
     }
 
-    private static final Reflection.MethodInvoker getMaterialByBlock = Reflection.getTypedMethod(Reflection.getClass("{obc}.util.CraftMagicNumbers"), "getMaterial", Material.class, block);
+    private static final Reflection.Method getMaterialByBlock = Reflection.getTypedMethod(Reflection.getClass("org.bukkit.craftbukkit.util.CraftMagicNumbers"), "getMaterial", Material.class, block);
-    private static final Reflection.MethodInvoker getBlockByBlockData = Reflection.getTypedMethod(iBlockData, null, block);
+    private static final Reflection.Method getBlockByBlockData = Reflection.getTypedMethod(iBlockData, null, block);
     @Override
     public Material idToMaterial(int blockState) {
         return (Material)getMaterialByBlock.invoke(null, getBlockByBlockData.invoke(getByCombinedId.invoke(null, blockState)));

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

@@ -42,6 +42,7 @@ import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockTypes;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.FightSystem;
+import de.steamwar.sql.NodeData;
 import de.steamwar.sql.SchematicData;
 import de.steamwar.sql.SchematicNode;
 import org.bukkit.DyeColor;
@@ -144,6 +145,6 @@ public class WorldeditWrapper14 implements WorldeditWrapper {
             throw new SecurityException(e);
         }
 
-        new SchematicData(schem).saveFromBytes(outputStream.toByteArray(), true);
+        new SchematicData(schem).saveFromBytes(outputStream.toByteArray(), NodeData.SchematicFormat.SPONGE_V2);
     }
 }

FightSystem/FightSystem_15/build.gradle.kts

@@ -22,8 +22,8 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
-    compileOnly(project(":FightSystem:FightSystem_Core"))
+    compileOnly(project(":FightSystem:FightSystem_Core", "default"))
 
     compileOnly(libs.nms15)
     compileOnly(libs.worldedit15)

FightSystem/FightSystem_18/build.gradle.kts

@@ -22,8 +22,9 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
-    compileOnly(project(":FightSystem:FightSystem_Core"))
+    compileOnly(project(":FightSystem:FightSystem_Core", "default"))
+    compileOnly(project(":FightSystem:FightSystem_14", "default"))
 
     compileOnly(libs.spigotapi)
 

FightSystem/FightSystem_18/src/de/steamwar/fightsystem/utils/BlockIdWrapper18.java

@@ -0,0 +1,42 @@
+/*
+ *     This file is a part of the SteamWar software.
+ *
+ *     Copyright (C) 2024  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.utils;
+
+import de.steamwar.Reflection;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+
+import java.util.*;
+
+public class BlockIdWrapper18 extends BlockIdWrapper14 {
+
+    private static final Reflection.Field<Map> hiddenEntities = Reflection.getField(Reflection.getClass("org.bukkit.craftbukkit.entity.CraftPlayer"), Map.class, 0, UUID.class, Set.class);
+    @Override
+    public void trackEntity(Player player, Entity entity) {
+        hiddenEntities.get(player).remove(entity.getUniqueId());
+        super.trackEntity(player, entity);
+    }
+
+    @Override
+    public void untrackEntity(Player player, Entity entity) {
+        hiddenEntities.get(player).put(entity.getUniqueId(), new HashSet<>(1));
+        super.untrackEntity(player, entity);
+    }
+}

FightSystem/FightSystem_18/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper18.java

@@ -19,7 +19,7 @@
 
 package de.steamwar.fightsystem.utils;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
 import de.steamwar.fightsystem.Config;
 import net.minecraft.server.level.WorldServer;
 import net.minecraft.world.level.chunk.Chunk;
@@ -33,9 +33,9 @@ import java.util.stream.StreamSupport;
 
 public class CraftbukkitWrapper18 implements CraftbukkitWrapper {
 
-    private static final Reflection.MethodInvoker getWorld = Reflection.getMethod(Reflection.getClass("{obc}.CraftWorld"), "getHandle");
+    private static final Reflection.Method getWorld = Reflection.getMethod(Reflection.getClass("org.bukkit.craftbukkit.CraftWorld"), "getHandle");
-    private static final Reflection.MethodInvoker getChunk = Reflection.getTypedMethod(net.minecraft.world.level.World.class, null, Chunk.class, int.class, int.class);
+    private static final Reflection.Method getChunk = Reflection.getTypedMethod(net.minecraft.world.level.World.class, null, Chunk.class, int.class, int.class);
-    private static final Reflection.MethodInvoker getChunkSections = Reflection.getTypedMethod(Chunk.class, null, ChunkSection[].class);
+    private static final Reflection.Method getChunkSections = Reflection.getTypedMethod(Chunk.class, null, ChunkSection[].class);
     private ChunkSection[] getChunkSections(World world, int x, int z) {
         return (ChunkSection[]) getChunkSections.invoke(getChunk.invoke(getWorld.invoke(world), x, z));
     }
@@ -46,7 +46,7 @@ public class CraftbukkitWrapper18 implements CraftbukkitWrapper {
         System.arraycopy(getChunkSections(backup, x, z), 0, sections, 0, sections.length);
     }
 
-    private static final Reflection.MethodInvoker getEntity = Reflection.getTypedMethod(Reflection.getClass("{obc}.entity.CraftEntity"), "getHandle", net.minecraft.world.entity.Entity.class);
+    private static final Reflection.Method getEntity = Reflection.getTypedMethod(Reflection.getClass("org.bukkit.craftbukkit.entity.CraftEntity"), "getHandle", net.minecraft.world.entity.Entity.class);
     protected net.minecraft.world.entity.Entity getEntity(Entity e) {
         return (net.minecraft.world.entity.Entity) getEntity.invoke(e);
     }
@@ -56,8 +56,8 @@ public class CraftbukkitWrapper18 implements CraftbukkitWrapper {
         return getEntity(e).ce();
     }
 
-    private static final Reflection.MethodInvoker getWorldEntities = Reflection.getTypedMethod(WorldServer.class, null, LevelEntityGetter.class);
+    private static final Reflection.Method getWorldEntities = Reflection.getTypedMethod(WorldServer.class, null, LevelEntityGetter.class);
-    private static final Reflection.MethodInvoker getIterable = Reflection.getTypedMethod(LevelEntityGetter.class, null, Iterable.class);
+    private static final Reflection.Method getIterable = Reflection.getTypedMethod(LevelEntityGetter.class, null, Iterable.class);
     @Override
     public Stream<?> entityIterator() {
         return StreamSupport.stream(((Iterable<?>) getIterable.invoke(getWorldEntities.invoke(getWorld.invoke(Config.world)))).spliterator(), false);

FightSystem/FightSystem_18/src/de/steamwar/fightsystem/utils/HullHiderWrapper18.java

@@ -19,7 +19,7 @@
 
 package de.steamwar.fightsystem.utils;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
 import de.steamwar.fightsystem.Config;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectArrayMap;
 import net.minecraft.core.BlockPosition;
@@ -27,31 +27,22 @@ import net.minecraft.core.SectionPosition;
 import net.minecraft.network.protocol.game.PacketPlayOutBlockChange;
 import net.minecraft.network.protocol.game.PacketPlayOutMultiBlockChange;
 import net.minecraft.world.level.block.state.IBlockData;
-import org.bukkit.block.data.BlockData;
 
-import java.util.ArrayList;
 import java.util.List;
 
 
 public class HullHiderWrapper18 implements HullHiderWrapper {
 
-    private static final Reflection.MethodInvoker getState = Reflection.getTypedMethod(Reflection.getClass("{obc}.block.data.CraftBlockData"), "getState", IBlockData.class);
+    private static final Reflection.Method getState = Reflection.getTypedMethod(Reflection.getClass("org.bukkit.craftbukkit.block.data.CraftBlockData"), "getState", IBlockData.class);
     @Override
     public Object generateBlockChangePacket(List<Hull.IntVector> changes) {
-        List<Object> blockdata = new ArrayList<>(changes.size());
+        Object[] blockdata = new Object[changes.size()];
+        for(int i = 0; i < blockdata.length; i++) {
+            Hull.IntVector change = changes.get(i);
+            blockdata[i] = getState.invoke(Config.world.getBlockData(change.getX(), change.getY(), change.getZ()));
+        }
 
-        changes.removeIf(change -> {
+        return generateBlockChangePacket(changes, blockdata);
-            BlockData data = Config.world.getBlockData(change.getX(), change.getY(), change.getZ());
-            boolean unchanged = data.getMaterial() == Config.ObfuscateWith || Config.HiddenBlocks.contains(data.getMaterial());
-            if(!unchanged)
-                blockdata.add(getState.invoke(data));
-            return unchanged;
-        });
-
-        if(changes.isEmpty())
-            return null;
-
-        return generateBlockChangePacket(changes, blockdata.toArray());
     }
 
     private Object generateBlockChangePacket(List<Hull.IntVector> changes, Object[] blockdata) {

FightSystem/FightSystem_19/build.gradle.kts

@@ -22,8 +22,8 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":FightSystem:FightSystem_Core"))
+    compileOnly(project(":FightSystem:FightSystem_Core", "default"))
-    compileOnly(project(":FightSystem:FightSystem_18"))
+    compileOnly(project(":FightSystem:FightSystem_18", "default"))
 
     compileOnly(libs.spigotapi)
 

FightSystem/FightSystem_20/build.gradle.kts

@@ -22,8 +22,8 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":FightSystem:FightSystem_Core"))
+    compileOnly(project(":FightSystem:FightSystem_Core", "default"))
-    compileOnly(project(":FightSystem:FightSystem_18"))
+    compileOnly(project(":FightSystem:FightSystem_18", "default"))
 
     compileOnly(libs.spigotapi)
 

FightSystem/FightSystem_21/build.gradle.kts

@@ -0,0 +1,43 @@
+/*
+ *   This file is a part of the SteamWar software.
+ *
+ *   Copyright (C) 2024  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/>.
+ */
+
+plugins {
+    steamwar.java
+}
+
+dependencies {
+    compileOnly(project(":FightSystem:FightSystem_Core", "default"))
+    compileOnly(project(":FightSystem:FightSystem_18", "default"))
+
+    compileOnly(libs.paperapi21) {
+        attributes {
+            // Very Hacky, but it works
+            attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 21)
+        }
+    }
+
+    compileOnly(libs.nms21) {
+        attributes {
+            // Very Hacky, but it works
+            attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 21)
+        }
+    }
+
+    compileOnly(libs.fastutil)
+}

FightSystem/FightSystem_21/src/de/steamwar/fightsystem/utils/CraftbukkitWrapper21.java

@@ -1,7 +1,7 @@
 /*
  *   This file is a part of the SteamWar software.
  *
- *   Copyright (C) 2023  SteamWar.de-Serverteam
+ *   Copyright (C) 2024 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
@@ -17,15 +17,14 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.fightsystem.ai.chaos;
+package de.steamwar.fightsystem.utils;
 
-import org.bukkit.util.Vector;
+import org.bukkit.entity.Entity;
 
-public class Bridge {
+public class CraftbukkitWrapper21 extends CraftbukkitWrapper18 {
-    private Bridge() {
+
+    @Override
+    public float headRotation(Entity e) {
+        return getEntity(e).bS();
     }
-
-    public static final Vector BRIDGE_POS = new Vector(25, 14, 24);
-    public static final Vector BRIDGE_SHIELDS = new Vector(25, 15, 25);
-    public static final Vector BRIDGE_MG = new Vector(21, 15, 24);
 }

FightSystem/FightSystem_8/build.gradle.kts

@@ -22,8 +22,8 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
-    compileOnly(project(":FightSystem:FightSystem_Core"))
+    compileOnly(project(":FightSystem:FightSystem_Core", "default"))
 
     compileOnly(libs.nms8)
     compileOnly(libs.worldedit12)

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

@@ -19,19 +19,20 @@
 
 package de.steamwar.fightsystem.utils;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
 import de.steamwar.fightsystem.Config;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Block;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
 public class BlockIdWrapper8 implements BlockIdWrapper {
 
-    private static final Class<?> entityTracker = Reflection.getClass("{nms}.EntityTracker");
+    private static final Class<?> entityTracker = Reflection.getClass("net.minecraft.EntityTracker");
-    private static final Reflection.FieldAccessor<?> getEntityTracker = Reflection.getField(worldServer, entityTracker,  0);
+    private static final Reflection.Field<?> getEntityTracker = Reflection.getField(worldServer, entityTracker,  0);
-    private static final Class<?> intHashMap = Reflection.getClass("{nms}.IntHashMap");
+    private static final Class<?> intHashMap = Reflection.getClass("net.minecraft.IntHashMap");
-    private static final Reflection.FieldAccessor<?> getTrackedEntities = Reflection.getField(entityTracker, intHashMap,  0);
+    private static final Reflection.Field<?> getTrackedEntities = Reflection.getField(entityTracker, intHashMap,  0);
 
     private final Object trackers;
     public BlockIdWrapper8() {
@@ -53,20 +54,20 @@ public class BlockIdWrapper8 implements BlockIdWrapper {
         world.getBlockAt(x, y, z).setTypeIdAndData(blockState >> 4, (byte)(blockState & 0b1111), false);
     }
 
-    private static final Class<?> entityTrackerEntry = Reflection.getClass("{nms}.EntityTrackerEntry");
+    private static final Class<?> entityTrackerEntry = Reflection.getClass("net.minecraft.EntityTrackerEntry");
-    private static final Reflection.MethodInvoker get = Reflection.getTypedMethod(intHashMap, "get", Object.class, int.class);
+    private static final Reflection.Method get = Reflection.getTypedMethod(intHashMap, "get", Object.class, int.class);
-    private static final Reflection.MethodInvoker updatePlayer = Reflection.getMethod(entityTrackerEntry, "updatePlayer", entityPlayer);
+    private static final Reflection.Method updatePlayer = Reflection.getMethod(entityTrackerEntry, "updatePlayer", entityPlayer);
     @Override
-    public void trackEntity(Player player, int entity) {
+    public void trackEntity(Player player, Entity entity) {
-        Object tracker = get.invoke(trackers, entity);
+        Object tracker = get.invoke(trackers, entity.getEntityId());
         if(tracker != null)
             updatePlayer.invoke(tracker, getPlayer.invoke(player));
     }
 
-    private static final Reflection.MethodInvoker clearPlayer = Reflection.getMethod(entityTrackerEntry, "a", entityPlayer);
+    private static final Reflection.Method clearPlayer = Reflection.getMethod(entityTrackerEntry, "a", entityPlayer);
     @Override
-    public void untrackEntity(Player player, int entity) {
+    public void untrackEntity(Player player, Entity entity) {
-        Object tracker = get.invoke(trackers, entity);
+        Object tracker = get.invoke(trackers, entity.getEntityId());
         if(tracker != null)
             clearPlayer.invoke(tracker, getPlayer.invoke(player));
     }

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

@@ -19,26 +19,17 @@
 
 package de.steamwar.fightsystem.utils;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
 import de.steamwar.fightsystem.Config;
-import org.bukkit.Material;
 
 import java.util.List;
 
 public class HullHiderWrapper8 implements HullHiderWrapper {
 
-    private static final Reflection.ConstructorInvoker newMultiBlockChange = Reflection.getConstructor("{nms}.PacketPlayOutMultiBlockChange", int.class, short[].class, Reflection.getClass("{nms}.Chunk"));
+    private static final Reflection.Constructor newMultiBlockChange = Reflection.getConstructor("net.minecraft.PacketPlayOutMultiBlockChange", int.class, short[].class, Reflection.getClass("net.minecraft.Chunk"));
-    private static final Reflection.MethodInvoker getHandle = Reflection.getMethod("{obc}.CraftChunk", "getHandle");
+    private static final Reflection.Method getHandle = Reflection.getMethod("org.bukkit.craftbukkit.CraftChunk", "getHandle");
     @Override
     public Object generateBlockChangePacket(List<Hull.IntVector> changes) {
-        changes.removeIf(change -> {
-            Material material = Config.world.getBlockAt(change.getX(), change.getY(), change.getZ()).getType();
-            return material == Config.ObfuscateWith || Config.HiddenBlocks.contains(material);
-        });
-
-        if(changes.isEmpty())
-            return null;
-
         Hull.IntVector chunk = changes.get(0);
         chunk = new Hull.IntVector(chunk.getX() >> 4, chunk.getY() >> 4, chunk.getZ() >> 4);
         int xOffset = 16*chunk.getX();

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

@@ -39,6 +39,7 @@ import com.sk89q.worldedit.session.ClipboardHolder;
 import com.sk89q.worldedit.world.World;
 import de.steamwar.fightsystem.Config;
 import de.steamwar.fightsystem.FightSystem;
+import de.steamwar.sql.NodeData;
 import de.steamwar.sql.SchematicData;
 import de.steamwar.sql.SchematicNode;
 import org.bukkit.DyeColor;
@@ -142,6 +143,6 @@ public class WorldeditWrapper8 implements WorldeditWrapper {
             throw new SecurityException(e);
         }
 
-        new SchematicData(schem).saveFromBytes(outputStream.toByteArray(), false);
+        new SchematicData(schem).saveFromBytes(outputStream.toByteArray(), NodeData.SchematicFormat.MCEDIT);
     }
 }

FightSystem/FightSystem_9/build.gradle.kts

@@ -22,9 +22,9 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
-    compileOnly(project(":FightSystem:FightSystem_Core"))
+    compileOnly(project(":FightSystem:FightSystem_Core", "default"))
-    compileOnly(project(":FightSystem:FightSystem_8"))
+    compileOnly(project(":FightSystem:FightSystem_8", "default"))
 
     compileOnly(libs.nms9)
 }

FightSystem/FightSystem_9/src/de/steamwar/fightsystem/utils/BountifulWrapper9.java

@@ -19,7 +19,7 @@
 
 package de.steamwar.fightsystem.utils;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
 import de.steamwar.fightsystem.fight.Fight;
 import de.steamwar.fightsystem.fight.FightTeam;
 import de.steamwar.fightsystem.listener.Recording;
@@ -43,9 +43,9 @@ import java.util.Map;
 
 public class BountifulWrapper9 implements BountifulWrapper {
 
-    private static final Class<?> enumHand = Reflection.getClass("{nms.world}.EnumHand");
+    private static final Class<?> enumHand = Reflection.getClass("net.minecraft.world.InteractionHand");
     private static final Object mainHand = enumHand.getEnumConstants()[0];
-    private static final Reflection.FieldAccessor<?> blockPlaceHand = Reflection.getField(Recording.blockPlacePacket, enumHand, 0);
+    private static final Reflection.Field<?> blockPlaceHand = Reflection.getField(Recording.blockPlacePacket, enumHand, 0);
 
     @Override
     public boolean mainHand(Object packet) {

FightSystem/FightSystem_Core/build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(project(":SpigotCore"))
+    compileOnly(project(":SpigotCore", "default"))
 
     compileOnly(libs.spigotapi)
 

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

@@ -344,7 +344,7 @@ public class Config {
             EventTeamBlueID = team1.getTeamId();
             EventTeamRedID = team2.getTeamId();
             BothTeamsPublic = EventTeamRedID == 0 && EventTeamBlueID == 0;
-            SpectatePort = EventKampf.getSpectatePort();
+            SpectatePort = EventKampf.getSpectatePort() == null ? 0 : EventKampf.getSpectatePort();
             LiveReplay = SpectatePort != 0;
             Referees = Referee.get(Config.EventKampf.getEventID());
 

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

@@ -153,7 +153,6 @@ public class FightSystem extends JavaPlugin {
         new GamemodeCommand();
         new ReadyCommand();
         new AkCommand();
-        new LeaderCommand();
         new LockschemCommand();
         new StateCommand();
         new SkipCommand();

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

@@ -34,9 +34,6 @@ GAMEMODE_NOT_ALLOWED=§cChanging gamemode is not permitted
 GAMEMODE_UNKNOWN=§cUnknown gamemode {0}
 GAMEMODE_HELP=§8/§7gm §8[§egamemode§8]
 
-LEADER_FULL=§cAll teams already have a leader
-ALREADY_IN_TEAM=§cYou are already in a team
-
 LOCKSCHEM_HELP=§8/§7lockschem §8[§eteam§8]
 UNKNOWN_TEAM=§cThis team does not exist
 LOCKSCHEM_LOCKED=§7Schematic locked
@@ -65,7 +62,9 @@ STATE_RUNNING=§eFighting phase
 STATE_SPECTATE_WIN=§7Victory {0}
 STATE_SPECTATE_TIE=§7Draw
 
-REMOVE_TITLE=Kick player
+MANAGE_TITLE=Manage players
+MANAGE_LORE1=§eLeft §7click§8: §ekick
+MANAGE_LORE2=§eRight §7click§8: §epromote
 
 KIT_SELECTION_TITLE=Kit selection
 KIT_NO_KITS=§cNo kits found
@@ -113,7 +112,7 @@ SKIP_NOT_READY=§c§mSkipping to next event
 TEAM_CHAT={0}{1}§8» {0}{2}
 CHOOSE_KIT=§eChoose kit
 RESPAWN=§eRespawn
-REMOVE_PLAYERS=§cKick player
+MANAGE_PLAYERS=§cManage players
 CHOOSE_SCHEMATIC=§eChoose {0}
 SCHEMATIC_REQUIRED=§cChoose a schematic first
 ADD_AI=§eAdd AI
@@ -141,7 +140,6 @@ NO_TELEPORT=§cYou are not allowed to use this teleport function
 OPEN_INVENTORY_TO_CUSTOMIZE=§eOpen inventory to customize your kit
 NO_ENTERN=§cYou may not board
 NO_TEAMAREA=§cYou are not allowed in the team area
-TEST_BECOME_LEADER=§7Become a team leader with §8/§eleader
 PREPARE_SCHEM_DELETED=§cApparently the schematic to be submitted was deleted. submission aborted.
 PREPARE_SCHEM_EXISTS=§cThere is already a schematic with the suffix -prepared, please rename or delete it, submission aborted.
 PREPARE_ACTIVE_PISTON=§cMoving pistons were found in the team area, submission aborted.

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

@@ -32,9 +32,6 @@ GAMEMODE_NOT_ALLOWED=§cSpielmodusänderung verboten
 GAMEMODE_UNKNOWN=§cUnbekannter Spielmodus {0}
 GAMEMODE_HELP=§8/§7gm §8[§eSpielmodus§8]
 
-LEADER_FULL=§cAlle Teams haben bereits einen Leader
-ALREADY_IN_TEAM=§cDu bist bereits in einem Team
-
 LOCKSCHEM_HELP=§8/§7lockschem §8[§eTeam§8]
 UNKNOWN_TEAM=§cDieses Team existiert nicht
 LOCKSCHEM_LOCKED=§7Schematic gesperrt
@@ -59,7 +56,9 @@ STATE_RUNNING=§eKampfphase
 STATE_SPECTATE_WIN=§7Sieg {0}
 STATE_SPECTATE_TIE=§7Unentschieden
 
-REMOVE_TITLE=Spieler rauswerfen
+MANAGE_TITLE=Mitspieler verwalten
+MANAGE_LORE1=§eLinksklick§8: §eRauswurf
+MANAGE_LORE2=§eRechtsklick§8: §eBefördern
 
 KIT_SELECTION_TITLE=Kitauswahl
 KIT_NO_KITS=§cKeine Kits gefunden
@@ -106,7 +105,7 @@ SKIP_READY=§aBeschleunigung zum nächsten Event
 SKIP_NOT_READY=§c§mBeschleunigung zum nächsten Event
 CHOOSE_KIT=§eKit wählen
 RESPAWN=§eRespawn
-REMOVE_PLAYERS=§cSpieler rauswerfen
+MANAGE_PLAYERS=§cMitspieler verwalten
 CHOOSE_SCHEMATIC=§e{0} wählen
 SCHEMATIC_REQUIRED=§cZuerst muss eine Schematic gewählt sein
 ADD_AI=§eKI hinzufügen
@@ -134,7 +133,6 @@ NO_TELEPORT=§cDu darfst diese Teleportfunktion nicht benutzen
 OPEN_INVENTORY_TO_CUSTOMIZE=§eInventar zum Anpassen des Kits öffnen
 NO_ENTERN=§cDu darfst nicht entern
 NO_TEAMAREA=§cDu darfst nicht zu den Teams
-TEST_BECOME_LEADER=§7Werde zum Teamleader mit §8/§eleader
 PREPARE_SCHEM_DELETED=§cAnscheinend wurde die auszufahrende Schematic gelöscht, Einsenden wird abgebrochen.
 PREPARE_SCHEM_EXISTS=§cEs existiert bereits eine Schem mit Namenszusatz -prepared, diese bitte umbenennen oder löschen, Einsenden wird abgebrochen.
 PREPARE_ACTIVE_PISTON=§cIm Teambereich wurden sich noch bewegende Pistons gefunden, Einsenden wird abgebrochen.

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

@@ -19,11 +19,9 @@
 
 package de.steamwar.fightsystem.ai;
 
-import com.comphenix.tinyprotocol.Reflection;
+import de.steamwar.Reflection;
-import de.steamwar.core.Core;
+import de.steamwar.fightsystem.ArenaMode;
 import de.steamwar.fightsystem.Config;
-import de.steamwar.fightsystem.ai.chaos.ChaosAI;
-import de.steamwar.fightsystem.ai.lixfel.LixfelAI;
 import de.steamwar.fightsystem.fight.FightTeam;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -37,9 +35,7 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class AIManager {
     private static final List<AIManager> AIs = Arrays.asList(
-            new AIManager(DummyAI.class, Material.STONE, () -> true),
+            new AIManager(DummyAI.class, Material.STONE, () -> ArenaMode.Test.contains(Config.mode))
-            new AIManager(LixfelAI.class, Material.TNT, () -> Core.getVersion() >= 14),
-            new AIManager(ChaosAI.class, Material.SLIME_BLOCK, () -> Config.SchematicType.toDB().equals("miniwargear19") && Core.getVersion() >= 14)
     );
 
     public static List<AIManager> availableAIs() {

FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/chaos/Cannon.java

@@ -1,172 +0,0 @@
-/*
- *   This file is a part of the SteamWar software.
- *
- *   Copyright (C) 2023  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.ai.chaos;
-
-import org.bukkit.util.Vector;
-
-public class Cannon {
-    public final Vector[] tnt;
-    public final Vector button;
-    public final Vector load;
-    public final Vector escape;
-    public final String name;
-
-    private Cannon(String name, Vector[] tnt, Vector button, Vector load, Vector escape) {
-        this.tnt = tnt;
-        this.button = button;
-        this.load = load;
-        this.escape = escape;
-        this.name = name;
-    }
-
-    public static final Vector[] DS_LEFT_TNT = new Vector[] {
-            new Vector(40, 24, 12),
-            new Vector(39, 24, 12),
-            new Vector(38, 23, 12),
-            new Vector(38, 24, 12),
-            new Vector(40, 23, 15),
-            new Vector(40, 23, 14),
-            new Vector(40, 24, 15),
-            new Vector(40, 24, 14),
-            new Vector(38, 23, 15),
-            new Vector(38, 23, 14),
-            new Vector(38, 24, 15),
-            new Vector(38, 24, 14),
-            new Vector(40, 23, 12),
-    };
-    public static final Vector DS_LEFT_BUTTON = new Vector(39, 25, 11);
-    public static final Vector DS_LEFT_LOAD = new Vector(39, 25, 13);
-    public static final Vector DS_LEFT_ESCAPE = new Vector(31, 26, 13);
-    public static final Cannon DS_LEFT = new Cannon("Downstäb Links", DS_LEFT_TNT, DS_LEFT_BUTTON, DS_LEFT_LOAD, DS_LEFT_ESCAPE);
-
-    public static final Vector[] DS_RIGHT_TNT = new Vector[] {
-            new Vector(12, 24, 12),
-            new Vector(11, 24, 12),
-            new Vector(10, 23, 12),
-            new Vector(10, 24, 12),
-            new Vector(10, 23, 15),
-            new Vector(10, 23, 14),
-            new Vector(10, 24, 15),
-            new Vector(10, 24, 14),
-            new Vector(12, 23, 14),
-            new Vector(12, 24, 14),
-            new Vector(12, 23, 15),
-            new Vector(12, 24, 15),
-            new Vector(12, 23, 12),
-    };
-    public static final Vector DS_RIGHT_BUTTON = new Vector(11, 25, 11);
-    public static final Vector DS_RIGHT_LOAD = new Vector(11, 25, 13);
-    public static final Vector DS_RIGHT_ESCAPE = new Vector(19, 26, 13);
-    public static final Cannon DS_RIGHT = new Cannon("Downstäb Rechts", DS_RIGHT_TNT, DS_RIGHT_BUTTON, DS_RIGHT_LOAD, DS_RIGHT_ESCAPE);
-
-    public static final Vector[] STATIC_LEFT_TNT = new Vector[] {
-            new Vector(37, 17, 15),
-            new Vector(37, 17, 14),
-            new Vector(37, 18, 16),
-            new Vector(37, 18, 15),
-            new Vector(37, 18, 14),
-            new Vector(36, 17, 16),
-            new Vector(36, 17, 15),
-            new Vector(36, 17, 14),
-            new Vector(36, 18, 16),
-            new Vector(36, 18, 15),
-            new Vector(36, 18, 14),
-            new Vector(37, 17, 16),
-    };
-    public static final Vector STATIC_LEFT_BUTTON = new Vector(38, 18, 11);
-    public static final Vector STATIC_LEFT_LOAD = new Vector(37, 17, 12);
-    public static final Vector STATIC_LEFT_ESCAPE = new Vector(30, 13, 9);
-    public static final Cannon STATIC_LEFT = new Cannon("Lupf Links", STATIC_LEFT_TNT, STATIC_LEFT_BUTTON, STATIC_LEFT_LOAD, STATIC_LEFT_ESCAPE);
-
-    public static final Vector[] STATIC_RIGHT_TNT = new Vector[] {
-            new Vector(14, 17, 15),
-            new Vector(14, 18, 16),
-            new Vector(14, 18, 15),
-            new Vector(14, 17, 14),
-            new Vector(14, 18, 14),
-            new Vector(13, 17, 16),
-            new Vector(13, 17, 15),
-            new Vector(13, 17, 14),
-            new Vector(13, 18, 16),
-            new Vector(13, 18, 15),
-            new Vector(13, 18, 14),
-            new Vector(14, 17, 16),
-    };
-    public static final Vector STATIC_RIGHT_BUTTON = new Vector(12, 18, 11);
-    public static final Vector STATIC_RIGHT_LOAD = new Vector(13, 17, 12);
-    public static final Vector STATIC_RIGHT_ESCAPE = new Vector(20, 13, 9);
-    public static final Cannon STATIC_RIGHT = new Cannon("Lupf Rechts", STATIC_RIGHT_TNT, STATIC_RIGHT_BUTTON, STATIC_RIGHT_LOAD, STATIC_RIGHT_ESCAPE);
-
-    public static final Vector[] AK_TNT = new Vector[] {
-            new Vector(10, 7, 17),
-            new Vector(10, 11, 17),
-            new Vector(10, 10, 17),
-            new Vector(10, 8, 17),
-            new Vector(10, 9, 17),
-            new Vector(10, 7, 15),
-            new Vector(11, 7, 15),
-            new Vector(12, 7, 15),
-            new Vector(10, 10, 15),
-            new Vector(11, 10, 15),
-            new Vector(12, 10, 15),
-            new Vector(12, 8, 15),
-            new Vector(12, 9, 15),
-            new Vector(11, 8, 15),
-            new Vector(11, 9, 15),
-            new Vector(10, 8, 15),
-            new Vector(10, 9, 15),
-            new Vector(10, 7, 19),
-            new Vector(11, 7, 19),
-            new Vector(12, 7, 19),
-            new Vector(12, 8, 19),
-            new Vector(11, 8, 19),
-            new Vector(10, 8, 19),
-            new Vector(10, 10, 19),
-            new Vector(11, 10, 19),
-            new Vector(12, 10, 19),
-            new Vector(12, 9, 19),
-            new Vector(11, 9, 19),
-            new Vector(10, 9, 19),
-            new Vector(10, 6, 17),
-    };
-    public static final Vector AK_BUTTON = new Vector(9, 9, 16);
-    public static final Vector AK_LOAD = new Vector(11, 8, 17);
-    public static final Cannon AK = new Cannon("Arschkratzer", AK_TNT, AK_BUTTON, AK_LOAD, null);
-
-    public static final Vector[] HA_RIGHT_TNT = new Vector[] {
-            new Vector(23, 5, 9),
-            new Vector(23, 6, 9),
-            new Vector(23, 7, 9),
-            new Vector(23, 8, 9),
-    };
-
-    public static final Vector[] HA_LEFT_TNT = new Vector[] {
-            new Vector(27, 5, 9),
-            new Vector(27, 6, 9),
-            new Vector(27, 7, 9),
-            new Vector(27, 8, 9),
-    };
-
-    public static final Vector HA_RIGHT_LOAD = new Vector(23, 8, 8);
-    public static final Vector HA_LEFT_LOAD = new Vector(27, 8, 8);
-
-    public static final Cannon HA_LEFT = new Cannon("Halbautomatik Links", HA_LEFT_TNT, null, HA_LEFT_LOAD, null);
-    public static final Cannon HA_RIGHT = new Cannon("Halbautomatik Rechts", HA_RIGHT_TNT, null, HA_RIGHT_LOAD, null);
-}